X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=client%2Fvc_dbus.c;h=fb2af05269d71ea4862dc1ad139aa587993d140f;hb=0fb10008f3dcdc16a5937afb3d918d40749eae7c;hp=feffd98ad1ef82e0da21d52545f68feef5b732f9;hpb=2e9d814f00d2b868f3a6aace8fed1e9213121134;p=platform%2Fcore%2Fuifw%2Fvoice-control.git diff --git a/client/vc_dbus.c b/client/vc_dbus.c index feffd98..fb2af05 100644 --- a/client/vc_dbus.c +++ b/client/vc_dbus.c @@ -14,8 +14,7 @@ * limitations under the License. */ - -#include "vc_client.h" +#include "vc_command.h" #include "vc_dbus.h" #include "vc_main.h" @@ -35,7 +34,7 @@ extern int __vc_cb_service_state(int state); extern int __vc_cb_manager_pid(int manager_pid); - +//LCOV_EXCL_START static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handler) { if (NULL == g_conn_listener) return ECORE_CALLBACK_RENEW; @@ -58,7 +57,7 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle snprintf(if_name, 64, "%s", VC_CLIENT_SERVICE_INTERFACE); if (dbus_message_is_method_call(msg, if_name, VCD_METHOD_HELLO)) { - SLOG(LOG_DEBUG, TAG_VCC, "===== Get Hello"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Get Hello"); int pid = 0; int response = -1; @@ -70,10 +69,10 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle } if (pid > 0) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc get hello : pid(%d) ", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc get hello : pid(%d) ", pid); response = 1; } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc get hello : invalid pid "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc get hello : invalid pid "); } DBusMessage* reply = NULL; @@ -83,18 +82,17 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle dbus_message_append_args(reply, DBUS_TYPE_INT32, &response, DBUS_TYPE_INVALID); if (!dbus_connection_send(g_conn_listener, reply, NULL)) - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc get hello : fail to send reply"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc get hello : fail to send reply"); else - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc get hello : result(%d)", response); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc get hello : result(%d)", response); dbus_connection_flush(g_conn_listener); dbus_message_unref(reply); } else { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc get hello : fail to create reply message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc get hello : fail to create reply message"); } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); } /* VCD_METHOD_HELLO */ else if (dbus_message_is_signal(msg, if_name, VCD_METHOD_SET_SERVICE_STATE)) { @@ -106,19 +104,18 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle dbus_error_free(&err); } - SLOG(LOG_DEBUG, TAG_VCC, "<<<< state changed : %d", state); + SLOG(LOG_DEBUG, TAG_VCC, "@@ state changed : %d", state); __vc_cb_service_state(state); } /* VCD_METHOD_SET_SERVICE_STATE */ else if (dbus_message_is_method_call(msg, if_name, VCD_METHOD_RESULT)) { - SLOG(LOG_DEBUG, TAG_VCC, "===== Get Client Result"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Get Client Result"); __vc_cb_result(); - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); } /* VCD_METHOD_RESULT */ else if (dbus_message_is_signal(msg, if_name, VCD_METHOD_SEND_MANAGER_PID)) { @@ -130,14 +127,14 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle dbus_error_free(&err); } - SLOG(LOG_DEBUG, TAG_VCC, "<<<< manager pid is changed : %d", manager_pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ manager pid is changed : %d", manager_pid); __vc_cb_manager_pid(manager_pid); } /* VCD_METHOD_SEND_MANAGER_PID */ else if (dbus_message_is_signal(msg, if_name, VCD_METHOD_ERROR)) { - SLOG(LOG_DEBUG, TAG_VCC, "===== Get Error"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Get Error"); int reason; int daemon_pid; char* err_msg; @@ -149,17 +146,35 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc Get Error message : Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc Get Error message : Get arguments error (%s)", err.message); dbus_error_free(&err); } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc Get Error message : reason(%d), daemon_pid(%d), msg(%s)", reason, daemon_pid, err_msg); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc Get Error message : reason(%d), daemon_pid(%d), msg(%s)", reason, daemon_pid, err_msg); __vc_cb_error(reason, daemon_pid, err_msg); } - SLOG(LOG_DEBUG, TAG_VCC, "====="); - SLOG(LOG_DEBUG, TAG_VCC, " "); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); } /* VCD_METHOD_ERROR */ + else if (dbus_message_is_signal(msg, "org.freedesktop.DBus", "NameOwnerChanged")) { + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Owner Changed"); + DBusError err; + dbus_error_init(&err); + /* remove 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'", VC_SERVER_SERVICE_INTERFACE); + dbus_bus_remove_match(g_conn_listener, rule_err, &err); + dbus_connection_flush(g_conn_listener); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_VCC, "Match Error (%s)", err.message); + dbus_error_free(&err); + } + + __vc_cb_error(VC_ERROR_SERVICE_RESET, -1, "Daemon Reset"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + } /* NameOwnerChanged */ + else { SLOG(LOG_DEBUG, TAG_VCC, "Message is NOT valid"); dbus_message_unref(msg); @@ -172,45 +187,65 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle return ECORE_CALLBACK_PASS_ON; } +//LCOV_EXCL_STOP + +static void __vc_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; + } +} int vc_dbus_open_connection() { if (NULL != g_conn_sender && NULL != g_conn_listener) { - SLOG(LOG_WARN, TAG_VCC, "already existed connection "); + SLOG(LOG_WARN, TAG_VCC, "already existed connection "); //LCOV_EXCL_LINE return 0; } DBusError err; int ret; - /* initialise the error value */ + /* initialize the error value */ dbus_error_init(&err); /* connect to the DBUS system bus, and check for errors */ g_conn_sender = dbus_bus_get_private(DBUS_BUS_SESSION, &err); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "Dbus Connection Error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "Dbus Connection Error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); } if (NULL == g_conn_sender) { - SLOG(LOG_ERROR, TAG_VCC, "Fail to get dbus connection "); + SLOG(LOG_ERROR, TAG_VCC, "Fail to get dbus connection "); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } + dbus_connection_set_exit_on_disconnect(g_conn_sender, false); + g_conn_listener = dbus_bus_get_private(DBUS_BUS_SESSION, &err); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "Dbus Connection Error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "Dbus Connection Error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); } if (NULL == g_conn_listener) { - SLOG(LOG_ERROR, TAG_VCC, "Fail to get dbus connection "); + SLOG(LOG_ERROR, TAG_VCC, "Fail to get dbus connection "); //LCOV_EXCL_LINE + __vc_dbus_connection_free(); return VC_ERROR_OPERATION_FAILED; } + dbus_connection_set_exit_on_disconnect(g_conn_listener, false); + int pid = getpid(); char service_name[64]; @@ -223,36 +258,39 @@ int vc_dbus_open_connection() ret = dbus_bus_request_name(g_conn_listener, service_name, DBUS_NAME_FLAG_REPLACE_EXISTING, &err); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "Name Error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "Name Error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); } if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) { - SLOG(LOG_ERROR, TAG_VCC, "fail dbus_bus_request_name()"); + SLOG(LOG_ERROR, TAG_VCC, "fail dbus_bus_request_name()"); //LCOV_EXCL_LINE + __vc_dbus_connection_free(); return -2; } if (NULL != g_fd_handler) { - SLOG(LOG_WARN, TAG_VCC, "The handler already exists."); + SLOG(LOG_WARN, TAG_VCC, "The handler already exists."); //LCOV_EXCL_LINE + __vc_dbus_connection_free(); return 0; } - char rule[128] = {0, }; - snprintf(rule, 128, "type='signal',interface='%s'", VC_CLIENT_SERVICE_INTERFACE); + char rule[256] = {0, }; + snprintf(rule, 256, "type='signal',interface='%s'", VC_CLIENT_SERVICE_INTERFACE); /* add a rule for which messages we want to see */ dbus_bus_add_match(g_conn_listener, rule, &err); - dbus_connection_flush(g_conn_listener); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "Match Error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "Match Error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); + __vc_dbus_connection_free(); return VC_ERROR_OPERATION_FAILED; } int fd = 0; if (1 != dbus_connection_get_unix_fd(g_conn_listener, &fd)) { - SLOG(LOG_ERROR, TAG_VCC, "fail to get fd from dbus "); + SLOG(LOG_ERROR, TAG_VCC, "fail to get fd from dbus "); //LCOV_EXCL_LINE + __vc_dbus_connection_free(); return VC_ERROR_OPERATION_FAILED; } else { SLOG(LOG_DEBUG, TAG_VCC, "Get fd from dbus : %d", fd); @@ -260,7 +298,8 @@ int vc_dbus_open_connection() g_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_fd_handler) { - SLOG(LOG_ERROR, TAG_VCC, "fail to get fd handler from ecore "); + SLOG(LOG_ERROR, TAG_VCC, "fail to get fd handler from ecore "); //LCOV_EXCL_LINE + __vc_dbus_connection_free(); return VC_ERROR_OPERATION_FAILED; } @@ -277,47 +316,54 @@ int vc_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", VC_CLIENT_SERVICE_NAME, pid); + char service_name[64]; + memset(service_name, '\0', 64); + snprintf(service_name, 64, "%s%d", VC_CLIENT_SERVICE_NAME, pid); - dbus_bus_release_name(g_conn_listener, service_name, &err); + dbus_bus_release_name(g_conn_listener, service_name, &err); - if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); - dbus_error_free(&err); + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); //LCOV_EXCL_LINE + dbus_error_free(&err); + } } - dbus_connection_close(g_conn_sender); - dbus_connection_close(g_conn_listener); - - dbus_connection_unref(g_conn_sender); - dbus_connection_unref(g_conn_listener); - - g_conn_sender = NULL; - g_conn_listener = NULL; + __vc_dbus_connection_free(); return 0; } int vc_dbus_reconnect() { + if (!g_conn_sender || !g_conn_listener) { + vc_dbus_close_connection(); + + if (0 != vc_dbus_open_connection()) { + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to reconnect"); //LCOV_EXCL_LINE + return -1; + } + + SLOG(LOG_DEBUG, TAG_VCC, "[DBUS] Reconnect"); //LCOV_EXCL_LINE + return 0; + } + bool sender_connected = dbus_connection_get_is_connected(g_conn_sender); bool listener_connected = dbus_connection_get_is_connected(g_conn_listener); - SLOG(LOG_DEBUG, TAG_VCC, "[DBUS] Sender(%s) Listener(%s)", - sender_connected ? "Connected" : "Not connected", listener_connected ? "Connected" : "Not connected"); + SLOG(LOG_WARN, TAG_VCC, "[DBUS] Sender(%s) Listener(%s)", + sender_connected ? "Connected" : "Not connected", listener_connected ? "Connected" : "Not connected"); //LCOV_EXCL_LINE if (false == sender_connected || false == listener_connected) { vc_dbus_close_connection(); if (0 != vc_dbus_open_connection()) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to reconnect"); + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to reconnect"); //LCOV_EXCL_LINE return -1; } - SLOG(LOG_DEBUG, TAG_VCC, "[DBUS] Reconnect"); + SLOG(LOG_DEBUG, TAG_VCC, "[DBUS] Reconnect"); //LCOV_EXCL_LINE } return 0; @@ -326,7 +372,7 @@ int vc_dbus_reconnect() static int __dbus_check() { if (NULL == g_conn_sender) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] NULL connection"); + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] NULL connection"); //LCOV_EXCL_LINE return vc_dbus_reconnect(); } return 0; @@ -347,7 +393,7 @@ int vc_dbus_request_hello() VC_METHOD_HELLO); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> Request vc hello : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ Request vc hello : Fail to make message"); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } @@ -357,9 +403,10 @@ int vc_dbus_request_hello() DBusMessage* result_msg = NULL; int result = 0; - result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, 500, &err); + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, -1, &err); if (dbus_error_is_set(&err)) { + SLOG(LOG_DEBUG, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); } @@ -391,10 +438,10 @@ int vc_dbus_request_initialize(int pid, int* mgr_pid, int* service_state, int* d VC_METHOD_INITIALIZE); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc initialize : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc initialize : Fail to make message "); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc initialize : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc initialize : pid(%d)", pid); } dbus_message_append_args(msg, @@ -411,7 +458,7 @@ int vc_dbus_request_initialize(int pid, int* mgr_pid, int* service_state, int* d dbus_message_unref(msg); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); } @@ -427,7 +474,7 @@ int vc_dbus_request_initialize(int pid, int* mgr_pid, int* service_state, int* d DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } @@ -438,12 +485,23 @@ int vc_dbus_request_initialize(int pid, int* mgr_pid, int* service_state, int* d *mgr_pid = tmp; *service_state = tmp_service_state; *daemon_pid = tmp_daemon_pid; - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc initialize : result = %d mgr = %d service = %d daemon_pid = %d", result, *mgr_pid, *service_state, *daemon_pid); + + /* add a rule for daemon error */ + char rule[256] = {0, }; + snprintf(rule, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", VC_SERVER_SERVICE_INTERFACE); + dbus_bus_add_match(g_conn_listener, rule, &err); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_VCC, "Match Error (%s)", err.message); //LCOV_EXCL_LINE + dbus_error_free(&err); + } + + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc initialize : result = %d mgr = %d service = %d daemon_pid = %d", result, *mgr_pid, *service_state, *daemon_pid); //LCOV_EXCL_LINE } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc initialize : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc initialize : result = %d", result); //LCOV_EXCL_LINE } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL "); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL "); //LCOV_EXCL_LINE vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -453,10 +511,24 @@ int vc_dbus_request_initialize(int pid, int* mgr_pid, int* service_state, int* d int vc_dbus_request_finalize(int pid) { + DBusError err; + dbus_error_init(&err); + if (0 != __dbus_check()) { return VC_ERROR_OPERATION_FAILED; } + /* remove 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'", VC_SERVER_SERVICE_INTERFACE); + dbus_bus_remove_match(g_conn_listener, rule_err, &err); + dbus_connection_flush(g_conn_listener); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_VCC, "Match Error (%s)", err.message); //LCOV_EXCL_LINE + dbus_error_free(&err); + } + DBusMessage* msg; msg = dbus_message_new_method_call( @@ -466,17 +538,14 @@ int vc_dbus_request_finalize(int pid) VC_METHOD_FINALIZE); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc finalize : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc finalize : Fail to make message "); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc finalize : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc finalize : pid(%d)", pid); } dbus_message_append_args(msg, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INVALID); - DBusError err; - dbus_error_init(&err); - DBusMessage* result_msg; int result = VC_ERROR_OPERATION_FAILED; @@ -484,7 +553,7 @@ int vc_dbus_request_finalize(int pid) dbus_message_unref(msg); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); } @@ -494,7 +563,7 @@ int vc_dbus_request_finalize(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } @@ -502,12 +571,12 @@ int vc_dbus_request_finalize(int pid) dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc finalize : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc finalize : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc finalize : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc finalize : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL "); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL "); //LCOV_EXCL_LINE vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -515,6 +584,7 @@ int vc_dbus_request_finalize(int pid) return result; } +//LCOV_EXCL_START int vc_dbus_request_set_exclusive_command(int pid, bool value) { if (0 != __dbus_check()) { @@ -530,10 +600,10 @@ int vc_dbus_request_set_exclusive_command(int pid, bool value) VC_METHOD_SET_EXCLUSIVE_CMD); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc set exclusive command : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set exclusive command : Fail to make message"); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc set exclusive command : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set exclusive command : pid(%d)", pid); } int temp = value; @@ -553,7 +623,7 @@ int vc_dbus_request_set_exclusive_command(int pid, bool value) dbus_message_unref(msg); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); } @@ -563,25 +633,26 @@ int vc_dbus_request_set_exclusive_command(int pid, bool value) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc set exclusive command : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set exclusive command : result = %d", result); } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc set exclusive command : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set exclusive command : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL"); //LCOV_EXCL_LINE vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } return result; } +//LCOV_EXCL_STOP int vc_dbus_request_set_command(int pid, vc_cmd_type_e cmd_type) { @@ -598,10 +669,10 @@ int vc_dbus_request_set_command(int pid, vc_cmd_type_e cmd_type) VC_METHOD_SET_COMMAND); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc set command : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set command : Fail to make message"); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc set command : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set command : pid(%d)", pid); } dbus_message_append_args(msg, @@ -619,7 +690,7 @@ int vc_dbus_request_set_command(int pid, vc_cmd_type_e cmd_type) dbus_message_unref(msg); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); } @@ -629,19 +700,19 @@ int vc_dbus_request_set_command(int pid, vc_cmd_type_e cmd_type) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc set command : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set command : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc set command : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set command : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL"); //LCOV_EXCL_LINE vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -664,10 +735,10 @@ int vc_dbus_request_unset_command(int pid, vc_cmd_type_e cmd_type) VC_METHOD_UNSET_COMMAND); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc unset command : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc unset command : Fail to make message"); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc unset command : pid(%d), type(%d)", pid, cmd_type); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc unset command : pid(%d), type(%d)", pid, cmd_type); } dbus_message_append_args(msg, @@ -685,7 +756,7 @@ int vc_dbus_request_unset_command(int pid, vc_cmd_type_e cmd_type) dbus_message_unref(msg); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); } @@ -695,19 +766,19 @@ int vc_dbus_request_unset_command(int pid, vc_cmd_type_e cmd_type) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc unset command : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc unset command : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc unset command : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc unset command : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL"); //LCOV_EXCL_LINE vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -732,10 +803,10 @@ int vc_dbus_set_foreground(int pid, bool value) VCC_MANAGER_METHOD_SET_FOREGROUND); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc set foreground to manager : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set foreground to manager : Fail to make message"); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc set foreground to manager : client pid(%d), value(%s)", pid, tmp_value ? "true" : "false"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set foreground to manager : client pid(%d), value(%s)", pid, tmp_value ? "true" : "false"); } dbus_message_append_args(msg, @@ -744,7 +815,7 @@ int vc_dbus_set_foreground(int pid, bool value) DBUS_TYPE_INVALID); if (1 != dbus_connection_send(g_conn_sender, msg, NULL)) { - SLOG(LOG_ERROR, TAG_VCC, "[Dbus ERROR] Fail to Send"); + SLOG(LOG_ERROR, TAG_VCC, "[Dbus ERROR] Fail to Send"); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } @@ -758,10 +829,10 @@ int vc_dbus_set_foreground(int pid, bool value) VC_METHOD_SET_FOREGROUND); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc set foreground to daemon : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set foreground to daemon : Fail to make message"); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc set foreground to daemon : client pid(%d), value(%s)", pid, tmp_value ? "true" : "false"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set foreground to daemon : client pid(%d), value(%s)", pid, tmp_value ? "true" : "false"); } dbus_message_append_args(msg, @@ -772,7 +843,7 @@ int vc_dbus_set_foreground(int pid, bool value) dbus_message_set_no_reply(msg, TRUE); if (1 != dbus_connection_send(g_conn_sender, msg, NULL)) { - SLOG(LOG_ERROR, TAG_VCC, "[Dbus ERROR] Fail to Send"); + SLOG(LOG_ERROR, TAG_VCC, "[Dbus ERROR] Fail to Send"); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } @@ -783,7 +854,8 @@ int vc_dbus_set_foreground(int pid, bool value) return 0; } -int vc_dbus_request_dialog(int pid, const char* disp_text, const char* utt_text, bool continuous) +//LCOV_EXCL_START +int vc_dbus_set_server_dialog(int pid, const char* app_id, const char* credential) { if (NULL == g_conn_sender) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] NULL connection"); @@ -793,6 +865,76 @@ int vc_dbus_request_dialog(int pid, const char* disp_text, const char* utt_text, } DBusMessage* msg; + msg = dbus_message_new_method_call( + VC_SERVER_SERVICE_NAME, + VC_SERVER_SERVICE_OBJECT_PATH, + VC_SERVER_SERVICE_INTERFACE, + VC_METHOD_SET_SERVER_DIALOG); + + if (NULL == msg) { + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set server dialog : Fail to make message"); + return VC_ERROR_OPERATION_FAILED; + } else { + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set server dialog : pid(%d), app_id(%s)", pid, app_id); + } + + dbus_message_append_args(msg, + DBUS_TYPE_INT32, &pid, + DBUS_TYPE_STRING, &app_id, + DBUS_TYPE_STRING, &credential, + DBUS_TYPE_INVALID); + + DBusError err; + dbus_error_init(&err); + + DBusMessage* result_msg; + int result = VC_ERROR_OPERATION_FAILED; + + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_time, &err); + dbus_message_unref(msg); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); + dbus_error_free(&err); + } + + if (NULL != result_msg) { + dbus_message_get_args(result_msg, &err, + DBUS_TYPE_INT32, &result, + DBUS_TYPE_INVALID); + + if (dbus_error_is_set(&err)) { + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); + dbus_error_free(&err); + result = VC_ERROR_OPERATION_FAILED; + } + dbus_message_unref(result_msg); + + if (0 == result) { + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set server dialog : result = %d", result); + } else { + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set server dialog : result = %d", result); + } + } else { + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL"); + vc_dbus_reconnect(); + result = VC_ERROR_TIMED_OUT; + } + + return result; +} +//LCOV_EXCL_STOP + +int vc_dbus_request_dialog(int pid, const char* disp_text, const char* utt_text, bool continuous) +{ + if (NULL == g_conn_sender) { + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] NULL connection"); //LCOV_EXCL_LINE + if (0 != vc_dbus_reconnect()) { + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to reconnect"); //LCOV_EXCL_LINE + } + } + + DBusMessage* msg; int tmp_continue = 0; tmp_continue = (int)continuous; @@ -804,10 +946,10 @@ int vc_dbus_request_dialog(int pid, const char* disp_text, const char* utt_text, VC_METHOD_DIALOG); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc request dialog to manager : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc request dialog to manager : Fail to make message"); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc request dialog to manager : client pid(%d), disp_text(%s), utt_text(%s), continuous(%d)", getpid(), disp_text, utt_text, continuous); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc request dialog to manager : client pid(%d), disp_text(%s), utt_text(%s), continuous(%d)", getpid(), disp_text, utt_text, continuous); } dbus_message_append_args(msg, @@ -820,7 +962,7 @@ int vc_dbus_request_dialog(int pid, const char* disp_text, const char* utt_text, dbus_message_set_no_reply(msg, TRUE); if (1 != dbus_connection_send(g_conn_sender, msg, NULL)) { - SLOG(LOG_ERROR, TAG_VCC, "[Dbus ERROR] Fail to Send"); + SLOG(LOG_ERROR, TAG_VCC, "[Dbus ERROR] Fail to Send"); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } else { SLOG(LOG_DEBUG, TAG_VCC, "[Dbus DEBUG] Success to Send"); @@ -831,6 +973,7 @@ int vc_dbus_request_dialog(int pid, const char* disp_text, const char* utt_text, return 0; +//LCOV_EXCL_START /* DBusError err; dbus_error_init(&err); @@ -852,33 +995,34 @@ int vc_dbus_request_dialog(int pid, const char* disp_text, const char* utt_text, DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc set command : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc set command : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc set command : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc set command : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } return result; */ +//LCOV_EXCL_STOP } int vc_dbus_request_is_system_command_valid(int pid, bool* is_sys_cmd_valid) { if (NULL == g_conn_sender) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] NULL connection"); + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] NULL connection"); //LCOV_EXCL_LINE if (0 != vc_dbus_reconnect()) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to reconnect"); + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to reconnect"); //LCOV_EXCL_LINE } } @@ -891,10 +1035,10 @@ int vc_dbus_request_is_system_command_valid(int pid, bool* is_sys_cmd_valid) VC_METHOD_IS_SYS_COMMAND_VALID); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc is system command valid : Fail to make message"); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc is system command valid : Fail to make message"); //LCOV_EXCL_LINE return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc is system command valid : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc is system command valid : pid(%d)", pid); } dbus_message_append_args(msg, @@ -912,7 +1056,7 @@ int vc_dbus_request_is_system_command_valid(int pid, bool* is_sys_cmd_valid) dbus_message_unref(msg); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Dbus Error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); } @@ -923,7 +1067,7 @@ int vc_dbus_request_is_system_command_valid(int pid, bool* is_sys_cmd_valid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); //LCOV_EXCL_LINE dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } @@ -931,12 +1075,12 @@ int vc_dbus_request_is_system_command_valid(int pid, bool* is_sys_cmd_valid) if (0 == result) { *is_sys_cmd_valid = (bool)tmp_sys_cmd; - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc is system command valid : result = %d, is_sys_cmd_valid = %d", result, *is_sys_cmd_valid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc is system command valid : result = %d, is_sys_cmd_valid = %d", result, *is_sys_cmd_valid); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc is system command valid : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc is system command valid : result = %d", result); } } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Result message is NULL"); + SLOG(LOG_ERROR, TAG_VCC, "@@ Result message is NULL"); //LCOV_EXCL_LINE vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -944,7 +1088,7 @@ int vc_dbus_request_is_system_command_valid(int pid, bool* is_sys_cmd_valid) return result; } - +//LCOV_EXCL_START #if 0 int vc_dbus_request_start(int pid, int silence) { @@ -958,10 +1102,10 @@ int vc_dbus_request_start(int pid, int silence) VC_METHOD_REQUEST_START); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc start : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc start : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc start : pid(%d), silence(%d)", pid, silence); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc start : pid(%d), silence(%d)", pid, silence); } DBusMessageIter args; @@ -991,19 +1135,19 @@ int vc_dbus_request_start(int pid, int silence) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc start : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc start : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc start : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc start : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1023,10 +1167,10 @@ int vc_dbus_request_stop(int pid) VC_METHOD_REQUEST_STOP); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc stop : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc stop : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc stop : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc stop : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1053,19 +1197,19 @@ int vc_dbus_request_stop(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc stop : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc stop : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc stop : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc stop : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1085,10 +1229,10 @@ int vc_dbus_request_cancel(int pid) VC_METHOD_REQUEST_CANCEL); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc cancel : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc cancel : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc cancel : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc cancel : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1115,19 +1259,19 @@ int vc_dbus_request_cancel(int pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc cancel : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc cancel : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc cancel : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc cancel : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1135,7 +1279,9 @@ int vc_dbus_request_cancel(int pid) return result; } #endif +//LCOV_EXCL_STOP +//LCOV_EXCL_START /* Authority */ int vc_dbus_request_auth_enable(int pid, int mgr_pid) { @@ -1161,10 +1307,10 @@ int vc_dbus_request_auth_enable(int pid, int mgr_pid) VC_METHOD_AUTH_ENABLE); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth enable : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth enable : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth enable : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth enable : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1191,19 +1337,19 @@ int vc_dbus_request_auth_enable(int pid, int mgr_pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc auth enable : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth enable : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc auth enable : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth enable : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1235,10 +1381,10 @@ int vc_dbus_request_auth_disable(int pid, int mgr_pid) VC_METHOD_AUTH_DISABLE); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth disable : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth disable : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth disable : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth disable : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1265,19 +1411,19 @@ int vc_dbus_request_auth_disable(int pid, int mgr_pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc auth disable : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth disable : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc auth disable : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth disable : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1309,10 +1455,10 @@ int vc_dbus_request_auth_start(int pid, int mgr_pid) VC_METHOD_AUTH_START); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth start : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth start : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth start : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth start : pid(%d)", pid); } DBusMessageIter args; @@ -1341,19 +1487,19 @@ int vc_dbus_request_auth_start(int pid, int mgr_pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc auth start : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth start : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc auth start : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth start : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1385,10 +1531,10 @@ int vc_dbus_request_auth_stop(int pid, int mgr_pid) VC_METHOD_AUTH_STOP); if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth stop : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth stop : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth stop : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth stop : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1415,19 +1561,19 @@ int vc_dbus_request_auth_stop(int pid, int mgr_pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc auth stop : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth stop : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc auth stop : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth stop : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } @@ -1459,10 +1605,10 @@ int vc_dbus_request_auth_cancel(int pid, int mgr_pid) VC_METHOD_AUTH_CANCEL); /* name of the signal */ if (NULL == msg) { - SLOG(LOG_ERROR, TAG_VCC, ">>>> vc auth cancel : Fail to make message "); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth cancel : Fail to make message "); return VC_ERROR_OPERATION_FAILED; } else { - SLOG(LOG_DEBUG, TAG_VCC, ">>>> vc auth cancel : pid(%d)", pid); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth cancel : pid(%d)", pid); } dbus_message_append_args(msg, @@ -1489,22 +1635,23 @@ int vc_dbus_request_auth_cancel(int pid, int mgr_pid) DBUS_TYPE_INVALID); if (dbus_error_is_set(&err)) { - SLOG(LOG_ERROR, TAG_VCC, "<<<< Get arguments error (%s)", err.message); + SLOG(LOG_ERROR, TAG_VCC, "@@ Get arguments error (%s)", err.message); dbus_error_free(&err); result = VC_ERROR_OPERATION_FAILED; } dbus_message_unref(result_msg); if (0 == result) { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc auth cancel : result = %d", result); + SLOG(LOG_DEBUG, TAG_VCC, "@@ vc auth cancel : result = %d", result); } else { - SLOG(LOG_ERROR, TAG_VCC, "<<<< vc auth cancel : result = %d", result); + SLOG(LOG_ERROR, TAG_VCC, "@@ vc auth cancel : result = %d", result); } } else { - SLOG(LOG_DEBUG, TAG_VCC, "<<<< Result Message is NULL"); + SLOG(LOG_DEBUG, TAG_VCC, "@@ Result Message is NULL"); vc_dbus_reconnect(); result = VC_ERROR_TIMED_OUT; } return result; } +//LCOV_EXCL_STOP