Changeset 5833 in orxonox.OLD for branches/network/src/lib/network/network_stream.cc

Timestamp:

Nov 30, 2005, 11:09:18 AM (18 years ago)

Author:

patrick

Message:

network: server/client orxonox now works

File:

• branches/network/src/lib/network/network_stream.cc (modified) (7 diffs)

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

@@ -44 +44 @@
   this->init();
   /* initialize the references */
+  this->type = NET_CLIENT;
   this->networkSocket = new NetworkSocket();
   this->networkProtocol = new NetworkProtocol();
@@ -52 +53 @@
 NetworkStream::NetworkStream(IPaddress& address, NodeType type)
 {
+  this->type = type;
   this->init();
   this->networkSocket = new NetworkSocket(address);
@@ -62 +64 @@
 NetworkStream::NetworkStream(unsigned int port, NodeType type)
 {
+  this->type = type;
   this->init();
   this->networkSocket = new NetworkSocket();
@@ -74 +77 @@
     : DataStream()
 {
+  this->type = type;
   this->init();
   this->networkSocket = new NetworkSocket(address);
@@ -86 +90 @@
     : DataStream()
 {
+  this->type = type;
   this->init();
   this->networkSocket = new NetworkSocket();
@@ -134 +139 @@
   PRINT(0)("============= DOWNSTREAM:===============\n");
   /* first of all read the synchronizeable's data: */
-  //if(this->isServer())
-  dataLength = this->synchronizeables->readBytes((byte*)downBuffer);
+  if( this->isServer())
+    dataLength = this->synchronizeables->readBytes((byte*)downBuffer);
 
   if( dataLength > 0)
@@ -181 +186 @@
     if( dataLength == this->packetHeader.length)
     {
-      printf("NetworkStream::processData() - Got Data: \n");
+      printf("NetworkStream::processData() - Got Data: %i bytes\n", dataLength);
       /* send the received data to connectionMonitor */
       this->connectionMonitor->processPacket((byte*)upBuffer, this->packetHeader.length);
       /* now pass the data to the sync object */
-      //if(!this->isServer())
-      this->synchronizeables->writeBytes((byte*)upBuffer, this->packetHeader.length);
+      if( !this->isServer())
+        this->synchronizeables->writeBytes((byte*)upBuffer, this->packetHeader.length);
 
       this->state = NET_REC_HEADER;