Enhance logging for secure address

Change-Id: I99a8654e154143d2df2ae02d7c190f4e6afb17a0

diff --git a/bt-api/bt-common.c b/bt-api/bt-common.c
index 6779baf..4c7462b 100644 (file)
--- a/bt-api/bt-common.c
+++ b/bt-api/bt-common.c
@@ -248,8 +248,14 @@ void _bt_convert_addr_string_to_secure_string(char *addr, const char *address)
        strncpy(addr, address, len);
        addr[len] = '\0';
 
-       addr[len-1] = 'X';
-       addr[len-2] = 'X';
+       addr[len-7] = 'X';
+       addr[len-8] = 'X';
+       addr[len-10] = 'X';
+       addr[len-11] = 'X';
+       addr[len-13] = 'X';
+       addr[len-14] = 'X';
+       addr[len-16] = 'X';
+       addr[len-17] = 'X';
 
        return;
 }
@@ -271,8 +277,7 @@ void _bt_convert_addr_type_to_secure_string(char *address, unsigned char *addr)
        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]);
+                       "XX:XX:XX:XX:%2.2X:%2.2X", addr[4], addr[5]);
 }
 
 const char *_bt_convert_error_to_string(int error)
@@ -2175,6 +2180,7 @@ BT_EXPORT_API int bluetooth_get_uuid_name(const char *uuid, char **name)
                }
        }
 
+       BT_INFO("Unknown uuid : %s", uuid);
        *name = g_strdup("Unknown");
        return BLUETOOTH_ERROR_NONE;
 }

diff --git a/bt-service/bt-service-common.c b/bt-service/bt-service-common.c
index eb17e87..a514535 100644 (file)
--- a/bt-service/bt-service-common.c
+++ b/bt-service/bt-service-common.c
@@ -483,8 +483,14 @@ void _bt_convert_addr_string_to_secure_string(char *addr,
        strncpy(addr, address, len);
        addr[len] = '\0';
 
-       addr[len-1] = 'X';
-       addr[len-2] = 'X';
+       addr[len-7] = 'X';
+       addr[len-8] = 'X';
+       addr[len-10] = 'X';
+       addr[len-11] = 'X';
+       addr[len-13] = 'X';
+       addr[len-14] = 'X';
+       addr[len-16] = 'X';
+       addr[len-17] = 'X';
 
        return;
 }
@@ -960,6 +966,7 @@ const char *_bt_convert_uuid_to_string(const char *uuid)
                        return (char *)bt_uuid_name[i].specification_name;
        }
 
+       BT_INFO("Unknown uuid : %s", uuid);
        return "Unknown";
 }
 

diff --git a/bt-service/bt-service-event-receiver.c b/bt-service/bt-service-event-receiver.c
index a980dad..1829789 100644 (file)
--- a/bt-service/bt-service-event-receiver.c
+++ b/bt-service/bt-service-event-receiver.c
@@ -1933,10 +1933,8 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                _bt_convert_device_path_to_address(path, address);
                _bt_convert_addr_string_to_type(bd_addr.addr, address);
 
-               _bt_convert_addr_string_to_secure_string(secure_address, address);
-               BT_DBG("Address: %s", secure_address);
-               BT_DBG("Profile UUID: %s", profile_uuid);
-               BT_DBG("State: %d", state);
+               BT_DBG("Profile: %s, state: %d addr: %s",
+                       _bt_convert_uuid_to_string(profile_uuid), state, address);
 
                if ((strcmp(profile_uuid, A2DP_SINK_UUID) == 0)  &&
                        (state == BT_PROFILE_STATE_CONNECTED)) {
@@ -2301,8 +2299,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                address = g_malloc0(BT_ADDRESS_STRING_SIZE);
 
                _bt_convert_device_path_to_address(path, address);
-               _bt_convert_addr_string_to_secure_string(secure_address, address);
-               BT_DBG("Address : %s MTU changed : %d", secure_address, mtu);
+               BT_DBG("Address : %s MTU changed : %d", address, mtu);
 
                param = g_variant_new("(isqy)",
                        result,