Changeset 7737

Timestamp:

Dec 8, 2010, 4:08:22 PM (13 years ago)

Author:

smerkli

Message:

pre-merge

Location:

code/branches/masterserver/src/libraries/network

Files:

• WANDiscovery.cc (modified) (2 diffs)
• WANDiscovery.h (modified) (4 diffs)

code/branches/masterserver/src/libraries/network/WANDiscovery.cc

@@ -41 +41 @@
   ManageScopedSingleton(WANDiscovery, ScopeID::Root, true);
 
+  void WANDiscovery::setConfigValues()
+  {
+    SetConfigValue(this->msaddr, "msaddr");
+  } 
+
   WANDiscovery::WANDiscovery()
   {
+    /* debugging output */
     COUT(4) << "Creating WANDiscovery.\n";
+  
+    /* register object with orxonox main class */
+    RegisterObject(WANDiscovery);
+
+    /* set default string for this->msaddr */
+    this->msaddr = "localhost";
+
+    /* ... and register a config value function for it */
+    this->setConfigValues();
 
     /* initialize it and see if it worked */
@@ -50 +65 @@
 
     /* connect and see if it worked */
-    if( msc.connect( MS_ADDRESS, 1234 ) )
+    if( msc.connect( this->msaddr.c_str(), 1234 ) )
       COUT(2) << "Error: could not connect to master server at " 
-        << MS_ADDRESS << std::endl;
+        << this->msaddr << std::endl;
 
+    /* debugging output */
     COUT(4) << "Initialization of WANDiscovery complete.\n";
   }

code/branches/masterserver/src/libraries/network/WANDiscovery.h

@@ -32 +32 @@
 #include "NetworkPrereqs.h"
 #include "packet/ServerInformation.h"
+#include "core/ConfigFileManager.h"
 #include "util/Singleton.h"
+#include "core/OrxonoxClass.h"
+#include "core/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
 #include "MasterServerComm.h"
 #include "MasterServerProtocol.h"
@@ -46 +50 @@
   class _NetworkExport WANDiscovery
 // tolua_end
-    : public Singleton<WANDiscovery>
+    : public Singleton<WANDiscovery>, public OrxonoxClass
   { // tolua_export
     friend class Singleton<WANDiscovery>;
@@ -84 +88 @@
       /** game server list */
       std::vector<packet::ServerInformation> servers_;
+
+      /** Function used for the configuration file parameter update */
+      void setConfigValues();
       
     private:
@@ -92 +99 @@
       MasterServerComm msc;
 
+      /** master server address */
+      std::string msaddr;
+
   }; // tolua_export