From ea66a2b5cdb21422139c421b4d3733e1c1c3937e Mon Sep 17 00:00:00 2001 From: Selva Nair Date: Wed, 4 Nov 2015 13:59:38 -0500 Subject: [PATCH] Fix termination when windows suspends/sleeps When TUN/TAP I/O operation is aborted, restart with a SIGHUP instead of terminate. The abort error from TAP is often triggered by system suspend which is fully recoverable on resume. Catastrophic events will get caught later during the restart. This solves the abnormal termination during suspend/resume. Signed-off-by: Selva Nair Acked-by: Gert Doering Message-Id: <1446663578-14471-1-git-send-email-selva.nair@gmail.com> URL: http://article.gmane.org/gmane.network.openvpn.devel/10438 Signed-off-by: Gert Doering --- src/openvpn/forward.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 62eb6fc22..cef063d9c 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -958,8 +958,9 @@ read_incoming_tun (struct context *c) /* Was TUN/TAP I/O operation aborted? */ if (tuntap_abort(c->c2.buf.len)) { - register_signal(c, SIGTERM, "tun-abort"); - msg(M_FATAL, "TUN/TAP I/O operation aborted, exiting"); + register_signal(c, SIGHUP, "tun-abort"); + c->persist.restart_sleep_seconds = 10; + msg(M_INFO, "TUN/TAP I/O operation aborted, restarting"); perf_pop(); return; } -- 2.47.2