diff options
Diffstat (limited to 'WireGuard/WireGuard')
-rw-r--r-- | WireGuard/WireGuard/Tunnel/ActivateOnDemandSetting.swift | 12 | ||||
-rw-r--r-- | WireGuard/WireGuard/UI/TunnelViewModel.swift | 8 |
2 files changed, 15 insertions, 5 deletions
diff --git a/WireGuard/WireGuard/Tunnel/ActivateOnDemandSetting.swift b/WireGuard/WireGuard/Tunnel/ActivateOnDemandSetting.swift index c89cce3..38359da 100644 --- 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 50d97c3..07d1bac 100644 --- 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 } } |