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/WireGuard/ZipArchive/ZipExporter.swift | 2 +- WireGuard/WireGuard/ZipArchive/ZipImporter.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'WireGuard/WireGuard/ZipArchive') diff --git a/WireGuard/WireGuard/ZipArchive/ZipExporter.swift b/WireGuard/WireGuard/ZipArchive/ZipExporter.swift index 052242a..1f7c2da 100644 --- a/WireGuard/WireGuard/ZipArchive/ZipExporter.swift +++ b/WireGuard/WireGuard/ZipArchive/ZipExporter.swift @@ -23,7 +23,7 @@ class ZipExporter { var lastTunnelName: String = "" for tunnelConfiguration in tunnelConfigurations { if let contents = tunnelConfiguration.asWgQuickConfig().data(using: .utf8) { - let name = tunnelConfiguration.interface.name ?? "" + let name = tunnelConfiguration.name ?? "untitled" if name.isEmpty || name == lastTunnelName { continue } inputsToArchiver.append((fileName: "\(name).conf", contents: contents)) lastTunnelName = name diff --git a/WireGuard/WireGuard/ZipArchive/ZipImporter.swift b/WireGuard/WireGuard/ZipArchive/ZipImporter.swift index a8819e2..18a00e8 100644 --- a/WireGuard/WireGuard/ZipArchive/ZipImporter.swift +++ b/WireGuard/WireGuard/ZipArchive/ZipImporter.swift @@ -44,7 +44,7 @@ class ZipImporter { continue } guard let fileContents = String(data: file.contents, encoding: .utf8) else { continue } - guard let tunnelConfig = try? TunnelConfiguration(fileContents, name: file.fileBaseName) else { continue } + guard let tunnelConfig = try? TunnelConfiguration(fromWgQuickConfig: fileContents, called: file.fileBaseName) else { continue } configs[index] = tunnelConfig } DispatchQueue.main.async { completion(.success(configs)) } -- cgit v1.2.3-59-g8ed1b