Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5829 in orxonox.OLD for branches/network/src/subprojects


Ignore:
Timestamp:
Nov 30, 2005, 9:43:05 AM (19 years ago)
Author:
patrick
Message:

network: much work on multiplayability, does not yet work

Location:
branches/network/src/subprojects/network
Files:
4 added
5 edited

Legend:

Unmodified
Added
Removed

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

    r5822 r5829  
    1515network_SOURCES=  network_unit_test.cc \
    1616                  simple_sync.cc \
     17                  read_sync.cc \
     18                  write_sync.cc \
    1719                  \
    1820                  \
    … …  
    2628
    2729noinst_HEADERS  =  network_unit_test.h \
    28                    simple_sync.h
     30                   simple_sync.h \
     31                   read_sync.h \
     32                   write_sync.h
    2933

  • branches/network/src/subprojects/network/Makefile.in

    r5822 r5829  
    5454PROGRAMS = $(bin_PROGRAMS)
    5555am_network_OBJECTS = network-network_unit_test.$(OBJEXT) \
    56         network-simple_sync.$(OBJEXT) network-base_object.$(OBJEXT) \
     56        network-simple_sync.$(OBJEXT) network-read_sync.$(OBJEXT) \
     57        network-write_sync.$(OBJEXT) network-base_object.$(OBJEXT) \
    5758        network-class_list.$(OBJEXT) network-load_param.$(OBJEXT) \
    5859        network-substring.$(OBJEXT) network-helper_functions.$(OBJEXT)
    … …  
    193194network_SOURCES = network_unit_test.cc \
    194195                  simple_sync.cc \
     196                  read_sync.cc \
     197                  write_sync.cc \
    195198                  \
    196199                  \
    … …  
    202205
    203206noinst_HEADERS = network_unit_test.h \
    204                    simple_sync.h
     207                   simple_sync.h \
     208                   read_sync.h \
     209                   write_sync.h
    205210
    206211all: all-am
    … …  
    275280@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network-load_param.Po@am__quote@
    276281@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network-network_unit_test.Po@am__quote@
     282@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network-read_sync.Po@am__quote@
    277283@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network-simple_sync.Po@am__quote@
    278284@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network-substring.Po@am__quote@
     285@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network-write_sync.Po@am__quote@
    279286
    280287.cc.o:
    … …  
    319326@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    320327@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network-simple_sync.obj `if test -f 'simple_sync.cc'; then $(CYGPATH_W) 'simple_sync.cc'; else $(CYGPATH_W) '$(srcdir)/simple_sync.cc'; fi`
     328
     329network-read_sync.o: read_sync.cc
     330@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network-read_sync.o -MD -MP -MF "$(DEPDIR)/network-read_sync.Tpo" -c -o network-read_sync.o `test -f 'read_sync.cc' || echo '$(srcdir)/'`read_sync.cc; \
     331@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/network-read_sync.Tpo" "$(DEPDIR)/network-read_sync.Po"; else rm -f "$(DEPDIR)/network-read_sync.Tpo"; exit 1; fi
     332@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='read_sync.cc' object='network-read_sync.o' libtool=no @AMDEPBACKSLASH@
     333@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     334@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network-read_sync.o `test -f 'read_sync.cc' || echo '$(srcdir)/'`read_sync.cc
     335
     336network-read_sync.obj: read_sync.cc
     337@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network-read_sync.obj -MD -MP -MF "$(DEPDIR)/network-read_sync.Tpo" -c -o network-read_sync.obj `if test -f 'read_sync.cc'; then $(CYGPATH_W) 'read_sync.cc'; else $(CYGPATH_W) '$(srcdir)/read_sync.cc'; fi`; \
     338@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/network-read_sync.Tpo" "$(DEPDIR)/network-read_sync.Po"; else rm -f "$(DEPDIR)/network-read_sync.Tpo"; exit 1; fi
     339@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='read_sync.cc' object='network-read_sync.obj' libtool=no @AMDEPBACKSLASH@
     340@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     341@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network-read_sync.obj `if test -f 'read_sync.cc'; then $(CYGPATH_W) 'read_sync.cc'; else $(CYGPATH_W) '$(srcdir)/read_sync.cc'; fi`
     342
     343network-write_sync.o: write_sync.cc
     344@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network-write_sync.o -MD -MP -MF "$(DEPDIR)/network-write_sync.Tpo" -c -o network-write_sync.o `test -f 'write_sync.cc' || echo '$(srcdir)/'`write_sync.cc; \
     345@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/network-write_sync.Tpo" "$(DEPDIR)/network-write_sync.Po"; else rm -f "$(DEPDIR)/network-write_sync.Tpo"; exit 1; fi
     346@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='write_sync.cc' object='network-write_sync.o' libtool=no @AMDEPBACKSLASH@
     347@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     348@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network-write_sync.o `test -f 'write_sync.cc' || echo '$(srcdir)/'`write_sync.cc
     349
     350network-write_sync.obj: write_sync.cc
     351@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network-write_sync.obj -MD -MP -MF "$(DEPDIR)/network-write_sync.Tpo" -c -o network-write_sync.obj `if test -f 'write_sync.cc'; then $(CYGPATH_W) 'write_sync.cc'; else $(CYGPATH_W) '$(srcdir)/write_sync.cc'; fi`; \
     352@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/network-write_sync.Tpo" "$(DEPDIR)/network-write_sync.Po"; else rm -f "$(DEPDIR)/network-write_sync.Tpo"; exit 1; fi
     353@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='write_sync.cc' object='network-write_sync.obj' libtool=no @AMDEPBACKSLASH@
     354@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     355@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network-write_sync.obj `if test -f 'write_sync.cc'; then $(CYGPATH_W) 'write_sync.cc'; else $(CYGPATH_W) '$(srcdir)/write_sync.cc'; fi`
    321356
    322357network-base_object.o: $(MAINSRCDIR)/lib/lang/base_object.cc

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

    r5822 r5829  
    1212
    1313#include "simple_sync.h"
     14#include "read_sync.h"
    1415
    1516int verbose = 4;
    … …  
    2526  printf(" --server [port number]     creates a test server\n");
    2627  printf(" --client [address] [port]  connects to a server\n");
     28  printf(" --listen [address] [port]  just listens to this connection");
    2729  printf("\n");
    2830}
    … …  
    7678
    7779#define _N_ELEMENTS 212994
     80
    7881  char sendbuf[_N_ELEMENTS+1];
    7982  char recvbuf[_N_ELEMENTS+1];
    … …  
    131134
    132135  /* create the network manager */
    133   NetworkManager* nm = new NetworkManager();
     136  NetworkManager* nm = NetworkManager::getInstance();
    134137
    135138  /* initialize the network manager */
    … …  
    143146  int error = SDLNet_ResolveHost(&ip, "127.0.0.1", port);
    144147  //SDLNet_ResolveHost(&ip, "localhost", port);
    145   if(error == -1) printf("\n\nerror on address resolution, program inconsistancy\n\n");
     148  if(error == -1)
     149    printf("\n\nerror on address resolution, program inconsistancy\n\n");
    146150  nm->establishConnection(ip, *clientSync);
    147151  /* adding some break for connection setup */
    … …  
    149153
    150154  /* synchronize the data 1 time (increment for longer tests) */
    151   for( int i = 0; i < 3; i++) {
     155  for( int i = 0; i < 3; i++)
     156  {
    152157    nm->synchronize();
    153158    /* simulate the network delay */
    … …  
    177182int startServer(int argc, char** argv)
    178183{
    179   if( argc <= 2) {
     184  if( argc <= 2)
     185  {
    180186    printf(" Wrong arguments try following notations:\n");
    181187    printf("   --server [port number]\n");
    … …  
    186192  printf("Starting Server on port %i\n", port);
    187193
    188   NetworkManager* netMan = new NetworkManager();
     194  NetworkManager* netMan = NetworkManager::getInstance();
    189195  Synchronizeable* ss = new SimpleSync("Server\0");
    190196
    191   //NetworkStream* server = new NetworkStream(port, ss, NET_SERVER);
    192197  netMan->createServer(*ss, port);
    193198  SDL_Delay(20);
    194199
    195   for(;;) {
     200  for(;;)
     201  {
    196202    netMan->synchronize();
    197203    SDL_Delay(500);
    198204  }
     205
     206  delete netMan;
     207  delete ss;
     208
     209
    199210  return 0;
    200211}
    … …  
    203214int startClient(int argc, char** argv)
    204215{
    205   if( argc < 3) {
     216  if( argc < 3)
     217  {
    206218    printf(" Wrong arguments try following notations:\n");
    207219    printf("   --client [server ip] [port number]\n");
    208     printf("   --server [server name] [port number]\n");
     220    printf("   --client [server name] [port number]\n");
    209221    return 0;
    210222  }
    … …  
    216228  IPaddress ip;
    217229  int error = SDLNet_ResolveHost(&ip, name, port);
    218   //SDLNet_ResolveHost(&ip, "localhost", port);
    219   if(error == -1) printf("\n\nerror on address resolution, program inconsistancy\n\n");
    220 
    221   NetworkManager* netMan = new NetworkManager();
     230  if(error == -1)
     231    printf("\n\nerror on address resolution, program inconsistancy\n\n");
     232
     233  NetworkManager* netMan = NetworkManager::getInstance();
    222234  Synchronizeable* ss = new SimpleSync("Client\0");
    223235
    224236  netMan->establishConnection(ip, *ss);
    225237
    226   for(;;) {
     238  for(;;)
     239  {
    227240    netMan->synchronize();
    228241    SDL_Delay(500);
    229242  }
    230243
    231   //NetworkStream* client = new NetworkStream(ip, ss, NET_CLIENT);
     244
     245  delete netMan;
     246  delete ss;
     247
     248  return 0;
     249}
     250
     251
     252
     253int startListen(int argc, char** argv)
     254{
     255  if( argc < 3)
     256  {
     257    printf(" Wrong arguments try following notations:\n");
     258    printf("   --listen [server ip] [port number]\n");
     259    printf("   --listen [server name] [port number]\n");
     260    return 0;
     261  }
     262
     263  char* name = argv[2];
     264  int port = atoi(argv[3]);
     265  printf("Connecting to %s, on port %i\n", name, port);
     266
     267  IPaddress ip;
     268  int error = SDLNet_ResolveHost(&ip, name, port);
     269  if(error == -1)
     270    printf("\n\nerror on address resolution, program inconsistancy\n\n");
     271
     272  NetworkManager* netMan = NetworkManager::getInstance();
     273  Synchronizeable* ss = new ReadSync("WriteSync\0");
     274
     275  netMan->establishConnection(ip, *ss);
     276
     277  for(;;)
     278  {
     279    netMan->synchronize();
     280    SDL_Delay(10);
     281  }
    232282
    233283
    … …  
    253303  {
    254304    //else if(!strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true;
    255     if (! strcmp( "--sockettest", argv[i]) || !strcmp("-st", argv[i])) return testSocket(argc, argv);
    256     else if (! strcmp( "--frameworktest", argv[i]) || !strcmp("-ft", argv[i])) return testFramework(argc, argv);
    257     else if (! strcmp( "--server", argv[i]) || !strcmp("-s", argv[i])) return startServer(argc, argv);
    258     else if (! strcmp( "--client", argv[i]) || !strcmp("-c", argv[i])) return startClient(argc, argv);
     305    if (! strcmp( "--sockettest", argv[i]) || !strcmp("-st", argv[i]))
     306      return testSocket(argc, argv);
     307    else if (! strcmp( "--frameworktest", argv[i]) || !strcmp("-ft", argv[i]))
     308      return testFramework(argc, argv);
     309    else if (! strcmp( "--server", argv[i]) || !strcmp("-s", argv[i]))
     310      return startServer(argc, argv);
     311    else if (! strcmp( "--client", argv[i]) || !strcmp("-c", argv[i]))
     312      return startClient(argc, argv);
     313    else if (! strcmp( "--listen", argv[i]) || !strcmp("-l", argv[i]))
     314      return startListen(argc, argv);
    259315  }
    260316

  • branches/network/src/subprojects/network/simple_sync.cc

    r5822 r5829  
    8686 *  read data from Synchronizeable
    8787 */
    88 int SimpleSync::readBytes(byte* data) const
     88int SimpleSync::readBytes(byte* data)
    8989{
    9090  PRINTF(0)("SimpleSync: sent %i bytes of data\n", this->outLength);

  • branches/network/src/subprojects/network/simple_sync.h

    r5822 r5829  
    1717
    1818    virtual void writeBytes(const byte* data, int length);
    19     virtual int readBytes(byte* data) const;
     19    virtual int readBytes(byte* data);
    2020
    2121
Note: See TracChangeset for help on using the changeset viewer.