Skip to content

Commit

Permalink
CELLO-352 : Handle the WPS return code for RDKProxy & Legacy Plugin (r…
Browse files Browse the repository at this point in the history 
…dkcentral#53)

Reason for change: Below are the changes,
(1) The legacy plugin must return `"result":1` when failed as per the existing documentation. So added this change.
(2) When WPS is initiated and wps failed at the RDKProxy, its returning RPC success but with the return param.status as failure. This has to be handled.
Test Procedure: As per CELLO-352
Risks: Low
Signed-off-by: Karunakaran A <[email protected]>
  • Loading branch information
@karuna2git
karuna2git committed Dec 11, 2024
1 parent da274ff commit d98437c
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 20 deletions.
2 changes: 2 additions & 0 deletions LegacyPlugin_WiFiManagerAPIs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,8 @@ namespace WPEFramework

if (Core::ERROR_NONE == rc)
response["result"] = 0;
else
response["result"] = 1;
returnJson(rc);
}

Expand Down
47 changes: 27 additions & 20 deletions NetworkManagerRDKProxy.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,9 +576,9 @@ namespace WPEFramework
IARM_Bus_RegisterEventHandler(IARM_BUS_NM_SRV_MGR_NAME, IARM_BUS_WIFI_MGR_EVENT_onAvailableSSIDs, NetworkManagerInternalEventHandler);

