giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Homogenize access to RPL non-storing links from external modules

This commit is contained in:
Simon Duquennoy 2017-12-10 12:59:00 -08:00
parent e1088e59d7
commit 627cb3de9c
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/rpl-border-router/webserver/webserver.c
View File

@ -124,8 +124,8 @@ PT_THREAD(generate_routes(struct httpd_state *s))
} }
#endif /* UIP_MAX_ROUTES != 0 */ #endif /* UIP_MAX_ROUTES != 0 */
#if RPL_WITH_NON_STORING #if UIP_CONF_IPV6_RPL
{ if(rpl_ns_num_nodes() > 0) {
static rpl_ns_node_t *link; static rpl_ns_node_t *link;
ADD(" Routing links\n <ul>\n"); ADD(" Routing links\n <ul>\n");
SEND(&s->sout); SEND(&s->sout);
@ -151,7 +151,7 @@ PT_THREAD(generate_routes(struct httpd_state *s))
ADD(" </ul>"); ADD(" </ul>");
SEND(&s->sout); SEND(&s->sout);
} }
#endif /* RPL_WITH_NON_STORING */ #endif /* UIP_CONF_IPV6_RPL */
SEND_STRING(&s->sout, BOTTOM); SEND_STRING(&s->sout, BOTTOM);

12
os/services/shell/shell-commands.c
View File

@ -551,12 +551,6 @@ static
PT_THREAD(cmd_routes(struct pt *pt, shell_output_func output, char *args)) PT_THREAD(cmd_routes(struct pt *pt, shell_output_func output, char *args))
{ {
uip_ds6_defrt_t *default_route; uip_ds6_defrt_t *default_route;
#if RPL_WITH_NON_STORING
rpl_ns_node_t *link;
#endif /* RPL_WITH_NON_STORING */
#if (UIP_MAX_ROUTES != 0)
uip_ds6_route_t *route;
#endif /* (UIP_MAX_ROUTES != 0) */
PT_BEGIN(pt); PT_BEGIN(pt);
@ -575,8 +569,9 @@ PT_THREAD(cmd_routes(struct pt *pt, shell_output_func output, char *args))
SHELL_OUTPUT(output, "-- None\n"); SHELL_OUTPUT(output, "-- None\n");
} }
#if RPL_WITH_NON_STORING #if UIP_CONF_IPV6_RPL
if(rpl_ns_num_nodes() > 0) { if(rpl_ns_num_nodes() > 0) {
rpl_ns_node_t *link;
/* Our routing links */ /* Our routing links */
SHELL_OUTPUT(output, "Routing links (%u in total):\n", rpl_ns_num_nodes()); SHELL_OUTPUT(output, "Routing links (%u in total):\n", rpl_ns_num_nodes());
link = rpl_ns_node_head(); link = rpl_ns_node_head();
@ -604,10 +599,11 @@ PT_THREAD(cmd_routes(struct pt *pt, shell_output_func output, char *args))
} else { } else {
SHELL_OUTPUT(output, "No routing links\n"); SHELL_OUTPUT(output, "No routing links\n");
} }
#endif /* RPL_WITH_NON_STORING */ #endif /* UIP_CONF_IPV6_RPL */
#if (UIP_MAX_ROUTES != 0) #if (UIP_MAX_ROUTES != 0)
if(uip_ds6_route_num_routes() > 0) { if(uip_ds6_route_num_routes() > 0) {
uip_ds6_route_t *route;
/* Our routing entries */ /* Our routing entries */
SHELL_OUTPUT(output, "Routing entries (%u in total):\n", uip_ds6_route_num_routes()); SHELL_OUTPUT(output, "Routing entries (%u in total):\n", uip_ds6_route_num_routes());
route = uip_ds6_route_head(); route = uip_ds6_route_head();