[Orxonox-commit 2967] r7666 - code/branches/masterserver/src/modules/masterserver

smerkli at orxonox.net smerkli at orxonox.net
Wed Nov 24 16:13:04 CET 2010


Author: smerkli
Date: 2010-11-24 16:13:04 +0100 (Wed, 24 Nov 2010)
New Revision: 7666

Modified:
   code/branches/masterserver/src/modules/masterserver/MasterServer.cc
Log:
further corrections.

Modified: code/branches/masterserver/src/modules/masterserver/MasterServer.cc
===================================================================
--- code/branches/masterserver/src/modules/masterserver/MasterServer.cc	2010-11-24 14:58:46 UTC (rev 7665)
+++ code/branches/masterserver/src/modules/masterserver/MasterServer.cc	2010-11-24 15:13:04 UTC (rev 7666)
@@ -158,6 +158,9 @@
         /* get an iterator */
         std::list<packet::ServerInformation>::iterator i;
 
+        /* packet holder */
+        ENetPacket *reply;
+
         /* loop through list elements */
         for( i = mainlist.serverlist.begin(); i != mainlist.serverlist.end(); ++i ) 
         {
@@ -168,7 +171,7 @@
           sprintf( tosend, "%s %s", MSPROTO_SERVERLIST_ITEM, (*i).getServerIP().c_str() );
 
           /* create packet from it */
-          ENetPacket * reply = enet_packet_create( tosend,
+           reply = enet_packet_create( tosend,
             strlen( tosend ) + 1, 
             ENET_PACKET_FLAG_RELIABLE);
 
@@ -178,6 +181,17 @@
           /* One could just use enet_host_service() instead. */
           enet_host_flush( this->server );
         } 
+
+        /* send end-of-list packet */
+        reply = enet_packet_create( MSPROTO_SERVERLIST_END,
+          MSPROTO_SERVERLIST_END_LEN + 1,
+          ENET_PACKET_FLAG_RELIABLE );
+
+        enet_peer_send( event->peer, 0, reply );
+
+        /* One could just use enet_host_service() instead. */
+        enet_host_flush( this->server );
+
       }
     }
     else




More information about the Orxonox-commit mailing list