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

gnrc_rpl: allow for non-router operation (as leaf)

Browse Source
This commit is contained in:
Martine Lenders 2018-02-21 20:23:36 +01:00
parent f5b65abb30
commit 9c84cd90b8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.dep
View File

@ -122,7 +122,7 @@ ifneq (,$(filter gnrc_rpl_p2p,$(USEMODULE)))
endif endif
ifneq (,$(filter gnrc_rpl,$(USEMODULE))) ifneq (,$(filter gnrc_rpl,$(USEMODULE)))
USEMODULE += gnrc_ipv6_router_default USEMODULE += gnrc_icmpv6
USEMODULE += trickle USEMODULE += trickle
USEMODULE += xtimer USEMODULE += xtimer
endif endif

4
sys/net/gnrc/routing/rpl/gnrc_rpl_dodag.c
View File

@ -132,6 +132,7 @@ bool gnrc_rpl_dodag_init(gnrc_rpl_instance_t *instance, ipv6_addr_t *dodag_id, k
assert(instance && (instance->state > 0)); assert(instance && (instance->state > 0));
gnrc_rpl_dodag_t *dodag = &instance->dodag; gnrc_rpl_dodag_t *dodag = &instance->dodag;
gnrc_netif_t *netif = gnrc_netif_get_by_pid(iface);
dodag->dodag_id = *dodag_id; dodag->dodag_id = *dodag_id;
dodag->my_rank = GNRC_RPL_INFINITE_RANK; dodag->my_rank = GNRC_RPL_INFINITE_RANK;
@ -150,6 +151,9 @@ bool gnrc_rpl_dodag_init(gnrc_rpl_instance_t *instance, ipv6_addr_t *dodag_id, k
dodag->instance = instance; dodag->instance = instance;
dodag->iface = iface; dodag->iface = iface;
if ((netif != NULL) && !(netif->flags & GNRC_NETIF_FLAGS_IPV6_FORWARDING)) {
gnrc_rpl_leaf_operation(dodag);
}
#ifdef MODULE_GNRC_RPL_P2P #ifdef MODULE_GNRC_RPL_P2P
if ((instance->mop == GNRC_RPL_P2P_MOP) && (gnrc_rpl_p2p_ext_new(dodag) == NULL)) { if ((instance->mop == GNRC_RPL_P2P_MOP) && (gnrc_rpl_p2p_ext_new(dodag) == NULL)) {
DEBUG("RPL: could not allocate new P2P-RPL DODAG extension. Remove DODAG\n"); DEBUG("RPL: could not allocate new P2P-RPL DODAG extension. Remove DODAG\n");