Remove redundant debug message
[platform/core/connectivity/bluetooth-frwk.git] / bt-service-adaptation / services / bt-request-handler.c
index b5670c7..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"
@@ -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
@@ -256,7 +256,7 @@ 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);
+       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,
@@ -441,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:
@@ -613,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;
 
@@ -2619,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;
 
@@ -2672,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,
@@ -2685,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;
                }
 
@@ -2736,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));
                }
@@ -3059,6 +3082,7 @@ normal:
        }
        case BT_SET_SCAN_PARAMETERS: {
                bluetooth_le_scan_params_t scan_params;
+
                __bt_service_get_parameters(in_param1, &scan_params,
                                sizeof(bluetooth_le_scan_params_t));
 
@@ -3843,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:
@@ -4129,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:
@@ -4284,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;
@@ -4325,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);
        }
 }
 
@@ -4384,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("-");
 }