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

Merge pull request #290 from simonduq/rpl-mrhof-etx-nomc

Browse source 
Update of RPL MRHOF (use no metric container with ETX [RFC6719])
This commit is contained in:
Adam Dunkels 2013-07-29 00:56:25 -07:00
commit 54f2109134
10 changed files with 43 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/net/rpl/rpl-icmp6.c
View file

@ -311,7 +311,9 @@ dio_input(void)
dio.mc.prec = buffer[i + 4] & 0xf;
dio.mc.length = buffer[i + 5];
if(dio.mc.type == RPL_DAG_MC_ETX) {
if(dio.mc.type == RPL_DAG_MC_NONE) {
/* No metric container: do nothing */
} else if(dio.mc.type == RPL_DAG_MC_ETX) {
dio.mc.obj.etx = get16(buffer, i + 6);
PRINTF("RPL: DAG MC: type %u, flags %u, aggr %u, prec %u, length %u, ETX %u\n",