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

Timestamp:

Aug 1, 2006, 12:39:03 AM (18 years ago)

Author:

patrick

Message:

some more smaller works:

• fixed a bug preventing clients/proxies to connect to server
• started an implementation of a soft-reconnection
• fixed a bug preventing more than one proxy to connect to a ms

File:

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

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

@@ -390 +390 @@
   this->handleDownstream( tick );
   this->handleUpstream( tick );
+
+  if( this->bSoftRedirect)
+    this->softReconnectToServer(0, IP("localhost", 10001));
 }
 
@@ -481 +484 @@
         userId = 1;
 
+        // find an empty slot within the range
         for( int i = 0; i < NET_ID_PROXY_MAX; i++)
         {
-          if( this->peers.find( i) != this->peers.end())
+          if( this->peers.find( i) == this->peers.end())
+          {
             userId = i;
-          break;
+            break;
+          }
         }
-        userId++;
 
 //         for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )
@@ -832 +837 @@
 /**
  * softly reconnecting to another server
+ * @param serverUserId the id of the client
  * @param address  of the new server
  */
-void NetworkStream::softReconnectToServer(IP address)
-{
-  this->networkMonitor->setForcedReconnection(address);
-  this->handleReconnect( NET_ID_MASTER_SERVER);
+void NetworkStream::softReconnectToServer(int serverUserId, IP address)
+{
+//   this->networkMonitor->setForcedReconnection(address);
+//   this->handleReconnect( NET_ID_MASTER_SERVER);
+
+  // create the new udp socket and open the connection to the soft connection port
+  NetworkSocket* newSocket = new UdpSocket(address.ipString(), 10001);
+
+  // delete the synchronization state of this client for all syncs
+  for ( SynchronizeableList::iterator it2 = synchronizeables.begin(); it2 != synchronizeables.end(); it2++ )  {
+    (*it2)->cleanUpUser( serverUserId );
+  }
+
+  // temp save the old socket
+  NetworkSocket* oldSocket = this->peers[serverUserId].socket;
+
+  // now integrate the new socket
+  this->peers[serverUserId].socket = newSocket;
+
+  return;
+
+  // now remove the old socket
+  oldSocket->disconnectServer();
+  delete oldSocket;
+
+  // replace the old connection monitor
+  if ( this->peers[serverUserId].connectionMonitor )
+    delete this->peers[serverUserId].connectionMonitor;
+  this->peers[serverUserId].connectionMonitor = new ConnectionMonitor(serverUserId);
+
+  // remove old node from the network monitor
+  this->networkMonitor->removeNode(&this->peers[serverUserId]);
+
+  this->bSoftRedirect = false;
 }
 
@@ -859 +895 @@
   this->peers[userId].connectionMonitor = NULL;
 
-
+  // delete the synchronization state of this client for all syncs
   for ( SynchronizeableList::iterator it2 = synchronizeables.begin(); it2 != synchronizeables.end(); it2++ )  {
     (*it2)->cleanUpUser( userId );
@@ -872 +908 @@
   this->peers.erase( userId);
 }
-