Changeset 9341 in orxonox.OLD

Timestamp:

Jul 20, 2006, 11:04:14 AM (18 years ago)

Author:

patrick

Message:

seems like the ip sync doesn't work properly. investigate

Location:

branches/proxy/src/lib/network

Files:

• monitor/network_monitor.cc (modified) (1 diff)
• network_stream.cc (modified) (4 diffs)

branches/proxy/src/lib/network/monitor/network_monitor.cc

@@ -247 +247 @@
   // check if a proxy server has to activated
 
-  this->debug();
+//   this->debug();
 }
 

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

@@ -335 +335 @@
 
     peers[clientId].socket = tempNetworkSocket;
-      // create new handshake and init its variables
+    // create new handshake and init its variables
     peers[clientId].handshake = new Handshake(this->pInfo->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID() );
     peers[clientId].handshake->setUniqueID(clientId);
@@ -345 +345 @@
 
     // get the proxy server informations and write them to the handshake, if any (proxy)
+    assert( this->networkMonitor != NULL);
     PeerInfo* pi = this->networkMonitor->getFirstChoiceProxy();
     if( pi != NULL)
+    {
       peers[clientId].handshake->setProxy1Address( pi->ip);
+      PRINTF(0)("proxy1 ip set to: %s\n", pi->ip.ipString().c_str());
+    }
 
     pi = this->networkMonitor->getSecondChoiceProxy();
@@ -356 +360 @@
     peers[clientId].handshake->setRedirect(this->networkMonitor->isReconnectNextClient());
 
-
+    // the connecting node of course is a client
     peers[clientId].nodeType = NET_CLIENT;
     peers[clientId].ip = peers[clientId].socket->getRemoteAddress();
@@ -496 +500 @@
               // get proxy 1 address and add it
               this->networkMonitor->addNode(it->second.handshake->getProxy1Address(), NET_PROXY_SERVER_ACTIVE);
+              PRINTF(0)("proxy1 ip read to: %s\n", it->second.handshake->getProxy1Address().ipString().c_str());
               // get proxy 2 address and add it
               this->networkMonitor->addNode(it->second.handshake->getProxy2Address(), NET_PROXY_SERVER_ACTIVE);