Changeset 9405 in orxonox.OLD

Timestamp:

Jul 24, 2006, 10:52:34 AM (18 years ago)

Author:

patrick

Message:

found server bug: initialization order inconsistency

Location:

branches/proxy/src

Files:

• lib/network/network_manager.cc (modified) (3 diffs)
• lib/network/network_stream.cc (modified) (4 diffs)
• lib/network/proxy/network_settings.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)

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

@@ -105 +105 @@
 int NetworkManager::createMasterServer(unsigned int port)
 {
+  // load the network settings
+  NetworkSettings::getInstance()->loadData();
+
   // create the network stream
   this->networkStream = new NetworkStream(NET_MASTER_SERVER);
@@ -123 +126 @@
 int NetworkManager::createProxyServer(unsigned int port)
 {
+  // load the network settings
+  NetworkSettings::getInstance()->loadData();
+
   // create the network stream
   this->networkStream = new NetworkStream(NET_PROXY_SERVER_ACTIVE);
@@ -148 +154 @@
 int NetworkManager::createClient(const std::string & name, unsigned int port)
 {
+  // load the network settings
+  NetworkSettings::getInstance()->loadData();
+
   // create the network stream
   this->networkStream = new NetworkStream(NET_CLIENT);

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

@@ -80 +80 @@
       // init the shared network data
       SharedNetworkData::getInstance()->setHostID(0);
-      SharedNetworkData::getInstance()->setNodeType(NET_MASTER_SERVER);
+//       SharedNetworkData::getInstance()->setNodeType(NET_MASTER_SERVER);
       break;
 
@@ -86 +86 @@
       // init the shared network data
       SharedNetworkData::getInstance()->setHostID(0);
-      SharedNetworkData::getInstance()->setNodeType(NET_PROXY_SERVER_ACTIVE);
+//       SharedNetworkData::getInstance()->setNodeType(NET_PROXY_SERVER_ACTIVE);
       break;
     case NET_PROXY_SERVER_PASSIVE:
             // init the shared network data
       SharedNetworkData::getInstance()->setHostID(0);
-      SharedNetworkData::getInstance()->setNodeType(NET_PROXY_SERVER_PASSIVE);
+//       SharedNetworkData::getInstance()->setNodeType(NET_PROXY_SERVER_PASSIVE);
       break;
     case NET_CLIENT:
-      SharedNetworkData::getInstance()->setNodeType(NET_CLIENT);
+//       SharedNetworkData::getInstance()->setNodeType(NET_CLIENT);
       break;
   }
@@ -380 +380 @@
           clientId = it->first + 1;
     }
-
     peers[clientId].socket = tempNetworkSocket;
+
+
     // create new handshake and init its variables
-    peers[clientId].handshake = new Handshake(this->pInfo->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID() );
+    peers[clientId].handshake = new Handshake(this->pInfo->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID());
     peers[clientId].handshake->setUniqueID(clientId);
 
@@ -403 +404 @@
 
     // check if the connecting client should reconnect to a proxy server
-    peers[clientId].handshake->setRedirect(this->networkMonitor->isReconnectNextClient());
+    peers[clientId].handshake->setRedirect(/*this->networkMonitor->isReconnectNextClient()*/false);
 
     // the connecting node of course is a client

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

@@ -41 +41 @@
   this->maxPlayer = 10;
 
-  this->loadData();
+//   this->loadData();
 }
 

branches/proxy/src/orxonox.cc

@@ -306 +306 @@
   std::string gameType = Preferences::getInstance()->getString( "game", "gameType", "" );
 
-  if( gameType == "multiplayer_client") // we are a client
-  {
+  if( gameType == "multiplayer_client")
+  {    // we are a client
     State::setOnline(true);
     SharedNetworkData::getInstance()->setNodeType(NET_CLIENT);