kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2026-01-01 01:41:18 +01:00
Code Releases Activity

Merge pull request #10724 from miri64/gnrc_ipv6_nib/fix/mixed-mode-ABRO

Browse Source 
gnrc_ipv6_nib: fix RA reception for non-6LN interfaces
This commit is contained in:
Gunar Schorcht 2019-01-08 09:47:09 +01:00 committed by GitHub
commit fb9e25faf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1382,6 +1382,16 @@ static void _remove_prefix(const ipv6_addr_t *pfx, unsigned pfx_len)
return;
}
#if GNRC_IPV6_NIB_CONF_MULTIHOP_P6C
static inline bool _multihop_p6c(gnrc_netif_t *netif, _nib_abr_entry_t *abr)
{
(void)netif; /* gnrc_netif_is_6lr() might resolve to a NOP */
return (gnrc_netif_is_6lr(netif) && (abr != NULL));
}
#else /* GNRC_IPV6_NIB_CONF_MULTIHOP_P6C */
#define _multihop_p6c(netif, abr) (false)
#endif /* GNRC_IPV6_NIB_CONF_MULTIHOP_P6C */
#if GNRC_IPV6_NIB_CONF_MULTIHOP_P6C
static uint32_t _handle_pio(gnrc_netif_t *netif, const icmpv6_hdr_t *icmpv6,
const ndp_opt_pi_t *pio, _nib_abr_entry_t *abr)
@ -1415,7 +1425,7 @@ static uint32_t _handle_pio(gnrc_netif_t *netif, const icmpv6_hdr_t *icmpv6,
if (pio->flags & NDP_OPT_PI_FLAGS_A) {
_auto_configure_addr(netif, &pio->prefix, pio->prefix_len);
}
if ((pio->flags & NDP_OPT_PI_FLAGS_L) || gnrc_netif_is_6lr(netif)) {
if ((pio->flags & NDP_OPT_PI_FLAGS_L) || _multihop_p6c(netif, abr)) {
_nib_offl_entry_t *pfx;
if (pio->valid_ltime.u32 == 0) {
@ -1442,8 +1452,9 @@ static uint32_t _handle_pio(gnrc_netif_t *netif, const icmpv6_hdr_t *icmpv6,
if ((pfx = _nib_pl_add(netif->pid, &pio->prefix, pio->prefix_len,
valid_ltime, pref_ltime))) {
#if GNRC_IPV6_NIB_CONF_MULTIHOP_P6C
assert(abr != NULL); /* should have been set in _handle_abro() */
_nib_abr_add_pfx(abr, pfx);
if (abr != NULL) {
_nib_abr_add_pfx(abr, pfx);
}
#endif /* GNRC_IPV6_NIB_CONF_MULTIHOP_P6C */
if (pio->flags & NDP_OPT_PI_FLAGS_L) {
pfx->flags |= _PFX_ON_LINK;