Changeset 7459 for code/trunk/src/libraries/network/LANDiscovery.cc

Timestamp:

Sep 17, 2010, 12:48:29 AM (15 years ago)

Author:

adrfried

Message:

Merged ipv6 branch

Orxonox now includes a modified version of ENet 1.3.0

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/network/LANDiscovery.cc (modified) (4 diffs)

code/trunk/src/libraries/network/LANDiscovery.cc

@@ -42 +42 @@
   LANDiscovery::LANDiscovery()
   {
-    this->host_ = enet_host_create(NULL, 10, 0, 0 );
+    this->host_ = enet_host_create(NULL, 10, 0, 0, 0 );
+    if ( this->host_ == NULL )
+        COUT(1) << "LANDiscovery: host_ == NULL" << std::endl;
   }
 
@@ -53 +55 @@
   {
     this->servers_.clear();
+    ENetPeer* peer;
     ENetAddress address;
-    enet_address_set_host(&address, "255.255.255.255");
+    memset(&address, 0, sizeof(ENetAddress));
     address.port = LAN_DISCOVERY_PORT;
 
-    ENetPeer* peer;
-    peer = enet_host_connect(this->host_, &address, 0);
+    /* 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;
@@ -67 +80 @@
         case ENET_EVENT_TYPE_CONNECT:
         {
-          COUT(0) << "connect from server: " << event.peer->address.host << endl;
+          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);
@@ -75 +88 @@
           {
             packet::ServerInformation info(&event);
-            COUT(0) << "received server information; name: " << info.getServerName() << ", IP: " << info.getServerIP() << ", RTT: " << info.getServerRTT() << endl;
+            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 )