Changeset 5638

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

Files:

• Makefile.am (modified) (2 diffs)
• communication/BaseCommunication.cpp (modified) (3 diffs)
• communication/networkinfo/AddressDiscovery.hpp (deleted)
• communication/networkinfo/AddressInformation.cpp (deleted)
• communication/networkinfo/AddressInformation.h (deleted)
• communication/networkinfo/NetworkInformation.cpp (modified) (2 diffs)
• communication/networkinfo/NetworkInterface.h (modified) (1 diff)
• overlay/BaseOverlay.cpp (modified) (10 diffs)
• utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp (modified) (6 diffs)
• utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h (modified) (2 diffs)
• utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h (modified) (1 diff)
• utility/logging/Logging.h (modified) (2 diffs)
• utility/serialization/DataStream.hpp (modified) (1 diff)
• utility/system/StartupWrapper.cpp (modified) (2 diffs)

source/ariba/Makefile.am

@@ -245 +245 @@
 
 libariba_la_SOURCES += \
-  communication/networkinfo/AddressInformation.cpp \
+  communication/networkinfo/AddressDiscovery.cpp \
   communication/networkinfo/NetworkChangeDetection.cpp \
   communication/networkinfo/NetworkInformation.cpp \
@@ -251 +251 @@
 
 nobase_libariba_la_HEADERS += \
-  communication/networkinfo/AddressInformation.h \
+  communication/networkinfo/AddressDiscovery.h \
   communication/networkinfo/NetworkChangeDetection.h \
   communication/networkinfo/NetworkChangeInterface.h \

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 );

source/ariba/overlay/BaseOverlay.cpp

@@ -127 +127 @@
                 // get descriptor of first hop
                 rld = getDescriptor(rlid);
-                logging_force( rld );
+                logging_info( rld );
 
                 // is first hop a relay path? yes-> try to find real link!
@@ -154 +154 @@
                 return NodeID::UNSPECIFIED;
         else {
-                logging_force( "Returning relay node " << relayNode.toString() );
+                logging_info( "Returning relay node " << relayNode.toString() );
                 return relayNode;
         }
@@ -810 +810 @@
                 // if link is a relayed link ->convert to direct link
                 if (ld->relay) {
-                        logging_force( "Converting to direct link: " << ld );
+                        logging_info( "Converting to direct link: " << ld );
                         ld->up = true;
                         ld->relay = false;
@@ -836 +836 @@
         LinkDescriptor* ld = getDescriptor(id, true);
         if ( ld == NULL ) return; // not found? ->ignore!
-        logging_force( "onLinkDown descriptor: " << ld );
+        logging_info( "onLinkDown descriptor: " << ld );
 
         // inform listeners about link down
@@ -1426 +1426 @@
                         logging_debug( "received keep-alive on link" );
                         if ( ld != NULL ) {
-                                logging_force("Keep-Alive for "<< ld->overlayId);
+                                logging_info("Keep-Alive for "<< ld->overlayId);
                                 ld->markAlive();
                         }
@@ -1445 +1445 @@
                                 break;
                         }
-                        logging_force( "Received direct link convert notification for " << rld );
+                        logging_info( "Received direct link convert notification for " << rld );
 
                         // set communcation link id and set it up
