Mercurial > hg > dhcpcd
changeset 5398:505ddba6ec99 draft
DHCP6: Restore lease timings
Erroneously changed in 060f5a9e93, only seems to affect
INFORM getting into a loop.
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Wed, 01 Jul 2020 20:09:42 +0100 |
| parents | 4c2de9b44e60 |
| children | 899ada974ec8 |
| files | src/dhcp6.c |
| diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dhcp6.c Wed Jul 01 11:46:01 2020 +0100 +++ b/src/dhcp6.c Wed Jul 01 20:09:42 2020 +0100 @@ -3183,14 +3183,12 @@ state->state = DH6S_BOUND; state->failed = false; - if ((state->renew != 0 || state->rebind != 0) && - state->renew != ND6_INFINITE_LIFETIME) + if (state->renew && state->renew != ND6_INFINITE_LIFETIME) eloop_timeout_add_sec(ifp->ctx->eloop, state->renew, state->state == DH6S_INFORMED ? dhcp6_startinform : dhcp6_startrenew, ifp); - if ((state->rebind != 0 || state->expire != 0) && - state->rebind != ND6_INFINITE_LIFETIME) + if (state->rebind && state->rebind != ND6_INFINITE_LIFETIME) eloop_timeout_add_sec(ifp->ctx->eloop, state->rebind, dhcp6_startrebind, ifp); if (state->expire != ND6_INFINITE_LIFETIME)