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

gnrc_rpl: make DODAG_CONF optional when joining DODAG

Browse Source
This commit is contained in:
Cenk Gündoğan 2016-03-15 16:34:06 +01:00
parent 3f5bf480fb
commit 39255ee8f8
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/include/net/gnrc/rpl.h
View File

@ -27,7 +27,7 @@
* CFLAGS * CFLAGS
* ------ * ------
* *
* - Exclude Prefix Information Options from DIOs * - Exclude Prefix Information Options from DIOs
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {.mk} * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {.mk}
* CFLAGS += -DGNRC_RPL_WITHOUT_PIO * CFLAGS += -DGNRC_RPL_WITHOUT_PIO
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -39,6 +39,16 @@
* CFLAGS += -DGNRC_RPL_DEFAULT_DIO_REDUNDANCY_CONSTANT=10 * CFLAGS += -DGNRC_RPL_DEFAULT_DIO_REDUNDANCY_CONSTANT=10
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* *
* - Make reception of DODAG_CONF optional when joining a DODAG.
* This will use the default trickle parameters until a
* DODAG_CONF is received from the parent. The DODAG_CONF is
* requested once from the parent while joining the DODAG.
* The standard behaviour is to request a DODAG_CONF and join
* only a DODAG once a DODAG_CONF is received.
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {.mk}
* CFLAGS += -DGNRC_RPL_DODAG_CONF_OPTIONAL_ON_JOIN
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*
* @{ * @{
* *
* @file * @file

5
sys/net/gnrc/routing/rpl/gnrc_rpl_control_messages.c
View File

@ -567,10 +567,15 @@ void gnrc_rpl_recv_DIO(gnrc_rpl_dio_t *dio, ipv6_addr_t *src, uint16_t len)
} }
if (!(included_opts & (((uint32_t) 1) << GNRC_RPL_OPT_DODAG_CONF))) { if (!(included_opts & (((uint32_t) 1) << GNRC_RPL_OPT_DODAG_CONF))) {
#ifndef GNRC_RPL_DODAG_CONF_OPTIONAL_ON_JOIN
DEBUG("RPL: DIO without DODAG_CONF option - remove DODAG and request new DIO\n"); DEBUG("RPL: DIO without DODAG_CONF option - remove DODAG and request new DIO\n");
gnrc_rpl_instance_remove(inst); gnrc_rpl_instance_remove(inst);
gnrc_rpl_send_DIS(NULL, src); gnrc_rpl_send_DIS(NULL, src);
return; return;
#else
DEBUG("RPL: DIO without DODAG_CONF option - use default trickle parameters\n");
gnrc_rpl_send_DIS(NULL, src);
#endif
} }
gnrc_rpl_delay_dao(dodag); gnrc_rpl_delay_dao(dodag);