Enhance debug message

Change-Id: I771e8ff026fcbd91d863a327ba443ac298968a95
Signed-off-by: Injun Yang <injun.yang@samsung.com>

diff --git a/bt-api/bt-common.c b/bt-api/bt-common.c
index 2166cec..37b42be 100644 (file)
--- a/bt-api/bt-common.c
+++ b/bt-api/bt-common.c
@@ -268,6 +268,273 @@ void _bt_convert_addr_type_to_string(char *address,
                        addr[3], addr[4], addr[5]);
 }
 
+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_BOND_DEVICE, "BT_BOND_DEVICE"},
+               {BT_BOND_DEVICE_BY_TYPE, "BT_BOND_DEVICE_BY_TYPE"},
+               {BT_CANCEL_BONDING, "BT_CANCEL_BONDING"},
+               {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_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_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_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_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_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_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"},
+               {-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;

diff --git a/bt-api/bt-request-sender.c b/bt-api/bt-request-sender.c
index 9118338..69f1da2 100644 (file)
--- a/bt-api/bt-request-sender.c
+++ b/bt-api/bt-request-sender.c
@@ -83,7 +83,9 @@ static void __bt_get_event_info(int service_function, GArray *output,
 {
        ret_if(event == NULL);
 
-       BT_DBG("service_function : %x", service_function);
+       BT_DBG("service_function : %s (0x%x)",
+               _bt_convert_service_function_to_string(service_function),
+               service_function);
        switch (service_function) {
        case BT_BOND_DEVICE:
        case BT_BOND_DEVICE_BY_TYPE:
@@ -369,7 +371,8 @@ static void __send_request_cb(GDBusProxy *proxy,
 
        /* Only if fail case, call the callback function*/
        bt_event.result = result;
-       BT_INFO("event_type[%d], result=[%d]", event_type, result);
+       BT_INFO("event_type[%d], result= %s [0x%x]", event_type,
+               _bt_convert_error_to_string(result), result);
 
        if (event_type == BT_ADAPTER_EVENT || event_type == BT_RFCOMM_CLIENT_EVENT) {
                ((bluetooth_cb_func_ptr)cb_data->cb)(bt_event.event,
@@ -539,7 +542,9 @@ int _bt_async_send_request(int service_type, int service_function,
        GVariant *param4;
        GVariant *param5;
 
-       BT_DBG("service_function : %x", service_function);
+       BT_DBG("service_function : %s (0x%x)",
+                       _bt_convert_service_function_to_string(service_function),
+                       service_function);
 
        cb_data = g_new0(bt_req_info_t, 1);
 

diff --git a/bt-api/include/bt-common.h b/bt-api/include/bt-common.h
index 6f476a7..e3a2af4 100644 (file)
--- a/bt-api/include/bt-common.h
+++ b/bt-api/include/bt-common.h
@@ -289,6 +289,10 @@ void _bt_convert_addr_string_to_secure_string(char *addr,
 void _bt_convert_addr_type_to_string(char *address,
                                unsigned char *addr);
 
+const char *_bt_convert_error_to_string(int error);
+
+const char *_bt_convert_service_function_to_string(int function);
+
 int _bt_copy_utf8_string(char *dest, const char *src, unsigned int length);
 
 gboolean _bt_utf8_validate(char *name);

diff --git a/bt-service/bt-request-handler.c b/bt-service/bt-request-handler.c
index 306a12a..070e972 100644 (file)
--- a/bt-service/bt-request-handler.c
+++ b/bt-service/bt-request-handler.c
@@ -205,8 +205,9 @@ static void __bt_service_method(GDBusConnection *connection,
                        }
                }
 
-               BT_DBG("SERVICE TYPE [%d] SERVICE FUNC [%d]",
-                               service_type, service_function);
+               BT_DBG("Service type = %d, fn = %s (0x%x)",
+                               service_type, _bt_convert_service_function_to_string(service_function),
+                               service_function);
                switch (service_type) {
                case BT_BLUEZ_SERVICE:
                        result = __bt_bluez_request(service_function,
@@ -277,7 +278,7 @@ static void __bt_service_method(GDBusConnection *connection,
                FN_END;
                return;
 fail:
-               BT_ERR_C("Request is failed [%s] [%x]",
+               BT_ERR_C("Request is failed [%s] [0x%x]",
                                _bt_convert_error_to_string(result), result);
 
                out_var = g_variant_new_from_data((const GVariantType *)"ay",

diff --git a/bt-service/bt-service-common.c b/bt-service/bt-service-common.c
index 651e45d..4dcde2d 100644 (file)
--- a/bt-service/bt-service-common.c
+++ b/bt-service/bt-service-common.c
@@ -35,6 +35,7 @@
 #include "bluetooth-api.h"
 #include "bt-service-common.h"
 #include "bt-service-agent.h"
+#include "bt-internal-types.h"
 
 static GDBusConnection *system_conn;
 static GDBusConnection *session_conn;
@@ -1010,6 +1011,190 @@ const char *_bt_convert_disc_reason_to_string(int reason)
        }
 }
 
+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_BOND_DEVICE, "BT_BOND_DEVICE"},
+               {BT_BOND_DEVICE_BY_TYPE, "BT_BOND_DEVICE_BY_TYPE"},
+               {BT_CANCEL_BONDING, "BT_CANCEL_BONDING"},
+               {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_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_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_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_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_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_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"},
+               {-1, ""},
+       };
+
+       for (i = 0; bt_functions[i].function != -1; i++) {
+               if (bt_functions[i].function == function)
+                       return bt_functions[i].function_name;
+       }
+
+       return NULL;
+}
+
 void _bt_logging_connection(gboolean connect, int addr_type)
 {
        static int le_conn = 0;

diff --git a/bt-service/bt-service-device.c b/bt-service/bt-service-device.c
index ec2641f..1b32ce4 100644 (file)
--- a/bt-service/bt-service-device.c
+++ b/bt-service/bt-service-device.c
@@ -1896,6 +1896,7 @@ static int __bt_connect_le_device_internal(int req_id, const bluetooth_device_ad
        gboolean auto_connect)
 {
        char device_address[BT_ADDRESS_STRING_SIZE] = { 0 };
+       char secure_address[BT_ADDRESS_STRING_SIZE] = { 0 };
        gchar *device_path = NULL;
        GDBusProxy *device_proxy = NULL;
        GDBusConnection *conn;
@@ -1930,6 +1931,9 @@ static int __bt_connect_le_device_internal(int req_id, const bluetooth_device_ad
                goto fail;
        }
 
+       _bt_convert_addr_string_to_secure_string(secure_address, device_address);
+       BT_INFO("Connect LE [%s]", secure_address);
+
        func_data->req_id = req_id;
 
        g_dbus_proxy_call(device_proxy, "ConnectLE",
@@ -2006,6 +2010,7 @@ int _bt_disconnect_le_device(int req_id,
                const bluetooth_device_address_t *bd_addr)
 {
        char device_address[BT_ADDRESS_STRING_SIZE] = { 0 };
+       char secure_address[BT_ADDRESS_STRING_SIZE] = { 0 };
        gchar *device_path;
        GDBusProxy *device_proxy;
        GDBusConnection *conn;
@@ -2042,6 +2047,9 @@ int _bt_disconnect_le_device(int req_id,
                goto fail;
        }
 
+       _bt_convert_addr_string_to_secure_string(secure_address, device_address);
+       BT_INFO("Disconnect LE [%s]", secure_address);
+
        func_data->req_id = req_id;
 
        g_dbus_proxy_call(device_proxy, "DisconnectLE",

diff --git a/bt-service/include/bt-service-common.h b/bt-service/include/bt-service-common.h
index 0b74fca..03805a4 100755 (executable)
--- a/bt-service/include/bt-service-common.h
+++ b/bt-service/include/bt-service-common.h
@@ -366,6 +366,8 @@ const char *_bt_convert_error_to_string(int error);
 
 const char *_bt_convert_disc_reason_to_string(int reason);
 
+const char *_bt_convert_service_function_to_string(int function);
+
 void _bt_logging_connection(gboolean connect, int addr_type);
 
 char *_bt_get_adapter_path(void);