picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #14699 from yuwata/dhcp6-fix-t1-t2

Browse source 
dhcp6: do not use T1 and T2 longer than one provided by the lease
This commit is contained in:
Lennart Poettering 2020-02-02 17:16:31 +01:00 committed by GitHub
parent 60d0a5098b 3ae01632f2
commit ddb10d8ccd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libsystemd-network/sd-dhcp6-client.c
View file

@ -675,8 +675,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) { static usec_t client_timeout_compute_random(usec_t val) {
return val - val / 10 + return val - (random_u32() % USEC_PER_SEC) * val / 10 / USEC_PER_SEC;
(random_u32() % (2 * USEC_PER_SEC)) * val / 10 / USEC_PER_SEC;
} }
static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userdata) { static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userdata) {
@ -686,7 +685,6 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
usec_t max_retransmit_duration = 0; usec_t max_retransmit_duration = 0;
uint8_t max_retransmit_count = 0; uint8_t max_retransmit_count = 0;
char time_string[FORMAT_TIMESPAN_MAX]; char time_string[FORMAT_TIMESPAN_MAX];
uint32_t expire = 0;
assert(s); assert(s);
assert(client); assert(client);
@ -735,8 +733,9 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
max_retransmit_time = DHCP6_REB_MAX_RT; max_retransmit_time = DHCP6_REB_MAX_RT;
if (event_source_is_enabled(client->timeout_resend_expire) <= 0) { if (event_source_is_enabled(client->timeout_resend_expire) <= 0) {
r = dhcp6_lease_ia_rebind_expire(&client->lease->ia, uint32_t expire = 0;
&expire);
r = dhcp6_lease_ia_rebind_expire(&client->lease->ia, &expire);
if (r < 0) { if (r < 0) {
client_stop(client, r); client_stop(client, r);
return 0; return 0;
@ -751,7 +750,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
return 0; return 0;
} }
if (max_retransmit_count && if (max_retransmit_count > 0 &&
client->retransmit_count >= max_retransmit_count) { client->retransmit_count >= max_retransmit_count) {
client_stop(client, SD_DHCP6_CLIENT_EVENT_RETRANS_MAX); client_stop(client, SD_DHCP6_CLIENT_EVENT_RETRANS_MAX);
return 0; return 0;
@ -765,7 +764,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
if (r >= 0) if (r >= 0)
client->retransmit_count++; client->retransmit_count++;
if (!client->retransmit_time) { if (client->retransmit_time == 0) {
client->retransmit_time = client->retransmit_time =
client_timeout_compute_random(init_retransmit_time); client_timeout_compute_random(init_retransmit_time);
@ -773,7 +772,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
client->retransmit_time += init_retransmit_time / 10; client->retransmit_time += init_retransmit_time / 10;
} else { } else {
if (max_retransmit_time && if (max_retransmit_time > 0 &&
client->retransmit_time > max_retransmit_time / 2) client->retransmit_time > max_retransmit_time / 2)
client->retransmit_time = client_timeout_compute_random(max_retransmit_time); client->retransmit_time = client_timeout_compute_random(max_retransmit_time);
else else
@ -791,7 +790,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
if (r < 0) if (r < 0)
goto error; goto error;
if (max_retransmit_duration && event_source_is_enabled(client->timeout_resend_expire) <= 0) { if (max_retransmit_duration > 0 && event_source_is_enabled(client->timeout_resend_expire) <= 0) {
log_dhcp6_client(client, "Max retransmission duration %"PRIu64" secs", log_dhcp6_client(client, "Max retransmission duration %"PRIu64" secs",
max_retransmit_duration / USEC_PER_SEC); max_retransmit_duration / USEC_PER_SEC);