Changeset 6678 in orxonox.OLD for branches/network

Timestamp:

Jan 24, 2006, 10:22:33 PM (19 years ago)

Author:

patrick

Message:

network: sys better now, got less errors and removed the pnode link sync alg, replacing

Location:

branches/network/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (2 diffs)
• lib/network/Makefile.am (modified) (2 diffs)
• lib/network/netdefs.h (modified) (1 diff)
• lib/network/network_game_manager.cc (modified) (3 diffs)
• lib/network/network_manager.cc (modified) (6 diffs)
• lib/network/network_manager.h (modified) (3 diffs)
• lib/network/network_stream.cc (modified) (1 diff)
• lib/network/network_stream.h (modified) (1 diff)
• lib/network/shared_network_data.cc (added)
• lib/network/shared_network_data.h (added)
• lib/network/synchronizeable.cc (modified) (3 diffs)
• world_entities/movie_entity.cc (modified) (1 diff)

branches/network/src/defs/class_id.h

@@ -147 +147 @@
   CL_GLGUI_MAIN_WIDGET          =    0x00000f41,
   CL_NETWORK_MANAGER            =    0x00000f50,
+  CL_SHARED_NETWORK_DATA        =    0x00000f51,
 
 

branches/network/src/lib/coord/p_node.cc

@@ -1084 +1084 @@
   this->setRelDir( Quaternion( Vector(f2, f3, f4), f1 ) );
 
-  int n;
-  char * childName;
-
-  PRINTF(0)("JKLO %d %d %d %d\n", data[__synchelp_read_i], data[__synchelp_read_i+1], data[__synchelp_read_i+2], data[__synchelp_read_i+3]);
-  SYNCHELP_READ_INT( n );
-  PRINTF(0)("read %s:n=%d\n", this->getName(), n);
-
-  for (int i = 0; i<n; i++)
-  {
-    SYNCHELP_READ_STRINGM( childName );
-    PRINTF(0)("RCVD CHILD = %s\n", childName);
-    addChild( childName );
-    delete childName;
-    childName = NULL;
-  }
+//   int n;
+//   char * childName;
+//
+//   PRINTF(0)("JKLO %d %d %d %d\n", data[__synchelp_read_i], data[__synchelp_read_i+1], data[__synchelp_read_i+2], data[__synchelp_read_i+3]);
+//   SYNCHELP_READ_INT( n );
+//   PRINTF(0)("read %s:n=%d\n", this->getName(), n);
+//
+//   for (int i = 0; i<n; i++)
+//   {
+//     SYNCHELP_READ_STRINGM( childName );
+//     PRINTF(0)("RCVD CHILD = %s\n", childName);
+//     addChild( childName );
+//     delete childName;
+//     childName = NULL;
+//   }
 
   return SYNCHELP_READ_N;
@@ -1135 +1135 @@
   SYNCHELP_WRITE_FLOAT( this->relDirection.v.z );
 
-  int n = children.size();
-
-  //check if camera is in children
-  for (std::list<PNode*>::const_iterator it = children.begin(); it!=children.end(); it++)
-  {
-    if ( (*it)->isA(CL_CAMERA) )
-      n--;
-  }
-  PRINTF(0)("write %s:n=%d\n", this->getName(), n);
-  SYNCHELP_WRITE_INT( n );
-  PRINTF(0)("ASDF %d %d %d %d\n", data[__synchelp_write_i-4], data[__synchelp_write_i-3], data[__synchelp_write_i-2], data[__synchelp_write_i-1]);
-
-  for (std::list<PNode*>::const_iterator it = children.begin(); it!=children.end(); it++)
-  {
-    //dont add camera because there is only one camera attached to local player
-    if ( !(*it)->isA(CL_CAMERA) )
-    {
-      PRINTF(0)("SENDING CHILD: %s\n", (*it)->getName());
-      SYNCHELP_WRITE_STRING( (*it)->getName() );
-    }
-  }
+//   int n = children.size();
+//   //check if camera is in children
+//   for (std::list<PNode*>::const_iterator it = children.begin(); it!=children.end(); it++)
+//   {
+//     if ( (*it)->isA(CL_CAMERA) )
+//       n--;
+//   }
+//   PRINTF(0)("write %s:n=%d\n", this->getName(), n);
+//   SYNCHELP_WRITE_INT( n );
+//   PRINTF(0)("ASDF %d %d %d %d\n", data[__synchelp_write_i-4], data[__synchelp_write_i-3], data[__synchelp_write_i-2], data[__synchelp_write_i-1]);
+//
+//
+//   for (std::list<PNode*>::const_iterator it = children.begin(); it!=children.end(); it++)
+//   {
+//     //dont add camera because there is only one camera attached to local player
+//     if ( !(*it)->isA(CL_CAMERA) )
+//     {
+//       PRINTF(0)("SENDING CHILD: %s\n", (*it)->getName());
+//       SYNCHELP_WRITE_STRING( (*it)->getName() );
+//     }
+//   }
 
   return SYNCHELP_WRITE_N;

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

