From f47c0f579d3d9b597e9a2cb743c1b92852920039 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Wed, 27 Apr 2016 14:00:55 +0200 Subject: [PATCH 1/2] RPL DAO ACK: improve logging --- core/net/rpl/rpl-icmp6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c index 0f20ddb67..32338e456 100644 --- a/core/net/rpl/rpl-icmp6.c +++ b/core/net/rpl/rpl-icmp6.c @@ -936,7 +936,7 @@ handle_dao_retransmission(void *ptr) 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); if(get_global_addr(&prefix) == 0) { @@ -1172,7 +1172,7 @@ dao_ack_input(void) uip_ds6_route_rm(re); } } 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 */ From 0379398d7cc92093ed89f57c4873424aa9b13146 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Wed, 27 Apr 2016 14:01:44 +0200 Subject: [PATCH 2/2] RPL DAO ACK: increment DAO seqno before storing it to my_dao_seqno --- core/net/rpl/rpl-icmp6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c index 32338e456..406b1b6c4 100644 --- a/core/net/rpl/rpl-icmp6.c +++ b/core/net/rpl/rpl-icmp6.c @@ -969,6 +969,7 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime) return; } + RPL_LOLLIPOP_INCREMENT(dao_sequence); #if RPL_WITH_DAO_ACK /* set up the state since this will be the first transmission of DAO */ /* retransmissions will call directly to dao_output_target_seq */ @@ -995,7 +996,6 @@ dao_output(rpl_parent_t *parent, uint8_t lifetime) void 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); } /*---------------------------------------------------------------------------*/