Changeset 5967

Timestamp:

Aug 14, 2009, 6:44:45 PM (15 years ago)

Author:

Christoph Mayer

Message:

rfcomm sdp fixing

Location:

source/ariba

Files:

• overlay/OverlayBootstrap.cpp (modified) (4 diffs)
• overlay/OverlayBootstrap.h (modified) (2 diffs)
• utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp (modified) (6 diffs)
• utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h (modified) (2 diffs)
• utility/system/StartupWrapper.cpp (modified) (1 diff)

source/ariba/overlay/OverlayBootstrap.cpp

@@ -38 +38 @@
 
 #include "OverlayBootstrap.h"
+
 #include "BaseOverlay.h"
+#include "ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h"
+
+using ariba::utility::BluetoothSdp;
 
 namespace ariba {
@@ -51 +55 @@
                 nodeid( NodeID::UNSPECIFIED ),
                 overlay( NULL ),
-                watchtimer(this) {
+                watchtimer(this),
+                haveOverlayConnection(false){
 
         srand(time(NULL));
+
+        BluetoothSdp::CONNECTION_CHECKER = this;
 }
 
@@ -162 +169 @@
 
         lastJoines.push_front(data);
+}
+
+bool OverlayBootstrap::haveOverlayConnections(){
+        boost::mutex::scoped_lock lock(haveOverlayConnectionMutex);
+        return haveOverlayConnection;
 }
 
@@ -175 +187 @@
         }
 
-        // TODO: --> SIGCOMM hack <--
-        // if we have no overlay neighbors, make sure sdp is loaded
-        // sdp searching is turned off when we have bootstrapped
-        if(overlay->getOverlayNeighbors().size() > 0){
-
-                // switch off sdp when we we _are_ in the spovnet already
-                if(manager.isModuleRegistered(BootstrapManager::BootstrapTypeBluetoothSdp))
-                        manager.unregisterModule(BootstrapManager::BootstrapTypeBluetoothSdp);
-
-                return;
+        {
+                boost::mutex::scoped_lock lock(haveOverlayConnectionMutex);
+                haveOverlayConnection = overlay->getOverlayNeighbors().size() > 0;
+
+                // we have overlay neighbors -> ok nothing to do
+                if(haveOverlayConnection > 0) return;
         }
 
-        // make sure sdp is running when we are _not_ in the spovnet
-        if(!manager.isModuleRegistered(BootstrapManager::BootstrapTypeBluetoothSdp))
-                manager.registerModule(BootstrapManager::BootstrapTypeBluetoothSdp);
-
-        //
-        // we have overlay neighbors -> ok
-        //
-
+        // no overlay neighbors, see if we can join using old information
         logging_info("overlay not joined, checking for earlier used bootstrap information");
         EndpointDescriptor joinep = EndpointDescriptor::UNSPECIFIED();

source/ariba/overlay/OverlayBootstrap.h

@@ -90 +90 @@
 
         void recordJoin(const EndpointDescriptor& _ep);
+        bool haveOverlayConnections();
 
 protected:
@@ -134 +135 @@
         WatchdogTimer watchtimer;
         void checkOverlayStatus();
+
+
+        bool haveOverlayConnection;
+        boost::mutex haveOverlayConnectionMutex;
 };
 

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

@@ -38 +38 @@
 
 #include "BluetoothSdp.h"
+#include "ariba/overlay/OverlayBootstrap.h"
 
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
@@ -62 +63 @@
 namespace ariba {
 namespace utility {
+
 use_logging_cpp(BluetoothSdp);
+OverlayBootstrap* BluetoothSdp::CONNECTION_CHECKER = NULL;
 
 BluetoothSdp::BluetoothSdp(BootstrapInformationCallback* _callback) :
@@ -258 +261 @@
         //
 
-        //if(!haveConnections()){
+        if(!haveConnections()){
 
                 /*
@@ -304 +307 @@
                 close(sock);
 
-        //} else {
-                //logging_debug("have active rfcomm connections, not searching");
-        //}
-
-        int nextscan = (rand() % 5) + 3;
+        } else {
+                logging_debug("have active connections, no sdp searching");
+        }
+
+        int nextscan = (rand() % 10) + 5;
         logging_debug("next sdp scan try in " << nextscan << " seconds");
 
@@ -419 +422 @@
 bool BluetoothSdp::haveConnections(){
 
+        // TODO: currently we check for overlay connectivity
+
+        if(CONNECTION_CHECKER == NULL) return false;
+        return CONNECTION_CHECKER->haveOverlayConnections();
+
+
+        /* TODO: this will check for rfcomm connections
         struct hci_conn_list_req* cl = NULL;
         struct hci_conn_info* ci = NULL;
@@ -445 +455 @@
 
         return haveconn;
+        */
 }
 

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

@@ -65 +65 @@
 
 namespace ariba {
+  namespace overlay {
+    class OverlayBootstrap;
+  }
+}
+
+using ariba::overlay::OverlayBootstrap;
+
+namespace ariba {
 namespace utility {
 
@@ -70 +78 @@
         use_logging_h(BluetoothSdp);
 public:
+        static OverlayBootstrap* CONNECTION_CHECKER;
+
         BluetoothSdp(BootstrapInformationCallback* _callback);
         virtual ~BluetoothSdp();

source/ariba/utility/system/StartupWrapper.cpp

@@ -104 +104 @@
         // set up again an individual level if you like
         
-        {
+        /*{
                 log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("MCPO"));
                 logger->setLevel(log4cxx::Level::getDebug());
         }
+        {
+                log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BaseCommunication"));
+                logger->setLevel(log4cxx::Level::getDebug());
+        }*/
+        {
+                log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("OverlayBootstrap"));
+                logger->setLevel(log4cxx::Level::getDebug());
+        }
+        {
+                log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BootstrapManager"));
+                logger->setLevel(log4cxx::Level::getDebug());
+        }
+        {
+                log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BluetoothSdp"));
+                logger->setLevel(log4cxx::Level::getDebug());
+        }
         /*{
-                log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BaseCommunication"));
-                logger->setLevel(log4cxx::Level::getDebug());
-        }
-        {
-                log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("OverlayBootstrap"));
-                logger->setLevel(log4cxx::Level::getDebug());
-        }
-        {
-                        log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BootstrapManager"));
-                        logger->setLevel(log4cxx::Level::getDebug());
-        }
-        {
                         log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("Chord"));
                         logger->setLevel(log4cxx::Level::getInfo());