diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-07-02 10:39:23 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-07-02 10:39:23 -0300 |
| commit | 81842d06dbaf9d3749176e018d40d109d68bf736 (patch) | |
| tree | 1a105f3774e2beedec6c85cb4ca82b1e0a6e3c30 /src/leap/services/eip | |
| parent | 008c65fad2fbf1e5d62c308fee46aaf1ee8c048c (diff) | |
| parent | ce9a59e719019d636af790de1b5185b702250fc1 (diff) | |
Merge remote-tracking branch 'ivan/feature/2921_check_openvpn_remotes' into develop
Diffstat (limited to 'src/leap/services/eip')
| -rw-r--r-- | src/leap/services/eip/vpnlaunchers.py | 8 | ||||
| -rw-r--r-- | src/leap/services/eip/vpnprocess.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/leap/services/eip/vpnlaunchers.py b/src/leap/services/eip/vpnlaunchers.py index 570a7893..3cee9bbb 100644 --- a/src/leap/services/eip/vpnlaunchers.py +++ b/src/leap/services/eip/vpnlaunchers.py @@ -324,7 +324,9 @@ class LinuxVPNLauncher(VPNLauncher): look for openvpn in the regular paths and algo in path_prefix/apps/eip/ (in case standalone is set) - Might raise VPNException. + Might raise: + VPNLauncherException, + OpenVPNNotFoundException. :param eipconfig: eip configuration object :type eipconfig: EIPConfig @@ -373,6 +375,10 @@ class LinuxVPNLauncher(VPNLauncher): gateway_selector = VPNGatewaySelector(eipconfig) gateways = gateway_selector.get_gateways() + if not gateways: + logger.error('No gateway was found!') + raise VPNLauncherException(self.tr('No gateway was found!')) + logger.debug("Using gateways ips: {}".format(', '.join(gateways))) for gw in gateways: diff --git a/src/leap/services/eip/vpnprocess.py b/src/leap/services/eip/vpnprocess.py index 0ec56ae7..cbf554da 100644 --- a/src/leap/services/eip/vpnprocess.py +++ b/src/leap/services/eip/vpnprocess.py @@ -698,6 +698,8 @@ class VPNProcess(protocol.ProcessProtocol, VPNManager): def getCommand(self): """ Gets the vpn command from the aproppriate launcher. + + Might throw: VPNLauncherException, OpenVPNNotFoundException. """ cmd = self._launcher.get_vpn_command( eipconfig=self._eipconfig, |