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

Revert "Parser: Interface name can be added after parsing" 

This reverts commit d3a9e79149.

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2018-10-28 21:57:18 +05:30
parent 3082863fd1
commit 4855eafb39
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WireGuard/WireGuard/Parsing/WgQuickConfigFileParser.swift
View File

@ -21,13 +21,15 @@ class WgQuickConfigFileParser {
// Based on the parser written by Eric Kuck <eric@bluelinelabs.com> in commit 5ef1656 // Based on the parser written by Eric Kuck <eric@bluelinelabs.com> in commit 5ef1656
static func parse(_ text: String) throws -> TunnelConfiguration { static func parse(_ text: String, name: String) throws -> TunnelConfiguration {
assert(!name.isEmpty)
func collate(interfaceAttributes attributes: [String:String]) -> InterfaceConfiguration? { func collate(interfaceAttributes attributes: [String:String]) -> InterfaceConfiguration? {
// required wg fields // required wg fields
guard let privateKeyString = attributes["PrivateKey"] else { return nil } guard let privateKeyString = attributes["PrivateKey"] else { return nil }
guard let privateKey = Data(base64Encoded: privateKeyString), privateKey.count == 32 else { return nil } guard let privateKey = Data(base64Encoded: privateKeyString), privateKey.count == 32 else { return nil }
var interface = InterfaceConfiguration(name: "", privateKey: privateKey) var interface = InterfaceConfiguration(name: name, privateKey: privateKey)
// other wg fields // other wg fields
if let listenPortString = attributes["ListenPort"] { if let listenPortString = attributes["ListenPort"] {
guard let listenPort = UInt16(listenPortString) else { return nil } guard let listenPort = UInt16(listenPortString) else { return nil }