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

gnrc_ipv6_nib_6ln: do not mark non-link-local directly VALID

Browse Source 
The whole address registration looses its point if all addresses are
marked valid from the get-go. With this fix non-link-local addresses
are first marked TENTATIVE and only after successful registration
marked as VALID. Link-local addresses are assumed to always be VALID.
This commit is contained in:
Martine Lenders 2018-02-14 18:41:58 +01:00
parent 720447458e
commit 8c8b6f9494
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1322,8 +1322,9 @@ static void _auto_configure_addr(gnrc_netif_t *netif, const ipv6_addr_t *pfx,
#endif /* GNRC_IPV6_NIB_CONF_6LN */
}
#if GNRC_IPV6_NIB_CONF_6LN
if (gnrc_netif_is_6ln(netif)) {
if GNRC_IPV6_NIB_CONF_6LN
/* mark link-local addresses as valid on 6LN */
if (gnrc_netif_is_6ln(netif) && ipv6_addr_is_link_local(pfx)) {
/* don't do this beforehand or risk a deadlock:
* * gnrc_netif_ipv6_addr_add_internal() adds VALID (i.e. manually configured
* addresses to the prefix list locking the NIB's mutex which is already
@ -1332,7 +1333,6 @@ static void _auto_configure_addr(gnrc_netif_t *netif, const ipv6_addr_t *pfx,
netif->ipv6.addrs_flags[idx] |= GNRC_NETIF_IPV6_ADDRS_FLAGS_STATE_VALID;
}
#endif /* GNRC_IPV6_NIB_CONF_6LN */
(void)idx;
/* TODO: make this line conditional on 6LN when there is a SLAAC
* implementation */
#if GNRC_IPV6_NIB_CONF_6LN
@ -1340,6 +1340,8 @@ static void _auto_configure_addr(gnrc_netif_t *netif, const ipv6_addr_t *pfx,
!gnrc_netif_is_6lbr(netif)) {
_handle_rereg_address(&netif->ipv6.addrs[idx]);
}
#else /* GNRC_IPV6_NIB_CONF_6LN */
(void)idx;
#endif /* GNRC_IPV6_NIB_CONF_6LN */
#if GNRC_IPV6_NIB_CONF_SLAAC
/* TODO send NS to solicited nodes and wait netif->ipv6.retrans_time to