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

Adsjut dao_ack_callback to new OFs

Browse source
This commit is contained in:
Simon Duquennoy 2016-04-22 23:59:59 +02:00 committed by Simon Duquennoy
parent bddf8207ed
commit b42b12d7c8
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/rpl/rpl-mrhof.c
View file

@ -99,10 +99,10 @@ dao_ack_callback(rpl_parent_t *p, int status)
PRINTF("RPL: MRHOF - DAO ACK received with status: %d\n", status); PRINTF("RPL: MRHOF - DAO ACK received with status: %d\n", status);
if(status >= RPL_DAO_ACK_UNABLE_TO_ACCEPT) { if(status >= RPL_DAO_ACK_UNABLE_TO_ACCEPT) {
/* punish the ETX as if this was 10 packets lost */ /* punish the ETX as if this was 10 packets lost */
neighbor_link_callback(p, MAC_TX_OK, 10); link_stats_packet_sent(rpl_get_parent_lladdr(p), MAC_TX_OK, 10);
} else if(status == RPL_DAO_ACK_TIMEOUT) { /* timeout = no ack */ } else if(status == RPL_DAO_ACK_TIMEOUT) { /* timeout = no ack */
/* punish the total lack of ACK with a similar punishment */ /* punish the total lack of ACK with a similar punishment */
neighbor_link_callback(p, MAC_TX_OK, 10); link_stats_packet_sent(rpl_get_parent_lladdr(p), MAC_TX_OK, 10);
} }
} }
#endif /* RPL_WITH_DAO_ACK */ #endif /* RPL_WITH_DAO_ACK */

21
core/net/rpl/rpl-of0.c
View file

@ -90,6 +90,25 @@ reset(rpl_dag_t *dag)
PRINTF("RPL: Reset OF0\n"); PRINTF("RPL: Reset OF0\n");
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if RPL_WITH_DAO_ACK
static void
dao_ack_callback(rpl_parent_t *p, int status)
{
if(status == RPL_DAO_ACK_UNABLE_TO_ADD_ROUTE_AT_ROOT) {
return;
}
/* here we need to handle failed DAO's and other stuff */
PRINTF("RPL: OF0 - DAO ACK received with status: %d\n", status);
if(status >= RPL_DAO_ACK_UNABLE_TO_ACCEPT) {
/* punish the ETX as if this was 10 packets lost */
link_stats_packet_sent(rpl_get_parent_lladdr(p), MAC_TX_OK, 10);
} else if(status == RPL_DAO_ACK_TIMEOUT) { /* timeout = no ack */
/* punish the total lack of ACK with a similar punishment */
link_stats_packet_sent(rpl_get_parent_lladdr(p), MAC_TX_OK, 10);
}
}
#endif /* RPL_WITH_DAO_ACK */
/*---------------------------------------------------------------------------*/
static uint16_t static uint16_t
parent_link_metric(rpl_parent_t *p) parent_link_metric(rpl_parent_t *p)
{ {
@ -198,7 +217,7 @@ update_metric_container(rpl_instance_t *instance)
rpl_of_t rpl_of0 = { rpl_of_t rpl_of0 = {
reset, reset,
#if RPL_WITH_DAO_ACK #if RPL_WITH_DAO_ACK
NULL, dao_ack_callback,
#endif #endif
parent_link_metric, parent_link_metric,
parent_path_cost, parent_path_cost,