Changeset 9654 in orxonox.OLD

Timestamp:

Aug 1, 2006, 1:05:56 AM (18 years ago)

Author:

patrick

Message:

some connection movement work

Location:

branches/proxy/src/lib/network

Files:

• network_manager.cc (modified) (1 diff)
• network_stream.cc (modified) (2 diffs)
• network_stream.h (modified) (1 diff)
• proxy/proxy_control.cc (modified) (5 diffs)
• proxy/proxy_control.h (modified) (1 diff)

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

@@ -240 +240 @@
   this->networkStream->setRedirectionTest();
 }
+

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

@@ -859 +859 @@
   this->peers[serverUserId].socket = newSocket;
 
+  this->bSoftRedirect = false;
   return;
 
@@ -873 +874 @@
   this->networkMonitor->removeNode(&this->peers[serverUserId]);
 
-  this->bSoftRedirect = false;
-}
+}
+
+
+
+/**
+ * prepares a soft connection for a client to connect to
+ * @param userId that will connect to this server
+ */
+void NetworkStream::prepareSoftConnection(int userId)
+{
+  PRINTF(0)("prepare soft connection for userId %i\n");
+}
+
 
 

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

@@ -51 +51 @@
     void reconnectToServer(IP address);
     void softReconnectToServer(int serverUserId, IP address);
+    void prepareSoftConnection(int userId);
 
 

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

@@ -24 +24 @@
 #include "ip.h"
 #include "peer_info.h"
+#include "network_stream.h"
 
 #include "converter.h"
@@ -278 +279 @@
 
 
-  this->forceReconnection(userId, serverInfo->ip);
+  this->forceReconnection(userId, serverId, serverInfo->ip);
 }
 
@@ -287 +288 @@
  * @param newAddress the addresss the client should connect to
  */
-void ProxyControl::forceReconnection(int userId, IP newAddress)
+void ProxyControl::forceReconnection(int userId, int serverId, IP newAddress)
 {
   PRINTF(0)("forcing reconnection: userId %i to %s\n", userId, newAddress.ipString().c_str());
@@ -321 +322 @@
 
   PRINTF(0)("Sending reconnection command to: %i\n", userId);
+  // send the reconnection signal to the client who must reconnect
   MessageManager::getInstance()->sendMessage( MSGID_PROXY_COMMAND, data, 3*INTSIZE, RT_USER, userId, MP_HIGHBANDWIDTH );
+  // and to the server who needs to accept the new client
+  MessageManager::getInstance()->sendMessage( MSGID_PROXY_COMMAND, data, 3*INTSIZE, RT_USER, serverId, MP_HIGHBANDWIDTH );
 }
 
@@ -366 +370 @@
       if( SharedNetworkData::getInstance()->getHostID() == userId)
       {
-        NetworkManager::getInstance()->reconnectToServer(IP(ipHost, 9999));
+        if( SharedNetworkData::getInstance()->isClient())
+          SharedNetworkData::getInstance()->getDefaultSyncStream()->softReconnectToServer(userId, IP(ipHost, 9999));
+        else
+          SharedNetworkData::getInstance()->getDefaultSyncStream()->prepareSoftConnection(userId);
       }
       break;

branches/proxy/src/lib/network/proxy/proxy_control.h

@@ -49 +49 @@
     void forceReconnectionShell(int userId, int serverId);
     void forceReconnection(int userId, int serverId);
-    void forceReconnection(int userId, IP newAddress);
+    void forceReconnection(int userId, int serverId, IP newAddress);
     void forceReconnection(int userId, const std::string& newAddress);
     static bool messageHandlerCommand( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId  );