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

Timestamp:

Nov 20, 2005, 2:48:33 AM (18 years ago)

Author:

patrick

Message:

network: added even more interface, more function to the network_manager and sync test class

File:

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

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

@@ -27 +27 @@
 #include "synchronizeable.h"
 #include "list.h"
-
+#include "debug.h"
 
 /* include your own header */
@@ -37 +37 @@
 
 
-NetworkStream::NetworkStream()
+NetworkStream::NetworkStream() 
+  : DataStream()
 {
   this->init();
@@ -47 +48 @@
 
 
-NetworkStream::NetworkStream(IPaddress& address, Synchronizeable& sync) 
+NetworkStream::NetworkStream(IPaddress& address, Synchronizeable& sync, NodeType type) 
   : DataStream(sync)
 {
   this->init();
-  this->networkSocket = new NetworkSocket();
+  this->networkSocket = new NetworkSocket(/* address, type */);
+}
+
+
+NetworkStream::NetworkStream(Synchronizeable& sync, int port, NodeType type) 
+  : DataStream(sync)
+{
+  this->init();
+  this->networkSocket = new NetworkSocket(/* address, type */);
 }
 
@@ -64 +73 @@
 NetworkStream::~NetworkStream()
 {
- delete networkSockets;
- delete synchronizeables;
+ delete networkSocket;
+ delete synchronizeable;
  delete connectionMonitor;
 
@@ -72 +81 @@
 void NetworkStream::processData()
 {
+  PRINTF(0)("process data\n");
   byte data[10] ; // obsolete, for debugging only
   byte* test = (byte *)data[0]; // obsolete, for debugging only
   int ret = 0;
-  this->synchronizeables->writeByteStream(NULL);
-  ret = this->networkSockets->writeBytes(NULL,1);
-  test = this->synchronizeables->readByteStream();
-  ret = this->networkSockets->readBytes(test,1);
+  this->synchronizeable->writeByteStream(NULL);
+  ret = this->networkSocket->writeBytes(NULL,1);
+  test = this->synchronizeable->readByteStream();
+  ret = this->networkSocket->readBytes(test,1);
 }