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

Timestamp:

Nov 20, 2005, 12:25:50 AM (19 years ago)

Author:

patrick

Message:

network: modiefied the unit test to enable diffrent modes, extended the NetworkStream constructors interface and NetworkManager interface

Location:

branches/network/src/lib/network

Files:

• network_manager.cc (modified) (2 diffs)
• network_manager.h (modified) (2 diffs)
• network_stream.cc (modified) (2 diffs)
• network_stream.h (modified) (2 diffs)

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

@@ -31 +31 @@
 #include "network_manager.h"
 
-/* include this file, it contains some default definitions */
-#include "netdefs.h"
 
 /* using namespace std is default, this needs to be here */
@@ -116 +114 @@
 /**
  *  creates a connection from one object to a host
+ * @param hostName: the name of the destination host
+ * @param synchronizeable: reference to the sync object
+ */
+NetworkStream& establishConnection(const char& hostName, const Synchronizeable& sync)
+{}
+
+
+/**
+ *  creates a connection from one object to a host
  * @param address: the address of the destination host
  * @param synchronizeable: reference to the sync object
  */
-NetworkStream& NetworkManager::establishConnection(/* address, port, object reference*/)
+NetworkStream& NetworkManager::establishConnection(const IPaddress& address, const Synchronizeable& sync)
 {
   PRINTF(0)("Establish connection...\n");
   /* creating a new network stream, it will register itself automaticaly to the class list */
-  NetworkStream* netStream = new NetworkStream();
+//  NetworkStream* netStream = new NetworkStream();
 }
 

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

@@ -9 +9 @@
 #define _NETWORK_MANAGER
 
+/* include this file, it contains some default definitions */
+#include "netdefs.h"
 
 /* include base_object.h since all classes are derived from this one */
 #include "base_object.h"
+
 
 /* forward declarations for the header file (include the header via #include "bla.h" in the source file) */
@@ -30 +33 @@
   void shutdown();
   
-  NetworkStream& establishConnection(/* address, port, object reference*/);
+  NetworkStream& establishConnection(const IPaddress& address, const Synchronizeable& sync);
+  NetworkStream& establishConnection(const char& hostName, const Synchronizeable& sync);
   void shutdownConnection();
   

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

@@ -21 +21 @@
 
 
+#include "base_object.h"
+//#include "network_protocol.h"
+#include "network_socket.h"
+#include "connection_monitor.h"
+#include "synchronizeable.h"
+#include "list.h"
+
+
 /* include your own header */
 #include "network_stream.h"
@@ -28 +36 @@
 
 
+NetworkStream::NetworkStream(DataStream& inStream, DataStream& outStream) 
+  : DataStream(inStream, outStream)
+{
+  this->init();
+}
+
+NetworkStream::NetworkStream(Synchronizeable& sync, NetworkSocket& socket) 
+  : DataStream(sync, socket)
+{
+  this->init();
+}
+
+NetworkStream::NetworkStream(DataStream& inStream, NetworkSocket& socket) 
+  : DataStream(inStream, socket)
+{
+  this->init();
+}
+
+NetworkStream::NetworkStream(Synchronizeable& sync, DataStream& outStream) 
+  : DataStream(sync, outStream)
+{
+  this->init();
+}
+
 NetworkStream::NetworkStream()
+{
+  this->init();
+  /* initialize the references */
+  this->networkSocket = new NetworkSocket();
+  this->synchronizeables = new Synchronizeable();
+  this->connectionMonitor = new ConnectionMonitor();
+}
+
+
+void NetworkStream::init()
 {
   /* set the class id for the base object */
   this->setClassID(CL_NETWORK_STREAM, "NetworkStream");
+}
 
-  /* initialize the references */
-  this->networkSockets = new NetworkSocket();
-  this->synchronizeables = new Synchronizeable();
-  this->connectionMonitor = new ConnectionMonitor();
-
- 
-
-}
 
 NetworkStream::~NetworkStream()

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

@@ -7 +7 @@
 #define _NETWORK_STREAM
 
-#include "base_object.h"
 #include "data_stream.h"
-//#include "network_protocol.h"
-#include "network_socket.h"
-#include "connection_monitor.h"
-#include "synchronizeable.h"
-#include "list.h"
 
+class Synchronizeable;
+class NetworkSocket;
+class ConnectionMonitor;
 
 class NetworkStream : public virtual DataStream
@@ -21 +18 @@
 public:
   NetworkStream();
+  NetworkStream(DataStream& inStream, DataStream& outStream);
+  NetworkStream(Synchronizeable& sync, NetworkSocket& socket);
+  NetworkStream(DataStream& inStream, NetworkSocket& socket);
+  NetworkStream(Synchronizeable& sync, DataStream& outStream);
+  
   ~NetworkStream();
-   virtual void processData();
+   
+  void init();
+  
+  virtual void processData();
 
 private: