X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=client%2Fstt_dbus.c;h=a70726408ab5a2373b2930fc8e9496d0b25c0cda;hb=e6e5e98c676315c8d51c52b643617d285b476f7d;hp=97b726bedf24b654d5cc7d2b97a42c2f821ce6f1;hpb=d50507f811d00cb3e1b0a503ee89f3f1aff3dcac;p=platform%2Fcore%2Fuifw%2Fstt.git diff --git a/client/stt_dbus.c b/client/stt_dbus.c index 97b726b..a707264 100644 --- a/client/stt_dbus.c +++ b/client/stt_dbus.c @@ -543,7 +543,7 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle if (NULL != temp_char) { temp_result[i] = strdup(temp_char); - SLOG(LOG_DEBUG, TAG_STTC, "result[%d] : %s", i, temp_result[i]); + SECURE_SLOG(LOG_DEBUG, TAG_STTC, "result[%d] : %s", i, temp_result[i]); } } @@ -652,10 +652,12 @@ static void __stt_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; } } @@ -705,6 +707,8 @@ int stt_dbus_open_connection() dbus_connection_set_exit_on_disconnect(g_conn_listener, false); + dbus_connection_set_exit_on_disconnect(g_conn_listener, false); + int pid = getpid(); char service_name[64]; @@ -764,16 +768,18 @@ int stt_dbus_close_connection() g_fd_handler = NULL; } - int pid = getpid(); + if (NULL != g_conn_listener) { + int pid = getpid(); - char service_name[64]; - memset(service_name, '\0', 64); - snprintf(service_name, 64, "%s%d", STT_CLIENT_SERVICE_NAME, pid); + char service_name[64]; + memset(service_name, '\0', 64); + snprintf(service_name, 64, "%s%d", STT_CLIENT_SERVICE_NAME, pid); - dbus_bus_release_name(g_conn_listener, service_name, &err); - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Release name Error (%s)", err.message); - dbus_error_free(&err); + dbus_bus_release_name(g_conn_listener, service_name, &err); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Release name Error (%s)", err.message); + dbus_error_free(&err); + } } __stt_dbus_connection_free(); @@ -900,9 +906,9 @@ int stt_dbus_request_hello(int uid) } else { SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] dbus: is_exist: False"); msg = dbus_message_new_method_call( - STT_SERVER_CUSTOM_SERVICE_NAME, - STT_SERVER_CUSTOM_SERVICE_OBJECT_PATH, - STT_SERVER_CUSTOM_SERVICE_INTERFACE, + STT_SERVER_CUSTOM_SERVICE_NAME, + STT_SERVER_CUSTOM_SERVICE_OBJECT_PATH, + STT_SERVER_CUSTOM_SERVICE_INTERFACE, STT_METHOD_HELLO); } } @@ -917,9 +923,10 @@ int stt_dbus_request_hello(int uid) } if (g_conn_sender) { - result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_short_time, &err); + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, -1, &err); dbus_message_unref(msg); if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get arguments error (%s)", err.message); dbus_error_free(&err); } @@ -1009,17 +1016,26 @@ int stt_dbus_request_initialize(int uid, bool* silence_supported, bool* credenti SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt initialize : result = %d, silence(%d), credential(%d)", result, *silence_supported, *credential_needed); - /* add a rule for daemon error */ - char rule_err[256] = {0, }; - snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface); - dbus_bus_add_match(g_conn_listener, rule_err, &err); - dbus_connection_flush(g_conn_listener); - - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message); - dbus_error_free(&err); + stt_client_s* client = stt_client_get_by_uid(uid); + if (NULL == client) { + SLOG(LOG_ERROR, TAG_STTC, "Fail to get STT client"); return STT_ERROR_OPERATION_FAILED; } + + if (STT_ERROR_SERVICE_RESET != client->reason) { + /* add a rule for daemon error */ + char rule_err[256] = {0, }; + + snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface); + dbus_bus_add_match(g_conn_listener, rule_err, &err); + dbus_connection_flush(g_conn_listener); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message); + dbus_error_free(&err); + return STT_ERROR_OPERATION_FAILED; + } + } } else { SLOG(LOG_ERROR, TAG_STTC, "<<<< stt initialize : result = %d", result); } @@ -1058,9 +1074,9 @@ int stt_dbus_request_finalize(int uid) SLOG(LOG_DEBUG, TAG_STTC, "[dbus_info] service name: %s, service object: %s, service interface: %s", g_server_service_name, g_server_service_object, g_server_service_interface); msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_FINALIZE); if (NULL == msg) { @@ -1083,7 +1099,7 @@ int stt_dbus_request_finalize(int uid) } if (NULL != result_msg) { - dbus_message_get_args(result_msg, &err, + dbus_message_get_args(result_msg, &err, DBUS_TYPE_INT32, &result, DBUS_TYPE_INVALID); @@ -1114,9 +1130,9 @@ int stt_dbus_request_set_current_engine(int uid, const char* engine_id, bool* si DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_SET_CURRENT_ENGINE); @@ -1149,8 +1165,8 @@ int stt_dbus_request_set_current_engine(int uid, const char* engine_id, bool* si int int_silence_supported = 0; int int_credential_needed = 0; - dbus_message_get_args(result_msg, &err, - DBUS_TYPE_INT32, &result, + dbus_message_get_args(result_msg, &err, + DBUS_TYPE_INT32, &result, DBUS_TYPE_INT32, &int_silence_supported, DBUS_TYPE_INT32, &int_credential_needed, DBUS_TYPE_INVALID); @@ -1191,9 +1207,9 @@ int stt_dbus_request_check_app_agreed(int uid, const char* appid, bool* value) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_CHECK_APP_AGREED); if (NULL == msg) { @@ -1260,9 +1276,9 @@ int stt_dbus_request_get_support_langs(int uid, stt_h stt, stt_supported_languag DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_GET_SUPPORT_LANGS); if (NULL == msg) { @@ -1345,9 +1361,9 @@ int stt_dbus_request_get_default_lang(int uid, char** language) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_GET_CURRENT_LANG); if (NULL == msg) { @@ -1413,9 +1429,9 @@ int stt_dbus_request_set_private_data(int uid, const char* key, const char* data DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_SET_PRIVATE_DATA); if (NULL == msg) { @@ -1483,9 +1499,9 @@ int stt_dbus_request_get_private_data(int uid, const char* key, char** data) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_GET_PRIVATE_DATA); if (NULL == msg) { @@ -1559,9 +1575,9 @@ int stt_dbus_request_is_recognition_type_supported(int uid, const char* type, bo DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_IS_TYPE_SUPPORTED); if (NULL == msg) { @@ -1628,9 +1644,9 @@ int stt_dbus_request_set_start_sound(int uid, const char* file) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_SET_START_SOUND); if (NULL == msg) { @@ -1689,9 +1705,9 @@ int stt_dbus_request_unset_start_sound(int uid) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_UNSET_START_SOUND); if (NULL == msg) { @@ -1754,9 +1770,9 @@ int stt_dbus_request_set_stop_sound(int uid, const char* file) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_SET_STOP_SOUND); if (NULL == msg) { @@ -1815,9 +1831,9 @@ int stt_dbus_request_unset_stop_sound(int uid) DBusMessage* msg; msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_UNSET_STOP_SOUND); if (NULL == msg) { @@ -1881,9 +1897,9 @@ int stt_dbus_request_start(int uid, const char* lang, const char* type, int sile /* create a signal & check for errors */ msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_START); if (NULL == msg) { @@ -1986,9 +2002,9 @@ int stt_dbus_request_stop(int uid) /* create a signal & check for errors */ msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_STOP); if (NULL == msg) { @@ -1998,8 +2014,8 @@ int stt_dbus_request_stop(int uid) SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt stop : uid(%d)", uid); } - dbus_message_append_args(msg, - DBUS_TYPE_INT32, &uid, + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); #if 1 if (g_conn_sender) { @@ -2066,9 +2082,9 @@ int stt_dbus_request_cancel(int uid) /* create a signal & check for errors */ msg = dbus_message_new_method_call( - g_server_service_name, - g_server_service_object, - g_server_service_interface, + g_server_service_name, + g_server_service_object, + g_server_service_interface, STT_METHOD_CANCEL); if (NULL == msg) { @@ -2078,8 +2094,8 @@ int stt_dbus_request_cancel(int uid) SLOG(LOG_DEBUG, TAG_STTC, ">>>> stt cancel : uid(%d)", uid); } - dbus_message_append_args(msg, - DBUS_TYPE_INT32, &uid, + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID); #if 1 if (g_conn_sender) {