diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-01-30 20:18:35 +0900 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-02-05 17:35:55 +0100 |
| commit | fb1bfd6804042799dc163063dc015947a1d515e8 (patch) | |
| tree | 0d219cb7eacf5af80f491cae7dca1208c29c0b7f | |
| parent | ca43a515c6bfac120e59de366c8ceb0396a0bb50 (diff) | |
| download | systemd-fb1bfd6804042799dc163063dc015947a1d515e8.tar.gz | |
dhcp6: do not use T1 and T2 longer than one provided by the lease
Fixes #12623.
(cherry picked from commit 9de8a4259eaebf4635142474e016b90ce5be5181)
(cherry picked from commit 6f4364046f90430aeede4789f016ae1644a292bf)
| -rw-r--r-- | src/libsystemd-network/sd-dhcp6-client.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index 9773a067d5..077a2bc8c4 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -659,8 +659,7 @@ static int client_timeout_resend_expire(sd_event_source *s, uint64_t usec, void } static usec_t client_timeout_compute_random(usec_t val) { - return val - val / 10 + - (random_u32() % (2 * USEC_PER_SEC)) * val / 10 / USEC_PER_SEC; + return val - (random_u32() % USEC_PER_SEC) * val / 10 / USEC_PER_SEC; } static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userdata) { |