projects / platform / core / uifw / stt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Pop all dbus message
[platform/core/uifw/stt.git] / server / sttd_dbus.c
diff --git a/server/sttd_dbus.c b/server/sttd_dbus.c
index 28298be..5cab68f 100644 (file)
--- a/server/sttd_dbus.c
+++ b/server/sttd_dbus.c
@@ -40,7 +40,7 @@ static char* g_server_service_interface = NULL;
 
 void __sttd_dbus_service_free();
 
-int sttdc_send_hello(int uid)
+int sttdc_send_hello(unsigned int uid)
 {
        int pid = sttd_client_get_pid(uid);
        if (0 > pid) {
@@ -57,7 +57,7 @@ int sttdc_send_hello(int uid)
 
        DBusMessage* msg = NULL;
 
-       SLOG(LOG_DEBUG, TAG_STTD, "[Dbus] Send hello message : uid(%d)", uid);
+       SLOG(LOG_DEBUG, TAG_STTD, "[Dbus] Send hello message : uid(%u)", uid);
 
        msg = dbus_message_new_method_call(
                service_name,
@@ -70,7 +70,7 @@ int sttdc_send_hello(int uid)
                return STTD_ERROR_OUT_OF_MEMORY;
        }
 
-       dbus_message_append_args(msg, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID);
+       dbus_message_append_args(msg, DBUS_TYPE_UINT32, &uid, DBUS_TYPE_INVALID);
 
        DBusError err;
        dbus_error_init(&err);
@@ -107,7 +107,7 @@ int sttdc_send_hello(int uid)
        return result;
 }
 
-int sttdc_send_set_volume(int uid, float volume)
+int sttdc_send_set_volume(unsigned int uid, float volume)
 {
        int pid = sttd_client_get_pid(uid);
 
@@ -125,7 +125,7 @@ int sttdc_send_set_volume(int uid, float volume)
 
        DBusMessage* msg;
 
-       /* SLOG(LOG_DEBUG, TAG_STTD, "[Dbus] Send set volume : uid(%d), volume(%f) volume size(%d)", uid, volume, sizeof(float)); */
+       /* SLOG(LOG_DEBUG, TAG_STTD, "[Dbus] Send set volume : uid(%u), volume(%f) volume size(%d)", uid, volume, sizeof(float)); */
 
        msg = dbus_message_new_signal(
                STT_CLIENT_SERVICE_OBJECT_PATH, /* object name of the signal */
@@ -138,14 +138,14 @@ int sttdc_send_set_volume(int uid, float volume)
        }
 
        dbus_message_append_args(msg,
-               DBUS_TYPE_INT32, &uid,
+               DBUS_TYPE_UINT32, &uid,
                DBUS_TYPE_INT32, &volume,
                DBUS_TYPE_INVALID);
 
        if (!dbus_connection_send(g_conn_sender, msg, NULL)) {
                SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to send message : Out Of Memory !");
        } else {
-               SLOG(LOG_DEBUG, TAG_STTD, "<<<< Send set volume : uid(%d), volume(%f)", uid, volume);
+               SLOG(LOG_DEBUG, TAG_STTD, "<<<< Send set volume : uid(%u), volume(%f)", uid, volume);
                dbus_connection_flush(g_conn_sender);
        }
 
@@ -154,7 +154,7 @@ int sttdc_send_set_volume(int uid, float volume)
        return 0;
 }
 
-int sttdc_send_set_state(int uid, int state)
+int sttdc_send_set_state(unsigned int uid, int state)
 {
        int pid = sttd_client_get_pid(uid);
 
@@ -182,14 +182,14 @@ int sttdc_send_set_state(int uid, int state)
        }
 
        dbus_message_append_args(msg,
-               DBUS_TYPE_INT32, &uid,
+               DBUS_TYPE_UINT32, &uid,
                DBUS_TYPE_INT32, &state,
                DBUS_TYPE_INVALID);
 
        if (!dbus_connection_send(g_conn_sender, msg, NULL)) {
                SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to send change state message : Out Of Memory !");
        } else {
-               SLOG(LOG_DEBUG, TAG_STTD, "<<<< Send change state message : uid(%d), state(%d)", uid, state);
+               SLOG(LOG_DEBUG, TAG_STTD, "<<<< Send change state message : uid(%u), state(%d)", uid, state);
                dbus_connection_flush(g_conn_sender);
        }
 
@@ -198,7 +198,7 @@ int sttdc_send_set_state(int uid, int state)
        return 0;
 }
 
-int sttdc_send_speech_status(int uid, int status)
+int sttdc_send_speech_status(unsigned int uid, int status)
 {
        int pid = sttd_client_get_pid(uid);
 
@@ -226,14 +226,14 @@ int sttdc_send_speech_status(int uid, int status)
        }
 
        dbus_message_append_args(msg,
-               DBUS_TYPE_INT32, &uid,
+               DBUS_TYPE_UINT32, &uid,
                DBUS_TYPE_INT32, &status,
                DBUS_TYPE_INVALID);
 
        if (!dbus_connection_send(g_conn_sender, msg, NULL)) {
                SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to send speech status message : Out Of Memory !");
        } else {
-               SLOG(LOG_DEBUG, TAG_STTD, "<<<< Send speech status message : uid(%d), status(%d)", uid, status);
+               SLOG(LOG_DEBUG, TAG_STTD, "<<<< Send speech status message : uid(%u), status(%d)", uid, status);
                dbus_connection_flush(g_conn_sender);
        }
 
