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

Timestamp:

Jul 19, 2006, 10:29:14 PM (19 years ago)

Author:

patrick

Message:

work of the day in one commit:D

• switched whole network framework to ip sturcture
• extended ip structrue a little bit
• reimplemented the disconnection/reconnection algorithm
• synchronizeable ip bug discovered and solved

File:

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

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

@@ -28 +28 @@
 #include "monitor/network_monitor.h"
 #include "synchronizeable.h"
+#include "ip.h"
 #include "network_game_manager.h"
 #include "shared_network_data.h"
@@ -85 +86 @@
   this->pInfo->nodeType = NET_CLIENT;
   // get the local ip address
-  SDLNet_ResolveHost( &this->pInfo->ip, NULL, port );
+  IPaddress ip;
+  SDLNet_ResolveHost( &ip, NULL, port );
+  this->pInfo->ip = ip;
 }
 
@@ -99 +102 @@
   this->pInfo->nodeType = NET_MASTER_SERVER;
   // get the local ip address
-  SDLNet_ResolveHost( &this->pInfo->ip, NULL, port );
+  IPaddress ip;
+  SDLNet_ResolveHost( &ip, NULL, port );
+  this->pInfo->ip = ip;
 }
 
@@ -356 +361 @@
 
     // check if the connecting client should reconnect to a proxy server
-    peers[clientId].handshake->setRedirect(this->networkMonitor->reconnectNextClient());
+    peers[clientId].handshake->setRedirect(this->networkMonitor->isReconnectNextClient());
 
 
@@ -364 +369 @@
 
     // check if there are too many clients connected (DEPRECATED: new: the masterserver sends a list of proxy servers)
-    if ( clientId > SharedNetworkData::getInstance()->getMaxPlayer() )
-    {
-//       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);
-    }
-    else
-    {
-      PRINTF(0)("New Client: %d\n", clientId);
-    }
-
-    //this->connectSynchronizeable(*handshakes[clientId]);
+//     if ( clientId > SharedNetworkData::getInstance()->getMaxPlayer() )
+//     {
+// //       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);
+//     }
+//     else
+//     {
+//       PRINTF(0)("New Client: %d\n", clientId);
+//     }
+    PRINTF(0)("New Client: %d\n", clientId);
+
+
   }
 
@@ -493 +499 @@
               it->second.nodeType = it->second.handshake->getRemoteNodeType();
               it->second.ip = it->second.socket->getRemoteAddress();
+              // add the new server to the nodes list (it can be a NET_MASTER_SERVER or NET_PROXY_SERVER)
               this->networkMonitor->addNode(&it->second);
-
               // get proxy 1 address and add it
               this->networkMonitor->addNode(it->second.handshake->getProxy1Address(), NET_PROXY_SERVER_ACTIVE);
@@ -500 +506 @@
               this->networkMonitor->addNode(it->second.handshake->getProxy2Address(), NET_PROXY_SERVER_ACTIVE);
 
-
-              // now check if there server accepted the connection
+              // now check if the 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();
-              }
+                this->handleReconnect( it->second.userId);
 
               // create the new network game manager and init it
@@ -537 +534 @@
                 this->networkMonitor->addNode(&it->second);
 
-                handleNewClient( it->second.userId );
+                this->handleNewClient( it->second.userId );
 
                 if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
@@ -560 +557 @@
     }
   }
+}
+
+
+/**
+ * this functions handles a reconnect event received from the a NET_MASTER_SERVER or NET_PROXY_SERVER
+ */
+void NetworkStream::handleReconnect(int userId)
+{
+  PRINTF(0)("===============================================\n");
+  PRINTF(0)("Client is redirected to the other proxy servers\n");
+  PRINTF(0)("===============================================\n");
+
+  PeerInfo* pInfo = &this->peers[userId];
+
+  // reject the server
+  pInfo->handshake->doReject( "redirected to different server");
+
+  // flush the old synchronization states, since the numbering could be completely different
+  pInfo->lastAckedState = 0;
+  pInfo->lastRecvedState = 0;
+  // not sure if this works as expected
+  if( pInfo->handshake)
+    delete pInfo->handshake;
+
+  // disconnect from the current server and reconnect to proxy server
+  pInfo->socket->reconnectToServer( pInfo->handshake->getProxy1Address().ipString(), pInfo->handshake->getProxy1Address().port());
+
+  // and restart the handshake
+  this->startHandshake();
 }