ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix config generation.

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jeroen Leenarts
2018-08-09 22:45:28 +02:00
parent bee5363dfa
commit 9e8feb05f3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WireGuard/Models/Tunnel+Extension.swift
+6 -6
View File
@@ -32,7 +32,7 @@ extension Tunnel {
} }
private func generateInterfaceProviderConfiguration(_ interface: Interface) -> String { private func generateInterfaceProviderConfiguration(_ interface: Interface) -> String {
var settingsString = "replace_peers=true\n" var settingsString = ""
if let hexPrivateKey = base64KeyToHex(interface.privateKey) { if let hexPrivateKey = base64KeyToHex(interface.privateKey) {
settingsString += "private_key=\(hexPrivateKey)\n" settingsString += "private_key=\(hexPrivateKey)\n"
@@ -54,20 +54,20 @@ extension Tunnel {
var settingsString = "" var settingsString = ""
if let hexPublicKey = base64KeyToHex(peer.publicKey) { if let hexPublicKey = base64KeyToHex(peer.publicKey) {
settingsString += "public_key=\(hexPublicKey)" settingsString += "public_key=\(hexPublicKey)\n"
} }
if let presharedKey = peer.presharedKey { if let presharedKey = peer.presharedKey {
settingsString += "preshared_key=\(presharedKey)" settingsString += "preshared_key=\(presharedKey)\n"
} }
if let endpoint = peer.endpoint { if let endpoint = peer.endpoint {
settingsString += "endpoint=\(endpoint)" settingsString += "endpoint=\(endpoint)\n"
} }
if peer.persistentKeepalive > 0 { if peer.persistentKeepalive > 0 {
settingsString += "persistent_keepalive_interval=\(peer.persistentKeepalive)" settingsString += "persistent_keepalive_interval=\(peer.persistentKeepalive)\n"
} }
if let allowedIPs = peer.allowedIPs?.split(separator: ",") { if let allowedIPs = peer.allowedIPs?.split(separator: ",") {
allowedIPs.forEach { allowedIPs.forEach {
settingsString += "allowed_ip=\($0.trimmingCharacters(in: .whitespaces))" settingsString += "allowed_ip=\($0.trimmingCharacters(in: .whitespaces))\n"
} }
} }