X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=server%2Fsttd_dbus.c;h=c234977ccce0cf22194edc053e948d0c57713742;hb=e6e5e98c676315c8d51c52b643617d285b476f7d;hp=5eff86c18ebf46821d7e3e3098315394b7bcda93;hpb=e286689424dc343fc0c9d7c789c77b79dd3e7b6e;p=platform%2Fcore%2Fuifw%2Fstt.git diff --git a/server/sttd_dbus.c b/server/sttd_dbus.c index 5eff86c..c234977 100644 --- a/server/sttd_dbus.c +++ b/server/sttd_dbus.c @@ -26,6 +26,7 @@ static DBusConnection* g_conn_sender = NULL; static DBusConnection* g_conn_listener = NULL; +static DBusConnection* g_conn_custom = NULL; static Ecore_Fd_Handler* g_dbus_fd_handler = NULL; @@ -197,6 +198,50 @@ int sttdc_send_set_state(int uid, int state) return 0; } +int sttdc_send_speech_status(int uid, int status) +{ + int pid = sttd_client_get_pid(uid); + + if (0 > pid) { + SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] pid is NOT valid"); + return -1; + } + + char service_name[64]; + memset(service_name, 0, 64); + snprintf(service_name, 64, "%s%d", STT_CLIENT_SERVICE_NAME, pid); + + char target_if_name[128]; + snprintf(target_if_name, sizeof(target_if_name), "%s%d", STT_CLIENT_SERVICE_INTERFACE, pid); + + DBusMessage* msg = NULL; + msg = dbus_message_new_signal( + STT_CLIENT_SERVICE_OBJECT_PATH, /* object name of the signal */ + target_if_name, /* interface name of the signal */ + STTD_METHOD_SPEECH_STATUS); /* name of the signal */ + + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to create message"); + return -1; + } + + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &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); + dbus_connection_flush(g_conn_sender); + } + + dbus_message_unref(msg); + + return 0; +} + int sttdc_send_result(int uid, int event, const char** data, int data_count, const char* result_msg) { int pid = sttd_client_get_pid(uid); @@ -214,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( @@ -270,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"); @@ -305,11 +350,6 @@ int sttdc_send_result(int uid, int event, const char** data, int data_count, con int sttdc_send_error_signal(int uid, int reason, const char *err_msg) { - if (NULL == err_msg) { - SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Input parameter is NULL"); - return STTD_ERROR_INVALID_PARAMETER; - } - int pid = sttd_client_get_pid(uid); if (0 > pid) { SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] pid is NOT valid"); @@ -430,6 +470,11 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle 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); @@ -455,6 +500,25 @@ void __sttd_dbus_service_free() } } +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; + } +} + int __sttd_get_buxtonkey() { /* request our name on the bus and check for errors */ @@ -515,24 +579,30 @@ 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(); - if (NULL == engine_appid || NULL == engine_default || 0 == strncmp(engine_appid, engine_default, strlen(engine_appid))) { + if (NULL == engine_default || 0 == strncmp(engine_appid, engine_default, strlen(engine_appid))) { g_server_service_name = (char*)calloc(strlen(STT_SERVER_SERVICE_NAME) + 1, sizeof(char)); - snprintf(g_server_service_name, strlen(STT_SERVER_SERVICE_NAME) + 1, "%s", STT_SERVER_SERVICE_NAME); + if (g_server_service_name) + snprintf(g_server_service_name, strlen(STT_SERVER_SERVICE_NAME) + 1, "%s", STT_SERVER_SERVICE_NAME); g_server_service_object = (char*)calloc(strlen(STT_SERVER_SERVICE_OBJECT_PATH) + 1, sizeof(char)); - snprintf(g_server_service_object, strlen(STT_SERVER_SERVICE_OBJECT_PATH) + 1, "%s", STT_SERVER_SERVICE_OBJECT_PATH); + if (g_server_service_object) + snprintf(g_server_service_object, strlen(STT_SERVER_SERVICE_OBJECT_PATH) + 1, "%s", STT_SERVER_SERVICE_OBJECT_PATH); g_server_service_interface = (char*)calloc(strlen(STT_SERVER_SERVICE_INTERFACE) + 1, sizeof(char)); - snprintf(g_server_service_interface, strlen(STT_SERVER_SERVICE_INTERFACE) + 1, "%s", STT_SERVER_SERVICE_INTERFACE); + if (g_server_service_interface) + snprintf(g_server_service_interface, strlen(STT_SERVER_SERVICE_INTERFACE) + 1, "%s", STT_SERVER_SERVICE_INTERFACE); } else { g_server_service_name = (char*)calloc(strlen(STT_SERVER_SERVICE_NAME) + strlen(engine_appid) - 8, sizeof(char)); - snprintf(g_server_service_name, strlen(STT_SERVER_SERVICE_NAME) + strlen(engine_appid) - 8, "%s%s%s", STT_SERVER_SERVICE_NAME, ".", (engine_appid + 10)); + if (g_server_service_name) + snprintf(g_server_service_name, strlen(STT_SERVER_SERVICE_NAME) + strlen(engine_appid) - 8, "%s%s%s", STT_SERVER_SERVICE_NAME, ".", (engine_appid + 10)); g_server_service_object = (char*)calloc(strlen(STT_SERVER_SERVICE_OBJECT_PATH) + strlen(engine_appid) - 8, sizeof(char)); - snprintf(g_server_service_object, strlen(STT_SERVER_SERVICE_OBJECT_PATH) + strlen(engine_appid) - 8, "%s%s%s", STT_SERVER_SERVICE_OBJECT_PATH, "/", (engine_appid + 10)); + if (g_server_service_object) + snprintf(g_server_service_object, strlen(STT_SERVER_SERVICE_OBJECT_PATH) + strlen(engine_appid) - 8, "%s%s%s", STT_SERVER_SERVICE_OBJECT_PATH, "/", (engine_appid + 10)); g_server_service_interface = (char*)calloc(strlen(STT_SERVER_SERVICE_INTERFACE) + strlen(engine_appid) - 8, sizeof(char)); - snprintf(g_server_service_interface, strlen(STT_SERVER_SERVICE_INTERFACE) + strlen(engine_appid) - 8, "%s%s%s", STT_SERVER_SERVICE_INTERFACE, ".", (engine_appid + 10)); + if (g_server_service_interface) + snprintf(g_server_service_interface, strlen(STT_SERVER_SERVICE_INTERFACE) + strlen(engine_appid) - 8, "%s%s%s", STT_SERVER_SERVICE_INTERFACE, ".", (engine_appid + 10)); } if (NULL == g_server_service_name || NULL == g_server_service_object || NULL == g_server_service_interface) { @@ -544,11 +614,13 @@ int __sttd_get_buxtonkey() bux_cli = NULL; bux_layer = NULL; bux_val = NULL; + + __sttd_dbus_service_free(); return STTD_ERROR_OPERATION_FAILED; } char* ret_char = strchr(g_server_service_interface, '-'); - while(NULL != ret_char) { + while (NULL != ret_char) { ret_char[0] = '_'; ret_char = strchr(g_server_service_interface, '-'); } @@ -571,7 +643,6 @@ int __sttd_get_buxtonkey() int __sttd_request_custom_dbus_name() { - static DBusConnection* g_conn_custom = NULL; DBusError err; dbus_error_init(&err); @@ -580,18 +651,28 @@ int __sttd_request_custom_dbus_name() if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail dbus_bus_get : %s", err.message); dbus_error_free(&err); + __sttd_dbus_connection_free(); + 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"); + __sttd_dbus_connection_free(); return STTD_ERROR_OPERATION_FAILED; } if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_request_name() : %s", err.message); dbus_error_free(&err); + __sttd_dbus_connection_free(); return STTD_ERROR_OPERATION_FAILED; } @@ -599,6 +680,7 @@ int __sttd_request_custom_dbus_name() if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_release_name() : %s", err.message); dbus_error_free(&err); + __sttd_dbus_connection_free(); return STTD_ERROR_OPERATION_FAILED; } @@ -629,6 +711,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); @@ -639,19 +723,26 @@ int sttd_dbus_open_connection() if (NULL == g_conn_listener) { SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to get dbus connection"); + __sttd_dbus_connection_free(); 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) { SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to get buxton key"); + __sttd_dbus_service_free(); + __sttd_dbus_connection_free(); return ret; } ret = __sttd_request_custom_dbus_name(); if (0 != ret) { SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to request custom dbus name"); + __sttd_dbus_service_free(); + __sttd_dbus_connection_free(); return ret; } @@ -659,15 +750,24 @@ int sttd_dbus_open_connection() if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) { SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to be primary owner"); + __sttd_dbus_service_free(); + __sttd_dbus_connection_free(); return STTD_ERROR_OPERATION_FAILED; } if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_request_name() : %s", err.message); dbus_error_free(&err); + __sttd_dbus_service_free(); + __sttd_dbus_connection_free(); 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); @@ -679,6 +779,8 @@ int sttd_dbus_open_connection() if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_add_match() : %s", err.message); dbus_error_free(&err); + __sttd_dbus_service_free(); + __sttd_dbus_connection_free(); return STTD_ERROR_OPERATION_FAILED; } @@ -688,6 +790,8 @@ int sttd_dbus_open_connection() g_dbus_fd_handler = ecore_main_fd_handler_add(fd, ECORE_FD_READ, (Ecore_Fd_Cb)listener_event_callback, g_conn_listener, NULL, NULL); if (NULL == g_dbus_fd_handler) { SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to get fd handler"); + __sttd_dbus_service_free(); + __sttd_dbus_connection_free(); return STTD_ERROR_OPERATION_FAILED; } @@ -704,22 +808,15 @@ int sttd_dbus_close_connection() g_dbus_fd_handler = NULL; } - dbus_bus_release_name(g_conn_listener, g_server_service_name, &err); - - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_release_name() : %s", err.message); - dbus_error_free(&err); + if (NULL != g_conn_listener) { + dbus_bus_release_name(g_conn_listener, g_server_service_name, &err); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_release_name() : %s", err.message); + dbus_error_free(&err); + } } - dbus_connection_close(g_conn_listener); - dbus_connection_close(g_conn_sender); - - dbus_connection_unref(g_conn_sender); - dbus_connection_unref(g_conn_listener); - - g_conn_listener = NULL; - g_conn_sender = NULL; - + __sttd_dbus_connection_free(); __sttd_dbus_service_free(); SLOG(LOG_DEBUG, TAG_STTD, "[Server] Close dbus connection");