aboutsummaryrefslogtreecommitdiffstats
path: root/WireGuard
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-12-22 01:36:33 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2018-12-22 01:36:42 +0100
commitaede9f6e450d25a0a9cbeeea604e08ba76246869 (patch)
treebdbb3619adbf0daa6db1d7f31dee5820a4259ac5 /WireGuard
parentFixes mock tunnels (diff)
downloadwireguard-apple-aede9f6e450d25a0a9cbeeea604e08ba76246869.tar.xz
wireguard-apple-aede9f6e450d25a0a9cbeeea604e08ba76246869.zip
Move model helpers to model directory
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'WireGuard')
-rw-r--r--WireGuard/Shared/Model/LegacyConfigMigration.swift (renamed from WireGuard/Shared/LegacyConfigMigration.swift)0
-rw-r--r--WireGuard/Shared/Model/NETunnelProviderProtocol+Extension.swift (renamed from WireGuard/Shared/NETunnelProviderProtocol+Extension.swift)2
-rw-r--r--WireGuard/Shared/Model/String+ArrayConversion.swift (renamed from WireGuard/Shared/String+ArrayConversion.swift)0
-rw-r--r--WireGuard/Shared/Model/TunnelConfiguration+WgQuickConfig.swift (renamed from WireGuard/Shared/TunnelConfiguration+WgQuickConfig.swift)0
-rw-r--r--WireGuard/WireGuard.xcodeproj/project.pbxproj8
5 files changed, 4 insertions, 6 deletions
diff --git a/WireGuard/Shared/LegacyConfigMigration.swift b/WireGuard/Shared/Model/LegacyConfigMigration.swift
index b67301f..b67301f 100644
--- a/WireGuard/Shared/LegacyConfigMigration.swift
+++ b/WireGuard/Shared/Model/LegacyConfigMigration.swift
diff --git a/WireGuard/Shared/NETunnelProviderProtocol+Extension.swift b/WireGuard/Shared/Model/NETunnelProviderProtocol+Extension.swift
index 258c968..98634fd 100644
--- a/WireGuard/Shared/NETunnelProviderProtocol+Extension.swift
+++ b/WireGuard/Shared/Model/NETunnelProviderProtocol+Extension.swift
@@ -3,8 +3,6 @@
import NetworkExtension
-private var tunnelNameKey: Void?
-
extension NETunnelProviderProtocol {
enum Keys: String {
diff --git a/WireGuard/Shared/String+ArrayConversion.swift b/WireGuard/Shared/Model/String+ArrayConversion.swift
index 6a3e794..6a3e794 100644
--- a/WireGuard/Shared/String+ArrayConversion.swift
+++ b/WireGuard/Shared/Model/String+ArrayConversion.swift
diff --git a/WireGuard/Shared/TunnelConfiguration+WgQuickConfig.swift b/WireGuard/Shared/Model/TunnelConfiguration+WgQuickConfig.swift
index 94e1079..94e1079 100644
--- a/WireGuard/Shared/TunnelConfiguration+WgQuickConfig.swift
+++ b/WireGuard/Shared/Model/TunnelConfiguration+WgQuickConfig.swift
diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj
index cd04c06..7bdc5e8 100644
--- a/WireGuard/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj
@@ -255,11 +255,7 @@
children = (
6FF3526A21C23F720008484E /* Logging */,
6F7774E6217201E0006A79B3 /* Model */,
- 6FFA5D942194454A0001E2F7 /* NETunnelProviderProtocol+Extension.swift */,
6F5A2B4421AFDE020081EDD8 /* FileManager+Extension.swift */,
- 5F9696A921CD6AE6008063FE /* LegacyConfigMigration.swift */,
- 5F4541B121CBFAEE00994C13 /* String+ArrayConversion.swift */,
- 5F9696AF21CD7128008063FE /* TunnelConfiguration+WgQuickConfig.swift */,
);
path = Shared;
sourceTree = "<group>";
@@ -298,6 +294,10 @@
6F7774E6217201E0006A79B3 /* Model */ = {
isa = PBXGroup;
children = (
+ 5F9696AF21CD7128008063FE /* TunnelConfiguration+WgQuickConfig.swift */,
+ 6FFA5D942194454A0001E2F7 /* NETunnelProviderProtocol+Extension.swift */,
+ 5F4541B121CBFAEE00994C13 /* String+ArrayConversion.swift */,
+ 5F9696A921CD6AE6008063FE /* LegacyConfigMigration.swift */,
6F7774E72172020C006A79B3 /* TunnelConfiguration.swift */,
6F7774E9217229DB006A79B3 /* IPAddressRange.swift */,
6F693A552179E556008551C1 /* Endpoint.swift */,