From 6e6c212649bd62e15259bf87683e6042759a38b1 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Thu, 10 Nov 2022 07:55:18 +0100 Subject: [PATCH] Move .killSwitch property to extras --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- PassepartoutLibrary/Package.swift | 2 +- .../Extensions/OpenVPNSettings+VPNConfiguration.swift | 2 +- .../Extensions/WireGuardSettings+VPNConfiguration.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1849b8e7..ba29503e 100644 --- a/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -51,7 +51,7 @@ "repositoryURL": "https://github.com/passepartoutvpn/tunnelkit", "state": { "branch": null, - "revision": "48af81e414e6f9d7ee43eb5c621a035ae939d520", + "revision": "47281cafc99dcfd0bdf60d41b3357cdbb33875fa", "version": null } }, diff --git a/PassepartoutLibrary/Package.swift b/PassepartoutLibrary/Package.swift index 006e69f5..d0611676 100644 --- a/PassepartoutLibrary/Package.swift +++ b/PassepartoutLibrary/Package.swift @@ -24,7 +24,7 @@ let package = Package( // Dependencies declare other packages that this package depends on. // .package(url: /* package url */, from: "1.0.0"), // .package(name: "TunnelKit", url: "https://github.com/passepartoutvpn/tunnelkit", from: "5.0.0"), - .package(name: "TunnelKit", url: "https://github.com/passepartoutvpn/tunnelkit", .revision("48af81e414e6f9d7ee43eb5c621a035ae939d520")), + .package(name: "TunnelKit", url: "https://github.com/passepartoutvpn/tunnelkit", .revision("47281cafc99dcfd0bdf60d41b3357cdbb33875fa")), // .package(name: "TunnelKit", path: "../../tunnelkit"), .package(url: "https://github.com/zoul/generic-json-swift", from: "2.0.0"), .package(url: "https://github.com/SwiftyBeaver/SwiftyBeaver", from: "1.9.0") diff --git a/PassepartoutLibrary/Sources/PassepartoutVPN/Extensions/OpenVPNSettings+VPNConfiguration.swift b/PassepartoutLibrary/Sources/PassepartoutVPN/Extensions/OpenVPNSettings+VPNConfiguration.swift index 4a3633e5..e92a91a6 100644 --- a/PassepartoutLibrary/Sources/PassepartoutVPN/Extensions/OpenVPNSettings+VPNConfiguration.swift +++ b/PassepartoutLibrary/Sources/PassepartoutVPN/Extensions/OpenVPNSettings+VPNConfiguration.swift @@ -57,7 +57,6 @@ extension Profile.OpenVPNSettings: VPNConfigurationProviding { configuration: customConfiguration ) cfg.username = parameters.username - cfg.killSwitch = true cfg.shouldDebug = true cfg.debugLogPath = parameters.preferences.tunnelLogPath cfg.debugLogFormat = parameters.preferences.tunnelLogFormat @@ -67,6 +66,7 @@ extension Profile.OpenVPNSettings: VPNConfigurationProviding { extra.passwordReference = parameters.passwordReference extra.onDemandRules = parameters.onDemandRules extra.disconnectsOnSleep = !parameters.networkSettings.keepsAliveOnSleep + extra.killSwitch = true pp_log.verbose("Configuration:") pp_log.verbose(cfg) diff --git a/PassepartoutLibrary/Sources/PassepartoutVPN/Extensions/WireGuardSettings+VPNConfiguration.swift b/PassepartoutLibrary/Sources/PassepartoutVPN/Extensions/WireGuardSettings+VPNConfiguration.swift index b65a48e0..a2e17f27 100644 --- a/PassepartoutLibrary/Sources/PassepartoutVPN/Extensions/WireGuardSettings+VPNConfiguration.swift +++ b/PassepartoutLibrary/Sources/PassepartoutVPN/Extensions/WireGuardSettings+VPNConfiguration.swift @@ -47,7 +47,6 @@ extension Profile.WireGuardSettings: VPNConfigurationProviding { appGroup: parameters.appGroup, configuration: customConfiguration ) - cfg.killSwitch = true cfg.shouldDebug = true cfg.debugLogPath = parameters.preferences.tunnelLogPath cfg.debugLogFormat = parameters.preferences.tunnelLogFormat @@ -55,6 +54,7 @@ extension Profile.WireGuardSettings: VPNConfigurationProviding { var extra = NetworkExtensionExtra() extra.onDemandRules = parameters.onDemandRules extra.disconnectsOnSleep = !parameters.networkSettings.keepsAliveOnSleep + extra.killSwitch = true pp_log.verbose("Configuration:") pp_log.verbose(cfg)