Changeset 5649 in orxonox.OLD

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

Location:

branches/network/src

Files:

• lib/network/data_stream.cc (modified) (3 diffs)
• lib/network/data_stream.h (modified) (1 diff)
• lib/network/netdefs.h (modified) (1 diff)
• lib/network/network_manager.cc (modified) (2 diffs)
• lib/network/network_manager.h (modified) (1 diff)
• lib/network/network_stream.cc (modified) (5 diffs)
• lib/network/network_stream.h (modified) (1 diff)
• subprojects/network/Makefile.am (modified) (1 diff)
• subprojects/network/network_unit_test.cc (modified) (3 diffs)
• subprojects/network/simple_sync.cc (added)
• subprojects/network/simple_sync.h (added)

branches/network/src/lib/network/data_stream.cc

@@ -23 +23 @@
 using namespace std;
 
+
+
+/**
+ * This is the empty construktor
+ */
+DataStream::DataStream()
+{
+  this->setClassID(CL_DATA_STREAM, "DataStream");
+}
+
+
+
 /**
  * This is the empty construktor
@@ -29 +41 @@
 {
   this->setClassID(CL_DATA_STREAM, "DataStream");
-  this->sync = &sync;
+  this->synchronizeable = &sync;
                         
 }
@@ -146 +158 @@
 }
 
-/**
- * This function moves the data from the downStream object to the upStream object and changes the data if necessary.
- * This function is virtual and therefore needs to be extended by the derived class
- */
-void DataStream::processData()
-{
-
-}
 
 /**

branches/network/src/lib/network/data_stream.h

@@ -60 +60 @@
       DataStream* downStream;
       NetworkSocket* networkSocket;
-      Synchronizeable* sync;
+      Synchronizeable* synchronizeable;
 
 };

branches/network/src/lib/network/netdefs.h

@@ -20 +20 @@
 
 
+typedef enum {
+  NET_SERVER,
+  NET_CLIENT
+} NodeType;
+
 #endif /* _NETWORK_MANAGER */

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

@@ -130 +130 @@
   PRINTF(0)("Establish connection...\n");
   /* creating a new network stream, it will register itself automaticaly to the class list */
-  NetworkStream* netStream = new NetworkStream(address, sync);
+  NetworkStream* netStream = new NetworkStream(address, sync, NET_CLIENT);
+}
+
+/**
+ *  creates a new NetworkStream of server type
+ * @param sync: the listener
+ */
+NetworkStream& NetworkManager::createServer(Synchronizeable& sync, int 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);
 }
 
@@ -152 +163 @@
   if (this->netStreamList != NULL || (this->netStreamList = ClassList::getList(CL_NETWORK_STREAM)) != NULL)
   {
-    
+    tIterator<BaseObject>* iterator = this->netStreamList->getIterator();
+    NetworkStream* stream = (NetworkStream*)(iterator->firstElement());
+    while( stream)
+    {
+      stream->processData();
+      stream = (NetworkStream*)(iterator->nextElement());
+    }
+    delete iterator;
   }
 

branches/network/src/lib/network/network_manager.h

@@ -35 +35 @@
   NetworkStream& establishConnection(IPaddress& address, Synchronizeable& sync);
   NetworkStream& establishConnection(const char& hostName, const Synchronizeable& sync);
+  NetworkStream& createServer(Synchronizeable& sync, int port);
   void shutdownConnection();
   

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);
 }
 

branches/network/src/lib/network/network_stream.h

@@ -13 +13 @@
 class ConnectionMonitor;
 
-class NetworkStream : public virtual DataStream
+class NetworkStream : public DataStream
 {
 
 public:
   NetworkStream();
-  NetworkStream(IPaddress& address, Synchronizeable& sync);
+  NetworkStream(IPaddress& address, Synchronizeable& sync, NodeType type);
+  NetworkStream(Synchronizeable& sync, int port, NodeType type);
   
   ~NetworkStream();

branches/network/src/subprojects/network/Makefile.am

@@ -20 +20 @@
                   $(MAINSRCDIR)/util/loading/load_param.cc \
                   $(MAINSRCDIR)/lib/util/substring.cc \
-                  $(MAINSRCDIR)/lib/util/helper_functions.cc
+                  $(MAINSRCDIR)/lib/util/helper_functions.cc 
+
 
 

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

@@ -8 +8 @@
 #include "network_manager.h"
 #include "network_socket.h"
+#include "network_stream.h"
 #include "synchronizeable.h"
 
@@ -124 +125 @@
   Synchronizeable sync;
   
+  
   /* create the network manager */
   NetworkManager* nm = new NetworkManager();
@@ -130 +132 @@
   nm->initialize();
 
+  /* create a server stream */
+  nm->createServer(sync, 9999);
+  
   /* esatblish a connection */
   nm->establishConnection(ip, sync);
+
+  /* synchronize the data 1 time (increment for longer tests) */
+  for( int i = 0; i < 1; i++) {
+    nm->synchronize();
+  }
   
   /* delete the network manager again */