summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-04-16 13:01:37 -0300
committerTomás Touceda <chiiph@leap.se>2014-04-16 13:01:37 -0300
commitdcfaeea8c892ecb962080a1fbdc456bdfe851eea (patch)
treeb4240ab4da024efb54bc2694ee619b6f98b54281 /src/leap/bitmask
parent90bbab2d49446934c7dd5f8c3ec84fd937dcd0b1 (diff)
parent0b5566dd599946dc73a0d8f46999ae19b2d0a9d2 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/fix-signals-names' into develop
Diffstat (limited to 'src/leap/bitmask')
-rw-r--r--src/leap/bitmask/backend.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/leap/bitmask/backend.py b/src/leap/bitmask/backend.py
index d208a6cd..d5a8a4e9 100644
--- a/src/leap/bitmask/backend.py
+++ b/src/leap/bitmask/backend.py
@@ -340,11 +340,11 @@ class EIP(object):
try:
self._start_eip()
except vpnprocess.OpenVPNAlreadyRunning:
- signaler.signal(signaler.EIP_OPEN_VPN_ALREADY_RUNNING)
+ signaler.signal(signaler.EIP_OPENVPN_ALREADY_RUNNING)
except vpnprocess.AlienOpenVPNAlreadyRunning:
- signaler.signal(signaler.EIP_ALIEN_OPEN_VPN_ALREADY_RUNNING)
+ signaler.signal(signaler.EIP_ALIEN_OPENVPN_ALREADY_RUNNING)
except vpnlauncher.OpenVPNNotFoundException:
- signaler.signal(signaler.EIP_OPEN_VPN_NOT_FOUND_ERROR)
+ signaler.signal(signaler.EIP_OPENVPN_NOT_FOUND_ERROR)
except vpnlauncher.VPNLauncherException:
# TODO: this seems to be used for 'gateway not found' only.
# see vpnlauncher.py
@@ -1027,15 +1027,15 @@ class Backend(object):
Signals:
backend_bad_call
- eip_alien_open_vpn_already_running
+ eip_alien_openvpn_already_running
eip_connected
eip_connection_aborted
eip_network_unreachable
eip_no_pkexec_error
eip_no_polkit_agent_error
eip_no_tun_kext_error
- eip_open_vpn_already_running
- eip_open_vpn_not_found_error
+ eip_openvpn_already_running
+ eip_openvpn_not_found_error
eip_process_finished
eip_process_restart_ping
eip_process_restart_tls