summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-14 11:16:15 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-14 15:29:57 -0300
commit85ad7ed3ed64e75b3eae60db82f65460ac7017b4 (patch)
tree219f9f32fd56c772b93294ecffa2ff54e64ca927
parent74f401c1c5d096313cc519544cb1415b145df5e4 (diff)
Make POLL_TIME bigger in VPNManager
-rw-r--r--changes/bug_retr_hangs3
-rw-r--r--src/leap/bitmask/services/eip/vpnprocess.py3
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug_retr_hangs b/changes/bug_retr_hangs
new file mode 100644
index 00000000..8bdf7bac
--- /dev/null
+++ b/changes/bug_retr_hangs
@@ -0,0 +1,3 @@
+ o Make the poll interval bigger to improve openvpn's internal
+ behavior. If it gets queried too many times per second, it's
+ behavior won't be good. Fixes #3430. \ 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 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"