Changeset 8280 for code/branches/masterserver2/src/libraries/network/MasterServer.cc

Timestamp:

Apr 21, 2011, 4:01:44 PM (14 years ago)

Author:

smerkli

Message:

ms-delserver command implemented to kick servers from the master server list

File:

• code/branches/masterserver2/src/libraries/network/MasterServer.cc (modified) (3 diffs)

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

@@ -38 +38 @@
   /* commands for the terminal interface */
   SetConsoleCommand( "ms-listservers", &MasterServer::listServers );
-  //SetConsoleCommand( "ms-delserver", &MasterServer::delServer );
+  SetConsoleCommand( "ms-delserver", &MasterServer::delServer );
   //SetConsoleCommand( "ms-serverinfo", &MasterServer::serverInfo );
 
@@ -67 +67 @@
     COUT(0) << MasterServer::getInstance()->mainlist.serverlist.size() <<
       " servers connected." << std::endl;
+  }
+
+  void 
+  MasterServer::delServer( std::string todeladdr )
+  {
+    /* tell the user we're now removing the entry from the server list */
+    COUT(0) << "MS: Deleting server \"" << todeladdr << "\"..." 
+      << std::endl;
+
+    /* see if we actually have that server on our list */
+    ServerListSearchResult shandle = 
+      MasterServer::getInstance()->mainlist.findServerByAddress(todeladdr);
+
+    if( !shandle.success )
+    { COUT(0) << "MS: Server not found, not removing." << std::endl;
+      return;
+    }
+
+    /* force-disconnect the server */  
+    enet_peer_disconnect( shandle.result.peer, NULL );
+
+    /* actually remove the entry from the server list by address */
+    MasterServer::getInstance()->mainlist.delServerByAddress( todeladdr);
+
+    /* tell the user about our success */
+    COUT(0) << "MS: Server deletion successful." << std::endl;
   }
 
@@ -365 +391 @@
     }
 
-    /***** INITIALIZE GAME SERVER AND PEER LISTS *****/
-    this->peers = new PeerList();
-
     /* set pointer to this instance */
     MasterServer::setInstance( this );