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

Added routing module with only routing.h, now included wherever RPL is used

This commit is contained in:
Simon Duquennoy 2017-12-09 00:53:48 -08:00
parent 552d088a3e
commit 871ee1e34f
54 changed files with 132 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.include
View File

@ -52,7 +52,7 @@ ifneq ("$(wildcard project-conf.h)","")
CFLAGS += -DPROJECT_CONF_PATH=\"project-conf.h\"
endif
MODULES += os os/net os/net/mac os/storage
MODULES += os os/net os/net/mac os/net/routing os/storage
oname = ${patsubst %.c,%.o,${patsubst %.S,%.o,$(1)}}

6
examples/6tisch/etsi-plugtest-2017/node.c
View File

@ -38,15 +38,11 @@
#include "contiki.h"
#include "node-id.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "sys/log.h"
#include "net/ipv6/uip-ds6-route.h"
#include "net/mac/tsch/tsch.h"
#include "net/mac/tsch/tsch-log.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#include "net/routing/routing.h"
#include "serial-shell.h"
#include "sf-plugtest.h"
#if CONTIKI_TARGET_SRF06_CC26XX

6
examples/6tisch/simple-node/node.c
View File

@ -38,15 +38,11 @@
#include "contiki.h"
#include "node-id.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "sys/log.h"
#include "net/ipv6/uip-ds6-route.h"
#include "net/mac/tsch/tsch.h"
#include "net/mac/tsch/tsch-log.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#include "net/routing/routing.h"
#define DEBUG DEBUG_PRINT
#include "net/ipv6/uip-debug.h"

6
examples/6tisch/sixtop/node-sixtop.c
View File

@ -39,17 +39,13 @@
#include "contiki.h"
#include "node-id.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "sys/log.h"
#include "net/ipv6/uip-ds6-route.h"
#include "net/mac/tsch/tsch.h"
#include "net/mac/tsch/tsch-log.h"
#include "net/mac/tsch/tsch-schedule.h"
#include "net/mac/tsch/sixtop/sixtop.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#include "net/routing/routing.h"
#include "sf-simple.h"

2
examples/ip64-router/ip64-router.c
View File

@ -2,7 +2,7 @@
#include "contiki-net.h"
#include "ip64/ip64.h"
#include "net/netstack.h"
#include "rpl-dag-root.h"
#include "net/routing/routing.h"
#include "sys/autostart.h"
/*---------------------------------------------------------------------------*/

3
examples/ipso-objects/example-server.c
View File

@ -38,9 +38,8 @@
#include "contiki.h"
#include "net/ipv6/uip.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "net/netstack.h"
#include "net/routing/routing.h"
#include "coap-constants.h"
#include "coap-engine.h"
#include "lwm2m-engine.h"

2
examples/ipv6-hooks/ipv6-hooks.c
View File

@ -1,5 +1,5 @@
#include "contiki.h"
#include "rpl.h"
#include "net/routing/routing.h"
#include "random.h"
#include "net/netstack.h"
#include "net/ipv6/simple-udp.h"

3
examples/multicast/root.c
View File

@ -48,8 +48,7 @@
#define DEBUG DEBUG_PRINT
#include "net/ipv6/uip-debug.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "net/routing/routing.h"
#define MAX_PAYLOAD_LEN 120
#define MCAST_SINK_UDP_PORT 3001 /* Host byte order */

5
examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c
View File

@ -42,11 +42,8 @@
*/
/*---------------------------------------------------------------------------*/
#include "contiki.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#include "net/routing/routing.h"
#include "mqtt.h"
#include "rpl.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-icmp6.h"
#include "net/ipv6/sicslowpan.h"

2
examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c
View File

@ -35,7 +35,7 @@
#include "contiki.h"
#include "contiki-lib.h"
#include "contiki-net.h"
#include "rpl.h"
#include "net/routing/routing.h"
#include "net/ipv6/uip.h"
#include <string.h>

5
examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c
View File

@ -36,11 +36,8 @@
*/
/*---------------------------------------------------------------------------*/
#include "contiki.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#include "net/routing/routing.h"
#include "mqtt.h"
#include "rpl.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-icmp6.h"
#include "sys/etimer.h"

5
examples/platform-specific/cc26xx/very-sleepy-demo/very-sleepy-demo.c
View File

