Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5566 in orxonox.OLD for branches


Ignore:
Timestamp:
Nov 15, 2005, 1:00:55 AM (19 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:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/network/src/lib/network/Makefile.am

    r5554 r5566  
    88                      network_socket.cc \
    99                      connection_monitor.cc \
    10                   data_stream.cc
     10                      network_stream.cc \
     11                      data_stream.cc
    1112
    1213
     
    1617                 network_socket.h \
    1718                 connection_monitor.h \
     19                 network_stream.h \
    1820                 data_stream.h
    1921
  • branches/network/src/lib/network/Makefile.in

    r5533 r5566  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.9.5 from Makefile.am.
    22# @configure_input@
    33
     
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXnet_a_SOURCES)
    1719
    1820srcdir = @srcdir@
     
    5658am_libORXnet_a_OBJECTS = synchronizeable.$(OBJEXT) \
    5759        network_manager.$(OBJEXT) network_socket.$(OBJEXT) \
    58         connection_monitor.$(OBJEXT)
     60        connection_monitor.$(OBJEXT) network_stream.$(OBJEXT) \
     61        data_stream.$(OBJEXT)
    5962libORXnet_a_OBJECTS = $(am_libORXnet_a_OBJECTS)
    6063DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
     
    187190                      network_manager.cc \
    188191                      network_socket.cc \
    189                       connection_monitor.cc
     192                      connection_monitor.cc \
     193                      network_stream.cc \
     194                      data_stream.cc
    190195
    191196noinst_HEADERS = synchronizeable.h \
    192197                 network_manager.h \
    193                  network_socket.h \
    194                  connection_monitor.h
     198                 network_socket.h \
     199                 connection_monitor.h \
     200                 network_stream.h \
     201                 data_stream.h
    195202
    196203all: all-am
     
    242249
    243250@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection_monitor.Po@am__quote@
     251@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_stream.Po@am__quote@
    244252@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_manager.Po@am__quote@
    245253@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_socket.Po@am__quote@
     254@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_stream.Po@am__quote@
    246255@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synchronizeable.Po@am__quote@
    247256
  • branches/network/src/lib/network/network_manager.cc

    r5530 r5566  
    1919*/
    2020#define DEBUG_MODULE_NETWORK
     21
     22
     23#include "network_stream.h"
     24#include "list.h"
    2125
    2226
     
    6367
    6468
    65 
    66 
    6769/**
    6870 *  standard constructor
    6971 */
    7072NetworkManager::NetworkManager()
    71 {}
     73{
     74  this->netStreamList = new tList<NetworkStream>();
     75  NetworkStream* ns = new NetworkStream();
     76}
    7277
    7378
  • branches/network/src/lib/network/network_manager.h

    r5533 r5566  
    22 * @file network_manager.h
    33  *  Main interface for the network module. Manages all the modules
    4 
    54*/
    65
     
    1413#include "base_object.h"
    1514
     15/* this are class predefinitions. the includes are in the source file */
     16class NetworkStream;
     17template<typename> class tList;
    1618
    17 
     19/* and here is the class itsself*/
    1820class NetworkManager : public BaseObject
    1921{
     
    3234  void synchronize();
    3335
     36private:
     37  tList<NetworkStream>*    netStreamList;            // list with refs to all network streams
     38   
    3439};
    3540
Note: See TracChangeset for help on using the changeset viewer.