summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant2025-12-05 20:51:28 +0000
committerKevin Darbyshire-Bryant2025-12-05 20:51:28 +0000
commitc86d29bb83d6e89b4ffe49fa4155c3e1746b6b8e (patch)
tree4142b26717dc55f4440c882036c2b538493100fd
parentb062769ab85f72577f71e510446e14c82a2e28a6 (diff)
Revert "dhcpv6-ia: add some noise to the T1 and T2 periods"
Accidental push to wrong branch/repo This reverts commit 81ea5bfef775b8e2d4aae9826e84a040288864df.
-rw-r--r--src/dhcpv6-ia.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index edd7823..5af952d 100644
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -721,11 +721,8 @@ static size_t build_ia(uint8_t *buf, size_t buflen, uint16_t status,
/* UINT32_MAX is RFC defined as infinite lease-time */
a->preferred_until = (floor_preferred_lifetime == UINT32_MAX) ? 0 : floor_preferred_lifetime + now;
- /* if there's sufficient time left, subtract a pseudo random 127 seconds from the refresh timers */
- o_ia.t1 = htonl((floor_preferred_lifetime == UINT32_MAX) ? floor_preferred_liftime : (floor_preferred_liftime > 256) ?
- floor_preferred_lifetime * 5 / 10 - ((rand() >> 8) & 0x7f) : floor_preferred_lifetime * 5 / 10);
- o_ia.t2 = htonl((floor_preferred_lifetime == UINT32_MAX) ? floor_preferred_lifetime : (floor_preferred_lifetime > 256) ?
- floor_preferred_lifetime * 8 / 10 - ((rand() >> 8) & 0x7f) : floor_preferred_lifetime * 8 / 10);
+ o_ia.t1 = htonl((floor_preferred_lifetime == UINT32_MAX) ? floor_preferred_lifetime : floor_preferred_lifetime * 5 / 10);
+ o_ia.t2 = htonl((floor_preferred_lifetime == UINT32_MAX) ? floor_preferred_lifetime : floor_preferred_lifetime * 8 / 10);
if (!o_ia.t1)
o_ia.t1 = htonl(1);