diff options
author | Kali Kaneko <kali@leap.se> | 2013-08-14 21:38:20 +0200 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2013-08-14 21:38:20 +0200 |
commit | 2adb0ef6e0a73f40ce4cd66f7c59d0d777badca9 (patch) | |
tree | 219f9f32fd56c772b93294ecffa2ff54e64ca927 /src/leap/bitmask/services | |
parent | 74f401c1c5d096313cc519544cb1415b145df5e4 (diff) | |
parent | 85ad7ed3ed64e75b3eae60db82f65460ac7017b4 (diff) |
Merge remote-tracking branch 'chiiph/bug/retr_conf_hangs' into develop
Diffstat (limited to 'src/leap/bitmask/services')
-rw-r--r-- | src/leap/bitmask/services/eip/vpnprocess.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py index 497df188..95ea2334 100644 --- a/src/leap/bitmask/services/eip/vpnprocess.py +++ b/src/leap/bitmask/services/eip/vpnprocess.py @@ -31,6 +31,7 @@ from leap.bitmask.services.eip.vpnlaunchers import get_platform_launcher from leap.bitmask.services.eip.eipconfig import EIPConfig from leap.bitmask.services.eip.udstelnet import UDSTelnet from leap.bitmask.util import first +from leap.bitmask.platform_init import IS_MAC from leap.common.check import leap_assert, leap_assert_type logger = logging.getLogger(__name__) @@ -228,7 +229,7 @@ class VPNManager(object): """ # Timers, in secs - POLL_TIME = 0.5 + POLL_TIME = 2.5 if IS_MAC else 1.0 CONNECTION_RETRY_TIME = 1 TS_KEY = "ts" |