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]);
}
}
return STT_ERROR_OPERATION_FAILED;
}
+ 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];
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();
} 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);
}
}
result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_short_time, &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);
}
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);
}
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) {
}
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);
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);
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);
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) {
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) {
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) {
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) {
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) {
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) {
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) {
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) {
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) {
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) {
/* 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) {
/* 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) {
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) {
/* 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) {
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) {