Move .killSwitch property to extras
This commit is contained in:
parent
1b704d7d4a
commit
6e6c212649
|
@ -51,7 +51,7 @@
|
||||||
"repositoryURL": "https://github.com/passepartoutvpn/tunnelkit",
|
"repositoryURL": "https://github.com/passepartoutvpn/tunnelkit",
|
||||||
"state": {
|
"state": {
|
||||||
"branch": null,
|
"branch": null,
|
||||||
"revision": "48af81e414e6f9d7ee43eb5c621a035ae939d520",
|
"revision": "47281cafc99dcfd0bdf60d41b3357cdbb33875fa",
|
||||||
"version": null
|
"version": null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -24,7 +24,7 @@ let package = Package(
|
||||||
// Dependencies declare other packages that this package depends on.
|
// Dependencies declare other packages that this package depends on.
|
||||||
// .package(url: /* package url */, from: "1.0.0"),
|
// .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", 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(name: "TunnelKit", path: "../../tunnelkit"),
|
||||||
.package(url: "https://github.com/zoul/generic-json-swift", from: "2.0.0"),
|
.package(url: "https://github.com/zoul/generic-json-swift", from: "2.0.0"),
|
||||||
.package(url: "https://github.com/SwiftyBeaver/SwiftyBeaver", from: "1.9.0")
|
.package(url: "https://github.com/SwiftyBeaver/SwiftyBeaver", from: "1.9.0")
|
||||||
|
|
|
@ -57,7 +57,6 @@ extension Profile.OpenVPNSettings: VPNConfigurationProviding {
|
||||||
configuration: customConfiguration
|
configuration: customConfiguration
|
||||||
)
|
)
|
||||||
cfg.username = parameters.username
|
cfg.username = parameters.username
|
||||||
cfg.killSwitch = true
|
|
||||||
cfg.shouldDebug = true
|
cfg.shouldDebug = true
|
||||||
cfg.debugLogPath = parameters.preferences.tunnelLogPath
|
cfg.debugLogPath = parameters.preferences.tunnelLogPath
|
||||||
cfg.debugLogFormat = parameters.preferences.tunnelLogFormat
|
cfg.debugLogFormat = parameters.preferences.tunnelLogFormat
|
||||||
|
@ -67,6 +66,7 @@ extension Profile.OpenVPNSettings: VPNConfigurationProviding {
|
||||||
extra.passwordReference = parameters.passwordReference
|
extra.passwordReference = parameters.passwordReference
|
||||||
extra.onDemandRules = parameters.onDemandRules
|
extra.onDemandRules = parameters.onDemandRules
|
||||||
extra.disconnectsOnSleep = !parameters.networkSettings.keepsAliveOnSleep
|
extra.disconnectsOnSleep = !parameters.networkSettings.keepsAliveOnSleep
|
||||||
|
extra.killSwitch = true
|
||||||
|
|
||||||
pp_log.verbose("Configuration:")
|
pp_log.verbose("Configuration:")
|
||||||
pp_log.verbose(cfg)
|
pp_log.verbose(cfg)
|
||||||
|
|
|
@ -47,7 +47,6 @@ extension Profile.WireGuardSettings: VPNConfigurationProviding {
|
||||||
appGroup: parameters.appGroup,
|
appGroup: parameters.appGroup,
|
||||||
configuration: customConfiguration
|
configuration: customConfiguration
|
||||||
)
|
)
|
||||||
cfg.killSwitch = true
|
|
||||||
cfg.shouldDebug = true
|
cfg.shouldDebug = true
|
||||||
cfg.debugLogPath = parameters.preferences.tunnelLogPath
|
cfg.debugLogPath = parameters.preferences.tunnelLogPath
|
||||||
cfg.debugLogFormat = parameters.preferences.tunnelLogFormat
|
cfg.debugLogFormat = parameters.preferences.tunnelLogFormat
|
||||||
|
@ -55,6 +54,7 @@ extension Profile.WireGuardSettings: VPNConfigurationProviding {
|
||||||
var extra = NetworkExtensionExtra()
|
var extra = NetworkExtensionExtra()
|
||||||
extra.onDemandRules = parameters.onDemandRules
|
extra.onDemandRules = parameters.onDemandRules
|
||||||
extra.disconnectsOnSleep = !parameters.networkSettings.keepsAliveOnSleep
|
extra.disconnectsOnSleep = !parameters.networkSettings.keepsAliveOnSleep
|
||||||
|
extra.killSwitch = true
|
||||||
|
|
||||||
pp_log.verbose("Configuration:")
|
pp_log.verbose("Configuration:")
|
||||||
pp_log.verbose(cfg)
|
pp_log.verbose(cfg)
|
||||||
|
|
Loading…
Reference in New Issue