Changeset 9629 in orxonox.OLD for branches/proxy/src/lib

Timestamp:

Jul 31, 2006, 1:32:36 AM (18 years ago)

Author:

patrick

Message:

one more rule to prevent proxys overwriting masters

File:

• branches/proxy/src/lib/network/synchronizeable.cc (modified) (2 diffs)

branches/proxy/src/lib/network/synchronizeable.cc

@@ -423 +423 @@
     // Permission   SERVER accept if:
     // sender == SERVER
-    else if( (*it)->checkPermission( PERMISSION_SERVER ) && !SharedNetworkData::getInstance()->isUserClient( userId) ) {
+    else if( (*it)->checkPermission( PERMISSION_SERVER ) && !SharedNetworkData::getInstance()->isUserClient( userId) &&
+               SharedNetworkData::getInstance()->isClient()) {
       hasPermission = true; b6 = true; }
+    else if(  (*it)->checkPermission( PERMISSION_SERVER ) && !SharedNetworkData::getInstance()->isUserClient( userId) &&
+                !SharedNetworkData::getInstance()->isClient() &&
+                !SharedNetworkData::getInstance()->isUserLocal( this->owner) && this->owner !=  SharedNetworkData::getInstance()->getHostID()) {
+      hasPermission = true; b7 = true; }
+
+
+#if 0
+
+    // i am SERVER && reciever == SERVER && reciever != owner && ( owner is local || i am owner)
+        else if( (*it)->checkPermission( PERMISSION_SERVER ) && !SharedNetworkData::getInstance()->isClient() &&
+                   userId != this->owner &&
+                   ( SharedNetworkData::getInstance()->isUserLocal( userId) || this->owner ==  SharedNetworkData::getInstance()->getHostID())) {
+          hasPermission = true; b6 = true; }
+#endif
+
 
     // Pemission    ALL accept if:
     else if(  (*it)->checkPermission( PERMISSION_ALL )) {
-      hasPermission = true; b7 = true; }
+      hasPermission = true; b8 = true; }
 
    // no rights to over-write local data
@@ -452 +468 @@
 //         (*it)->checkPermission( PERMISSION_OWNER ), (*it)->checkPermission( PERMISSION_MASTER_SERVER ),
 //         (*it)->checkPermission( PERMISSION_SERVER ), (*it)->checkPermission( PERMISSION_ALL ));
-//         PRINTF(0)("hasPermission: %i, eval: %i, %i, %i, %i, %i, %i, %i\n", hasPermission, b1, b2, b3, b4, b5, b6, b7);
+//         PRINTF(0)("hasPermission: %i, eval: %i, %i, %i, %i, %i, %i, %i, %i\n", hasPermission, b1, b2, b3, b4, b5, b6, b7, b8);
 //         PRINTF(0)("rec %s %s %d\n", this->getClassCName(), (*it)->getName().c_str(), n);
 //       }