Skip to content

Commit

Permalink
Aro Registation and Dao update
Browse files Browse the repository at this point in the history
Aro registration stop Active DAO process.

DAO transit build set fully path controller bit's.

Change-Id: Id692dc51611aa3a4c4df6668d0a4bfc11e454f67
  • Loading branch information
Juha Heiskanen committed Feb 7, 2020
1 parent 6cde17a commit 1acec7c
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions source/RPL/rpl_downward.c
Original file line number Diff line number Diff line change
Expand Up @@ -545,8 +545,7 @@ static rpl_dao_target_t *rpl_instance_choose_target_to_assign(rpl_instance_t *in
*/
ns_list_foreach(rpl_neighbour_t, neighbour, &instance->candidate_neighbours) {
if (neighbour->dao_path_control & unassigned_pc) {
unassigned_pc &= neighbour->dao_path_control;
*path_control = unassigned_pc;
*path_control = neighbour->dao_path_control;
*parent = neighbour;
return target;
}
Expand All @@ -561,14 +560,7 @@ static rpl_dao_target_t *rpl_instance_choose_target_to_assign(rpl_instance_t *in
}
}

/* If looking for a follow-up target, final path control must match */
if (t1) {
if (unassigned_pc != *path_control) {
continue;
}
} else {
*path_control = unassigned_pc;
}
*path_control = target->path_control;
return target;
}

Expand Down Expand Up @@ -1811,6 +1803,8 @@ static void rpl_instance_address_registration_cancel(rpl_instance_t *instance)
instance->wait_response = NULL;
instance->pending_neighbour_confirmation = false;
instance->delay_dao_timer = 0;
instance->dao_in_transit = false;
instance->dao_retry_timer = 0;
}

void rpl_instance_parent_address_reg_timer_update(rpl_instance_t *instance, uint16_t seconds)
Expand Down

0 comments on commit 1acec7c

Please sign in to comment.