From c679046d7a8fef50bdcfff31dd1df0e4118346e6 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Wed, 18 Nov 2015 15:25:13 +0100 Subject: [PATCH] RPL: improved debug messages for No-Path DAOs --- core/net/rpl/rpl-dag.c | 2 +- core/net/rpl/rpl-icmp6.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c index 9b6c92e3f..09bbbd4ad 100644 --- a/core/net/rpl/rpl-dag.c +++ b/core/net/rpl/rpl-dag.c @@ -849,7 +849,7 @@ rpl_nullify_parent(rpl_parent_t *parent) uip_ds6_defrt_rm(dag->instance->def_route); dag->instance->def_route = NULL; } - /* Send no-path DAO only to preferred parent, if any */ + /* Send No-Path DAO only to preferred parent, if any */ if(parent == dag->preferred_parent) { dao_output(parent, RPL_ZERO_LIFETIME); rpl_set_preferred_parent(dag, NULL); diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c index 3732dec92..f0ba41308 100644 --- a/core/net/rpl/rpl-icmp6.c +++ b/core/net/rpl/rpl-icmp6.c @@ -731,11 +731,11 @@ dao_input(void) rep->state.nopath_received = 1; rep->state.lifetime = RPL_NOPATH_REMOVAL_DELAY; - /* We forward the incoming no-path DAO to our parent, if we have + /* We forward the incoming No-Path DAO to our parent, if we have one. */ if(dag->preferred_parent != NULL && rpl_get_parent_ipaddr(dag->preferred_parent) != NULL) { - PRINTF("RPL: Forwarding no-path DAO to parent "); + PRINTF("RPL: Forwarding No-Path DAO to parent "); PRINT6ADDR(rpl_get_parent_ipaddr(dag->preferred_parent)); PRINTF("\n"); uip_icmp6_send(rpl_get_parent_ipaddr(dag->preferred_parent), @@ -900,7 +900,7 @@ dao_output_target(rpl_parent_t *parent, uip_ipaddr_t *prefix, uint8_t lifetime) buffer[pos++] = 0; /* path seq - ignored */ buffer[pos++] = lifetime; - PRINTF("RPL: Sending DAO with prefix "); + PRINTF("RPL: Sending %sDAO with prefix ", lifetime == RPL_ZERO_LIFETIME ? "No-Path " : ""); PRINT6ADDR(prefix); PRINTF(" to "); PRINT6ADDR(rpl_get_parent_ipaddr(parent));