From 921b81e89b2f395347510215d30255258fa9f2e3 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Wed, 17 Oct 2018 16:11:22 +0530 Subject: Model: Name should be part of the interface, not the tunnel Signed-off-by: Roopesh Chander --- WireGuard/WireGuard/Model/Configuration.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'WireGuard/WireGuard/Model/Configuration.swift') diff --git a/WireGuard/WireGuard/Model/Configuration.swift b/WireGuard/WireGuard/Model/Configuration.swift index 4eb3f2f..ab50cf7 100644 --- a/WireGuard/WireGuard/Model/Configuration.swift +++ b/WireGuard/WireGuard/Model/Configuration.swift @@ -10,23 +10,23 @@ import Foundation @available(OSX 10.14, iOS 12.0, *) class TunnelConfiguration: Codable { - var name: String let interface: InterfaceConfiguration var peers: [PeerConfiguration] = [] - init(name: String, interface: InterfaceConfiguration) { - self.name = name + init(interface: InterfaceConfiguration) { self.interface = interface } } @available(OSX 10.14, iOS 12.0, *) class InterfaceConfiguration: Codable { + var name: String var privateKey: Data var addresses: [IPAddressRange] = [] var listenPort: UInt64? = nil var mtu: UInt64? = nil var dns: String? = nil - init(privateKey: Data) { + init(name: String, privateKey: Data) { + self.name = name self.privateKey = privateKey } } -- cgit v1.2.3-59-g8ed1b