RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

nib/_nib-6ln: bail out early if address is no longer assigned

Browse Source
This commit is contained in:
Benjamin Valentin 2023-10-19 19:45:34 +02:00
parent 14b608cb23
commit 7c6b367035
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
sys/net/gnrc/network_layer/ipv6/nib/_nib-6ln.c
View File

@ -185,12 +185,19 @@ void _handle_rereg_address(const ipv6_addr_t *addr)
{ {
gnrc_netif_t *netif = gnrc_netif_get_by_ipv6_addr(addr); gnrc_netif_t *netif = gnrc_netif_get_by_ipv6_addr(addr);
if (netif == NULL) {
DEBUG("nib: Couldn't re-register %s, address wasn't assigned to any "
"interface anymore.\n",
ipv6_addr_to_str(addr_str, addr, sizeof(addr_str)));
return;
}
gnrc_netif_acquire(netif); gnrc_netif_acquire(netif);
_nib_dr_entry_t *router = _nib_drl_get(NULL, netif->pid); _nib_dr_entry_t *router = _nib_drl_get(NULL, netif->pid);
const bool router_reachable = (router != NULL) && const bool router_reachable = (router != NULL) &&
_is_reachable(router->next_hop); _is_reachable(router->next_hop);
if (router_reachable && (netif != NULL)) { if (router_reachable) {
assert((unsigned)netif->pid == _nib_onl_get_if(router->next_hop)); assert((unsigned)netif->pid == _nib_onl_get_if(router->next_hop));
DEBUG("nib: Re-registering %s", DEBUG("nib: Re-registering %s",
ipv6_addr_to_str(addr_str, addr, sizeof(addr_str))); ipv6_addr_to_str(addr_str, addr, sizeof(addr_str)));
@ -200,39 +207,36 @@ void _handle_rereg_address(const ipv6_addr_t *addr)
_snd_ns(&router->next_hop->ipv6, netif, addr, &router->next_hop->ipv6); _snd_ns(&router->next_hop->ipv6, netif, addr, &router->next_hop->ipv6);
} }
else { else {
DEBUG("nib: Couldn't re-register %s, no current router found or address " DEBUG("nib: Couldn't re-register %s, no current router found.\n",
"wasn't assigned to any interface anymore.\n",
ipv6_addr_to_str(addr_str, addr, sizeof(addr_str))); ipv6_addr_to_str(addr_str, addr, sizeof(addr_str)));
} }
if (netif != NULL) {
int idx = gnrc_netif_ipv6_addr_idx(netif, addr);
if (idx < 0) { int idx = gnrc_netif_ipv6_addr_idx(netif, addr);
DEBUG("nib: %s is not assigned to interface %d anymore.\n", if (idx < 0) {
ipv6_addr_to_str(addr_str, addr, sizeof(addr_str)), DEBUG("nib: %s is not assigned to interface %d anymore.\n",
netif->pid); ipv6_addr_to_str(addr_str, addr, sizeof(addr_str)),
} netif->pid);
else if (router_reachable && }
(_is_valid(netif, idx) || (_is_tentative(netif, idx) && else if (router_reachable &&
(gnrc_netif_ipv6_addr_dad_trans(netif, idx) < (_is_valid(netif, idx) || (_is_tentative(netif, idx) &&
SIXLOWPAN_ND_REG_TRANSMIT_NUMOF)))) { (gnrc_netif_ipv6_addr_dad_trans(netif, idx) <
uint32_t retrans_time; SIXLOWPAN_ND_REG_TRANSMIT_NUMOF)))) {
uint32_t retrans_time;
if (_is_valid(netif, idx)) { if (_is_valid(netif, idx)) {
retrans_time = SIXLOWPAN_ND_MAX_RS_SEC_INTERVAL * MS_PER_SEC; retrans_time = SIXLOWPAN_ND_MAX_RS_SEC_INTERVAL * MS_PER_SEC;
}
else {
retrans_time = netif->ipv6.retrans_time;
/* increment encoded retransmission count */
netif->ipv6.addrs_flags[idx]++;
}
_evtimer_add(&netif->ipv6.addrs[idx], GNRC_IPV6_NIB_REREG_ADDRESS,
&netif->ipv6.addrs_timers[idx], retrans_time);
} }
else { else {
netif->ipv6.rs_sent = 0; retrans_time = netif->ipv6.retrans_time;
_handle_search_rtr(netif); /* increment encoded retransmission count */
netif->ipv6.addrs_flags[idx]++;
} }
_evtimer_add(&netif->ipv6.addrs[idx], GNRC_IPV6_NIB_REREG_ADDRESS,
&netif->ipv6.addrs_timers[idx], retrans_time);
}
else {
netif->ipv6.rs_sent = 0;
_handle_search_rtr(netif);
} }
gnrc_netif_release(netif); gnrc_netif_release(netif);
} }