summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-06-04 10:11:46 -0500
committerKali Kaneko <kali@leap.se>2014-06-04 14:01:48 -0500
commit0626d6349472bdcd934328165cfe1a0e7d891bfe (patch)
treef96d28de642e15c67fe9cf39db4a7705501a8a89 /src/leap/bitmask/services
parentaeb89d2c64f8925d5063149e718ec2d97248b7c4 (diff)
catch openvpn unexpected ending
show also the back-to-clearnet button on that case.
Diffstat (limited to 'src/leap/bitmask/services')
-rw-r--r--src/leap/bitmask/services/eip/conductor.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/leap/bitmask/services/eip/conductor.py b/src/leap/bitmask/services/eip/conductor.py
index 3c031952..4c01225f 100644
--- a/src/leap/bitmask/services/eip/conductor.py
+++ b/src/leap/bitmask/services/eip/conductor.py
@@ -297,8 +297,11 @@ class EIPConductor(object):
signal = self.qtsigs.connection_aborted_signal
self._backend.eip_terminate()
- # XXX FIXME --- check exitcode is != 0 really
- if exitCode != 0 and not self.user_stopped_eip:
+ # XXX FIXME --- check exitcode is != 0 really.
+ # bitmask-root is masking the exitcode, so we might need
+ # to fix it on that side.
+ #if exitCode != 0 and not self.user_stopped_eip:
+ if not self.user_stopped_eip:
eip_status_label = self._eip_status.tr(
"{0} finished in an unexpected manner!")
eip_status_label = eip_status_label.format(self.eip_name)
@@ -307,6 +310,9 @@ class EIPConductor(object):
self._eip_status.set_eip_status(eip_status_label,
error=True)
signal = self.qtsigs.connection_died_signal
+ self._eip_status.show_fw_down_button()
+ msg = self._eip_status.tr("Outgoing traffic is blocked")
+ self._eip_status.set_eip_message(msg)
if exitCode == 0 and IS_MAC:
# XXX remove this warning after I fix cocoasudo.