NMLOG_INFO("threadEventRegistration successfully subscribed to IARM event for NetworkManager Plugin");
/*
/*
* Read current network state and post the event.
* Useful if NetworkManager plugin or WPEFramework is restarted
* Useful if NetworkManager plugin or WPEFramework is restarted
* or netsrvmgr misses to post iarm events during bootup.
*/
getInitialConnectionState();
Expand Down Expand Up @@ -671,9 +671,9 @@ namespace WPEFramework
IARM_Bus_RegisterEventHandler(IARM_BUS_NM_SRV_MGR_NAME, IARM_BUS_WIFI_MGR_EVENT_onWIFIStateChanged, NetworkManagerInternalEventHandler);
IARM_Bus_RegisterEventHandler(IARM_BUS_NM_SRV_MGR_NAME, IARM_BUS_WIFI_MGR_EVENT_onError, NetworkManagerInternalEventHandler);
IARM_Bus_RegisterEventHandler(IARM_BUS_NM_SRV_MGR_NAME, IARM_BUS_WIFI_MGR_EVENT_onAvailableSSIDs, NetworkManagerInternalEventHandler);
/*
/*
* Read current network state and post the event.
* Useful if NetworkManager plugin or WPEFramework is restarted
* Useful if NetworkManager plugin or WPEFramework is restarted
* or netsrvmgr misses to post iarm events during bootup.
*/
getInitialConnectionState();
Expand All @@ -685,7 +685,7 @@ namespace WPEFramework
{
LOG_ENTRY_FUNCTION();
uint32_t rc = Core::ERROR_RPC_CALL_FAILED;
IARM_BUS_NetSrvMgr_InterfaceList_t list;
IARM_BUS_NetSrvMgr_InterfaceList_t list{};
if (IARM_RESULT_SUCCESS == IARM_Bus_Call(IARM_BUS_NM_SRV_MGR_NAME, IARM_BUS_NETSRVMGR_API_getInterfaceList, (void*)&list, sizeof(list)))
{
std::vector<InterfaceDetails> interfaceList;
Expand Down Expand Up @@ -870,7 +870,7 @@ namespace WPEFramework


/* @brief Get IP Address Of the Interface */
uint32_t NetworkManagerImplementation::GetIPSettings(string& interface /* @inout */, const string &ipversion /* @in */, IPAddress& address /* @out */)
uint32_t NetworkManagerImplementation::GetIPSettings(string& interface /* @inout */, const string &ipversion /* @in */, IPAddress& address /* @out */)
{
LOG_ENTRY_FUNCTION();
uint32_t rc = Core::ERROR_RPC_CALL_FAILED;
Expand Down Expand Up @@ -1082,7 +1082,7 @@ const string CIDR_PREFIXES[CIDR_NETMASK_IP_LEN+1] = {
{
LOG_ENTRY_FUNCTION();
uint32_t rc = Core::ERROR_RPC_CALL_FAILED;
IARM_Bus_WiFiSrvMgr_SsidList_Param_t param;
IARM_Bus_WiFiSrvMgr_SsidList_Param_t param{};
IARM_Result_t retVal = IARM_RESULT_SUCCESS;

(void)ssids;
Expand All @@ -1107,7 +1107,7 @@ const string CIDR_PREFIXES[CIDR_NETMASK_IP_LEN+1] = {
{
LOG_ENTRY_FUNCTION();
uint32_t rc = Core::ERROR_RPC_CALL_FAILED;
IARM_Bus_WiFiSrvMgr_Param_t param;
IARM_Bus_WiFiSrvMgr_Param_t param{};
memset(&param, 0, sizeof(param));

if (IARM_RESULT_SUCCESS == IARM_Bus_Call(IARM_BUS_NM_SRV_MGR_NAME, IARM_BUS_WIFI_MGR_API_stopProgressiveWifiScanning, (void*) &param, sizeof(IARM_Bus_WiFiSrvMgr_Param_t)))
Expand All @@ -1127,7 +1127,7 @@ const string CIDR_PREFIXES[CIDR_NETMASK_IP_LEN+1] = {
LOG_ENTRY_FUNCTION();
uint32_t rc = Core::ERROR_RPC_CALL_FAILED;
IARM_Result_t retVal = IARM_RESULT_SUCCESS;
IARM_Bus_WiFiSrvMgr_Param_t param;
IARM_Bus_WiFiSrvMgr_Param_t param{};

memset(&param, 0, sizeof(param));

Expand Down Expand Up @@ -1155,7 +1155,7 @@ const string CIDR_PREFIXES[CIDR_NETMASK_IP_LEN+1] = {
{
LOG_ENTRY_FUNCTION();
uint32_t rc = Core::ERROR_RPC_CALL_FAILED;
IARM_Bus_WiFiSrvMgr_Param_t param;
IARM_Bus_WiFiSrvMgr_Param_t param{};
memset(&param, 0, sizeof(param));

strncpy(param.data.connect.ssid, ssid.ssid.c_str(), SSID_SIZE - 1);
Expand All @@ -1179,7 +1179,7 @@ const string CIDR_PREFIXES[CIDR_NETMASK_IP_LEN+1] = {
{
LOG_ENTRY_FUNCTION();
uint32_t rc = Core::ERROR_RPC_CALL_FAILED;
IARM_Bus_WiFiSrvMgr_Param_t param;
IARM_Bus_WiFiSrvMgr_Param_t param{};
memset(&param, 0, sizeof(param));

/* Currently RDK-NM supports only one saved SSID. So when you say clear, it jsut clears it. No need to pass input at this point in time.
Expand All @@ -1205,7 +1205,7 @@ const string CIDR_PREFIXES[CIDR_NETMASK_IP_LEN+1] = {
LOG_ENTRY_FUNCTION();
uint32_t rc = Core::ERROR_RPC_CALL_FAILED;
IARM_Result_t retVal = IARM_RESULT_SUCCESS;
IARM_Bus_WiFiSrvMgr_Param_t param;
IARM_Bus_WiFiSrvMgr_Param_t param{};
memset(&param, 0, sizeof(param));

if(ssid.ssid.length() || ssid.passphrase.length())
Expand Down Expand Up @@ -1243,7 +1243,7 @@ const string CIDR_PREFIXES[CIDR_NETMASK_IP_LEN+1] = {
LOG_ENTRY_FUNCTION();
IARM_Result_t retVal = IARM_RESULT_SUCCESS;
uint32_t rc = Core::ERROR_RPC_CALL_FAILED;
IARM_Bus_WiFiSrvMgr_Param_t param;
IARM_Bus_WiFiSrvMgr_Param_t param{};
memset(&param, 0, sizeof(param));

retVal = IARM_Bus_Call(IARM_BUS_NM_SRV_MGR_NAME, IARM_BUS_WIFI_MGR_API_disconnectSSID, (void *)&param, sizeof(param));
Expand All @@ -1264,7 +1264,7 @@ const string CIDR_PREFIXES[CIDR_NETMASK_IP_LEN+1] = {
LOG_ENTRY_FUNCTION();
uint32_t rc = Core::ERROR_RPC_CALL_FAILED;
IARM_Result_t retVal = IARM_RESULT_SUCCESS;
IARM_Bus_WiFiSrvMgr_Param_t param;
IARM_Bus_WiFiSrvMgr_Param_t param{};

memset(&param, 0, sizeof(param));

Expand Down Expand Up @@ -1347,7 +1347,7 @@ const string CIDR_PREFIXES[CIDR_NETMASK_IP_LEN+1] = {
{
LOG_ENTRY_FUNCTION();
uint32_t rc = Core::ERROR_RPC_CALL_FAILED;
IARM_Bus_WiFiSrvMgr_WPS_Parameters_t wps_parameters;
IARM_Bus_WiFiSrvMgr_WPS_Parameters_t wps_parameters{};
if (method == WIFI_WPS_PBC)
{
wps_parameters.pbc = true;
Expand All @@ -1362,15 +1362,22 @@ const string CIDR_PREFIXES[CIDR_NETMASK_IP_LEN+1] = {
snprintf(wps_parameters.pin, sizeof(wps_parameters.pin), "xxxxxxxx");
wps_parameters.pbc = false;
}
wps_parameters.status = false;

if (IARM_RESULT_SUCCESS == IARM_Bus_Call(IARM_BUS_NM_SRV_MGR_NAME, IARM_BUS_WIFI_MGR_API_initiateWPSPairing2, (void *)&wps_parameters, sizeof(wps_parameters)))
{
NMLOG_INFO ("StartWPS is success");
rc = Core::ERROR_NONE;
if (wps_parameters.status)
{
NMLOG_INFO ("StartWPS is success");
rc = Core::ERROR_NONE;
}
else
NMLOG_ERROR ("StartWPS: Failed");
}
else

if (Core::ERROR_NONE != rc)
{
NMLOG_ERROR ("StartWPS: Failed");
NMLOG_ERROR ("StartWPS: Failed");
}

return rc;
Expand All @@ -1389,7 +1396,7 @@ const string CIDR_PREFIXES[CIDR_NETMASK_IP_LEN+1] = {
}
else
{
NMLOG_ERROR ("StopWPS: Failed");
NMLOG_ERROR ("StopWPS: Failed");
}

return rc;
Expand Down

0 comments on commit d98437c

Please sign in to comment.