-
Notifications
You must be signed in to change notification settings - Fork 381
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix reliability and time consumption of testInitialConnectionTimings …
…test
- Loading branch information
Jon Petersson
committed
Sep 19, 2023
1 parent
a91c5d9
commit 56f7b23
Showing
5 changed files
with
142 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
ios/PacketTunnelCore/TunnelMonitor/TunnelMonitorTimings.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| // | ||
| // TunnelMonitorTimings.swift | ||
| // PacketTunnelCore | ||
| // | ||
| // Created by Jon Petersson on 2023-09-18. | ||
| // Copyright © 2023 Mullvad VPN AB. All rights reserved. | ||
| // | ||
|
|
||
| import MullvadTypes | ||
|
|
||
| public struct TunnelMonitorTimings { | ||
| /// Interval for periodic heartbeat ping issued when traffic is flowing. | ||
| /// Should help to detect connectivity issues on networks that drop traffic in one of directions, | ||
| /// regardless if tx/rx counters are being updated. | ||
| let heartbeatPingInterval: Duration | ||
|
|
||
| /// Heartbeat timeout that once exceeded triggers next heartbeat to be sent. | ||
| let heartbeatReplyTimeout: Duration | ||
|
|
||
| /// Timeout used to determine if there was a network activity lately. | ||
| var trafficFlowTimeout: Duration { heartbeatPingInterval * 0.5 } | ||
|
|
||
| /// Ping timeout. | ||
| let pingTimeout: Duration | ||
|
|
||
| /// Interval to wait before sending next ping. | ||
| let pingDelay: Duration | ||
|
|
||
| /// Initial timeout when establishing connection. | ||
| let initialEstablishTimeout: Duration | ||
|
|
||
| /// Multiplier applied to `establishTimeout` on each failed connection attempt. | ||
| let establishTimeoutMultiplier: UInt32 | ||
|
|
||
| /// Maximum timeout when establishing connection. | ||
| var maxEstablishTimeout: Duration { pingTimeout } | ||
|
|
||
| /// Connectivity check periodicity. | ||
| let connectivityCheckInterval: Duration | ||
|
|
||
| /// Inbound traffic timeout used when outbound traffic was registered prior to inbound traffic. | ||
| let inboundTrafficTimeout: Duration | ||
|
|
||
| /// Traffic timeout applied when both tx/rx counters remain stale, i.e no traffic flowing. | ||
| /// Ping is issued after that timeout is exceeded.s | ||
| let trafficTimeout: Duration | ||
|
|
||
| public init( | ||
| heartbeatPingInterval: Duration = .seconds(10), | ||
| heartbeatReplyTimeout: Duration = .seconds(3), | ||
| pingTimeout: Duration = .seconds(15), | ||
| pingDelay: Duration = .seconds(3), | ||
| initialEstablishTimeout: Duration = .seconds(4), | ||
| establishTimeoutMultiplier: UInt32 = 2, | ||
| connectivityCheckInterval: Duration = .seconds(1), | ||
| inboundTrafficTimeout: Duration = .seconds(5), | ||
| trafficTimeout: Duration = .minutes(2) | ||
| ) { | ||
| self.heartbeatPingInterval = heartbeatPingInterval | ||
| self.heartbeatReplyTimeout = heartbeatReplyTimeout | ||
| self.pingTimeout = pingTimeout | ||
| self.pingDelay = pingDelay | ||
| self.initialEstablishTimeout = initialEstablishTimeout | ||
| self.establishTimeoutMultiplier = establishTimeoutMultiplier | ||
| self.connectivityCheckInterval = connectivityCheckInterval | ||
| self.inboundTrafficTimeout = inboundTrafficTimeout | ||
| self.trafficTimeout = trafficTimeout | ||
| } | ||
| } |
Oops, something went wrong.