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

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Afonso Oliveira 2018-09-09 22:07:36 +01:00 committed by GitHub
commit 42be17c8bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 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);

2
os/net/security/tinydtls

@ -1 +1 @@
Subproject commit 5da931eeb78d1cd4a1e0068a91de9b78bd3f66de Subproject commit 53a0d97da748a67093c49cb38744650c71d58c4d