Changeset 6959 in orxonox.OLD for trunk/src/lib/network/network_stream.cc

Timestamp:

Feb 1, 2006, 4:40:34 PM (19 years ago)

Author:

patrick

Message:

trunk: merged network branche into trunk

File:

• trunk/src/lib/network/network_stream.cc (modified) (4 diffs)

trunk/src/lib/network/network_stream.cc

@@ -26 +26 @@
 #include "connection_monitor.h"
 #include "synchronizeable.h"
-#include "network_manager.h"
 #include "network_game_manager.h"
+#include "shared_network_data.h"
 
 #include "debug.h"
@@ -195 +195 @@
           {
             SharedNetworkData::getInstance()->setHostID( handshakes[i]->getHostId() );
-            myHostId = NetworkManager::getInstance()->getHostID();
+            myHostId = SharedNetworkData::getInstance()->getHostID();
 
             this->networkGameManager = NetworkGameManager::getInstance();
@@ -231 +231 @@
   int reciever;
   Header header;
+  int counter;
+
   for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
   {
+    counter = 0;
+
     if ( (*it)!=NULL && (*it)->beSynchronized() /*&& (*it)->getOwner() == myHostId*/ )
     {
       do {
+        counter++;
+
+        //check for endless loop
+        if ( counter > 50 )
+        {
+          PRINTF(1)("there seems to be an error in readBytes of %s\n", (*it)->getClassName());
+          assert(false);
+        }
+
         reciever = 0;
         dataLength = (*it)->readBytes(downBuffer, DATA_STREAM_BUFFER_SIZE, &reciever);
-
 
         if ( dataLength<=0 ){
@@ -267 +279 @@
             for ( int i = 0; i<networkSockets.size(); i++)
             {
-              if ( i!=-reciever && networkSockets[i] != NULL )
+              if ( i!=abs(reciever) && networkSockets[i] != NULL )
               {
-                PRINTF(5)("write %d bytes to socket %d\n", dataLength, i);
+                PRINTF(0)("write %d bytes to socket %d uniqueid %d reciever %d\n", dataLength, i, (*it)->getUniqueID(), reciever);
                 networkSockets[i]->writePacket(downBuffer, dataLength);
               }