Changeset 5648 in orxonox.OLD

Timestamp:

Nov 20, 2005, 1:23:21 AM (18 years ago)

Author:

patrick

Message:

network: some more constructor/interface work

Location:

branches/network/src/lib/network

Files:

• data_stream.cc (modified) (1 diff)
• data_stream.h (modified) (2 diffs)
• network_manager.cc (modified) (1 diff)
• network_manager.h (modified) (1 diff)
• network_stream.cc (modified) (2 diffs)
• network_stream.h (modified) (1 diff)

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

@@ -26 +26 @@
  * This is the empty construktor
  */
-DataStream::DataStream()
+DataStream::DataStream(Synchronizeable& sync)
 {
+  this->setClassID(CL_DATA_STREAM, "DataStream");
+  this->sync = &sync;
                         
 }

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

@@ -20 +20 @@
       public:
       DataStream();
+      DataStream(Synchronizeable& sync);
       DataStream(DataStream& inStream, DataStream& outStream);
       DataStream(Synchronizeable& sync, NetworkSocket& socket);
@@ -59 +60 @@
       DataStream* downStream;
       NetworkSocket* networkSocket;
+      Synchronizeable* sync;
 
 };

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

@@ -126 +126 @@
  * @param synchronizeable: reference to the sync object
  */
-NetworkStream& NetworkManager::establishConnection(const IPaddress& address, const Synchronizeable& sync)
+NetworkStream& NetworkManager::establishConnection(IPaddress& address, 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(address, sync);
 }
 

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

@@ -33 +33 @@
   void shutdown();
   
-  NetworkStream& establishConnection(const IPaddress& address, const Synchronizeable& sync);
+  NetworkStream& establishConnection(IPaddress& address, Synchronizeable& sync);
   NetworkStream& establishConnection(const char& hostName, const Synchronizeable& sync);
   void shutdownConnection();

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

@@ -36 +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()
@@ -67 +44 @@
   this->synchronizeables = new Synchronizeable();
   this->connectionMonitor = new ConnectionMonitor();
+}
+
+
+NetworkStream::NetworkStream(IPaddress& address, Synchronizeable& sync) 
+  : DataStream(sync)
+{
+  this->init();
+  this->networkSocket = new NetworkSocket();
 }
 

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

@@ -18 +18 @@
 public:
   NetworkStream();
-  NetworkStream(DataStream& inStream, DataStream& outStream);
-  NetworkStream(Synchronizeable& sync, NetworkSocket& socket);
-  NetworkStream(DataStream& inStream, NetworkSocket& socket);
-  NetworkStream(Synchronizeable& sync, DataStream& outStream);
+  NetworkStream(IPaddress& address, Synchronizeable& sync);
   
   ~NetworkStream();