riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rpl: introduce constants for PREFIX_INFO length with/without RPL_OPT_LEN

Browse Source
This commit is contained in:
Cenk Gündoğan 2015-01-31 12:58:00 +01:00
parent 26095013a1
commit c14217c68e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/net/include/rpl/rpl_config.h
View File

@ -57,7 +57,8 @@ enum RPL_MSG_CODE {
#define RPL_OPT_LEN 2 #define RPL_OPT_LEN 2
#define RPL_OPT_DODAG_CONF_LEN 14 #define RPL_OPT_DODAG_CONF_LEN 14
#define RPL_OPT_DODAG_CONF_LEN_WITH_OPT_LEN (RPL_OPT_DODAG_CONF_LEN + RPL_OPT_LEN) #define RPL_OPT_DODAG_CONF_LEN_WITH_OPT_LEN (RPL_OPT_DODAG_CONF_LEN + RPL_OPT_LEN)
#define RPL_OPT_PREFIX_INFO_LEN 32 #define RPL_OPT_PREFIX_INFO_LEN 30
#define RPL_OPT_PREFIX_INFO_LEN_WITH_OPT_LEN (RPL_OPT_PREFIX_INFO_LEN + RPL_OPT_LEN)
#define RPL_OPT_SOLICITED_INFO_LEN 21 #define RPL_OPT_SOLICITED_INFO_LEN 21
#define RPL_OPT_TARGET_LEN 20 #define RPL_OPT_TARGET_LEN 20
#define RPL_OPT_TRANSIT_LEN 22 #define RPL_OPT_TRANSIT_LEN 22

4
sys/net/routing/rpl/rpl_nonstoring/rpl_nonstoring.c
View File

@ -488,12 +488,12 @@ void rpl_recv_DIO_mode(void)
} }
case (RPL_OPT_PREFIX_INFO): { case (RPL_OPT_PREFIX_INFO): {
if (rpl_opt_buf->length != (RPL_OPT_PREFIX_INFO_LEN - RPL_OPT_LEN)) { if (rpl_opt_buf->length != RPL_OPT_PREFIX_INFO_LEN) {
/* error malformed */ /* error malformed */
return; return;
} }
len += RPL_OPT_PREFIX_INFO_LEN; len += RPL_OPT_PREFIX_INFO_LEN_WITH_OPT_LEN;
break; break;
} }

4
sys/net/routing/rpl/rpl_storing/rpl_storing.c
View File

@ -519,12 +519,12 @@ void rpl_recv_DIO_mode(void)
} }
case (RPL_OPT_PREFIX_INFO): { case (RPL_OPT_PREFIX_INFO): {
if (rpl_opt_buf->length != (RPL_OPT_PREFIX_INFO_LEN - RPL_OPT_LEN)) { if (rpl_opt_buf->length != RPL_OPT_PREFIX_INFO_LEN) {
/* error malformed */ /* error malformed */
return; return;
} }
len += RPL_OPT_PREFIX_INFO_LEN; len += RPL_OPT_PREFIX_INFO_LEN_WITH_OPT_LEN;
break; break;
} }