summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services/eip/vpnprocess.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-08-15 19:54:55 +0200
committerKali Kaneko <kali@leap.se>2013-08-15 19:54:55 +0200
commit4f8ddf9978cee13f22635fd3d1e42b190ca838b3 (patch)
treecaf2c805c25c4564a7d5f75d2d66c3ee8517e233 /src/leap/bitmask/services/eip/vpnprocess.py
parent2adb0ef6e0a73f40ce4cd66f7c59d0d777badca9 (diff)
parent3a0950e936dbe20a22f5809c46406d3a6b9ceffa (diff)
Merge remote-tracking branch 'chiiph/feature/improve_openvpn_detection' into develop
Diffstat (limited to 'src/leap/bitmask/services/eip/vpnprocess.py')
-rw-r--r--src/leap/bitmask/services/eip/vpnprocess.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py
index 95ea2334..a896b60c 100644
--- a/src/leap/bitmask/services/eip/vpnprocess.py
+++ b/src/leap/bitmask/services/eip/vpnprocess.py
@@ -229,6 +229,9 @@ class VPNManager(object):
"""
# Timers, in secs
+ # NOTE: We need to set a bigger poll time in OSX because it seems
+ # openvpn malfunctions when you ask it a lot of things in a short
+ # amount of time.
POLL_TIME = 2.5 if IS_MAC else 1.0
CONNECTION_RETRY_TIME = 1
@@ -579,7 +582,7 @@ class VPNManager(object):
# we need to be able to filter out arguments in the form
# --openvpn-foo, since otherwise we are shooting ourselves
# in the feet.
- if any(map(lambda s: s.startswith("openvpn"), p.cmdline)):
+ if any(map(lambda s: s.find("LEAPOPENVPN") != -1, p.cmdline)):
openvpn_process = p
break
except psutil.error.AccessDenied: