Make sure that the tunnel and path monitor run on the same serial queue
Signed-off-by: Andrej Mihajlov <and@mullvad.net> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
parent
e9bd6e576f
commit
3646430528
|
@ -8,6 +8,8 @@ import os.log
|
|||
|
||||
class PacketTunnelProvider: NEPacketTunnelProvider {
|
||||
|
||||
private let dispatchQueue = DispatchQueue(label: "PacketTunnel")
|
||||
|
||||
private var handle: Int32?
|
||||
private var networkMonitor: NWPathMonitor?
|
||||
private var ifname: String?
|
||||
|
@ -18,17 +20,18 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
|
|||
}
|
||||
|
||||
override func startTunnel(options: [String: NSObject]?, completionHandler startTunnelCompletionHandler: @escaping (Error?) -> Void) {
|
||||
dispatchQueue.async {
|
||||
let activationAttemptId = options?["activationAttemptId"] as? String
|
||||
let errorNotifier = ErrorNotifier(activationAttemptId: activationAttemptId)
|
||||
|
||||
guard let tunnelProviderProtocol = protocolConfiguration as? NETunnelProviderProtocol,
|
||||
guard let tunnelProviderProtocol = self.protocolConfiguration as? NETunnelProviderProtocol,
|
||||
let tunnelConfiguration = tunnelProviderProtocol.asTunnelConfiguration() else {
|
||||
errorNotifier.notify(PacketTunnelProviderError.savedProtocolConfigurationIsInvalid)
|
||||
startTunnelCompletionHandler(PacketTunnelProviderError.savedProtocolConfigurationIsInvalid)
|
||||
return
|
||||
}
|
||||
|
||||
configureLogger()
|
||||
self.configureLogger()
|
||||
#if os(macOS)
|
||||
wgEnableRoaming(true)
|
||||
#endif
|
||||
|
@ -43,9 +46,10 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
|
|||
}
|
||||
assert(endpoints.count == resolvedEndpoints.count)
|
||||
|
||||
packetTunnelSettingsGenerator = PacketTunnelSettingsGenerator(tunnelConfiguration: tunnelConfiguration, resolvedEndpoints: resolvedEndpoints)
|
||||
self.packetTunnelSettingsGenerator = PacketTunnelSettingsGenerator(tunnelConfiguration: tunnelConfiguration, resolvedEndpoints: resolvedEndpoints)
|
||||
|
||||
setTunnelNetworkSettings(packetTunnelSettingsGenerator!.generateNetworkSettings()) { error in
|
||||
self.setTunnelNetworkSettings(self.packetTunnelSettingsGenerator!.generateNetworkSettings()) { error in
|
||||
self.dispatchQueue.async {
|
||||
if let error = error {
|
||||
wg_log(.error, message: "Starting tunnel failed with setTunnelNetworkSettings returning \(error.localizedDescription)")
|
||||
errorNotifier.notify(PacketTunnelProviderError.couldNotSetNetworkSettings)
|
||||
|
@ -55,7 +59,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
|
|||
self.networkMonitor!.pathUpdateHandler = { [weak self] path in
|
||||
self?.pathUpdate(path: path)
|
||||
}
|
||||
self.networkMonitor!.start(queue: DispatchQueue(label: "NetworkMonitor"))
|
||||
self.networkMonitor!.start(queue: self.dispatchQueue)
|
||||
|
||||
let fileDescriptor = (self.packetFlow.value(forKeyPath: "socket.fileDescriptor") as? Int32) ?? -1
|
||||
if fileDescriptor < 0 {
|
||||
|
@ -81,15 +85,18 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override func stopTunnel(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
|
||||
networkMonitor?.cancel()
|
||||
networkMonitor = nil
|
||||
dispatchQueue.async {
|
||||
self.networkMonitor?.cancel()
|
||||
self.networkMonitor = nil
|
||||
|
||||
ErrorNotifier.removeLastErrorFile()
|
||||
|
||||
wg_log(.info, staticMessage: "Stopping tunnel")
|
||||
if let handle = handle {
|
||||
if let handle = self.handle {
|
||||
wgTurnOff(handle)
|
||||
}
|
||||
completionHandler()
|
||||
|
@ -101,23 +108,28 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
|
|||
exit(0)
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
override func handleAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
|
||||
dispatchQueue.async {
|
||||
guard let completionHandler = completionHandler else { return }
|
||||
guard let handle = handle else {
|
||||
guard let handle = self.handle else {
|
||||
completionHandler(nil)
|
||||
return
|
||||
}
|
||||
|
||||
if messageData.count == 1 && messageData[0] == 0 {
|
||||
guard let settings = wgGetConfig(handle) else {
|
||||
completionHandler(nil)
|
||||
return
|
||||
}
|
||||
completionHandler(String(cString: settings).data(using: .utf8)!)
|
||||
if let settings = wgGetConfig(handle) {
|
||||
let data = String(cString: settings).data(using: .utf8)!
|
||||
completionHandler(data)
|
||||
free(settings)
|
||||
} else {
|
||||
completionHandler(nil)
|
||||
}
|
||||
} else {
|
||||
completionHandler(nil)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class func getInterfaceName(fileDescriptor: Int32) -> String? {
|
||||
|
|
Loading…
Reference in New Issue