Changeset 6139 in orxonox.OLD for trunk/src/lib/network/server_socket.cc

Timestamp:

Dec 16, 2005, 6:45:32 PM (18 years ago)

Author:

patrick

Message:

trunk: merged branche network with trunk using command: svn merge -r5999:HEAD, conflicts resolved in favor of the trunk bla

File:

• trunk/src/lib/network/server_socket.cc (modified) (2 diffs)

trunk/src/lib/network/server_socket.cc

@@ -110 +110 @@
 
 
-NetworkSocket ServerSocket::getNewSocket( )
+NetworkSocket* ServerSocket::getNewSocket( )
 {
+  if ( !listenSocket )
+  {
+    PRINTF(1)("listenSocket == NULL! Maybe you forgot to call listen()\n");
+    close();
+    return NULL;
+  }
+
   TCPsocket sock = SDLNet_TCP_Accept(listenSocket);
 
@@ -120 +127 @@
   else
   {
-    return NetworkSocket(sock);
+    return new NetworkSocket(sock);
   }
 }
 
+void ServerSocket::close( )
+{
+  if ( listenSocket )
+  {
+    SDLNet_TCP_Close( listenSocket );
+    listenSocket = NULL;
+  }
+
+  _isListening = false;
+}
+