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

Merge pull request #906 from joakimeriksson/rpl-conf-copy

Browse source 
fixed so that trickle timer and route lifetime rpl config is updated at global repair
This commit is contained in:
Nicolas Tsiftes 2015-02-07 21:23:29 +01:00
parent 5012edadc6 6edccf35a6
commit 5de85e5335
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1060,6 +1060,14 @@ global_repair(uip_ipaddr_t *from, rpl_dag_t *dag, rpl_dio_t *dio)
remove_parents(dag, 0); remove_parents(dag, 0);
dag->version = dio->version; dag->version = dio->version;
/* copy parts of the configuration so that it propagates in the network */
dag->instance->dio_intdoubl = dio->dag_intdoubl;
dag->instance->dio_intmin = dio->dag_intmin;
dag->instance->dio_redundancy = dio->dag_redund;
dag->instance->default_lifetime = dio->default_lifetime;
dag->instance->lifetime_unit = dio->lifetime_unit;
dag->instance->of->reset(dag); dag->instance->of->reset(dag);
dag->min_rank = INFINITE_RANK; dag->min_rank = INFINITE_RANK;
RPL_LOLLIPOP_INCREMENT(dag->instance->dtsn_out); RPL_LOLLIPOP_INCREMENT(dag->instance->dtsn_out);