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

gnrc_ipv6_nib: actually timeout a default router

Browse Source 
While the GNRC_IPV6_NIB_RTR_TIMEOUT is properly handled, it is actually
never fired. Moreover, the router lifetime is set, but never read.

This removes the router lifetime and switches it out for an evtimer
to does the GNRC_IPV6_NIB_RTR_TIMEOUT event.
This commit is contained in:
Martine Lenders 2017-11-17 11:35:14 +01:00
parent 2db13af649
commit fb5851dde4
No known key found for this signature in database
GPG Key ID: 8E97A9FE55F25D62
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h
View File

@ -184,7 +184,10 @@ typedef struct _nib_onl_entry {
*/
typedef struct {
_nib_onl_entry_t *next_hop; /**< next hop to destination */
uint16_t ltime; /**< lifetime in seconds */
/**
* @brief Event for @ref GNRC_IPV6_NIB_RTR_TIMEOUT
*/
evtimer_msg_event_t rtr_timeout;
} _nib_dr_entry_t;
/**

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

@ -592,9 +592,12 @@ static void _handle_rtr_adv(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
#endif /* !GNRC_IPV6_NIB_CONF_6LBR */
#endif /* GNRC_IPV6_NIB_CONF_MULTIHOP_P6C */
if (rtr_adv->ltime.u16 != 0) {
uint16_t rtr_ltime = byteorder_ntohs(rtr_adv->ltime);
dr = _nib_drl_add(&ipv6->src, netif->pid);
if (dr != NULL) {
dr->ltime = byteorder_ntohs(rtr_adv->ltime);
_evtimer_add(netif, GNRC_IPV6_NIB_RTR_TIMEOUT, &dr->rtr_timeout,
rtr_ltime * MS_PER_SEC);
}
else {
DEBUG("nib: default router list is full. Ignoring RA from %s\n",
@ -602,7 +605,7 @@ static void _handle_rtr_adv(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
return;
}
/* UINT16_MAX * 1000 < UINT32_MAX so there are no overflows */
next_timeout = _min(next_timeout, dr->ltime * MS_PER_SEC);
next_timeout = _min(next_timeout, rtr_ltime * MS_PER_SEC);
}
else {
dr = _nib_drl_get(&ipv6->src, netif->pid);