Changeset 9545 in orxonox.OLD
- Timestamp:
- Jul 28, 2006, 11:12:32 AM (18 years ago)
- Location:
- branches/proxy/src/lib/network
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/proxy/src/lib/network/handshake.cc
r9494 r9545 71 71 remoteState.error = 0; 72 72 remoteState.errorString = ""; 73 remoteState.hostId = -1;73 remoteState.hostId = NET_ID_UNASSIGNED; 74 74 remoteState.networkManagerId = -1; 75 75 remoteState.messageManagerId = -1; -
branches/proxy/src/lib/network/network_stream.cc
r9544 r9545 494 494 peers[userId].connectionMonitor = new ConnectionMonitor( userId ); 495 495 peers[userId].userId = userId; 496 PRINTF(0)("Setting client userId to%i\n", userId);497 496 498 497 PRINTF(0)("num sync: %d\n", synchronizeables.size()); … … 585 584 // - client <==> master server 586 585 // - proxy server <==> master server 587 if( SharedNetworkData::getInstance()->isClient() || SharedNetworkData::getInstance()->isProxyServerActive() && it->second.isMasterServer()) 586 if( SharedNetworkData::getInstance()->isClient() || 587 SharedNetworkData::getInstance()->isProxyServerActive() && 588 SharedNetworkData::getInstance()->isUserMasterServer(it->second.userId)) 588 589 { 589 590 PRINTF(0)("Handshake: i am in client role\n"); -
branches/proxy/src/lib/network/peer_info.cc
r9494 r9545 42 42 void PeerInfo::clear() 43 43 { 44 this->userId = 0;45 this->nodeType = NET_ CLIENT;44 this->userId = NET_ID_UNASSIGNED; 45 this->nodeType = NET_UNASSIGNED; 46 46 this->socket = NULL; 47 47 this->handshake = NULL;
Note: See TracChangeset
for help on using the changeset viewer.