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

Revert "gnrc_ipv6_nib: consider all local interfaces when looking for address"

Browse Source 
This reverts commit 8871b929ab.
This commit is contained in:
Benjamin Valentin 2022-02-17 19:27:48 +01:00
parent e58af6a876
commit 32c89e72ef
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -915,7 +915,6 @@ static void _handle_nbr_sol(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
const ndp_nbr_sol_t *nbr_sol, size_t icmpv6_len) const ndp_nbr_sol_t *nbr_sol, size_t icmpv6_len)
{ {
size_t tmp_len = icmpv6_len - sizeof(ndp_nbr_sol_t); size_t tmp_len = icmpv6_len - sizeof(ndp_nbr_sol_t);
gnrc_netif_t *tgt_netif;
int tgt_idx; int tgt_idx;
ndp_opt_t *opt; ndp_opt_t *opt;
@ -941,23 +940,13 @@ static void _handle_nbr_sol(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
ipv6_addr_to_str(addr_str, &ipv6->dst, sizeof(addr_str))); ipv6_addr_to_str(addr_str, &ipv6->dst, sizeof(addr_str)));
return; return;
} }
/* check if target is assigned only now in case the length was wrong */
/* check if the address belongs to this host */ tgt_idx = gnrc_netif_ipv6_addr_idx(netif, &nbr_sol->tgt);
tgt_netif = gnrc_netif_get_by_ipv6_addr(&nbr_sol->tgt);
if (tgt_netif != NULL) {
/* check if target is assigned only now in case the length was wrong */
tgt_idx = gnrc_netif_ipv6_addr_idx(tgt_netif, &nbr_sol->tgt);
} else {
tgt_idx = -1;
}
if (tgt_idx < 0) { if (tgt_idx < 0) {
DEBUG("nib: Target address %s is not assigned to the local interface\n", DEBUG("nib: Target address %s is not assigned to the local interface\n",
ipv6_addr_to_str(addr_str, &nbr_sol->tgt, sizeof(addr_str))); ipv6_addr_to_str(addr_str, &nbr_sol->tgt, sizeof(addr_str)));
return; return;
} }
/* pre-check option length */ /* pre-check option length */
FOREACH_OPT(nbr_sol, opt, tmp_len) { FOREACH_OPT(nbr_sol, opt, tmp_len) {
if (tmp_len > icmpv6_len) { if (tmp_len > icmpv6_len) {
@ -979,16 +968,19 @@ static void _handle_nbr_sol(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
DEBUG(" - Destination address: %s\n", DEBUG(" - Destination address: %s\n",
ipv6_addr_to_str(addr_str, &ipv6->dst, sizeof(addr_str))); ipv6_addr_to_str(addr_str, &ipv6->dst, sizeof(addr_str)));
#if IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_SLAAC) #if IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_SLAAC)
gnrc_netif_t *tgt_netif = gnrc_netif_get_by_ipv6_addr(&nbr_sol->tgt);
if (tgt_netif != NULL) { if (tgt_netif != NULL) {
int idx;
gnrc_netif_acquire(tgt_netif); gnrc_netif_acquire(tgt_netif);
tgt_idx = gnrc_netif_ipv6_addr_idx(tgt_netif, &nbr_sol->tgt); idx = gnrc_netif_ipv6_addr_idx(tgt_netif, &nbr_sol->tgt);
/* if idx < 0: /* if idx < 0:
* nbr_sol->tgt was removed between getting tgt_netif by nbr_sol->tgt * nbr_sol->tgt was removed between getting tgt_netif by nbr_sol->tgt
* and gnrc_netif_acquire(tgt_netif). This is like `tgt_netif` would * and gnrc_netif_acquire(tgt_netif). This is like `tgt_netif` would
* have been NULL in the first place so just continue as if it would * have been NULL in the first place so just continue as if it would
* have. */ * have. */
if ((tgt_idx >= 0) && gnrc_netif_ipv6_addr_dad_trans(tgt_netif, tgt_idx)) { if ((idx >= 0) && gnrc_netif_ipv6_addr_dad_trans(tgt_netif, idx)) {
if (!ipv6_addr_is_unspecified(&ipv6->src)) { if (!ipv6_addr_is_unspecified(&ipv6->src)) {
/* (see https://tools.ietf.org/html/rfc4862#section-5.4.3) */ /* (see https://tools.ietf.org/html/rfc4862#section-5.4.3) */
DEBUG("nib: Neighbor is performing AR, but target address is " DEBUG("nib: Neighbor is performing AR, but target address is "
@ -998,7 +990,7 @@ static void _handle_nbr_sol(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
} }
/* cancel validation timer */ /* cancel validation timer */
evtimer_del(&_nib_evtimer, evtimer_del(&_nib_evtimer,
&tgt_netif->ipv6.addrs_timers[tgt_idx].event); &tgt_netif->ipv6.addrs_timers[idx].event);
/* _remove_tentative_addr() context switches to `tgt_netif->pid` so /* _remove_tentative_addr() context switches to `tgt_netif->pid` so
* release `tgt_netif`. We are done here anyway. */ * release `tgt_netif`. We are done here anyway. */
gnrc_netif_release(tgt_netif); gnrc_netif_release(tgt_netif);

9
sys/net/gnrc/network_layer/ndp/gnrc_ndp.c
View File

@ -355,16 +355,11 @@ void gnrc_ndp_nbr_adv_send(const ipv6_addr_t *tgt, gnrc_netif_t *netif,
gnrc_netif_acquire(netif); gnrc_netif_acquire(netif);
do { /* XXX: hidden goto */ do { /* XXX: hidden goto */
int tgt_idx; int tgt_idx;
gnrc_netif_t *tgt_netif = gnrc_netif_get_by_ipv6_addr(tgt);
if (tgt_netif == NULL) { if ((tgt_idx = gnrc_netif_ipv6_addr_idx(netif, tgt)) < 0) {
DEBUG("ndp: tgt not assigned to interface. Abort sending\n"); DEBUG("ndp: tgt not assigned to interface. Abort sending\n");
break; break;
} }
tgt_idx = gnrc_netif_ipv6_addr_idx(tgt_netif, tgt);
assert(tgt_idx >= 0);
if (gnrc_netif_is_rtr(netif) && gnrc_netif_is_rtr_adv(netif)) { if (gnrc_netif_is_rtr(netif) && gnrc_netif_is_rtr_adv(netif)) {
adv_flags |= NDP_NBR_ADV_FLAGS_R; adv_flags |= NDP_NBR_ADV_FLAGS_R;
} }
@ -397,7 +392,7 @@ void gnrc_ndp_nbr_adv_send(const ipv6_addr_t *tgt, gnrc_netif_t *netif,
} }
/* TODO: also check if the node provides proxy services for tgt */ /* TODO: also check if the node provides proxy services for tgt */
if ((pkt != NULL) && if ((pkt != NULL) &&
(tgt_netif->ipv6.addrs_flags[tgt_idx] & (netif->ipv6.addrs_flags[tgt_idx] &
GNRC_NETIF_IPV6_ADDRS_FLAGS_ANYCAST)) { GNRC_NETIF_IPV6_ADDRS_FLAGS_ANYCAST)) {
/* TL2A is not supplied and tgt is not anycast */ /* TL2A is not supplied and tgt is not anycast */
adv_flags |= NDP_NBR_ADV_FLAGS_O; adv_flags |= NDP_NBR_ADV_FLAGS_O;