diff options
| author |   Roopesh Chander <roop@roopc.net> | 2019-02-23 13:56:51 +0530 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-03-18 06:46:55 +0100 |
| commit | 5d757982ba26ab3d9a26d16b8d03ea038e6568f2 (patch) | |
| tree | 7e176fb35793ed1c437545efcdc71cca3aa0ba1e /WireGuard/WireGuard/UI | |
| parent | on-demand: Simplify OS-specific code for interface type selection (diff) | |
| download | wireguard-apple-5d757982ba26ab3d9a26d16b8d03ea038e6568f2.tar.xz wireguard-apple-5d757982ba26ab3d9a26d16b8d03ea038e6568f2.zip | |
on-demand: Infrastructure for supporting SSID-based rules
Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to '')
3 files changed, 5 insertions, 5 deletions
diff --git a/WireGuard/WireGuard/UI/TunnelViewModel.swift b/WireGuard/WireGuard/UI/TunnelViewModel.swift index 8a9b007..956bfd1 100644 --- a/WireGuard/WireGuard/UI/TunnelViewModel.swift +++ b/WireGuard/WireGuard/UI/TunnelViewModel.swift @@ -661,7 +661,7 @@ extension TunnelViewModel { } static func defaultActivateOnDemandOption() -> ActivateOnDemandOption { - return .anyInterface + return .anyInterface(.anySSID) } } diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelEditTableViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelEditTableViewController.swift index 1a20ffe..22c3ec4 100644 --- a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelEditTableViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelEditTableViewController.swift @@ -44,8 +44,8 @@ class TunnelEditTableViewController: UITableViewController { ] let activateOnDemandOptions: [ActivateOnDemandOption] = [ - .anyInterface, - .wiFiInterfaceOnly, + .anyInterface(.anySSID), + .wiFiInterfaceOnly(.anySSID), .nonWiFiInterfaceOnly ] diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/TunnelEditViewController.swift b/WireGuard/WireGuard/UI/macOS/ViewController/TunnelEditViewController.swift index 2c1c538..1c1c054 100644 --- a/WireGuard/WireGuard/UI/macOS/ViewController/TunnelEditViewController.swift +++ b/WireGuard/WireGuard/UI/macOS/ViewController/TunnelEditViewController.swift @@ -82,8 +82,8 @@ class TunnelEditViewController: NSViewController { let activateOnDemandOptions: [ActivateOnDemandOption] = [ .none, - .anyInterface, - .wiFiInterfaceOnly, + .anyInterface(.anySSID), + .wiFiInterfaceOnly(.anySSID), .nonWiFiInterfaceOnly ] |