Changeset 7662

Timestamp:

Nov 24, 2010, 3:29:56 PM (13 years ago)

Author:

smerkli

Message:

fatal bug found.

Location:

code/branches/masterserver/src

Files:

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

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

@@ -83 +83 @@
 
     if (this->peer == NULL )
-    { fprintf( stderr, 
-        "No available peers for initiating an ENet connection.\n");
+    { COUT(2) << "ERROR: No available peers for initiating an ENet connection.\n";
     //exit (EXIT_FAILURE);
     return -1;

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

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

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

@@ -35 +35 @@
 {
   /* singleton stuff */
-  ManageScopedSingleton( MasterServer, ScopeID::Root, false );
+  //ManageScopedSingleton( MasterServer, ScopeID::Root, false );
 
   /***** EVENTS *****/
@@ -166 +166 @@
           /* build reply string */
           char *tosend = (char *)calloc( (*i).getServerIP().length() + MSPROTO_SERVERLIST_ITEM_LEN + 2,1 );
-          sprintf( "%s %s", MSPROTO_SERVERLIST_ITEM, (*i).getServerIP().c_str() );
+          sprintf( tosend, "%s %s", MSPROTO_SERVERLIST_ITEM, (*i).getServerIP().c_str() );
 
           /* create packet from it */