Better os() directives

Signed-off-by: Roopesh Chander <roop@roopc.net>

diff --git a/WireGuard/Shared/FileManager+Extension.swift b/WireGuard/Shared/FileManager+Extension.swift
index d98cd0a995366185104abefa3e49e78a7eb70834..2155683552000bf793ef06ca6705bd64efeecb79 100644 (file)
--- a/WireGuard/Shared/FileManager+Extension.swift
+++ b/WireGuard/Shared/FileManager+Extension.swift
@@ -8,8 +8,10 @@ extension FileManager {
     private static var sharedFolderURL: URL? {
         #if os(iOS)
         let appGroupIdInfoDictionaryKey = "com.wireguard.ios.app_group_id"
-        #elseif os(OSX)
+        #elseif os(macOS)
         let appGroupIdInfoDictionaryKey = "com.wireguard.macos.app_group_id"
+        #else
+        #error("Unimplemented")
         #endif
         guard let appGroupId = Bundle.main.object(forInfoDictionaryKey: appGroupIdInfoDictionaryKey) as? String else {
             os_log("Cannot obtain app group ID from bundle", log: OSLog.default, type: .error)

diff --git a/WireGuard/WireGuard/Tunnel/ActivateOnDemandSetting.swift b/WireGuard/WireGuard/Tunnel/ActivateOnDemandSetting.swift
index c89cce37dd6c75b7629c8b82e055d5b82637deb2..38359da480de3b1f9bc6ff7c7338e410ccaf3588 100644 (file)
--- a/WireGuard/WireGuard/Tunnel/ActivateOnDemandSetting.swift
+++ b/WireGuard/WireGuard/Tunnel/ActivateOnDemandSetting.swift
@@ -14,9 +14,11 @@ enum ActivateOnDemandOption {
     #if os(iOS)
     case useOnDemandOverWiFiOrCellular
     case useOnDemandOverCellularOnly
-    #elseif os(OSX)
+    #elseif os(macOS)
     case useOnDemandOverWiFiOrEthernet
     case useOnDemandOverEthernetOnly
+    #else
+    #error("Unimplemented")
     #endif
 }
 
@@ -40,7 +42,7 @@ extension ActivateOnDemandSetting {
             connectRule.interfaceTypeMatch = .cellular
             disconnectRule.interfaceTypeMatch = .wiFi
             rules = [connectRule, disconnectRule]
-        #elseif os(OSX)
+        #elseif os(macOS)
         case .useOnDemandOverWiFiOrEthernet:
             rules = [connectRule]
         case .useOnDemandOverWiFiOnly:
@@ -51,6 +53,8 @@ extension ActivateOnDemandSetting {
             connectRule.interfaceTypeMatch = .ethernet
             disconnectRule.interfaceTypeMatch = .wiFi
             rules = [connectRule, disconnectRule]
+        #else
+        #error("Unimplemented")
         #endif
         }
         tunnelProviderManager.onDemandRules = rules
@@ -62,10 +66,12 @@ extension ActivateOnDemandSetting {
         let otherInterfaceType: NEOnDemandRuleInterfaceType = .cellular
         let useWiFiOrOtherOption: ActivateOnDemandOption = .useOnDemandOverWiFiOrCellular
         let useOtherOnlyOption: ActivateOnDemandOption = .useOnDemandOverCellularOnly
-        #elseif os(OSX)
+        #elseif os(macOS)
         let otherInterfaceType: NEOnDemandRuleInterfaceType = .ethernet
         let useWiFiOrOtherOption: ActivateOnDemandOption = .useOnDemandOverWiFiOrEthernet
         let useOtherOnlyOption: ActivateOnDemandOption = .useOnDemandOverEthernetOnly
+        #else
+        #error("Unimplemented")
         #endif
         let activateOnDemandOption: ActivateOnDemandOption
         switch rules.count {

diff --git a/WireGuard/WireGuard/UI/TunnelViewModel.swift b/WireGuard/WireGuard/UI/TunnelViewModel.swift
index 50d97c3949ba49bea4e5034625d0389163dc94df..07d1bac168815472916a4706baa24e1e23cff498 100644 (file)
--- a/WireGuard/WireGuard/UI/TunnelViewModel.swift
+++ b/WireGuard/WireGuard/UI/TunnelViewModel.swift
@@ -461,11 +461,13 @@ extension TunnelViewModel {
             return tr("tunnelOnDemandOptionWiFiOrCellular")
         case .useOnDemandOverCellularOnly:
             return tr("tunnelOnDemandOptionCellularOnly")
-        #elseif os(OSX)
+        #elseif os(macOS)
         case .useOnDemandOverWiFiOrEthernet:
             return tr("tunnelOnDemandOptionWiFiOrEthernet")
         case .useOnDemandOverEthernetOnly:
             return tr("tunnelOnDemandOptionEthernetOnly")
+        #else
+        #error("Unimplemented")
         #endif
         }
     }
@@ -485,8 +487,10 @@ extension TunnelViewModel {
     static func defaultActivateOnDemandOption() -> ActivateOnDemandOption {
         #if os(iOS)
         return .useOnDemandOverWiFiOrCellular
-        #elseif os(OSX)
+        #elseif os(macOS)
         return .useOnDemandOverWiFiOrEthernet
+        #else
+        #error("Unimplemented")
         #endif
     }
 }

diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift
index a1f90f1d3bb81411a330df5f1820de9e83704845..02588c33bce5d4b5c51123dcf0e9e942140af3a2 100644 (file)
--- a/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift
+++ b/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift
@@ -81,8 +81,10 @@ class PacketTunnelSettingsGenerator {
         if mtu == 0 {
             #if os(iOS)
             networkSettings.mtu = NSNumber(value: 1280)
-            #elseif os(OSX)
+            #elseif os(macOS)
             networkSettings.tunnelOverheadBytes = 80
+            #else
+            #error("Unimplemented")
             #endif
         } else {
             networkSettings.mtu = NSNumber(value: mtu)