Changeset 6059 in orxonox.OLD

Timestamp:

Dec 12, 2005, 1:24:38 PM (18 years ago)

Author:

rennerc

Message:

 

File:

• branches/network/src/lib/network/network_stream.cc (modified) (9 diffs)

branches/network/src/lib/network/network_stream.cc

@@ -130 +130 @@
 void NetworkStream::processData()
 {
-  PRINTF(0)("processData()\n");
   if ( this->type == NET_SERVER )
     this->updateConnectionList();
@@ -148 +147 @@
           }
           PRINT(0)("handshake finished\n");
+          //TODO: replace handshake by entitymanager
         }
         else
@@ -167 +167 @@
   for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
   {
-    if ( (*it) && (*it)->getOwner() == myHostId )
+    //TODO: remove items from synchronizeables if they dont exist
+    if ( (*it)!=NULL  && ClassList::exists(*it) && (*it)->getOwner() == myHostId )
     {
       do {
@@ -173 +174 @@
         dataLength = (*it)->readBytes(downBuffer, DATA_STREAM_BUFFER_SIZE, &reciever);
 
-        PRINTF(0)("reciever = %d\n", reciever);
 
         if ( dataLength<=0 ){
@@ -180 +180 @@
         }
 
-        PRINTF(0)("read %d bytes\n", dataLength);
-
-        if (ClassList::exists((*it)))
-        {
-          PRINTF(0)("before cast\n");
-          dataLength = networkProtocol->createHeader((byte*)downBuffer, dataLength, DATA_STREAM_BUFFER_SIZE, static_cast<const Synchronizeable&>(*(*it)));
-          PRINTF(0)("after cast\n");
-        }
-        else
-        {
-          PRINTF(0)("instance does not exist anymore\n");
-          //synchronizeables.remove(it);
-        }
+        dataLength = networkProtocol->createHeader((byte*)downBuffer, dataLength, DATA_STREAM_BUFFER_SIZE, static_cast<const Synchronizeable&>(*(*it)));
 
         if ( dataLength<=0 )
@@ -199 +187 @@
         if ( reciever!=0 )
         {
-          if ( networkSockets[reciever] )
+          if ( networkSockets[reciever] != NULL )
           {
             PRINTF(0)("write %d bytes to socket %d\n", dataLength, reciever);
@@ -213 +201 @@
           for ( int i = 0; i<networkSockets.size(); i++)
           {
-            if ( networkSockets[i] )
+            if ( networkSockets[i] != NULL )
             {
               PRINTF(0)("write %d bytes to socket %d\n", dataLength, reciever);
@@ -222 +210 @@
 
       } while( reciever!=0 );
+    }
+    else
+    {
+      PRINTF(0)("synchronizeables == NULL");
     }
   }
@@ -365 +357 @@
       networkSockets[i]->destroy();
       networkSockets[i] = NULL;
+      //TODO: delete handshake from synchronizeable list so i can delete it
       delete handshakes[i];
       handshakes[i] = NULL;