Changeset 6053 in orxonox.OLD for branches/network/src/lib/network/network_stream.cc

Timestamp:

Dec 11, 2005, 6:01:04 PM (18 years ago)

Author:

rennerc

Message:

handshake works now

File:

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

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

@@ -29 +29 @@
 #include "list.h"
 #include "debug.h"
+#include "class_list.h"
 
 /* include your own header */
@@ -73 +74 @@
   this->connectionMonitor = new ConnectionMonitor();
   this->networkSockets.push_back( NULL );
+  this->handshakes.push_back( NULL );
   this->bActive = true;
 }
@@ -128 +130 @@
 void NetworkStream::processData()
 {
-  //PRINTF(0)("processData()\n");
+  PRINTF(0)("processData()\n");
   if ( this->type == NET_SERVER )
     this->updateConnectionList();
 
-  for (HandshakeVector::iterator it = handshakes.begin(); it!=handshakes.end(); it++)
-  {
-    if ( *it )
-    {
-      if ( (*it)->completed() )
+  for (int i = 0; i<handshakes.size(); i++)
+  {
+    if ( handshakes[i] )
+    {
+      if ( handshakes[i]->completed() )
       {
-        if ( (*it)->ok() )
-        {
-          NetworkManager::getInstance()->setHostID( (*it)->getHostId() );
-          myHostId = NetworkManager::getInstance()->getHostID();
-          delete *it;
-          *it = NULL;
+        if ( handshakes[i]->ok() )
+        {
+          if ( type != NET_SERVER )
+          {
+            NetworkManager::getInstance()->setHostID( handshakes[i]->getHostId() );
+            myHostId = NetworkManager::getInstance()->getHostID();
+          }
           PRINT(0)("handshake finished\n");
         }
@@ -149 +152 @@
         {
           PRINT(1)("handshake failed!\n");
-          delete *it;
-          *it = NULL;
+          networkSockets[i]->disconnectServer();
           //TODO: handle error
         }
@@ -165 +167 @@
   for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
   {
-    if ( (*it)->getOwner() == myHostId )
-    {
-      PRINTF(0)("sync: %s\n", (*it)->getName());
-      reciever = 0;
+    if ( (*it) && (*it)->getOwner() == myHostId )
+    {
       do {
-        dataLength = (*it)->readBytes(downBuffer, DATA_STREAM_BUFFER_SIZE, reciever);
+        reciever = 0;
+        dataLength = (*it)->readBytes(downBuffer, DATA_STREAM_BUFFER_SIZE, &reciever);
+
+        PRINTF(0)("reciever = %d\n", reciever);
 
         if ( dataLength<=0 ){
@@ -179 +182 @@
         PRINTF(0)("read %d bytes\n", dataLength);
 
-        dataLength = networkProtocol->createHeader((byte*)downBuffer, dataLength, DATA_STREAM_BUFFER_SIZE, static_cast<const Synchronizeable&>(*(*it)));
+        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);
+        }
 
         if ( dataLength<=0 )
@@ -188 +201 @@
           if ( networkSockets[reciever] )
           {
-            PRINTF(0)("write %d bytes to socket\n", dataLength);
+            PRINTF(0)("write %d bytes to socket %d\n", dataLength, reciever);
             networkSockets[reciever]->writePacket(downBuffer, dataLength);
           }
@@ -198 +211 @@
         else
         {
-          for ( int i = 1; i<networkSockets.size(); i++)
+          for ( int i = 0; i<networkSockets.size(); i++)
           {
             if ( networkSockets[i] )
+            {
+              PRINTF(0)("write %d bytes to socket %d\n", dataLength, reciever);
               networkSockets[i]->writePacket(downBuffer, dataLength);
+            }
           }
         }
@@ -211 +227 @@
   /* UPSTREAM */
 
-  for ( int i = 1; i<networkSockets.size(); i++)
+  for ( int i = 0; i<networkSockets.size(); i++)
   {
     if ( networkSockets[i] )