commit | 0cd0d1e07270b05016b29cd7c9d6f4c5440fb078 | [log] [tgz] |
---|---|---|
author | Darin Petkov <petkov@chromium.org> | Mon Feb 11 12:49:10 2013 +0100 |
committer | ChromeBot <chrome-bot@google.com> | Wed Feb 13 08:09:31 2013 -0800 |
tree | 4d882f03fd6b5177e391fc1acf5a4daa9487308c | |
parent | 1361c0366043f3d2628dc7c339339116ce31085e [diff] |
shill: openvpn: Use different reconnect timeouts for tls-error and offline. When the system goes offline, use reconnect timeout of 2 minutes rather than one to allow the user more time to reconnect. When the connect attempt fails due to tls-error, limit the timeout to 20 seconds because it's most likely due to bad certificates and 20 seconds should be enough to adjust for intermittent failures. Also, cleanup some FRIEND_TESTs for unit tests that this patch touches. BUG=chromium-os:36355,chromium-os:38674 TEST=unit tests; tested by connecting to corp VPN, disconnect WiFi, re-connect WiFi after a minute, observe VPN reconnect; tested by connecting test OpenVPN with bad CA certificate and observe reduced reconnect timeout; inspected logs. Change-Id: I2e7c7b34fbe46355a34f2c9a3b3125e25950bb3e Reviewed-on: https://gerrit.chromium.org/gerrit/43036 Tested-by: Darin Petkov <petkov@chromium.org> Reviewed-by: Paul Stewart <pstew@chromium.org> Commit-Queue: Darin Petkov <petkov@chromium.org>