Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7662 for code


Ignore:
Timestamp:
Nov 24, 2010, 3:29:56 PM (14 years ago)
Author:
smerkli
Message:

fatal bug found.

Location:
code/branches/masterserver/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/masterserver/src/libraries/network/MasterServerComm.cc

    r7650 r7662  
    8383
    8484    if (this->peer == NULL )
    85     { fprintf( stderr,
    86         "No available peers for initiating an ENet connection.\n");
     85    { COUT(2) << "ERROR: No available peers for initiating an ENet connection.\n";
    8786    //exit (EXIT_FAILURE);
    8887    return -1;
  • code/branches/masterserver/src/libraries/network/MasterServerProtocol.h

    r7659 r7662  
    3131
    3232/* master server address (to be moved elsewhere later) */
    33 #define MS_ADDRESS "82.130.81.100"
     33#define MS_ADDRESS "129.132.3.227"
    3434
    3535#define MSPROTO_CLIENT "CL"
  • code/branches/masterserver/src/modules/masterserver/MasterServer.cc

    r7658 r7662  
    3535{
    3636  /* singleton stuff */
    37   ManageScopedSingleton( MasterServer, ScopeID::Root, false );
     37  //ManageScopedSingleton( MasterServer, ScopeID::Root, false );
    3838
    3939  /***** EVENTS *****/
     
    166166          /* build reply string */
    167167          char *tosend = (char *)calloc( (*i).getServerIP().length() + MSPROTO_SERVERLIST_ITEM_LEN + 2,1 );
    168           sprintf( "%s %s", MSPROTO_SERVERLIST_ITEM, (*i).getServerIP().c_str() );
     168          sprintf( tosend, "%s %s", MSPROTO_SERVERLIST_ITEM, (*i).getServerIP().c_str() );
    169169
    170170          /* create packet from it */
Note: See TracChangeset for help on using the changeset viewer.