Changeset 5953 for source/ariba

Timestamp:

Aug 14, 2009, 2:17:07 PM (15 years ago)

Author:

Christoph Mayer

Message:

more agressive sdp scan, sdp off when in spovnet, sdp on and agressive when not

Location:

source/ariba

Files:

• overlay/OverlayBootstrap.cpp (modified) (1 diff)
• utility/bootstrap/BootstrapManager.cpp (modified) (1 diff)
• utility/bootstrap/BootstrapManager.h (modified) (1 diff)
• utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp (modified) (2 diffs)

source/ariba/overlay/OverlayBootstrap.cpp

@@ -175 +175 @@
         }
 
+        // 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;
+        }
+
+        // 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
-        if(overlay->getOverlayNeighbors().size() > 0) return;
+        //
 
         logging_info("overlay not joined, checking for earlier used bootstrap information");

source/ariba/utility/bootstrap/BootstrapManager.cpp

@@ -97 +97 @@
 }
 
+bool BootstrapManager::isModuleRegistered(BootstrapType type){
+        boost::mutex::scoped_lock lock( modulesMutex );
+
+        ModuleMap::iterator i = modules.find(type);
+        return  (i != modules.end());
+}
+
 BootstrapManager::RegistrationResult BootstrapManager::unregisterModule(
                 BootstrapManager::BootstrapType type){

source/ariba/utility/bootstrap/BootstrapManager.h

@@ -88 +88 @@
         RegistrationResult unregisterAllModules();
         RegistrationResult unregisterModule(BootstrapType type);
+        bool isModuleRegistered(BootstrapType type);
 
         void registerCallback(BootstrapInformationCallback* _callback);

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

@@ -258 +258 @@
         //
 
-        if(!haveConnections()){
+        //if(!haveConnections()){
 
                 /*
@@ -304 +304 @@
                 close(sock);
 
-        } else {
-                logging_debug("have active rfcomm connectinos, not searching");
-        }
-
-        int nextscan = (rand() % 30) + 5;
+        //} else {
+                //logging_debug("have active rfcomm connections, not searching");
+        //}
+
+        int nextscan = (rand() % 5) + 3;
         logging_debug("next sdp scan try in " << nextscan << " seconds");