@ -40,10 +40,7 @@
#include "net/netstack.h"
#include "net/ipv6/uip-ds6-nbr.h"
#include "net/ipv6/uip-ds6-route.h"
#include "rpl.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#include "net/routing/routing.h"
#include "coap-engine.h"
#include "coap.h"

2
examples/platform-specific/jn516x/rpl/node/node.c
View File

@ -37,7 +37,7 @@
#include "contiki.h"
#include "net/ipv6/uip-ds6.h"
#include "rpl.h"
#include "net/routing/routing.h"
#include "tools/rpl-tools.h"
#define DEBUG DEBUG_PRINT

3
examples/platform-specific/jn516x/rpl/tools/rpl-tools.c
View File

@ -36,8 +36,7 @@
#include "contiki.h"
#include "contiki-net.h"
#include "net/ipv6/uip.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "net/routing/routing.h"
#include <string.h>
#include <stdio.h>

5
examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c
View File

@ -37,10 +37,7 @@
#include "net/mac/tsch/tsch-schedule.h"
#include "net/mac/tsch/tsch.h"
#include "net/mac/tsch/tsch-private.h"
#include "rpl.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#include "net/routing/routing.h"
#include "net/mac/tsch/tsch-schedule.h"
#include "net/ipv6/uip-debug.h"
#include "lib/random.h"

3
examples/platform-specific/jn516x/tsch/tools/rpl-tools.c
View File

@ -36,8 +36,7 @@
#include "contiki.h"
#include "contiki-net.h"
#include "net/ipv6/uip.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "net/routing/routing.h"
#include <string.h>
#include <stdio.h>

2
examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/rpl-border-router.c
View File

@ -36,7 +36,7 @@
#include "contiki-net.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "rpl.h"
#include "net/routing/routing.h"
#include "simple-udp.h"
#include "net/mac/tsch/tsch.h"
#include "net/mac/tsch/tsch-schedule.h"

2
examples/platform-specific/zoul/orion/client/client.c
View File

@ -33,7 +33,7 @@
#include "http-socket.h"
#include "ipv6/ip64-addr.h"
#include "dev/leds.h"
#include "rpl.h"
#include "net/routing/routing.h"
#include <stdio.h>
/*---------------------------------------------------------------------------*/
static struct http_socket s;

2
examples/platform-specific/zoul/orion/client/ifttt-client.c
View File

@ -33,7 +33,7 @@
#include "http-socket.h"
#include "ipv6/ip64-addr.h"
#include "dev/leds.h"
#include "rpl.h"
#include "net/routing/routing.h"
#include "dev/button-sensor.h"
#include <stdio.h>
/*---------------------------------------------------------------------------*/

3
examples/platform-specific/zoul/orion/ip64-router/ip64-router.c
View File

@ -45,8 +45,7 @@
#include "contiki-net.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "net/routing/routing.h"
#include "dev/leds.h"
#include "ip64/ip64.h"
#include "net/netstack.h"

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

@ -31,10 +31,7 @@
*/
#include "contiki.h"
#include "rpl.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#include "net/routing/routing.h"
#include <stdio.h>
#include <string.h>

2
examples/rpl-udp/udp-client.c
View File

@ -1,5 +1,5 @@
#include "contiki.h"
#include "rpl.h"
#include "net/routing/routing.h"
#include "random.h"
#include "net/netstack.h"
#include "net/ipv6/simple-udp.h"

3
examples/rpl-udp/udp-server.c
View File

@ -28,8 +28,7 @@
*/
#include "contiki.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "net/routing/routing.h"
#include "net/netstack.h"
#include "net/ipv6/simple-udp.h"

1
os/contiki-net.h
View File

@ -42,6 +42,7 @@
#include "net/ipv6/uip-udp-packet.h"
#include "net/ipv6/simple-udp.h"
#include "net/ipv6/uip-nameserver.h"
#include "net/routing/routing.h"
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-icmp6.h"

7
os/net/ipv6/multicast/esmrf.c
View File

@ -46,12 +46,7 @@
#include "net/ipv6/multicast/uip-mcast6-route.h"
#include "net/ipv6/multicast/uip-mcast6-stats.h"
#include "net/ipv6/multicast/esmrf.h"
#if UIP_CONF_IPV6_RPL_LITE == 1
#include "net/rpl-lite/rpl.h"
#else /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/rpl-classic/rpl.h"
#include "net/rpl-classic/rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/routing/routing.h"
#include "net/ipv6/uip.h"
#include "net/netstack.h"
#include "net/packetbuf.h"

