Changeset 9479 in orxonox.OLD for branches

Timestamp:

Jul 25, 2006, 11:52:37 PM (18 years ago)

Author:

patrick

Message:

proxy server not able to load the world file, some more safty in the handshake handling

Location:

branches/proxy/src

Files:

• lib/network/network_stream.cc (modified) (4 diffs)
• story_entities/multi_player_world_data.cc (modified) (4 diffs)

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

@@ -555 +555 @@
           // write the first informations into the node so they can be read from there for case differentiation
           it->second.nodeType = it->second.handshake->getRemoteNodeType();
-          it->second.ip = it->second.socket->getRemoteAddress();
 
           // the counter part didn't mark it free for deletion yet
@@ -568 +567 @@
               this->pInfo->userId = SharedNetworkData::getInstance()->getHostID();
 
+              it->second.ip = it->second.socket->getRemoteAddress();
+
 //               it->second.nodeType = it->second.handshake->getRemoteNodeType();
 //               it->second.ip = it->second.socket->getRemoteAddress();
@@ -602 +603 @@
               if (  SharedNetworkData::getInstance()->isMasterServer() )
               {
+                it->second.ip = it->second.socket->getRemoteAddress();
+
                 this->networkMonitor->addNode(&it->second);
 
@@ -613 +616 @@
               else if ( SharedNetworkData::getInstance()->isProxyServerActive() && it->second.isClient() )
               {
-                it->second.nodeType = it->second.handshake->getRemoteNodeType();
                 it->second.ip = it->second.socket->getRemoteAddress();
 

branches/proxy/src/story_entities/multi_player_world_data.cc

@@ -112 +112 @@
   const TiXmlElement* element = NULL;
 
-  if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+  if( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
   {
     /* load the spawning points */
@@ -148 +148 @@
     element = element->FirstChildElement();
 
-    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+    if( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
     {
       while( element != NULL)
@@ -206 +206 @@
 
 
-    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+    if( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
     {
       this->localPlayer = new Player();
@@ -284 +284 @@
 
   // create server playable
-  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+  if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
   {
     NetworkGameManager::getInstance()->signalNewPlayer( 0 );