on-demand: Infrastructure for supporting SSID-based rules

Signed-off-by: Roopesh Chander <roop@roopc.net>
2019-02-23 13:56:51 +05:30
parent 3767a12983
commit 5d757982ba
4 changed files with 71 additions and 21 deletions
@@ -661,7 +661,7 @@ extension TunnelViewModel {
    }

    static func defaultActivateOnDemandOption() -> ActivateOnDemandOption {
-        return .anyInterface
+        return .anyInterface(.anySSID)
    }
 }

@@ -44,8 +44,8 @@ class TunnelEditTableViewController: UITableViewController {
    ]

    let activateOnDemandOptions: [ActivateOnDemandOption] = [
-        .anyInterface,
-        .wiFiInterfaceOnly,
+        .anyInterface(.anySSID),
+        .wiFiInterfaceOnly(.anySSID),
        .nonWiFiInterfaceOnly
    ]

@@ -82,8 +82,8 @@ class TunnelEditViewController: NSViewController {

    let activateOnDemandOptions: [ActivateOnDemandOption] = [
        .none,
-        .anyInterface,
-        .wiFiInterfaceOnly,
+        .anyInterface(.anySSID),
+        .wiFiInterfaceOnly(.anySSID),
        .nonWiFiInterfaceOnly
    ]