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

RPL: improved debug messages for No-Path DAOs

Browse source
This commit is contained in:
Simon Duquennoy 2015-11-18 15:25:13 +01:00
parent 298ff6db76
commit c679046d7a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/net/rpl/rpl-dag.c
View file

@ -849,7 +849,7 @@ rpl_nullify_parent(rpl_parent_t *parent)
uip_ds6_defrt_rm(dag->instance->def_route); uip_ds6_defrt_rm(dag->instance->def_route);
dag->instance->def_route = NULL; 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) { if(parent == dag->preferred_parent) {
dao_output(parent, RPL_ZERO_LIFETIME); dao_output(parent, RPL_ZERO_LIFETIME);
rpl_set_preferred_parent(dag, NULL); rpl_set_preferred_parent(dag, NULL);

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

@ -731,11 +731,11 @@ dao_input(void)
rep->state.nopath_received = 1; rep->state.nopath_received = 1;
rep->state.lifetime = RPL_NOPATH_REMOVAL_DELAY; 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. */ one. */
if(dag->preferred_parent != NULL && if(dag->preferred_parent != NULL &&
rpl_get_parent_ipaddr(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)); PRINT6ADDR(rpl_get_parent_ipaddr(dag->preferred_parent));
PRINTF("\n"); PRINTF("\n");
uip_icmp6_send(rpl_get_parent_ipaddr(dag->preferred_parent), 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++] = 0; /* path seq - ignored */
buffer[pos++] = lifetime; buffer[pos++] = lifetime;
PRINTF("RPL: Sending DAO with prefix "); PRINTF("RPL: Sending %sDAO with prefix ", lifetime == RPL_ZERO_LIFETIME ? "No-Path " : "");
PRINT6ADDR(prefix); PRINT6ADDR(prefix);
PRINTF(" to "); PRINTF(" to ");
PRINT6ADDR(rpl_get_parent_ipaddr(parent)); PRINT6ADDR(rpl_get_parent_ipaddr(parent));