Changeset 7650 for code/branches/masterserver/src/libraries/network/Server.cc

Timestamp:

Nov 17, 2010, 4:05:13 PM (13 years ago)

Author:

smerkli

Message:

Minimum target achieved for today, servers can log on to master server, clients can get server list. To be debugged.

File:

• code/branches/masterserver/src/libraries/network/Server.cc (modified) (3 diffs)

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

@@ -105 +105 @@
     /* initialize it and see if it worked */
     if( msc.initialize() )
-      COUT(1) << "Error: could not initialize master server communications!\n";
+    { COUT(1) << "Error: could not initialize master server communications!\n";
+      return;
+    }
 
     /* connect and see if it worked */
     if( msc.connect( MS_ADDRESS, 1234 ) )
-      COUT(1) << "Error: could not connect to master server!\n";
-
-    /* TODO */
+    { COUT(1) << "Error: could not connect to master server!\n";
+      return;
+    }
+
     /* now send the master server some note we're here */
+    msc.sendRequest( MSPROTO_GAME_SERVER " " MSPROTO_REGISTER_SERVER );
   }
 
@@ -164 +168 @@
 
   /* TODO */
-  int replyhandler( char *addr, ENetEvent *ev )
+  int rephandler( char *addr, ENetEvent *ev )
   { 
     /* handle incoming data */
@@ -174 +178 @@
   void Server::helper_HandleMasterServerRequests()
   { 
-    this->msc.pollForReply( replyhandler ); 
+    this->msc.pollForReply( rephandler ); 
   }