Changeset 7556 in orxonox.OLD for branches/network

Timestamp:

May 8, 2006, 11:55:55 AM (19 years ago)

Author:

rennerc

Message:

fixed some bugs in udpSockets. subprojects/network should work now

Location:

branches/network/src

Files:

• lib/network/udp_server_socket.cc (modified) (4 diffs)
• lib/network/udp_socket.cc (modified) (4 diffs)
• subprojects/network/network_unit_test.cc (modified) (2 diffs)

branches/network/src/lib/network/udp_server_socket.cc

@@ -44 +44 @@
   for ( int i = 0; i < packetBuffer.size(); i++ )
     removeUserPackets( i );
+  
+  if ( packet )
+    SDLNet_FreePacket( packet );
+  
+  if ( socket )
+    SDLNet_UDP_Close( socket );
 }
 
@@ -106 +112 @@
     NetworkPacket networkPacket;
     networkPacket.length = packet->len;
-    networkPacket.data = (byte*)malloc( packet->len );
-    assert( networkPacket.data );
+    if ( packet->len != 0 )
+    {
+      networkPacket.data = (byte*)malloc( packet->len );
+      assert( networkPacket.data );
+    }
+    else
+      networkPacket.data = NULL;
     memcpy( networkPacket.data, packet->data, packet->len );
     packetBuffer[userId].push_back( networkPacket );
@@ -155 +166 @@
     if ( it->data )
     {
-      delete it->data;
+      free( it->data );
       it->data = NULL;
     }
@@ -253 +264 @@
   memcpy( packet->data, networkPacket.data, networkPacket.length );
   packet->len = networkPacket.length;
+  packet->channel = -1;
   
   if ( SDLNet_UDP_Send( socket, userId, packet ) == 0 )

branches/network/src/lib/network/udp_socket.cc

@@ -68 +68 @@
   this->init();
   this->serverSocket = serverSocket;
+  this->userId = userId;
 }
 
@@ -73 +74 @@
  * destructor
  */
-UdpSocket::~ UdpSocket( )
+UdpSocket::~UdpSocket( )
 {
   if ( serverSocket )
@@ -79 +80 @@
   
   disconnectServer();
+  
+  if ( this->packet )
+    SDLNet_FreePacket( this->packet );
+  
+  if ( socket )
+    SDLNet_UDP_Close( socket );
 }
 
@@ -186 +193 @@
     if ( networkPacket.data )
     {
-      delete networkPacket.data;
+      free( networkPacket.data );
       networkPacket.data = NULL;
     }

branches/network/src/subprojects/network/network_unit_test.cc

@@ -112 +112 @@
 
   //sending bigger packets than 255 is not supported
-
+#if 0
   printf("try to send more than 255 bytes\n");
   printf("result: %d\n", client1->writePacket((byte*)buf, 1000));
@@ -120 +120 @@
   printf("try to read with a too small buffer\n");
   printf("result: %d\n", client1->readPacket((byte*)buf, strlen(str1)));
-
+#endif
+
+  delete client1;
+  delete client2;
+  delete server1;
+  delete server2; 
+  
   return 0;
 }