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

Timestamp:

Jan 24, 2006, 10:22:33 PM (18 years ago)

Author:

patrick

Message:

network: sys better now, got less errors and removed the pnode link sync alg, replacing

File:

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

branches/network/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"
@@ -29 +26 @@
 /* include your own header */
 #include "network_manager.h"
+#include "shared_network_data.h"
+#include "network_stream.h"
 
 
@@ -52 +51 @@
   this->syncList = NULL;
   this->defaultSyncStream = NULL;
-
-  this->hostID = -1;
-  this->newUniqueID = MAX_CONNECTIONS + 2;
-  this->bGameServer = false;
+  this->sharedNetworkData = SharedNetworkData::getInstance();
 
   PRINTF(0)("NetworkManager created\n");
@@ -102 +98 @@
 
   this->defaultSyncStream = new NetworkStream(ipAddress);
+  this->sharedNetworkData->setDefaultSyncStream(this->defaultSyncStream);
   this->defaultSyncStream->startHandshake();
   return 1;
@@ -113 +110 @@
 int NetworkManager::createServer(unsigned int port)
 {
-  this->hostID = 0;
-  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");
-  this->bGameServer = true;
   SDL_Delay(20);
   return 1;
-}
-
-
-/**
- *  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->defaultSyncStream = new NetworkStream(address);
-  this->defaultSyncStream->connectSynchronizeable(sync);
-}
-
-
-/**
- *  teardown a connection
- */
-void NetworkManager::shutdownConnection()
-{
-  PRINTF(0)("Shutdown connection\n");
 }
 
@@ -167 +142 @@
 }
 
-/**
- * Sets the hostID to a specific number
- * @param id: The new ID
- */
-void NetworkManager::setHostID(int id)
-{
-    this->hostID = id;
-}
-