diff options
| author | Kali Kaneko <kali@leap.se> | 2014-04-23 09:46:48 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-04-23 09:46:48 -0500 |
| commit | 46679a57269c1378f3f8c94012df236d4eac5d19 (patch) | |
| tree | f422a523751d93e5c2bd97b56e6ecdb370b8436f | |
| parent | f783150bd4afdb739c827a7bb2676ed6db6ba34e (diff) | |
| parent | d5d90c59759da24fa6751f3195f0800892b2ccb8 (diff) | |
Merge remote-tracking branch 'chiiph/bug/reenable-ping-restart' into develop
| -rw-r--r-- | changes/bug_reenable_ping_restart | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/services/eip/vpnprocess.py | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/changes/bug_reenable_ping_restart b/changes/bug_reenable_ping_restart new file mode 100644 index 00000000..8b6653f1 --- /dev/null +++ b/changes/bug_reenable_ping_restart @@ -0,0 +1 @@ +- Let OpenVPN run its course when a ping-restart happens.
\ No newline at end of file diff --git a/src/leap/bitmask/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py index 9986526a..a9444489 100644 --- a/src/leap/bitmask/services/eip/vpnprocess.py +++ b/src/leap/bitmask/services/eip/vpnprocess.py @@ -66,8 +66,9 @@ class VPNObserver(object): 'Network is unreachable (code=101)',), 'PROCESS_RESTART_TLS': ( "SIGUSR1[soft,tls-error]",), - 'PROCESS_RESTART_PING': ( - "SIGUSR1[soft,ping-restart]",), + # Let ping-restart work as it should + # 'PROCESS_RESTART_PING': ( + # "SIGUSR1[soft,ping-restart]",), 'INITIALIZATION_COMPLETED': ( "Initialization Sequence Completed",), } |