ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TunnelsManager: initialize observer on correct thread

Browse Source 
Because of the callback recursion, this function needs to always be called from the right thread

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
2018-11-03 07:03:09 +01:00
parent 6405b76941
commit ec943587fa
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WireGuard/WireGuard/VPN/TunnelsManager.swift
+7 -5
View File
@@ -399,13 +399,14 @@ class TunnelContainer: NSObject {
} }
private func startObservingTunnelStatus() { private func startObservingTunnelStatus() {
if (statusObservationToken != nil) { return } DispatchQueue.main.async { [weak self] in
let connection = tunnelProvider.connection guard let s = self else { return }
statusObservationToken = NotificationCenter.default.addObserver( if (s.statusObservationToken != nil) { return }
let connection = s.tunnelProvider.connection
s.statusObservationToken = NotificationCenter.default.addObserver(
forName: .NEVPNStatusDidChange, forName: .NEVPNStatusDidChange,
object: connection, object: connection,
queue: nil) { [weak self] (_) in queue: nil) { (_) in
guard let s = self else { return }
if ((s.status == .restarting) && (connection.status == .disconnected || connection.status == .disconnecting)) { if ((s.status == .restarting) && (connection.status == .disconnected || connection.status == .disconnecting)) {
// Don't change s.status when disconnecting for a restart // Don't change s.status when disconnecting for a restart
if (connection.status == .disconnected) { if (connection.status == .disconnected) {
@@ -421,6 +422,7 @@ class TunnelContainer: NSObject {
if (s.status == .inactive) { if (s.status == .inactive) {
s.stopObservingTunnelStatus() s.stopObservingTunnelStatus()
} }
}
} }
} }