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

Timestamp:

Jul 17, 2006, 10:15:33 AM (18 years ago)

Author:

patrick

Message:

work from this weekend in the train

• the ip should now synchronize over network in the handshake (always the favorite 2 proxy server ips)
• the network monitor now keeps track of all network nodes answers with proxy server lists if asked/needed
• it is untested

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();
   // and set also the localhost
   this->pInfo->nodeType = NET_CLIENT;
+  // get the local ip address
+  SDLNet_ResolveHost( &this->pInfo->ip, "localhost", port );
+
 }
 
@@ -95 +99 @@
   this->serverSocket = new UdpServerSocket(port);
   this->pInfo->nodeType = NET_MASTER_SERVER;
+  // get the local ip address
+  SDLNet_ResolveHost( &this->pInfo->ip, "localhost", port );
 }
 
@@ -164 +170 @@
   if( this->pInfo)
     delete this->pInfo;
+
+  if( this->networkMonitor)
+    delete this->networkMonitor;
 }
 
@@ -182 +191 @@
 /**
  * starts the network handshake
+ * handsakes are always initialized from the client side first. this starts the handshake and therefore is only
+ * executed as client
  */
 void NetworkStream::startHandshake()
@@ -190 +201 @@
   peers[0].handshake = hs;
 
+  // set the preferred nick name
   hs->setPreferedNickName( Preferences::getInstance()->getString( "multiplayer", "nickname", "Player" ) );
-  //hs->set
 
 //   peers[0].handshake->setSynchronized( true );
@@ -314 +325 @@
       peers[clientId].socket = tempNetworkSocket;
       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].handshake->setUniqueID(clientId);
       peers[clientId].userId = clientId;
       peers[clientId].nodeType = NET_CLIENT;
@@ -328 +351 @@
 
       peers[clientId].socket = tempNetworkSocket;
+      // handshake handling
       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;
@@ -337 +372 @@
     }
 
-    // check if there are too many clients connected
+    // check if there are too many clients connected (DEPRECATED: new: the masterserver sends a list of proxy servers)
     if ( clientId > NET_MAX_CONNECTIONS )
     {
-      peers[clientId].handshake->doReject( "too many connections" );
+//       peers[clientId].handshake->setRedirect(true);
+//
+//       peers[clientId].handshake->doReject( "too many connections" );
       PRINTF(0)("Will reject client %d because there are to many connections!\n", clientId);
     }
@@ -467 +504 @@
               this->networkMonitor->addNode(&it->second);
 
+              // get proxy 1 address and add it
+              this->networkMonitor->addNode(it->second.handshake->getProxy1Address());
+              // get proxy 2 address and add it
+              this->networkMonitor->addNode(it->second.handshake->getProxy2Address());
+
+
+              // now check if there server accepted the connection
+              if( it->second.handshake->redirect())
+              {
+                // handle the redirection
+                PRINTF(0)("===============================================\n");
+                PRINTF(0)("Client is redirected to the other proxy servers\n");
+                PRINTF(0)("===============================================\n");
+
+                // disconnect from the current server and reconnect to proxy server
+//                 it->second.socket->disconnectServer();
+
+              }
+
+              // create the new network game manager and init it
               this->networkGameManager = NetworkGameManager::getInstance();
               this->networkGameManager->setUniqueID( it->second.handshake->getNetworkGameManagerId() );
+              // init the new message manager
               MessageManager::getInstance()->setUniqueID( it->second.handshake->getMessageManagerId() );
             }