deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1378 from simonduq/pr/rpl-dao-delay-naming

Browse source 
RPL: clearer naming and documentation of DAO delay constants
This commit is contained in:
Nicolas Tsiftes 2015-11-18 17:56:35 +01:00
parent 9bb3a3a235 33f8db0dd3
commit 500a74a057
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/net/rpl/rpl-icmp6.c
View file

@ -729,7 +729,7 @@ dao_input(void)
PRINT6ADDR(&prefix);
PRINTF("\n");
rep->state.nopath_received = 1;
rep->state.lifetime = DAO_EXPIRATION_TIMEOUT;
rep->state.lifetime = RPL_NOPATH_REMOVAL_DELAY;
/* We forward the incoming no-path DAO to our parent, if we have
one. */

22
core/net/rpl/rpl-private.h
View file

@ -103,12 +103,19 @@
/*---------------------------------------------------------------------------*/
/* Default values for RPL constants and variables. */
/* The default value for the DAO timer. */
#ifdef RPL_CONF_DAO_LATENCY
#define RPL_DAO_LATENCY RPL_CONF_DAO_LATENCY
#else /* RPL_CONF_DAO_LATENCY */
#define RPL_DAO_LATENCY (CLOCK_SECOND * 4)
#endif /* RPL_DAO_LATENCY */
/* DAO transmissions are always delayed by RPL_DAO_DELAY +/- RPL_DAO_DELAY/2 */
#ifdef RPL_CONF_DAO_DELAY
#define RPL_DAO_DELAY RPL_CONF_DAO_DELAY
#else /* RPL_CONF_DAO_DELAY */
#define RPL_DAO_DELAY (CLOCK_SECOND * 4)
#endif /* RPL_CONF_DAO_DELAY */
/* Delay between reception of a no-path DAO and actual route removal */
#ifdef RPL_CONF_NOPATH_REMOVAL_DELAY
#define RPL_NOPATH_REMOVAL_DELAY RPL_CONF_NOPATH_REMOVAL_DELAY
#else /* RPL_CONF_NOPATH_REMOVAL_DELAY */
#define RPL_NOPATH_REMOVAL_DELAY 60
#endif /* RPL_CONF_NOPATH_REMOVAL_DELAY */
/* Special value indicating immediate removal. */
#define RPL_ZERO_LIFETIME 0
@ -134,9 +141,6 @@
#define INFINITE_RANK 0xffff
/* Expire DAOs from neighbors that do not respond in this time. (seconds) */
#define DAO_EXPIRATION_TIMEOUT 60
/*---------------------------------------------------------------------------*/
#define RPL_INSTANCE_LOCAL_FLAG 0x80
#define RPL_INSTANCE_D_FLAG 0x40

2
core/net/rpl/rpl-timers.c
View file

@ -312,7 +312,7 @@ schedule_dao(rpl_instance_t *instance, clock_time_t latency)
void
rpl_schedule_dao(rpl_instance_t *instance)
{
schedule_dao(instance, RPL_DAO_LATENCY);
schedule_dao(instance, RPL_DAO_DELAY);
}
/*---------------------------------------------------------------------------*/
void