Changeset 9396 in orxonox.OLD for branches/proxy/src/lib/network/network_manager.cc

Timestamp:

Jul 23, 2006, 10:07:23 PM (18 years ago)

Author:

patrick

Message:

committing my weekends work: 2100 lines

• proxy server now accepts and synchronizes clients like a master server
• network manager got different network setup interface
• network stream got different constructure scheme
• permissions checking and algorithm extended and changed
• starting ability to connect to multiple network nodes at the same time
• some very much smaller changes here and there

File:

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

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

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: Patrick Boenzli
-   co-programmer: ...
+   main-programmer: Patrick Boenzli (patrick@orxonox.ethz.ch)
+   co-programmer: Christoph Renner (rennerc@ee.ethz.ch)
 */
 
@@ -98 +98 @@
 
 
+
+/**
+ *  creates a new NetworkStream of server type
+ * @param port: number of the TCP port
+ */
+int NetworkManager::createMasterServer(unsigned int port)
+{
+  // init the proxy settings data do this before everything else is done here
+  NetworkSettings::getInstance()->loadData();
+
+  // create the network stream
+  this->networkStream = new NetworkStream(NET_MASTER_SERVER);
+  this->networkStream->createServer( port);
+
+  // start the network game manager
+  this->networkStream->createNetworkGameManager();
+
+  PRINTF(0)("Created Network Master Server\n");
+  SDL_Delay(20);
+  return 1;
+}
+
+/**
+ *  creates a new network stream of proxy server type
+ * @param port: number of the TCP port
+ */
+int NetworkManager::createProxyServer(unsigned int port)
+{
+  // init the proxy settings data do this before everything else is done here
+  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
+
+
+
+  // start the network game manager
+  this->networkStream->createNetworkGameManager();
+
+
+  PRINTF(0)("Created Network Proxy Server\n");
+  SDL_Delay(20);
+  return 1;
+}
+
+
 /**
  *  creates a connection from one object to a host
  * @param hostName: the name of the destination host
  */
-int NetworkManager::establishConnection(const std::string & name, unsigned int port)
-{
-  this->networkStream = new NetworkStream( name, port );
-  SharedNetworkData::getInstance()->setDefaultSyncStream(this->networkStream);
+int NetworkManager::createClient(const std::string & name, unsigned int port)
+{
+  // create the network stream
+  this->networkStream = new NetworkStream(NET_CLIENT);
+  // connect to the master server, if a redirection should occure, this is handled in the NetworkStream itself
+  this->networkStream->connectToMasterServer( name, port);
+
+  // and start the handshake
   this->networkStream->startHandshake();
+
+  PRINTF(0)("Created Network Client");
   return 1;
 }
@@ -112 +168 @@
 
 /**
- *  creates a new NetworkStream of server type
- * @param port: number of the TCP port
- */
-int NetworkManager::createServer(unsigned int port)
-{
-  SharedNetworkData::getInstance()->setHostID(0);
-  SharedNetworkData::getInstance()->setNodeType(NET_MASTER_SERVER);
-  this->networkStream = new NetworkStream(port);
-  SharedNetworkData::getInstance()->setDefaultSyncStream(this->networkStream);
-  this->networkStream->createNetworkGameManager();
-  PRINTF(0)("CREATE SERVER\n");
-  SDL_Delay(20);
-  return 1;
-}
-
-
+ * connects a synchronizeable to the network stream
+ * @param sync: synchronizeable to connect
+ */
 void NetworkManager::connectSynchronizeable(Synchronizeable& sync)
 {
@@ -144 +187 @@
   if( likely(this->elapsedTime < 1.0f / NETWORK_FREQUENCY))
     return;
+
   this->elapsedTime = 0.0f;
 
-  if ( networkStream )
+  if ( this->networkStream )
     networkStream->processData();