Changeset 7651 for code/branches/masterserver

Timestamp:

Nov 17, 2010, 4:18:14 PM (14 years ago)

Author:

smerkli

Message:

done for today

Location:

code/branches/masterserver/src

Files:

• libraries/network/WANDiscovery.cc (modified) (2 diffs)
• libraries/network/WANDiscovery.h (modified) (1 diff)
• libraries/network/packet/ServerInformation.h (modified) (1 diff)
• modules/masterserver/MasterServer.cc (modified) (6 diffs)
• modules/masterserver/MasterServer.h (modified) (2 diffs)
• modules/masterserver/ServerList.h (modified) (1 diff)

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

@@ -62 +62 @@
 
   /* callback for the network reply poller */
+  /* WORK MARK WORK WORK */
   /* NOTE implement protocol-specific part here. */
-  int rhandler( char *addr, ENetEvent *ev )
+  int WANDiscovery::rhandler( char *addr, ENetEvent *ev )
   { 
     /* handle incoming data */
     /* if a list entry arrives add to list */
-    if( !strncmp( ev->packet->data, MSPROTO_SERVERLIST_ITEM,
+    if( !strncmp( (char*)ev->packet->data, MSPROTO_SERVERLIST_ITEM,
       MSPROTO_SERVERLIST_ITEM_LEN ) )
     { 
       /* create server structure from that item */
-      ServerInformation toadd;
+      packet::ServerInformation toadd;
 
       /* fill in data */
-      toadd->setName( std::string(ev->packet->data + 
+      toadd.setServerName( std::string((char*)ev->packet->data + 
         MSPROTO_SERVERLIST_ITEM_LEN) );
-      toadd->setIP( std::string(ev->packet->data + 
+      toadd.setServerIP( std::string((char*)ev->packet->data + 
         MSPROTO_SERVERLIST_ITEM_LEN) );
 
       /* add to list */
-      this->servers_.add( toadd );
+      this->servers_.push_back( toadd );
     }
-    else if( !strncmp( ev->packet->data, MSPROTO_SERVERLIST_END,
+    else if( !strncmp( (char*)ev->packet->data, MSPROTO_SERVERLIST_END,
       MSPROTO_SERVERLIST_END_LEN ) )
     { return 1; }
@@ -99 +100 @@
 
     /* deal with replies */
-    while( !msc.pollForReply( rhandler ) ) 
+    while( !msc.pollForReply( WANDiscovery::rhandler ) ) 
       /* nothing */;
 

code/branches/masterserver/src/libraries/network/WANDiscovery.h

@@ -77 +77 @@
        */
       static WANDiscovery& getInstance() { return Singleton<WANDiscovery>::getInstance(); } // tolua_export
+    
+      int rhandler( char *addr, ENetEvent *ev );
       
     private:

code/branches/masterserver/src/libraries/network/packet/ServerInformation.h

@@ -50 +50 @@
         std::string   getServerName() { return this->serverName_; }
         void          setServerName(std::string name) { this->serverName_ = name; }
+        void          setServerIP( std::string IP ) { this->serverIP_ = IP; }
         uint32_t      getServerRTT() { return this->serverRTT_; }
         

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

@@ -57 +57 @@
       << event->peer->address.port << "\n";
 
-    /* game server or client connection? */
-    /* -> decide in protocol */
-    /* game server */
-    /* add to game server list */
-    /*  */
-
-    /* client */
-    /* add to client list */
-
     /* store string form of address here */
     event->peer->data = addrconv; 
@@ -82 +73 @@
     }
 
-    /* output that the disconnect happened, to be removed at a later time. */
+    /* output that the disconnect happened */
     COUT(4) << (char*)event->peer->data << " disconnected.\n";
 
+    /* create string from peer data */
+    std::string name = std::string( (char*)event->peer->data );
+
     /* remove the server from the list it belongs to */
+    this->mainlist->delServerByName( name );
 
     /* Reset the peer's client information. */
     if( event->peer->data ) free( event->peer->data );
+
+    /* done */
     return 0;
   }
@@ -95 +92 @@
   int 
   MasterServer::eventData( ENetEvent *event )
-  { /* output what's in the packet (to be removed later) */
+  { /* validate packet */
     if( !event || !(event->packet) || !(event->peer) )
+      //|| !(event->packet->data) || !strlen(event->packet->data) )
     { COUT(2) << "No complete event given.\n";
       return -1;
@@ -110 +108 @@
       << event->packet->dataLength
       << " containing "
-      << event->packet->data
+      << (const char*)event->packet->data
       << " was received from "
       << addrconv 
@@ -116 +114 @@
       << event->channelID << "\n";
 
+    /*
     //[> send some packet back for testing <]
     //[> TESTING <]
@@ -131 +130 @@
 
     //[> /TESTING <]
+    */
 
     /* GAME SERVER OR CLIENT CONNECTION? */
-
-    /* Game server */
-    /* parse data */
-    /* start actions */
-    /* and send reply */
-
-    /* client */
-    /* parse data */
-    /* start actions */
-    /* and send reply */
+    if( !strncmp( (char *)event->packet->data, MSPROTO_GAME_SERVER, 
+      MSPROTO_GAME_SERVER_LEN ) )
+    { /* Game server */
+
+      if( !strncmp( (char *)event->packet->data 
+        + MSPROTO_GAME_SERVER_LEN+1, 
+        MSPROTO_REGISTER_SERVER, MSPROTO_REGISTER_SERVER_LEN ) )
+      { /* register new server */
+        mainlist->addServer( packet::ServerInformation( event ) );
+      }
+    }
+    else if( !strncmp( (char *)event->packet->data, MSPROTO_CLIENT, 
+      MSPROTO_CLIENT_LEN) )
+    { /* client */
+      
+      if( !strncmp( (char *)event->packet->data + MSPROTO_CLIENT_LEN+1,
+        MSPROTO_REQ_LIST ) )
+      { /* send server list */
+        
+        /* get an iterator */
+        std::list<packet::ServerInformation *>::iterator i;
+
+        /* loop through list elements */
+        for( i = serverlist.begin(); i != 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() );
+
+          /* create packet from it */
+          ENetPacket * reply = enet_packet_create( tosend,
+            strlen( tosend ) + 1, 
+            ENET_PACKET_FLAG_RELIABLE);
+
+          /* Send the reply to the peer over channel id 0. */
+          enet_peer_send( event->peer, 0, reply );
+
+          /* One could just use enet_host_service() instead. */
+          enet_host_flush( this->server );
+        } 
+      }
+    }
+    else
+    { /* bad message, don't do anything. */ } 
 
     /* delete addrconv */

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

@@ -39 +39 @@
 #include <network/packet/Welcome.h>
 #include <util/Singleton.h>
+#include <network/MasterServerProtocol.h>
 
 /* my includes */
@@ -46 +47 @@
 /* c compatibility */
 #include <cstdio>
-
-#define ORX_MSERVER_PORT 1234
-#define ORX_MSERVER_MAXCONNS 32
-#define ORX_MSERVER_MAXCHANS 2
 
 namespace orxonox 

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

@@ -77 +77 @@
       void sortByPing();
 
-    private:
       /** the list of servers for internal storage */
       std::list<packet::ServerInformation *> serverlist;
+    private:
   };
 }