riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

set received parent lifetime when creating a new parent

Browse Source
This commit is contained in:
Oleg Hahm 2013-11-23 00:03:12 +01:00
parent 60880821fa
commit fce4f556a8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/net/rpl/rpl_dodag.c
View File

@ -150,6 +150,7 @@ rpl_parent_t *rpl_new_parent(rpl_dodag_t *dodag, ipv6_addr_t *address, uint16_t
parent->addr = *address; parent->addr = *address;
parent->rank = rank; parent->rank = rank;
parent->dodag = dodag; parent->dodag = dodag;
parent->lifetime = dodag->default_lifetime * dodag->lifetime_unit;
/* dtsn is set at the end of recv_dio function */ /* dtsn is set at the end of recv_dio function */
parent->dtsn = 0; parent->dtsn = 0;
return parent; return parent;
@ -305,7 +306,7 @@ void rpl_join_dodag(rpl_dodag_t *dodag, ipv6_addr_t *parent, uint16_t parent_ran
return; return;
} }
preferred_parent = rpl_new_parent(my_dodag, parent, parent_rank); preferred_parent = rpl_new_parent(dodag, parent, parent_rank);
if (preferred_parent == NULL) { if (preferred_parent == NULL) {
rpl_del_dodag(my_dodag); rpl_del_dodag(my_dodag);