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

Assume VPN gateway when route gw is "vpn_gateway"

This commit is contained in:
Davide De Rosa 2019-10-22 13:52:24 +02:00
parent 920a84f952
commit 98b9d71eb3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- Session negotiation succeeds too early (Robert Patchett). [#124](https://github.com/passepartoutvpn/tunnelkit/pull/124) - Session negotiation succeeds too early (Robert Patchett). [#124](https://github.com/passepartoutvpn/tunnelkit/pull/124)
- Handle `vpn_gateway` literal in `--route`.
## 2.0.5 (2019-09-26) ## 2.0.5 (2019-09-26)

10
TunnelKit/Sources/Protocols/OpenVPN/ConfigurationParser.swift
View File

@ -490,7 +490,10 @@ extension OpenVPN {
let address = routeEntryArguments[0] let address = routeEntryArguments[0]
let mask = (routeEntryArguments.count > 1) ? routeEntryArguments[1] : "255.255.255.255" let mask = (routeEntryArguments.count > 1) ? routeEntryArguments[1] : "255.255.255.255"
let gateway = (routeEntryArguments.count > 2) ? routeEntryArguments[2] : nil // defaultGateway4 var gateway = (routeEntryArguments.count > 2) ? routeEntryArguments[2] : nil // defaultGateway4
if gateway == "vpn_gateway" {
gateway = nil
}
optRoutes4.append((address, mask, gateway)) optRoutes4.append((address, mask, gateway))
} }
Regex.route6.enumerateArguments(in: line) { Regex.route6.enumerateArguments(in: line) {
@ -505,7 +508,10 @@ extension OpenVPN {
} }
let destination = destinationComponents[0] let destination = destinationComponents[0]
let gateway = (routeEntryArguments.count > 1) ? routeEntryArguments[1] : nil // defaultGateway6 var gateway = (routeEntryArguments.count > 1) ? routeEntryArguments[1] : nil // defaultGateway6
if gateway == "vpn_gateway" {
gateway = nil
}
optRoutes6.append((destination, prefix, gateway)) optRoutes6.append((destination, prefix, gateway))
} }
Regex.gateway.enumerateArguments(in: line) { Regex.gateway.enumerateArguments(in: line) {