Changeset 9474 in orxonox.OLD for branches/proxy

Timestamp:

Jul 25, 2006, 11:09:28 PM (18 years ago)

Author:

patrick

Message:

the hybrid mode should work now in a very closed setup

Location:

branches/proxy/src/lib/network

Files:

• README.NETWORK (modified) (1 diff)
• network_stream.cc (modified) (1 diff)
• player_stats.cc (modified) (1 diff)
• synchronizeable.cc (modified) (1 diff)

branches/proxy/src/lib/network/README.NETWORK

@@ -54 +54 @@
 =====================================
 The network node with the offset 0 is always the server to which the client must connect to (in case there are connections to other hosts at the same time).
+
+
+
+
+UNSOLVED:
+=========
+ - what if the proxy server gets a new client and wants to add it to the game? There are some problems waiting in the network game manager
+ - actualy the whole message sending system won't work in this network topic. proxys have to relay messages to clients
+
+
+

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

@@ -825 +825 @@
     // now compress the data with the zip library
     int compLength = 0;
-    if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
+    if ( SharedNetworkData::getInstance()->isMasterServer() ||
+         SharedNetworkData::getInstance()->isProxyServerActive())
       compLength = Zip::getInstance()->zip( buf, offset, compBuf, UDP_PACKET_SIZE, dictServer );
     else

branches/proxy/src/lib/network/player_stats.cc

@@ -191 +191 @@
 void PlayerStats::setNickName( std::string nick )
 {
-  if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/ )
+  if ( SharedNetworkData::getInstance()->isMasterServer())
   {
     this->nickName = nick;

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

@@ -72 +72 @@
     this->networkStream->disconnectSynchronizeable(*this);
 
-    if ( (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/ )
+    // remove the message manager only by the server
+    if ( (SharedNetworkData::getInstance()->isMasterServer() )
            && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( CL_MESSAGE_MANAGER ) )
       NetworkGameManager::getInstance()->removeSynchronizeable( this->getUniqueID() );