Add back addresses.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jeroen Leenarts
2018-08-12 21:37:56 +02:00
parent 9e8feb05f3
commit d38a81c301
8 changed files with 94 additions and 30 deletions
+9 -5
View File
@@ -12,8 +12,15 @@ extension Tunnel {
public func generateProviderConfiguration() -> [String: Any] {
var providerConfiguration = [String: Any]()
providerConfiguration["title"] = self.title
providerConfiguration["tunnelIdentifier"] = self.tunnelIdentifier
providerConfiguration[PCKeys.title.rawValue] = self.title
providerConfiguration[PCKeys.tunnelIdentifier.rawValue] = self.tunnelIdentifier
providerConfiguration[PCKeys.endpoints.rawValue] = peers?.array.compactMap {($0 as? Peer)?.endpoint}.joined(separator: ", ")
providerConfiguration[PCKeys.dns.rawValue] = interface?.dns
providerConfiguration[PCKeys.addresses.rawValue] = interface?.addresses
if let mtu = interface?.mtu {
providerConfiguration[PCKeys.mtu.rawValue] = NSNumber(value: mtu)
}
var settingsString = "replace_peers=true\n"
if let interface = interface {
settingsString += generateInterfaceProviderConfiguration(interface)
@@ -40,9 +47,6 @@ extension Tunnel {
if interface.listenPort > 0 {
settingsString += "listen_port=\(interface.listenPort)\n"
}
if let dns = interface.dns {
settingsString += "dns=\(dns)\n"
}
if interface.mtu > 0 {
settingsString += "mtu=\(interface.mtu)\n"
}