passepartoutvpn
/
tunnelkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore errors from outdated link writes 

Prevents async delegation after cleanup.
This commit is contained in:
Davide De Rosa 2019-08-09 18:38:19 +02:00
parent f15a7e1c6d
commit 6b281711c7
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
TunnelKit/Sources/Protocols/OpenVPN/OpenVPNSession.swift
View File

@ -387,7 +387,7 @@ public class OpenVPNSession: Session {
private func loopLink() {
let loopedLink = link
loopedLink?.setReadHandler(queue: queue) { [weak self] (newPackets, error) in
guard loopedLink === self?.link else {
guard self?.link === loopedLink else {
log.warning("Ignoring read from outdated LINK")
return
}
@ -1008,7 +1008,12 @@ public class OpenVPNSession: Session {
}
// WARNING: runs in Network.framework queue
let writeLink = link
link?.writePackets(rawList) { [weak self] (error) in
guard self?.link === writeLink else {
log.warning("Ignoring write from outdated LINK")
return
}
if let error = error {
self?.queue.sync {
log.error("Failed LINK write during control flush: \(error)")
@ -1131,7 +1136,12 @@ public class OpenVPNSession: Session {
// WARNING: runs in Network.framework queue
controlChannel.addSentDataCount(encryptedPackets.flatCount)
let writeLink = link
link?.writePackets(encryptedPackets) { [weak self] (error) in
guard self?.link === writeLink else {
log.warning("Ignoring write from outdated LINK")
return
}
if let error = error {
self?.queue.sync {
log.error("Data: Failed LINK write during send data: \(error)")
@ -1172,7 +1182,12 @@ public class OpenVPNSession: Session {
}
// WARNING: runs in Network.framework queue
let writeLink = link
link?.writePacket(raw) { [weak self] (error) in
guard self?.link === writeLink else {
log.warning("Ignoring write from outdated LINK")
return
}
if let error = error {
self?.queue.sync {
log.error("Failed LINK write during send ack for packetId \(controlPacket.packetId): \(error)")