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

Schedule ping block even just for timeout check

Browse Source 
In case keepAliveInterval is not set.
This commit is contained in:
Davide De Rosa 2019-12-12 18:28:23 +01:00
parent e6f2f3e85a
commit 88a1bdac06
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TunnelKit/Sources/Protocols/OpenVPN/CoreConfiguration+OpenVPN.swift
View File

@ -53,6 +53,8 @@ extension CoreConfiguration {
static let pushRequestInterval = 2.0
static let pingTimeoutCheckInterval = 10.0
static let pingTimeout = 120.0
static let retransmissionLimit = 0.1

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

@ -555,19 +555,26 @@ public class OpenVPNSession: Session {
return
}
log.debug("Send ping")
sendDataPackets([OpenVPN.DataPacket.pingString])
lastPing.outbound = Date()
// is keep-alive enabled?
if let _ = keepAliveInterval {
log.debug("Send ping")
sendDataPackets([OpenVPN.DataPacket.pingString])
lastPing.outbound = Date()
}
// schedule even just to check for ping timeout
scheduleNextPing()
}
private func scheduleNextPing() {
guard let interval = keepAliveInterval else {
log.verbose("Skip ping, keep-alive not set")
return
let interval: TimeInterval
if let keepAliveInterval = keepAliveInterval {
interval = keepAliveInterval
log.verbose("Schedule ping after \(interval) seconds")
} else {
interval = CoreConfiguration.OpenVPN.pingTimeoutCheckInterval
log.verbose("Schedule ping timeout check after \(interval) seconds")
}
log.verbose("Schedule ping after \(interval) seconds")
queue.asyncAfter(deadline: .now() + interval) { [weak self] in
log.verbose("Running ping block")
self?.ping()