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

Parser: Address, DNS and AllowedIPs can have mutliple entries

This commit is contained in:
Roopesh Chander 2018-11-05 23:52:16 +05:30
parent c1286c95c3
commit 4c701a0e4f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WireGuard/WireGuard/ConfigFile/WgQuickConfigFileParser.swift
View File

@ -114,7 +114,12 @@ class WgQuickConfigFileParser {
// Line contains an attribute // Line contains an attribute
let key = line[..<equalsIndex].trimmingCharacters(in: .whitespaces) let key = line[..<equalsIndex].trimmingCharacters(in: .whitespaces)
let value = line[line.index(equalsIndex, offsetBy: 1)...].trimmingCharacters(in: .whitespaces) let value = line[line.index(equalsIndex, offsetBy: 1)...].trimmingCharacters(in: .whitespaces)
attributes[key] = value let keysWithMultipleEntriesAllowed: Set<String> = ["Address", "AllowedIPs", "DNS"]
if let presentValue = attributes[key], keysWithMultipleEntriesAllowed.contains(key) {
attributes[key] = presentValue + "," + value
} else {
attributes[key] = value
}
} else { } else {
if (lowercasedLine != "[interface]" && lowercasedLine != "[peer]") { if (lowercasedLine != "[interface]" && lowercasedLine != "[peer]") {
throw ParseError.invalidLine(line) throw ParseError.invalidLine(line)