Changeset 8204 for code/branches/masterserver2/src/libraries

Timestamp:

Apr 7, 2011, 4:37:29 PM (14 years ago)

Author:

smerkli

Message:

 

Location:

code/branches/masterserver2/src/libraries/network

Files:

• MasterServer.cc (modified) (3 diffs)
• MasterServer.h (modified) (1 diff)

code/branches/masterserver2/src/libraries/network/MasterServer.cc

@@ -104 +104 @@
    */
   void 
-  MasterServer::helper_cleanupServers()
+  MasterServer::helper_cleanupServers( void )
   {
     /* get an iterator */
@@ -115 +115 @@
     for( i = mainlist.serverlist.begin(); i 
         != mainlist.serverlist.end(); ++i ) 
-    {
+    { /* see if we have a disconnected peer */
       if( (*i).peer && 
          ((*i).peer->state == ENET_PEER_STATE_DISCONNECTED ||
           (*i).peer->state == ENET_PEER_STATE_ZOMBIE ))
-      { mainlist.delServerByName( (*i).ServerInfo.getServerName() );
-        COUT(2) << "someone timed out.\n";
+      { 
+        /* Remove it from the list */
+        COUT(2) << (char*)(*i).peer->data << " timed out.\n";
+        mainlist.delServerByName( (*i).ServerInfo.getServerName() );
+
+        /* stop iterating, we manipulated the list */
+        /* TODO note: this only removes one dead server per loop
+         * iteration. not beautiful, but one iteration is ~100ms, 
+         * so not really relevant for the moment.
+         */
         break;
       }
@@ -263 +271 @@
     }
 
-    /* check for timed out pings and remove those guys from
-     * the server list
-     */
+    /* check for timed out peers and remove those from * the server list */
     helper_cleanupServers();
 

code/branches/masterserver2/src/libraries/network/MasterServer.h

@@ -69 +69 @@
       /* helpers */
       void helper_sendlist( ENetEvent *event );
-      void helper_pingServers( void );
-      void helper_cleanupServers();
+      void helper_cleanupServers( void );
 
       /* members */