Changeset 9656 in orxonox.OLD for trunk/src/lib/network/network_manager.cc

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

• trunk/src/lib/network/network_manager.cc (modified) (6 diffs)

trunk/src/lib/network/network_manager.cc

@@ -31 +31 @@
 #include "network_log.h"
 #include "network_game_manager.h"
+#include "proxy/proxy_control.h"
 
 
@@ -37 +38 @@
 
 SHELL_COMMAND(debug, NetworkManager, debug);
+SHELL_COMMAND(redirTest, NetworkManager, setRedirectionTest);
+
 
 
@@ -111 +114 @@
   // create the network stream
   this->networkStream = new NetworkStream(NET_MASTER_SERVER);
-  this->networkStream->createServer( port, port + 1);
+  this->networkStream->createServer( port, port + 1, port + 2);
 
   // start the network game manager
   this->networkStream->createNetworkGameManager();
+
+  // init the proxy control center
+  ProxyControl::getInstance();
 
   PRINTF(0)("Created Network Master Server\n");
@@ -138 +144 @@
 
   // then start the server
-  this->networkStream->createServer( port, port +1);
-
+  this->networkStream->createServer( port, port + 1, port + 2);
 
   // and to the other proxy servers also, this would be very nice if its works
-
-
-  // start the network game manager
-  //this->networkStream->createNetworkGameManager();
-
+  /* put it here....*/
+
+  // init the proxy control center
+  ProxyControl::getInstance();
 
   PRINTF(0)("Created Network Proxy Server\n");
@@ -168 +172 @@
   this->networkStream->connectToMasterServer( name, port);
 
+
   // and start the handshake
   this->networkStream->startHandshake();
+  // create the proxy control
+  ProxyControl::getInstance();
 
   PRINTF(0)("Created Network Client\n");
   return 1;
+}
+
+
+/**
+ * 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);
 }
 
@@ -216 +234 @@
   PRINT(0)("===========================================\n");
 }
+
+
+void NetworkManager::setRedirectionTest()
+{
+  this->networkStream->setRedirectionTest();
+}
+