@@ -242,7 +242,7 @@ int sttdc_send_speech_status(int uid, int status)
        return 0;
 }
 
-int sttdc_send_result(int uid, int event, const char** data, int data_count, const char* result_msg)
+int sttdc_send_result(unsigned int uid, int event, const char** data, int data_count, const char* result_msg)
 {
        int pid = sttd_client_get_pid(uid);
        if (0 > pid) {
@@ -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(%u), event(%d), result count(%d) result id(%d)",
                uid, event, data_count, g_internal_result_id);
 
        msg = dbus_message_new_signal(
@@ -276,7 +276,7 @@ int sttdc_send_result(int uid, int event, const char** data, int data_count, con
        dbus_message_iter_init_append(msg, &args);
 
        /* Append uid & type */
-       dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &uid);
+       dbus_message_iter_append_basic(&args, DBUS_TYPE_UINT32, &uid);
 
        char* msg_temp;
        dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &event);
@@ -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");
@@ -348,7 +348,7 @@ int sttdc_send_result(int uid, int event, const char** data, int data_count, con
        return 0;
 }
 
-int sttdc_send_error_signal(int uid, int reason, const char *err_msg)
+int sttdc_send_error_signal(unsigned int uid, int reason, const char *err_msg)
 {
        int pid = sttd_client_get_pid(uid);
        if (0 > pid) {
@@ -375,7 +375,7 @@ int sttdc_send_error_signal(int uid, int reason, const char *err_msg)
        }
 
        dbus_message_append_args(msg,
-               DBUS_TYPE_INT32, &uid,
+               DBUS_TYPE_UINT32, &uid,
                DBUS_TYPE_INT32, &reason,
                DBUS_TYPE_STRING, &err_msg,
                DBUS_TYPE_INVALID);
@@ -383,7 +383,7 @@ int sttdc_send_error_signal(int uid, int reason, const char *err_msg)
        if (!dbus_connection_send(g_conn_sender, msg, NULL)) {
                SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] <<<< error message : Out Of Memory !");
        } else {
-               SLOG(LOG_DEBUG, TAG_STTD, "<<<< Send error message : uid(%d), reason(%d), err_msg(%s)", uid, reason, (NULL == err_msg) ? "NULL" : err_msg);
+               SLOG(LOG_ERROR, TAG_STTD, "<<<< Send error message : uid(%u), reason(%d), err_msg(%s)", uid, reason, (NULL == err_msg) ? "NULL" : err_msg);
                dbus_connection_flush(g_conn_sender);
        }
 
@@ -400,84 +400,98 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle
 
        dbus_connection_read_write_dispatch(g_conn_listener, 50);
 
-       DBusMessage* msg = NULL;
-       msg = dbus_connection_pop_message(g_conn_listener);
+       while(1) {
+               DBusMessage* msg = NULL;
+               msg = dbus_connection_pop_message(g_conn_listener);
 
-       if (true != dbus_connection_get_is_connected(g_conn_listener)) {
-               SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Connection is disconnected");
-               return ECORE_CALLBACK_RENEW;
-       }
+               if (true != dbus_connection_get_is_connected(g_conn_listener)) {
+                       SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Connection is disconnected");
+                       return ECORE_CALLBACK_RENEW;
+               }
 
-       /* loop again if we haven't read a message */
-       if (NULL == msg) {
-               return ECORE_CALLBACK_RENEW;
-       }
+               /* loop again if we haven't read a message */
+               if (NULL == msg) {
+                       return ECORE_CALLBACK_RENEW;
+               }
 
-       SLOG(LOG_DEBUG, TAG_STTD, "[Dbus info] service name: %s, service object: %s, service interface: %s", (NULL == g_server_service_name) ? "NULL" : g_server_service_name,
-                       (NULL == g_server_service_object) ? "NULL" : g_server_service_object, (NULL == g_server_service_interface) ? "NULL" : g_server_service_interface);
+               SLOG(LOG_DEBUG, TAG_STTD, "[Dbus info] service name: %s, service object: %s, service interface: %s", (NULL == g_server_service_name) ? "NULL" : g_server_service_name,
+                               (NULL == g_server_service_object) ? "NULL" : g_server_service_object, (NULL == g_server_service_interface) ? "NULL" : g_server_service_interface);
 
-       /* client event */
-       if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_HELLO))
-               sttd_dbus_server_hello(g_conn_listener, msg);
+               /* client event */
+               if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_HELLO))
+                       sttd_dbus_server_hello(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_INITIALIZE))
-               sttd_dbus_server_initialize(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_INITIALIZE))
+                       sttd_dbus_server_initialize(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_FINALIZE))
-               sttd_dbus_server_finalize(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_FINALIZE))
+                       sttd_dbus_server_finalize(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_SET_CURRENT_ENGINE))
-               sttd_dbus_server_set_current_engine(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_SET_CURRENT_ENGINE))
+                       sttd_dbus_server_set_current_engine(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_CHECK_APP_AGREED))
-               sttd_dbus_server_check_app_agreed(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_CHECK_APP_AGREED))
+                       sttd_dbus_server_check_app_agreed(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_GET_SUPPORT_LANGS))
-               sttd_dbus_server_get_support_lang(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_GET_SUPPORT_LANGS))
+                       sttd_dbus_server_get_support_lang(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_GET_CURRENT_LANG))
-               sttd_dbus_server_get_default_lang(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_GET_CURRENT_LANG))
+                       sttd_dbus_server_get_default_lang(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_SET_PRIVATE_DATA))
-               sttd_dbus_server_set_private_data(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_SET_PRIVATE_DATA))
+                       sttd_dbus_server_set_private_data(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_GET_PRIVATE_DATA))
-               sttd_dbus_server_get_private_data(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_GET_PRIVATE_DATA))
+                       sttd_dbus_server_get_private_data(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_IS_TYPE_SUPPORTED))
-               sttd_dbus_server_is_recognition_type_supported(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_IS_TYPE_SUPPORTED))
+                       sttd_dbus_server_is_recognition_type_supported(g_conn_listener, msg);
 
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_GET_AUDIO_FORMAT))
+                       sttd_dbus_server_get_audio_format(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_SET_START_SOUND))
-               sttd_dbus_server_set_start_sound(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_UNSET_START_SOUND))
-               sttd_dbus_server_unset_start_sound(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_SET_START_SOUND))
+                       sttd_dbus_server_set_start_sound(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_SET_STOP_SOUND))
-               sttd_dbus_server_set_stop_sound(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_UNSET_START_SOUND))
+                       sttd_dbus_server_unset_start_sound(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_UNSET_STOP_SOUND))
-               sttd_dbus_server_unset_stop_sound(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_SET_STOP_SOUND))
+                       sttd_dbus_server_set_stop_sound(g_conn_listener, msg);
 
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_UNSET_STOP_SOUND))
+                       sttd_dbus_server_unset_stop_sound(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_START))
-               sttd_dbus_server_start(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_STOP))
-               sttd_dbus_server_stop(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_START))
+                       sttd_dbus_server_start(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_CANCEL))
-               sttd_dbus_server_cancel(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_STOP))
+                       sttd_dbus_server_stop(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_START_FILE))
-               sttd_dbus_server_start_file(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_START_AUDIO_STREAMING))
+                       sttd_dbus_server_start_audio_streaming(g_conn_listener, msg);
 
