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

Merge pull request #1381 from simonduq/pr/rpl-dao-debug

Browse source 
Improved RPL debugging
This commit is contained in:
Nicolas Tsiftes 2015-12-01 09:41:33 +01:00
commit 064a431bb8
3 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/net/ipv6/uip-ds6-route.c
View file

@ -427,6 +427,12 @@ uip_ds6_route_rm(uip_ds6_route_t *route)
if(list_head(route->neighbor_routes->route_list) == NULL) { if(list_head(route->neighbor_routes->route_list) == NULL) {
/* If this was the only route using this neighbor, remove the /* If this was the only route using this neighbor, remove the
neighbor from the table - this implicitly unlocks nexthop */ neighbor from the table - this implicitly unlocks nexthop */
#if (DEBUG) & DEBUG_ANNOTATE
uip_ipaddr_t *nexthop = uip_ds6_route_nexthop(route);
if(nexthop != NULL) {
ANNOTATE("#L %u 0\n", nexthop->u8[sizeof(uip_ipaddr_t) - 1]);
}
#endif /* (DEBUG) & DEBUG_ANNOTATE */
PRINTF("uip_ds6_route_rm: removing neighbor too\n"); PRINTF("uip_ds6_route_rm: removing neighbor too\n");
nbr_table_remove(nbr_routes, route->neighbor_routes->route_list); nbr_table_remove(nbr_routes, route->neighbor_routes->route_list);
} }
@ -440,25 +446,6 @@ uip_ds6_route_rm(uip_ds6_route_t *route)
#if UIP_DS6_NOTIFICATIONS #if UIP_DS6_NOTIFICATIONS
call_route_callback(UIP_DS6_NOTIFICATION_ROUTE_RM, call_route_callback(UIP_DS6_NOTIFICATION_ROUTE_RM,
&route->ipaddr, uip_ds6_route_nexthop(route)); &route->ipaddr, uip_ds6_route_nexthop(route));
#endif
#if 0 //(DEBUG & DEBUG_ANNOTATE) == DEBUG_ANNOTATE
/* we need to check if this was the last route towards "nexthop" */
/* if so - remove that link (annotation) */
uip_ds6_route_t *r;
for(r = uip_ds6_route_head();
r != NULL;
r = uip_ds6_route_next(r)) {
uip_ipaddr_t *nextr, *nextroute;
nextr = uip_ds6_route_nexthop(r);
nextroute = uip_ds6_route_nexthop(route);
if(nextr != NULL &&
nextroute != NULL &&
uip_ipaddr_cmp(nextr, nextroute)) {
/* we found another link using the specific nexthop, so keep the #L */
return;
}
}
ANNOTATE("#L %u 0\n", uip_ds6_route_nexthop(route)->u8[sizeof(uip_ipaddr_t) - 1]);
#endif #endif
} }

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));