summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-07-02 10:39:23 -0300
committerTomás Touceda <chiiph@leap.se>2013-07-02 10:39:23 -0300
commit81842d06dbaf9d3749176e018d40d109d68bf736 (patch)
tree1a105f3774e2beedec6c85cb4ca82b1e0a6e3c30
parent008c65fad2fbf1e5d62c308fee46aaf1ee8c048c (diff)
parentce9a59e719019d636af790de1b5185b702250fc1 (diff)
Merge remote-tracking branch 'ivan/feature/2921_check_openvpn_remotes' into develop
-rw-r--r--changes/feature-2921_check-for-no-gateways1
-rw-r--r--src/leap/gui/mainwindow.py2
-rw-r--r--src/leap/services/eip/vpnlaunchers.py8
-rw-r--r--src/leap/services/eip/vpnprocess.py2
4 files changed, 11 insertions, 2 deletions
diff --git a/changes/feature-2921_check-for-no-gateways b/changes/feature-2921_check-for-no-gateways
new file mode 100644
index 00000000..dfd9d2bd
--- /dev/null
+++ b/changes/feature-2921_check-for-no-gateways
@@ -0,0 +1 @@
+ o Check if there is no gateway to use and display correct message. Close #2921.
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 94343292..85c66bc0 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -1006,7 +1006,7 @@ class MainWindow(QtGui.QMainWindow):
error=True)
self._set_eipstatus_off()
except VPNLauncherException as e:
- self._status_panel.set_gloal_status("%s" % (e,), error=True)
+ self._status_panel.set_global_status("%s" % (e,), error=True)
self._set_eipstatus_off()
else:
self._already_started_eip = True
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,