Changeset 6039 in orxonox.OLD

Timestamp:

Dec 11, 2005, 1:25:51 AM (18 years ago)

Author:

rennerc

Message:

network_socket wont cause a segfault on connection close

Location:

branches/network/src/lib/network

Files:

• network_socket.cc (modified) (8 diffs)
• network_socket.h (modified) (1 diff)
• network_stream.cc (modified) (1 diff)

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

@@ -64 +64 @@
   outgoingBufferLength = 0;
 
-#ifdef _USE_OUTGOING_BUFFER
+
   thread_write_running = false;
-#endif
   thread_read_running = false;
 
@@ -106 +105 @@
   SDL_DestroyMutex(outgoingBufferMutex);
   SDL_DestroyMutex(socketMutex);
+  SDL_DestroyMutex(threadTerminationMutex);
 }
 
@@ -263 +263 @@
   NetworkSocket * self = (NetworkSocket*)data;
 
+  self->thread_read_running = true;
+
   while (!self->terminateThread)
   {
@@ -292 +294 @@
       SDL_mutexV(self->socketMutex);
       SDL_mutexV(self->incomingBufferMutex);
-      return -1;
+      break;
     }
 
@@ -311 +313 @@
     delete self;
   }
-
-
-  printf("QUIT READ THREAD\n");
+  else
+  {
+    SDL_mutexV(self->threadTerminationMutex);
+  }
+
+
+  PRINTF(0)("QUIT READ THREAD\n");
   return 0;
 }
@@ -323 +329 @@
   char buffer[_LOCAL_BUFFER_SIZE];
   NetworkSocket * self = (NetworkSocket*)data;
+
+  self->thread_write_running = true;
 
   while (!self->terminateThread)
@@ -361 +369 @@
 
       SDL_mutexV(self->socketMutex);
-      return -1;
+      break;
     }
 
@@ -374 +382 @@
     delete self;
   }
-
-
-  printf("QUIT WRITE THREAD\n");
+  else
+  {
+    SDL_mutexV(self->threadTerminationMutex);
+  }
+
+
+  PRINTF(0)("QUIT WRITE THREAD\n");
   return 0;
 }

branches/network/src/lib/network/network_socket.h

@@ -66 +66 @@
   static int thread_read(void * data);
   bool thread_read_running;
+  bool thread_write_running;
 #ifdef _USE_OUTGOING_BUFFER
   static int thread_write(void * data);
-  bool thread_write_running;
 #endif
 

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

@@ -220 +220 @@
 
       //delete networkSockets[i];
+      networkSockets[i]->disconnectServer();
       networkSockets[i]->destroy();
       networkSockets[i] = NULL;