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

Merge pull request #1311 from arurke/dis-config

Browse source 
Add configuration of DIS start delay and interval in RPL conf.
This commit is contained in:
Nicolas Tsiftes 2015-11-17 17:48:18 +01:00
parent b3b22756b7 857d69a338
commit e642dfc671
2 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/net/rpl/rpl-conf.h
View file

@ -238,7 +238,7 @@
/* /*
* RPL probing. When enabled, probes will be sent periodically to keep * RPL probing. When enabled, probes will be sent periodically to keep
* parent link estimates up to date. * parent link estimates up to date.
* */ */
#ifdef RPL_CONF_WITH_PROBING #ifdef RPL_CONF_WITH_PROBING
#define RPL_WITH_PROBING RPL_CONF_WITH_PROBING #define RPL_WITH_PROBING RPL_CONF_WITH_PROBING
#else #else
@ -247,7 +247,7 @@
/* /*
* RPL probing interval. * RPL probing interval.
* */ */
#ifdef RPL_CONF_PROBING_INTERVAL #ifdef RPL_CONF_PROBING_INTERVAL
#define RPL_PROBING_INTERVAL RPL_CONF_PROBING_INTERVAL #define RPL_PROBING_INTERVAL RPL_CONF_PROBING_INTERVAL
#else #else
@ -256,7 +256,7 @@
/* /*
* RPL probing expiration time. * RPL probing expiration time.
* */ */
#ifdef RPL_CONF_PROBING_EXPIRATION_TIME #ifdef RPL_CONF_PROBING_EXPIRATION_TIME
#define RPL_PROBING_EXPIRATION_TIME RPL_CONF_PROBING_EXPIRATION_TIME #define RPL_PROBING_EXPIRATION_TIME RPL_CONF_PROBING_EXPIRATION_TIME
#else #else
@ -265,7 +265,7 @@
/* /*
* Function used to select the next parent to be probed. * Function used to select the next parent to be probed.
* */ */
#ifdef RPL_CONF_PROBING_SELECT_FUNC #ifdef RPL_CONF_PROBING_SELECT_FUNC
#define RPL_PROBING_SELECT_FUNC RPL_CONF_PROBING_SELECT_FUNC #define RPL_PROBING_SELECT_FUNC RPL_CONF_PROBING_SELECT_FUNC
#else #else
@ -279,7 +279,7 @@
* To probe with DIS, use: * To probe with DIS, use:
* #define RPL_CONF_PROBING_SEND_FUNC(instance, addr) dis_output((addr)) * #define RPL_CONF_PROBING_SEND_FUNC(instance, addr) dis_output((addr))
* Any other custom probing function is also acceptable. * Any other custom probing function is also acceptable.
* */ */
#ifdef RPL_CONF_PROBING_SEND_FUNC #ifdef RPL_CONF_PROBING_SEND_FUNC
#define RPL_PROBING_SEND_FUNC RPL_CONF_PROBING_SEND_FUNC #define RPL_PROBING_SEND_FUNC RPL_CONF_PROBING_SEND_FUNC
#else #else
@ -288,7 +288,7 @@
/* /*
* Function used to calculate next RPL probing interval * Function used to calculate next RPL probing interval
* */ */
#ifdef RPL_CONF_PROBING_DELAY_FUNC #ifdef RPL_CONF_PROBING_DELAY_FUNC
#define RPL_PROBING_DELAY_FUNC RPL_CONF_PROBING_DELAY_FUNC #define RPL_PROBING_DELAY_FUNC RPL_CONF_PROBING_DELAY_FUNC
#else #else
@ -296,4 +296,22 @@
+ random_rand() % (RPL_PROBING_INTERVAL)) + random_rand() % (RPL_PROBING_INTERVAL))
#endif #endif
/*
* Interval of DIS transmission
*/
#ifdef RPL_CONF_DIS_INTERVAL
#define RPL_DIS_INTERVAL RPL_CONF_DIS_INTERVAL
#else
#define RPL_DIS_INTERVAL 60
#endif
/*
* Added delay of first DIS transmission after boot
*/
#ifdef RPL_CONF_DIS_START_DELAY
#define RPL_DIS_START_DELAY RPL_CONF_DIS_START_DELAY
#else
#define RPL_DIS_START_DELAY 5
#endif
#endif /* RPL_CONF_H */ #endif /* RPL_CONF_H */

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

@ -184,12 +184,7 @@
/* DIS related */ /* DIS related */
#define RPL_DIS_SEND 1 #define RPL_DIS_SEND 1
#ifdef RPL_DIS_INTERVAL_CONF
#define RPL_DIS_INTERVAL RPL_DIS_INTERVAL_CONF
#else
#define RPL_DIS_INTERVAL 60
#endif
#define RPL_DIS_START_DELAY 5
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Lollipop counters */ /* Lollipop counters */