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

Merge pull request #3679 from cgundogan/pr/rpl/trickle_reset_infinite_dio

Browse Source 
rpl: reset trickle if INFINITE_RANK DIO from child recvd
This commit is contained in:
Cenk Gündoğan 2015-08-29 09:31:18 +02:00
commit 2584bc1adf
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/net/gnrc/routing/rpl/gnrc_rpl_control_messages.c
View File

@ -432,6 +432,9 @@ void gnrc_rpl_recv_DIO(gnrc_rpl_dio_t *dio, ipv6_addr_t *src, uint16_t len)
if (byteorder_ntohs(dio->rank) != GNRC_RPL_INFINITE_RANK) { if (byteorder_ntohs(dio->rank) != GNRC_RPL_INFINITE_RANK) {
trickle_increment_counter(&dodag->trickle); trickle_increment_counter(&dodag->trickle);
} }
else {
trickle_reset_timer(&dodag->trickle);
}
return; return;
} }
@ -456,8 +459,17 @@ void gnrc_rpl_recv_DIO(gnrc_rpl_dio_t *dio, ipv6_addr_t *src, uint16_t len)
gnrc_rpl_parent_update(dodag, parent); gnrc_rpl_parent_update(dodag, parent);
/* sender of incoming DIO is not a parent of mine (anymore) and has an INFINITE rank
and I have a rank != INFINITE_RANK */
if (parent->state == 0) {
if ((byteorder_ntohs(dio->rank) == GNRC_RPL_INFINITE_RANK)
&& (dodag->my_rank != GNRC_RPL_INFINITE_RANK)) {
trickle_reset_timer(&dodag->trickle);
return;
}
}
/* incoming DIO is from pref. parent */ /* incoming DIO is from pref. parent */
if (dodag->parents && (parent == dodag->parents) && (parent->state != 0)) { else if (parent == dodag->parents) {
if (parent->dtsn != dio->dtsn) { if (parent->dtsn != dio->dtsn) {
gnrc_rpl_delay_dao(dodag); gnrc_rpl_delay_dao(dodag);
} }