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

Timestamp:

Jan 25, 2006, 2:39:53 PM (18 years ago)

Author:

patrick

Message:

merged the network branche to the trunk

File:

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

trunk/src/lib/network/network_manager.cc

@@ -20 +20 @@
 #define DEBUG_MODULE_NETWORK
 
-
-#include "network_stream.h"
 #include "class_list.h"
-
 #include "debug.h"
-
+#include "shell_command.h"
 
 /* include your own header */
 #include "network_manager.h"
+#include "shared_network_data.h"
+#include "network_stream.h"
 
 
 /* using namespace std is default, this needs to be here */
 using namespace std;
+
+SHELL_COMMAND(debug, NetworkManager, debug);
 
 
@@ -49 +50 @@
   this->netStreamList = NULL;
   this->syncList = NULL;
-  this->tmpStream = NULL;
-
-  this->hostID = -1;
-  this->bGameServer = false;
+  this->defaultSyncStream = NULL;
+  this->sharedNetworkData = SharedNetworkData::getInstance();
 
   PRINTF(0)("NetworkManager created\n");
@@ -98 +97 @@
   }
 
-  this->tmpStream = new NetworkStream(ipAddress);
+  this->defaultSyncStream = new NetworkStream(ipAddress);
+  this->sharedNetworkData->setDefaultSyncStream(this->defaultSyncStream);
+  this->defaultSyncStream->startHandshake();
   return 1;
 }
@@ -109 +110 @@
 int NetworkManager::createServer(unsigned int port)
 {
-  this->hostID = 0;
-  this->bGameServer = true;
-  this->tmpStream = new NetworkStream(port);
-  this->bGameServer = true;
+  this->sharedNetworkData->setHostID(0);
+  this->sharedNetworkData->setGameServer(true);
+  this->defaultSyncStream = new NetworkStream(port);
+  this->sharedNetworkData->setDefaultSyncStream(this->defaultSyncStream);
+  this->defaultSyncStream->createNetworkGameManager();
+  PRINTF(0)("CREATE SERVER\n");
   SDL_Delay(20);
   return 1;
@@ -118 +121 @@
 
 
-/**
- *  creates a connection from one object to a host
- * @param address: the address of the destination host
- * @param synchronizeable: reference to the sync object
- */
-NetworkStream& NetworkManager::establishConnection(IPaddress& address, Synchronizeable& sync)
-{
-  /* creating a new network stream, it will register itself automaticaly to the class list */
-  this->tmpStream = new NetworkStream(address);
-  this->tmpStream->connectSynchronizeable(sync);
-}
-
-
-/**
- *  teardown a connection
- */
-void NetworkManager::shutdownConnection()
-{
-  PRINTF(0)("Shutdown connection\n");
-}
-
-
 void NetworkManager::connectSynchronizeable(Synchronizeable& sync)
 {
-  this->tmpStream->connectSynchronizeable(sync);
+  if( this->defaultSyncStream)
+    this->defaultSyncStream->connectSynchronizeable(sync);
 }
 
@@ -157 +139 @@
       if( static_cast<NetworkStream*>(*stream)->isActive())
         static_cast<NetworkStream*>(*stream)->processData();
-
   }
-
 }
 
+
+
 /**
- * Sets the hostID to a specific number
- * @param id: The new ID
+ * debug output
  */
-void NetworkManager::setHostID(int id)
+ void NetworkManager::debug()
 {
-    this->hostID = id;
+  PRINT(0)("=================Network::debug()=========\n");
+  this->defaultSyncStream->debug();
+  PRINT(0)("===========================================\n");
 }