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

Convert DNS names to IP address. 

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jeroen Leenarts 2018-09-30 21:39:00 +02:00
parent 2fda480585
commit 0c1520d6f8
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Shared/Validators.swift
View File

@ -31,12 +31,12 @@ struct Endpoint {
var addressType: AddressType var addressType: AddressType
init?(endpointString: String, needsPort: Bool = true) throws { init?(endpointString: String, needsPort: Bool = true) throws {
var ipString: String var hostString: String
if needsPort { if needsPort {
guard let range = endpointString.range(of: ":", options: .backwards, range: nil, locale: nil) else { guard let range = endpointString.range(of: ":", options: .backwards, range: nil, locale: nil) else {
throw EndpointValidationError.noIpAndPort(endpointString) throw EndpointValidationError.noIpAndPort(endpointString)
} }
ipString = String(endpointString[..<range.lowerBound]) hostString = String(endpointString[..<range.lowerBound])
let portString = endpointString[range.upperBound...] let portString = endpointString[range.upperBound...]
@ -45,10 +45,12 @@ struct Endpoint {
} }
self.port = port self.port = port
} else { } else {
ipString = endpointString hostString = endpointString
} }
ipString = ipString.replacingOccurrences(of: "[", with: "").replacingOccurrences(of: "]", with: "") hostString = hostString.replacingOccurrences(of: "[", with: "").replacingOccurrences(of: "]", with: "")
let ipString = convertToipAddress(from: hostString)
ipAddress = String(ipString) ipAddress = String(ipString)
let addressType = validateIpAddress(ipToValidate: ipAddress) let addressType = validateIpAddress(ipToValidate: ipAddress)
@ -59,6 +61,22 @@ struct Endpoint {
} }
} }
private func convertToipAddress(from hostname: String) -> String {
let host = CFHostCreateWithName(nil, hostname as CFString).takeRetainedValue()
CFHostStartInfoResolution(host, .addresses, nil)
var success: DarwinBoolean = false
if let addresses = CFHostGetAddressing(host, &success)?.takeUnretainedValue() as NSArray?,
let theAddress = addresses.firstObject as? NSData {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
if getnameinfo(theAddress.bytes.assumingMemoryBound(to: sockaddr.self), socklen_t(theAddress.length),
&hostname, socklen_t(hostname.count), nil, 0, NI_NUMERICHOST) == 0 {
let numAddress = String(cString: hostname)
return numAddress
}
}
return hostname
}
func validateIpAddress(ipToValidate: String) -> AddressType { func validateIpAddress(ipToValidate: String) -> AddressType {
var sin = sockaddr_in() var sin = sockaddr_in()