aboutsummaryrefslogtreecommitdiffstats
path: root/WireGuard/WireGuard/VPN/TunnelsManager.swift
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-11-03 19:35:25 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2018-11-03 19:35:25 +0100
commit955de09c9e0e318642089fe63c4c1d44517e3ff8 (patch)
tree82e99b4f67464fa5c464eff9a7d6db5a40b8d669 /WireGuard/WireGuard/VPN/TunnelsManager.swift
parentSettings: limit size of logo (diff)
downloadwireguard-apple-955de09c9e0e318642089fe63c4c1d44517e3ff8.tar.xz
wireguard-apple-955de09c9e0e318642089fe63c4c1d44517e3ff8.zip
Global: run through swiftlint
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'WireGuard/WireGuard/VPN/TunnelsManager.swift')
-rw-r--r--WireGuard/WireGuard/VPN/TunnelsManager.swift16
1 files changed, 8 insertions, 8 deletions
diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index 39328a6..2ea3377 100644
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -32,7 +32,7 @@ enum TunnelManagementError: Error {
class TunnelsManager {
private var tunnels: [TunnelContainer]
- weak var delegate: TunnelsManagerDelegate? = nil
+ weak var delegate: TunnelsManagerDelegate?
private var isAddingTunnel: Bool = false
private var isModifyingTunnel: Bool = false
@@ -58,7 +58,7 @@ class TunnelsManager {
completionHandler(nil, TunnelManagementError.tunnelAlreadyExistsWithThatName)
return
}
-
+
if self.tunnels.contains(where: { $0.name == tunnelName }) {
completionHandler(nil, TunnelManagementError.tunnelAlreadyExistsWithThatName)
return
@@ -97,7 +97,7 @@ class TunnelsManager {
return
}
let tail = tunnelConfigurations.dropFirst()
- self.add(tunnelConfiguration: head) { [weak self, tail] (tunnel, error) in
+ self.add(tunnelConfiguration: head) { [weak self, tail] (_, error) in
DispatchQueue.main.async {
self?.addMultiple(tunnelConfigurations: tail, numberSuccessful: numberSuccessful + (error == nil ? 1 : 0), completionHandler: completionHandler)
}
@@ -115,7 +115,7 @@ class TunnelsManager {
let tunnelProviderManager = tunnel.tunnelProvider
let isNameChanged = (tunnelName != tunnelProviderManager.localizedDescription)
- var oldName: String? = nil
+ var oldName: String?
if (isNameChanged) {
if self.tunnels.contains(where: { $0.name == tunnelName }) {
completionHandler(TunnelManagementError.tunnelAlreadyExistsWithThatName)
@@ -238,7 +238,7 @@ class TunnelContainer: NSObject {
fileprivate let tunnelProvider: NETunnelProviderManager
private var statusObservationToken: AnyObject?
- private var dnsResolver: DNSResolver? = nil
+ private var dnsResolver: DNSResolver?
init(tunnel: NETunnelProviderManager) {
self.name = tunnel.localizedDescription ?? "Unnamed"
@@ -314,9 +314,9 @@ class TunnelContainer: NSObject {
assert(resolvedEndpoints.allSatisfy { (resolvedEndpoint) in
guard let resolvedEndpoint = resolvedEndpoint else { return true }
switch (resolvedEndpoint.host) {
- case .ipv4(_): return true
- case .ipv6(_): return true
- case .name(_, _): return false
+ case .ipv4: return true
+ case .ipv6: return true
+ case .name: return false
}
})