@@ -1560 +1560 @@
                         // missed more than four keep-alive messages (10 sec)? -> drop link
                         if (ld->keepAliveMissed > 4) {
-                                logging_force( "Link connection request is stale, closing: " << ld );
+                                logging_info( "Link connection request is stale, closing: " << ld );
                                 oldlinks.push_back( ld );
                                 continue;
@@ -1588 +1588 @@
                         // missed more than four keep-alive messages (4 sec)? -> drop link
                         if (ld->keepAliveMissed >= 8) {
-                                logging_force( "Link is stale, closing: " << ld );
+                                logging_info( "Link is stale, closing: " << ld );
                                 oldlinks.push_back( ld );
                                 continue;
@@ -1602 +1602 @@
 
                 if (!ld->communicationId.isUnspecified() && it != bootstrapLinks.end() ){
-                        logging_force( "Not dropping initiator link: " << ld );
+                        logging_info( "Not dropping initiator link: " << ld );
                         continue;
                 }
 */
-                logging_force( "Link timed out. Dropping " << ld );
+                logging_info( "Link timed out. Dropping " << ld );
                 dropLink( ld->overlayId );
         }
@@ -1618 +1618 @@
 void BaseOverlay::showLinkState() {
         int i=0;
-        logging_force("--- link state -------------------------------");
+        logging_info("--- link state -------------------------------");
         BOOST_FOREACH( LinkDescriptor* ld, links ) {
-                logging_force("link " << i << ": " << ld);
+                logging_info("link " << i << ": " << ld);
                 i++;
         }
-        logging_force("----------------------------------------------");
+        logging_info("----------------------------------------------");
 }
 

source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp

@@ -41 +41 @@
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
 
-        // Attribute descriptors for SDP
-        // base was chosen randomly
-        #define SDP_SPOVNET_BASE                        0x4000
-        #define SDP_ATTR_SPOVNET_NAME           0x0000 + SDP_SPOVNET_BASE
-        #define SDP_ATTR_SPOVNET_INFO1          0x0001 + SDP_SPOVNET_BASE
-        #define SDP_ATTR_SPOVNET_INFO2          0x0002 + SDP_SPOVNET_BASE
-        #define SDP_ATTR_SPOVNET_INFO3          0x0003 + SDP_SPOVNET_BASE
-
-        // The SpoVNet unique identifier, this should be the same for all SpoVNet implementations
-        const uint8_t svc_uuid_int[] = {0x59, 0x29, 0x24, 0x34, 0x69, 0x42, 0x11, 0xde, 0x94,
+// Attribute descriptors for SDP
+// base was chosen randomly
+#define SDP_SPOVNET_BASE                        0x4000
+#define SDP_ATTR_SPOVNET_NAME           0x0000 + SDP_SPOVNET_BASE
+#define SDP_ATTR_SPOVNET_INFO1          0x0001 + SDP_SPOVNET_BASE
+#define SDP_ATTR_SPOVNET_INFO2          0x0002 + SDP_SPOVNET_BASE
+#define SDP_ATTR_SPOVNET_INFO3          0x0003 + SDP_SPOVNET_BASE
+
+// The SpoVNet unique identifier, this should be the same for all SpoVNet implementations
+const uint8_t svc_uuid_int[] = {0x59, 0x29, 0x24, 0x34, 0x69, 0x42, 0x11, 0xde, 0x94,
                 0x3e, 0x00, 0x21, 0x5d, 0xb4, 0xd8, 0x54};
 
-        const char *service_name = "SpoVNet";
-        const char *svc_dsc = "www.ariba-underlay.org";
-        const char *service_prov = "ITM Uni Karlsruhe";
+const char *service_name = "SpoVNet";
+const char *svc_dsc = "www.ariba-underlay.org";
+const char *service_prov = "ITM Uni Karlsruhe";
 
 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
@@ -67 +67 @@
         BootstrapModule(_callback), scan_timer_(io_service_) {
         srand( time(NULL) );
-        found = false;
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
 
@@ -141 +140 @@
         uuid_t root_uuid, l2cap_uuid, rfcomm_uuid, svc_uuid, svc_class_uuid;
         sdp_list_t *l2cap_list = 0, *rfcomm_list = 0, *root_list = 0, *proto_list =
-        0, *access_proto_list = 0, *svc_class_list = 0, *profile_list = 0;
+                0, *access_proto_list = 0, *svc_class_list = 0, *profile_list = 0;
         sdp_data_t *channel = 0;
         sdp_profile_desc_t profile;
@@ -253 +252 @@
 
 void BluetoothSdp::bt_scan() {
-        /*
-         * Scans for other bluetooth devices and starts a SDP search on them.
-         */
-
-        logging_debug("scanning for peers");
-
-        inquiry_info *ii = NULL;
-        int max_rsp, num_rsp;
-        int dev_id, sock, len, flags;
-        int i;
-
-        bdaddr_t address;
-        uint8_t channel;
-
-        dev_id = hci_get_route(NULL);
-        sock = hci_open_dev(dev_id);
-        if (dev_id < 0 || sock < 0) {
-                logging_error("opening socket for device "
-                                << dev_id << " failed. can not scan for peers: " << strerror(errno));
-                return;
-        }
-
-        len = 8;
-        max_rsp = 255;
-        flags = IREQ_CACHE_FLUSH;
-        ii = (inquiry_info*) malloc(max_rsp * sizeof(inquiry_info));
-
-        num_rsp = hci_inquiry(dev_id, len, max_rsp, NULL, &ii, flags);
-        if (num_rsp < 0)
-                logging_error("hci_inquiry failed with " << num_rsp << ": " << strerror(errno));
-
-        for (i = 0; i < num_rsp; i++) {
-                address = (ii + i)->bdaddr;
-
-                string saddress = ba2string(&address);
-                string sname = ba2name(&address, sock);
-
-                logging_debug("found peer [" << saddress << "] [" << sname << "]");
-                sdp_search( address, sname );
-        }
-
-        free(ii);
-        close(sock);
-
-        if(!found){
-                int nextscan = (rand() % 30) + 5;
-                logging_debug("next sdp scan in " << nextscan << " seconds");
-
-
-                scan_timer_.expires_from_now( boost::posix_time::seconds(nextscan) );
-                scan_timer_.async_wait( boost::bind(&BluetoothSdp::bt_scan, this) );
-        }
+
+        //
+        // scan for devices if we have no active rfcomm connections running.
+        // otherwise we would break existing connections due to chipping seq
+        //
+
+        if(!haveConnections()){
+
+                /*
+                 * Scans for other bluetooth devices and starts a SDP search on them.
+                 */
+
+                logging_debug("scanning for peers");
+
+                inquiry_info *ii = NULL;
+                int max_rsp, num_rsp;
+                int dev_id, sock, len, flags;
+                int i;
+
+                bdaddr_t address;
+                uint8_t channel;
+
+                dev_id = hci_get_route(NULL);
+                sock = hci_open_dev(dev_id);
+                if (dev_id < 0 || sock < 0) {
+                        logging_error("opening socket for device "
+                                        << dev_id << " failed. can not scan for peers: " << strerror(errno));
+                        return;
+                }
+
+                len = 8;
+                max_rsp = 255;
+                flags = IREQ_CACHE_FLUSH;
+                ii = (inquiry_info*) malloc(max_rsp * sizeof(inquiry_info));
+
+                num_rsp = hci_inquiry(dev_id, len, max_rsp, NULL, &ii, flags);
+                if (num_rsp < 0)
+                        logging_error("hci_inquiry failed with " << num_rsp << ": " << strerror(errno));
+
+                for (i = 0; i < num_rsp; i++) {
+                        address = (ii + i)->bdaddr;
+
+                        string saddress = ba2string(&address);
+                        string sname = ba2name(&address, sock);
+
+                        logging_debug("found peer [" << saddress << "] [" << sname << "]");
+                        sdp_search( address, sname );
+                }
+
+                free(ii);
+                close(sock);
+
+        } else {
+                logging_debug("have active rfcomm connectinos, not searching");
+        }
+
+        int nextscan = (rand() % 30) + 5;
+        logging_debug("next sdp scan try in " << nextscan << " seconds");
+
+        scan_timer_.expires_from_now( boost::posix_time::seconds(nextscan) );
+        scan_timer_.async_wait( boost::bind(&BluetoothSdp::bt_scan, this) );
 }
 
@@ -372 +380 @@
 
                                 // Callback
-                                found = true;
                                 callback->onBootstrapServiceFound(name, info1, info2, info3);
                         }
@@ -410 +417 @@
 }
 
+bool BluetoothSdp::haveConnections(){
+
+        struct hci_conn_list_req* cl = NULL;
+        struct hci_conn_info* ci = NULL;
+
+        int btsock = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
+        if(btsock <  0){
+                logging_error("failed getting bluetooth raw socket");
+                return true; // return true to be safe here and not perform sdp scan
+        }
+
+        cl = (struct hci_conn_list_req*)malloc(10 * sizeof(struct hci_conn_info) + sizeof(struct hci_conn_list_req));
+
+        cl->dev_id = hci_get_route(NULL);;
+        cl->conn_num = 10;
+        ci = cl->conn_info;
+
+        if(ioctl(btsock, HCIGETCONNLIST, (void*)cl)){
+                logging_warn("could not get active rfcomm connections");
+                return true; // return true to be safe here and not perform sdp scan
+        }
+
+        bool haveconn = (cl->conn_num > 0);
+        logging_error("we have " << cl->conn_num << " active connections");
+        free(cl);
+        close(btsock);
+
+        return haveconn;
+}
+
 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
 

source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h

@@ -92 +92 @@
         sdp_session_t *sdp_session_;
         uint8_t channel_;
+
+        bool haveConnections();
 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
 
@@ -97 +99 @@
         boost::asio::deadline_timer scan_timer_;
         boost::thread t_;
-
-        bool found;
-
 };
 

