GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 08:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Stop listening on ocserv-sm socket on error to prevent looping.

Browse Source 
Resolves #356

Signed-off-by: Alan Jowett <alan.jowett@microsoft.com>
This commit is contained in:
Alan Jowett
2020-09-28 14:56:53 -06:00
committed by Nikos Mavrogiannopoulos
parent 53c8c0f139
commit 12c3d62276
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@@ -1,3 +1,8 @@
* Version 1.1.2 (unreleased)
- Fixed an infinite loop on sec-mod crash when server-drain-ms is set
(#356)
* Version 1.1.1 (released 2020-09-21)
- Fixed compatibility with OpenBSD that lacks procfs (#312)
- Improved rate-limit-ms and made it dependent on secmod backlog. This

26
src/main.c
View File

@@ -894,7 +894,6 @@ static void sec_mod_child_watcher_cb(struct ev_loop *loop, ev_child *w, int reve
ev_child_stop(loop, w);
mslog(s, NULL, LOG_ERR, "ocserv-secmod died unexpectedly");
ev_feed_signal_event (loop, SIGTERM);
}
void script_child_watcher_cb(struct ev_loop *loop, ev_child *w, int revents)
@@ -1007,18 +1006,20 @@ static void term_sig_watcher_cb(struct ev_loop *loop, ev_signal *w, int revents)
}
else
{
mslog(s, NULL, LOG_INFO, "termination request received; stopping new connections");
graceful_shutdown_watcher.repeat = ((ev_tstamp)(server_drain_ms)) / 1000.;
mslog(s, NULL, LOG_INFO, "termination request received; waiting %d ms", server_drain_ms);
ev_timer_again(loop, &graceful_shutdown_watcher);
if (!ev_is_active(&graceful_shutdown_watcher)) {
mslog(s, NULL, LOG_INFO, "termination request received; stopping new connections");
graceful_shutdown_watcher.repeat = ((ev_tstamp)(server_drain_ms)) / 1000.;
mslog(s, NULL, LOG_INFO, "termination request received; waiting %d ms", server_drain_ms);
ev_timer_again(loop, &graceful_shutdown_watcher);
// Close the listening ports and stop the IO
list_for_each_safe(&s->listen_list.head, ltmp, lpos, list) {
ev_io_stop(loop, &ltmp->io);
close(ltmp->fd);
list_del(&ltmp->list);
talloc_free(ltmp);
s->listen_list.total--;
// Close the listening ports and stop the IO
list_for_each_safe(&s->listen_list.head, ltmp, lpos, list) {
ev_io_stop(loop, &ltmp->io);
close(ltmp->fd);
list_del(&ltmp->list);
talloc_free(ltmp);
s->listen_list.total--;
}
}
}
}
@@ -1283,6 +1284,7 @@ static void sec_mod_watcher_cb (EV_P_ ev_io *w, int revents)
if (ret < 0) { /* bad commands from sec-mod are unacceptable */
mslog(s, NULL, LOG_ERR,
"error in command from sec-mod");
ev_io_stop(loop, w);
ev_feed_signal_event (loop, SIGTERM);
}
}