-       else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_CANCEL_FILE))
-               sttd_dbus_server_cancel_file(g_conn_listener, msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_SEND_AUDIO_STREAMING))
+                       sttd_dbus_server_send_audio_streaming(g_conn_listener, msg);
 
-       /* free the message */
-       dbus_message_unref(msg);
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_STOP_AUDIO_STREAMING))
+                       sttd_dbus_server_stop_audio_streaming(g_conn_listener, msg);
+
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_CANCEL))
+                       sttd_dbus_server_cancel(g_conn_listener, msg);
+
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_START_FILE))
+                       sttd_dbus_server_start_file(g_conn_listener, msg);
+
+               else if (dbus_message_is_method_call(msg, g_server_service_interface, STT_METHOD_CANCEL_FILE))
+                       sttd_dbus_server_cancel_file(g_conn_listener, msg);
+
+               /* free the message */
+               dbus_message_unref(msg);
+       }
 
        return ECORE_CALLBACK_RENEW;
 }
@@ -504,14 +518,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 +593,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();
 
@@ -652,6 +669,13 @@ int __sttd_request_custom_dbus_name()
                return STTD_ERROR_OPERATION_FAILED;
        }
 
+       if (NULL == g_conn_custom) {
+               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);
+
        int ret = dbus_bus_request_name(g_conn_custom, STT_SERVER_CUSTOM_SERVICE_NAME, DBUS_NAME_FLAG_REPLACE_EXISTING, &err);
        if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) {
                SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to be primary owner");
@@ -675,6 +699,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, "==");
@@ -700,6 +725,8 @@ int sttd_dbus_open_connection()
                return STTD_ERROR_OPERATION_FAILED;
        }
 
+       dbus_connection_set_exit_on_disconnect(g_conn_sender, false);
+
        /* connect to the bus and check for errors */
        g_conn_listener = dbus_bus_get_private(DBUS_BUS_SESSION, &err);
 
@@ -714,6 +741,8 @@ int sttd_dbus_open_connection()
                return STTD_ERROR_OPERATION_FAILED;
        }
 
+       dbus_connection_set_exit_on_disconnect(g_conn_listener, false);
+
        /* Get buxton key */
        ret = __sttd_get_buxtonkey();
        if (0 != ret) {
@@ -748,6 +777,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);
Domain: UI Framework / Voice;