diff options
author | Roopesh Chander <roop@roopc.net> | 2018-11-08 15:54:12 +0530 |
---|---|---|
committer | Roopesh Chander <roop@roopc.net> | 2018-11-08 17:52:01 +0530 |
commit | e66cf5264ad6980dae3f990b232c2f62c43608db (patch) | |
tree | 835a8c676e901eebdeafc422bb29acc9d41925f3 /WireGuard/WireGuard/VPN/TunnelsManager.swift | |
parent | Move logic to extension: Refactor PacketTunnelOptionsGenerator into a PacketTunnelSettingsGenerator (diff) | |
download | wireguard-apple-e66cf5264ad6980dae3f990b232c2f62c43608db.tar.xz wireguard-apple-e66cf5264ad6980dae3f990b232c2f62c43608db.zip |
Move logic to extension: NETunnelProviderProtocol extension code should be shared
Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to '')
-rw-r--r-- | WireGuard/WireGuard/VPN/TunnelsManager.swift | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift index be6c860..ba4ef7f 100644 --- a/WireGuard/WireGuard/VPN/TunnelsManager.swift +++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift @@ -210,37 +210,6 @@ class TunnelsManager { } } -extension NETunnelProviderProtocol { - convenience init?(tunnelConfiguration: TunnelConfiguration) { - assert(!tunnelConfiguration.interface.name.isEmpty) - guard let serializedTunnelConfiguration = try? JSONEncoder().encode(tunnelConfiguration) else { return nil } - - self.init() - - let appId = Bundle.main.bundleIdentifier! - providerBundleIdentifier = "\(appId).network-extension" - providerConfiguration = [ - "tunnelConfiguration": serializedTunnelConfiguration, - "tunnelConfigurationVersion": 1 - ] - - let endpoints = tunnelConfiguration.peers.compactMap({$0.endpoint}) - if endpoints.count == 1 { - serverAddress = endpoints.first!.stringRepresentation() - } else if endpoints.isEmpty { - serverAddress = "Unspecified" - } else { - serverAddress = "Multiple endpoints" - } - username = tunnelConfiguration.interface.name - } - - func tunnelConfiguration() -> TunnelConfiguration? { - guard let serializedTunnelConfiguration = providerConfiguration?["tunnelConfiguration"] as? Data else { return nil } - return try? JSONDecoder().decode(TunnelConfiguration.self, from: serializedTunnelConfiguration) - } -} - class TunnelContainer: NSObject { @objc dynamic var name: String @objc dynamic var status: TunnelStatus |