passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tunnels manager: Need to keep VPN-on-demand tunnels's status under observation 

Because they can turn on automatically, even while the app is in the foreground.

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2018-11-12 18:16:44 +05:30
parent bdb2411ebc
commit c60c29b93c
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
WireGuard/WireGuard/VPN/TunnelsManager.swift
View File

@ -227,7 +227,14 @@ class TunnelsManager {
class TunnelContainer: NSObject { class TunnelContainer: NSObject {
@objc dynamic var name: String @objc dynamic var name: String
@objc dynamic var status: TunnelStatus @objc dynamic var status: TunnelStatus
@objc dynamic var isActivateOnDemandEnabled: Bool
@objc dynamic var isActivateOnDemandEnabled: Bool {
didSet {
if (isActivateOnDemandEnabled) {
startObservingTunnelStatus()
}
}
}
var onDeactivationComplete: (() -> Void)? var onDeactivationComplete: (() -> Void)?
@ -241,7 +248,7 @@ class TunnelContainer: NSObject {
self.isActivateOnDemandEnabled = tunnel.isOnDemandEnabled self.isActivateOnDemandEnabled = tunnel.isOnDemandEnabled
self.tunnelProvider = tunnel self.tunnelProvider = tunnel
super.init() super.init()
if (status != .inactive) { if (status != .inactive || isActivateOnDemandEnabled) {
startObservingTunnelStatus() startObservingTunnelStatus()
} }
} }
@ -258,7 +265,7 @@ class TunnelContainer: NSObject {
let status = TunnelStatus(from: self.tunnelProvider.connection.status) let status = TunnelStatus(from: self.tunnelProvider.connection.status)
self.status = status self.status = status
self.isActivateOnDemandEnabled = self.tunnelProvider.isOnDemandEnabled self.isActivateOnDemandEnabled = self.tunnelProvider.isOnDemandEnabled
if (status != .inactive) { if (status != .inactive || isActivateOnDemandEnabled) {
startObservingTunnelStatus() startObservingTunnelStatus()
} }
} }
@ -375,9 +382,11 @@ class TunnelContainer: NSObject {
} }
s.status = TunnelStatus(from: connection.status) s.status = TunnelStatus(from: connection.status)
if (s.status == .inactive) { if (s.status == .inactive) {
s.statusObservationToken = nil
s.onDeactivationComplete?() s.onDeactivationComplete?()
s.onDeactivationComplete = nil s.onDeactivationComplete = nil
if (!s.isActivateOnDemandEnabled) {
s.statusObservationToken = nil
}
} }
} }
} }