]> git.ipfire.org Git - thirdparty/wireguard-apple.git/commitdiff
Fixes mock tunnels
authorEric Kuck <eric@bluelinelabs.com>
Sat, 22 Dec 2018 00:35:01 +0000 (18:35 -0600)
committerEric Kuck <eric@bluelinelabs.com>
Sat, 22 Dec 2018 00:35:01 +0000 (18:35 -0600)
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
WireGuard/WireGuard/Tunnel/MockTunnels.swift

index 97ceacb743f054131715c83d9f13507e33ebdcd4..746f508e8e6a115179afdac87741bc77b7a4f7a5 100644 (file)
@@ -26,7 +26,7 @@ class MockTunnels {
     static func createMockTunnels() -> [NETunnelProviderManager] {
         return tunnelNames.map { tunnelName -> NETunnelProviderManager in
 
-            var interface = InterfaceConfiguration(name: tunnelName, privateKey: Curve25519.generatePrivateKey())
+            var interface = InterfaceConfiguration(privateKey: Curve25519.generatePrivateKey())
             interface.addresses = [IPAddressRange(from: String(format: address, Int.random(in: 1 ... 10), Int.random(in: 1 ... 254)))!]
             interface.dns = dnsServers.map { DNSServer(from: $0)! }
 
@@ -34,11 +34,11 @@ class MockTunnels {
             peer.endpoint = Endpoint(from: endpoint)
             peer.allowedIPs = [IPAddressRange(from: allowedIPs)!]
 
-            let tunnelConfiguration = TunnelConfiguration(interface: interface, peers: [peer])
+            let tunnelConfiguration = TunnelConfiguration(name: tunnelName, interface: interface, peers: [peer])
 
             let tunnelProviderManager = NETunnelProviderManager()
             tunnelProviderManager.protocolConfiguration = NETunnelProviderProtocol(tunnelConfiguration: tunnelConfiguration)
-            tunnelProviderManager.localizedDescription = tunnelConfiguration.interface.name
+            tunnelProviderManager.localizedDescription = tunnelConfiguration.name
             tunnelProviderManager.isEnabled = true
 
             return tunnelProviderManager