Fix Memory Leaks

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-event-handler.c

diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c
index 3342aed..b213807 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -883,7 +883,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
                g_variant_get(parameters, "(i&s)", &result, &address);
 
                _bt_convert_addr_string_to_type(dev_address.addr, address);
-               BT_DBG("Sending Event to Framework");
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_SERVER_CONNECTED,
                                result, &dev_address,
                                event_info->cb, event_info->user_data);
@@ -894,7 +893,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
                g_variant_get(parameters, "(i&s)", &result, &address);
 
                _bt_convert_addr_string_to_type(dev_address.addr, address);
-               BT_DBG("Sending Event to Framework");
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_SERVER_DISCONNECTED,
                                result, &dev_address,
                                event_info->cb, event_info->user_data);
@@ -905,7 +903,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
                g_variant_get(parameters, "(i&s)", &result, &address);
 
                _bt_convert_addr_string_to_type(dev_address.addr, address);
-               BT_DBG("Sending Event to Framework");
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_CLIENT_CONNECTED,
                                result, &dev_address,
                                event_info->cb, event_info->user_data);
@@ -916,7 +913,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
                g_variant_get(parameters, "(i&s)", &result, &address);
 
                _bt_convert_addr_string_to_type(dev_address.addr, address);
-               BT_DBG("Sending Event to Framework");
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_CLIENT_DISCONNECTED,
                                result, &dev_address,
                                event_info->cb, event_info->user_data);
@@ -928,7 +924,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
                g_variant_get(parameters, "(i&s)", &result, &address);
 
                _bt_convert_addr_string_to_type(dev_address.addr, address);
-               BT_DBG("Sending Event to Framework");
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_CONNECTED,
                                result, &dev_address,
                                event_info->cb, event_info->user_data);
@@ -939,7 +934,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
                g_variant_get(parameters, "(i&s)", &result, &address);
 
                _bt_convert_addr_string_to_type(dev_address.addr, address);
-               BT_DBG("Sending Event to Framework");
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_DISCONNECTED,
                                result, &dev_address,
                                event_info->cb, event_info->user_data);
@@ -1019,7 +1013,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
 
                conn_info.addr_type = addr_type;
                conn_info.disc_reason = 0;
-               BT_DBG("Sending Event to Framework");
                _bt_common_event_cb(BLUETOOTH_EVENT_DEVICE_CONNECTED,
                                result, &conn_info,
                                event_info->cb, event_info->user_data);
@@ -1030,8 +1023,8 @@ void __bt_device_event_filter(GDBusConnection *connection,
                bt_connection_info_t conn_info;
                bluetooth_device_address_t dev_address = { {0} };
                int rssi;
-               BT_DBG("BT_DEVICE_DISCONNECTED");
                g_variant_get(parameters, "(i&syi)", &result, &address, &addr_type, &rssi);
+               BT_DBG("BT_DEVICE_DISCONNECTED reason(%d)", result);
 
                _bt_convert_addr_string_to_type(dev_address.addr,
                                                address);
@@ -1045,7 +1038,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
                conn_info.addr_type = addr_type;
                conn_info.disc_reason = result;
                conn_info.rssi = rssi;
-               BT_DBG("Sending Event to Framework, disconnect reason [0x%x]", result);
                _bt_common_event_cb(BLUETOOTH_EVENT_DEVICE_DISCONNECTED,
                                result, &conn_info,
                                event_info->cb, event_info->user_data);
@@ -3115,7 +3107,6 @@ static void __bt_tds_event_filter(GDBusConnection *connection,
                const char *address = NULL;
                char *data;
                int data_len = 0;
-               int k;
                GVariant *var = NULL;
                bluetooth_tds_transport_data_info_t *info = NULL;
 
@@ -3124,13 +3115,6 @@ static void __bt_tds_event_filter(GDBusConnection *connection,
                data = (char *)g_variant_get_data(var);
 
                if (data) {
-                       BT_DBG("Address [%s]", address);
-                       BT_DBG("Data len [%d]", data_len);
-
-                       /* DEBUG */
-                       for (k = 0; k < data_len ; k++)
-                               BT_DBG("Data[%d] [0x%x]", k, data[k]);
-
                        if (data_len == 0) {
                                BT_ERR("No data");
                                g_variant_unref(var);
@@ -3619,13 +3603,14 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                memcpy(&char_prop.svc_prop.uuid, g_variant_get_data(svc_uuid_var), 16);
                char_prop.svc_prop.instance_id = svc_inst;
 
-               /* DEBUG */
-       //      for (i = 0; i < char_prop.val_len; i++)
-       //              BT_INFO("Data[%d] = [0x%x]", i, char_prop.value[i]);
-
                _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_CHAR_VAL_CHANGED,
                                result, &char_prop,
                                event_info->cb, event_info->user_data);
+
+               g_variant_unref(svc_uuid_var);
+               g_variant_unref(char_uuid_var);
+               g_variant_unref(data_var);
+
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_READ_CHAR) == 0) { /* Done */
                /* Event: BLUETOOTH_EVENT_GATT_READ_CHAR */
                BT_DBG("GATT Client event[BT_GATT_CLIENT_READ_CHAR]");
@@ -3668,13 +3653,14 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                memcpy(&char_prop.svc_prop.uuid, g_variant_get_data(svc_uuid_var), 16);
                char_prop.svc_prop.instance_id = svc_inst;
 
-               /* DEBUG */
-       //      for (i = 0; i < char_prop.val_len; i++)
-       //              BT_INFO("Data[%d] = [0x%x]", i, char_prop.value[i]);
-
                _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_READ_CHAR,
                                result, &char_prop,
                                event_info->cb, event_info->user_data);
+
+               g_variant_unref(svc_uuid_var);
+               g_variant_unref(char_uuid_var);
+               g_variant_unref(data_var);
+
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_WRITE_CHAR) == 0) { /* Done */
                /* Event: BLUETOOTH_EVENT_GATT_WRITE_CHAR */
                BT_DBG("GATT Client event[BT_GATT_CLIENT_WRITE_CHAR]");
@@ -3713,6 +3699,10 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_WRITE_CHAR,
                                result, &char_prop,
                                event_info->cb, event_info->user_data);
