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

Model: IP address can be specified without '/cidr' 

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2018-10-30 13:45:16 +05:30
parent 535f0e1e4a
commit 7e4597e0d7
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
WireGuard/WireGuard/Model/IPAddressRange.swift
View File

@ -15,10 +15,9 @@ struct IPAddressRange {
extension IPAddressRange {
init?(from string: String) {
guard let indexOfSlash = string.lastIndex(of: "/") else { return nil }
let indexOfNetworkPrefixLength = string.index(after: indexOfSlash)
guard (indexOfNetworkPrefixLength < string.endIndex) else { return nil }
let addressString = String(string[string.startIndex ..< indexOfSlash])
let endOfIPAddress = string.lastIndex(of: "/") ?? string.endIndex
let addressString = String(string[string.startIndex ..< endOfIPAddress])
let address: IPAddress
if let addr = IPv4Address(addressString) {
address = addr
} else if let addr = IPv6Address(addressString) {
@ -26,18 +25,19 @@ extension IPAddressRange {
} else {
return nil
}
let maxNetworkPrefixLength: UInt8 = (address is IPv4Address) ? 32 : 128
var networkPrefixLength: UInt8
if (endOfIPAddress < string.endIndex) { // "/" was located
let indexOfNetworkPrefixLength = string.index(after: endOfIPAddress)
guard (indexOfNetworkPrefixLength < string.endIndex) else { return nil }
let networkPrefixLengthSubstring = string[indexOfNetworkPrefixLength ..< string.endIndex]
if let npl = UInt8(networkPrefixLengthSubstring) {
if (address is IPv4Address) {
networkPrefixLength = min(npl, 32)
} else if (address is IPv6Address) {
networkPrefixLength = min(npl, 128)
guard let npl = UInt8(networkPrefixLengthSubstring) else { return nil }
networkPrefixLength = min(npl, maxNetworkPrefixLength)
} else {
fatalError()
}
} else {
return nil
networkPrefixLength = maxNetworkPrefixLength
}
self.address = address
self.networkPrefixLength = networkPrefixLength
}
func stringRepresentation() -> String {
return "\(address)/\(networkPrefixLength)"