riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16679 from kfessel/p-dhcp-mrd

Browse Source 
dhcpv6_client: mrd calculation fixed
This commit is contained in:
Martine Lenders 2021-07-23 19:02:38 +02:00 committed by GitHub
commit e3b52ff08d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/net/application_layer/dhcpv6/client.c
View File

@ -839,7 +839,7 @@ static void _request_renew_rebind(uint8_t type)
case DHCPV6_RENEW: case DHCPV6_RENEW:
irt = DHCPV6_REN_TIMEOUT; irt = DHCPV6_REN_TIMEOUT;
mrt = DHCPV6_REN_MAX_RT; mrt = DHCPV6_REN_MAX_RT;
mrd = rebind_time - t2; mrd = rebind_time - _now_sec();
break; break;
case DHCPV6_REBIND: { case DHCPV6_REBIND: {
irt = DHCPV6_REB_TIMEOUT; irt = DHCPV6_REB_TIMEOUT;
@ -858,7 +858,7 @@ static void _request_renew_rebind(uint8_t type)
mrd = valid_until; mrd = valid_until;
} }
} }
if (mrd > 0) { if (mrd == 0) {
/* all leases already expired, don't try to rebind and /* all leases already expired, don't try to rebind and
* solicit immediately */ * solicit immediately */
_post_solicit_servers(); _post_solicit_servers();

6
sys/net/gnrc/application_layer/dhcpv6/client.c
View File

@ -25,6 +25,7 @@
#include "net/gnrc/rpl.h" #include "net/gnrc/rpl.h"
#include "net/sock.h" #include "net/sock.h"
#include "timex.h" #include "timex.h"
#include "evtimer.h"
#include "net/dhcpv6/client.h" #include "net/dhcpv6/client.h"
@ -183,13 +184,14 @@ uint32_t dhcpv6_client_prefix_valid_until(unsigned netif,
gnrc_ipv6_nib_pl_t ple; gnrc_ipv6_nib_pl_t ple;
void *state = NULL; void *state = NULL;
uint32_t max_valid = 0; uint32_t max_valid = 0;
uint32_t now = evtimer_now_msec();
while (gnrc_ipv6_nib_pl_iter(netif, &state, &ple)) { while (gnrc_ipv6_nib_pl_iter(netif, &state, &ple)) {
if ((ple.pfx_len == pfx_len) && if ((ple.pfx_len == pfx_len) &&
((ple.valid_until / MS_PER_SEC) > max_valid) && (((ple.valid_until - now) / MS_PER_SEC) > max_valid) &&
(ipv6_addr_match_prefix(&ple.pfx, (ipv6_addr_match_prefix(&ple.pfx,
pfx) >= ple.pfx_len)) { pfx) >= ple.pfx_len)) {
max_valid = ple.valid_until / MS_PER_SEC; max_valid = (ple.valid_until - now) / MS_PER_SEC;
} }
} }
return max_valid; return max_valid;