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

Merge pull request #1634 from simonduq/pr/daoack-fix

Browse source 
DAO ACK fix
This commit is contained in:
Antonio Lignan 2016-04-27 23:47:07 +02:00
parent 24449e9cba 0379398d7c
commit 6afd56e0ee
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -936,7 +936,7 @@ handle_dao_retransmission(void *ptr)
return; return;
} }
PRINTF("Should retransmit DAO - seq:%d trans:%d\n", instance->my_dao_seqno, PRINTF("RPL: will retransmit DAO - seq:%d trans:%d\n", instance->my_dao_seqno,
instance->my_dao_transmissions); instance->my_dao_transmissions);
if(get_global_addr(&prefix) == 0) { if(get_global_addr(&prefix) == 0) {
@ -969,6 +969,7 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime)
return; return;
} }
RPL_LOLLIPOP_INCREMENT(dao_sequence);
#if RPL_WITH_DAO_ACK #if RPL_WITH_DAO_ACK
/* set up the state since this will be the first transmission of DAO */ /* set up the state since this will be the first transmission of DAO */
/* retransmissions will call directly to dao_output_target_seq */ /* retransmissions will call directly to dao_output_target_seq */
@ -995,7 +996,6 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime)
void void
dao_output_target(rpl_parent_t *parent, uip_ipaddr_t *prefix, uint8_t lifetime) dao_output_target(rpl_parent_t *parent, uip_ipaddr_t *prefix, uint8_t lifetime)
{ {
RPL_LOLLIPOP_INCREMENT(dao_sequence);
dao_output_target_seq(parent, prefix, lifetime, dao_sequence); dao_output_target_seq(parent, prefix, lifetime, dao_sequence);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -1172,7 +1172,7 @@ dao_ack_input(void)
uip_ds6_route_rm(re); uip_ds6_route_rm(re);
} }
} else { } else {
PRINTF("RPL: No route entry to fwd DAO ACK to\n"); PRINTF("RPL: No route entry found to forward DAO ACK (seqno %u)\n", sequence);
} }
} }
#endif /* RPL_WITH_DAO_ACK */ #endif /* RPL_WITH_DAO_ACK */