Changeset 6062 in orxonox.OLD

Timestamp:

Dec 12, 2005, 2:25:31 PM (18 years ago)

Author:

rennerc

Message:

network_stream: server doesnt crash on connection close

Location:

branches/network/src/lib/network

Files:

• handshake.cc (modified) (3 diffs)
• network_socket.cc (modified) (6 diffs)
• network_stream.cc (modified) (6 diffs)

branches/network/src/lib/network/handshake.cc

@@ -38 +38 @@
 void Handshake::writeBytes( const byte * data, int length )
 {
-  PRINTF(0)("Handshake::writeBytes states = %d %d %d %d (%d)\n", hasState( HS_RECVD_INIT ), hasState( HS_RECVD_VER ), hasState( HS_RECVD_HID ), hasState( HS_COMPLETED ), state);
+  PRINTF(5)("Handshake::writeBytes states = %d %d %d %d (%d)\n", hasState( HS_RECVD_INIT ), hasState( HS_RECVD_VER ), hasState( HS_RECVD_HID ), hasState( HS_COMPLETED ), state);
 
   if ( hasState( HS_COMPLETED ) )
@@ -86 +86 @@
   }
 
-  if ( hasState( HS_RECVD_VER ) && !hasState( HS_RECVD_HID ) )
+  if ( !isServer() && hasState( HS_RECVD_VER ) && !hasState( HS_RECVD_HID ) )
   {
     if ( length != 4 )
@@ -107 +107 @@
 int Handshake::readBytes( byte * data, int maxLength, int * reciever )
 {
-  PRINTF(0)("Handshake::readBytes states = %d %d %d %d (%d)\n", hasState( HS_SENT_INIT ), hasState( HS_SENT_VER ), hasState( HS_SENT_HID ), hasState( HS_COMPLETED ), state);
+  PRINTF(5)("Handshake::readBytes states = %d %d %d %d (%d)\n", hasState( HS_SENT_INIT ), hasState( HS_SENT_VER ), hasState( HS_SENT_HID ), hasState( HS_COMPLETED ), state);
 
   if ( hasState( HS_COMPLETED ) )

branches/network/src/lib/network/network_socket.cc

@@ -159 +159 @@
 int NetworkSocket::writeBytes(byte * data, int length)
 {
-  PRINTF(0)("NetworkSocket::writeBytes()\n");
+  PRINTF(5)("NetworkSocket::writeBytes()\n");
 #ifdef _USE_OUTGOING_BUFFER
 
@@ -207 +207 @@
 int NetworkSocket::readBytes(byte * data, int length)
 {
-  PRINTF(0)("NetworkSocket::readBytes()\n");
+  PRINTF(5)("NetworkSocket::readBytes()\n");
   if (data==NULL)
     return 0;
@@ -311 +311 @@
   {
     SDL_mutexV(self->threadTerminationMutex);
-    delete self;
   }
   else
@@ -380 +379 @@
   {
     SDL_mutexV(self->threadTerminationMutex);
-    delete self;
   }
   else
@@ -394 +392 @@
 bool NetworkSocket::writePacket( byte * data, int length )
 {
-  PRINTF(0)("NetworkSocket::writePacket()\n");
+  PRINTF(5)("NetworkSocket::writePacket()\n");
   if (length>255)
   {
@@ -409 +407 @@
 int NetworkSocket::readPacket( byte * data, int maxLength )
 {
-  PRINTF(0)("NetworkSocket::readPacket()\n");
+  PRINTF(5)("NetworkSocket::readPacket()\n");
   if (incomingBufferLength<1)
   {

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

@@ -122 +122 @@
 {
   this->synchronizeables.push_back(&sync);
+  sync.setNetworkStream( this );
 
   if( this->networkSockets.size()>0 )
@@ -155 +156 @@
           }
           PRINT(0)("handshake finished\n");
+          delete handshakes[i];
+          handshakes[i] = NULL;
           //TODO: replace handshake by entitymanager
         }
@@ -176 +179 @@
   {
     //TODO: remove items from synchronizeables if they dont exist
-    if ( (*it)!=NULL  && ClassList::exists(*it) && (*it)->getOwner() == myHostId )
+    if ( (*it)!=NULL && (*it)->getOwner() == myHostId )
     {
       do {
@@ -197 +200 @@
           if ( networkSockets[reciever] != NULL )
           {
-            PRINTF(0)("write %d bytes to socket %d\n", dataLength, reciever);
+            PRINTF(5)("write %d bytes to socket %d\n", dataLength, reciever);
             networkSockets[reciever]->writePacket(downBuffer, dataLength);
           }
@@ -211 +214 @@
             if ( networkSockets[i] != NULL )
             {
-              PRINTF(0)("write %d bytes to socket %d\n", dataLength, reciever);
+              PRINTF(5)("write %d bytes to socket %d\n", dataLength, reciever);
               networkSockets[i]->writePacket(downBuffer, dataLength);
             }
@@ -366 +369 @@
       networkSockets[i] = NULL;
       //TODO: delete handshake from synchronizeable list so i can delete it
-      delete handshakes[i];
+      if ( handshakes[i] )
+        delete handshakes[i];
       handshakes[i] = NULL;