X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Fbt-common.c;h=e416c450ee8d3d2acd54986fb3e07e125941a44a;hb=baafd71b1294da18908043ccb450a1bfaac62c75;hp=515d4ce2c24b5329ef74425ccd696c2eb78be447;hpb=9378ba57f1d5507fed275b215c70e1d53d774a61;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/bt-api/bt-common.c b/bt-api/bt-common.c
index 515d4ce..e416c45 100644
--- a/bt-api/bt-common.c
+++ b/bt-api/bt-common.c
@@ -37,7 +37,7 @@
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
 
-#ifdef TIZEN_DPM_ENABLE
+#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
 #endif
 
@@ -50,6 +50,8 @@ static guint bus_id;
 
 static GDBusConnection *system_gconn = NULL;
 
+static gboolean bt_enabled = FALSE;
+
 #define DBUS_TIMEOUT 20 * 1000 /* 20 Seconds */
 
 GDBusConnection *g_bus_get_private_conn(void)
@@ -86,8 +88,6 @@ GDBusConnection *g_bus_get_private_conn(void)
 
 GDBusConnection *_bt_gdbus_init_system_gconn(void)
 {
-	dbus_threads_init_default();
-
 	if (system_gconn != NULL)
 		return system_gconn;
 
@@ -98,13 +98,10 @@ GDBusConnection *_bt_gdbus_init_system_gconn(void)
 
 GDBusConnection *_bt_gdbus_get_system_gconn(void)
 {
-
-
-	if (system_gconn == NULL) {
+	if (system_gconn == NULL)
 		system_gconn = _bt_gdbus_init_system_gconn();
-	} else if (g_dbus_connection_is_closed(system_gconn)) {
+	else if (g_dbus_connection_is_closed(system_gconn))
 		system_gconn = g_bus_get_private_conn();
-	}
 
 	return system_gconn;
 }
@@ -129,6 +126,7 @@ bt_user_info_t *_bt_get_user_data(int type)
 void _bt_common_event_cb(int event, int result, void *param,
 					void *callback, void *user_data)
 {
+	BT_DBG("bt_common_event_cb, event: %d", event);
 	bluetooth_event_param_t bt_event = { 0, };
 	bt_event.event = event;
 	bt_event.result = result;
@@ -219,28 +217,45 @@ void _bt_divide_device_class(bluetooth_device_class_t *device_class,
 	}
 }
 
-void _bt_convert_addr_string_to_type(unsigned char *addr,
-					const char *address)
+void _bt_convert_addr_string_to_type(unsigned char *addr, const char *address)
 {
-        int i;
-        char *ptr = NULL;
+	int i;
+	char *ptr = NULL;
 
 	ret_if(address == NULL);
 	ret_if(addr == NULL);
 
-        for (i = 0; i < BT_ADDRESS_LENGTH_MAX; i++) {
-                addr[i] = strtol(address, &ptr, 16);
-                if (ptr[0] != '\0') {
-                        if (ptr[0] != ':')
-                                return;
+	for (i = 0; i < BT_ADDRESS_LENGTH_MAX; i++) {
+		addr[i] = strtol(address, &ptr, 16);
+		if (ptr[0] != '\0') {
+			if (ptr[0] != ':')
+				return;
 
-                        address = ptr + 1;
-                }
-        }
+			address = ptr + 1;
+		}
+	}
 }
 
-void _bt_convert_addr_type_to_string(char *address,
-				unsigned char *addr)
+void _bt_convert_addr_string_to_secure_string(char *addr, const char *address)
+{
+	int len;
+
+	ret_if(address == NULL);
+	ret_if(addr == NULL);
+
+	len = strlen(address);
+	ret_if(len != BT_ADDRESS_STRING_SIZE - 1);
+
+	strncpy(addr, address, len);
+	addr[len] = '\0';
+
+	addr[len-1] = 'X';
+	addr[len-2] = 'X';
+
+	return;
+}
+
+void _bt_convert_addr_type_to_string(char *address, unsigned char *addr)
 {
 	ret_if(address == NULL);
 	ret_if(addr == NULL);
@@ -251,6 +266,360 @@ void _bt_convert_addr_type_to_string(char *address,
 			addr[3], addr[4], addr[5]);
 }
 
+void _bt_convert_addr_type_to_secure_string(char *address, unsigned char *addr)
+{
+	ret_if(address == NULL);
+	ret_if(addr == NULL);
+
+	g_snprintf(address, BT_ADDRESS_STRING_SIZE,
+			"%2.2X:%2.2X:%2.2X:%2.2X:XX:XX",
+			addr[0], addr[1], addr[2], addr[3]);
+}
+
+const char *_bt_convert_error_to_string(int error)
+{
+	switch (error) {
+	case BLUETOOTH_ERROR_CANCEL:
+		return "CANCELLED";
+	case BLUETOOTH_ERROR_INVALID_PARAM:
+		return "INVALID_PARAMETER";
+	case BLUETOOTH_ERROR_INVALID_DATA:
+		return "INVALID DATA";
+	case BLUETOOTH_ERROR_MEMORY_ALLOCATION:
+	case BLUETOOTH_ERROR_OUT_OF_MEMORY:
+		return "OUT_OF_MEMORY";
+	case BLUETOOTH_ERROR_TIMEOUT:
+		return "TIMEOUT";
+	case BLUETOOTH_ERROR_NO_RESOURCES:
+		return "NO_RESOURCES";
+	case BLUETOOTH_ERROR_INTERNAL:
+		return "INTERNAL";
+	case BLUETOOTH_ERROR_NOT_SUPPORT:
+		return "NOT_SUPPORT";
+	case BLUETOOTH_ERROR_DEVICE_NOT_ENABLED:
+		return "NOT_ENABLED";
+	case BLUETOOTH_ERROR_DEVICE_ALREADY_ENABLED:
+		return "ALREADY_ENABLED";
+	case BLUETOOTH_ERROR_DEVICE_BUSY:
+		return "DEVICE_BUSY";
+	case BLUETOOTH_ERROR_ACCESS_DENIED:
+		return "ACCESS_DENIED";
+	case BLUETOOTH_ERROR_MAX_CLIENT:
+		return "MAX_CLIENT";
+	case BLUETOOTH_ERROR_NOT_FOUND:
+		return "NOT_FOUND";
+	case BLUETOOTH_ERROR_SERVICE_SEARCH_ERROR:
+		return "SERVICE_SEARCH_ERROR";
+	case BLUETOOTH_ERROR_PARING_FAILED:
+		return "PARING_FAILED";
+	case BLUETOOTH_ERROR_NOT_PAIRED:
+		return "NOT_PAIRED";
+	case BLUETOOTH_ERROR_SERVICE_NOT_FOUND:
+		return "SERVICE_NOT_FOUND";
+	case BLUETOOTH_ERROR_NOT_CONNECTED:
+		return "NOT_CONNECTED";
+	case BLUETOOTH_ERROR_ALREADY_CONNECT:
+		return "ALREADY_CONNECT";
+	case BLUETOOTH_ERROR_CONNECTION_BUSY:
+		return "CONNECTION_BUSY";
+	case BLUETOOTH_ERROR_CONNECTION_ERROR:
+		return "CONNECTION_ERROR";
+	case BLUETOOTH_ERROR_MAX_CONNECTION:
+		return "MAX_CONNECTION";
+	case BLUETOOTH_ERROR_NOT_IN_OPERATION:
+		return "NOT_IN_OPERATION";
+	case BLUETOOTH_ERROR_CANCEL_BY_USER:
+		return "CANCEL_BY_USER";
+	case BLUETOOTH_ERROR_REGISTRATION_FAILED:
+		return "REGISTRATION_FAILED";
+	case BLUETOOTH_ERROR_IN_PROGRESS:
+		return "IN_PROGRESS";
+	case BLUETOOTH_ERROR_AUTHENTICATION_FAILED:
+		return "AUTHENTICATION_FAILED";
+	case BLUETOOTH_ERROR_HOST_DOWN:
+		return "HOST_DOWN";
+	case BLUETOOTH_ERROR_END_OF_DEVICE_LIST:
+		return "END_OF_DEVICE_LIST";
+	case BLUETOOTH_ERROR_AGENT_ALREADY_EXIST:
+		return "AGENT_ALREADY_EXIST";
+	case BLUETOOTH_ERROR_AGENT_DOES_NOT_EXIST:
+		return "AGENT_DOES_NOT_EXIST";
+	case BLUETOOTH_ERROR_ALREADY_INITIALIZED:
+		return "ALREADY_INITIALIZED";
+	case BLUETOOTH_ERROR_PERMISSION_DEINED:
+		return "PERMISSION_DEINED";
+	case BLUETOOTH_ERROR_ALREADY_DEACTIVATED:
+		return "ALREADY_DEACTIVATED";
+	case BLUETOOTH_ERROR_NOT_INITIALIZED:
+		return "NOT_INITIALIZED";
+	case BLUETOOTH_ERROR_AUTHENTICATION_REJECTED:
+		return "AUTHENTICATION REJECTED";
+	default:
+		return "UNKNOWN";
+	}
+}
+
+const char *_bt_convert_service_function_to_string(int function)
+{
+	int i;
+
+	typedef struct {
+		int function;
+		const char *function_name;
+	} bt_function_name_t;
+
+	const bt_function_name_t bt_functions[] = {
+		{BT_CHECK_ADAPTER, "BT_CHECK_ADAPTER"},
+		{BT_ENABLE_ADAPTER, "BT_ENABLE_ADAPTER"},
+		{BT_DISABLE_ADAPTER, "BT_DISABLE_ADAPTER"},
+		{BT_RECOVER_ADAPTER, "BT_RECOVER_ADAPTER"},
+		{BT_SET_DISCOVERABLE_TIME, "BT_SET_DISCOVERABLE_TIME"},
+		{BT_GET_DISCOVERABLE_TIME, "BT_GET_DISCOVERABLE_TIME"},
+		{BT_IGNORE_AUTO_PAIRING, "BT_IGNORE_AUTO_PAIRING"},
+		{BT_GET_LOCAL_ADDRESS, "BT_GET_LOCAL_ADDRESS"},
+		{BT_GET_LOCAL_VERSION, "BT_GET_LOCAL_VERSION"},
+		{BT_GET_LOCAL_NAME, "BT_GET_LOCAL_NAME"},
+		{BT_SET_LOCAL_NAME, "BT_SET_LOCAL_NAME"},
+		{BT_IS_SERVICE_USED, "BT_IS_SERVICE_USED"},
+		{BT_GET_DISCOVERABLE_MODE, "BT_GET_DISCOVERABLE_MODE"},
+		{BT_SET_DISCOVERABLE_MODE, "BT_SET_DISCOVERABLE_MODE"},
+		{BT_START_DISCOVERY, "BT_START_DISCOVERY"},
+		{BT_START_CUSTOM_DISCOVERY, "BT_START_CUSTOM_DISCOVERY"},
+		{BT_CANCEL_DISCOVERY, "BT_CANCEL_DISCOVERY"},
+		{BT_START_LE_DISCOVERY, "BT_START_LE_DISCOVERY"},
+		{BT_STOP_LE_DISCOVERY, "BT_STOP_LE_DISCOVERY"},
+		{BT_IS_DISCOVERYING, "BT_IS_DISCOVERYING"},
+		{BT_IS_LE_DISCOVERYING, "BT_IS_LE_DISCOVERYING"},
+		{BT_ENABLE_RSSI, "BT_ENABLE_RSSI"},
+		{BT_GET_RSSI, "BT_GET_RSSI"},
+		{BT_IS_CONNECTABLE, "BT_IS_CONNECTABLE"},
+		{BT_SET_CONNECTABLE, "BT_SET_CONNECTABLE"},
+		{BT_GET_BONDED_DEVICES, "BT_GET_BONDED_DEVICES"},
+		{BT_RESET_ADAPTER, "BT_RESET_ADAPTER"},
+		{BT_SET_ADVERTISING, "BT_SET_ADVERTISING"},
+		{BT_SET_CUSTOM_ADVERTISING, "BT_SET_CUSTOM_ADVERTISING"},
+		{BT_SET_ADVERTISING_PARAMETERS, "BT_SET_ADVERTISING_PARAMETERS"},
+		{BT_GET_ADVERTISING_DATA, "BT_GET_ADVERTISING_DATA"},
+		{BT_SET_ADVERTISING_DATA, "BT_SET_ADVERTISING_DATA"},
+		{BT_SET_SCAN_PARAMETERS, "BT_SET_SCAN_PARAMETERS"},
+		{BT_GET_SCAN_RESPONSE_DATA, "BT_GET_SCAN_RESPONSE_DATA"},
+		{BT_SET_SCAN_RESPONSE_DATA, "BT_SET_SCAN_RESPONSE_DATA"},
+		{BT_IS_ADVERTISING, "BT_IS_ADVERTISING"},
+		{BT_SET_MANUFACTURER_DATA, "BT_SET_MANUFACTURER_DATA"},
+		{BT_LE_CONN_UPDATE, "BT_LE_CONN_UPDATE"},
+		{BT_LE_READ_MAXIMUM_DATA_LENGTH, "BT_LE_READ_MAXIMUM_DATA_LENGTH"},
+		{BT_LE_WRITE_HOST_SUGGESTED_DATA_LENGTH, "BT_LE_WRITE_HOST_SUGGESTED_DATA_LENGTH"},
+		{BT_LE_READ_HOST_SUGGESTED_DATA_LENGTH, "BT_LE_READ_HOST_SUGGESTED_DATA_LENGTH"},
+		{BT_LE_SET_DATA_LENGTH, "BT_LE_SET_DATA_LENGTH"},
+		{BT_ADD_WHITE_LIST, "BT_ADD_WHITE_LIST"},
+		{BT_REMOVE_WHITE_LIST, "BT_REMOVE_WHITE_LIST"},
+		{BT_CLEAR_WHITE_LIST, "BT_CLEAR_WHITE_LIST"},
+		{BT_REGISTER_SCAN_FILTER, "BT_REGISTER_SCAN_FILTER"},
+		{BT_UNREGISTER_SCAN_FILTER, "BT_UNREGISTER_SCAN_FILTER"},
+		{BT_UNREGISTER_ALL_SCAN_FILTERS, "BT_UNREGISTER_ALL_SCAN_FILTERS"},
+		{BT_IS_SCAN_FILTER_SUPPORTED, "BT_IS_SCAN_FILTER_SUPPORTED"},
+		{BT_GET_PROFILE_CONNECTED_DEVICES, "BT_GET_PROFILE_CONNECTED_DEVICES"},
+		{BT_ENABLE_FORCE_HCI_DUMP, "BT_ENABLE_FORCE_HCI_DUMP"},
+		{BT_SET_PASSKEY_NOTIFICATION, "BT_SET_PASSKEY_NOTIFICATION"},
+		{BT_BOND_DEVICE, "BT_BOND_DEVICE"},
+		{BT_BOND_DEVICE_BY_TYPE, "BT_BOND_DEVICE_BY_TYPE"},
+		{BT_CANCEL_BONDING, "BT_CANCEL_BONDING"},
+		{BT_PASSKEY_REPLY, "BT_PASSKEY_REPLY"},
+		{BT_PASSKEY_CONFIRMATION_REPLY, "BT_PASSKEY_CONFIRMATION_REPLY"},
+		{BT_UNBOND_DEVICE, "BT_UNBOND_DEVICE"},
+		{BT_SEARCH_SERVICE, "BT_SEARCH_SERVICE"},
+		{BT_CANCEL_SEARCH_SERVICE, "BT_CANCEL_SEARCH_SERVICE"},
+		{BT_GET_BONDED_DEVICE, "BT_GET_BONDED_DEVICE"},
+		{BT_GET_IS_ALIAS_SET, "BT_GET_IS_ALIAS_SET"},
+		{BT_SET_ALIAS, "BT_SET_ALIAS"},
+		{BT_SET_AUTHORIZATION, "BT_SET_AUTHORIZATION"},
+		{BT_UNSET_AUTHORIZATION, "BT_UNSET_AUTHORIZATION"},
+		{BT_IS_DEVICE_CONNECTED, "BT_IS_DEVICE_CONNECTED"},
+		{BT_GET_CONNECTED_LINK_TYPE, "BT_GET_CONNECTED_LINK_TYPE"},
+		{BT_SET_PIN_CODE, "BT_SET_PIN_CODE"},
+		{BT_UNSET_PIN_CODE, "BT_UNSET_PIN_CODE"},
+		{BT_UPDATE_LE_CONNECTION_MODE, "BT_UPDATE_LE_CONNECTION_MODE"},
+		{BT_SET_PROFILE_TRUSTED, "BT_SET_PROFILE_TRUSTED"},
+		{BT_GET_PROFILE_TRUSTED, "BT_GET_PROFILE_TRUSTED"},
+		{BT_SET_PROFILE_RESTRICTED, "BT_SET_PROFILE_RESTRICTED"},
+		{BT_GET_PROFILE_RESTRICTED, "BT_GET_PROFILE_RESTRICTED"},
+		{BT_HID_CONNECT, "BT_HID_CONNECT"},
+		{BT_HID_DISCONNECT, "BT_HID_DISCONNECT"},
+		{BT_HID_DEVICE_ACTIVATE, "BT_HID_DEVICE_ACTIVATE"},
+		{BT_HID_DEVICE_DEACTIVATE, "BT_HID_DEVICE_DEACTIVATE"},
+		{BT_HID_DEVICE_CONNECT, "BT_HID_DEVICE_CONNECT"},
+		{BT_HID_DEVICE_DISCONNECT, "BT_HID_DEVICE_DISCONNECT"},
+		{BT_HID_DEVICE_SEND_MOUSE_EVENT, "BT_HID_DEVICE_SEND_MOUSE_EVENT"},
+		{BT_HID_DEVICE_SEND_KEY_EVENT, "BT_HID_DEVICE_SEND_KEY_EVENT"},
+		{BT_HID_DEVICE_SEND_CUSTOM_EVENT, "BT_HID_DEVICE_SEND_CUSTOM_EVENT"},
+		{BT_HID_DEVICE_SEND_REPLY_TO_REPORT, "BT_HID_DEVICE_SEND_REPLY_TO_REPORT"},
+		{BT_HID_ENABLE_BARCODE_FEATURE, "BT_HID_ENABLE_BARCODE_FEATURE"},
+		{BT_NETWORK_ACTIVATE, "BT_NETWORK_ACTIVATE"},
+		{BT_NETWORK_DEACTIVATE, "BT_NETWORK_DEACTIVATE"},
+		{BT_NETWORK_CONNECT, "BT_NETWORK_CONNECT"},
+		{BT_NETWORK_DISCONNECT, "BT_NETWORK_DISCONNECT"},
+		{BT_NETWORK_SERVER_DISCONNECT, "BT_NETWORK_SERVER_DISCONNECT"},
+		{BT_AUDIO_CONNECT, "BT_AUDIO_CONNECT"},
+		{BT_AUDIO_DISCONNECT, "BT_AUDIO_DISCONNECT"},
+		{BT_AG_CONNECT, "BT_AG_CONNECT"},
+		{BT_AG_DISCONNECT, "BT_AG_DISCONNECT"},
+		{BT_AV_CONNECT, "BT_AV_CONNECT"},
+		{BT_AV_DISCONNECT, "BT_AV_DISCONNECT"},
+		{BT_AV_SOURCE_CONNECT, "BT_AV_SOURCE_CONNECT"},
+		{BT_AV_SOURCE_DISCONNECT, "BT_AV_SOURCE_DISCONNECT"},
+		{BT_HF_CONNECT, "BT_HF_CONNECT"},
+		{BT_HF_DISCONNECT, "BT_HF_DISCONNECT"},
+		{BT_GET_SPEAKER_GAIN, "BT_GET_SPEAKER_GAIN"},
+		{BT_SET_SPEAKER_GAIN, "BT_SET_SPEAKER_GAIN"},
+		{BT_SET_CONTENT_PROTECT, "BT_SET_CONTENT_PROTECT"},
+		{BT_OOB_READ_LOCAL_DATA, "BT_OOB_READ_LOCAL_DATA"},
+		{BT_OOB_ADD_REMOTE_DATA, "BT_OOB_ADD_REMOTE_DATA"},
+		{BT_OOB_REMOVE_REMOTE_DATA, "BT_OOB_REMOVE_REMOTE_DATA"},
+		{BT_AVRCP_SET_TRACK_INFO, "BT_AVRCP_SET_TRACK_INFO"},
+		{BT_AVRCP_SET_PROPERTY, "BT_AVRCP_SET_PROPERTY"},
+		{BT_AVRCP_SET_PROPERTIES, "BT_AVRCP_SET_PROPERTIES"},
+		{BT_AVRCP_CONTROL_CONNECT, "BT_AVRCP_CONTROL_CONNECT"},
+		{BT_AVRCP_CONTROL_DISCONNECT, "BT_AVRCP_CONTROL_DISCONNECT"},
+		{BT_AVRCP_TARGET_CONNECT, "BT_AVRCP_TARGET_CONNECT"},
+		{BT_AVRCP_TARGET_DISCONNECT, "BT_AVRCP_TARGET_DISCONNECT"},
+		{BT_AVRCP_HANDLE_CONTROL, "BT_AVRCP_HANDLE_CONTROL"},
+		{BT_AVRCP_CONTROL_SET_PROPERTY, "BT_AVRCP_CONTROL_SET_PROPERTY"},
+		{BT_AVRCP_CONTROL_GET_PROPERTY, "BT_AVRCP_CONTROL_GET_PROPERTY"},
+		{BT_AVRCP_GET_TRACK_INFO, "BT_AVRCP_GET_TRACK_INFO"},
+		{BT_OPP_PUSH_FILES, "BT_OPP_PUSH_FILES"},
+		{BT_OPP_CANCEL_PUSH, "BT_OBT_OPP_IS_PUSHING_FILESPP_CANCEL_PUSH"},
+		{BT_OPP_IS_PUSHING_FILES, "BT_OPP_IS_PUSHING_FILES"},
+		{BT_OPP_GET_TRANSFER_PROGRESS, "BT_OPP_GET_TRANSFER_PROGRESS"},
+		{BT_MAP_CREATE_SESSION, "BT_MAP_CREATE_SESSION"},
+		{BT_MAP_DESTROY_SESSION, "BT_MAP_DESTROY_SESSION"},
+		{BT_MAP_SET_FOLDER, "BT_MAP_SET_FOLDER"},
+		{BT_MAP_LIST_FOLDERS, "BT_MAP_LIST_FOLDERS"},
+		{BT_MAP_LIST_FILTER_FIELDS, "BT_MAP_LIST_FILTER_FIELDS"},
+		{BT_MAP_LIST_MESSAGES, "BT_MAP_LIST_MESSAGES"},
+		{BT_MAP_UPDATE_INBOX, "BT_MAP_UPDATE_INBOX"},
+		{BT_MAP_PUSH_MESSAGE, "BT_MAP_PUSH_MESSAGE"},
+		{BT_MAP_GET_MESSAGE, "BT_MAP_GET_MESSAGE"},
+		{BT_OBEX_SERVER_ALLOCATE, "BT_OBEX_SERVER_ALLOCATE"},
+		{BT_OBEX_SERVER_DEALLOCATE, "BT_OBEX_SERVER_DEALLOCATE"},
+		{BT_OBEX_SERVER_IS_ACTIVATED, "BT_OBEX_SERVER_IS_ACTIVATED"},
+		{BT_OBEX_SERVER_ACCEPT_CONNECTION, "BT_OBEX_SERVER_ACCEPT_CONNECTION"},
+		{BT_OBEX_SERVER_REJECT_CONNECTION, "BT_OBEX_SERVER_REJECT_CONNECTION"},
+		{BT_OBEX_SERVER_ACCEPT_FILE, "BT_OBEX_SERVER_ACCEPT_FILE"},
+		{BT_OBEX_SERVER_REJECT_FILE, "BT_OBEX_SERVER_REJECT_FILE"},
+		{BT_OBEX_SERVER_SET_PATH, "BT_OBEX_SERVER_SET_PATH"},
+		{BT_OBEX_SERVER_SET_ROOT, "BT_OBEX_SERVER_SET_ROOT"},
+		{BT_OBEX_SERVER_CANCEL_TRANSFER, "BT_OBEX_SERVER_CANCEL_TRANSFER"},
+		{BT_OBEX_SERVER_CANCEL_ALL_TRANSFERS, "BT_OBEX_SERVER_CANCEL_ALL_TRANSFERS"},
+		{BT_OBEX_SERVER_IS_RECEIVING, "BT_OBEX_SERVER_IS_RECEIVING"},
+		{BT_RFCOMM_CLIENT_CONNECT, "BT_RFCOMM_CLIENT_CONNECT"},
+		{BT_RFCOMM_CLIENT_CANCEL_CONNECT, "BT_RFCOMM_CLIENT_CANCEL_CONNECT"},
+		{BT_RFCOMM_CLIENT_IS_CONNECTED, "BT_RFCOMM_CLIENT_IS_CONNECTED"},
+		{BT_RFCOMM_SOCKET_DISCONNECT, "BT_RFCOMM_SOCKET_DISCONNECT"},
+		{BT_RFCOMM_SOCKET_WRITE, "BT_RFCOMM_SOCKET_WRITE"},
+		{BT_RFCOMM_CREATE_SOCKET, "BT_RFCOMM_CREATE_SOCKET"},
+		{BT_RFCOMM_REMOVE_SOCKET, "BT_RFCOMM_REMOVE_SOCKET"},
+		{BT_RFCOMM_LISTEN, "BT_RFCOMM_LISTEN"},
+		{BT_RFCOMM_IS_UUID_AVAILABLE, "BT_RFCOMM_IS_UUID_AVAILABLE"},
+		{BT_RFCOMM_ACCEPT_CONNECTION, "BT_RFCOMM_ACCEPT_CONNECTION"},
+		{BT_RFCOMM_REJECT_CONNECTION, "BT_RFCOMM_REJECT_CONNECTION"},
+		{BT_RFCOMM_CREATE_SOCKET_EX, "BT_RFCOMM_CREATE_SOCKET_EX"},
+		{BT_RFCOMM_REMOVE_SOCKET_EX, "BT_RFCOMM_REMOVE_SOCKET_EX"},
+		{BT_PBAP_CONNECT, "BT_PBAP_CONNECT"},
+		{BT_PBAP_DISCONNECT, "BT_PBAP_DISCONNECT"},
+		{BT_PBAP_GET_PHONEBOOK_SIZE, "BT_PBAP_GET_PHONEBOOK_SIZE"},
+		{BT_PBAP_GET_PHONEBOOK, "BT_PBAP_GET_PHONEBOOK"},
+		{BT_PBAP_GET_LIST, "BT_PBAP_GET_LIST"},
+		{BT_PBAP_PULL_VCARD, "BT_PBAP_PULL_VCARD"},
+		{BT_PBAP_PHONEBOOK_SEARCH, "BT_PBAP_PHONEBOOK_SEARCH"},
+		{BT_ENABLE_ADAPTER_LE, "BT_ENABLE_ADAPTER_LE"},
+		{BT_DISABLE_ADAPTER_LE, "BT_DISABLE_ADAPTER_LE"},
+		{BT_CONNECT_LE, "BT_CONNECT_LE"},
+		{BT_DISCONNECT_LE, "BT_DISCONNECT_LE"},
+		{BT_SET_LE_PRIVACY, "BT_SET_LE_PRIVACY"},
+		{BT_REQ_ATT_MTU, "BT_REQ_ATT_MTU"},
+		{BT_GET_ATT_MTU, "BT_GET_ATT_MTU"},
+		{BT_GET_DEVICE_IDA, "BT_GET_DEVICE_IDA"},
+		{BT_SET_LE_STATIC_RANDOM_ADDRESS, "BT_SET_LE_STATIC_RANDOM_ADDRESS"},
+		{BT_HDP_CONNECT, "BT_HDP_CONNECT"},
+		{BT_HDP_DISCONNECT, "BT_HDP_DISCONNECT"},
+		{BT_HDP_SEND_DATA, "BT_HDP_SEND_DATA"},
+		{BT_HDP_REGISTER_SINK_APP, "BT_HDP_REGISTER_SINK_APP"},
+		{BT_HDP_UNREGISTER_SINK_APP, "BT_HDP_UNREGISTER_SINK_APP"},
+		{BT_GATT_GET_PRIMARY_SERVICES, "BT_GATT_GET_PRIMARY_SERVICES"},
+		{BT_GATT_DISCOVER_CHARACTERISTICS, "BT_GATT_DISCOVER_CHARACTERISTICS"},
+		{BT_GATT_SET_PROPERTY_REQUEST, "BT_GATT_SET_PROPERTY_REQUEST"},
+		{BT_GATT_READ_CHARACTERISTIC, "BT_GATT_READ_CHARACTERISTIC"},
+		{BT_GATT_DISCOVER_CHARACTERISTICS_DESCRIPTOR, "BT_GATT_DISCOVER_CHARACTERISTICS_DESCRIPTOR"},
+		{BT_GATT_REGISTER_APPLICATION, "BT_GATT_REGISTER_APPLICATION"},
+		{BT_GATT_REGISTER_SERVICE, "BT_GATT_REGISTER_SERVICE"},
+		{BT_GATT_SEND_RESPONSE, "BT_GATT_SEND_RESPONSE"},
+		{BT_LE_IPSP_INIT, "BT_LE_IPSP_INIT"},
+		{BT_LE_IPSP_DEINIT, "BT_LE_IPSP_DEINIT"},
+		{BT_LE_IPSP_CONNECT, "BT_LE_IPSP_CONNECT"},
+		{BT_LE_IPSP_DISCONNECT, "BT_LE_IPSP_DISCONNECT"},
+		{BT_DPM_SET_ALLOW_BT_MODE, "BT_DPM_SET_ALLOW_BT_MODE"},
+		{BT_DPM_GET_ALLOW_BT_MODE, "BT_DPM_GET_ALLOW_BT_MODE"},
+		{BT_DPM_SET_DEVICE_RESTRITION, "BT_DPM_SET_DEVICE_RESTRITION"},
+		{BT_DPM_GET_DEVICE_RESTRITION, "BT_DPM_GET_DEVICE_RESTRITION"},
+		{BT_DPM_SET_UUID_RESTRITION, "BT_DPM_SET_UUID_RESTRITION"},
+		{BT_DPM_GET_UUID_RESTRITION, "BT_DPM_GET_UUID_RESTRITION"},
+		{BT_DPM_ADD_DEVICES_BLACKLIST, "BT_DPM_ADD_DEVICES_BLACKLIST"},
+		{BT_DPM_ADD_DEVICES_WHITELIST, "BT_DPM_ADD_DEVICES_WHITELIST"},
+		{BT_DPM_ADD_UUIDS_BLACKLIST, "BT_DPM_ADD_UUIDS_BLACKLIST"},
+		{BT_DPM_ADD_UUIDS_WHITELIST, "BT_DPM_ADD_UUIDS_WHITELIST"},
+		{BT_DPM_CLEAR_DEVICES_BLACKLIST, "BT_DPM_CLEAR_DEVICES_BLACKLIST"},
+		{BT_DPM_CLEAR_DEVICES_WHITELIST, "BT_DPM_CLEAR_DEVICES_WHITELIST"},
+		{BT_DPM_CLEAR_UUIDS_BLACKLIST, "BT_DPM_CLEAR_UUIDS_BLACKLIST"},
+		{BT_DPM_CLEAR_UUIDS_WHITELIST, "BT_DPM_CLEAR_UUIDS_WHITELIST"},
+		{BT_DPM_REMOVE_DEVICE_BLACKLIST, "BT_DPM_REMOVE_DEVICE_BLACKLIST"},
+		{BT_DPM_REMOVE_DEVICE_WHITELIST, "BT_DPM_REMOVE_DEVICE_WHITELIST"},
+		{BT_DPM_REMOVE_UUID_BLACKLIST, "BT_DPM_REMOVE_UUID_BLACKLIST"},
+		{BT_DPM_REMOVE_UUID_WHITELIST, "BT_DPM_REMOVE_UUID_WHITELIST"},
+		{BT_DPM_GET_DEVICES_BLACKLIST, "BT_DPM_GET_DEVICES_BLACKLIST"},
+		{BT_DPM_GET_DEVICES_WHITELIST, "BT_DPM_GET_DEVICES_WHITELIST"},
+		{BT_DPM_GET_UUIDS_BLACKLIST, "BT_DPM_GET_UUIDS_BLACKLIST"},
+		{BT_DPM_GET_UUIDS_WHITELIST, "BT_DPM_GET_UUIDS_WHITELIST"},
+		{BT_DPM_SET_ALLOW_OUTGOING_CALL, "BT_DPM_SET_ALLOW_OUTGOING_CALL"},
+		{BT_DPM_GET_ALLOW_OUTGOING_CALL, "BT_DPM_GET_ALLOW_OUTGOING_CALL"},
+		{BT_DPM_SET_PAIRING_STATE, "BT_DPM_SET_PAIRING_STATE"},
+		{BT_DPM_GET_PAIRING_STATE, "BT_DPM_GET_PAIRING_STATE"},
+		{BT_DPM_SET_PROFILE_STATE, "BT_DPM_SET_PROFILE_STATE"},
+		{BT_DPM_GET_PROFILE_STATE, "BT_DPM_GET_PROFILE_STATE"},
+		{BT_DPM_SET_DESKROP_CONNECTIVITY_STATE, "BT_DPM_SET_DESKROP_CONNECTIVITY_STATE"},
+		{BT_DPM_GET_DESKROP_CONNECTIVITY_STATE, "BT_DPM_GET_DESKROP_CONNECTIVITY_STATE"},
+		{BT_DPM_SET_DISCOVERABLE_STATE, "BT_DPM_SET_DISCOVERABLE_STATE"},
+		{BT_DPM_GET_DISCOVERABLE_STATE, "BT_DPM_GET_DISCOVERABLE_STATE"},
+		{BT_DPM_SET_LIMITED_DISCOVERABLE_STATE, "BT_DPM_SET_LIMITED_DISCOVERABLE_STATE"},
+		{BT_DPM_GET_LIMITED_DISCOVERABLE_STATE, "BT_DPM_GET_LIMITED_DISCOVERABLE_STATE"},
+		{BT_DPM_SET_DATA_TRANSFER_STATE, "BT_DPM_SET_DATA_TRANSFER_STATE"},
+		{BT_DPM_GET_DATA_TRANSFER_STATE, "BT_DPM_GET_DATA_TRANSFER_STATE"},
+		{BT_PXP_MONITOR_SET_PROPERTY, "BT_PXP_MONITOR_SET_PROPERTY"},
+		{BT_PXP_MONITOR_GET_PROPERTY, "BT_PXP_MONITOR_GET_PROPERTY"},
+		{BT_PXP_MONITOR_GET_SUPPORTED_SERIVCES, "BT_PXP_MONITOR_GET_SUPPORTED_SERIVCES"},
+		{BT_PXP_REPORTER_REGISTER, "BT_PXP_REPORTER_REGISTER"},
+		{BT_PXP_REPORTER_UNREGISTER, "BT_PXP_REPORTER_UNREGISTER"},
+		{BT_PXP_REPORTER_GET_PROPERTY, "BT_PXP_REPORTER_GET_PROPERTY"},
+		{BT_TDS_PROVIDER_REGISTER, "BT_TDS_PROVIDER_REGISTER"},
+		{BT_TDS_PROVIDER_UNREGISTER, "BT_TDS_PROVIDER_UNREGISTER"},
+		{BT_TDS_PROVIDER_SET_MANUF_DATA, "BT_TDS_PROVIDER_SET_MANUF_DATA"},
+		{BT_TDS_PROVIDER_CREATE, "BT_TDS_PROVIDER_CREATE"},
+		{BT_TDS_PROVIDER_DESTROY, "BT_TDS_PROVIDER_DESTROY"},
+		{BT_TDS_PROVIDER_SET_TRANSPORT_DATA, "BT_TDS_PROVIDER_SET_TRANSPORT_DATA"},
+		{BT_TDS_SEND_ACTIVATION_RESPONSE, "BT_TDS_SEND_ACTIVATION_RESPONSE"},
+		{BT_TDS_READ_TRANSPORT_DATA, "BT_TDS_READ_TRANSPORT_DATA"},
+		{BT_TDS_ENABLE_CONTROL_POINT, "BT_TDS_ENABLE_CONTROL_POINT"},
+		{BT_TDS_ACTIVATE_CONTROL_POINT, "BT_TDS_ACTIVATE_CONTROL_POINT"},
+		{-1, ""},
+	};
+
+	for (i = 0; bt_functions[i].function != -1; i++) {
+		if (bt_functions[i].function == function)
+			return bt_functions[i].function_name;
+	}
+
+	return NULL;
+}
+
 int _bt_copy_utf8_string(char *dest, const char *src, unsigned int length)
 {
 	int i;
@@ -304,7 +673,6 @@ static GDBusConnection *gconn;
 static int latest_id = -1;
 #define BT_RFCOMM_ID_MAX 245
 static gboolean id_used[BT_RFCOMM_ID_MAX];
-GDBusNodeInfo *new_conn_node;
 
 static const gchar rfcomm_agent_xml[] =
 "<node name='/'>"
@@ -339,6 +707,7 @@ static void __new_connection_method(GDBusConnection *connection,
 		char addr[20];
 		bluetooth_device_address_t  remote_addr1;
 		bt_new_connection_cb cb = user_data;
+		char secure_address[BT_ADDRESS_STRING_SIZE] = { 0 };
 		int fd;
 
 		g_variant_get(parameters, "(oha{sv})", &obj_path, &index,
@@ -347,6 +716,7 @@ static void __new_connection_method(GDBusConnection *connection,
 		msg = g_dbus_method_invocation_get_message(invocation);
 		fd_list = g_dbus_message_get_unix_fd_list(msg);
 		if (fd_list == NULL) {
+			BT_ERR("fd_list is NULL");
 			GQuark quark = g_quark_from_string("rfcomm-app");
 			GError *err = g_error_new(quark, 0, "No fd in message");
 			g_dbus_method_invocation_return_gerror(invocation, err);
@@ -364,11 +734,12 @@ static void __new_connection_method(GDBusConnection *connection,
 			g_error_free(err);
 			return;
 		}
-		BT_INFO("Object Path %s", obj_path);
 
-		_bt_device_path_to_address(obj_path, addr);
+		_bt_convert_device_path_to_address(obj_path, addr);
 		_bt_convert_addr_string_to_type(remote_addr1.addr, (const char *)addr);
-		BT_INFO("fd: %d, address %s", fd, addr);
+
+		_bt_convert_addr_string_to_secure_string(secure_address, addr);
+		BT_INFO("fd: %d, address %s", fd, secure_address);
 
 		g_dbus_method_invocation_return_value(invocation, NULL);
 
@@ -489,7 +860,7 @@ static GDBusProxy *__bt_gdbus_get_device_proxy(char *object_path)
 						BT_DEVICE_INTERFACE,
 						NULL, &err);
 
-	if (err) {
+	if (device_gproxy == NULL && err) {
 		BT_ERR("Unable to create proxy: %s", err->message);
 		g_clear_error(&err);
 		return NULL;
@@ -512,6 +883,7 @@ void _bt_unregister_gdbus(int object_id)
 int _bt_register_new_conn(const char *path, bt_new_connection_cb cb)
 {
 	GDBusConnection *gconn;
+	GDBusNodeInfo *node_info;
 	int id;
 	GError *error = NULL;
 
@@ -519,16 +891,15 @@ int _bt_register_new_conn(const char *path, bt_new_connection_cb cb)
 	if (gconn == NULL)
 		return -1;
 
-	if (new_conn_node == NULL)
-		new_conn_node = _bt_get_gdbus_node(rfcomm_agent_xml);
-
-	if (new_conn_node == NULL)
+	node_info = _bt_get_gdbus_node(rfcomm_agent_xml);
+	if (node_info == NULL)
 		return -1;
 
 	id = g_dbus_connection_register_object(gconn, path,
-						new_conn_node->interfaces[0],
+						node_info->interfaces[0],
 						&method_table,
 						cb, NULL, &error);
+	g_dbus_node_info_unref(node_info);
 	if (id == 0) {
 		BT_ERR("Failed to register: %s", error->message);
 		g_error_free(error);
@@ -612,6 +983,7 @@ fail:
 int _bt_register_new_conn_ex(const char *path, const char *bus_name, bt_new_connection_cb cb)
 {
 	GDBusConnection *gconn;
+	GDBusNodeInfo *node_info;
 	int id;
 	GError *error = NULL;
 
@@ -619,16 +991,16 @@ int _bt_register_new_conn_ex(const char *path, const char *bus_name, bt_new_conn
 	if (gconn == NULL)
 		return -1;
 
-	if (new_conn_node == NULL)
-		new_conn_node = _bt_get_gdbus_node_ex(rfcomm_agent_xml, bus_name);
+	node_info = _bt_get_gdbus_node_ex(rfcomm_agent_xml, bus_name);
 
-	if (new_conn_node == NULL)
+	if (node_info == NULL)
 		return -1;
 
 	id = g_dbus_connection_register_object(gconn, path,
-						new_conn_node->interfaces[0],
+						node_info->interfaces[0],
 						&method_table,
 						cb, NULL, &error);
+	g_dbus_node_info_unref(node_info);
 	if (id == 0) {
 		BT_ERR("Failed to register: %s", error->message);
 		g_error_free(error);
@@ -992,9 +1364,7 @@ int _bt_discover_services(char *address, char *uuid, void *cb,
 		}
 		if (ret)
 			g_variant_unref(ret);
-
 		g_object_unref(adapter_proxy);
-
 		object_path = _bt_get_device_object_path(address);
 		if (object_path == NULL)
 			return BLUETOOTH_ERROR_INTERNAL;
@@ -1020,6 +1390,7 @@ int _bt_cancel_discovers(char *address)
 	char *object_path;
 	GDBusProxy *proxy;
 	GDBusProxy *adapter_proxy;
+	GVariant *ret = NULL;
 	GError *err = NULL;
 	object_path = _bt_get_device_object_path(address);
 	if (object_path == NULL) {
@@ -1038,16 +1409,14 @@ int _bt_cancel_discovers(char *address)
 		}
 		if (ret)
 			g_variant_unref(ret);
-
 		g_object_unref(adapter_proxy);
-
 		object_path = _bt_get_device_object_path(address);
 		if (object_path == NULL)
 			return BLUETOOTH_ERROR_INTERNAL;
 	}
 	proxy = __bt_gdbus_get_device_proxy(object_path);
 	g_free(object_path);
-	g_dbus_proxy_call_sync(proxy, "CancelDiscovery",
+	ret = g_dbus_proxy_call_sync(proxy, "CancelDiscovery",
 		NULL,
 		G_DBUS_CALL_FLAGS_NONE,
 		DBUS_TIMEOUT, NULL,
@@ -1057,6 +1426,8 @@ int _bt_cancel_discovers(char *address)
 		g_clear_error(&err);
 		return BLUETOOTH_ERROR_INTERNAL;
 	}
+	if (ret)
+		g_variant_unref(ret);
 	if (proxy)
 		g_object_unref(proxy);
 	return BLUETOOTH_ERROR_NONE;
@@ -1089,54 +1460,35 @@ int _bt_discover_service_uuids(char *address, char *remote_uuid)
 		BT_ERR("DBus Error: [%s]", err->message);
 		g_clear_error(&err);
 	}
-	ret = g_dbus_proxy_call_sync(proxy, "GetAll",
-			g_variant_new("(s)", BT_DEVICE_INTERFACE),
-			G_DBUS_CALL_FLAGS_NONE,
-			DBUS_TIMEOUT, NULL,
-			&err);
+	ret = g_dbus_proxy_call_sync(proxy, "Get",
+			g_variant_new("(ss)", BT_DEVICE_INTERFACE, "UUIDs"),
+			G_DBUS_CALL_FLAGS_NONE, DBUS_TIMEOUT, NULL, &err);
 	if (err) {
 		result = BLUETOOTH_ERROR_INTERNAL;
 		BT_ERR("DBus Error : %s", err->message);
 		g_clear_error(&err);
 		goto done;
-	}
-	if (ret == NULL) {
-		BT_ERR("g_dbus_proxy_call_sync function return NULL");
-		result = BLUETOOTH_ERROR_INTERNAL;
-		goto done;
+	} else {
+		g_variant_get(ret, "(v)", &value);
+		uuid_value = (char **)g_variant_get_strv(value, &size);
+		BT_DBG("Size items %d", size);
+		g_variant_unref(value);
+		g_variant_unref(ret);
 	}
 
-	g_variant_get(ret, "(@a{sv})", &value);
-	g_variant_unref(ret);
-	if (value) {
-		GVariant *temp_value = g_variant_lookup_value(value, "UUIDs",
-			G_VARIANT_TYPE_STRING_ARRAY);
-
-		if (temp_value) {
-			size = g_variant_get_size(temp_value);
-			if (size > 0) {
-				uuid_value = (char **)g_variant_get_strv(temp_value, &size);
-				BT_DBG("Size items %d", size);
-
-				if (uuid_value) {
-					for (i = 0; uuid_value[i] != NULL; i++) {
-						BT_DBG("Remote uuids %s", uuid_value[i]);
-						if (strcasecmp(uuid_value[i], remote_uuid) == 0) {
-							result = BLUETOOTH_ERROR_NONE;
-							g_variant_unref(temp_value);
-							goto done;
-						}
-					}
-				}
+	if (uuid_value) {
+		for (i = 0; uuid_value[i] != NULL; i++) {
+			BT_DBG("Remote uuids %s", uuid_value[i]);
+			if (g_ascii_strcasecmp(uuid_value[i], remote_uuid) == 0) {
+				result = BLUETOOTH_ERROR_NONE;
+				goto done;
 			}
-			g_variant_unref(temp_value);
 		}
 	}
+
 done:
 	if (proxy)
 		g_object_unref(proxy);
-	if (value)
-		g_variant_unref(value);
 	if (uuid_value)
 		g_free(uuid_value);
 
@@ -1170,38 +1522,25 @@ int _bt_get_cod_by_address(char *address, bluetooth_device_class_t *dev_class)
 		g_clear_error(&err);
 	}
 
-	result = g_dbus_proxy_call_sync(proxy, "GetAll",
-			g_variant_new("(s)", BT_DEVICE_INTERFACE),
-			G_DBUS_CALL_FLAGS_NONE,
-			DBUS_TIMEOUT, NULL,
-			&err);
+	result = g_dbus_proxy_call_sync(proxy, "Get",
+			g_variant_new("(ss)", BT_DEVICE_INTERFACE, "Class"),
+			G_DBUS_CALL_FLAGS_NONE, DBUS_TIMEOUT, NULL, &err);
 	if (err) {
 		ret = BLUETOOTH_ERROR_INTERNAL;
 		BT_ERR("DBus Error : %s", err->message);
 		g_clear_error(&err);
 		goto done;
-	}
-	if (result == NULL) {
-		BT_ERR("g_dbus_proxy_call_sync function return NULL");
-		ret = BLUETOOTH_ERROR_INTERNAL;
-		goto done;
-	}
-	g_variant_get(result, "(@a{sv})", &value);
-	g_variant_unref(result);
-	if (value) {
-		GVariant *temp_value = g_variant_lookup_value(value, "Class",
-			G_VARIANT_TYPE_UINT32);
-		class = g_variant_get_uint32(temp_value);
+	} else {
+		g_variant_get(result, "(v)", &value);
+		class = g_variant_get_uint32(value);
 		_bt_divide_device_class(dev_class, class);
-		if (temp_value)
-			g_variant_unref(temp_value);
+		g_variant_unref(value);
+		g_variant_unref(result);
 	}
 
 done:
 	if (proxy)
 		g_object_unref(proxy);
-	if (value)
-		g_variant_unref(value);
 
 	BT_DBG("-");
 	return ret;
@@ -1252,6 +1591,30 @@ int _bt_disconnect_profile(char *address, char *uuid, void *cb,
 	return BLUETOOTH_ERROR_NONE;
 }
 
+int _bt_disconnect_ext_profile(char *address, char *path)
+{
+	GDBusProxy *proxy;
+	char *object_path;
+
+	object_path = _bt_get_device_object_path(address);
+	if (object_path == NULL)
+		return BLUETOOTH_ERROR_INTERNAL;
+
+	proxy = __bt_gdbus_get_device_proxy(object_path);
+	g_free(object_path);
+	if (proxy == NULL) {
+		BT_ERR("Error while getting proxy");
+		return BLUETOOTH_ERROR_INTERNAL;
+	}
+
+	g_dbus_proxy_call(proxy, "DisconnectExtProfile",
+			g_variant_new("(o)", path),
+			G_DBUS_CALL_FLAGS_NONE,
+			DBUS_TIMEOUT, NULL, NULL, NULL);
+	BT_DBG("-");
+	return BLUETOOTH_ERROR_NONE;
+}
+
 int _bt_get_adapter_path(GDBusConnection *conn, char *path)
 {
 	GError *err = NULL;
@@ -1276,10 +1639,12 @@ int _bt_get_adapter_path(GDBusConnection *conn, char *path)
 	result = g_dbus_proxy_call_sync(manager_proxy, "DefaultAdapter", NULL,
 			G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
 	if (!result) {
-		if (err != NULL)
-			BT_ERR("Fail to get DefaultAdapter (Error: %s)", err->message);
-		else
+		if (err != NULL) {
+			if (!g_strrstr(err->message, "ServiceUnknown"))
+				BT_ERR("Fail to get DefaultAdapter (Error: %s)", err->message);
+		} else {
 			BT_ERR("Fail to get DefaultAdapter");
+		}
 
 		goto fail;
 	}
@@ -1318,6 +1683,35 @@ fail:
 
 }
 
+void _bt_convert_device_path_to_addr_type(const char *device_path,
+					  unsigned char *addr)
+{
+	char *dev_addr;
+	char address[BT_ADDRESS_STRING_SIZE] = { 0 };
+	int i;
+	char *addr_ptr = address;
+	char *ptr = NULL;
+
+	ret_if(device_path == NULL);
+	ret_if(addr == NULL);
+
+	dev_addr = strstr(device_path, "dev_");
+	if (dev_addr != NULL) {
+		dev_addr += 4;
+		g_strlcpy(addr_ptr, dev_addr, BT_ADDRESS_STRING_SIZE);
+
+		for (i = 0; i < BT_ADDRESS_LENGTH_MAX; i++) {
+			addr[i] = strtol(addr_ptr, &ptr, 16);
+			if (ptr[0] != '\0') {
+				if (ptr[0] != '_')
+					return;
+
+				addr_ptr = ptr + 1;
+			}
+		}
+	}
+}
+
 void _bt_convert_device_path_to_address(const char *device_path,
 						char *device_address)
 {
@@ -1333,9 +1727,8 @@ void _bt_convert_device_path_to_address(const char *device_path,
 		dev_addr += 4;
 		g_strlcpy(address, dev_addr, sizeof(address));
 
-		while ((pos = strchr(address, '_')) != NULL) {
+		while ((pos = strchr(address, '_')) != NULL)
 			*pos = ':';
-		}
 
 		g_strlcpy(device_address, address, BT_ADDRESS_STRING_SIZE);
 	}
@@ -1351,9 +1744,8 @@ static char *__bt_extract_device_path(GVariantIter *iter, char *address)
 		retv_if(object_path == NULL, NULL);
 		_bt_convert_device_path_to_address(object_path, device_address);
 
-		if (g_strcmp0(address, device_address) == 0) {
+		if (g_strcmp0(address, device_address) == 0)
 			return g_strdup(object_path);
-		}
 	}
 	return NULL;
 }
@@ -1410,28 +1802,6 @@ fail:
 	return object_path;
 }
 
-void _bt_device_path_to_address(const char *device_path, char *device_address)
-{
-	char address[BT_ADDRESS_STRING_SIZE] = { 0 };
-	char *dev_addr = NULL;
-
-	if (!device_path || !device_address)
-		return;
-
-	dev_addr = strstr(device_path, "dev_");
-	if (dev_addr != NULL) {
-		char *pos = NULL;
-		dev_addr += 4;
-		g_strlcpy(address, dev_addr, sizeof(address));
-
-		while ((pos = strchr(address, '_')) != NULL) {
-			*pos = ':';
-		}
-
-		g_strlcpy(device_address, address, BT_ADDRESS_STRING_SIZE);
-	}
-}
-
 GDBusConnection *_bt_init_system_gdbus_conn(void)
 {
 	GError *error = NULL;
@@ -1499,10 +1869,12 @@ int _bt_check_privilege(int service_type, int service_function)
 {
 	int result;
 
+	BT_CHECK_ENABLED(return);
+
 	BT_INIT_PARAMS();
 	BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
-	result = _bt_send_request(service_type, service_function,
+	result = _bt_sync_send_request(service_type, service_function,
 		in_param1, in_param2, in_param3, in_param4, &out_param);
 
 	BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
@@ -1529,7 +1901,7 @@ GVariant *_bt_get_managed_objects(void)
 			BT_MANAGER_INTERFACE,
 			NULL, &error);
 
-	if (error) {
+	if (manager_proxy == NULL && error) {
 		BT_ERR("Unable to create proxy: %s", error->message);
 		g_clear_error(&error);
 		return NULL;
@@ -1551,6 +1923,154 @@ GVariant *_bt_get_managed_objects(void)
 	return result;
 }
 
+gboolean _bt_check_enabled_internal(void)
+{
+	if (bt_enabled == TRUE)
+		return TRUE;
+
+	if (bluetooth_check_adapter() == BLUETOOTH_ADAPTER_ENABLED)
+		bt_enabled = TRUE;
+
+	return bt_enabled;
+}
+
+void _bt_set_adapter_internal_status(gboolean enabled)
+{
+	bt_enabled = enabled;
+}
+
+int _bt_get_uuid_specification_name(const char *uuid, char **name)
+{
+	int i;
+	int offset = 0;
+	int uuid_len = 4;
+	static struct {
+		const char *uuid;
+		const char *specification_name;
+	} bt_uuid_name[] = {
+		/* GATT Services */
+		{"1800", "Generic Access"},
+		{"1801", "Generic Attribute"},
+		{"1802", "Immediate Alert"},
+		{"1803", "Link Loss"},
+		{"1804", "Tx Power"},
+		{"1805", "Current Time Service"},
+		{"1806", "Reference Time Update Service"},
+		{"1807", "Next DST Change Service"},
+		{"1808", "Glucose"},
+		{"1809", "Health Thermometer"},
+		{"180A", "Device Information"},
+		{"180D", "Heart Rate"},
+		{"180F", "Battery Service"},
+		{"1810", "Blood Pressure"},
+		{"1811", "Alert Notification Service"},
+		{"1812", "Human Interface Device"},
+
+		/* GATT Declarations */
+		{"2800", "Primary Service Declaration"},
+		{"2801", "Secondary Service Declaration"},
+		{"2802", "Include Declaration"},
+		{"2803", "Characteristic Declaration"},
+
+		/* GATT Descriptors */
+		{"2900", "Characteristic Extended Properties"},
+		{"2901", "Characteristic User Description"},
+		{"2902", "Client Characteristic Configuration"},
+		{"2903", "Server Characteristic Configuration"},
+		{"2904", "Characteristic Format"},
+		{"2905", "Characteristic Aggregate Formate"},
+		{"2906", "Valid Range"},
+		{"2907", "External Report Reference"},
+		{"2908", "Report Reference"},
+
+		/* GATT Characteristics */
+		{"2A00", "Device Name"},
+		{"2A01", "Appearance"},
+		{"2A02", "Peripheral Privacy Flag"},
+		{"2A03", "Reconnection Address"},
+		{"2A04", "Peripheral Preferred Connection Parameters"},
+		{"2A05", "Service Changed"},
+		{"2A06", "Alert Level"},
+		{"2A07", "Tx Power Level"},
+		{"2A08", "Date Time"},
+		{"2A09", "Day of Week"},
+		{"2A0A", "Day Date Time"},
+		{"2A19", "Battery Level"},
+		{"2A1E", "Intermediate Temperature"},
+		{"2A23", "System ID"},
+		{"2A24", "Model Number String"},
+		{"2A25", "Serial Number String"},
+		{"2A26", "Firmware Revision String"},
+		{"2A27", "Hardware Revision String"},
+		{"2A28", "Software Revision String"},
+		{"2A29", "Manufacturer Name String"},
+		{"2A2A", "IEEE 11073-20601 Regulatory Certification Data List"},
+		{"2A2B", "Current Time"},
+		{"2A37", "Heart Rate Measurement"},
+		{"2A38", "Body Sensor Location"},
+		{"2A3F", "Alert Status"},
+		{"2A46", "New Alert"},
+		{"2A4A", "HID Information"},
+		{"2A4C", "HID Control Point"},
+		{"2A50", "PnP ID"},
+
+		/* Custom uuids */
+		{"7905F431-B5CE-4E99-A40F-4B1E122D00D0", "Apple Notification Center Service"},
+		{"9FBF120D-6301-42D9-8C58-25E699A21DBD", "Notifications Source"},
+		{"69D1D8F3-45E1-49A8-9821-9BBDFDAAD9D9", "Control Point"},
+		{"22EAC6E9-24D6-4BB5-BE44-B36ACE7C7BFB", "Data Source"},
+		{"89D3502B-0F36-433A-8EF4-C502AD55F8DC", "Apple Media Service"},
+		{"9B3C81D8-57B1-4A8A-B8DF-0E56F7CA51C2", "Remote Command"},
+		{"2F7CABCE-808D-411F-9A0C-BB92BA96C102", "Entity Update"},
+		{"C6B2F38C-23AB-46D8-A6AB-A3A870BBD5D7", "Entity Attribute"},
+		{"9A3F68E0-86CE-11E5-A309-0002A5D5C51B", "Samsung Gear Manager Service"},
+		{"c2f2cc0f-c085-4dd4-be5a-aca3074bbc72", "Control Point"},
+		{"cece518b-28d7-4171-92d5-76a1e249a3b9", "Notifications Source"},
+		{NULL, NULL}
+	};
+
+	if (!uuid || !name)
+		return BLUETOOTH_ERROR_INVALID_PARAM;
+	if (strlen(uuid) == 36) {
+		if (!g_ascii_strncasecmp(uuid + 9, "0000-1000-8000-00805F9B34FB", 27))
+			offset = 4;
+		else {
+			offset = 0;
+			uuid_len = 36;
+		}
+	} else if (strlen(uuid) >= 8)
+		offset = 4;
+
+	for (i = 0; bt_uuid_name[i].uuid; i++) {
+		if (!g_ascii_strncasecmp(uuid + offset, bt_uuid_name[i].uuid, uuid_len)) {
+			*name = g_strdup(bt_uuid_name[i].specification_name);
+			return BLUETOOTH_ERROR_NONE;
+		}
+	}
+
+	*name = g_strdup("Unknown");
+	return BLUETOOTH_ERROR_NONE;
+}
+
+int _bt_get_error_value_from_message(const char *error_message)
+{
+	if (error_message == NULL) {
+		BT_ERR("Error message NULL");
+		return BLUETOOTH_ERROR_INTERNAL;
+	}
+
+	BT_ERR("Error message = %s", error_message);
+
+	if (g_strrstr(error_message, BT_ERROR_OPERATION_NOT_SUPPORTED))
+		return BLUETOOTH_ERROR_NOT_IN_OPERATION;
+	else if (g_strrstr(error_message, BT_ERROR_OPERATION_NOT_ALLOWED))
+		return BLUETOOTH_ERROR_PERMISSION_DEINED;
+	else if (g_strrstr(error_message, BT_ERROR_ACCESS_DENIED))
+		return BLUETOOTH_ERROR_PERMISSION_DEINED;
+	else
+		return BLUETOOTH_ERROR_INTERNAL;
+}
+
 BT_EXPORT_API int bluetooth_is_supported(void)
 {
 	int is_supported = 0;
@@ -1612,26 +2132,29 @@ BT_EXPORT_API int bluetooth_register_callback(bluetooth_cb_func_ptr callback_ptr
 	_bt_set_user_data(BT_COMMON, (void *)callback_ptr, user_data);
 
 	/* Register All events */
-	ret = _bt_register_event(BT_ADAPTER_EVENT, (void *)callback_ptr, user_data);
-	if (ret != BLUETOOTH_ERROR_NONE)
-		goto fail;
-	ret = _bt_register_event(BT_DEVICE_EVENT, (void *)callback_ptr, user_data);
-	if (ret != BLUETOOTH_ERROR_NONE)
-		goto fail;
-	ret = _bt_register_event(BT_NETWORK_EVENT, (void *)callback_ptr, user_data);
-	if (ret != BLUETOOTH_ERROR_NONE)
-		goto fail;
-	ret = _bt_register_event(BT_RFCOMM_CLIENT_EVENT, (void *)callback_ptr, user_data);
-	if (ret != BLUETOOTH_ERROR_NONE)
-		goto fail;
-	ret = _bt_register_event(BT_RFCOMM_SERVER_EVENT, (void *)callback_ptr, user_data);
-	if (ret != BLUETOOTH_ERROR_NONE)
-		goto fail;
-#ifdef GATT_NO_RELAY
-	ret = _bt_register_event(BT_GATT_BLUEZ_EVENT, (void *)callback_ptr, user_data);
-	if (ret != BLUETOOTH_ERROR_NONE)
-		goto fail;
-#endif
+	if (ret != BLUETOOTH_ERROR_ALREADY_INITIALIZED) {
+		ret = _bt_register_event(BT_ADAPTER_EVENT, (void *)callback_ptr, user_data);
+		if (ret != BLUETOOTH_ERROR_NONE)
+			goto fail;
+		ret = _bt_register_event(BT_DEVICE_EVENT, (void *)callback_ptr, user_data);
+		if (ret != BLUETOOTH_ERROR_NONE)
+			goto fail;
+		ret = _bt_register_event(BT_NETWORK_EVENT, (void *)callback_ptr, user_data);
+		if (ret != BLUETOOTH_ERROR_NONE)
+			goto fail;
+		ret = _bt_register_event(BT_RFCOMM_CLIENT_EVENT, (void *)callback_ptr, user_data);
+		if (ret != BLUETOOTH_ERROR_NONE)
+			goto fail;
+		ret = _bt_register_event(BT_RFCOMM_SERVER_EVENT, (void *)callback_ptr, user_data);
+		if (ret != BLUETOOTH_ERROR_NONE)
+			goto fail;
+		ret = _bt_register_event(BT_GATT_BLUEZ_EVENT, (void *)callback_ptr, user_data);
+		if (ret != BLUETOOTH_ERROR_NONE)
+			goto fail;
+		ret = _bt_register_event(BT_TDS_EVENT, (void *)callback_ptr, user_data);
+		if (ret != BLUETOOTH_ERROR_NONE)
+			goto fail;
+	}
 
 	_bt_register_name_owner_changed();
 
@@ -1648,18 +2171,22 @@ BT_EXPORT_API int bluetooth_unregister_callback(void)
 
 
 	ret = _bt_deinit_event_handler();
-	if (ret != BLUETOOTH_ERROR_NONE) {
+	if (ret != BLUETOOTH_ERROR_NONE)
 		BT_ERR("Fail to deinit the event handler");
-	}
 
 	_bt_unregister_name_owner_changed();
 
 	_bt_set_user_data(BT_COMMON, NULL, NULL);
 
+	_bt_set_obex_server_id(BT_NO_SERVER);
+
+	_bt_gdbus_deinit_proxys();
+
 	if (system_gconn) {
 		g_object_unref(system_gconn);
 		system_gconn = NULL;
 	}
+
 	return BLUETOOTH_ERROR_NONE;
 }