kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-22 21:13:52 +01:00
Code Releases Activity

ipv6/nib: fix lifetime handling in RIO handling

Browse Source
This commit is contained in:
Fabian Hüßler 2024-02-06 18:21:09 +01:00
parent c4ae9063e9
commit fef5c8c5d8
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/net/gnrc/network_layer/ipv6/nib/nib.c
View File

@ -1653,7 +1653,7 @@ static uint32_t _handle_pio(gnrc_netif_t *netif, const icmpv6_hdr_t *icmpv6,
if (valid_ltime < UINT32_MAX) { /* UINT32_MAX means infinite lifetime */ if (valid_ltime < UINT32_MAX) { /* UINT32_MAX means infinite lifetime */
/* the valid lifetime is given in seconds, but our timers work in /* the valid lifetime is given in seconds, but our timers work in
* microseconds, so we have to scale down to the smallest possible * milliseconds, so we have to scale down to the smallest possible
* value (UINT32_MAX - 1). This is however alright since we ask for * value (UINT32_MAX - 1). This is however alright since we ask for
* a new router advertisement before this timeout expires */ * a new router advertisement before this timeout expires */
valid_ltime = (valid_ltime > (UINT32_MAX / MS_PER_SEC)) ? valid_ltime = (valid_ltime > (UINT32_MAX / MS_PER_SEC)) ?
@ -1720,20 +1720,11 @@ static uint32_t _handle_rio(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
DEBUG(" - Route lifetime: %" PRIu32 "\n", DEBUG(" - Route lifetime: %" PRIu32 "\n",
byteorder_ntohl(rio->route_ltime)); byteorder_ntohl(rio->route_ltime));
if (route_ltime < UINT32_MAX) { /* UINT32_MAX means infinite lifetime */
/* the valid lifetime is given in seconds, but our timers work in
* microseconds, so we have to scale down to the smallest possible
* value (UINT32_MAX - 1). This is however alright since we ask for
* a new router advertisement before this timeout expires */
route_ltime = (route_ltime > (UINT32_MAX / MS_PER_SEC)) ?
(UINT32_MAX - 1) : route_ltime * MS_PER_SEC;
}
if (route_ltime == 0) { if (route_ltime == 0) {
gnrc_ipv6_nib_ft_del(&rio->prefix, rio->prefix_len); gnrc_ipv6_nib_ft_del(&rio->prefix, rio->prefix_len);
} else { } else {
gnrc_ipv6_nib_ft_add(&rio->prefix, rio->prefix_len, &ipv6->src, gnrc_ipv6_nib_ft_add(&rio->prefix, rio->prefix_len, &ipv6->src,
netif->pid, route_ltime); netif->pid, route_ltime == UINT32_MAX ? 0 : route_ltime);
} }
return route_ltime; return route_ltime;