summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2017-06-29 17:03:08 +0200
committerRuben Pollan <meskio@sindominio.net>2017-07-20 21:37:03 +0200
commit05cdff086cfa4b4770d1d1af50b1f462e09b1632 (patch)
tree298d8cdf8c18c8233846c55f2dda0c0f012e95a3 /src/leap
parentd18de54f1fe00c0f7cfa3be64faed9863e248231 (diff)
[refactor] rename VPNTunnel to TunnelManager
So it's coherent with FirewallManager. - Related: #8942
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/vpn/service.py4
-rw-r--r--src/leap/bitmask/vpn/tunnel.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/bitmask/vpn/service.py b/src/leap/bitmask/vpn/service.py
index 075295c..ccdbc11 100644
--- a/src/leap/bitmask/vpn/service.py
+++ b/src/leap/bitmask/vpn/service.py
@@ -29,7 +29,7 @@ from twisted.logger import Logger
from leap.bitmask.hooks import HookableService
from leap.bitmask.util import merge_status
from leap.bitmask.vpn.fw.firewall import FirewallManager
-from leap.bitmask.vpn.tunnel import VPNTunnel
+from leap.bitmask.vpn.tunnel import TunnelManager
from leap.bitmask.vpn._checks import is_service_ready, get_vpn_cert_path
from leap.bitmask.vpn import privilege, helpers
from leap.bitmask.vpn.privilege import NoPolkitAuthAgentAvailable
@@ -212,7 +212,7 @@ class VPNService(HookableService):
'Cannot find provider certificate. '
'Please configure provider.')
- self._tunnel = VPNTunnel(
+ self._tunnel = TunnelManager(
provider, remotes, cert_path, key_path, ca_path, extra_flags)
self._firewall = FirewallManager(remotes)
diff --git a/src/leap/bitmask/vpn/tunnel.py b/src/leap/bitmask/vpn/tunnel.py
index 70b4be0..c62d067 100644
--- a/src/leap/bitmask/vpn/tunnel.py
+++ b/src/leap/bitmask/vpn/tunnel.py
@@ -37,7 +37,7 @@ from .constants import IS_WIN
# TODO ConfiguredVPNConnection ?
-class VPNTunnel(object):
+class TunnelManager(object):
"""
A VPN Tunnel holds the configuration for a VPN connection, and allows to