summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-05-15 09:25:25 -0500
committerKali Kaneko <kali@leap.se>2014-05-15 10:15:29 -0500
commitdfbe8c4f0158366e91ea5118e5aa68c07d28ddbf (patch)
tree9d7fad246d632d7667ae9559366a35e8f69dcdd6 /src/leap
parent19391a9eb7ac4b09dd86c4d722291dbda140dde0 (diff)
avoid openvp soft-restart. Closes: #5669
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/services/eip/vpnprocess.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/leap/bitmask/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py
index d57eafe2..1559ea8b 100644
--- a/src/leap/bitmask/services/eip/vpnprocess.py
+++ b/src/leap/bitmask/services/eip/vpnprocess.py
@@ -68,9 +68,8 @@ class VPNObserver(object):
'Network is unreachable (code=101)',),
'PROCESS_RESTART_TLS': (
"SIGUSR1[soft,tls-error]",),
- # Let ping-restart work as it should
- # 'PROCESS_RESTART_PING': (
- # "SIGUSR1[soft,ping-restart]",),
+ 'PROCESS_RESTART_PING': (
+ "SIGTERM[soft,ping-restart]",),
'INITIALIZATION_COMPLETED': (
"Initialization Sequence Completed",),
}
@@ -296,7 +295,10 @@ class VPN(object):
"""
from twisted.internet import reactor
self._stop_pollers()
- self._user_stopped = True
+
+ # We assume that the only valid shutodowns are initiated
+ # by an user action.
+ self._user_stopped = shutdown
# First we try to be polite and send a SIGTERM...
if self._vpnproc: