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

Timestamp:

Nov 28, 2005, 10:20:08 PM (19 years ago)

Author:

patrick

Message:

This implementation of the internal state of NetworkSTream makes much more sense.

File:

• branches/network/src/lib/network/network_stream.cc (modified) (1 diff)

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

@@ -122 +122 @@
   /* first of all read the next Orxonox Network Header */
 
-  switch( this->state)
+  if( this->state == NET_REC_HEADER)
   {
+    dataLength = this->networkSocket->readBlock((byte*)upBuffer, sizeof(Header));
+    if( dataLength == sizeof(Header))
+    {
+      this->packetHeader = this->networkProtocol->extractHeader((byte*) upBuffer , dataLength);
+      printf("NetworkStream::processData() - Got Header: Protocol %u, Version: %u, Sender: %u, Receiver: %u, Length: %u\n",
+             this->packetHeader.protocol, this->packetHeader.version, this->packetHeader.senderID,
+             this->packetHeader.receiverID, this->packetHeader.length);
+      /* FIXME: what if it was no this->packetHeader? catch? eg: the protocol identifier, receiver id*/
 
-    case NET_REC_HEADER:
-      dataLength = this->networkSocket->readBlock((byte*)upBuffer, sizeof(Header));
-      if( dataLength == sizeof(Header))
-      {
-        this->packetHeader = this->networkProtocol->extractHeader((byte*) upBuffer , dataLength);
-        printf("NetworkStream::processData() - Got Header: Protocol %u, Version: %u, Sender: %u, Receiver: %u, Length: %u\n",
-               this->packetHeader.protocol, this->packetHeader.version, this->packetHeader.senderID,
-               this->packetHeader.receiverID, this->packetHeader.length);
-        /* FIXME: what if it was no this->packetHeader? catch? eg: the protocol identifier, receiver id*/
+      this->state = NET_REC_DATA;
+    }
+  }
+  if( this->state == NET_REC_DATA)
+  {
+    /* now read the data */
+    dataLength = this->networkSocket->readBlock((byte*)upBuffer, this->packetHeader.length);
+    /* check if the data is available and process it if so */
+    if( dataLength == this->packetHeader.length)
+    {
+      printf("NetworkStream::processData() - Got Data: \n");
+      /* send the received data to connectionMonitor */
+      this->connectionMonitor->processPacket((byte*)upBuffer, this->packetHeader.length);
+      /* now pass the data to the sync object */
+      this->synchronizeables->writeBytes((byte*)upBuffer, this->packetHeader.length);
 
-        this->state = NET_REC_DATA;
-      }
-      break;
-
-    case NET_REC_DATA:
-      /* now read the data */
-      dataLength = this->networkSocket->readBlock((byte*)upBuffer, this->packetHeader.length);
-      /* check if the data is available and process it if so */
-      if( dataLength == this->packetHeader.length)
-      {
-        printf("NetworkStream::processData() - Got Data: \n");
-        /* send the received data to connectionMonitor */
-        this->connectionMonitor->processPacket((byte*)upBuffer, this->packetHeader.length);
-        /* now pass the data to the sync object */
-        this->synchronizeables->writeBytes((byte*)upBuffer, this->packetHeader.length);
-
-        this->state = NET_REC_HEADER;
-      }
-      break;
-
-    default:
-      break;
+      this->state = NET_REC_HEADER;
+    }
   }