Changeset 9635 in orxonox.OLD

Timestamp:

Jul 31, 2006, 2:00:23 AM (18 years ago)

Author:

patrick

Message:

the other SERVER doesn't check anymore if the variable was sent correctly

File:

• branches/proxy/src/lib/network/synchronizeable.cc (modified) (1 diff)

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) &&
-               SharedNetworkData::getInstance()->isClient()) {
+    else if( (*it)->checkPermission( PERMISSION_SERVER ) && !SharedNetworkData::getInstance()->isUserClient( userId) /*&&
+               SharedNetworkData::getInstance()->isClient()*/) {
       hasPermission = true; b6 = true; }
     // sender == SERVER && i am SERVER && user is not local
-    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; }
+//     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; }