mirror/icwmp
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/icwmp.git synced 2025-12-10 07:44:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix interface reset at session end

Browse source
This commit is contained in:
Suvendhu Hansa 2022-07-28 14:54:13 +00:00 • committed by Vivek Kumar Dutta
parent 75a98b0e27
commit 90edffe98f
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cwmp.c
View file

@ -88,6 +88,7 @@ static bool interface_reset_req(char *param_name, char *value)
return false; return false;
ret = regexec(&reegex, param_name, 0, NULL, 0); ret = regexec(&reegex, param_name, 0, NULL, 0);
regfree(&reegex);
if (ret != 0) if (ret != 0)
return false; return false;

20
src/rpc.c
View file

@ -201,7 +201,7 @@ static int xml_prepare_parameters_inform(struct cwmp_dm_parameter *dm_parameter,
bool event_in_session_event_list(char *event, struct list_head *list_evts) bool event_in_session_event_list(char *event, struct list_head *list_evts)
{ {
struct event_container *event_container; struct event_container *event_container = NULL;
list_for_each_entry (event_container, list_evts, list) { list_for_each_entry (event_container, list_evts, list) {
if (strcmp(event, EVENT_CONST[event_container->code].CODE) == 0) if (strcmp(event, EVENT_CONST[event_container->code].CODE) == 0)
@ -311,8 +311,7 @@ static void load_inform_xml_schema(mxml_node_t **tree, struct cwmp *cwmp, struct
struct cwmp_dm_parameter cwmp_dm_param = { 0 }; struct cwmp_dm_parameter cwmp_dm_param = { 0 };
LIST_HEAD(list_inform); LIST_HEAD(list_inform);
for (i = 0; i < inform_parameters_nbre; i++) { for (i = 0; i < inform_parameters_nbre; i++) {
char *fault = cwmp_get_single_parameter_value(forced_inform_parameters[i], &cwmp_dm_param); if (NULL != cwmp_get_single_parameter_value(forced_inform_parameters[i], &cwmp_dm_param))
if (fault != NULL)
continue; continue;
// An empty connection url cause CDR test to break // An empty connection url cause CDR test to break
@ -344,9 +343,9 @@ static void load_inform_xml_schema(mxml_node_t **tree, struct cwmp *cwmp, struct
if (!check_inform_parameter_events_list_corresponding(events_str_list, &(session->head_event_container))) if (!check_inform_parameter_events_list_corresponding(events_str_list, &(session->head_event_container)))
continue; continue;
char *fault = cwmp_get_single_parameter_value(parameter_name, &cwmp_dm_param); if (NULL != cwmp_get_single_parameter_value(parameter_name, &cwmp_dm_param))
if (fault != NULL)
continue; continue;
if (xml_prepare_parameters_inform(&cwmp_dm_param, param_list, &size)) { if (xml_prepare_parameters_inform(&cwmp_dm_param, param_list, &size)) {
MXML_DELETE(xml); MXML_DELETE(xml);
} }
@ -364,11 +363,11 @@ static void load_inform_xml_schema(mxml_node_t **tree, struct cwmp *cwmp, struct
*tree = xml; *tree = xml;
} }
int cwmp_rpc_acs_prepare_message_inform(struct cwmp *cwmp, struct session *session, struct rpc *this) int cwmp_rpc_acs_prepare_message_inform(struct cwmp *cwmp, struct session *session, struct rpc *this __attribute__((unused)))
{ {
mxml_node_t *tree; mxml_node_t *tree;
if (session == NULL || this == NULL) if (session == NULL)
return -1; return -1;
load_inform_xml_schema(&tree, cwmp, session); load_inform_xml_schema(&tree, cwmp, session);
@ -915,10 +914,11 @@ int cwmp_handle_rpc_cpe_set_parameter_values(struct session *session, struct rpc
goto fault; goto fault;
FREE(parameter_key); FREE(parameter_key);
struct cwmp_dm_parameter *param_value; struct cwmp_dm_parameter *param_value = NULL;
// cppcheck-suppress unknownMacro list_for_each_entry (param_value, &list_set_param_value, list) {
list_for_each_entry (param_value, &list_set_param_value, list) set_interface_reset_request(param_value->name, param_value->value);
set_diagnostic_parameter_structure_value(param_value->name, param_value->value); set_diagnostic_parameter_structure_value(param_value->name, param_value->value);
}
cwmp_free_all_xml_data_list(&xml_list_set_param_value); cwmp_free_all_xml_data_list(&xml_list_set_param_value);
cwmp_free_all_dm_parameter_list(&list_set_param_value); cwmp_free_all_dm_parameter_list(&list_set_param_value);