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

Timestamp:

Dec 30, 2005, 1:52:26 AM (18 years ago)

Author:

bensch

Message:

orxonox/branches/newtork: merged the network branche for merging to the trunk
confilcts maily resolved in favor of trunk with some minor fixes

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6146:HEAD

File:

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

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

@@ -44 +44 @@
   /* set the class id for the base object */
   this->setClassID(CL_NETWORK_MANAGER, "NetworkManager");
+  PRINTF(0)("START\n");
 
   /* initialize the references */
@@ -49 +50 @@
   this->syncList = NULL;
   this->tmpStream = NULL;
+
   this->hostID = -1;
   this->bGameServer = false;
@@ -107 +109 @@
 int NetworkManager::createServer(unsigned int port)
 {
+  this->hostID = 0;
+  this->bGameServer = true;
   this->tmpStream = new NetworkStream(port);
   this->bGameServer = true;
@@ -124 +128 @@
   this->tmpStream = new NetworkStream(address);
   this->tmpStream->connectSynchronizeable(sync);
-}
-
-
-/**
- *  creates a new NetworkStream of server type
- * @param sync: the listener
- */
-NetworkStream& NetworkManager::createServer(Synchronizeable& sync, unsigned int port)
-{
-  PRINTF(0)("Create a new server socket\n");
-  /* creating a new network stream, it will register itself automaticaly to the class list */
-  this->tmpStream = new NetworkStream(port);
-  this->tmpStream->connectSynchronizeable(sync);
-  this->bGameServer = true;
 }
 
@@ -178 +168 @@
 void NetworkManager::setHostID(int id)
 {
-  this->hostID = id;
+    this->hostID = id;
 }