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

Do not try to resolve a valid ip address. 

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jeroen Leenarts 2018-10-03 10:39:04 +02:00
parent c10532acd9
commit ce02b7a4c0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Shared/Validators.swift
View File

@ -49,11 +49,16 @@ struct Endpoint {
} }
hostString = hostString.replacingOccurrences(of: "[", with: "").replacingOccurrences(of: "]", with: "") hostString = hostString.replacingOccurrences(of: "[", with: "").replacingOccurrences(of: "]", with: "")
var addressType = validateIpAddress(ipToValidate: hostString)
let ipString = convertToipAddress(from: hostString) let ipString: String
if addressType == .other {
ipString = convertToipAddress(from: hostString)
} else {
ipString = hostString
}
ipAddress = String(ipString) ipAddress = String(ipString)
let addressType = validateIpAddress(ipToValidate: ipAddress) addressType = validateIpAddress(ipToValidate: ipAddress)
guard addressType == .IPv4 || addressType == .IPv6 else { guard addressType == .IPv4 || addressType == .IPv6 else {
throw EndpointValidationError.invalidIP(ipAddress) throw EndpointValidationError.invalidIP(ipAddress)
} }