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

Improve parsing of PUSH_REPLY prefix

This commit is contained in:
Davide De Rosa 2019-04-02 17:56:37 +02:00
parent bc0fb71064
commit d72b583900
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,9 +179,9 @@ extension SessionProxy {
case subnet case subnet
} }
private static let prefix = "PUSH_REPLY,"
private struct Regex { private struct Regex {
static let prefix = "PUSH_REPLY,"
static let topology = NSRegularExpression("topology (net30|p2p|subnet)") static let topology = NSRegularExpression("topology (net30|p2p|subnet)")
static let ifconfig = NSRegularExpression("ifconfig [\\d\\.]+ [\\d\\.]+") static let ifconfig = NSRegularExpression("ifconfig [\\d\\.]+ [\\d\\.]+")
@ -228,11 +228,13 @@ extension SessionProxy {
let cipher: SessionProxy.Cipher? let cipher: SessionProxy.Cipher?
init?(message: String) throws { init?(message: String) throws {
guard message.hasPrefix(Regex.prefix) else { guard message.hasPrefix(PushReply.prefix) else {
return nil return nil
} }
let prefixOffset = message.index(message.startIndex, offsetBy: Regex.prefix.count) guard let prefixIndex = message.range(of: PushReply.prefix)?.lowerBound else {
original = String(message[prefixOffset..<message.endIndex]) return nil
}
original = String(message[prefixIndex...])
var optTopologyArguments: [String]? var optTopologyArguments: [String]?
var optIfconfig4Arguments: [String]? var optIfconfig4Arguments: [String]?