Changeset 7738 for code/branches

Timestamp:

Dec 8, 2010, 4:13:02 PM (14 years ago)

Author:

smerkli

Message:

aaaand it works

Location:

code/branches/masterserver/src/libraries/network

Files:

• WANDiscovery.cc (modified) (3 diffs)
• WANDiscovery.h (modified) (1 diff)

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

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

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

@@ -100 +100 @@
 
       /** master server address */
-      std::string msaddr;
+      std::string msaddress;
 
   }; // tolua_export