Skip to content

Commit 1acec7c

Browse files
author
Juha Heiskanen
committed
Aro Registation and Dao update
Aro registration stop Active DAO process. DAO transit build set fully path controller bit's. Change-Id: Id692dc51611aa3a4c4df6668d0a4bfc11e454f67
1 parent 6cde17a commit 1acec7c

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

source/RPL/rpl_downward.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,7 @@ static rpl_dao_target_t *rpl_instance_choose_target_to_assign(rpl_instance_t *in
545545
*/
546546
ns_list_foreach(rpl_neighbour_t, neighbour, &instance->candidate_neighbours) {
547547
if (neighbour->dao_path_control & unassigned_pc) {
548-
unassigned_pc &= neighbour->dao_path_control;
549-
*path_control = unassigned_pc;
548+
*path_control = neighbour->dao_path_control;
550549
*parent = neighbour;
551550
return target;
552551
}
@@ -561,14 +560,7 @@ static rpl_dao_target_t *rpl_instance_choose_target_to_assign(rpl_instance_t *in
561560
}
562561
}
563562

564-
/* If looking for a follow-up target, final path control must match */
565-
if (t1) {
566-
if (unassigned_pc != *path_control) {
567-
continue;
568-
}
569-
} else {
570-
*path_control = unassigned_pc;
571-
}
563+
*path_control = target->path_control;
572564
return target;
573565
}
574566

@@ -1811,6 +1803,8 @@ static void rpl_instance_address_registration_cancel(rpl_instance_t *instance)
18111803
instance->wait_response = NULL;
18121804
instance->pending_neighbour_confirmation = false;
18131805
instance->delay_dao_timer = 0;
1806+
instance->dao_in_transit = false;
1807+
instance->dao_retry_timer = 0;
18141808
}
18151809

18161810
void rpl_instance_parent_address_reg_timer_update(rpl_instance_t *instance, uint16_t seconds)

0 commit comments

Comments
 (0)