mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 18:07:25 +00:00
Code Issues Releases Wiki Activity

[master] Correct calculation of client timeout to include MRD

Browse Source 
Correc the calculation of the next climet timeout period to
properly include MRD.
This commit is contained in:
Shawn Routhier 2014-04-30 13:21:48 -07:00
parent df1280d050
commit b6ab3f6c2a
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RELNOTES
View File

@ -98,6 +98,11 @@ by Eric Young (eay@cryptsoft.com).
- Remove unused RCSID tags. - Remove unused RCSID tags.
[ISC-Bugs #35846] [ISC-Bugs #35846]
- Correct the v6 client timing code. When doing the timing backoff
for MRT limit it to MRD.
Thanks to Jiri Popelka at Red Hat for the bug and fix.
[ISC-Bugs #21238
Changes since 4.3.0rc1 Changes since 4.3.0rc1
- None - None

26
client/dhc6.c
View File

@ -1,7 +1,7 @@
/* dhc6.c - DHCPv6 client routines. */ /* dhc6.c - DHCPv6 client routines. */
/* /*
* Copyright (c) 2012-2013 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2012-2014 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2006-2010 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2006-2010 by Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -300,7 +300,7 @@ dhc6_retrans_init(struct client_state *client)
static void static void
dhc6_retrans_advance(struct client_state *client) dhc6_retrans_advance(struct client_state *client)
{ {
struct timeval elapsed; struct timeval elapsed, elapsed_plus_rt;
/* elapsed = cur - start */ /* elapsed = cur - start */
elapsed.tv_sec = cur_tv.tv_sec - client->start_time.tv_sec; elapsed.tv_sec = cur_tv.tv_sec - client->start_time.tv_sec;
@ -317,6 +317,12 @@ dhc6_retrans_advance(struct client_state *client)
elapsed.tv_sec += 1; elapsed.tv_sec += 1;
elapsed.tv_usec -= 1000000; elapsed.tv_usec -= 1000000;
} }
/*
* Save what the time will be after the current RT to determine
* what the delta to MRD will be.
*/
elapsed_plus_rt.tv_sec = elapsed.tv_sec;
elapsed_plus_rt.tv_usec = elapsed.tv_usec;
/* /*
* RT for each subsequent message transmission is based on the previous * RT for each subsequent message transmission is based on the previous
@ -355,12 +361,16 @@ dhc6_retrans_advance(struct client_state *client)
} }
if (elapsed.tv_sec >= client->MRD) { if (elapsed.tv_sec >= client->MRD) {
/* /*
* wake at RT + cur = start + MRD * The desired RT is the time that will be remaining in MRD
* when the current timeout finishes. We then have
* desired RT = MRD - (elapsed time + previous RT); or
* desired RT = MRD - elapsed_plut_rt;
*/ */
client->RT = client->MRD + client->RT = client->MRD - elapsed_plus_rt.tv_sec;
(client->start_time.tv_sec - cur_tv.tv_sec); client->RT = (client->RT * 100) -
client->RT = client->RT * 100 + (elapsed_plus_rt.tv_usec / 10000);
(client->start_time.tv_usec - cur_tv.tv_usec) / 10000; if (client->RT < 0)
client->RT = 0;
} }
client->txcount++; client->txcount++;
} }
@ -1437,7 +1447,7 @@ check_timing6 (struct client_state *client, u_int8_t msg_type,
} }
/* Check if finished (-1 argument). */ /* Check if finished (-1 argument). */
if ((client->MRD != 0) && (elapsed.tv_sec > client->MRD)) { if ((client->MRD != 0) && (elapsed.tv_sec >= client->MRD)) {
log_info("Max retransmission duration exceeded."); log_info("Max retransmission duration exceeded.");
return(CHK_TIM_MRD_EXCEEDED); return(CHK_TIM_MRD_EXCEEDED);
} }