From 4ed646973ee4e1871cda792083bf4fe70afa8c3f Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 22 Dec 2018 00:28:18 +0100 Subject: Move name from interface to tunnel Signed-off-by: Jason A. Donenfeld --- WireGuard/Shared/Model/InterfaceConfiguration.swift | 6 ++---- WireGuard/Shared/Model/TunnelConfiguration.swift | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'WireGuard/Shared/Model') diff --git a/WireGuard/Shared/Model/InterfaceConfiguration.swift b/WireGuard/Shared/Model/InterfaceConfiguration.swift index ff804a6..ef33907 100644 --- a/WireGuard/Shared/Model/InterfaceConfiguration.swift +++ b/WireGuard/Shared/Model/InterfaceConfiguration.swift @@ -4,18 +4,16 @@ import Foundation struct InterfaceConfiguration { - var name: String? var privateKey: Data var addresses = [IPAddressRange]() var listenPort: UInt16? var mtu: UInt16? var dns = [DNSServer]() - init(name: String?, privateKey: Data) { - self.name = name - self.privateKey = privateKey + init(privateKey: Data) { if privateKey.count != TunnelConfiguration.keyLength { fatalError("Invalid private key") } + self.privateKey = privateKey } } diff --git a/WireGuard/Shared/Model/TunnelConfiguration.swift b/WireGuard/Shared/Model/TunnelConfiguration.swift index 2e394ee..bee3c9d 100644 --- a/WireGuard/Shared/Model/TunnelConfiguration.swift +++ b/WireGuard/Shared/Model/TunnelConfiguration.swift @@ -4,14 +4,16 @@ import Foundation final class TunnelConfiguration { + var name: String? var interface: InterfaceConfiguration let peers: [PeerConfiguration] static let keyLength = 32 - init(interface: InterfaceConfiguration, peers: [PeerConfiguration]) { + init(name: String?, interface: InterfaceConfiguration, peers: [PeerConfiguration]) { self.interface = interface self.peers = peers + self.name = name let peerPublicKeysArray = peers.map { $0.publicKey } let peerPublicKeysSet = Set(peerPublicKeysArray) -- cgit v1.2.3-59-g8ed1b