Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-22 10:30:13 +00:00
Code Issues Projects Releases Wiki Activity

RPL DAO-ACK: move initialization of current ougoing DAO from da_output to dao_output_target_seq

Browse Source
This commit is contained in:
Simon Duquennoy 2015-11-23 13:39:49 +01:00 committed by Joakim Eriksson
parent 19b04098d5
commit e1f9369a09
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/net/rpl/rpl-icmp6.c
View File

@ -966,7 +966,6 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime)
{ {
/* Destination Advertisement Object */ /* Destination Advertisement Object */
uip_ipaddr_t prefix; uip_ipaddr_t prefix;
rpl_instance_t *instance;
if(get_global_addr(&prefix) == 0) { if(get_global_addr(&prefix) == 0) {
PRINTF("RPL: No global address set for this node - suppressing DAO\n"); PRINTF("RPL: No global address set for this node - suppressing DAO\n");
@ -976,23 +975,9 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime)
if(parent == NULL || parent->dag == NULL || parent->dag->instance == NULL) { if(parent == NULL || parent->dag == NULL || parent->dag->instance == NULL) {
return; return;
} }
instance = parent->dag->instance;
/* Sending a DAO with own prefix as target */ /* Sending a DAO with own prefix as target */
dao_output_target(parent, &prefix, lifetime); dao_output_target(parent, &prefix, lifetime);
#if RPL_WITH_DAO_ACK
/* keep track of my own sending of DAO for handling ack and loss of ack */
if(lifetime != RPL_ZERO_LIFETIME) {
instance->my_dao_seqno = dao_sequence;
instance->my_dao_transmissions = 1;
ctimer_set(&instance->dao_retransmit_timer, RPL_DAO_RETRANSMISSION_TIMEOUT,
handle_dao_retransmission, parent);
}
#else
/* We know that we have tried to register so now we are assuming
that we have a down-link - unless this is a zero lifetime one */
rpl_set_downward_link(lifetime != RPL_ZERO_LIFETIME);
#endif /* RPL_WITH_DAO_ACK */
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
@ -1089,6 +1074,19 @@ dao_output_target_seq(rpl_parent_t *parent, uip_ipaddr_t *prefix,
if(rpl_get_parent_ipaddr(parent) != NULL) { if(rpl_get_parent_ipaddr(parent) != NULL) {
uip_icmp6_send(rpl_get_parent_ipaddr(parent), ICMP6_RPL, RPL_CODE_DAO, pos); uip_icmp6_send(rpl_get_parent_ipaddr(parent), ICMP6_RPL, RPL_CODE_DAO, pos);
#if RPL_WITH_DAO_ACK
if(lifetime != RPL_ZERO_LIFETIME) {
/* keep track of my own sending of DAO for handling ack and loss of ack */
instance->my_dao_seqno = dao_sequence;
instance->my_dao_transmissions = 1;
ctimer_set(&instance->dao_retransmit_timer, RPL_DAO_RETRANSMISSION_TIMEOUT,
handle_dao_retransmission, parent);
}
#else /* RPL_WITH_DAO_ACK */
/* We know that we have tried to register so now we are assuming
that we have a down-link - unless this is a zero lifetime one */
rpl_set_downward_link(lifetime != RPL_ZERO_LIFETIME);
#endif /* RPL_WITH_DAO_ACK */
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/