Changeset 9398 in orxonox.OLD

Timestamp:

Jul 23, 2006, 11:43:27 PM (18 years ago)

Author:

patrick

Message:

new settings init

Location:

branches/proxy/src

Files:

• lib/network/network_manager.cc (modified) (1 diff)
• lib/network/proxy/network_settings.cc (modified) (5 diffs)
• lib/network/shared_network_data.cc (modified) (1 diff)
• lib/network/shared_network_data.h (modified) (1 diff)
• orxonox.cc (modified) (4 diffs)

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

@@ -126 +126 @@
 int NetworkManager::createProxyServer(unsigned int port)
 {
-  // init the proxy settings data do this before everything else is done here
-  NetworkSettings::getInstance()->loadData();
-
   // create the network stream
   this->networkStream = new NetworkStream(NET_PROXY_SERVER_ACTIVE);

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

@@ -17 +17 @@
 
 #include "network_settings.h"
+
 #include "netdefs.h"
+#include "shared_network_data.h"
 
 #include "loading/resource_manager.h"
@@ -38 +40 @@
   // suggest a good standard max players value
   this->maxPlayer = 10;
+
+  this->loadData();
 }
 
@@ -82 +86 @@
 
   this->loadNetworkSettings( root);
+
+  // set the new unique id offset
+  SharedNetworkData::getInstance()->setNewUniqueID( this->maxPlayer + 2);
 }
 
@@ -120 +127 @@
 }
 
+
 /**
  * sets the proxy address to
@@ -126 +134 @@
 void NetworkSettings::setProxyAddr(const std::string& proxyAddr)
 {
+
+  if( !SharedNetworkData::getInstance()->isMasterServer())
+    return;
+
   IPaddress *ip = new IPaddress;
 

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

@@ -40 +40 @@
   // setUniqueID( maxCon+2 ) because we need one id for every handshake
   // and one for handshake to reject client maxCon+1
-  this->newUniqueID = NetworkSettings::getInstance()->getMaxPlayer() + 2;
+  this->newUniqueID = 2;
 }
 

branches/proxy/src/lib/network/shared_network_data.h

@@ -29 +29 @@
     /** @returns the next uniqueID free for an object */
     inline int getNewUniqueID() { return ( this->nodeType != NET_CLIENT)?this->newUniqueID++:-1; }
+    /** sets the @param newUniqueID: the new offset for the next unique id */
+    inline void setNewUniqueID(int newUniqueID) { this->newUniqueID = newUniqueID; }
 
     /** @returns true is this node is a master server */

branches/proxy/src/orxonox.cc

@@ -58 +58 @@
 
 #include "network_manager.h"
+#include "shared_network_data.h"
 
 #include "state.h"
@@ -308 +309 @@
   {
     State::setOnline(true);
+    SharedNetworkData::getInstance()->setNodeType(NET_CLIENT);
     NetworkManager::getInstance()->createClient(this->serverName, port);
   }
@@ -313 +315 @@
   {    // we are a master server
     State::setOnline(true);
+    SharedNetworkData::getInstance()->setNodeType(NET_MASTER_SERVER);
+
     NetworkManager::getInstance()->createMasterServer(port);
   }
@@ -318 +322 @@
   {    // we are a proxy server
     State::setOnline(true);
+    SharedNetworkData::getInstance()->setNodeType(NET_PROXY_SERVER_ACTIVE);
     NetworkManager::getInstance()->createProxyServer(port);
   }