Changeset 9309 in orxonox.OLD

Timestamp:

Jul 18, 2006, 12:57:07 AM (18 years ago)

Author:

patrick

Message:

client ip bug

File:

• branches/proxy/src/lib/network/network_stream.cc (modified) (2 diffs)

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

@@ -322 +322 @@
       peers[clientId].handshake = new Handshake(this->pInfo->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID() );
       peers[clientId].handshake->setUniqueID(clientId);
-      peers[clientId].ip = tempNetworkSocket->getRemoteAddress();
-
-      // get the proxy server informations and write them to the handshake, if any (proxy)
-      PeerInfo* pi = this->networkMonitor->getFirstChoiceProxy();
-      if( pi != NULL)
-        peers[clientId].handshake->setProxy1Address( pi->ip);
-      pi = this->networkMonitor->getSecondChoiceProxy();
-      if( pi != NULL)
-        peers[clientId].handshake->setProxy2Address( pi->ip);
-
-       // check if the connecting client should reconnect to a proxy server
-      peers[clientId].handshake->setRedirect(this->networkMonitor->reconnectNextClient());
 
       peers[clientId].connectionMonitor = new ConnectionMonitor( clientId );
       peers[clientId].userId = clientId;
-      peers[clientId].nodeType = NET_CLIENT;
     }
     else
@@ -351 +338 @@
       peers[clientId].handshake = new Handshake(this->pInfo->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID());
       peers[clientId].handshake->setUniqueID(clientId);
-      // get the proxy server informations and write them to the handshake, if any (proxy)
-      PeerInfo* pi = this->networkMonitor->getFirstChoiceProxy();
-      if( pi != NULL)
-        peers[clientId].handshake->setProxy1Address( pi->ip);
-      pi = this->networkMonitor->getSecondChoiceProxy();
-      if( pi != NULL)
-        peers[clientId].handshake->setProxy2Address( pi->ip);
-
-       // check if the connecting client should reconnect to a proxy server
-      peers[clientId].handshake->setRedirect(this->networkMonitor->reconnectNextClient());
 
       peers[clientId].connectionMonitor = new ConnectionMonitor( clientId );
       peers[clientId].userId = clientId;
-      peers[clientId].nodeType = NET_CLIENT;
 
       PRINTF(0)("num sync: %d\n", synchronizeables.size());
     }
+
+
+    // get the proxy server informations and write them to the handshake, if any (proxy)
+    PeerInfo* pi = this->networkMonitor->getFirstChoiceProxy();
+    if( pi != NULL)
+      peers[clientId].handshake->setProxy1Address( pi->ip);
+
+    pi = this->networkMonitor->getSecondChoiceProxy();
+    if( pi != NULL)
+      peers[clientId].handshake->setProxy2Address( pi->ip);
+
+    // check if the connecting client should reconnect to a proxy server
+    peers[clientId].handshake->setRedirect(this->networkMonitor->reconnectNextClient());
+
+
+    peers[clientId].nodeType = NET_CLIENT;
+    peers[clientId].ip = peers[clientId].socket->getRemoteAddress();
+
 
     // check if there are too many clients connected (DEPRECATED: new: the masterserver sends a list of proxy servers)