Index: source/ariba/utility/bootstrap/BootstrapManager.cpp
===================================================================
--- source/ariba/utility/bootstrap/BootstrapManager.cpp	(revision 4872)
+++ source/ariba/utility/bootstrap/BootstrapManager.cpp	(revision 4879)
@@ -41,4 +41,5 @@
 #include "ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h"
 #include "ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h"
+#include "ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h"
 
 namespace ariba {
@@ -72,4 +73,7 @@
 		module = new PeriodicBroadcast(this);
 		break;
+	case BootstrapTypeBluetoothSdp:
+		module = new BluetoothSdp(this);
+		break;
 	}
 
@@ -130,4 +134,12 @@
 	}
 
+	{ // bluetooth sdp
+			RegistrationResult resone = RegistrationSucceeded;
+			resone = registerModule(BootstrapTypeBluetoothSdp);
+
+			if(resone != RegistrationSucceeded)
+				result = resone;
+		}
+
 	{ // todo
 		/*  ...   */
@@ -140,4 +152,5 @@
 	unregisterModule(BootstrapTypeMulticastDns);
 	unregisterModule(BootstrapTypePeriodicBroadcast);
+	unregisterModule(BootstrapTypeBluetoothSdp);
 	/*  todo  ...  */
 
Index: source/ariba/utility/bootstrap/BootstrapManager.h
===================================================================
--- source/ariba/utility/bootstrap/BootstrapManager.h	(revision 4872)
+++ source/ariba/utility/bootstrap/BootstrapManager.h	(revision 4879)
@@ -75,4 +75,5 @@
 		BootstrapTypeMulticastDns,			// use mDNS bootstrapping
 		BootstrapTypePeriodicBroadcast, 	// stupid periodic broadcasting
+		BootstrapTypeBluetoothSdp,			// bluetooth service discovery
 	};
 
Index: source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp
===================================================================
--- source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp	(revision 4872)
+++ source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp	(revision 4879)
@@ -43,5 +43,5 @@
 // Attribute descriptors for SDP
 // base was chosen randomly
-#define SDP_SPOVNET_BASE 		0x4000
+#define SDP_SPOVNET_BASE 			0x4000
 #define SDP_ATTR_SPOVNET_NAME		0x0000 + SDP_SPOVNET_BASE
 #define SDP_ATTR_SPOVNET_INFO1		0x0001 + SDP_SPOVNET_BASE
@@ -133,5 +133,5 @@
 	 */
 
-	logging_info("Registering SDP service.\n");
+	logging_info("Registering SDP service");
 
 	uint8_t rfcomm_channel = channel_;
@@ -239,6 +239,5 @@
 
 	if (sdp_session_ == 0) {
-		std::cout
-		<< "Something is wrong with your SDP server, nothing registered.";
+		logging_error( "Something is wrong with your SDP server, nothing registered" );
 	} else {
 		sdp_record_register(sdp_session_, &record, 0);
@@ -260,5 +259,5 @@
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
 
-	logging_info("Unregistering SDP service.\n");
+	logging_info("Unregistering SDP service");
 	sdp_close(sdp_session_);
 
@@ -276,5 +275,5 @@
 	 */
 
-	logging_info("Scanning for peers.\n");
+	logging_info("Scanning for peers");
 
 	inquiry_info *ii = NULL;
@@ -293,5 +292,5 @@
 	sock = hci_open_dev(dev_id);
 	if (dev_id < 0 || sock < 0) {
-		perror("opening socket");
+		logging_error("opening socket");
 		exit(1);
 	}
@@ -304,5 +303,5 @@
 	num_rsp = hci_inquiry(dev_id, len, max_rsp, NULL, &ii, flags);
 	if (num_rsp < 0)
-	perror("hci_inquiry");
+		logging_error("hci_inquiry");
 
 	for (i = 0; i < num_rsp; i++) {
@@ -324,10 +323,8 @@
 	close(sock);
 
-	logging_info("Next scan in 20 seconds.\n");
+	logging_info("Next scan in 20 seconds");
 
 	scan_timer_.expires_from_now(boost::posix_time::seconds(20));
 	scan_timer_.async_wait(boost::bind(&BluetoothSdp::bt_scan, this));
-
-
 }
 
@@ -399,4 +396,3 @@
 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
 
-}
-} //namespace ariba, utility
+}} //namespace ariba, utility
Index: source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h
===================================================================
--- source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h	(revision 4872)
+++ source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h	(revision 4879)
@@ -53,9 +53,9 @@
 
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
+  #include <bluetooth/bluetooth.h>
+  #include <bluetooth/sdp.h>
+  #include <bluetooth/sdp_lib.h>
+  #include <bluetooth/hci.h>
+  #include <bluetooth/hci_lib.h>
 #endif
 
@@ -80,7 +80,7 @@
 	virtual void revokeService(string name);
 
+private:
+
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
-
-private:
 	void bt_scan();
 	void sdp_search(bdaddr_t target);
@@ -88,5 +88,4 @@
 	sdp_session_t *sdp_session_;
 	uint8_t channel_;
-
 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
 
@@ -95,5 +94,4 @@
 	boost::thread t_;
 
-
 };