@@ -6 +6 @@
 libORXnet_a_SOURCES = synchronizeable.cc \
                       network_manager.cc \
+                      shared_network_data.cc \
                       network_socket.cc \
                       connection_monitor.cc \
@@ -21 +22 @@
 noinst_HEADERS = synchronizeable.h \
                  network_manager.h \
+                 shared_network_data.h \
                  network_socket.h \
                  connection_monitor.h \

branches/network/src/lib/network/netdefs.h

@@ -17 +17 @@
 
 
+#define MAX_CONNECTIONS 1000
+
+
 typedef unsigned char byte;
 

branches/network/src/lib/network/network_game_manager.cc

@@ -213 +213 @@
   if ( this->isServer())
   {
-    if ( NetworkManager::getInstance()->getNewUniqueID() < 0 )
+    if ( SharedNetworkData::getInstance()->getNewUniqueID() < 0 )
     {
       PRINTF(1)("Cannot create entity! There are no more uniqueIDs left!\n");
       return -1;
     }
-    return this->executeCreateEntity( classID, NetworkManager::getInstance()->getNewUniqueID(), owner );
+    return this->executeCreateEntity( classID, SharedNetworkData::getInstance()->getNewUniqueID(), owner );
   }
   else
@@ -237 +237 @@
   if ( this->isServer() )
   {
-    if ( NetworkManager::getInstance()->getNewUniqueID() < 0 )
+    if ( SharedNetworkData::getInstance()->getNewUniqueID() < 0 )
     {
       PRINTF(1)("Cannot create entity! There are no more uniqueIDs left!\n");
@@ -255 +255 @@
     {
       Synchronizeable * s = dynamic_cast<Synchronizeable*>(b);
-      s->setUniqueID( NetworkManager::getInstance()->getNewUniqueID() );
+      s->setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
       s->setOwner( 0 );
       // all entities created via this function are added automaticaly to the synchronizeable list

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

@@ -20 +20 @@
 #define DEBUG_MODULE_NETWORK
 
-
-#include "network_stream.h"
 #include "class_list.h"
-
 #include "debug.h"
 #include "shell_command.h"
@@ -29 +26 @@
 /* include your own header */
 #include "network_manager.h"
+#include "shared_network_data.h"
+#include "network_stream.h"
 
 
@@ -52 +51 @@
   this->syncList = NULL;
   this->defaultSyncStream = NULL;
-
-  this->hostID = -1;
-  this->newUniqueID = MAX_CONNECTIONS + 2;
-  this->bGameServer = false;
+  this->sharedNetworkData = SharedNetworkData::getInstance();
 
   PRINTF(0)("NetworkManager created\n");
@@ -102 +98 @@
 
   this->defaultSyncStream = new NetworkStream(ipAddress);
+  this->sharedNetworkData->setDefaultSyncStream(this->defaultSyncStream);
   this->defaultSyncStream->startHandshake();
   return 1;
@@ -113 +110 @@
 int NetworkManager::createServer(unsigned int port)
 {
-  this->hostID = 0;
-  this->bGameServer = true;
+  this->sharedNetworkData->setHostID(0);
+  this->sharedNetworkData->setGameServer(true);
   this->defaultSyncStream = new NetworkStream(port);
+  this->sharedNetworkData->setDefaultSyncStream(this->defaultSyncStream);
   this->defaultSyncStream->createNetworkGameManager();
   PRINTF(0)("CREATE SERVER\n");
-  this->bGameServer = true;
   SDL_Delay(20);
   return 1;
-}
-
-
-/**
- *  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(IPaddress& address, Synchronizeable& sync)
-{
-  /* creating a new network stream, it will register itself automaticaly to the class list */
-  this->defaultSyncStream = new NetworkStream(address);
-  this->defaultSyncStream->connectSynchronizeable(sync);
-}
-
-
-/**
- *  teardown a connection
- */
-void NetworkManager::shutdownConnection()
-{
-  PRINTF(0)("Shutdown connection\n");
 }
 
@@ -167 +142 @@
 }
 
-/**
- * Sets the hostID to a specific number
- * @param id: The new ID
- */
-void NetworkManager::setHostID(int id)
-{
-    this->hostID = id;
-}
-
 
 

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

@@ -6 +6 @@
 /* you will want to add such a a line at your header file also, since it will
    prevent c++ from including your code twice*/
-#ifndef _NETWORK_MANGER
+#ifndef _NETWORK_MANAGER
 #define _NETWORK_MANAGER
 
 /* include this file, it contains some default definitions */
 #include "netdefs.h"
+#include "shared_network_data.h"
 
 /* include base_object.h since all classes are derived from this one */
@@ -38 +39 @@
     int createServer(unsigned int port);
 
-    NetworkStream& establishConnection(IPaddress& address, Synchronizeable& sync);
-    void shutdownConnection();
-
-
-    void setHostID(int id);
     /** Returns the hostID @return The hostID of the object */
-    inline int getHostID() { return this->hostID; }
-    inline bool isGameServer() { return this->bGameServer; }
+    inline int getHostID() { return this->sharedNetworkData->getHostID(); }
+    inline bool isGameServer() { return this->sharedNetworkData->isGameServer(); }
 
 
     void connectSynchronizeable(Synchronizeable& sync);
     void synchronize();
-
-    inline NetworkStream* getDefaultSyncStream() { return this->defaultSyncStream; }
-
-    /** @returns the next uniqueID free for an object */
-    inline int getNewUniqueID() { return ( this->bGameServer)?this->newUniqueID++:-1; }
 
     void debug();
@@ -68 +59 @@
     static NetworkManager*           singletonRef;            //!< Pointer to the only instance of this Class
     NetworkStream*                   defaultSyncStream;       //!< FIXME: this is only for testing purposes
-    int                              hostID;                  //!< The Host-ID of the Manager
-    bool                             bGameServer;             //!< true if it is a server
-    int                              newUniqueID;
 
+    SharedNetworkData*               sharedNetworkData;       //!< reference to the shared data
 };
 

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

