mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-09-05 12:29:38 +00:00
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
This commit is contained in:
commit
6a6c3dd417
@ -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;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user