+
+               g_variant_unref(svc_uuid_var);
+               g_variant_unref(char_uuid_var);
+
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_READ_DESC) == 0) { /* Done */
                /* Event: BLUETOOTH_EVENT_GATT_READ_DESC */
                BT_DBG("GATT Client event[BT_GATT_CLIENT_READ_DESC]");
@@ -3727,7 +3717,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                int svc_uuid_len = 0;
                int char_uuid_len = 0;
                int desc_uuid_len = 0;
-               unsigned int i;
 
                memset(&desc_prop, 0x00, sizeof(bt_gatt_char_descriptor_property_t));
 
@@ -3767,13 +3756,15 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                memcpy(&desc_prop.svc_prop.uuid, g_variant_get_data(svc_uuid_var), 16);
                desc_prop.svc_prop.instance_id = svc_inst;
 
-               /* DEBUG */
-               for (i = 0; i < desc_prop.val_len; i++)
-                       BT_INFO("Data[%d] = [0x%x]", i, desc_prop.value[i]);
-
                _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_READ_DESC,
                                result, &desc_prop,
                                event_info->cb, event_info->user_data);
+
+               g_variant_unref(svc_uuid_var);
+               g_variant_unref(char_uuid_var);
+               g_variant_unref(desc_uuid_var);
+               g_variant_unref(data_var);
+
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_WRITE_DESC) == 0) { /* Done */
                /* Event: BLUETOOTH_EVENT_GATT_WRITE_DESC */
                BT_DBG("GATT Client event[BT_GATT_CLIENT_WRITE_DESC]");
@@ -3823,6 +3814,11 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_WRITE_DESC,
                                result, &desc_prop,
                                event_info->cb, event_info->user_data);
+
+               g_variant_unref(svc_uuid_var);
+               g_variant_unref(char_uuid_var);
+               g_variant_unref(desc_uuid_var);
+
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_SERVICE_CHANGED) == 0) {
                BT_DBG("GATT Client event[BT_GATT_CLIENT_SERVICE_CHANGED]");
                bt_gatt_service_change_t change = {0, };
@@ -3894,7 +3890,6 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection,
                BT_INFO("GATT Server event[BT_GATT_SERVER_WRITE_REQUESTED]");
                const char *address = NULL;
                GVariant *data_var = NULL;
-               int i;
                bluetooth_device_address_t dev_address = { {0} };
 
                bluetooth_gatt_server_write_requested_info_t write_info;
@@ -3933,13 +3928,11 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection,
                                dev_address.addr,
                                BLUETOOTH_ADDRESS_LENGTH);
 
-               /* DEBUG */
-               for (i = 0; i < write_info.length; i++)
-                       BT_DBG("Data[%d] = [0x%x]", i, write_info.data.data[i]);
-
                _bt_gatt_server_event_cb(BLUETOOTH_EVENT_GATT_SERVER_VALUE_CHANGED,
                                BLUETOOTH_ERROR_NONE, &write_info,
                                event_info->cb, event_info->user_data);
+
+               g_variant_unref(data_var);
        } else if (strcasecmp(signal_name, BT_GATT_SERVER_READ_REQ) == 0) {
                const char *address = NULL;
                bluetooth_device_address_t dev_address = { {0} };
@@ -4124,41 +4117,34 @@ int _bt_register_event(int event_type, void *event_cb, void *user_data)
                path = BT_RFCOMM_SERVER_PATH;
                break;
        case BT_HF_AGENT_EVENT:
-               BT_DBG("BT_HF_AGENT_EVENT\n");
                event_func = __bt_hf_agent_event_filter;
                path = BT_HF_AGENT_PATH;
                interface = BT_HF_SERVICE_INTERFACE;
                break;
        case BT_A2DP_SOURCE_EVENT:
-               BT_DBG("BT_A2DP_SOURCE_EVENT");
                event_func = __bt_a2dp_source_event_filter;
                path = BT_A2DP_SOURCE_PATH;
                break;
        case BT_HID_DEVICE_EVENT:
-               BT_DBG("BT_HID_DEVICE_EVENT");
                event_func = __bt_hid_device_event_filter;
                path = BT_HID_DEVICE_PATH;
                break;
 #ifdef GATT_NO_RELAY
        case BT_GATT_BLUEZ_EVENT:
-               BT_DBG("BT_GATT_BLUEZ_EVENT");
                event_func = __bt_device_event_filter;
                interface = BT_GATT_CHARACTERISTIC_INTERFACE;
                path = NULL;
                break;
 #endif
        case BT_TDS_EVENT:
-               BT_DBG("BT_TDS_EVENT");
                event_func = __bt_tds_event_filter;
                path = BT_TDS_PATH;
                break;
        case BT_OTP_EVENT:
-               BT_DBG("BT_OTP_EVENT");
                event_func = __bt_otp_event_filter;
                path = BT_OTP_PATH;
                break;
        case BT_HDP_EVENT:
-               BT_DBG("BT_HDP_EVENT");
                event_func = __bt_hdp_event_filter;
                path = BT_HDP_DEVICE_PATH;
                break;