Changeset 7553 in orxonox.OLD

Timestamp:

May 6, 2006, 1:23:16 PM (18 years ago)

Author:

rennerc

Message:

fixed some bugs

Location:

branches/network/src

Files:

• lib/network/udp_server_socket.cc (modified) (3 diffs)
• lib/network/udp_socket.cc (modified) (1 diff)
• subprojects/network/network_unit_test.cc (modified) (1 diff)

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

@@ -100 +100 @@
       UdpSocket * sock = new UdpSocket( this, packet->address, userId );
       newSocketList.push_back( sock );
+      PRINTF(0)("NEW CONNECTION %x\n", packet->address.host );
     }
     
@@ -111 +112 @@
   }
   
-  assert( res = 0 );
-  
-  NetworkSocket * result = newSocketList.front();
-  
-  newSocketList.pop_front();
+  assert( res == 0 );
+  
+  NetworkSocket * result = NULL;
+  
+  if ( newSocketList.size() > 0 )
+  {
+    result = newSocketList.front();
+  
+    newSocketList.pop_front();
+  }
   
   return result;
@@ -199 +205 @@
 {
   int channel = SDLNet_UDP_Bind( socket, userId, &ip );
-  if( channel == userId ) 
+  if( channel != userId ) 
   {
     PRINTF(1)("SDLNet_UDP_Bind: %s\n", SDLNet_GetError());

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

@@ -107 +107 @@
   }
   
-  int channel = SDLNet_UDP_Bind(socket, -1, &ip);
+  int channel = SDLNet_UDP_Bind(socket, 1, &ip);
   if ( channel == -1 ) 
   {

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

@@ -42 +42 @@
   NetworkSocket* client1 = new UdpSocket("localhost", 9999);
 
-  NetworkSocket* server1 = server.getNewSocket();
+  client1->writePacket( (byte*)"test", 5 );
+  NetworkSocket* server1 = NULL;
+  while ( server1 == NULL )
+    server1 = server.getNewSocket();
+  
+  assert( server1->isOk() );
 
   NetworkSocket* client2 = new UdpSocket("localhost", 9999);
 
-  NetworkSocket* server2 = server.getNewSocket();
+  client2->writePacket( (byte*)"test", 5 );
+  NetworkSocket* server2 = NULL;
+  while ( server2 == NULL )
+    server2 = server.getNewSocket();
 
   char buf[1024];