Changeset 9600 in orxonox.OLD

Timestamp:

Jul 29, 2006, 9:59:20 AM (18 years ago)

Author:

patrick

Message:

reconnection command deep structure

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -179 +179 @@
 
 /**
+ * reconnects this client to another server
+ * @param address new server address
+ */
+void NetworkManager::reconnectToServer(IP address)
+{
+  PRINTF(0)("Rec. reconnection command\n");
+  this->networkStream->reconnectToServer(address);
+}
+
+
+/**
  * connects a synchronizeable to the network stream
  * @param sync: synchronizeable to connect

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

@@ -39 +39 @@
     int createProxyServer( unsigned int port);
 
+    void reconnectToServer(IP address);
+
     void connectSynchronizeable(Synchronizeable& sync);
     void synchronize(float dtS);

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

@@ -741 +741 @@
 
 
+
+/**
+ * reconnects to another server, with full handshake
+ * @param address of the new server
+ */
+void NetworkStream::reconnectToServer(IP address)
+{
+
+}
+
+
+
+/**
+ * softly reconnecting to another server
+ * @param address  of the new server
+ */
+void NetworkStream::softReconnectToServer(IP address)
+{
+
+}
+
+
 /**
  * handles the disconnect event

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

@@ -41 +41 @@
     void init();
 
+    /* network interface controls */
     void connectToMasterServer(std::string host, int port);
     void connectToProxyServer(int proxyId, std::string host, int port);
@@ -47 +48 @@
     void createNetworkGameManager();
     void startHandshake(int userId = NET_ID_MASTER_SERVER);
+
+    void reconnectToServer(IP address);
+    void softReconnectToServer(IP address);
+
 
     /* synchronizeable interface */

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

@@ -16 +16 @@
 
 #include "class_list.h"
-
+#include "shell_command.h"
 
 #include "state.h"
 #include "shared_network_data.h"
+#include "network_manager.h"
 #include "network_game_manager.h"
 #include "ip.h"
@@ -35 +36 @@
 ProxyControl* ProxyControl::singletonRef = NULL;
 
+
+SHELL_COMMAND(forceReconnect, ProxyControl, forceReconnectionShell);
 
 /**
@@ -227 +230 @@
 
 
+/**
+ * a shell command wrapper
+ * @param userId the userId of the client/user :D
+ * @param serverId the userId of the server to connect to
+ */
+void ProxyControl::forceReconnectionShell(int userId, int serverId)
+{
+  this->forceReconnection(userId, serverId);
+}
+
 
 /**
@@ -332 +345 @@
 
       // handle it
-      if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+      if( SharedNetworkData::getInstance()->getHostID() == userId &&
+         (SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive()))
       {
+        NetworkManager::getInstance()->reconnectToServer(IP(ipHost, 9999));
       }
       break;

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

@@ -43 +43 @@
 
     /* proxy server network control */
+    void forceReconnectionShell(int userId, int serverId);
     void forceReconnection(int userId, int serverId);
     void forceReconnection(int userId, IP newAddress);