Changeset 9308 in orxonox.OLD for branches/proxy/src/lib/network/network_stream.cc

Timestamp:

Jul 17, 2006, 5:47:32 PM (18 years ago)

Author:

patrick

Message:

proxy server ip synchronizeing bug, nodes get registered

File:

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

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

@@ -81 +81 @@
   this->peers[0].nodeType = NET_MASTER_SERVER;
   this->peers[0].connectionMonitor = new ConnectionMonitor( 0 );
-  this->peers[0].ip = this->peers[0].socket->getDestAddress();
+  this->peers[0].ip = this->peers[0].socket->getRemoteAddress();
   // and set also the localhost
   this->pInfo->nodeType = NET_CLIENT;
   // get the local ip address
-  SDLNet_ResolveHost( &this->pInfo->ip, "localhost", port );
-
+  SDLNet_ResolveHost( &this->pInfo->ip, NULL, port );
 }
 
@@ -100 +99 @@
   this->pInfo->nodeType = NET_MASTER_SERVER;
   // get the local ip address
-  SDLNet_ResolveHost( &this->pInfo->ip, "localhost", port );
+  SDLNet_ResolveHost( &this->pInfo->ip, NULL, port );
 }
 
@@ -204 +203 @@
   hs->setPreferedNickName( Preferences::getInstance()->getString( "multiplayer", "nickname", "Player" ) );
 
-//   peers[0].handshake->setSynchronized( true );
-  //this->connectSynchronizeable(*hs);
-  //this->connectSynchronizeable(*hs);
   PRINTF(0)("NetworkStream: Handshake created: %s\n", hs->getName());
 }
@@ -305 +301 @@
 
 /**
- * if we are a server update the connection list to accept new connections (clients)
- * also start the handsake for the new clients
+ * if we are a NET_MASTER_SERVER or NET_PROXY_SERVER_ACTIVE update the connection list to accept new
+ * connections (clients) also start the handsake for the new clients
  */
 void NetworkStream::updateConnectionList( )
@@ -326 +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)
@@ -501 +498 @@
 
               it->second.nodeType = it->second.handshake->getRemoteNodeType();
-              it->second.ip = it->second.socket->getDestAddress();
+              it->second.ip = it->second.socket->getRemoteAddress();
               this->networkMonitor->addNode(&it->second);
 
               // get proxy 1 address and add it
-              this->networkMonitor->addNode(it->second.handshake->getProxy1Address());
+              this->networkMonitor->addNode(it->second.handshake->getProxy1Address(), NET_PROXY_SERVER_ACTIVE);
               // get proxy 2 address and add it
-              this->networkMonitor->addNode(it->second.handshake->getProxy2Address());
+              this->networkMonitor->addNode(it->second.handshake->getProxy2Address(), NET_PROXY_SERVER_ACTIVE);
 
 
@@ -520 +517 @@
                 // disconnect from the current server and reconnect to proxy server
 //                 it->second.socket->disconnectServer();
-
               }
 
@@ -537 +533 @@
           else
           {
-            // handsheke finished registring new player
+            // handshake finished registring new player
             if ( it->second.handshake->canDel() )
             {
@@ -543 +539 @@
               {
                 it->second.nodeType = it->second.handshake->getRemoteNodeType();
+                it->second.ip = it->second.socket->getRemoteAddress();
+
                 this->networkMonitor->addNode(&it->second);