Changeset 7459 for code/trunk/src/libraries/network

Timestamp:

Sep 17, 2010, 12:48:29 AM (14 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/CMakeLists.txt (modified) (1 diff)
• src/libraries/network/ClientConnection.cc (modified) (3 diffs)
• src/libraries/network/ClientInformation.cc (modified) (2 diffs)
• src/libraries/network/LANDiscoverable.cc (modified) (3 diffs)
• src/libraries/network/LANDiscovery.cc (modified) (4 diffs)
• src/libraries/network/ServerConnection.cc (modified) (3 diffs)
• src/libraries/network/packet/ServerInformation.cc (modified) (2 diffs)
• src/libraries/network/packet/ServerInformation.h (modified) (1 diff)

code/trunk/src/libraries/network/CMakeLists.txt

@@ -71 +71 @@
   LINK_LIBRARIES
     ${ZLIB_LIBRARY}
-    ${ENET_LIBRARY}
+    #${ENET_LIBRARY}
+    enet_orxonox
     ${Boost_THREAD_LIBRARY}
     util

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

@@ -48 +48 @@
     this->serverAddress_ = new ENetAddress();
     //set standard address and port
-    enet_address_set_host(this->serverAddress_, "127.0.0.1");
+    enet_address_set_host(this->serverAddress_, "127.0.0.1"); // TODO: check for IPv6 and connect to ::1 instead
     serverAddress_->port = NETWORK_PORT;
   }
@@ -59 +59 @@
 
   void ClientConnection::setServerAddress( const std::string& serverAddress ) {
-    enet_address_set_host (this->serverAddress_, serverAddress.c_str());
+    if (enet_address_set_host (this->serverAddress_, serverAddress.c_str()) < 0)
+        COUT(1) << "Error: Could not resolve \"" << serverAddress << "\"." << std::endl;
   }
 
@@ -70 +71 @@
     ENetEvent event;
 
-    this->host_ = enet_host_create(NULL, NETWORK_CLIENT_MAX_CONNECTIONS, 0, 0);
+    this->host_ = enet_host_create(NULL, NETWORK_CLIENT_MAX_CONNECTIONS, 0, 0, 0);
     if ( this->host_ == NULL )
     {
-      COUT(2) << "ClientConnection: host_ == NULL" << std::endl;
+      COUT(1) << "ClientConnection: host_ == NULL" << std::endl;
       // error handling
       return false;
     }