6
os/net/ipv6/multicast/smrf.c
View File

@ -47,11 +47,7 @@
#include "net/ipv6/multicast/uip-mcast6-route.h"
#include "net/ipv6/multicast/uip-mcast6-stats.h"
#include "net/ipv6/multicast/smrf.h"
#if UIP_CONF_IPV6_RPL_LITE == 1
#include "net/rpl-lite/rpl.h"
#else /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/rpl-classic/rpl.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/routing/routing.h"
#include "net/netstack.h"
#include "net/packetbuf.h"
#include <string.h>

7
os/net/ipv6/sicslowpan.c
View File

@ -74,12 +74,7 @@
#include "net/packetbuf.h"
#include "net/queuebuf.h"
#if UIP_CONF_IPV6_RPL_LITE == 1
#include "net/rpl-lite/rpl.h"
#else /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/rpl-classic/rpl.h"
#include "net/rpl-classic/rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/routing/routing.h"
/* Log configuration */
#include "sys/log.h"

10
os/net/ipv6/tcpip.c
View File

@ -44,15 +44,7 @@
#include "net/ipv6/uip-nd6.h"
#include "net/ipv6/uip-ds6.h"
#include "net/linkaddr.h"
#if UIP_CONF_IPV6_RPL
#if UIP_CONF_IPV6_RPL_LITE == 1
#include "net/rpl-lite/rpl.h"
#else /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/rpl-classic/rpl.h"
#include "net/rpl-classic/rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#endif
#include "net/routing/routing.h"
#include <string.h>

1
os/net/ipv6/uip-ds6-nbr.h
View File

@ -49,7 +49,6 @@
#include "net/ipv6/uip.h"
#include "net/nbr-table.h"
#include "sys/stimer.h"
#include "net/ipv6/uip-ds6.h"
#if UIP_CONF_IPV6_QUEUE_PKT
#include "net/ipv6/uip-packetqueue.h"
#endif /*UIP_CONF_QUEUE_PKT */

8
os/net/ipv6/uip-ds6-route.h
View File

@ -44,13 +44,7 @@
#include "net/nbr-table.h"
#include "sys/stimer.h"
#include "lib/list.h"
#if UIP_CONF_IPV6_RPL
#if UIP_CONF_IPV6_RPL_LITE == 1
#include "net/rpl-lite/rpl-conf.h"
#else /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/rpl-classic/rpl-conf.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#endif
#include "net/routing/routing.h"
#ifdef UIP_CONF_MAX_ROUTES
#define UIP_MAX_ROUTES UIP_CONF_MAX_ROUTES

2
os/net/ipv6/uip-ds6.h
View File

@ -46,8 +46,8 @@
#include "sys/stimer.h"
/* The size of uip_ds6_addr_t depends on UIP_ND6_DEF_MAXDADNS. Include uip-nd6.h to define it. */
#include "net/ipv6/uip-nd6.h"
#include "net/ipv6/uip-ds6-route.h"
#include "net/ipv6/uip-ds6-nbr.h"
#include "net/ipv6/uip-ds6-route.h"
/*--------------------------------------------------*/
/** Configuration. For all tables (Neighbor cache, Prefix List, Routing Table,

10
os/net/ipv6/uip-icmp6.c
View File

@ -46,6 +46,7 @@
#include "net/ipv6/uip-ds6.h"
#include "net/ipv6/uip-icmp6.h"
#include "contiki-default-conf.h"
#include "net/routing/routing.h"
/* Log configuration */
#include "sys/log.h"
@ -58,15 +59,6 @@
#define UIP_EXT_BUF ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len])
#define UIP_FIRST_EXT_BUF ((struct uip_ext_hdr *)&uip_buf[UIP_LLIPH_LEN])
#if UIP_CONF_IPV6_RPL
#if UIP_CONF_IPV6_RPL_LITE == 1
#include "net/rpl-lite/rpl.h"
#else /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/rpl-classic/rpl.h"
#include "net/rpl-classic/rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#endif /* UIP_CONF_IPV6_RPL */
/** \brief temporary IP address */
static uip_ipaddr_t tmp_ipaddr;

10
os/net/ipv6/uip6.c
View File

