Fix dbus delay issue

[platform/core/uifw/stt.git] / server / sttd_dbus.c

diff --git a/server/sttd_dbus.c b/server/sttd_dbus.c
index cf69d02..38d7756 100644 (file)
--- a/server/sttd_dbus.c
+++ b/server/sttd_dbus.c
@@ -259,7 +259,7 @@ int sttdc_send_result(int uid, int event, const char** data, int data_count, con
        snprintf(target_if_name, sizeof(target_if_name), "%s%d", STT_CLIENT_SERVICE_INTERFACE, pid);
 
        DBusMessage* msg = NULL;
-       SLOG(LOG_DEBUG, TAG_STTD, "[Dbus] send result signal : uid(%d), event(%d), result count(%d) result id(%d)", 
+       SLOG(LOG_DEBUG, TAG_STTD, "[Dbus] send result signal : uid(%d), event(%d), result count(%d) result id(%d)",
                uid, event, data_count, g_internal_result_id);
 
        msg = dbus_message_new_signal(
@@ -315,7 +315,7 @@ int sttdc_send_result(int uid, int event, const char** data, int data_count, con
        SLOG(LOG_DEBUG, TAG_STTD, "[Dbus] result size (%d)", data_count);
        for (i = 0; i < data_count; i++) {
                if (NULL != data[i]) {
-                       SLOG(LOG_DEBUG, TAG_STTD, "[Dbus] result (%d, %s)", i, data[i]);
+                       SECURE_SLOG(LOG_DEBUG, TAG_STTD, "[Dbus] result (%d, %s)", i, data[i]);
 
                        if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &data[i])) {
                                SLOG(LOG_ERROR, TAG_STTD, "[Dbus] response message : Fail to append result data");
@@ -504,14 +504,17 @@ void __sttd_dbus_connection_free()
 {
        if (NULL != g_conn_listener) {
                dbus_connection_close(g_conn_listener);
+               dbus_connection_unref(g_conn_listener);
                g_conn_listener = NULL;
        }
        if (NULL != g_conn_sender) {
                dbus_connection_close(g_conn_sender);
+               dbus_connection_unref(g_conn_sender);
                g_conn_sender = NULL;
        }
        if (NULL != g_conn_custom) {
                dbus_connection_close(g_conn_custom);
+               dbus_connection_unref(g_conn_custom);
                g_conn_custom = NULL;
        }
 }
@@ -576,7 +579,7 @@ int __sttd_get_buxtonkey()
        }
        SLOG(LOG_DEBUG, TAG_STTD, "[DBUS-BUXTON2] buxton_value_get_string: engine_default: %s", engine_default);
 
-       ret = aul_app_get_appid_bypid(pid, engine_appid, sizeof(engine_appid));
+       ret = aul_app_get_appid_bypid(pid, engine_appid, sizeof(engine_appid) - 1);
 
        __sttd_dbus_service_free();
 
@@ -653,8 +656,8 @@ int __sttd_request_custom_dbus_name()
        }
 
        if (NULL == g_conn_custom) {
-               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] fail to get dbus connection");
-               return STT_ERROR_OPERATION_FAILED;
+               SLOG(LOG_ERROR, TAG_STTD, "[ERROR] fail to get dbus connection");
+               return STTD_ERROR_OPERATION_FAILED;
        }
 
        dbus_connection_set_exit_on_disconnect(g_conn_custom, false);
@@ -682,6 +685,7 @@ int __sttd_request_custom_dbus_name()
        }
 
        dbus_connection_close(g_conn_custom);
+       dbus_connection_unref(g_conn_custom);
        g_conn_custom = NULL;
 
        SLOG(LOG_DEBUG, TAG_STTD, "==");
@@ -759,6 +763,11 @@ int sttd_dbus_open_connection()
                return STTD_ERROR_OPERATION_FAILED;
        }
 
+       /* Flush messages which are received before fd event handler registration */
+/*     while (DBUS_DISPATCH_DATA_REMAINS == dbus_connection_get_dispatch_status(g_conn_listener)) {
+               listener_event_callback(NULL, NULL);
+       }
+*/
        /* add a rule for getting signal */
        char rule[128];
        snprintf(rule, 128, "type='signal',interface='%s'", g_server_service_interface);