summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-02-12 16:06:34 +0100
committerKali Kaneko <kali@leap.se>2017-02-12 16:06:34 +0100
commit952c9007284b45968f8232317dfffeb6363f8831 (patch)
treed9cafaa5ce2391590a6e7aea8c61642dc5a0db27 /src/leap
parentd3c2fb5b5e5c50c9d752ee95b7d394adb42d626f (diff)
[bug] workaround for newest openvpn version
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/services/eip/vpnprocess.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py
index 580bd572..d58d44da 100644
--- a/src/leap/bitmask/services/eip/vpnprocess.py
+++ b/src/leap/bitmask/services/eip/vpnprocess.py
@@ -664,7 +664,14 @@ class VPNManager(object):
parts = stripped.split(",")
if len(parts) < 5:
continue
- ts, status_step, ok, ip, remote = parts
+ try:
+ ts, status_step, ok, ip, remote = parts
+ except ValueError:
+ # Workaround for newer openvpn version
+ try:
+ ts, status_step, ok, ip, remote, port, _, _, _ = parts
+ except ValueError:
+ ts, status_step, ok, ip, remote, port, _, _ = parts
state = status_step
if state != self._last_state: