giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #621 from tdesmet/validate-dio-before-init-dag 

Add option to validate dio before init dag
This commit is contained in:
George Oikonomou 2018-09-08 21:15:34 +01:00 committed by GitHub
parent 1361f7d874 92b323c7d1
commit 20c5e968b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
os/net/routing/rpl-lite/rpl-conf.h
View File

@ -191,6 +191,13 @@
#define RPL_DEFAULT_LEAF_ONLY 0 #define RPL_DEFAULT_LEAF_ONLY 0
#endif #endif
/*
* Function used to validate dio before using it to init dag
*/
#ifdef RPL_CONF_VALIDATE_DIO_FUNC
#define RPL_VALIDATE_DIO_FUNC RPL_CONF_VALIDATE_DIO_FUNC
#endif
/******************************************************************************/ /******************************************************************************/
/********************************** Timing ************************************/ /********************************** Timing ************************************/
/******************************************************************************/ /******************************************************************************/

13
os/net/routing/rpl-lite/rpl-dag.c
View File

@ -61,6 +61,12 @@ static int init_dag_from_dio(rpl_dio_t *dio);
/* Allocate instance table. */ /* Allocate instance table. */
rpl_instance_t curr_instance; rpl_instance_t curr_instance;
/*---------------------------------------------------------------------------*/
#ifdef RPL_VALIDATE_DIO_FUNC
int RPL_VALIDATE_DIO_FUNC(rpl_dio_t *dio);
#endif /* RPL_PROBING_SELECT_FUNC */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
const char * const char *
rpl_dag_state_to_str(enum rpl_dag_state state) rpl_dag_state_to_str(enum rpl_dag_state state)
@ -542,6 +548,13 @@ init_dag_from_dio(rpl_dio_t *dio)
static int static int
process_dio_init_dag(uip_ipaddr_t *from, rpl_dio_t *dio) process_dio_init_dag(uip_ipaddr_t *from, rpl_dio_t *dio)
{ {
#ifdef RPL_VALIDATE_DIO_FUNC
if(!RPL_VALIDATE_DIO_FUNC(dio)) {
LOG_WARN("DIO validation failed\n");
return 0;
}
#endif
/* Check MOP */ /* Check MOP */
if(dio->mop != RPL_MOP_NO_DOWNWARD_ROUTES && dio->mop != RPL_MOP_NON_STORING) { if(dio->mop != RPL_MOP_NO_DOWNWARD_ROUTES && dio->mop != RPL_MOP_NON_STORING) {
LOG_WARN("ignoring DIO with an unsupported MOP: %d\n", dio->mop); LOG_WARN("ignoring DIO with an unsupported MOP: %d\n", dio->mop);