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

Initialize the DIO object in case options are missing. Updated the terminology regarding options.

Browse source
This commit is contained in:
nvt 2011-09-05 20:28:50 +02:00
parent f7a3a8476f
commit 644f1c627d
2 changed files with 31 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,19 +79,20 @@
#define RPL_CODE_SEC_DAO 0x82 /* Secure DAO */
#define RPL_CODE_SEC_DAO_ACK 0x83 /* Secure DAO ACK */
/* RPL DIO/DAO suboption types */
#define RPL_DIO_SUBOPT_PAD1 0
#define RPL_DIO_SUBOPT_PADN 1
#define RPL_DIO_SUBOPT_DAG_METRIC_CONTAINER 2
#define RPL_DIO_SUBOPT_ROUTE_INFO 3
#define RPL_DIO_SUBOPT_DAG_CONF 4
#define RPL_DIO_SUBOPT_TARGET 5
#define RPL_DIO_SUBOPT_TRANSIT 6
#define RPL_DIO_SUBOPT_SOLICITED_INFO 7
#define RPL_DIO_SUBOPT_PREFIX_INFO 8
/* RPL control message options. */
#define RPL_OPTION_PAD1 0
#define RPL_OPTION_PADN 1
#define RPL_OPTION_DAG_METRIC_CONTAINER 2
#define RPL_OPTION_ROUTE_INFO 3
#define RPL_OPTION_DAG_CONF 4
#define RPL_OPTION_TARGET 5
#define RPL_OPTION_TRANSIT 6
#define RPL_OPTION_SOLICITED_INFO 7
#define RPL_OPTION_PREFIX_INFO 8
#define RPL_OPTION_TARGET_DESC 9
#define RPL_DAO_K_FLAG 0x80 /* DAO ACK requested */
#define RPL_DAO_D_FLAG 0x40 /* DODAG ID Present */
#define RPL_DAO_D_FLAG 0x40 /* DODAG ID present */
/*---------------------------------------------------------------------------*/
/* Default values for RPL constants and variables. */