Changeset 9605 in orxonox.OLD
- Timestamp:
- Jul 29, 2006, 11:46:07 AM (18 years ago)
- Location:
- branches/proxy/src/lib/network
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/proxy/src/lib/network/network_stream.cc
r9604 r9605 767 767 /** 768 768 * this functions handles a reconnect event received from the a NET_MASTER_SERVER or NET_PROXY_SERVER 769 * @param userId 769 770 */ 770 771 void NetworkStream::handleReconnect(int userId) … … 792 793 // disconnect from the current server and reconnect to proxy server 793 794 this->handleDisconnect( userId); 794 //this->connectToProxyServer(NET_ID_PROXY_SERVER_01, proxyIP.ipString(), 9999);795 this->connectToMasterServer(proxyIP.ipString(), 9999);795 this->connectToProxyServer(NET_ID_PROXY_SERVER_01, proxyIP.ipString(), 9999); 796 // this->connectToMasterServer(proxyIP.ipString(), 9999); 796 797 #warning the ports are not yet integrated correctly in the ip class 797 798 -
branches/proxy/src/lib/network/synchronizeable.cc
r9598 r9605 365 365 366 366 367 368 369 367 // * <====| MASTER_SERVER 370 368 if( this->networkStream->isUserMasterServer( userId ) && (*it)->checkPermission( PERMISSION_MASTER_SERVER )) 371 369 hasPermission = true; 372 else if( this->networkStream->isUserMasterServer( userId ) && this->owner != SharedNetworkData::getInstance()->getHostID()373 && (*it)->checkPermission( PERMISSION_OWNER ))370 else if( this->networkStream->isUserMasterServer( userId ) && 371 this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER )) 374 372 hasPermission = true; 375 373 376 374 // * <====| PROXY_SERVER 377 else if( this->networkStream->isUserProxyServerActive( userId ) && this->owner != SharedNetworkData::getInstance()->getHostID()378 && (*it)->checkPermission( PERMISSION_OWNER ))375 else if( this->networkStream->isUserProxyServerActive( userId ) && 376 this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER )) 379 377 hasPermission = true; 380 378 // CLIENT <====| PROXY_SERVER 381 else if( this->networkStream->isUserProxyServerActive( userId ) && SharedNetworkData::getInstance()->isClient()382 && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))383 hasPermission = true;384 else if( this->networkStream->isUserProxyServerActive( userId ) && SharedNetworkData::getInstance()->isClient()385 && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))386 hasPermission = true;387 379 else if( this->networkStream->isUserProxyServerActive( userId ) && SharedNetworkData::getInstance()->isClient() 388 380 && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
Note: See TracChangeset
for help on using the changeset viewer.