Changeset 5805 in orxonox.OLD for branches/network/src/lib

Timestamp:

Nov 28, 2005, 6:36:16 PM (19 years ago)

Author:

patrick

Message:

network: added some simulated network delay - this helps a lot for debugging

Location:

branches/network/src/lib/network

Files:

• network_manager.cc (modified) (1 diff)
• network_protocol.cc (modified) (2 diffs)
• network_socket.cc (modified) (4 diffs)
• network_stream.cc (modified) (3 diffs)

branches/network/src/lib/network/network_manager.cc

@@ -139 +139 @@
 NetworkStream& NetworkManager::createServer(Synchronizeable& sync, unsigned int port)
 {
-  printf("Create a new server socket, liestening on port %u...\n", port);
+  PRINTF(0)("Create a new server socket\n");
   /* creating a new network stream, it will register itself automaticaly to the class list */
   NetworkStream* netStream = new NetworkStream(sync, port, NET_SERVER);

branches/network/src/lib/network/network_protocol.cc

@@ -68 +68 @@
     return -1;
 
+//   for(int i = 0; i < length; i++)
+//     printf("send byte[%i]=%u\n", i, data[i]);
+
   //Create space for the header
   for( int i = length - 1; i >= 0; i--)
@@ -102 +105 @@
   h.data = data;
 
+//   for(int i = 0; i < length; i++)
+//     printf("recS byte[%i]=%u\n", i, data[i]);
+
   //Remove header
   for (int i = headerLength; i < length; i++)

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

@@ -163 +163 @@
   tcpSocket = NULL;
   SDL_mutexV(socketMutex);
-
 }
 
@@ -220 +219 @@
   SDL_mutexV(outgoingBufferMutex);
 
+
   return nbytes;
 #else
@@ -395 +395 @@
 #undef min
 
-    //printf("thread_write nbytes=%d listening=%d\n", nbytestowrite, (int)self->_isListening);
+//     printf("thread_write nbytes=%d listening=%d\n", nbytestowrite, (int)self->_isListening);
 
     //if buffer is full
@@ -431 +431 @@
   }
 
+  printf("QUIT WRITE THREAD\n");
   return 0;
 }

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

@@ -86 +86 @@
  networkSocket->disconnectServer();
 
- delete networkSocket;
+ if( this->networkSocket)
+   delete networkSocket;
+
  delete connectionMonitor;
  delete networkProtocol;
@@ -107 +109 @@
                                             *(this->synchronizeables), 12);
 
-  printf("created header: data packet wights: %i bytes\n", ret);
   /* pass the data to the network socket */
   ret = this->networkSocket->writeBytes((byte*)downBuffer, ret);
   /* check if there was an error */
-  printf("NetworkSocket: sent %i bytes\n", ret);
   if( ret == -1) { PRINTF(0)("Error in writing data to the NetworkSocket\n");}
 
@@ -122 +122 @@
   ret = this->networkSocket->readBlock((byte*)upBuffer, 11/* this is very bad: hard coded packet sizes! */);
   /* error checking: data read? */
-  printf("NetworkSocket: received %i bytes\n", ret);
   if( ret != 11 /*PACKAGE_SIZE + sizeof(Header)*/) { PRINTF(0)("Error while reading data from the NetworkSocket. Skipping further work\n");}
   else