Changeset 5638 for source/ariba/communication

Timestamp:

Aug 4, 2009, 10:17:33 AM (15 years ago)

Author:

Christoph Mayer

Message:

adress detection aufgeräumt, network info für bleutooth, data stream (hopeful crash fix), logging auf maemo nur warn, ...

Location:

source/ariba/communication

Files:

• BaseCommunication.cpp (modified) (3 diffs)
• networkinfo/AddressDiscovery.hpp (deleted)
• networkinfo/AddressInformation.cpp (deleted)
• networkinfo/AddressInformation.h (deleted)
• networkinfo/NetworkInformation.cpp (modified) (2 diffs)
• networkinfo/NetworkInterface.h (modified) (1 diff)

source/ariba/communication/BaseCommunication.cpp

@@ -38 +38 @@
 
 #include "BaseCommunication.h"
+#include "networkinfo/AddressDiscovery.h"
 
 #ifdef UNDERLAY_OMNET
@@ -51 +52 @@
 namespace ariba {
 namespace communication {
-
-#include "networkinfo/AddressDiscovery.hpp"
 
 use_logging_cpp(BaseCommunication);
@@ -115 +114 @@
 
         logging_info( "Searching for local locators ..." );
-        discover_endpoints(localDescriptor.getEndpoints());
+        AddressDiscovery::discover_endpoints( localDescriptor.getEndpoints() );
         logging_info( "Done. Local endpoints = " << localDescriptor.toString() );
 

source/ariba/communication/networkinfo/NetworkInformation.cpp

@@ -38 +38 @@
 
 #include "NetworkInformation.h"
+#include "ariba/config.h"
+
+#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+  #include <bluetooth/bluetooth.h>
+  #include <bluetooth/hci.h>
+  #include <bluetooth/hci_lib.h>
+#endif
 
 namespace ariba {
@@ -192 +199 @@
         } // for( ; i != iend; i++ )*/
 
+        //
+        // not we try to get bluetooth interfaces
+        //
+
+#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+
+        int btsock = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
+        if(btsock <  0){
+                logging_error("failed getting bluetooth raw socket");
+                return retlist;
+        }
+
+        struct hci_dev_list_req* btlist = NULL;
+        struct hci_dev_req* btdev = NULL;
+
+        btlist = (hci_dev_list_req*)malloc(HCI_MAX_DEV *
+                        sizeof(struct hci_dev_list_req) + sizeof(struct hci_dev_req));
+
+        btlist->dev_num = HCI_MAX_DEV;
+        btdev = btlist->dev_req;
+
+        if(ioctl(btsock, HCIGETDEVLIST, btlist) < 0){
+                logging_error("failed getting requesting bluetooth devices");
+                free(btlist);
+                close(btsock);
+                return retlist;
+        }
+
+        btdev = btlist->dev_req;
+
+        for(int i=0; i<btlist->dev_num; i++, btdev++){
+                struct hci_dev_info di;
+                NetworkInterface interface;
+
+                if(hci_devinfo(btdev->dev_id, &di) < 0) continue;
+                if(hci_test_bit(HCI_RAW, &di.flags)) continue;
+
+                interface.name = string(di.name);
+                interface.index = di.dev_id;
+                interface.mtu = di.sco_mtu;
+                interface.isBroadcast = false;
+                interface.isLoopback = false;
+                interface.isMulticast = false;
+                interface.isUp = hci_test_bit(HCI_UP, &di.flags);
+                interface.isRunning = hci_test_bit(HCI_RUNNING, &di.flags);
+
+                retlist.push_back( interface );
+        }
+
+        free(btlist);
+        close(btsock);
+#endif
+
         return retlist;
 }

source/ariba/communication/networkinfo/NetworkInterface.h

@@ -63 +63 @@
         bool    isBroadcast;
         bool    isMulticast;
-        int     mtu;
-        int     txQueueLen;
+        int             mtu;
+        int             txQueueLen;
 
         static NetworkInterface UNDEFINED;
 
-        inline bool operator==(const NetworkInterface& rh ){
+        NetworkInterface& operator=(const NetworkInterface& rh){
+                name            = rh.name;
+                index           = rh.index;
+                isRunning       = rh.isRunning;
+                isUp            = rh.isUp;
+                isLoopback      = rh.isLoopback;
+                isBroadcast     = rh.isBroadcast;
+                isMulticast     = rh.isMulticast;
+                mtu             = rh.mtu;
+                txQueueLen      = rh.txQueueLen;
+                return *this;
+        }
+
+        bool operator==(const NetworkInterface& rh ){
                 // equality means same name
                 return ( name.compare(rh.name) == 0 );