passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VPN: Cleaner derivation of subnet mask from CIDR network prefix length 

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2018-10-28 11:51:18 +05:30
parent 011e1eeab8
commit 78ab196a28
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
WireGuard/WireGuard/VPN/PacketTunnelOptionsGenerator.swift
View File

@ -155,21 +155,15 @@ class PacketTunnelOptionsGenerator {
}
static func ipv4SubnetMaskString(of addressRange: IPAddressRange) -> String {
var n: UInt8 = addressRange.networkPrefixLength
let n: UInt8 = addressRange.networkPrefixLength
assert(n <= 32)
var components: [UInt8] = []
while (n >= 8) {
components.append(255)
n = n - 8
}
if (n > 0) {
components.append(((1 << n) - 1) << (8 - n))
}
while (components.count < 4) {
components.append(0)
}
assert(components.count == 4)
return components.map { String($0) }.joined(separator: ".")
var octets: [UInt8] = [0, 0, 0, 0]
let subnetMask: UInt32 = n > 0 ? ~UInt32(0) << (32 - n) : UInt32(0)
octets[0] = UInt8(truncatingIfNeeded: subnetMask >> 24)
octets[1] = UInt8(truncatingIfNeeded: subnetMask >> 16)
octets[2] = UInt8(truncatingIfNeeded: subnetMask >> 8)
octets[3] = UInt8(truncatingIfNeeded: subnetMask)
return octets.map { String($0) }.joined(separator: ".")
}
}