From 7485474c4ce5d03c3f90b699246f2ad96964be64 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Fri, 9 Nov 2018 19:49:48 +0530 Subject: [PATCH] NE: Minor refactoring to enable calling startTunnel() with a tunnelConfiguration Signed-off-by: Roopesh Chander --- .../WireGuardNetworkExtension/PacketTunnelProvider.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift index e131e74..cae4524 100644 --- a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift +++ b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift @@ -23,7 +23,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider { /// Begin the process of establishing the tunnel. override func startTunnel(options: [String: NSObject]?, completionHandler startTunnelCompletionHandler: @escaping (Error?) -> Void) { - os_log("Starting tunnel", log: OSLog.default, type: .info) guard let tunnelProviderProtocol = self.protocolConfiguration as? NETunnelProviderProtocol, let tunnelConfiguration = tunnelProviderProtocol.tunnelConfiguration() else { @@ -32,6 +31,12 @@ class PacketTunnelProvider: NEPacketTunnelProvider { return } + startTunnel(with: tunnelConfiguration, completionHandler: startTunnelCompletionHandler) + } + + func startTunnel(with tunnelConfiguration: TunnelConfiguration, completionHandler startTunnelCompletionHandler: @escaping (Error?) -> Void) { + os_log("Starting tunnel", log: OSLog.default, type: .info) + // Resolve endpoint domains let endpoints = tunnelConfiguration.peers.map { $0.endpoint }