source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h

@@ -352 +352 @@
                                 if( it != services->end() ){
 
+                                        /*
                                         it->second.setInfo1( msg.getInfo1() );
                                         it->second.setInfo2( msg.getInfo2() );
                                         it->second.setInfo3( msg.getInfo3() );
+                                        */
                                         it->second.setLastseen( time(NULL) );
 

source/ariba/utility/logging/Logging.h

@@ -44 +44 @@
 #include <log4cxx/logger.h>
 #include <log4cxx/basicconfigurator.h>
-#include "ariba/config.h"
 
 
@@ -71 +70 @@
         log4cxx::LoggerPtr x::logger(log4cxx::Logger::getLogger(#x));
 
-#ifdef HAVE_MAEMO
-
-  #define logging_trace(x)  {                                                             }
-  #define logging_debug(x)  {                                                             }
-  #define logging_info(x)   {                                                             }
-  #define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
-  #define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
-  #define logging_force(x)  {                                                             }
-  #define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
-
-#else
-
-  #define logging_trace(x)  {            LOG4CXX_TRACE(logger,x);                         }
-  #define logging_debug(x)  {colorDebug; LOG4CXX_DEBUG(logger,x); colorDefault;           }
-  #define logging_info(x)   {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
-  #define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
-  #define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
-  #define logging_force(x)  {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
-  #define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
-
-#endif // HAVE_MAEMO
+#define logging_trace(x)  {            LOG4CXX_TRACE(logger,x);                         }
+#define logging_debug(x)  {colorDebug; LOG4CXX_DEBUG(logger,x); colorDefault;           }
+#define logging_info(x)   {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
+#define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
+#define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
+#define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
 
 #endif //LOGGING_H__

source/ariba/utility/serialization/DataStream.hpp

@@ -509 +509 @@
                                 i++;
                         }
-                        if (isCharP) *text = strdup(s.c_str()); else *string = s;
+                        if (isCharP) *text = strdup(s.c_str());
+                        else string->assign(s);
                 }
                 sznMethodEnd()

source/ariba/utility/system/StartupWrapper.cpp

@@ -38 +38 @@
 
 #include "StartupWrapper.h"
+#include "ariba/config.h"
 
 namespace ariba {
@@ -131 +132 @@
         // DON'T SVN COMMIT YOUR CHANGED LOGGING! THE ABOVE CODE MUST REMAIN AS IS!
         //$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+
+#ifdef HAVE_MAEMO
+        log4cxx::LoggerPtr logger(log4cxx::Logger::getRootLogger());
+        logger->setLevel(log4cxx::Level::getWarn());
+#endif
 }