Changeset 5344

Timestamp:

Jul 26, 2009, 3:32:49 PM (15 years ago)

Author:

Christoph Mayer

Message:

 

Location:

source/ariba

Files:

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

source/ariba/overlay/OverlayBootstrap.cpp

@@ -64 +64 @@
 
         manager.registerCallback( this );
-        manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
-        //manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
+        //manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
+        manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
 }
 
@@ -76 +76 @@
 
         manager.unregisterCallback( this );
-        manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
-        //manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
+        //manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
+        manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
 }
 

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

@@ -320 +320 @@
         // connect to the SDP server running on the remote machine
         logging_debug("querying services from bt device " << ba2string(&target));
-        session = sdp_connect(BDADDR_ANY, &target, 0);
+        session = sdp_connect(BDADDR_ANY, &target, SDP_RETRY_IF_BUSY);
 
         if (session == NULL) {

source/ariba/utility/system/StartupWrapper.cpp

@@ -107 +107 @@
         }
         {
-//              log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BaseCommunication"));
-//              logger->setLevel(log4cxx::Level::getError());
+                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());
         }