Changeset 7688 for code/branches

Timestamp:

Dec 1, 2010, 2:11:44 PM (14 years ago)

Author:

smerkli

Message:

further debugging.

Location:

code/branches/masterserver/src

Files:

• libraries/network/MasterServerProtocol.h (modified) (1 diff)
• libraries/network/WANDiscovery.cc (modified) (1 diff)
• modules/masterserver/MasterServer.cc (modified) (1 diff)

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

@@ -31 +31 @@
 
 /* master server address (to be moved elsewhere later) */
-#define MS_ADDRESS "129.132.3.227"
+#define MS_ADDRESS "172.16.113.1"
 
 #define MSPROTO_CLIENT "CL"

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

@@ -51 +51 @@
     /* connect and see if it worked */
     if( msc.connect( MS_ADDRESS, 1234 ) )
-      COUT(2) << "Error: could not connect to master server!\n";
+      COUT(2) << "Error: could not connect to master server at " 
+        << MS_ADDRESS << std::endl;
 
     COUT(4) << "Initialization of WANDiscovery complete.\n";

code/branches/masterserver/src/modules/masterserver/MasterServer.cc

@@ -35 +35 @@
 {
   /* singleton stuff */
-  //ManageScopedSingleton( MasterServer, ScopeID::Root, false );
+  ManageScopedSingleton( MasterServer, ScopeID::Root, false );
 
   /* helpers */