Changeset 7630 for code/branches/masterserver/src

Timestamp:

Nov 10, 2010, 2:19:44 PM (14 years ago)

Author:

smerkli

Message:

initiated WANDiscovery code, now implementing…

Location:

code/branches/masterserver/src

Files:

• libraries/network/WANDiscovery.cc (copied) (copied from code/branches/masterserver/src/libraries/network/LANDiscovery.cc) (2 diffs)
• libraries/network/WANDiscovery.h (copied) (copied from code/branches/masterserver/src/libraries/network/LANDiscovery.h) (3 diffs)
• modules/masterserver/MasterServer.cc (modified) (1 diff)
• modules/masterserver/MasterServerComm.cc (modified) (3 diffs)

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

@@ -27 +27 @@
  */
 
-#include "LANDiscovery.h"
+#include "WANDiscovery.h"
 
 #include <enet/enet.h>
@@ -38 +38 @@
 namespace orxonox
 {
-  ManageScopedSingleton(LANDiscovery, ScopeID::Root, true);
+  ManageScopedSingleton(WANDiscovery, ScopeID::Root, true);
 
-  LANDiscovery::LANDiscovery()
+  WANDiscovery::WANDiscovery()
   {
-    this->host_ = enet_host_create(NULL, 10, 0, 0, 0 );
-    if ( this->host_ == NULL )
-        COUT(1) << "LANDiscovery: host_ == NULL" << std::endl;
   }
 
-  LANDiscovery::~LANDiscovery()
+  WANDiscovery::~WANDiscovery()
   {
-    enet_host_destroy(this->host_);
   }
 
-  void LANDiscovery::discover()
+  void WANDiscovery::discover()
   {
     this->servers_.clear();
-    ENetPeer* peer;
-    ENetAddress address;
-    memset(&address, 0, sizeof(ENetAddress));
-    address.port = LAN_DISCOVERY_PORT;
-
-    /* TODO: check for availability of each protocol */
-    /* IPv4 */
-    address.host = ENET_HOST_BROADCAST;
-    peer = enet_host_connect(this->host_, &address, 0, 0);
-    if (peer == NULL)
-        COUT(1) << "Error: Could not send LAN discovery to IPv4 Broadcast." << std::endl;
-
-    /* IPv6 */
-    enet_address_set_host(&address, "ff02::1"); // TODO: use a multicast group
-    peer = enet_host_connect(this->host_, &address, 0, 0);
-    if (peer == NULL)
-        COUT(1) << "Error: Could not send LAN discovery to IPv6 Multicast." << std::endl;
-
-    ENetEvent event;
-    while( enet_host_service(this->host_, &event, 1000 ) )
-    {
-      switch( event.type )
-      {
-        case ENET_EVENT_TYPE_CONNECT:
-        {
-          COUT(4) << "Received LAN discovery connect from server " << event.peer->host->receivedAddress << std::endl;
-          ENetPacket* packet = enet_packet_create(LAN_DISCOVERY_MESSAGE, strlen(LAN_DISCOVERY_MESSAGE)+1, ENET_PACKET_FLAG_RELIABLE);
-          enet_peer_send(event.peer, 0, packet);
-          break;
-        }
-        case ENET_EVENT_TYPE_RECEIVE:
-          {
-            packet::ServerInformation info(&event);
-            COUT(3) << "Received LAN discovery server information; Name: " << info.getServerName() << ", Address: " << info.getServerIP() << ", RTT: " << info.getServerRTT() << endl;
-            std::vector<packet::ServerInformation>::iterator it;
-            for( it=this->servers_.begin(); it!=this->servers_.end(); ++it )
-            {
-              if( (*it).getServerIP() == info.getServerIP() )
-                break;
-            }
-            if( it==this->servers_.end() )
-              this->servers_.push_back(info);
-          }
-//           enet_address_get_host_ip(&event.peer->address, buffer, buflen );
-//           serverIPs.push_back(std::string(buffer));
-          break;
-        default:
-          break;
-      }
-    }
   }
 
-  std::string LANDiscovery::getServerListItemName(unsigned int index)
+  std::string WANDiscovery::getServerListItemName(unsigned int index)
   {
-    if( index >= this->servers_.size() )
-      return BLANKSTRING;
-    else
-      return this->servers_[index].getServerName();
+
   }
 
-  std::string LANDiscovery::getServerListItemIP(unsigned int index)
+  std::string WANDiscovery::getServerListItemIP(unsigned int index)
   {
-    if( index >= this->servers_.size() )
-      return BLANKSTRING;
-    else
-      return this->servers_[index].getServerIP();
+
   }
 

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

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Fabian 'x3n' Landau (original)
  *   Co-authors:
- *      ...
+ *      Sandro 'smerkli' Merkli (copied and adapted to WAN)
  *
  */
 
-#ifndef LANDISCOVERY_H
-#define LANDISCOVERY_H
+#ifndef WANDISCOVERY_H
+#define WANDISCOVERY_H
 
 #include "NetworkPrereqs.h"
@@ -40 +40 @@
 {
 
-  class _NetworkExport LANDiscovery
+  class _NetworkExport WANDiscovery
 // tolua_end
-    : public Singleton<LANDiscovery>
+    : public Singleton<WANDiscovery>
   { // tolua_export
-    friend class Singleton<LANDiscovery>;
+    friend class Singleton<WANDiscovery>;
     public:
-      LANDiscovery();
-      ~LANDiscovery();
+      WANDiscovery();
+      ~WANDiscovery();
       void discover(); // tolua_export
       std::string getServerListItemName( unsigned int index ); // tolua_export
       std::string getServerListItemIP( unsigned int index ); // tolua_export
-      static LANDiscovery& getInstance(){ return Singleton<LANDiscovery>::getInstance(); } // tolua_export
+      static WANDiscovery& getInstance(){ return Singleton<WANDiscovery>::getInstance(); } // tolua_export
       
     private:
-      static LANDiscovery* singletonPtr_s;
+      static WANDiscovery* singletonPtr_s;
       ENetHost* host_;
       std::vector<packet::ServerInformation> servers_;
@@ -61 +61 @@
 } // tolua_export
 
-#endif // LANDISCOVERY_H
+#endif // WANDISCOVERY_H

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

@@ -116 +116 @@
       << event->channelID << "\n";
 
-    /* send some packet back for testing */
-    /* TESTING */
-
-    /* Create a reliable reply of size 7 containing "reply\0" */
-    ENetPacket * reply = enet_packet_create ("reply", 
-        strlen ("reply") + 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 );
-
-    /* /TESTING */
-
-    /* game server or client connection? */
-    /* game server */
+    //[> send some packet back for testing <]
+    //[> TESTING <]
+
+    //[> Create a reliable reply of size 7 containing "reply\0" <]
+    //ENetPacket * reply = enet_packet_create ("reply", 
+        //strlen ("reply") + 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 );
+
+    //[> /TESTING <]
+
+    /* GAME SERVER OR CLIENT CONNECTION? */
+
+    /* Game server */
     /* parse data */
     /* start actions */
     /* and send reply */
+
     /* client */
     /* parse data */

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

@@ -76 +76 @@
   { fprintf( stderr, 
         "No available peers for initiating an ENet connection.\n");
-    exit (EXIT_FAILURE);
+    //exit (EXIT_FAILURE);
+    return -1;
   }
 
@@ -87 +88 @@
     enet_peer_reset (this->peer);
     fprintf( stdout, "Connection to %s failed.", address );
-    exit(EXIT_FAILURE);
+    //exit(EXIT_FAILURE);
+    return -1;
   }
 
@@ -171 +173 @@
   /* setup object and connect */
   MasterServerComm msc = MasterServerComm();
-  msc.connect( argv[1], 1234 );
+  if( msc.connect( argv[1], 1234 ) )
+    exit(EXIT_FAILURE);
   
   /* send some data and poll for replies */