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

Merge #19920

Browse Source 
19920: gnrc_ipv6_nib: disable router advertisements on interface startup r=miri64 a=benpicco





Co-authored-by: Benjamin Valentin <benjamin.valentin@ml-pa.com>
This commit is contained in:
bors[bot] 2023-09-13 07:20:15 +00:00 committed by GitHub
commit d9367b14e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/include/net/gnrc/ipv6/nib/conf.h
View File

@ -130,18 +130,11 @@ extern "C" {
#endif #endif
/** /**
* @brief (de-)activate router advertising at interface start-up * @brief activate router advertising at interface start-up
*/ */
#ifndef CONFIG_GNRC_IPV6_NIB_ADV_ROUTER #ifndef CONFIG_GNRC_IPV6_NIB_ADV_ROUTER
#if CONFIG_GNRC_IPV6_NIB_ROUTER && \
(!CONFIG_GNRC_IPV6_NIB_6LR || CONFIG_GNRC_IPV6_NIB_6LBR) && \
!(IS_USED(MODULE_DHCPV6_CLIENT_IA_PD) || IS_USED(MODULE_GNRC_UHCPC) || \
IS_USED(MODULE_GNRC_IPV6_AUTO_SUBNETS) || IS_USED(MODULE_GNRC_IPV6_STATIC_ADDR))
#define CONFIG_GNRC_IPV6_NIB_ADV_ROUTER 1
#else
#define CONFIG_GNRC_IPV6_NIB_ADV_ROUTER 0 #define CONFIG_GNRC_IPV6_NIB_ADV_ROUTER 0
#endif #endif
#endif
/** /**
* @brief Include a Route Information Option for subnets * @brief Include a Route Information Option for subnets

9
sys/net/gnrc/routing/rpl/gnrc_rpl.c
View File

@ -122,10 +122,15 @@ kernel_pid_t gnrc_rpl_init(kernel_pid_t if_pid)
} }
/* register all_RPL_nodes multicast address */ /* register all_RPL_nodes multicast address */
gnrc_netif_ipv6_group_join_internal(gnrc_netif_get_by_pid(if_pid), gnrc_netif_t *netif = gnrc_netif_get_by_pid(if_pid);
&ipv6_addr_all_rpl_nodes); gnrc_netif_ipv6_group_join_internal(netif, &ipv6_addr_all_rpl_nodes);
/* send DODAG Information Solicitation */
gnrc_rpl_send_DIS(NULL, (ipv6_addr_t *) &ipv6_addr_all_rpl_nodes, NULL, 0); gnrc_rpl_send_DIS(NULL, (ipv6_addr_t *) &ipv6_addr_all_rpl_nodes, NULL, 0);
/* RPL enables routing, start advertising ourself as a router */
gnrc_ipv6_nib_change_rtr_adv_iface(netif, true);
return gnrc_rpl_pid; return gnrc_rpl_pid;
} }