From 4afa1973bcec5d7c2767f40afb75e91e00b2ca37 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Fri, 3 Jun 2022 04:00:42 +0000 Subject: [PATCH] Revert "Continue session in case GetRPCMethods failing" This reverts commit 643af329ffc77f8849823a979bce9b2ea4046490 --- cwmp.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/cwmp.c b/cwmp.c index 5c0fb52..5f5776e 100644 --- a/cwmp.c +++ b/cwmp.c @@ -179,21 +179,13 @@ int cwmp_schedule_rpc(struct cwmp *cwmp, struct session *session) goto retry; CWMP_LOG(INFO, "Send the %s RPC message to the ACS", rpc_acs_methods[rpc_acs->type].name); - if (xml_send_message(cwmp, session, rpc_acs)) { - if (rpc_acs->type == RPC_ACS_GET_RPC_METHODS) - continue; - else - goto retry; - } + if (xml_send_message(cwmp, session, rpc_acs) || thread_end) + goto retry; CWMP_LOG(INFO, "Get the %sResponse message from the ACS", rpc_acs_methods[rpc_acs->type].name); if (rpc_acs_methods[rpc_acs->type].parse_response || thread_end) - if (rpc_acs_methods[rpc_acs->type].parse_response(cwmp, session, rpc_acs)) { - if (rpc_acs->type == RPC_ACS_GET_RPC_METHODS) - continue; - else - goto retry; - } + if (rpc_acs_methods[rpc_acs->type].parse_response(cwmp, session, rpc_acs)) + goto retry; ilist = ilist->prev; if (rpc_acs_methods[rpc_acs->type].extra_clean != NULL)