From 290f83d5ef4d26e11d0b6eaccd47fcda7d359ae3 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Sat, 10 Nov 2018 17:02:30 +0530 Subject: Model: Ensure that a TunnelConfiguration always has a valid array of peers Signed-off-by: Roopesh Chander --- WireGuard/WireGuard/ConfigFile/WgQuickConfigFileParser.swift | 3 +-- WireGuard/WireGuard/UI/TunnelViewModel.swift | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'WireGuard/WireGuard') diff --git a/WireGuard/WireGuard/ConfigFile/WgQuickConfigFileParser.swift b/WireGuard/WireGuard/ConfigFile/WgQuickConfigFileParser.swift index 863cd11..0ded15e 100644 --- a/WireGuard/WireGuard/ConfigFile/WgQuickConfigFileParser.swift +++ b/WireGuard/WireGuard/ConfigFile/WgQuickConfigFileParser.swift @@ -157,8 +157,7 @@ class WgQuickConfigFileParser { } if let interfaceConfiguration = interfaceConfiguration { - let tunnelConfiguration = TunnelConfiguration(interface: interfaceConfiguration) - tunnelConfiguration.peers = peerConfigurations + let tunnelConfiguration = TunnelConfiguration(interface: interfaceConfiguration, peers: peerConfigurations) return tunnelConfiguration } else { throw ParseError.noInterface diff --git a/WireGuard/WireGuard/UI/TunnelViewModel.swift b/WireGuard/WireGuard/UI/TunnelViewModel.swift index 16da1c2..94e3e6d 100644 --- a/WireGuard/WireGuard/UI/TunnelViewModel.swift +++ b/WireGuard/WireGuard/UI/TunnelViewModel.swift @@ -441,8 +441,7 @@ class TunnelViewModel { return .error("Two or more peers cannot have the same public key") } - let tunnelConfiguration = TunnelConfiguration(interface: interfaceConfiguration) - tunnelConfiguration.peers = peerConfigurations + let tunnelConfiguration = TunnelConfiguration(interface: interfaceConfiguration, peers: peerConfigurations) return .saved(tunnelConfiguration) } } -- cgit v1.2.3-59-g8ed1b