summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-01-31 23:04:42 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-02-23 00:37:26 +0100
commit957eeaba8743ab409b8a3195afbaa534be9b2c8e (patch)
tree9f71f039161eeec7dde0ff88894950294c19d233 /src/leap/bitmask
parentb76fb35ff1acea0b78193672b6d1ded0d3fece0c (diff)
[feature] enable vpn service
Diffstat (limited to 'src/leap/bitmask')
-rw-r--r--src/leap/bitmask/core/dispatcher.py2
-rw-r--r--src/leap/bitmask/core/service.py4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/leap/bitmask/core/dispatcher.py b/src/leap/bitmask/core/dispatcher.py
index 1e95ce2..833741d 100644
--- a/src/leap/bitmask/core/dispatcher.py
+++ b/src/leap/bitmask/core/dispatcher.py
@@ -406,7 +406,7 @@ class CommandDispatcher(object):
return _format_result({'eip': 'disabled'})
subcmd = parts[1]
- dispatch = self._subcommand_eip.dispatch
+ dispatch = self.subcommand_eip.dispatch
if subcmd in ('enable', 'disable'):
d = dispatch(self.core, *parts)
else:
diff --git a/src/leap/bitmask/core/service.py b/src/leap/bitmask/core/service.py
index a34bf0e..3a3b1f6 100644
--- a/src/leap/bitmask/core/service.py
+++ b/src/leap/bitmask/core/service.py
@@ -166,9 +166,7 @@ class BitmaskBackend(configurable.ConfigurableService):
self._maybe_init_service('mail', service, self.basedir)
def _init_eip(self):
- # FIXME -- land EIP into leap.vpn
- pass
- # self._maybe_init_service('eip', EIPService)
+ self._maybe_init_service('eip', EIPService)
def _init_zmq(self):
zs = _zmq.ZMQServerService(self)