@@ -194 +194 @@
           if ( type != NET_SERVER )
           {
-            NetworkManager::getInstance()->setHostID( handshakes[i]->getHostId() );
+            SharedNetworkData::getInstance()->setHostID( handshakes[i]->getHostId() );
             myHostId = NetworkManager::getInstance()->getHostID();
 

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

@@ -14 +14 @@
 #include "server_socket.h"
 #include "handshake.h"
-
-#define MAX_CONNECTIONS 1000
 
 class Synchronizeable;

branches/network/src/lib/network/synchronizeable.cc

@@ -17 +17 @@
 #define DEBUG_MODULE_NETWORK
 
-#include "synchronizeable.h"
-
-#include "network_manager.h"
+#include "shared_network_data.h"
 #include "network_stream.h"
 #include "netdefs.h"
 
 #include "assert.h"
+
+#include "synchronizeable.h"
+
 
 
@@ -34 +35 @@
   this->owner = 0;
   this->state = 0;
-  this->hostID = NetworkManager::getInstance()->getHostID();
+  this->hostID = SharedNetworkData::getInstance()->getHostID();
   this->setIsServer(this->hostID == 0);
   this->uniqueID = -1;
@@ -40 +41 @@
   this->setRequestedSync( false );
   this->setIsOutOfSync( !(this->isServer()) );
-
   this->bSynchronize = false;
 
-  NetworkStream* nd = NetworkManager::getInstance()->getDefaultSyncStream();
+  NetworkStream* nd = SharedNetworkData::getInstance()->getDefaultSyncStream();
   assert(nd != NULL);
   nd->connectSynchronizeable(*this);
-  this->setUniqueID(NetworkManager::getInstance()->getNewUniqueID());
+  this->setUniqueID(SharedNetworkData::getInstance()->getNewUniqueID());
 }
 

branches/network/src/world_entities/movie_entity.cc

@@ -56 +56 @@
 MovieEntity::~MovieEntity ()
 {
-  delete this->media_container;
+  if( this->media_container)
+    delete this->media_container;
 }