Changeset 7657 for code/branches/masterserver/src/modules

Timestamp:

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

Author:

smerkli

Message:

it has compiled.

Location:

code/branches/masterserver/src/modules/masterserver

Files:

• MasterServer.cc (modified) (4 diffs)
• MasterServer.h (modified) (1 diff)
• ServerList.cc (modified) (5 diffs)
• ServerList.h (modified) (2 diffs)

code/branches/masterserver/src/modules/masterserver/MasterServer.cc

@@ -80 +80 @@
 
     /* remove the server from the list it belongs to */
-    this->mainlist->delServerByName( name );
+    this->mainlist.delServerByName( name );
 
     /* Reset the peer's client information. */
@@ -141 +141 @@
         MSPROTO_REGISTER_SERVER, MSPROTO_REGISTER_SERVER_LEN ) )
       { /* register new server */
-        mainlist->addServer( packet::ServerInformation( event ) );
+        mainlist.addServer( packet::ServerInformation( event ) );
       }
     }
@@ -149 +149 @@
       
       if( !strncmp( (char *)event->packet->data + MSPROTO_CLIENT_LEN+1,
-        MSPROTO_REQ_LIST ) )
+        MSPROTO_REQ_LIST, MSPROTO_REQ_LIST_LEN ) )
       { /* send server list */
         
         /* get an iterator */
-        std::list<packet::ServerInformation *>::iterator i;
+        std::list<packet::ServerInformation>::iterator i;
 
         /* loop through list elements */
-        for( i = serverlist.begin(); i != serverlist.end(); ++i ) 
+        for( i = mainlist.serverlist.begin(); i != mainlist.serverlist.end(); ++i ) 
         {
           /* WORK MARK */
           /* send this particular server */
           /* build reply string */
-          char *tosend = (char *)calloc( (*i)->getServerIP().length() + 1,1 );
-          snprintf( "%s %s", MSPROTO_SERVERLIST_ITEM, (*i)->getServerIP() );
+          char *tosend = (char *)calloc( (*i).getServerIP().length() + MSPROTO_SERVERLIST_ITEM_LEN + 2,1 );
+          sprintf( "%s %s", MSPROTO_SERVERLIST_ITEM, (*i).getServerIP().c_str() );
 
           /* create packet from it */
@@ -258 +258 @@
 
     /***** INITIALIZE GAME SERVER AND PEER LISTS *****/
-    this->mainlist = new ServerList();
+    //this->mainlist = new ServerList();
     this->peers = new PeerList();
-    if( this->mainlist == NULL || this->peers == NULL )
-    { COUT(1) << "Error creating server or peer list.\n";
-      exit( EXIT_FAILURE );
-    }
+    //if( this->mainlist == NULL || this->peers == NULL )
+    //{ COUT(1) << "Error creating server or peer list.\n";
+      //exit( EXIT_FAILURE );
+    //}
 
     /* run the main method */

code/branches/masterserver/src/modules/masterserver/MasterServer.h

@@ -73 +73 @@
       ENetAddress address;
       ENetHost *server;
-      ServerList *mainlist;
+      ServerList mainlist;
       PeerList *peers;
 

code/branches/masterserver/src/modules/masterserver/ServerList.cc

@@ -40 +40 @@
 
   int 
-  ServerList::addServer( packet::ServerInformation *toadd )
+  ServerList::addServer( packet::ServerInformation toadd )
   { this->serverlist.push_back( toadd ); 
     return 0;
@@ -49 +49 @@
   { 
     /* get an iterator */
-    std::list<packet::ServerInformation *>::iterator i;
+    std::list<packet::ServerInformation>::iterator i;
 
     /* loop through list elements */
     for( i = serverlist.begin(); i != serverlist.end(); ++i ) 
-      if( (*i)->getServerName() == name )
+      if( (*i).getServerName() == name )
       { /* found this name, remove and quit */
-        this->serverlist.remove( *i );
+        this->serverlist.erase( i );
         return true;
       }
@@ -64 +64 @@
   { 
     /* get an iterator */
-    std::list<packet::ServerInformation *>::iterator i;
+    std::list<packet::ServerInformation>::iterator i;
 
     /* loop through list elements */
     for( i=serverlist.begin(); i != serverlist.end(); ++i ) 
-      if( (*i)->getServerIP() == address )
+      if( (*i).getServerIP() == address )
       { /* found this name, remove and quit */
-        this->serverlist.remove( *i );
+        this->serverlist.erase( i );
         return true;
       }
@@ -78 +78 @@
 
   /* sort by name */
-  bool sub_compare_names( packet::ServerInformation *no1, 
-    packet::ServerInformation *no2 )
-  { return no1->getServerName() > no2->getServerName(); }
+  bool sub_compare_names( packet::ServerInformation no1, 
+    packet::ServerInformation no2 )
+  { return no1.getServerName() > no2.getServerName(); }
 
   void ServerList::sortByName()
@@ -88 +88 @@
   
   /* sort by ping */
-  bool sub_compare_pings( packet::ServerInformation *no1, 
-    packet::ServerInformation *no2 )
+  bool sub_compare_pings( packet::ServerInformation no1, 
+    packet::ServerInformation no2 )
   { 
     /* TODO */
-    return no1->getServerName() > no2->getServerName();
+    return no1.getServerName() > no2.getServerName();
   }
 

code/branches/masterserver/src/modules/masterserver/ServerList.h

@@ -54 +54 @@
        * Add server to the game server list
        */
-      int addServer( packet::ServerInformation *toadd );
+      int addServer( packet::ServerInformation toadd );
 
       /** \param name Name of the server to remove
@@ -78 +78 @@
 
       /** the list of servers for internal storage */
-      std::list<packet::ServerInformation *> serverlist;
+      std::list<packet::ServerInformation> serverlist;
     private:
   };