Changeset 6695 in orxonox.OLD for trunk/src/lib/network/network_stream.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_stream.cc (modified) (10 diffs)

trunk/src/lib/network/network_stream.cc

@@ -53 +53 @@
 }
 
+
 NetworkStream::NetworkStream(IPaddress& address)
 {
@@ -60 +61 @@
   this->networkProtocol = new NetworkProtocol();
   this->connectionMonitor = new ConnectionMonitor();
-
-  Handshake* hs = new Handshake(false);
-  hs->setUniqueID( 0 );
-  this->handshakes.push_back(hs);
-  this->connectSynchronizeable(*hs);
-  PRINTF(0)("NetworkStream: %s\n", hs->getName());
   this->maxConnections = 1;
 }
@@ -81 +76 @@
   this->handshakes.push_back( NULL );
   this->bActive = true;
-  this->networkGameManager = NetworkGameManager::getInstance();
-  // setUniqueID( maxCon+2 ) because we need one id for every handshake
-  // and one for handshake to reject client maxCon+1
-  this->networkGameManager->setUniqueID( this->maxConnections+2 );
-  this->connectSynchronizeable( *(this->networkGameManager) );
-
-  this->setMaxConnections( 10 );
 }
 
@@ -132 +120 @@
 
 
+void NetworkStream::createNetworkGameManager()
+{
+  this->networkGameManager = NetworkGameManager::getInstance();
+  // setUniqueID( maxCon+2 ) because we need one id for every handshake
+  // and one for handshake to reject client maxCon+1
+  this->networkGameManager->setUniqueID( this->maxConnections + 2 );
+  //this->connectSynchronizeable( *(this->networkGameManager) );
+  this->setMaxConnections( 10 );
+}
+
+
+void NetworkStream::startHandshake()
+{
+  Handshake* hs = new Handshake(false);
+  hs->setUniqueID( 0 );
+  this->handshakes.push_back(hs);
+  //this->connectSynchronizeable(*hs);
+  PRINTF(0)("NetworkStream: %s\n", hs->getName());
+}
+
+
 void NetworkStream::connectSynchronizeable(Synchronizeable& sync)
 {
@@ -140 +149 @@
     this->bActive = true;
 }
+
 
 void NetworkStream::disconnectSynchronizeable(Synchronizeable& sync)
@@ -184 +194 @@
           if ( type != NET_SERVER )
           {
-            NetworkManager::getInstance()->setHostID( handshakes[i]->getHostId() );
+            SharedNetworkData::getInstance()->setHostID( handshakes[i]->getHostId() );
             myHostId = NetworkManager::getInstance()->getHostID();
 
             this->networkGameManager = NetworkGameManager::getInstance();
             this->networkGameManager->setUniqueID( handshakes[i]->getNetworkGameManagerId() );
-            this->connectSynchronizeable( *(this->networkGameManager) );
+            //this->connectSynchronizeable( *(this->networkGameManager) );
           }
           else
@@ -216 +226 @@
   /* DOWNSTREAM */
 
+
+
   int dataLength;
   int reciever;
@@ -221 +233 @@
   for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
   {
-    if ( (*it)!=NULL /*&& (*it)->getOwner() == myHostId*/ )
+    if ( (*it)!=NULL && (*it)->beSynchronized() /*&& (*it)->getOwner() == myHostId*/ )
     {
       do {
@@ -357 +369 @@
     PRINTF(0)("New Client: %d\n", clientId);
 
-    this->connectSynchronizeable(*handshakes[clientId]);
+    //this->connectSynchronizeable(*handshakes[clientId]);
   }
 
@@ -416 +428 @@
 
 
+
+void NetworkStream::debug()
+{
+  if( this->isServer())
+    PRINT(0)(" Host ist Server with ID: %i\n", this->myHostId);
+  else
+    PRINT(0)(" Host ist Client with ID: %i\n", this->myHostId);
+
+  PRINT(0)(" Got %i connected Synchronizeables, showing active Syncs:\n", this->synchronizeables.size());
+  for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
+  {
+    if( (*it)->beSynchronized() == true)
+      PRINT(0)("  Synchronizeable of class: %s::%s, with unique ID: %i, Synchronize: %i\n", (*it)->getClassName(), (*it)->getName(),
+               (*it)->getUniqueID(), (*it)->beSynchronized());
+  }
+  PRINT(0)(" Maximal Connections: %i\n", this->maxConnections);
+
+}
+
+
+int NetworkStream::getSyncCount()
+{
+  int n = 0;
+  for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
+    if( (*it)->beSynchronized() == true)
+      ++n;
+
+  //return synchronizeables.size();
+  return n;
+}
+
+
+
+
+
+