summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2023-04-03 13:15:31 +0200
committerDavid Lönnhager <david.l@mullvad.net>2023-04-03 13:15:31 +0200
commit5d029cc335a3a4c364437332ac2860098ced49db (patch)
treedf6efe509e0e47488a3892277f1efeec3725a0e5
parent69b9ae59b7c5e6b528c39388941c248746a91945 (diff)
parentc25ea2b2ebf046d0ada02a2c6e6acfb5b2d01cb3 (diff)
downloadmullvadvpn-5d029cc335a3a4c364437332ac2860098ced49db.tar.xz
mullvadvpn-5d029cc335a3a4c364437332ac2860098ced49db.zip
Merge branch 'slow-down-rotation-des-128'
-rw-r--r--ios/MullvadVPN/TunnelManager/TunnelManager.swift2
-rw-r--r--mullvad-daemon/src/device/service.rs6
2 files changed, 6 insertions, 2 deletions
diff --git a/ios/MullvadVPN/TunnelManager/TunnelManager.swift b/ios/MullvadVPN/TunnelManager/TunnelManager.swift
index 196561af5e..74c2127059 100644
--- a/ios/MullvadVPN/TunnelManager/TunnelManager.swift
+++ b/ios/MullvadVPN/TunnelManager/TunnelManager.swift
@@ -31,7 +31,7 @@ private let establishedTunnelStatusPollInterval: TimeInterval = 5
private let privateKeyRotationInterval: TimeInterval = 60 * 60 * 24 * 14
/// Private key rotation retry interval (in seconds).
-private let privateKeyRotationFailureRetryInterval: TimeInterval = 60 * 15
+private let privateKeyRotationFailureRetryInterval: TimeInterval = 60 * 60 * 24
/// A class that provides a convenient interface for VPN tunnels configuration, manipulation and
/// monitoring.
diff --git a/mullvad-daemon/src/device/service.rs b/mullvad-daemon/src/device/service.rs
index 1f574f272f..c1aba7b748 100644
--- a/mullvad-daemon/src/device/service.rs
+++ b/mullvad-daemon/src/device/service.rs
@@ -206,7 +206,7 @@ impl DeviceService {
))
},
should_retry_backoff,
- retry_strategy(),
+ rotate_retry_strategy(),
)
.await
.map_err(map_rest_error)?;
@@ -443,3 +443,7 @@ fn retry_strategy() -> Jittered<ExponentialBackoff> {
.max_delay(RETRY_BACKOFF_INTERVAL_MAX),
)
}
+
+fn rotate_retry_strategy() -> impl Iterator<Item = Duration> {
+ std::iter::repeat(RETRY_BACKOFF_INTERVAL_MAX)
+}