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

RPL: Check acceptable_rank even after first obtaining a parent. Added comment on a slight departure from RFC6550.

Browse source
This commit is contained in:
Simon Duquennoy 2015-11-29 21:50:16 +01:00 committed by Simon Duquennoy
parent d53a3a3df2
commit 7855ba20ba
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -791,8 +791,12 @@ rpl_select_dag(rpl_instance_t *instance, rpl_parent_t *p)
/* Update the DAG rank. */ /* Update the DAG rank. */
best_dag->rank = rpl_rank_via_parent(best_dag->preferred_parent); best_dag->rank = rpl_rank_via_parent(best_dag->preferred_parent);
if(last_parent == NULL || best_dag->rank < best_dag->min_rank) { if(last_parent == NULL || best_dag->rank < best_dag->min_rank) {
/* This is a slight departure from RFC6550: if we had no preferred parent before,
* reset min_rank. This helps recovering from temporary bad link conditions. */
best_dag->min_rank = best_dag->rank; best_dag->min_rank = best_dag->rank;
} else if(!acceptable_rank(best_dag, best_dag->rank)) { }
if(!acceptable_rank(best_dag, best_dag->rank)) {
PRINTF("RPL: New rank unacceptable!\n"); PRINTF("RPL: New rank unacceptable!\n");
rpl_set_preferred_parent(instance->current_dag, NULL); rpl_set_preferred_parent(instance->current_dag, NULL);
if(instance->mop != RPL_MOP_NO_DOWNWARD_ROUTES && last_parent != NULL) { if(instance->mop != RPL_MOP_NO_DOWNWARD_ROUTES && last_parent != NULL) {