Changeset 9545 in orxonox.OLD for branches/proxy

Timestamp:

Jul 28, 2006, 11:12:32 AM (18 years ago)

Author:

patrick

Message:

initializing the default values in a better way to prevent missunderstandings

Location:

branches/proxy/src/lib/network

Files:

• handshake.cc (modified) (1 diff)
• network_stream.cc (modified) (2 diffs)
• peer_info.cc (modified) (1 diff)

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

@@ -71 +71 @@
   remoteState.error = 0;
   remoteState.errorString = "";
-  remoteState.hostId = -1;
+  remoteState.hostId = NET_ID_UNASSIGNED;
   remoteState.networkManagerId = -1;
   remoteState.messageManagerId = -1;

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

@@ -494 +494 @@
   peers[userId].connectionMonitor = new ConnectionMonitor( userId );
   peers[userId].userId = userId;
-  PRINTF(0)("Setting client userId to%i\n", userId);
 
   PRINTF(0)("num sync: %d\n", synchronizeables.size());
@@ -585 +584 @@
             // - client       <==> master server
             // - proxy server <==> master server
-            if(  SharedNetworkData::getInstance()->isClient() || SharedNetworkData::getInstance()->isProxyServerActive() && it->second.isMasterServer())
+            if(  SharedNetworkData::getInstance()->isClient() ||
+                 SharedNetworkData::getInstance()->isProxyServerActive() &&
+                 SharedNetworkData::getInstance()->isUserMasterServer(it->second.userId))
             {
               PRINTF(0)("Handshake: i am in client role\n");

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

@@ -42 +42 @@
 void PeerInfo::clear()
 {
-  this->userId = 0;
-  this->nodeType = NET_CLIENT;
+  this->userId = NET_ID_UNASSIGNED;
+  this->nodeType = NET_UNASSIGNED;
   this->socket = NULL;
   this->handshake = NULL;