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

Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

Browse source
This commit is contained in:
Adam Dunkels 2011-02-22 17:35:41 +01:00
parent 64e273d388 68e9fb2a5c
commit 6a6c3dd417
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -202,6 +202,9 @@ rpl_set_root(uip_ipaddr_t *dag_id)
PRINT6ADDR(&dag->dag_id); PRINT6ADDR(&dag->dag_id);
PRINTF("\n"); PRINTF("\n");
ANNOTATE("#A root=%u\n",dag->dag_id.u8[sizeof(dag->dag_id) - 1]);
rpl_reset_dio_timer(dag, 1); rpl_reset_dio_timer(dag, 1);
return dag; return dag;
@ -513,6 +516,9 @@ join_dag(uip_ipaddr_t *from, rpl_dio_t *dio)
PRINT6ADDR(&dag->dag_id); PRINT6ADDR(&dag->dag_id);
PRINTF("\n"); PRINTF("\n");
ANNOTATE("#A join=%u\n",dag->dag_id.u8[sizeof(dag->dag_id) - 1]);
dag->default_lifetime = dio->default_lifetime; dag->default_lifetime = dio->default_lifetime;
dag->lifetime_unit = dio->lifetime_unit; dag->lifetime_unit = dio->lifetime_unit;