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 uci issue when reloading the connection interface

Browse source
This commit is contained in:
Omar Kallel 2022-03-07 15:04:48 +01:00
parent 8df8a9a6a0
commit 11b4339fc3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cwmp.c
View file

@ -364,9 +364,9 @@ static void cwmp_schedule_session(struct cwmp *cwmp)
ilist = (&(cwmp->head_session_queue))->next; ilist = (&(cwmp->head_session_queue))->next;
retry = false; retry = false;
} }
cwmp_uci_init();
if (cwmp->session_status.last_status == SESSION_FAILURE) if (cwmp->session_status.last_status == SESSION_FAILURE)
reload_networking_config(); reload_networking_config();
cwmp_uci_init();
session = list_entry(ilist, struct session, list); session = list_entry(ilist, struct session, list);
if (file_exists(DM_ENABLED_NOTIFY)) { if (file_exists(DM_ENABLED_NOTIFY)) {
if (!event_exist_in_list(cwmp, EVENT_IDX_4VALUE_CHANGE)) if (!event_exist_in_list(cwmp, EVENT_IDX_4VALUE_CHANGE))
@ -411,6 +411,7 @@ static void cwmp_schedule_session(struct cwmp *cwmp)
} }
if (session->error == CWMP_RETRY_SESSION && (!list_empty(&(session->head_event_container)) || (list_empty(&(session->head_event_container)) && cwmp->cwmp_cr_event == 0))) { if (session->error == CWMP_RETRY_SESSION && (!list_empty(&(session->head_event_container)) || (list_empty(&(session->head_event_container)) && cwmp->cwmp_cr_event == 0))) {
reload_networking_config();
run_session_end_func(); run_session_end_func();
error = cwmp_move_session_to_session_queue(cwmp, session); error = cwmp_move_session_to_session_queue(cwmp, session);
CWMP_LOG(INFO, "Retry session, retry count = %d, retry in %ds", cwmp->retry_count_session, cwmp_get_retry_interval(cwmp)); CWMP_LOG(INFO, "Retry session, retry count = %d, retry in %ds", cwmp->retry_count_session, cwmp_get_retry_interval(cwmp));
@ -419,7 +420,6 @@ static void cwmp_schedule_session(struct cwmp *cwmp)
cwmp->session_status.last_status = SESSION_FAILURE; cwmp->session_status.last_status = SESSION_FAILURE;
cwmp->session_status.next_retry = time(NULL) + cwmp_get_retry_interval(cwmp); cwmp->session_status.next_retry = time(NULL) + cwmp_get_retry_interval(cwmp);
cwmp->session_status.failure_session++; cwmp->session_status.failure_session++;
reload_networking_config();
pthread_mutex_unlock(&(cwmp->mutex_session_send)); pthread_mutex_unlock(&(cwmp->mutex_session_send));
continue; continue;
} }