From f8ddf8c816dd600b34259dbf9b3712cc4c4102b2 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Sun, 10 Dec 2017 13:06:53 -0800 Subject: [PATCH] Added missing includes for modules that rely on RPL --- examples/6tisch/simple-node/node.c | 7 +++++++ .../cc26xx/cc26xx-web-demo/cetic-6lbr-client.c | 5 +++++ .../jn516x/rpl/coap-dongle-node/dongle-node.c | 1 + .../jn516x/rpl/coap-dr1175-node/dr1175-node.c | 1 + .../jn516x/rpl/coap-dr1199-node/dr1199-node.c | 1 + .../jn516x/tsch/tx-power-verification/node/node.c | 1 + .../jn516x/tsch/uart1-test-node/uart1-test-node.c | 1 + examples/rpl-border-router/webserver/webserver.c | 1 + os/net/mac/tsch/tsch-rpl.c | 7 +++++++ os/services/orchestra/orchestra.c | 5 +++++ tests/07-simulation-base/code-slip-radio/wait-dag.c | 6 ++++++ 11 files changed, 36 insertions(+) diff --git a/examples/6tisch/simple-node/node.c b/examples/6tisch/simple-node/node.c index 1132ecb67..f26049d15 100644 --- a/examples/6tisch/simple-node/node.c +++ b/examples/6tisch/simple-node/node.c @@ -44,6 +44,13 @@ #include "net/mac/tsch/tsch-log.h" #include "net/routing/routing.h" +#if ROUTING_CONF_RPL_LITE +#include "net/routing/rpl-lite/rpl.h" +#elif ROUTING_CONF_RPL_CLASSIC +#include "net/routing/rpl-classic/rpl.h" +#include "net/routing/rpl-classic/rpl-ns.h" +#endif + #define DEBUG DEBUG_PRINT #include "net/ipv6/uip-debug.h" diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c index 11171e51e..d3042bf81 100644 --- a/examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c +++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c @@ -37,6 +37,11 @@ #include "contiki-net.h" #include "net/routing/routing.h" #include "net/ipv6/uip.h" +#if ROUTING_CONF_RPL_LITE +#include "net/routing/rpl-lite/rpl.h" +#elif ROUTING_CONF_RPL_CLASSIC +#include "net/routing/rpl-classic/rpl.h" +#endif #include #include diff --git a/examples/platform-specific/jn516x/rpl/coap-dongle-node/dongle-node.c b/examples/platform-specific/jn516x/rpl/coap-dongle-node/dongle-node.c index 5e8c3cca1..2fb2d7761 100644 --- a/examples/platform-specific/jn516x/rpl/coap-dongle-node/dongle-node.c +++ b/examples/platform-specific/jn516x/rpl/coap-dongle-node/dongle-node.c @@ -34,6 +34,7 @@ #include "contiki.h" #include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" +#include "net/routing/routing.h" #include "coap-engine.h" #include "sys/ctimer.h" #include diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/dr1175-node.c b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/dr1175-node.c index 75d654a1e..443cf4fbe 100644 --- a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/dr1175-node.c +++ b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/dr1175-node.c @@ -35,6 +35,7 @@ #include "contiki.h" #include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" +#include "net/routing/routing.h" #include "coap-engine.h" #include "light-sensor.h" #include "ht-sensor.h" diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/dr1199-node.c b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/dr1199-node.c index b901414d6..d341170ad 100644 --- a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/dr1199-node.c +++ b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/dr1199-node.c @@ -34,6 +34,7 @@ #include "contiki.h" #include "net/ipv6/uip.h" #include "net/ipv6/uip-ds6.h" +#include "net/routing/routing.h" #include "coap-engine.h" #include "dev/leds.h" #include "button-sensor.h" diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/node.c b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/node.c index 45a2f191a..995dc3304 100644 --- a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/node.c +++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/node.c @@ -33,6 +33,7 @@ */ #include "contiki.h" #include "net/ipv6/uip-ds6.h" +#include "net/routing/routing.h" #include "net/netstack.h" #include "net/ipv6/uip.h" #include "net/linkaddr.h" diff --git a/examples/platform-specific/jn516x/tsch/uart1-test-node/uart1-test-node.c b/examples/platform-specific/jn516x/tsch/uart1-test-node/uart1-test-node.c index 0d96527bc..dd647fa21 100644 --- a/examples/platform-specific/jn516x/tsch/uart1-test-node/uart1-test-node.c +++ b/examples/platform-specific/jn516x/tsch/uart1-test-node/uart1-test-node.c @@ -34,6 +34,7 @@ #include "contiki.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip.h" +#include "net/routing/routing.h" #include "net/linkaddr.h" #include "coap-engine.h" #include "sys/ctimer.h" diff --git a/examples/rpl-border-router/webserver/webserver.c b/examples/rpl-border-router/webserver/webserver.c index a4946b6e7..9e47065b6 100644 --- a/examples/rpl-border-router/webserver/webserver.c +++ b/examples/rpl-border-router/webserver/webserver.c @@ -37,6 +37,7 @@ #include "net/routing/rpl-lite/rpl.h" #elif ROUTING_CONF_RPL_CLASSIC #include "net/routing/rpl-classic/rpl.h" +#include "net/routing/rpl-classic/rpl-ns.h" #endif #include diff --git a/os/net/mac/tsch/tsch-rpl.c b/os/net/mac/tsch/tsch-rpl.c index c01c0ea67..bc54de99c 100644 --- a/os/net/mac/tsch/tsch-rpl.c +++ b/os/net/mac/tsch/tsch-rpl.c @@ -51,6 +51,13 @@ #include "net/mac/tsch/tsch-log.h" #include "net/mac/tsch/tsch-rpl.h" +#if ROUTING_CONF_RPL_LITE +#include "net/routing/rpl-lite/rpl.h" +#elif ROUTING_CONF_RPL_CLASSIC +#include "net/routing/rpl-classic/rpl.h" +#include "net/routing/rpl-classic/rpl-private.h" +#endif + /* Log configuration */ #include "sys/log.h" #define LOG_MODULE "TSCH RPL" diff --git a/os/services/orchestra/orchestra.c b/os/services/orchestra/orchestra.c index efd5b9f5d..8b9929c03 100644 --- a/os/services/orchestra/orchestra.c +++ b/os/services/orchestra/orchestra.c @@ -41,6 +41,11 @@ #include "net/packetbuf.h" #include "net/ipv6/uip-icmp6.h" #include "net/routing/routing.h" +#if ROUTING_CONF_RPL_LITE +#include "net/routing/rpl-lite/rpl.h" +#elif ROUTING_CONF_RPL_CLASSIC +#include "net/routing/rpl-classic/rpl.h" +#endif #define DEBUG DEBUG_PRINT #include "net/ipv6/uip-debug.h" diff --git a/tests/07-simulation-base/code-slip-radio/wait-dag.c b/tests/07-simulation-base/code-slip-radio/wait-dag.c index e824ea55b..b349204b9 100644 --- a/tests/07-simulation-base/code-slip-radio/wait-dag.c +++ b/tests/07-simulation-base/code-slip-radio/wait-dag.c @@ -37,6 +37,12 @@ #include "net/ipv6/uip.h" #include +#if ROUTING_CONF_RPL_LITE +#include "net/routing/rpl-lite/rpl.h" +#elif ROUTING_CONF_RPL_CLASSIC +#include "net/routing/rpl-classic/rpl.h" +#endif + #define DEBUG DEBUG_FULL #include "net/ipv6/uip-debug.h"