From beac7004e30a31252ca5f564472fc40eb8ec8b23 Mon Sep 17 00:00:00 2001 From: yuvaramachandran_gurusamy Date: Thu, 6 Nov 2025 19:42:10 +0000 Subject: [PATCH 1/4] RDKEMW-9964: Removing onStopped GDial notification handling Signed-off-by: yuvaramachandran_gurusamy --- server/gdialserver_ut.cpp | 5 ----- server/gdialservice.cpp | 6 ------ server/include/gdialservicecommon.h | 1 - server/include/gdialserviceimpl.h | 1 - 4 files changed, 13 deletions(-) diff --git a/server/gdialserver_ut.cpp b/server/gdialserver_ut.cpp index 217eccfa..88ff7999 100644 --- a/server/gdialserver_ut.cpp +++ b/server/gdialserver_ut.cpp @@ -181,11 +181,6 @@ class gdialServiceTest: public GDialNotifier GDIAL_LOGINFO("App:%s appID:%s",appName.c_str(),appID.c_str()); } - virtual void onStopped() override - { - GDIAL_LOGINFO("~~~~~~~~~~~"); - } - virtual void updatePowerState(string powerState) override { GDIAL_LOGINFO("powerState : %s",powerState.c_str()); diff --git a/server/gdialservice.cpp b/server/gdialservice.cpp index 97606bf2..732fe188 100644 --- a/server/gdialservice.cpp +++ b/server/gdialservice.cpp @@ -825,7 +825,6 @@ void *gdialServiceImpl::responseHandlerThread(void *ctx) } } _instance->m_gdialserver_response_handler_thread = 0; - _instance->m_observer->onStopped(); pthread_exit(nullptr); } @@ -1202,11 +1201,6 @@ void gdialServiceImpl::onApplicationStateRequest(string appName, string appID) GDIAL_LOGTRACE("Exiting ..."); } -void gdialServiceImpl::onStopped() -{ - // -} - void gdialServiceImpl::updatePowerState(string powerState) { GDIAL_LOGTRACE("Entering ..."); diff --git a/server/include/gdialservicecommon.h b/server/include/gdialservicecommon.h index 3f9dfe49..fb463373 100644 --- a/server/include/gdialservicecommon.h +++ b/server/include/gdialservicecommon.h @@ -78,7 +78,6 @@ class GDialNotifier virtual void onApplicationHideRequest(string appName, string appID)=0; virtual void onApplicationResumeRequest(string appName, string appID)=0; virtual void onApplicationStateRequest(string appName, string appID)=0; - virtual void onStopped(void)=0; virtual void updatePowerState(string powerState)=0; }; #endif /* _GDIAL_SERVICE_COMMON_H_ */ \ No newline at end of file diff --git a/server/include/gdialserviceimpl.h b/server/include/gdialserviceimpl.h index 5733b43e..0f72ddab 100644 --- a/server/include/gdialserviceimpl.h +++ b/server/include/gdialserviceimpl.h @@ -97,7 +97,6 @@ class gdialServiceImpl: public GDialNotifier virtual void onApplicationHideRequest(string appName, string appID) override; virtual void onApplicationResumeRequest(string appName, string appID) override; virtual void onApplicationStateRequest(string appName, string appID) override; - virtual void onStopped() override; virtual void updatePowerState(string powerState) override; private: From 81bf29dd68ad4d3866509411d0c5efa0bd71e095 Mon Sep 17 00:00:00 2001 From: yuvaramachandran_gurusamy Date: Tue, 11 Nov 2025 13:56:34 +0000 Subject: [PATCH 2/4] RDKEMW-9964: Fixed coverity issues Signed-off-by: yuvaramachandran_gurusamy --- server/gdialservice.cpp | 95 +++++++++++++++++-------------- server/include/gdialserviceimpl.h | 2 +- 2 files changed, 53 insertions(+), 44 deletions(-) diff --git a/server/gdialservice.cpp b/server/gdialservice.cpp index 732fe188..101c4e8c 100644 --- a/server/gdialservice.cpp +++ b/server/gdialservice.cpp @@ -376,7 +376,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[]) if (g_strstr_len(app_list_low, app_list_len, "netflix")) { GDIAL_LOGINFO("netflix is enabled from cmdline"); - GList *allowed_origins = g_list_prepend(NULL, ".netflix.com"); + GList *allowed_origins = g_list_prepend(NULL, (gpointer)".netflix.com"); gdial_rest_server_register_app(dial_rest_server, "Netflix", NULL, NULL, TRUE, TRUE, allowed_origins); g_list_free(allowed_origins); } @@ -388,7 +388,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[]) if (g_strstr_len(app_list_low, app_list_len, "youtube")) { GDIAL_LOGINFO("youtube is enabled from cmdline"); - GList *allowed_origins = g_list_prepend(NULL, ".youtube.com"); + GList *allowed_origins = g_list_prepend(NULL, (gpointer)".youtube.com"); gdial_rest_server_register_app(dial_rest_server, "YouTube", NULL, NULL, TRUE, TRUE, allowed_origins); g_list_free(allowed_origins); } @@ -400,7 +400,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[]) if (g_strstr_len(app_list_low, app_list_len, "youtubetv")) { GDIAL_LOGINFO("youtubetv is enabled from cmdline"); - GList *allowed_origins = g_list_prepend(NULL, ".youtube.com"); + GList *allowed_origins = g_list_prepend(NULL, (gpointer)".youtube.com"); gdial_rest_server_register_app(dial_rest_server, "YouTubeTV", NULL, NULL, TRUE, TRUE, allowed_origins); g_list_free(allowed_origins); } @@ -412,7 +412,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[]) if (g_strstr_len(app_list_low, app_list_len, "youtubekids")) { GDIAL_LOGINFO("youtubekids is enabled from cmdline"); - GList *allowed_origins = g_list_prepend(NULL, ".youtube.com"); + GList *allowed_origins = g_list_prepend(NULL, (gpointer)".youtube.com"); gdial_rest_server_register_app(dial_rest_server, "YouTubeKids", NULL, NULL, TRUE, TRUE, allowed_origins); g_list_free(allowed_origins); } @@ -424,7 +424,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[]) if (g_strstr_len(app_list_low, app_list_len, "amazoninstantvideo")) { GDIAL_LOGINFO("AmazonInstantVideo is enabled from cmdline"); - GList *allowed_origins = g_list_prepend(NULL, ".amazonprime.com"); + GList *allowed_origins = g_list_prepend(NULL, (gpointer)".amazonprime.com"); gdial_rest_server_register_app(dial_rest_server, "AmazonInstantVideo", NULL, NULL, TRUE, TRUE, allowed_origins); g_list_free(allowed_origins); } @@ -436,8 +436,8 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[]) if (g_strstr_len(app_list_low, app_list_len, "spotify")) { GDIAL_LOGINFO("spotify is enabled from cmdline"); - GList *app_prefixes= g_list_prepend(NULL, "com.spotify"); - GList *allowed_origins = g_list_prepend(NULL, ".spotify.com"); + GList *app_prefixes= g_list_prepend(NULL, (gpointer)"com.spotify"); + GList *allowed_origins = g_list_prepend(NULL, (gpointer)".spotify.com"); gdial_rest_server_register_app(dial_rest_server, "com.spotify.Spotify.TV", app_prefixes, NULL, TRUE, TRUE, allowed_origins); g_list_free(allowed_origins); g_list_free(app_prefixes); @@ -450,7 +450,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[]) if (g_strstr_len(app_list_low, app_list_len, "pairing")) { GDIAL_LOGINFO("pairing is enabled from cmdline"); - GList *allowed_origins = g_list_prepend(NULL, ".comcast.com"); + GList *allowed_origins = g_list_prepend(NULL, (gpointer)".comcast.com"); gdial_rest_server_register_app(dial_rest_server, "Pairing", NULL, NULL, TRUE, TRUE, allowed_origins); g_list_free(allowed_origins); } @@ -625,7 +625,7 @@ void *gdialServiceImpl::requestHandlerThread(void *ctx) { GDIAL_LOGTRACE("Entering ..."); gdialServiceImpl *_instance = (gdialServiceImpl *)ctx; - RequestHandlerPayload reqHdlrPayload; + RequestHandlerPayload reqHdlrPayload = {}; while(!_instance->m_RequestHandlerThreadExit) { reqHdlrPayload.appNameOrfriendlyname = ""; @@ -805,7 +805,7 @@ void *gdialServiceImpl::responseHandlerThread(void *ctx) std::string appName = response_data.appName, appId = response_data.appIdOrQuery; GDIAL_LOGINFO("AppState : appName:%s appId:%s",appName.c_str(),appId.c_str()); - _instance->m_observer->onApplicationStateRequest(appName,appId); + _instance->m_observer->onApplicationStateRequest(std::move(appName),std::move(appId)); } break; case APP_RESUME_REQUEST: @@ -813,7 +813,7 @@ void *gdialServiceImpl::responseHandlerThread(void *ctx) std::string appName = response_data.appName, appId = response_data.appIdOrQuery; GDIAL_LOGINFO("AppResume : appName:%s appId:%s",appName.c_str(),appId.c_str()); - _instance->m_observer->onApplicationResumeRequest(appName,appId); + _instance->m_observer->onApplicationResumeRequest(std::move(appName),std::move(appId)); } break; default: @@ -981,13 +981,14 @@ GDIAL_SERVICE_ERROR_CODES gdialService::ApplicationStateChanged(string applicati error.c_str()); if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance)) { - RequestHandlerPayload payload; + RequestHandlerPayload payload = {}; payload.event = APP_STATE_CHANGED; - - payload.appNameOrfriendlyname = applicationName; - payload.appIdOractivation = applicationId; - payload.state = appState; - payload.error = error; + payload.appNameOrfriendlyname = std::move(applicationName); + payload.appIdOractivation = std::move(applicationId); + payload.state = std::move(appState); + payload.error = std::move(error); + payload.data_param = nullptr; + payload.user_param1 = false; gdialImplInstance->sendRequest(payload); } GDIAL_LOGTRACE("Exiting ..."); @@ -1001,11 +1002,12 @@ GDIAL_SERVICE_ERROR_CODES gdialService::ActivationChanged(string activation, str GDIAL_LOGINFO("activation[%s] friendlyname[%s]",activation.c_str(),friendlyname.c_str()); if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance)) { - RequestHandlerPayload payload; + RequestHandlerPayload payload = {}; payload.event = ACTIVATION_CHANGED; - - payload.appNameOrfriendlyname = friendlyname; - payload.appIdOractivation = activation; + payload.appNameOrfriendlyname = std::move(friendlyname); + payload.appIdOractivation = std::move(activation); + payload.data_param = nullptr; + payload.user_param1 = false; GDIAL_LOGINFO("ACTIVATION_CHANGED request sent"); gdialImplInstance->sendRequest(payload); } @@ -1020,10 +1022,11 @@ GDIAL_SERVICE_ERROR_CODES gdialService::FriendlyNameChanged(string friendlyname) GDIAL_LOGINFO("friendlyname[%s]",friendlyname.c_str()); if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance)) { - RequestHandlerPayload payload; + RequestHandlerPayload payload = {}; payload.event = FRIENDLYNAME_CHANGED; - - payload.appNameOrfriendlyname = friendlyname; + payload.appNameOrfriendlyname = std::move(friendlyname); + payload.data_param = nullptr; + payload.user_param1 = false; gdialImplInstance->sendRequest(payload); } GDIAL_LOGTRACE("Exiting ..."); @@ -1050,9 +1053,10 @@ GDIAL_SERVICE_ERROR_CODES gdialService::RegisterApplications(RegisterAppEntryLis GDIAL_LOGINFO("appConfigList[%p]",appConfigList); if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance)) { - RequestHandlerPayload payload; + RequestHandlerPayload payload = {}; payload.event = REGISTER_APPLICATIONS; payload.data_param = appConfigList; + payload.user_param1 = false; gdialImplInstance->sendRequest(payload); } GDIAL_LOGTRACE("Exiting ..."); @@ -1066,9 +1070,10 @@ void gdialService::setNetworkStandbyMode(bool nwStandbymode) GDIAL_LOGINFO("nwStandbymode[%u]",nwStandbymode); if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance)) { - RequestHandlerPayload payload; + RequestHandlerPayload payload = {}; payload.event = UPDATE_NW_STANDBY; payload.user_param1 = (bool)nwStandbymode; + payload.data_param = nullptr; gdialImplInstance->sendRequest(payload); } GDIAL_LOGTRACE("Exiting ..."); @@ -1082,9 +1087,11 @@ GDIAL_SERVICE_ERROR_CODES gdialService::setManufacturerName(string manufacturer) GDIAL_LOGINFO("Manufacturer[%s]",manufacturer.c_str()); if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance)) { - RequestHandlerPayload payload; + RequestHandlerPayload payload = {}; payload.event = UPDATE_MANUFACTURER_NAME; - payload.manufacturer = manufacturer; + payload.manufacturer = std::move(manufacturer); + payload.data_param = nullptr; + payload.user_param1 = false; gdialImplInstance->sendRequest(payload); } GDIAL_LOGTRACE("Exiting ..."); @@ -1098,9 +1105,11 @@ GDIAL_SERVICE_ERROR_CODES gdialService::setModelName(string model) GDIAL_LOGINFO("Model[%s]",model.c_str()); if ((nullptr != m_gdialService ) && (nullptr != gdialImplInstance)) { - RequestHandlerPayload payload; + RequestHandlerPayload payload = {}; payload.event = UPDATE_MODEL_NAME; payload.model = model; + payload.data_param = nullptr; + payload.user_param1 = false; gdialImplInstance->sendRequest(payload); } GDIAL_LOGTRACE("Exiting ..."); @@ -1133,10 +1142,10 @@ void gdialServiceImpl::onApplicationLaunchRequestWithLaunchParam(string appName, GDIAL_LOGTRACE("Entering ..."); payload.event = APP_LAUNCH_REQUEST_WITH_PARAMS; - payload.appName = appName; - payload.parameterOrPayload = strPayLoad; - payload.appIdOrQuery = strQuery; - payload.AddDataUrl = strAddDataUrl; + payload.appName = std::move(appName); + payload.parameterOrPayload = std::move(strPayLoad); + payload.appIdOrQuery = std::move(strQuery); + payload.AddDataUrl = std::move(strAddDataUrl); notifyResponse(payload); GDIAL_LOGTRACE("Exiting ..."); } @@ -1147,8 +1156,8 @@ void gdialServiceImpl::onApplicationLaunchRequest(string appName, string paramet GDIAL_LOGTRACE("Entering ..."); payload.event = APP_LAUNCH_REQUEST; - payload.appName = appName; - payload.parameterOrPayload = parameter; + payload.appName = std::move(appName); + payload.parameterOrPayload = std::move(parameter); notifyResponse(payload); GDIAL_LOGTRACE("Exiting ..."); } @@ -1159,8 +1168,8 @@ void gdialServiceImpl::onApplicationStopRequest(string appName, string appID) GDIAL_LOGTRACE("Entering ..."); payload.event = APP_STOP_REQUEST; - payload.appName = appName; - payload.appIdOrQuery = appID; + payload.appName = std::move(appName); + payload.appIdOrQuery = std::move(appID); notifyResponse(payload); GDIAL_LOGTRACE("Exiting ..."); } @@ -1171,8 +1180,8 @@ void gdialServiceImpl::onApplicationHideRequest(string appName, string appID) GDIAL_LOGTRACE("Entering ..."); payload.event = APP_HIDE_REQUEST; - payload.appName = appName; - payload.appIdOrQuery = appID; + payload.appName = std::move(appName); + payload.appIdOrQuery = std::move(appID); notifyResponse(payload); GDIAL_LOGTRACE("Exiting ..."); } @@ -1183,8 +1192,8 @@ void gdialServiceImpl::onApplicationResumeRequest(string appName, string appID) GDIAL_LOGTRACE("Entering ..."); payload.event = APP_RESUME_REQUEST; - payload.appName = appName; - payload.appIdOrQuery = appID; + payload.appName = std::move(appName); + payload.appIdOrQuery = std::move(appID); notifyResponse(payload); GDIAL_LOGTRACE("Exiting ..."); } @@ -1195,8 +1204,8 @@ void gdialServiceImpl::onApplicationStateRequest(string appName, string appID) GDIAL_LOGTRACE("Entering ..."); payload.event = APP_STATE_REQUEST; - payload.appName = appName; - payload.appIdOrQuery = appID; + payload.appName = std::move(appName); + payload.appIdOrQuery = std::move(appID); notifyResponse(payload); GDIAL_LOGTRACE("Exiting ..."); } diff --git a/server/include/gdialserviceimpl.h b/server/include/gdialserviceimpl.h index 0f72ddab..26f4b430 100644 --- a/server/include/gdialserviceimpl.h +++ b/server/include/gdialserviceimpl.h @@ -103,7 +103,7 @@ class gdialServiceImpl: public GDialNotifier gdialServiceImpl(){}; virtual ~gdialServiceImpl(){}; - GDialNotifier *m_observer; + GDialNotifier *m_observer{nullptr}; pthread_t m_gdialserver_main_thread{0}; static void *mainThread(void *ctx); From 467f8f9f3898e70cf4880adee8967cd24c1e18bd Mon Sep 17 00:00:00 2001 From: yuvaramachandran_gurusamy Date: Tue, 11 Nov 2025 14:24:07 +0000 Subject: [PATCH 3/4] RDKEMW-9964: Fixed coverity issues Signed-off-by: yuvaramachandran_gurusamy --- server/gdialservice.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/gdialservice.cpp b/server/gdialservice.cpp index 101c4e8c..c45e0e6a 100644 --- a/server/gdialservice.cpp +++ b/server/gdialservice.cpp @@ -292,7 +292,7 @@ int gdialServiceImpl::start_GDialServer(int argc, char *argv[]) soup_server_add_handler(ssdp_http_server, "/", gdial_http_server_throttle_callback, NULL, NULL); GSocketAddress *listen_address = g_inet_socket_address_new_from_string(iface_ipv4_address_, GDIAL_REST_HTTP_PORT); - SoupServerListenOptions option = 0; + SoupServerListenOptions option = (SoupServerListenOptions)0; gboolean success = soup_server_listen(rest_http_server, listen_address, option, &error); g_object_unref (listen_address); if (!success) @@ -773,7 +773,7 @@ void *gdialServiceImpl::responseHandlerThread(void *ctx) payload.c_str(), query.c_str(), AddDataUrl.c_str()); - _instance->m_observer->onApplicationLaunchRequestWithLaunchParam(appName,payload,query,AddDataUrl); + _instance->m_observer->onApplicationLaunchRequestWithLaunchParam(std::move(appName),std::move(payload),std::move(query),std::move(AddDataUrl)); } break; case APP_LAUNCH_REQUEST: @@ -781,7 +781,7 @@ void *gdialServiceImpl::responseHandlerThread(void *ctx) std::string appName = response_data.appName, parameter = response_data.parameterOrPayload; GDIAL_LOGINFO("AppLaunch : appName:%s parameter:%s",appName.c_str(),parameter.c_str()); - _instance->m_observer->onApplicationLaunchRequest(appName,parameter); + _instance->m_observer->onApplicationLaunchRequest(std::move(appName),std::move(parameter)); } break; case APP_STOP_REQUEST: @@ -789,7 +789,7 @@ void *gdialServiceImpl::responseHandlerThread(void *ctx) std::string appName = response_data.appName, appId = response_data.appIdOrQuery; GDIAL_LOGINFO("AppStop : appName:%s appId:%s",appName.c_str(),appId.c_str()); - _instance->m_observer->onApplicationStopRequest(appName,appId); + _instance->m_observer->onApplicationStopRequest(std::move(appName),std::move(appId)); } break; case APP_HIDE_REQUEST: @@ -797,7 +797,7 @@ void *gdialServiceImpl::responseHandlerThread(void *ctx) std::string appName = response_data.appName, appId = response_data.appIdOrQuery; GDIAL_LOGINFO("AppHide : appName:%s appId:%s",appName.c_str(),appId.c_str()); - _instance->m_observer->onApplicationHideRequest(appName,appId); + _instance->m_observer->onApplicationHideRequest(std::move(appName),std::move(appId)); } break; case APP_STATE_REQUEST: From 6895bbe03a1e2e8be00243bc3d5eb5f6c7848582 Mon Sep 17 00:00:00 2001 From: yuvaramachandran_gurusamy Date: Tue, 11 Nov 2025 15:09:25 +0000 Subject: [PATCH 4/4] RDKEMW-9964: Fixed coverity issues Signed-off-by: yuvaramachandran_gurusamy --- server/gdialservice.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/gdialservice.cpp b/server/gdialservice.cpp index c45e0e6a..fdd64ed9 100644 --- a/server/gdialservice.cpp +++ b/server/gdialservice.cpp @@ -1107,7 +1107,7 @@ GDIAL_SERVICE_ERROR_CODES gdialService::setModelName(string model) { RequestHandlerPayload payload = {}; payload.event = UPDATE_MODEL_NAME; - payload.model = model; + payload.model = std::move(model); payload.data_param = nullptr; payload.user_param1 = false; gdialImplInstance->sendRequest(payload); @@ -1216,7 +1216,7 @@ void gdialServiceImpl::updatePowerState(string powerState) GDIAL_LOGINFO("powerState : %s",powerState.c_str()); if (m_observer) { - m_observer->updatePowerState(powerState); + m_observer->updatePowerState(std::move(powerState)); } GDIAL_LOGTRACE("Exiting ..."); } \ No newline at end of file