mirror of
https://dev.iopsys.eu/bbf/icwmp.git
synced 2025-12-10 07:44:41 +01:00
Fix fault string initialization
This commit is contained in:
parent
13c8bed356
commit
070e812e1b
2 changed files with 11 additions and 4 deletions
12
src/rpc.c
12
src/rpc.c
|
|
@ -410,8 +410,10 @@ static void load_inform_xml_schema(mxml_node_t **tree)
|
||||||
|
|
||||||
LIST_HEAD(parameters_list);
|
LIST_HEAD(parameters_list);
|
||||||
char *err = cwmp_get_parameter_values(parameter_name, ¶meters_list);
|
char *err = cwmp_get_parameter_values(parameter_name, ¶meters_list);
|
||||||
if (err || list_empty(¶meters_list))
|
if (err || list_empty(¶meters_list)) {
|
||||||
|
memset(cwmp_ctx.session->fault_msg, 0, sizeof(cwmp_ctx.session->fault_msg));
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
char *events_str_list = param_iter->value;
|
char *events_str_list = param_iter->value;
|
||||||
if (!check_inform_parameter_events_list_corresponding(events_str_list, &(cwmp_ctx.session->events)))
|
if (!check_inform_parameter_events_list_corresponding(events_str_list, &(cwmp_ctx.session->events)))
|
||||||
|
|
@ -2403,12 +2405,16 @@ int cwmp_create_fault_message(struct rpc *rpc_cpe, int fault_code, const char *f
|
||||||
|
|
||||||
MXML_DELETE(cwmp_ctx.session->tree_out);
|
MXML_DELETE(cwmp_ctx.session->tree_out);
|
||||||
|
|
||||||
if (xml_prepare_msg_out(cwmp_ctx.session))
|
if (xml_prepare_msg_out(cwmp_ctx.session)) {
|
||||||
|
memset(cwmp_ctx.session->fault_msg, 0, sizeof(cwmp_ctx.session->fault_msg));
|
||||||
return -1;
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
CWMP_LOG(INFO, "Preparing the Fault message");
|
CWMP_LOG(INFO, "Preparing the Fault message");
|
||||||
if (rpc_cpe_methods[RPC_CPE_FAULT].handler(rpc_cpe))
|
if (rpc_cpe_methods[RPC_CPE_FAULT].handler(rpc_cpe)) {
|
||||||
|
memset(cwmp_ctx.session->fault_msg, 0, sizeof(cwmp_ctx.session->fault_msg));
|
||||||
return -1;
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
rpc_cpe->type = RPC_CPE_FAULT;
|
rpc_cpe->type = RPC_CPE_FAULT;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -826,7 +826,8 @@ int run_session_end_func(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
INIT_LIST_HEAD(&intf_reset_list);
|
INIT_LIST_HEAD(&intf_reset_list);
|
||||||
|
memset(cwmp_ctx.session->fault_msg, 0, sizeof(cwmp_ctx.session->fault_msg));
|
||||||
end_session_flag = 0;
|
end_session_flag = 0;
|
||||||
|
|
||||||
return CWMP_OK;
|
return CWMP_OK;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue