summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/vpn/manager.py
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-02-01 16:12:39 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-02-23 00:40:32 +0100
commitef57df5a4791f81871f2da42c1bb3086d0ed0815 (patch)
tree0b452947d4d9ad0076000af5e5e0f7957fabf71d /src/leap/bitmask/vpn/manager.py
parent1d4a3d68869dd9c416b104399097a6bb0c1bace3 (diff)
[refactor] sort out some imports
Diffstat (limited to 'src/leap/bitmask/vpn/manager.py')
-rw-r--r--src/leap/bitmask/vpn/manager.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/leap/bitmask/vpn/manager.py b/src/leap/bitmask/vpn/manager.py
index 6802585..a27789c 100644
--- a/src/leap/bitmask/vpn/manager.py
+++ b/src/leap/bitmask/vpn/manager.py
@@ -22,14 +22,14 @@ VPN Manager
import os
import tempfile
-from .process import VPNProcess
-from ._config import _TempEIPConfig
+from ._control import VPNControl
+from ._config import _TempEIPConfig, _TempProviderConfig
from .constants import IS_WIN
# TODO this is very badly named. There is another class that is called
-# manager!!!
+# manager. This
class VPNManager(object):
@@ -50,10 +50,9 @@ class VPNManager(object):
self._remotes = remotes
self._eipconfig = _TempEIPConfig(extra_flags, cert_path, ports)
- self._providerconfig = _config._TempProviderConfig(domain, ca_path)
- # signaler = None # XXX handle signaling somehow...
- signaler = mock_signaler
- self._vpn = VPNProcess(remotes=remotes, signaler=signaler)
+ self._providerconfig = _TempProviderConfig(domain, ca_path)
+ signaler = None # XXX handle signaling somehow...
+ self._vpn = VPNControl(remotes=remotes, signaler=signaler)
def start(self):