From: Roopesh Chander <roop@roopc.net>
Date: Wed, 19 Dec 2018 07:40:42 +0000 (+0530)
Subject: NE: No need for two startTunnel() methods
X-Git-Tag: 0.0.20181225-1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04a8c2ff5adaffdec04effb30cc75d166f908c85;p=thirdparty%2Fwireguard-apple.git

NE: No need for two startTunnel() methods

Signed-off-by: Roopesh Chander <roop@roopc.net>
---

diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
index 8fd5cad..12a2e43 100644
--- a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
+++ b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
@@ -23,6 +23,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
         networkMonitor?.cancel()
     }
 
+    //swiftlint:disable:next function_body_length
     override func startTunnel(options: [String: NSObject]?, completionHandler startTunnelCompletionHandler: @escaping (Error?) -> Void) {
 
         let activationAttemptId = options?["activationAttemptId"] as? String
@@ -35,11 +36,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
                 return
         }
 
-        startTunnel(with: tunnelConfiguration, errorNotifier: errorNotifier, completionHandler: startTunnelCompletionHandler)
-    }
-
-    //swiftlint:disable:next function_body_length
-    func startTunnel(with tunnelConfiguration: TunnelConfiguration, errorNotifier: ErrorNotifier, completionHandler startTunnelCompletionHandler: @escaping (Error?) -> Void) {
         configureLogger()
 
         wg_log(.info, message: "Starting tunnel '\(tunnelConfiguration.interface.name)'")