Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-22 10:30:13 +00:00
Code Issues Projects Releases Wiki Activity

removed route annotation from rpl - moved to ds6

Browse Source
This commit is contained in:
joxe 2010-12-10 22:48:31 +00:00
parent 2c30b3c6ba
commit aa1795d5c2
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/net/rpl/rpl-dag.c
View File

@ -32,7 +32,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: rpl-dag.c,v 1.38 2010/11/03 15:41:23 adamdunkels Exp $ * $Id: rpl-dag.c,v 1.39 2010/12/10 22:48:31 joxe Exp $
*/ */
/** /**
* \file * \file
@ -311,13 +311,6 @@ rpl_select_parent(rpl_dag_t *dag)
} }
if(dag->preferred_parent != best) { if(dag->preferred_parent != best) {
/* Visualize the change of the preferred parent in Cooja. */
if(dag->preferred_parent != NULL) {
ANNOTATE("#L %u 0\n",
dag->preferred_parent->addr.u8[sizeof(best->addr) - 1]);
}
ANNOTATE("#L %u 1\n", best->addr.u8[sizeof(best->addr) - 1]);
dag->preferred_parent = best; /* Cache the value. */ dag->preferred_parent = best; /* Cache the value. */
rpl_set_default_route(dag, &best->addr); rpl_set_default_route(dag, &best->addr);
/* The DAO parent set changed - schedule a DAO transmission. */ /* The DAO parent set changed - schedule a DAO transmission. */
@ -364,7 +357,6 @@ rpl_remove_parent(rpl_dag_t *dag, rpl_parent_t *parent)
PRINTF("\n"); PRINTF("\n");
if(parent == dag->preferred_parent) { if(parent == dag->preferred_parent) {
ANNOTATE("#L %u 0\n", parent->addr.u8[sizeof(parent->addr) - 1]);
dag->preferred_parent = NULL; dag->preferred_parent = NULL;
} }
@ -461,7 +453,6 @@ join_dag(uip_ipaddr_t *from, rpl_dio_t *dio)
dag->version = dio->version; dag->version = dio->version;
dag->preferred_parent = p; dag->preferred_parent = p;
ANNOTATE("#L %u 1\n", p->addr.u8[sizeof(p->addr) - 1]);
dag->dio_intdoubl = dio->dag_intdoubl; dag->dio_intdoubl = dio->dag_intdoubl;
dag->dio_intmin = dio->dag_intmin; dag->dio_intmin = dio->dag_intmin;