]> git.ipfire.org Git - thirdparty/wireguard-apple.git/commitdiff
Fix function length warning.
authorJeroen Leenarts <jeroen.leenarts@gmail.com>
Wed, 26 Sep 2018 09:22:54 +0000 (11:22 +0200)
committerJeroen Leenarts <jeroen.leenarts@gmail.com>
Wed, 26 Sep 2018 09:22:54 +0000 (11:22 +0200)
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
WireGuardNetworkExtension/PacketTunnelProvider.swift

index cb8d092ef78de2a2daee70162299a0351c6e1547..a6ef5c333630d78a30ea9a158f31210f12974487 100644 (file)
@@ -14,8 +14,20 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
 
     // MARK: Properties
 
-    var wgHandle: Int32?
-    var wgContext: WireGuardContext?
+    private var wgHandle: Int32?
+    private var wgContext: WireGuardContext?
+
+    private var config: NETunnelProviderProtocol {
+        return self.protocolConfiguration as! NETunnelProviderProtocol // swiftlint:disable:this force_cast
+    }
+
+    private var interfaceName: String {
+        return config.providerConfiguration![PCKeys.title.rawValue]! as! String // swiftlint:disable:this force_cast
+    }
+
+    private var settings: String {
+        return config.providerConfiguration![PCKeys.settings.rawValue]! as! String // swiftlint:disable:this force_cast
+    }
 
     // MARK: NEPacketTunnelProvider
 
@@ -23,10 +35,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
     override func startTunnel(options: [String: NSObject]?, completionHandler startTunnelCompletionHandler: @escaping (Error?) -> Void) {
         os_log("Starting tunnel", log: Log.general, type: .info)
 
-        let config = self.protocolConfiguration as! NETunnelProviderProtocol // swiftlint:disable:this force_cast
-        let interfaceName = config.providerConfiguration![PCKeys.title.rawValue]! as! String // swiftlint:disable:this force_cast
-        let settings = config.providerConfiguration![PCKeys.settings.rawValue]! as! String // swiftlint:disable:this force_cast
-
         let validatedEndpoints = (config.providerConfiguration?[PCKeys.endpoints.rawValue] as? String ?? "").commaSeparatedToArray().compactMap { try? Endpoint(endpointString: String($0)) }.compactMap {$0}
         let validatedAddresses = (config.providerConfiguration?[PCKeys.addresses.rawValue] as? String ?? "").commaSeparatedToArray().compactMap { try? CIDRAddress(stringRepresentation: String($0)) }.compactMap { $0 }