Changeset 9487 in orxonox.OLD
- Timestamp:
- Jul 26, 2006, 11:02:25 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/proxy/src/lib/network/synchronizeable.cc
r9483 r9487 227 227 hasPermission = true; 228 228 // SPECIAL: get write permissions if i am proxy server and i am able to overwrite the client stuff 229 else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->owner != userId &&230 (*it)->checkPermission( PERMISSION_OWNER ) && this->networkStream->isUserClient(userId))229 else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserClient(userId) 230 && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ) ) 231 231 hasPermission = true; 232 232 else … … 369 369 hasPermission = true; 370 370 // SPECIAL: get write permissions if im sending to a proxy server that does not own this sync 371 else if( this->networkStream->isUserProxyServerActive( userId ) && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ) && SharedNetworkData::getInstance()->isClient()) 371 else if( this->networkStream->isUserProxyServerActive( userId ) && SharedNetworkData::getInstance()->isClient() 372 && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER )) 372 373 hasPermission = true; 373 374 else … … 391 392 else 392 393 { 393 // PRINTF(0)("DONT SET VAR BECAUSE OF PERMISSION: %s %d %d %d %d %d %d\n", (*it)->getName().c_str(), (*it)->checkPermission( PERMISSION_MASTER_SERVER ), (*it)->checkPermission( PERMISSION_OWNER ), (*it)->checkPermission( PERMISSION_ALL ), networkStream->isUserServer( userId ), this->owner, userId );394 PRINTF(0)("DONT SET VAR BECAUSE OF PERMISSION: %s perm: %d %d %d - %d %d %d\n", (*it)->getName().c_str(), (*it)->checkPermission( PERMISSION_MASTER_SERVER ), (*it)->checkPermission( PERMISSION_OWNER ), (*it)->checkPermission( PERMISSION_ALL ), networkStream->isUserMasterServer( userId ), this->owner, userId ); 394 395 n = (*it)->getSizeFromBuf( stateTo->data + i, stateTo->dataLength - i ); 395 396 //NETPRINTF(0)("%s::setvar %s %d\n", getClassCName(), (*it)->getName().c_str(), n);
Note: See TracChangeset
for help on using the changeset viewer.