[Orxonox-commit 2963] r7662 - in code/branches/masterserver/src: libraries/network modules/masterserver

[smerkli at orxonox.net]

Author: smerkli
Date: 2010-11-24 15:29:56 +0100 (Wed, 24 Nov 2010)
New Revision: 7662

Modified:
   code/branches/masterserver/src/libraries/network/MasterServerComm.cc
   code/branches/masterserver/src/libraries/network/MasterServerProtocol.h
   code/branches/masterserver/src/modules/masterserver/MasterServer.cc
Log:
fatal bug found.

Modified: code/branches/masterserver/src/libraries/network/MasterServerComm.cc
===================================================================
--- code/branches/masterserver/src/libraries/network/MasterServerComm.cc	2010-11-24 14:00:11 UTC (rev 7661)
+++ code/branches/masterserver/src/libraries/network/MasterServerComm.cc	2010-11-24 14:29:56 UTC (rev 7662)
@@ -82,8 +82,7 @@
     this->peer = enet_host_connect(this->client, &this->address, 2, 0);    
 
     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;
     }

Modified: code/branches/masterserver/src/libraries/network/MasterServerProtocol.h
===================================================================
--- code/branches/masterserver/src/libraries/network/MasterServerProtocol.h	2010-11-24 14:00:11 UTC (rev 7661)
+++ code/branches/masterserver/src/libraries/network/MasterServerProtocol.h	2010-11-24 14:29:56 UTC (rev 7662)
@@ -30,7 +30,7 @@
 #define MASTER_SERVER_PROTO
 
 /* 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"
 #define MSPROTO_CLIENT_LEN 2 

Modified: code/branches/masterserver/src/modules/masterserver/MasterServer.cc
===================================================================
--- code/branches/masterserver/src/modules/masterserver/MasterServer.cc	2010-11-24 14:00:11 UTC (rev 7661)
+++ code/branches/masterserver/src/modules/masterserver/MasterServer.cc	2010-11-24 14:29:56 UTC (rev 7662)
@@ -34,7 +34,7 @@
 namespace orxonox 
 {
   /* singleton stuff */
-  ManageScopedSingleton( MasterServer, ScopeID::Root, false );
+  //ManageScopedSingleton( MasterServer, ScopeID::Root, false );
 
   /***** EVENTS *****/
   /* connect event */
@@ -165,7 +165,7 @@
           /* send this particular server */
           /* 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 */
           ENetPacket * reply = enet_packet_create( tosend,