From a7a674f08246f9f367e06a166168f9d79b659945 Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Fri, 28 Sep 2018 16:02:12 +0900 Subject: [PATCH] Check if connection is NULL or not Change-Id: Ib6758c097f17969a12721915e459c2168717b24e Signed-off-by: Wonnam Jang --- client/vc_dbus.c | 2 +- client/vc_mgr_dbus.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++ client/vc_widget_dbus.c | 2 +- 3 files changed, 103 insertions(+), 2 deletions(-) diff --git a/client/vc_dbus.c b/client/vc_dbus.c index 2da8f6b..ebdce04 100644 --- a/client/vc_dbus.c +++ b/client/vc_dbus.c @@ -409,7 +409,7 @@ int vc_dbus_reconnect() static int __dbus_check() { - if (NULL == g_conn_sender) { + if (NULL == g_conn_sender || NULL == g_conn_listener) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] NULL connection"); //LCOV_EXCL_LINE return vc_dbus_reconnect(); } diff --git a/client/vc_mgr_dbus.c b/client/vc_mgr_dbus.c index f889e43..7545a7f 100644 --- a/client/vc_mgr_dbus.c +++ b/client/vc_mgr_dbus.c @@ -825,8 +825,21 @@ int vc_mgr_dbus_reconnect() return 0; } +static int __dbus_check() +{ + if (NULL == g_m_conn_sender || NULL == g_m_conn_listener) { + SLOG(LOG_ERROR, TAG_VCM, "[ERROR] NULL connection"); //LCOV_EXCL_LINE + return vc_mgr_dbus_reconnect(); + } + return 0; +} + int vc_mgr_dbus_request_hello() { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusMessage* msg; msg = dbus_message_new_method_call( @@ -893,6 +906,10 @@ static int __dbus_restore_daemon() int vc_mgr_dbus_request_initialize(int pid, int audio_streaming_mode, int* service_state, int* foreground, int* daemon_pid) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusError err; dbus_error_init(&err); @@ -993,6 +1010,10 @@ int vc_mgr_dbus_request_initialize(int pid, int audio_streaming_mode, int* servi int vc_mgr_dbus_request_finalize(int pid) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusError err; dbus_error_init(&err); @@ -1081,6 +1102,10 @@ int vc_mgr_dbus_request_finalize(int pid) int vc_mgr_dbus_request_set_command(int pid) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusError err; dbus_error_init(&err); @@ -1158,6 +1183,10 @@ int vc_mgr_dbus_request_set_command(int pid) int vc_mgr_dbus_request_unset_command(int pid) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusError err; dbus_error_init(&err); @@ -1235,6 +1264,10 @@ int vc_mgr_dbus_request_unset_command(int pid) int vc_mgr_dbus_request_demandable_client(int pid) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusError err; dbus_error_init(&err); @@ -1312,6 +1345,10 @@ int vc_mgr_dbus_request_demandable_client(int pid) int vc_mgr_dbus_request_set_audio_type(int pid, const char* audio_type) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusError err; dbus_error_init(&err); @@ -1391,6 +1428,10 @@ int vc_mgr_dbus_request_set_audio_type(int pid, const char* audio_type) int vc_mgr_dbus_request_get_audio_type(int pid, char** audio_type) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusError err; dbus_error_init(&err); @@ -1475,6 +1516,10 @@ int vc_mgr_dbus_request_get_audio_type(int pid, char** audio_type) int vc_mgr_dbus_request_set_private_data(int pid, const char* key, const char* data) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusMessage* msg; /* create a signal & check for errors */ @@ -1516,6 +1561,10 @@ int vc_mgr_dbus_request_set_private_data(int pid, const char* key, const char* d int vc_mgr_dbus_request_get_private_data(int pid, const char* key, char** data) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusMessage* msg; /* create a signal & check for errors */ @@ -1586,6 +1635,10 @@ int vc_mgr_dbus_request_get_private_data(int pid, const char* key, char** data) int vc_mgr_dbus_request_set_client_info(int pid) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusError err; dbus_error_init(&err); @@ -1664,6 +1717,10 @@ int vc_mgr_dbus_request_set_client_info(int pid) int vc_mgr_dbus_request_set_domain(int pid, const char* domain) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusMessage* msg; /* create a signal & check for errors */ @@ -1727,6 +1784,10 @@ int vc_mgr_dbus_request_set_domain(int pid, const char* domain) int vc_mgr_dbus_request_do_action(int pid, vc_send_event_type_e type, char* send_event) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusMessage* msg; /* create a signal & check for errors */ @@ -1764,6 +1825,10 @@ int vc_mgr_dbus_request_do_action(int pid, vc_send_event_type_e type, char* send int vc_mgr_dbus_request_start(int pid, int recognition_mode, bool exclusive_command_option, bool start_by_client) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusError err; dbus_error_init(&err); @@ -1849,6 +1914,10 @@ int vc_mgr_dbus_request_start(int pid, int recognition_mode, bool exclusive_comm int vc_mgr_dbus_request_stop(int pid) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusError err; dbus_error_init(&err); @@ -1927,6 +1996,10 @@ int vc_mgr_dbus_request_stop(int pid) int vc_mgr_dbus_request_cancel(int pid) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusError err; dbus_error_init(&err); @@ -2005,6 +2078,10 @@ int vc_mgr_dbus_request_cancel(int pid) int vc_mgr_dbus_request_enable_command_type(int pid, int cmd_type) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusError err; dbus_error_init(&err); @@ -2084,6 +2161,10 @@ int vc_mgr_dbus_request_enable_command_type(int pid, int cmd_type) int vc_mgr_dbus_request_disable_command_type(int pid, int cmd_type) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusError err; dbus_error_init(&err); @@ -2190,6 +2271,10 @@ static DBusMessage* __get_message(int pid, const char* method, int type) int vc_mgr_dbus_send_result(int pid, int cmd_type, int result_id) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusMessage* msg = NULL; switch (cmd_type) { @@ -2228,6 +2313,10 @@ int vc_mgr_dbus_send_result(int pid, int cmd_type, int result_id) int vc_mgr_dbus_send_result_selection(int pid) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusMessage* msg; /* create a signal & check for errors */ @@ -2263,6 +2352,10 @@ int vc_mgr_dbus_send_result_selection(int pid) int vc_mgr_dbus_send_specific_engine_request(int pid, const char* engine_app_id, const char* event, const char* request) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusMessage* msg; /* create a signal & check for errors */ @@ -2301,6 +2394,10 @@ int vc_mgr_dbus_send_specific_engine_request(int pid, const char* engine_app_id, int vc_mgr_dbus_send_utterance_status(int pid, int utt_id, int utt_status) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusMessage* msg; msg = __get_message(pid, VC_MANAGER_METHOD_UTTERANCE_STATUS, VC_COMMAND_TYPE_FOREGROUND); @@ -2331,6 +2428,10 @@ int vc_mgr_dbus_send_utterance_status(int pid, int utt_id, int utt_status) int vc_mgr_dbus_send_audio_streaming(int pid, vc_audio_streaming_event_e event, unsigned char* buffer, unsigned int len) { + if (0 != __dbus_check()) { + return VC_ERROR_OPERATION_FAILED; + } + DBusMessage* msg; msg = dbus_message_new_method_call( VC_SERVER_SERVICE_NAME, diff --git a/client/vc_widget_dbus.c b/client/vc_widget_dbus.c index 2289060..d71d479 100644 --- a/client/vc_widget_dbus.c +++ b/client/vc_widget_dbus.c @@ -453,7 +453,7 @@ int vc_widget_dbus_reconnect() static int __dbus_check() { - if (NULL == g_w_conn_sender) { + if (NULL == g_w_conn_sender || NULL == g_w_conn_listener) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] NULL connection"); return vc_widget_dbus_reconnect(); } -- 2.7.4