passepartoutvpn
/
tunnelkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Parse IPv6 DNS servers 

dhcp-option can be DN6 (older) or DNS (newer).
This commit is contained in:
Davide De Rosa 2018-08-24 15:00:10 +02:00
parent 97866e6f23
commit ac0e7713d6
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TunnelKit/Sources/Core/SessionProxy+PushReply.swift
View File

@ -96,7 +96,7 @@ extension SessionProxy {
private static let routeRegexp = try! NSRegularExpression(pattern: "route [\\d\\.]+( [\\d\\.]+){0,2}", options: []) private static let routeRegexp = try! NSRegularExpression(pattern: "route [\\d\\.]+( [\\d\\.]+){0,2}", options: [])
private static let dnsRegexp = try! NSRegularExpression(pattern: "dhcp-option DNS [\\d\\.]+", options: []) private static let dnsRegexp = try! NSRegularExpression(pattern: "dhcp-option DNS6? [\\d\\.a-fA-F:]+", options: [])
private static let authTokenRegexp = try! NSRegularExpression(pattern: "auth-token [a-zA-Z0-9/=+]+", options: []) private static let authTokenRegexp = try! NSRegularExpression(pattern: "auth-token [a-zA-Z0-9/=+]+", options: [])

11
TunnelKitTests/PushTests.swift
View File

@ -78,4 +78,15 @@ class PushTests: XCTestCase {
XCTAssertEqual(route.mask, "255.255.255.0") XCTAssertEqual(route.mask, "255.255.255.0")
XCTAssertEqual(route.gateway, "10.8.0.12") XCTAssertEqual(route.gateway, "10.8.0.12")
} }
func testIPv6() {
let msg = "PUSH_REPLY,dhcp-option DNS6 2001:4860:4860::8888,dhcp-option DNS6 2001:4860:4860::8844,tun-ipv6,route-gateway 10.8.0.1,topology subnet,ping 10,ping-restart 120,ifconfig-ipv6 fe80::601:30ff:feb7:ec01/64 fe80::601:30ff:feb7:dc02,ifconfig 10.8.0.2 255.255.255.0,peer-id 0"
let reply = try! SessionProxy.PushReply(message: msg)!
reply.debug()
// XCTAssertEqual(reply.address, "10.5.10.6")
// XCTAssertEqual(reply.addressMask, "255.255.255.255")
// XCTAssertEqual(reply.gatewayAddress, "10.5.10.5")
XCTAssertEqual(reply.dnsServers, ["2001:4860:4860::8888", "2001:4860:4860::8844"])
}
} }