diff options
author | Eric Kuck <eric@bluelinelabs.com> | 2018-12-12 11:40:57 -0600 |
---|---|---|
committer | Eric Kuck <eric@bluelinelabs.com> | 2018-12-12 11:40:57 -0600 |
commit | de14b76b4d99f74d52b6e404b2ab37394fa5b9dc (patch) | |
tree | 0d6e1efbf855bb4995b22e6c55ab8ab2f08e8f24 /WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift | |
parent | Zip importing: importFromFile should take a completionHandler (diff) | |
download | wireguard-apple-de14b76b4d99f74d52b6e404b2ab37394fa5b9dc.tar.xz wireguard-apple-de14b76b4d99f74d52b6e404b2ab37394fa5b9dc.zip |
Added swiftlint and fixed all errors (and a bunch, but not all, warnings)
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
Diffstat (limited to 'WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift')
-rw-r--r-- | WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift index 61e161e..f6bcdba 100644 --- a/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift +++ b/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift @@ -18,17 +18,17 @@ class PacketTunnelSettingsGenerator { func endpointUapiConfiguration(currentListenPort: UInt16) -> String { var wgSettings = "listen_port=\(tunnelConfiguration.interface.listenPort ?? currentListenPort)\n" - for (i, peer) in tunnelConfiguration.peers.enumerated() { + for (index, peer) in tunnelConfiguration.peers.enumerated() { wgSettings.append("public_key=\(peer.publicKey.hexEncodedString())\n") - if let endpoint = resolvedEndpoints[i] { + if let endpoint = resolvedEndpoints[index] { if case .name(_, _) = endpoint.host { assert(false, "Endpoint is not resolved") } wgSettings.append("endpoint=\(endpoint.stringRepresentation())\n") } } - + return wgSettings } - + func uapiConfiguration() -> String { var wgSettings = "" let privateKey = tunnelConfiguration.interface.privateKey.hexEncodedString() @@ -40,12 +40,12 @@ class PacketTunnelSettingsGenerator { wgSettings.append("replace_peers=true\n") } assert(tunnelConfiguration.peers.count == resolvedEndpoints.count) - for (i, peer) in tunnelConfiguration.peers.enumerated() { + for (index, peer) in tunnelConfiguration.peers.enumerated() { wgSettings.append("public_key=\(peer.publicKey.hexEncodedString())\n") if let preSharedKey = peer.preSharedKey { wgSettings.append("preshared_key=\(preSharedKey.hexEncodedString())\n") } - if let endpoint = resolvedEndpoints[i] { + if let endpoint = resolvedEndpoints[index] { if case .name(_, _) = endpoint.host { assert(false, "Endpoint is not resolved") } wgSettings.append("endpoint=\(endpoint.stringRepresentation())\n") } @@ -200,10 +200,10 @@ class PacketTunnelSettingsGenerator { } static func ipv4SubnetMaskString(of addressRange: IPAddressRange) -> String { - let n: UInt8 = addressRange.networkPrefixLength - assert(n <= 32) + let length: UInt8 = addressRange.networkPrefixLength + assert(length <= 32) var octets: [UInt8] = [0, 0, 0, 0] - let subnetMask: UInt32 = n > 0 ? ~UInt32(0) << (32 - n) : UInt32(0) + let subnetMask: UInt32 = length > 0 ? ~UInt32(0) << (32 - length) : UInt32(0) octets[0] = UInt8(truncatingIfNeeded: subnetMask >> 24) octets[1] = UInt8(truncatingIfNeeded: subnetMask >> 16) octets[2] = UInt8(truncatingIfNeeded: subnetMask >> 8) |