Changeset 5406 for source/ariba/communication

Timestamp:

Jul 29, 2009, 10:25:32 AM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba/communication

Files:

• BaseCommunication.cpp (modified) (1 diff)
• EndpointDescriptor.h (modified) (1 diff)
• networkinfo/AddressDiscovery.hpp (modified) (3 diffs)

source/ariba/communication/BaseCommunication.cpp

@@ -84 +84 @@
 
         logging_info( "Searching for local locators ..." );
-        discoverEndpoints(localDescriptor.getEndpoints());
+        discover_endpoints(localDescriptor.getEndpoints());
         logging_info( "Done. Local endpoints = " << localDescriptor.toString() );
 

source/ariba/communication/EndpointDescriptor.h

@@ -111 +111 @@
         bool operator==(const EndpointDescriptor& rh) const {
                 if (rh.isUnspecified() && isUnspecified()) return true;
-                return false;
+                return endpoints == rh.endpoints;
         }
 
         bool operator!=(const EndpointDescriptor& rh) const {
                 if (!rh.isUnspecified() && !isUnspecified()) return true;
-                return false;
+                return endpoints != rh.endpoints;
         }
 

source/ariba/communication/networkinfo/AddressDiscovery.hpp

@@ -6 +6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+
 #include <arpa/inet.h>
+
 #include <netinet/in.h>
+
 #include <net/if.h>
+
 #include <ifaddrs.h>
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hci.h>
+#include <bluetooth/hci_lib.h>
 
 using namespace ariba::addressing;
@@ -26 +36 @@
 }
 
-void discoverEndpoints( endpoint_set& endpoints ) {
+
+int dev_info(int s, int dev_id, long arg) {
+        endpoint_set* set = (endpoint_set*)arg;
+        struct hci_dev_info di;
+        di.dev_id = dev_id;
+        if (ioctl(s, HCIGETDEVINFO, (void *) &di)) return 0;
+        mac_address mac;
+        mac.bluetooth( di.bdaddr );
+        address_vf vf = mac;
+        set->add(vf);
+        return 0;
+}
+
+void discover_bluetooth( endpoint_set& endpoints ) {
+        hci_for_each_dev(HCI_UP, &dev_info, (long)&endpoints );
+}
+
+void discover_ip_addresses( endpoint_set& endpoints ) {
         struct ifaddrs* ifaceBuffer = NULL;
         struct ifaddrs* tmpAddr     = NULL;
@@ -63 +90 @@
                         mac_address mac = getMacFromIF(i->ifa_name);
                         address_vf vf = mac;
-                        endpoints.add( vf );
+//                      endpoints.add( vf );
                 }
         }
 }
 
+void discover_endpoints( endpoint_set& endpoints ) {
+        discover_ip_addresses( endpoints );
+        discover_bluetooth( endpoints );
+}
+
 #endif /* ADDRESSDISCOVERY_HPP_ */