diff options
author | Jeroen Leenarts <jeroen.leenarts@gmail.com> | 2018-08-28 14:05:19 +0200 |
---|---|---|
committer | Jeroen Leenarts <jeroen.leenarts@gmail.com> | 2018-08-28 14:05:19 +0200 |
commit | 8382fddbdceeac72bc780451c1b534ff1adc230a (patch) | |
tree | 5dfa0192de10f109c0a0cad1a7b8e2744d2f2533 /WireGuardNetworkExtension/PacketTunnelProvider.swift | |
parent | Move connection logic into seperate function. (diff) | |
download | wireguard-apple-8382fddbdceeac72bc780451c1b534ff1adc230a.tar.xz wireguard-apple-8382fddbdceeac72bc780451c1b534ff1adc230a.zip |
Cleanup config extraction.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to '')
-rw-r--r-- | WireGuardNetworkExtension/PacketTunnelProvider.swift | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuardNetworkExtension/PacketTunnelProvider.swift index 07c33e5..712cac5 100644 --- a/WireGuardNetworkExtension/PacketTunnelProvider.swift +++ b/WireGuardNetworkExtension/PacketTunnelProvider.swift @@ -31,13 +31,10 @@ class PacketTunnelProvider: NEPacketTunnelProvider { 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 mtu = config.providerConfiguration![PCKeys.mtu.rawValue] as? NSNumber let settings = config.providerConfiguration![PCKeys.settings.rawValue]! as! String // swiftlint:disable:this force_cast - let endpoints = config.providerConfiguration?[PCKeys.endpoints.rawValue] as? String ?? "" - let addresses = (config.providerConfiguration?[PCKeys.addresses.rawValue] as? String ?? "").commaSeparatedToArray() - let validatedEndpoints = endpoints.commaSeparatedToArray().compactMap { try? Endpoint(endpointString: String($0)) }.compactMap {$0} - let validatedAddresses = addresses.compactMap { try? CIDRAddress(stringRepresentation: String($0)) }.compactMap { $0 } + 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 } guard let firstEndpoint = validatedEndpoints.first else { startTunnelCompletionHandler(PacketTunnelProviderError.tunnelSetupFailed) @@ -83,7 +80,8 @@ class PacketTunnelProvider: NEPacketTunnelProvider { if let dns = config.providerConfiguration?[PCKeys.dns.rawValue] as? String { newSettings.dnsSettings = NEDNSSettings(servers: dns.commaSeparatedToArray()) } - if let mtu = mtu, mtu.intValue > 0 { + + if let mtu = config.providerConfiguration![PCKeys.mtu.rawValue] as? NSNumber, mtu.intValue > 0 { newSettings.mtu = mtu } |