Changeset 5566 in orxonox.OLD

Timestamp:

Nov 15, 2005, 1:00:55 AM (18 years ago)

Author:

patrick

Message:

network: added the missing NetworkStream files (they still need to be implemented) and added some small code to the NetworManager for preparation of the init process

Location:

branches/network/src/lib/network

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (5 diffs)
• network_manager.cc (modified) (2 diffs)
• network_manager.h (modified) (3 diffs)
• network_stream.cc (added)
• network_stream.h (added)

branches/network/src/lib/network/Makefile.am

@@ -8 +8 @@
                       network_socket.cc \
                       connection_monitor.cc \
-                  data_stream.cc
+                      network_stream.cc \
+                      data_stream.cc
 
 
@@ -16 +17 @@
                  network_socket.h \
                  connection_monitor.h \
+                 network_stream.h \
                  data_stream.h
 

branches/network/src/lib/network/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
@@ -15 +15 @@
 @SET_MAKE@
 
+
+SOURCES = $(libORXnet_a_SOURCES)
 
 srcdir = @srcdir@
@@ -56 +58 @@
 am_libORXnet_a_OBJECTS = synchronizeable.$(OBJEXT) \
         network_manager.$(OBJEXT) network_socket.$(OBJEXT) \
-        connection_monitor.$(OBJEXT)
+        connection_monitor.$(OBJEXT) network_stream.$(OBJEXT) \
+        data_stream.$(OBJEXT)
 libORXnet_a_OBJECTS = $(am_libORXnet_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -187 +190 @@
                       network_manager.cc \
                       network_socket.cc \
-                      connection_monitor.cc
+                      connection_monitor.cc \
+                      network_stream.cc \
+                      data_stream.cc
 
 noinst_HEADERS = synchronizeable.h \
                  network_manager.h \
-                 network_socket.h \
-                 connection_monitor.h
+                 network_socket.h \
+                 connection_monitor.h \
+                 network_stream.h \
+                 data_stream.h
 
 all: all-am
@@ -242 +249 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection_monitor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_stream.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_socket.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_stream.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synchronizeable.Po@am__quote@
 

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

@@ -19 +19 @@
 */
 #define DEBUG_MODULE_NETWORK
+
+
+#include "network_stream.h"
+#include "list.h"
 
 
@@ -63 +67 @@
 
 
-
-
 /**
  *  standard constructor
  */
 NetworkManager::NetworkManager()
-{}
+{
+  this->netStreamList = new tList<NetworkStream>();
+  NetworkStream* ns = new NetworkStream();
+}
 
 

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

@@ -2 +2 @@
  * @file network_manager.h
   *  Main interface for the network module. Manages all the modules
-
 */
 
@@ -14 +13 @@
 #include "base_object.h"
 
+/* this are class predefinitions. the includes are in the source file */
+class NetworkStream;
+template<typename> class tList;
 
-
+/* and here is the class itsself*/
 class NetworkManager : public BaseObject
 {
@@ -32 +34 @@
   void synchronize();
 
+private:
+  tList<NetworkStream>*    netStreamList;            // list with refs to all network streams
+   
 };