Changeset 7657 for code/branches/masterserver/src/libraries/network

Timestamp:

Nov 24, 2010, 2:07:53 PM (14 years ago)

Author:

smerkli

Message:

it has compiled.

Location:

code/branches/masterserver/src/libraries/network

Files:

• MasterServerProtocol.h (modified) (1 diff)
• WANDiscovery.cc (modified) (3 diffs)
• WANDiscovery.h (modified) (2 diffs)

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

@@ -37 +37 @@
 
 #define MSPROTO_REQ_LIST "REQ:LIST"
+#define MSPROTO_REQ_LIST_LEN 8
 
 

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

@@ -62 +62 @@
 
   /* callback for the network reply poller */
-  /* WORK MARK WORK WORK */
-  /* NOTE implement protocol-specific part here. */
-  int WANDiscovery::rhandler( char *addr, ENetEvent *ev )
+  int rhandler( char *addr, ENetEvent *ev )
   { 
+    /* error recognition */
+    if( !ev || !ev->packet || !ev->packet->data )
+    { COUT(2) << "Bad arguments received in WANDiscovery's reply handler.\n";
+      return 0;
+    }
+
     /* handle incoming data */
     /* if a list entry arrives add to list */
@@ -81 +85 @@
 
       /* add to list */
-      this->servers_.push_back( toadd );
+      WANDiscovery::getInstance().servers_.push_back( toadd );
     }
     else if( !strncmp( (char*)ev->packet->data, MSPROTO_SERVERLIST_END,
@@ -97 +101 @@
 
     /* send request to server */
-    msc.sendRequest( MSPROTO_CLIENT " " MSPROTO_REQ_LIST );
+    this->msc.sendRequest( MSPROTO_CLIENT " " MSPROTO_REQ_LIST );
 
     /* deal with replies */
-    while( !msc.pollForReply( WANDiscovery::rhandler ) ) 
+    while( !(this->msc).pollForReply( rhandler ) )
       /* nothing */;
 

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

@@ -78 +78 @@
       static WANDiscovery& getInstance() { return Singleton<WANDiscovery>::getInstance(); } // tolua_export
     
-      int rhandler( char *addr, ENetEvent *ev );
+      /** game server list */
+      std::vector<packet::ServerInformation> servers_;
       
     private:
@@ -87 +88 @@
       MasterServerComm msc;
 
-      /** game server list */
-      std::vector<packet::ServerInformation> servers_;
-
   }; // tolua_export