@ -79,15 +79,7 @@
#include "net/ipv6/uip-nd6.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#if UIP_CONF_IPV6_RPL
#if UIP_CONF_IPV6_RPL_LITE == 1
#include "net/rpl-lite/rpl.h"
#else /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/rpl-classic/rpl.h"
#include "net/rpl-classic/rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#endif
#include "net/routing/routing.h"
#if UIP_ND6_SEND_NS
#include "net/ipv6/uip-ds6-nbr.h"

8
os/net/mac/tsch/tsch-rpl.c
View File

@ -43,18 +43,12 @@
#if UIP_CONF_IPV6_RPL
#include "contiki.h"
#if UIP_CONF_IPV6_RPL_LITE == 1
#include "net/rpl-lite/rpl.h"
#else /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/rpl-classic/rpl.h"
#include "net/rpl-classic/rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/routing/routing.h"
#include "net/mac/tsch/tsch.h"
#include "net/mac/tsch/tsch-private.h"
#include "net/mac/tsch/tsch-schedule.h"
#include "net/mac/tsch/tsch-log.h"
#include "net/mac/tsch/tsch-rpl.h"
#include "tsch-rpl.h"
/* Log configuration */
#include "sys/log.h"

6
os/net/mac/tsch/tsch-rpl.h
View File

@ -38,11 +38,7 @@
/********** Includes **********/
#if UIP_CONF_IPV6_RPL_LITE == 1
#include "net/rpl-lite/rpl.h"
#else /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/rpl-classic/rpl.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/routing/routing.h"
#include "net/mac/tsch/tsch-queue.h"
/********** Functions *********/

8
os/net/mac/tsch/tsch.c
View File

@ -60,12 +60,12 @@
#include "net/mac/tsch/tsch-log.h"
#include "net/mac/tsch/tsch-packet.h"
#include "net/mac/tsch/tsch-security.h"
#include "net/mac/mac-sequence.h"
#include "lib/random.h"
#if UIP_CONF_IPV6_RPL
#include "net/mac/tsch/tsch-rpl.h"
#endif /* UIP_CONF_IPV6_RPL */
#endif /* #if UIP_CONF_IPV6_RPL */
#include "net/mac/mac-sequence.h"
#include "lib/random.h"
#include "net/routing/routing.h"
#if TSCH_WITH_SIXTOP
#include "net/mac/tsch/sixtop/sixtop.h"

73
os/net/routing/routing.h Normal file
View File

@ -0,0 +1,73 @@
/*
* Copyright (c) 2017, RISE SICS.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
*/
/**
* \file
* Routing driver header file
* \author
* Simon Duquennoy <simon.duquennoy@ri.se>
*/
#ifndef ROUTING_H_
#define ROUTING_H_
#include "contiki.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
/**
* The structure of a routing protocol driver.
*/
struct routing_driver {
char *name;
/** Initialize the routing protocol */
void (* init)(void);
/**
* Set the prefix, for nodes that will operate as root
*
* \param prefix The prefix. If NULL, UIP_DS6_DEFAULT_PREFIX is used instead
* \param iid The IID. If NULL, it will be built from uip_ds6_set_addr_iid.
*/
void (* root_set_prefix)(uip_ipaddr_t *prefix, uip_ipaddr_t *iid);
/**
* Set the node as root and start a network
*
* \return 0 in case of success, -1 otherwise
*/
int (* root_start)(void);
};
#endif /* ROUTING_H_ */

5
os/net/rpl-classic/rpl-dag-root.c
View File

@ -32,9 +32,8 @@
#include "contiki.h"
#include "contiki-net.h"
#include "net/rpl-classic/rpl.h"
#include "net/rpl-classic/rpl-private.h"
#include "net/rpl-classic/rpl-dag-root.h"
#include "rpl.h"
#include "rpl-private.h"
#include "net/ipv6/uip-ds6-route.h"
#include <string.h>

3
os/net/rpl-classic/rpl-dag.c
View File

@ -45,7 +45,8 @@
#include "contiki.h"
#include "net/link-stats.h"
#include "net/rpl-classic/rpl-private.h"
#include "rpl.h"
#include "rpl-private.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-nd6.h"
#include "net/ipv6/uip-ds6-nbr.h"

1
os/net/rpl-lite/rpl-icmp6.h
View File

@ -44,6 +44,7 @@
#include "uip.h"
#include "uip-ds6.h"
#include "uip-ds6-nbr.h"
/********** Data structures **********/

2
os/services/lwm2m/lwm2m-engine.c
View File

