Remove redundant debug message
[platform/core/connectivity/bluetooth-frwk.git] / bt-service-adaptation / services / bt-request-handler.c
index b9c11bd..cdd32e6 100644 (file)
@@ -23,6 +23,7 @@
 #include <gio/gunixfdlist.h>
 #include <cynara-client.h>
 #include <cynara-creds-gdbus.h>
+#include <systemd/sd-daemon.h>
 
 #include "bluetooth-api.h"
 #include "bluetooth-audio-api.h"
@@ -54,6 +55,8 @@
 #include "bt-service-pbap.h"
 #include "bt-service-oob.h"
 
+#include "bt-service-battery-monitor.h"
+
 #ifdef TIZEN_FEATURE_BT_PAN_NAP
 #include "bt-service-network.h"
 #endif
@@ -69,7 +72,6 @@ static guint owner_id = 0;
 static guint owner_sig_id = 0;
 static gboolean is_le_intended = FALSE;
 
-
 static cynara *p_cynara;
 static cynara_configuration *conf;
 
@@ -155,7 +157,6 @@ void _bt_free_info_from_invocation_list(invocation_info_t *req_info)
 {
        GSList *l;
        invocation_info_t *info;
-
        ret_if(NULL == req_info);
        ret_if(NULL == req_info->sender);
 
@@ -193,9 +194,7 @@ static void __bt_service_get_parameters(GVariant *in_param,
 static gboolean __bt_is_sync_function(int service_function)
 {
        /*TODO: Keep adding sync methods with expect replies from bluetooth service */
-       if (service_function == BT_ENABLE_ADAPTER
-                       || service_function == BT_DISABLE_ADAPTER
-                       || service_function == BT_GET_LOCAL_ADDRESS
+       if (service_function == BT_GET_LOCAL_ADDRESS
                        || service_function == BT_GET_LOCAL_NAME
                        || service_function == BT_GET_LOCAL_VERSION
                        || service_function == BT_GET_BONDED_DEVICES
@@ -223,6 +222,7 @@ static gboolean __bt_is_sync_function(int service_function)
                        || service_function == BT_GATT_SERVER_DELETE_SERVICE
                        || service_function == BT_START_LE_DISCOVERY
                        || service_function == BT_STOP_LE_DISCOVERY
+                       || service_function == BT_GET_CONNECTABLE
 #ifdef TIZEN_GATT_CLIENT
                        || service_function == BT_GATT_CLIENT_REGISTER
                        || service_function == BT_GATT_GET_PRIMARY_SERVICES
@@ -254,6 +254,29 @@ void _bt_save_invocation_context(GDBusMethodInvocation *invocation, int result,
 
 }
 
+static int __bt_bm_request_data(_bt_battery_data_t *latest)
+{
+       int ret = _bt_bm_read_data(latest);
+       if (ret == BLUETOOTH_ERROR_NONE) {
+               BT_DBG("Received data from bluetooth battery monitor: %ld %ld %d %d",
+                       latest->session_start_time, latest->session_end_time,
+                               latest->session_scan_time, latest->session_connected_time);
+
+               if (latest->atm_list == NULL) {
+                       BT_DBG("No app data transaction for this session");
+                       return ret;
+               }
+
+               for (GSList *l = latest->atm_list; l != NULL; l = g_slist_next(l)) {
+                       _bt_battery_app_data_t *t = (_bt_battery_app_data_t *)(l->data);
+                       BT_DBG("%ld %ld %d %d", (long int)(t->uid), (long int)(t->pid), t->rx_bytes, t->tx_bytes);
+               }
+       }
+       else
+               BT_ERR("Error encountered");
+        return ret;
+}
+
 static void __bt_service_method(GDBusConnection *connection,
                const gchar *sender,
                const gchar *object_path,
@@ -418,24 +441,10 @@ int __bt_bluez_request(int function_name,
        switch (function_name) {
        case BT_ENABLE_ADAPTER: {
                result = _bt_enable_adapter();
-               /* Save invocation */
-               if (result == BLUETOOTH_ERROR_NONE) {
-                       BT_DBG("_bt_enable_adapter scheduled successfully! save invocation context");
-                       sender = (char*)g_dbus_method_invocation_get_sender(context);
-                       _bt_save_invocation_context(context, result, sender,
-                                       function_name, NULL);
-               }
                break;
        }
        case BT_DISABLE_ADAPTER: {
                result = _bt_disable_adapter();
-               /* Save invocation */
-               if (result == BLUETOOTH_ERROR_NONE) {
-                       BT_DBG("_bt_disable_adapter scheduled successfully! save invocation context");
-                       sender = (char*)g_dbus_method_invocation_get_sender(context);
-                       _bt_save_invocation_context(context, result, sender,
-                                       function_name, NULL);
-               }
                break;
        }
        case BT_RECOVER_ADAPTER:
@@ -444,6 +453,32 @@ int __bt_bluez_request(int function_name,
        case BT_RESET_ADAPTER:
                result = _bt_reset_adapter();
                break;
+       case BT_BATTERY_READ_DATA: {
+               _bt_battery_data_t *data = NULL;
+               data = g_malloc0(sizeof(_bt_battery_data_t));
+               result = __bt_bm_request_data(data);
+
+               bt_battery_dbus_data_t dbus_data;
+               memset(&dbus_data, 0, sizeof(bt_battery_dbus_data_t));
+               dbus_data.session_start_time = data->session_start_time;
+               dbus_data.session_end_time = data->session_end_time;
+               dbus_data.session_scan_time = data->session_scan_time;
+               dbus_data.session_connected_time = data->session_connected_time;
+
+               /*Populating app data*/
+               int n = 0;
+               for (GSList *l = data->atm_list; l != NULL; l = g_slist_next(l)) {
+                       bt_battery_app_data *t = (bt_battery_app_data *)(l->data);
+                       memcpy(&dbus_data.app_data[n], t, sizeof(bt_battery_app_data));
+                       n++;
+               }
+               dbus_data.num_app = n;
+               g_array_append_vals(*out_param1, &dbus_data, sizeof(bt_battery_dbus_data_t));
+               g_slist_free(data->atm_list);
+               g_free(data);
+               data = NULL;
+               break;
+       }
        case BT_CHECK_ADAPTER: {
                int enabled = BT_ADAPTER_DISABLED;
                result = _bt_check_adapter(&enabled);
@@ -564,6 +599,17 @@ int __bt_bluez_request(int function_name,
                g_array_append_vals(*out_param1, &is_connectable, sizeof(gboolean));
                break;
        }
+       case BT_GET_CONNECTABLE: {
+               result  = _bt_get_connectable();
+
+               /* Save invocation */
+               if (result == BLUETOOTH_ERROR_NONE) {
+                        sender = (char*)g_dbus_method_invocation_get_sender(context);
+                        _bt_save_invocation_context(context, result, sender,
+                                        function_name, NULL);
+               }
+               break;
+       }
        case BT_SET_CONNECTABLE: {
                gboolean is_connectable;
 
@@ -822,6 +868,68 @@ int __bt_bluez_request(int function_name,
                result = _bt_set_authorization(&address, authorize);
                break;
        }
+       case BT_SET_LE_PRIVACY: {
+              gboolean set_privacy;
+              __bt_service_get_parameters(in_param1, &set_privacy,
+                               sizeof(gboolean));
+              result = _bt_set_le_privacy(set_privacy);
+              break;
+       }
+       case BT_ADD_WHITE_LIST: {
+               bluetooth_device_address_t address = { {0} };
+               int address_type = 0;
+               bool is_add = true;
+               __bt_service_get_parameters(in_param1,
+                               &address, sizeof(bluetooth_device_address_t));
+               __bt_service_get_parameters(in_param2,
+                               &address_type, sizeof(int));
+               result = _bt_set_white_list(&address, address_type, is_add);
+               break;
+       }
+       case BT_REMOVE_WHITE_LIST: {
+               bluetooth_device_address_t address = { {0} };
+               int address_type = 0;
+               bool is_add = false;
+               __bt_service_get_parameters(in_param1,
+                               &address, sizeof(bluetooth_device_address_t));
+               __bt_service_get_parameters(in_param2,
+                               &address_type, sizeof(int));
+               result = _bt_set_white_list(&address, address_type, is_add);
+               break;
+        }
+       case BT_UPDATE_LE_CONNECTION_MODE: {
+               char *sender = NULL;
+               bluetooth_device_address_t remote_address = { { 0 } };
+               bluetooth_le_connection_param_t parameters = { 0 };
+               bluetooth_le_connection_mode_t mode = BLUETOOTH_LE_CONNECTION_MODE_BALANCED;
+
+               __bt_service_get_parameters(in_param1, &remote_address,
+                               sizeof(bluetooth_device_address_t));
+               __bt_service_get_parameters(in_param2, &mode,
+                               sizeof(bluetooth_le_connection_mode_t));
+
+               result = _bt_get_le_connection_parameter(mode, &parameters);
+               if (result != BLUETOOTH_ERROR_NONE)
+                       break;
+
+               sender = (char *)g_dbus_method_invocation_get_sender(context);
+
+               result = _bt_le_connection_update(sender,
+                               remote_address.addr,
+                               parameters.interval_min,
+                               parameters.interval_max,
+                               parameters.latency,
+                               parameters.timeout);
+               break;
+       }
+       case BT_SET_MANUFACTURER_DATA: {
+               bluetooth_manufacturer_data_t m_data = { 0 };
+               __bt_service_get_parameters(in_param1,
+                               &m_data, sizeof(bluetooth_manufacturer_data_t));
+               result = _bt_set_manufacturer_data(&m_data);
+               break;
+       }
+
        case BT_IS_DEVICE_CONNECTED: {
                bluetooth_device_address_t address = { {0} };
                gboolean connected = FALSE;
@@ -865,6 +973,17 @@ int __bt_bluez_request(int function_name,
                }
                break;
        }
+       case BT_IS_SCAN_FILTER_SUPPORTED:{
+               int is_supported = 0;
+
+               if (_bt_is_scan_filter_supported() == TRUE)
+                       is_supported = 1;
+
+               g_array_append_vals(*out_param1,
+                               &is_supported, sizeof(int));
+
+               break;
+       }
        case BT_ENABLE_RSSI: {
                bluetooth_device_address_t bd_addr;
                int link_type;
@@ -1372,6 +1491,28 @@ int __bt_bluez_request(int function_name,
                result = BLUETOOTH_ERROR_NONE;
                break;
        }
+       case BT_RFCOMM_SEND_RX_DETAILS: {
+               uid_t uid;
+               pid_t pid;
+               int size;
+               __bt_service_get_parameters(in_param1, &uid, sizeof(uid_t));
+               __bt_service_get_parameters(in_param2, &pid, sizeof(pid_t));
+               __bt_service_get_parameters(in_param3, &size, sizeof(int));
+               BT_DBG("Sending details to bluetooth battery monitor: %ld, %ld, %d", (long int)uid, (long int)pid, size);
+               _bt_bm_add_transaction_details(uid, pid, size, RX_DATA);
+               break;
+       }
+       case BT_RFCOMM_SEND_TX_DETAILS: {
+               uid_t uid;
+               pid_t pid;
+               int size;
+               __bt_service_get_parameters(in_param1, &uid, sizeof(uid_t));
+               __bt_service_get_parameters(in_param2, &pid, sizeof(pid_t));
+               __bt_service_get_parameters(in_param3, &size, sizeof(int));
+               BT_DBG("Sending details to bluetooth battery monitor: %ld, %ld, %d", (long int)uid, (long int)pid, size);
+               _bt_bm_add_transaction_details(uid, pid, size, TX_DATA);
+               break;
+        }
        case BT_AUDIO_SELECT_ROLE: {
                bluetooth_audio_role_t role;
 
@@ -1547,6 +1688,46 @@ int __bt_bluez_request(int function_name,
                }
                break;
        }
+       case BT_HF_CONNECT: {
+               bluetooth_device_address_t address = { {0} };
+
+               __bt_service_get_parameters(in_param1,
+                               &address, sizeof(bluetooth_device_address_t));
+
+               result = _bt_hf_connect(&address);
+               if (result != BLUETOOTH_ERROR_NONE) {
+                       char addr[BT_ADDRESS_STRING_SIZE];
+                       _bt_convert_addr_type_to_string(addr, address.addr);
+                       g_array_append_vals(*out_param1, addr, BT_ADDRESS_STRING_SIZE);
+               } else {
+                       char *addr = g_malloc0(BT_ADDRESS_STRING_SIZE);
+                       _bt_convert_addr_type_to_string(addr, address.addr);
+                       sender = (char*)g_dbus_method_invocation_get_sender(context);
+                       _bt_save_invocation_context(context, result, sender,
+                                       function_name, (gpointer)addr);
+               }
+               break;
+       }
+       case BT_HF_DISCONNECT: {
+               bluetooth_device_address_t address = { {0} };
+
+               __bt_service_get_parameters(in_param1,
+                               &address, sizeof(bluetooth_device_address_t));
+
+               result = _bt_hf_disconnect(&address);
+               if (result != BLUETOOTH_ERROR_NONE) {
+                       char addr[BT_ADDRESS_STRING_SIZE];
+                       _bt_convert_addr_type_to_string(addr, address.addr);
+                       g_array_append_vals(*out_param1, addr, BT_ADDRESS_STRING_SIZE);
+               } else {
+                       char *addr = g_malloc0(BT_ADDRESS_STRING_SIZE);
+                       _bt_convert_addr_type_to_string(addr, address.addr);
+                       sender = (char*)g_dbus_method_invocation_get_sender(context);
+                       _bt_save_invocation_context(context, result, sender,
+                                       function_name, (gpointer)addr);
+               }
+               break;
+       }
        case BT_AVRCP_TARGET_CONNECT: {
                bluetooth_device_address_t address = { {0} };
 
@@ -1849,6 +2030,33 @@ int __bt_bluez_request(int function_name,
 
                break;
        }
+       case BT_LE_OOB_READ_LOCAL_DATA: {
+               bt_oob_data_t local_oob_data;
+
+               memset(&local_oob_data, 0x00, sizeof(bt_oob_data_t));
+               result = _bt_le_oob_read_local_data(&local_oob_data);
+
+               g_array_append_vals(*out_param1, &local_oob_data,
+                               sizeof(bt_oob_data_t));
+
+               break;
+       }
+       case BT_LE_OOB_ADD_REMOTE_DATA: {
+               bluetooth_device_address_t address = { {0} };
+               unsigned short address_type;
+               bt_oob_data_t remote_oob_data;
+
+               __bt_service_get_parameters(in_param1,
+                               &address, sizeof(bluetooth_device_address_t));
+               __bt_service_get_parameters(in_param2,
+                               &address_type, sizeof(unsigned short));
+               __bt_service_get_parameters(in_param3,
+                               &remote_oob_data, sizeof(bt_oob_data_t));
+
+               result = _bt_oob_add_remote_data(&address, address_type, &remote_oob_data);
+
+               break;
+       }
        case BT_AVRCP_SET_TRACK_INFO: {
                media_metadata_t data;
                media_metadata_attributes_t meta_data;
@@ -2408,6 +2616,34 @@ int __bt_bluez_request(int function_name,
                }
                break;
        }
+       case BT_REQ_ATT_MTU: {
+               bluetooth_device_address_t address = { {0} };
+               unsigned int mtu;
+               char *addr;
+
+               sender = (char*)g_dbus_method_invocation_get_sender(context);
+
+               __bt_service_get_parameters(in_param1,
+                               &address, sizeof(bluetooth_device_address_t));
+               __bt_service_get_parameters(in_param2,
+                               &mtu, sizeof(unsigned int));
+               BT_DBG("BT_REQ_ATT_MTU: %d", mtu);
+               result = _bt_request_att_mtu(&address, mtu);
+               if (BLUETOOTH_ERROR_NONE == result) {
+                       addr = g_malloc0(BT_ADDRESS_STRING_SIZE);
+                       BT_INFO("GATT Client: Save Invocation data for BT_REQ_ATT_MTU [%s]", sender);
+
+                       _bt_convert_addr_type_to_string(addr, address.addr);
+
+                       /* Save the informations to invocation */
+                       _bt_save_invocation_context(context, result, sender,
+                                       function_name, (gpointer)addr);
+               } else {
+                       g_array_append_vals(*out_param1, &address,
+                                       sizeof(bluetooth_device_address_t));
+               }
+               break;
+       }
        case BT_SET_LE_STATIC_RANDOM_ADDRESS: {
                gboolean is_enable;
 
@@ -2461,8 +2697,6 @@ int __bt_bluez_request(int function_name,
                int mtu = -1;
                bluetooth_gatt_client_char_prop_info_t param;
 
-               BT_INFO("GATT Client ACQUIRE WRITE recived");
-
                sender = (char*)g_dbus_method_invocation_get_sender(context);
 
                __bt_service_get_parameters(in_param1, &param,
@@ -2474,9 +2708,9 @@ int __bt_bluez_request(int function_name,
                g_array_append_vals(*out_param1, &mtu, sizeof(int));
 
                if (BLUETOOTH_ERROR_NONE == result)
-                       BT_INFO("GATT Client: Save Invocation data for characteristic props app[%s] fd[ %d]", sender, fd);
+                       BT_DBG("GATT Client: Save Invocation data for characteristic props app[%s] fd[ %d]", sender, fd);
                else {
-                       BT_ERR("Gatt Client Acqure Write");
+                       BT_ERR("GATT Client: gatt acquire write failed");
                        break;
                }
 
@@ -2525,7 +2759,7 @@ int __bt_bluez_request(int function_name,
                        _bt_save_invocation_context(context, result, sender,
                                        function_name, (gpointer)addr);
                } else {
-                       BT_INFO("GATT Client: gatt connect failed");
+                       BT_ERR("GATT Client: gatt connect failed");
                        g_array_append_vals(*out_param1, &address,
                                        sizeof(bluetooth_device_address_t));
                }
@@ -2851,10 +3085,20 @@ normal:
 
                __bt_service_get_parameters(in_param1, &scan_params,
                                sizeof(bluetooth_le_scan_params_t));
+
                BT_DBG("bluetooth_le_scan_params_t [%f %f %d]",
                                scan_params.interval, scan_params.window,
                                scan_params.type);
-               result = _bt_set_scan_parameters(&scan_params);
+
+               result = _bt_prepare_scan_parameters(&scan_params, 0);
+               break;
+       }
+       case BT_SET_SCAN_TYPE: {
+               int scan_type = 0;
+               __bt_service_get_parameters(in_param1, &scan_type, sizeof(int));
+
+               BT_DBG("bluetooth_le_scan_type [%d]", scan_type);
+               result = _bt_prepare_scan_parameters(NULL, scan_type);
                break;
        }
 #ifdef TIZEN_FEATURE_BT_PAN_NAP
@@ -2952,6 +3196,29 @@ normal:
                g_array_append_vals(*out_param1, &is_coded_phy_supported, sizeof(gboolean));
                break;
        }
+       case BT_DISCONNECT_DEVICE: {
+               bluetooth_device_address_t address = { {0} };
+
+               __bt_service_get_parameters(in_param1,
+                               &address, sizeof(bluetooth_device_address_t));
+
+               result = _bt_disconnect_device(&address);
+               break;
+       }
+       case BT_REGISTER_SCAN_FILTER: {
+               bluetooth_le_scan_filter_t scan_filter;
+
+               sender = (char*)g_dbus_method_invocation_get_sender(context);
+               __bt_service_get_parameters(in_param1, &scan_filter,
+                               sizeof(bluetooth_le_scan_filter_t));
+
+               BT_DBG("bluetooth_le_scan_filter_t [features : 0x%.2x]",
+                               scan_filter.added_features);
+
+               result = _bt_register_scan_filter(sender, &scan_filter);
+
+               break;
+       }
        default:
                BT_INFO("UnSupported function [%d]", function_name);
                result = BLUETOOTH_ERROR_NOT_SUPPORT;
@@ -3449,7 +3716,7 @@ int __bt_core_request(int function_name,
        case BT_ENABLE_ADAPTER:
        {
                bt_status_t status;
-               set_adapter_request_state(TRUE);
+               _bt_set_adapter_request_state(TRUE);
                status = _bt_adapter_get_status();
 
                if (status == BT_ACTIVATING) {
@@ -3468,7 +3735,6 @@ int __bt_core_request(int function_name,
        case BT_DISABLE_ADAPTER:
        {
                bt_status_t status;
-               set_le_request_state(TRUE);
                status = _bt_adapter_get_status();
                if (status == BT_DEACTIVATING) {
                                BT_DBG("Disabling in progress");
@@ -3486,7 +3752,7 @@ int __bt_core_request(int function_name,
        case BT_ENABLE_ADAPTER_LE:
        {
                bt_le_status_t le_status;
-
+               _bt_set_le_request_state(TRUE);
                le_status = _bt_adapter_get_le_status();
                if (le_status == BT_LE_ACTIVATING) {
                        BT_DBG("Enabling in progress");
@@ -3590,6 +3856,7 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_START_LE_DISCOVERY:
        case BT_STOP_LE_DISCOVERY:
        case BT_SET_SCAN_PARAMETERS:
+       case BT_SET_SCAN_TYPE:
 
        case BT_BOND_DEVICE:
        case BT_CANCEL_BONDING:
@@ -3600,8 +3867,12 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_SEARCH_SERVICE:
 
        case BT_RFCOMM_CLIENT_CONNECT:
+               if (function_name == BT_RFCOMM_CLIENT_CONNECT)
+                       BT_PERMANENT_LOG("Connect socket");
        case BT_RFCOMM_CLIENT_CANCEL_CONNECT:
        case BT_RFCOMM_SOCKET_DISCONNECT:
+               if (function_name == BT_RFCOMM_SOCKET_DISCONNECT)
+                       BT_PERMANENT_LOG("Disconnect socket");
        case BT_RFCOMM_SOCKET_WRITE:
        case BT_RFCOMM_CREATE_SOCKET:
        case BT_RFCOMM_REMOVE_SOCKET:
@@ -3778,10 +4049,13 @@ gboolean __bt_service_check_privilege(int function_name,
        }
        break;
 
+       case BT_RFCOMM_SEND_RX_DETAILS:
+        case BT_RFCOMM_SEND_TX_DETAILS:
        case BT_ENABLE_ADAPTER:
        case BT_DISABLE_ADAPTER:
        case BT_RESET_ADAPTER:
        case BT_RECOVER_ADAPTER:
+       case BT_BATTERY_READ_DATA:
        case BT_ENABLE_ADAPTER_LE:
        case BT_DISABLE_ADAPTER_LE:
        case BT_SET_CONNECTABLE:
@@ -3793,6 +4067,7 @@ gboolean __bt_service_check_privilege(int function_name,
 
        case BT_CANCEL_SEARCH_SERVICE:
        case BT_ENABLE_RSSI:
+       case BT_DISCONNECT_DEVICE:
 
        case BT_RFCOMM_ACCEPT_CONNECTION:
        case BT_RFCOMM_REJECT_CONNECTION:
@@ -3816,6 +4091,8 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_LE_WRITE_HOST_SUGGESTED_DATA_LENGTH:
        case BT_LE_READ_HOST_SUGGESTED_DATA_LENGTH:
        case BT_LE_SET_DATA_LENGTH:
+       case BT_LE_OOB_READ_LOCAL_DATA:
+       case BT_LE_OOB_ADD_REMOTE_DATA:
 
        case BT_LE_IPSP_INIT:
        case BT_LE_IPSP_DEINIT:
@@ -3880,6 +4157,7 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_IS_DISCOVERYING:
        case BT_IS_LE_DISCOVERYING:
        case BT_IS_CONNECTABLE:
+       case BT_GET_CONNECTABLE:
        case BT_GET_BONDED_DEVICES:
        case BT_GET_PROFILE_CONNECTED_DEVICES:
        case BT_GET_BONDED_DEVICE:
@@ -3900,8 +4178,6 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_IS_LE_2M_PHY_SUPPORTED:
        case BT_IS_LE_CODED_PHY_SUPPORTED:
        case BT_REGISTER_SCAN_FILTER:
-       case BT_UNREGISTER_SCAN_FILTER:
-       case BT_UNREGISTER_ALL_SCAN_FILTERS:
        case BT_IS_SCAN_FILTER_SUPPORTED:
        case BT_GET_ATT_MTU:
 
@@ -4037,6 +4313,19 @@ gboolean _is_name_acquired(void)
        return name_acquired;
 }
 
+void _bt_service_unref_connection(void)
+{
+       BT_INFO("+");
+
+       if (bt_service_conn) {
+               g_dbus_connection_flush_sync(bt_service_conn, NULL, NULL);
+               g_object_unref(bt_service_conn);
+               bt_service_conn = NULL;
+       }
+
+       BT_INFO("-");
+}
+
 int _bt_service_register(void)
 {
        GDBusConnection *conn;
@@ -4078,21 +4367,20 @@ fail:
 void _bt_service_unregister(void)
 {
        if (bt_service_conn) {
+               sd_notify(0, "STOPPING=1");
+
                if (owner_sig_id > 0) {
                        g_dbus_connection_signal_unsubscribe(
                                        bt_service_conn, owner_sig_id);
                        owner_sig_id = 0;
                }
 
-               __bt_service_register_object(bt_service_conn, NULL, FALSE);
-               if (bt_service_conn) {
-                       g_object_unref(bt_service_conn);
-                       bt_service_conn = NULL;
-               }
                if (owner_id > 0) {
                        g_bus_unown_name(owner_id);
                        owner_id = 0;
                }
+
+               __bt_service_register_object(bt_service_conn, NULL, FALSE);
        }
 }
 
@@ -4137,24 +4425,22 @@ void _bt_service_method_return(GDBusMethodInvocation *invocation,
                GArray *out_param, int result)
 {
        GVariant *out_var;
-       BT_DBG("+");
+       BT_DBG("");
        out_var = g_variant_new_from_data((const GVariantType *)"ay",
                        out_param->data, out_param->len, TRUE, NULL, NULL);
 
        g_dbus_method_invocation_return_value(invocation,
                        g_variant_new("(iv)", result, out_var));
-       BT_DBG("-");
 }
 
 void _bt_service_method_return_with_unix_fd_list(GDBusMethodInvocation *invocation,
                GArray *out_param, int result, GUnixFDList *fd_list)
 {
        GVariant *out_var;
-       BT_DBG("+");
+       BT_DBG("");
        out_var = g_variant_new_from_data((const GVariantType *)"ay",
                        out_param->data, out_param->len, TRUE, NULL, NULL);
 
        g_dbus_method_invocation_return_value_with_unix_fd_list(invocation,
                        g_variant_new("(iv)", result, out_var), fd_list);
-       BT_DBG("-");
 }