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

Timestamp:

Jul 27, 2006, 10:44:28 AM (19 years ago)

Author:

bensch

Message:

merged the proxy back

File:

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

trunk/src/lib/network/network_manager.cc

@@ -101 +101 @@
 /**
  *  creates a new NetworkStream of server type
- * @param port: number of the TCP port
+ * @param clientPort: number of the TCP/UDP port for client connections
+ * @param proxyPort: number of the TCP/UDP port for proxy connections
  */
 int NetworkManager::createMasterServer(unsigned int port)
@@ -110 +111 @@
   // create the network stream
   this->networkStream = new NetworkStream(NET_MASTER_SERVER);
-  this->networkStream->createServer( port);
+  this->networkStream->createServer( port, port + 1);
 
   // start the network game manager
@@ -129 +130 @@
   NetworkSettings::getInstance()->loadData();
 
-  // create the network stream
-  this->networkStream = new NetworkStream(NET_PROXY_SERVER_ACTIVE);
-  this->networkStream->createServer( port);
-  // and connect to the master server for synchronization
-//   this->networkStream->connectToMasterServer(NetworkSettings::getInstance()->getMasterAddr());
-  // and to the other proxy servers
-
+  // create the network stream af
+  this->networkStream = new NetworkStream(NET_PROXY_SERVER_ACTIVE );
+  // first connect to the master server for synchronization
+  this->networkStream->connectToMasterServer(NetworkSettings::getInstance()->getMasterAddr().ipString(), 10000);
+  // start the handshake with the master server
+  this->networkStream->startHandshake(NET_ID_MASTER_SERVER);
+
+  // then start the server
+  this->networkStream->createServer( port, port +1);
+
+
+  // and to the other proxy servers also, this would be very nice if its works
 
 
   // start the network game manager
-  this->networkStream->createNetworkGameManager();
+  //this->networkStream->createNetworkGameManager();
 
 
@@ -165 +171 @@
   this->networkStream->startHandshake();
 
-  PRINTF(0)("Created Network Client");
+  PRINTF(0)("Created Network Client\n");
   return 1;
 }