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

Timestamp:

Nov 17, 2010, 4:05:13 PM (15 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/MasterServerComm.cc (modified) (4 diffs)

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

@@ -111 +111 @@
       /* address buffer */
       char *addrconv = NULL;
+      int retval = 0;
 
       /* check what type of event it is and react accordingly */
@@ -136 +137 @@
           /* call the supplied callback, if any. */
           if( (*callback) != NULL )
-            (*callback)( addrconv, &(this->event) );
+            retval = (*callback)( addrconv, &(this->event) );
 
           enet_packet_destroy( event.packet );
@@ -145 +146 @@
 
       /* event handled, return 0 */
-      return 0;
+      return retval;
     }
 
@@ -158 +159 @@
     ENetPacket * packet = enet_packet_create( data, 
         strlen( data ) + 1, 
+        ENET_PACKET_FLAG_RELIABLE);
+
+    /* Send the packet to the peer over channel id 0. */
+    enet_peer_send (this->peer, 0, packet);
+
+    /* One could just use enet_host_service() instead. */
+    enet_host_flush( this->client );
+    if( packet ) free( packet );
+
+    /* all done. */
+    return 0;
+  }
+
+  int MasterServerComm::sendRequest( std::string data )
+  {
+    /* send the data to the friend */
+    /* Create a reliable packet of size 7 containing "packet\0" */
+    ENetPacket * packet = enet_packet_create( data.c_str(), 
+        data.length() + 1, 
         ENET_PACKET_FLAG_RELIABLE);