@ -53,6 +53,8 @@
#include "lwm2m-tlv-writer.h"
#include "lib/list.h"
#include "sys/cc.h"
#include "net/ipv6/uip-ds6.h"
#include "net/routing/routing.h"
#include <stdio.h>
#include <string.h>
#include <inttypes.h>

5
os/services/orchestra/orchestra-rule-unicast-per-neighbor-rpl-storing.c
View File

@ -44,10 +44,7 @@
#include "orchestra.h"
#include "net/ipv6/uip-ds6-route.h"
#include "net/packetbuf.h"
#include "rpl.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#include "net/routing/routing.h"
/*
* The body of this rule should be compiled only when "nbr_routes" is available,

5
os/services/orchestra/orchestra.c
View File

@ -40,10 +40,7 @@
#include "orchestra.h"
#include "net/packetbuf.h"
#include "net/ipv6/uip-icmp6.h"
#include "rpl.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#include "net/routing/routing.h"
#define DEBUG DEBUG_PRINT
#include "net/ipv6/uip-debug.h"

2
os/services/rpl-border-router/embedded/border-router-embedded.c
View File

@ -36,7 +36,7 @@
*/
#include "contiki.h"
#include "rpl.h"
#include "net/routing/routing.h"
#include "dev/button-sensor.h"
#include "dev/slip.h"
#include "rpl-border-router.h"

2
os/services/rpl-border-router/native/border-router-cmds.c
View File

@ -40,7 +40,7 @@
#include "border-router.h"
#include "border-router-cmds.h"
#include "dev/serial-line.h"
#include "rpl.h"
#include "net/routing/routing.h"
#include "net/ipv6/uiplib.h"
#include <string.h>
#include "shell.h"

3
os/services/rpl-border-router/native/border-router-native.c
View File

@ -40,7 +40,8 @@
#include "contiki.h"
#include "contiki-net.h"
#include "rpl.h"
#include "net/routing/routing.h"
#include "rpl-border-router.h"
#include "cmd.h"
#include "border-router.h"

2
os/services/rpl-border-router/rpl-border-router.c
View File

@ -31,8 +31,8 @@
*/
#include "contiki.h"
#include "net/routing/routing.h"
#include "rpl-border-router.h"
#include "rpl-dag-root.h"
/* Log configuration */
#include "sys/log.h"

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

@ -58,12 +58,7 @@
#include "net/mac/tsch/tsch-log.h"
#include "net/mac/tsch/tsch-private.h"
#endif /* MAC_CONF_WITH_TSCH */
#if UIP_CONF_IPV6_RPL_LITE
#include "net/rpl-lite/rpl.h"
#elif UIP_CONF_IPV6_RPL_CLASSIC
#include "net/rpl-classic/rpl.h"
#include "net/rpl-classic/rpl-private.h"
#endif
#include "net/routing/routing.h"
#include "net/mac/llsec802154.h"
#include <stdlib.h>

3
tests/07-simulation-base/code-ipv6/sender/unicast-sender.c
View File

@ -1,8 +1,7 @@
#include "contiki.h"
#include "contiki-lib.h"
#include "contiki-net.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "net/routing/routing.h"
#include <stdio.h>

2
tests/07-simulation-base/code-slip-radio/wait-dag.c
View File

@ -33,7 +33,7 @@
#include "contiki.h"
#include "contiki-lib.h"
#include "contiki-net.h"
#include "rpl.h"
#include "net/routing/routing.h"
#include "net/ipv6/uip.h"
#include <string.h>

2
tests/14-rpl-lite/code/receiver-node.c
View File

@ -38,7 +38,7 @@
#include "simple-udp.h"
#include "rpl.h"
#include "net/routing/routing.h"
#include "dev/leds.h"
#include <stdio.h>

3
tests/14-rpl-lite/code/root-node.c
View File

@ -38,8 +38,7 @@
#include "simple-udp.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include "net/routing/routing.h"
#include <stdio.h>
#include <string.h>

2
tests/15-rpl-classic/code/receiver-node.c
View File

@ -38,7 +38,7 @@
#include "simple-udp.h"
#include "rpl.h"
#include "net/routing/routing.h"
#include "dev/leds.h"
#include <stdio.h>

5
tests/15-rpl-classic/code/root-node.c
View File

@ -35,12 +35,9 @@
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ipv6/uip-debug.h"
#include "net/routing/routing.h"
#include "simple-udp.h"
#include "rpl.h"
#include "rpl-dag-root.h"
#include <stdio.h>
#include <string.h>