-    this->server_ = enet_host_connect(this->host_, serverAddress_, NETWORK_CLIENT_CHANNELS);
+    assert( this->host_->socket4 != ENET_SOCKET_NULL || this->host_->socket6 != ENET_SOCKET_NULL );
+    if (this->host_->socket4 == ENET_SOCKET_NULL)
+        COUT(2) << "Warning: IPv4 Socket failed." << std::endl;
+    else if (this->host_->socket6 == ENET_SOCKET_NULL)
+        COUT(2) << "Warning: IPv6 Socket failed." << std::endl;
+    else
+        COUT(3) << "Info: Using IPv4 and IPv6 Sockets." << std::endl;
+
+    this->server_ = enet_host_connect(this->host_, serverAddress_, NETWORK_CLIENT_CHANNELS, 0);
     if ( this->server_==NULL )
     {
-      COUT(2) << "ClientConnection: server == NULL" << std::endl;
+      COUT(1) << "ClientConnection: server_ == NULL" << std::endl;
       // error handling
       return false;

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

@@ -216 +216 @@
     ClientInformation *temp = head_;
     while(temp!=0){
-      if(temp->getPeer()->address.host==peer->address.host && temp->getPeer()->address.port==peer->address.port)
+      if(!memcmp(& temp->getPeer()->address, & peer->address, sizeof(peer->address)))
         break;
       temp = temp->next();
@@ -252 +252 @@
     ClientInformation *temp = head_;
     while(temp!=0){
-      if(temp->getPeer()->address.host==address->host && temp->getPeer()->address.port == address->port)
+      if(!memcmp(& temp->getPeer()->address, address, sizeof(*address)))
         break;
       temp = temp->next();

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

@@ -64 +64 @@
     if( bActive )
     {
-      ENetAddress bindAddress = { ENET_HOST_ANY, LAN_DISCOVERY_PORT };
+      ENetAddress bindAddress;
+      memset(& bindAddress, 0, sizeof(ENetAddress));
+      bindAddress.host = ENET_HOST_ANY;
+      bindAddress.port = LAN_DISCOVERY_PORT;
       assert( this->host_ == 0 );
-      this->host_ = enet_host_create( &bindAddress, 10, 0, 0 );
+      this->host_ = enet_host_create( &bindAddress, 10, 0, 0, 0 );
+      if ( this->host_ == NULL )
+          COUT(1) << "LANDiscoverable: host_ == NULL" << std::endl;
     }
     else
@@ -89 +94 @@
       {
         case ENET_EVENT_TYPE_CONNECT:
+            COUT(4) << "Received LAN discovery connect from client " << event.peer->host->receivedAddress << std::endl;
+            break;
         case ENET_EVENT_TYPE_DISCONNECT:
         case ENET_EVENT_TYPE_NONE:
@@ -95 +102 @@
           if( strcmp( LAN_DISCOVERY_MESSAGE, (char*)event.packet->data ) == 0 )      // check for a suitable orxonox client
           {
+            COUT(3) << "Received LAN discovery message from client " << event.peer->host->receivedAddress << std::endl;
             packet::ServerInformation info;
             info.setServerName("Orxonox Server");

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 )

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

@@ -44 +44 @@
   {
     this->bindAddress_ = new ENetAddress();
+    memset(this->bindAddress_, 0, sizeof(ENetAddress));
     this->bindAddress_->host = ENET_HOST_ANY;
     this->bindAddress_->port = NETWORK_PORT;
@@ -55 +56 @@
 
   void ServerConnection::setBindAddress( const std::string& bindAddress ) {
-    enet_address_set_host (this->bindAddress_, bindAddress.c_str());
+    if (enet_address_set_host (this->bindAddress_, bindAddress.c_str()) < 0)
+        COUT(1) << "Error: Could not resolve \"" << bindAddress << "\"." << std::endl;
   }
 
@@ -63 +65 @@
 
   bool ServerConnection::openListener() {
-    this->host_ = enet_host_create(this->bindAddress_, NETWORK_MAX_CONNECTIONS, 0, 0);
+    this->host_ = enet_host_create(this->bindAddress_, NETWORK_MAX_CONNECTIONS, 0, 0, 0);
     if ( this->host_ == NULL )
-      return false;
+    {
+        COUT(1) << "ServerConnection: host_ == NULL" << std::endl;
+        return false;
+    }
+    assert( this->host_->socket4 != ENET_SOCKET_NULL || this->host_->socket6 != ENET_SOCKET_NULL );
+    if (this->host_->socket4 == ENET_SOCKET_NULL)
+        COUT(2) << "Warning: IPv4 Socket failed." << std::endl;
+    else if (this->host_->socket6 == ENET_SOCKET_NULL)
+        COUT(2) << "Warning: IPv6 Socket failed." << std::endl;
     else
-      return true;
+        COUT(3) << "Info: Using IPv4 and IPv6 Sockets." << std::endl;
+
+    return true;
   }
 

code/trunk/src/libraries/network/packet/ServerInformation.cc

@@ -47 +47 @@
     ServerInformation::ServerInformation(ENetEvent* event)
     {
+      char serverIP[64];
+
       // Save Server Round Trip Time
       this->serverRTT_ = event->peer->roundTripTime;
-      // Save Server IP
-      char* serverIP = new char[16];
-      enet_address_get_host_ip(&event->peer->address, serverIP, 16);
+      // Save Server Address, leave some space for scope ID
+      enet_address_get_host_ip(&event->peer->address, serverIP, 64);
       this->serverIP_ = std::string(serverIP);
       // Save ACK
@@ -83 +84 @@
   
   } // namespace packet
+
+  std::ostream& operator<<(std::ostream& out, const ENetAddress& address)
+  {
+      char addr[64];
+      if (!enet_address_get_host_ip(&address, addr, 64))
+          out << addr;
+      return out;
+  }
 } // namespace orxonox
 

code/trunk/src/libraries/network/packet/ServerInformation.h

@@ -59 +59 @@
 
   }
+
+  _NetworkExport std::ostream& operator<<(std::ostream& out, const ENetAddress& address);
 }