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

Match cfg lines from the beginning 

E.g. cipher was matching tls-cipher.
This commit is contained in:
Davide De Rosa 2018-10-17 18:37:02 +02:00
parent c0ebf1d0ee
commit b62f7669f2
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Passepartout/Sources/VPN/TunnelKitProvider+FileConfiguration.swift
View File

@ -31,31 +31,31 @@ private let log = SwiftyBeaver.self
extension TunnelKitProvider.Configuration { extension TunnelKitProvider.Configuration {
private struct Regex { private struct Regex {
static let proto = Utils.regex("proto +(udp6?|tcp6?)") static let proto = Utils.regex("^proto +(udp6?|tcp6?)")
static let port = Utils.regex("port +\\d+") static let port = Utils.regex("^port +\\d+")
static let remote = Utils.regex("remote +[^ ]+( +\\d+)?( +(udp6?|tcp6?))?") static let remote = Utils.regex("^remote +[^ ]+( +\\d+)?( +(udp6?|tcp6?))?")
static let cipher = Utils.regex("cipher +[\\w\\-]+") static let cipher = Utils.regex("^cipher +[\\w\\-]+")
static let auth = Utils.regex("auth +[\\w\\-]+") static let auth = Utils.regex("^auth +[\\w\\-]+")
static let compLZO = Utils.regex("comp-lzo") static let compLZO = Utils.regex("^comp-lzo")
static let compress = Utils.regex("compress") static let compress = Utils.regex("^compress")
static let ping = Utils.regex("ping +\\d+") static let ping = Utils.regex("^ping +\\d+")
static let renegSec = Utils.regex("reneg-sec +\\d+") static let renegSec = Utils.regex("^reneg-sec +\\d+")
static let fragment = Utils.regex("fragment +\\d+") static let fragment = Utils.regex("^fragment +\\d+")
static let keyDirection = Utils.regex("key-direction +\\d") static let keyDirection = Utils.regex("^key-direction +\\d")
static let blockBegin = Utils.regex("<[\\w\\-]+>") static let blockBegin = Utils.regex("^<[\\w\\-]+>")
static let blockEnd = Utils.regex("<\\/[\\w\\-]+>") static let blockEnd = Utils.regex("^<\\/[\\w\\-]+>")
} }
static func parsed(from url: URL) throws -> (String, TunnelKitProvider.Configuration) { static func parsed(from url: URL) throws -> (String, TunnelKitProvider.Configuration) {