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

made rank use full resolution when using OF-ETX

Browse source
This commit is contained in:
joxe 2010-10-28 20:39:06 +00:00
parent 9194b3ac69
commit 9a1f902881
5 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: rpl-icmp6.c,v 1.25 2010/10/27 00:46:40 nvt-se Exp $
* $Id: rpl-icmp6.c,v 1.26 2010/10/28 20:39:06 joxe Exp $
*/
/**
* \file
@ -497,9 +497,9 @@ dao_input(void)
if(learned_from == RPL_ROUTE_FROM_UNICAST_DAO) {
/* Check if this is a DAO forwarding loop. */
p = rpl_find_parent(dag, &dao_sender_addr);
if(p != NULL && p->rank < dag->rank) {
if(p != NULL && DAG_RANK(p->rank, dag) < DAG_RANK(dag->rank, dag)) {
printf("RPL: Loop detected when receiving a unicast DAO from a node with a lower rank! (%u < %u)\n",
DAG_RANK(p->rank, dag), DAG_RANK(dag->rank, dag));
DAG_RANK(p->rank, dag), DAG_RANK(dag->rank, dag));
rpl_local_repair(dag);
return;
}