Changeset 5284 for source/ariba/communication/networkinfo

Timestamp:

Jul 24, 2009, 3:23:11 PM (15 years ago)

Author:

mies

Message:

+ added new transport modules and adapted ariba to them
+ exchange endpoint descriptors an link establishment
+ clean up of base communication
+ link establishment with in the presence of multiple endpoints
+ local discovery for ipv6, ipv4 and bluetooth mac addresses

Location:

source/ariba/communication/networkinfo

Files:

• AddressDiscovery.hpp (added)
• AddressInformation.cpp (modified) (2 diffs)
• AddressInformation.h (modified) (2 diffs)

source/ariba/communication/networkinfo/AddressInformation.cpp

@@ -39 +39 @@
 #include "AddressInformation.h"
 
+#include <ifaddrs.h>
+
+#include <boost/asio/ip/address.hpp>
+#include <boost/asio/ip/address_v4.hpp>
+
 namespace ariba {
 namespace communication {
+
+using namespace ariba::addressing;
 
 AddressInformation::AddressInformation(){
@@ -52 +59 @@
         AddressList retlist;
 
-        //
         // gather transport addresses
-        //
-
         struct ifaddrs* ifap;
         getifaddrs( &ifap );
 
         for( struct ifaddrs* p = ifap; p != NULL; p=p->ifa_next ){
+
+                // no name set? ->continue
                 if( interface.name.compare(string(p->ifa_name)) != 0 ) continue;
 
-                // TODO: currently only handle IPv4
+                // handle IPv4 entry
                 struct sockaddr* addr = p->ifa_addr;
-                if( addr->sa_family != AF_INET ) continue;
+                if( addr->sa_family == AF_INET ) {
+                        // get address
+                        const struct sockaddr_in& ipv4 = (const struct sockaddr_in&)*addr;
+                        boost::asio::ip::address_v4::bytes_type bytes;
+                        for( int i=0; i<4; i++ )
+                                bytes[i] = (ipv4.sin_addr.s_addr >> (24-i*8)) & 0xff;
 
-                const struct sockaddr_in& ipv4 = (const struct sockaddr_in&)*addr;
-                boost::asio::ip::address_v4::bytes_type bytes;
-                for( int i=0; i<4; i++ )
-                        bytes[i] = (ipv4.sin_addr.s_addr >> (24-i*8)) & 0xff;
-
-                boost::asio::ip::address boost_addr = boost::asio::ip::address_v4( bytes );
-                retlist.push_back( IPv4Locator::fromString(boost_addr.to_string()) );
+                        // add ipv4 address
+                        boost::asio::ip::address boost_addr = boost::asio::ip::address_v4( bytes );
+                        retlist.push_back( vcapsule<address_v>( ip_address(boost_addr) ) );
+                }
         }
 
         freeifaddrs( ifap );
-
-        //
-        // TODO: gather further addresses like MAC etc.
-        //
 
         return retlist;

source/ariba/communication/networkinfo/AddressInformation.h

@@ -40 +40 @@
 #define __ADDRESS_INFORMATION_H
 
-#include <ifaddrs.h>
 #include <vector>
-#include <boost/asio/ip/address.hpp>
-#include <boost/asio/ip/address_v4.hpp>
+
 #include "ariba/communication/networkinfo/NetworkInterface.h"
-#include "ariba/communication/modules/network/ip/IPv4Locator.h"
-
-using std::vector;
-using ariba::communication::NetworkInterface;
-using ariba::communication::IPv4Locator;
+#include "ariba/utility/addressing/addressing.hpp"
 
 namespace ariba {
 namespace communication {
 
-typedef vector<IPv4Locator> AddressList; // TODO: make more general, not only ipv4
+using namespace std;
+using namespace ariba::addressing;
+
+/// a list of addresses
+typedef vector<address_v*> AddressList;
 
 class AddressInformation {
@@ -62 +60 @@
 
         AddressList getAddresses(const NetworkInterface& interface);
-
 };