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

2017-12-09 00:53:48 -08:00 · 2017-12-09 00:53:48 -08:00 · 871ee1e34f
commit 871ee1e34f
parent 552d088a3e
54 changed files with 132 additions and 158 deletions
--- a/Makefile.include
+++ b/Makefile.include
@ -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)}}

--- a/examples/6tisch/etsi-plugtest-2017/node.c
+++ b/examples/6tisch/etsi-plugtest-2017/node.c
@ -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
--- a/examples/6tisch/simple-node/node.c
+++ b/examples/6tisch/simple-node/node.c
@ -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"
--- a/examples/6tisch/sixtop/node-sixtop.c
+++ b/examples/6tisch/sixtop/node-sixtop.c
@ -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"

--- a/examples/ip64-router/ip64-router.c
+++ b/examples/ip64-router/ip64-router.c
@ -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"

 /*---------------------------------------------------------------------------*/
--- a/examples/ipso-objects/example-server.c
+++ b/examples/ipso-objects/example-server.c
@ -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"
--- a/examples/ipv6-hooks/ipv6-hooks.c
+++ b/examples/ipv6-hooks/ipv6-hooks.c
@ -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"
--- a/examples/multicast/root.c
+++ b/examples/multicast/root.c
@ -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 */
--- a/examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c
+++ b/examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c
@ -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"
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c
+++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c
@ -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>
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c
+++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c
@ -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"
--- a/examples/platform-specific/cc26xx/very-sleepy-demo/very-sleepy-demo.c
+++ b/examples/platform-specific/cc26xx/very-sleepy-demo/very-sleepy-demo.c
@ -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"

--- a/examples/platform-specific/jn516x/rpl/node/node.c
+++ b/examples/platform-specific/jn516x/rpl/node/node.c
@ -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
--- a/examples/platform-specific/jn516x/rpl/tools/rpl-tools.c
+++ b/examples/platform-specific/jn516x/rpl/tools/rpl-tools.c
@ -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>

--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c
@ -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"
--- a/examples/platform-specific/jn516x/tsch/tools/rpl-tools.c
+++ b/examples/platform-specific/jn516x/tsch/tools/rpl-tools.c
@ -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>

--- a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/rpl-border-router.c
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/rpl-border-router.c
@ -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"
--- a/examples/platform-specific/zoul/orion/client/client.c
+++ b/examples/platform-specific/zoul/orion/client/client.c
@ -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;
--- a/examples/platform-specific/zoul/orion/client/ifttt-client.c
+++ b/examples/platform-specific/zoul/orion/client/ifttt-client.c
@ -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>
 /*---------------------------------------------------------------------------*/
--- a/examples/platform-specific/zoul/orion/ip64-router/ip64-router.c
+++ b/examples/platform-specific/zoul/orion/ip64-router/ip64-router.c
@ -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"
--- a/examples/rpl-border-router/webserver/webserver.c
+++ b/examples/rpl-border-router/webserver/webserver.c
@ -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>
--- a/examples/rpl-udp/udp-client.c
+++ b/examples/rpl-udp/udp-client.c
@ -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"
--- a/examples/rpl-udp/udp-server.c
+++ b/examples/rpl-udp/udp-server.c
@ -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"

--- a/os/contiki-net.h
+++ b/os/contiki-net.h
@ -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"
--- a/os/net/ipv6/multicast/esmrf.c
+++ b/os/net/ipv6/multicast/esmrf.c
@ -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"
--- a/os/net/ipv6/multicast/smrf.c
+++ b/os/net/ipv6/multicast/smrf.c
@ -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>
--- a/os/net/ipv6/sicslowpan.c
+++ b/os/net/ipv6/sicslowpan.c
@ -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"
--- a/os/net/ipv6/tcpip.c
+++ b/os/net/ipv6/tcpip.c
@ -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>

--- a/os/net/ipv6/uip-ds6-nbr.h
+++ b/os/net/ipv6/uip-ds6-nbr.h
@ -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 */
--- a/os/net/ipv6/uip-ds6-route.h
+++ b/os/net/ipv6/uip-ds6-route.h
@ -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
--- a/os/net/ipv6/uip-ds6.h
+++ b/os/net/ipv6/uip-ds6.h
@ -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,
--- a/os/net/ipv6/uip-icmp6.c
+++ b/os/net/ipv6/uip-icmp6.c
@ -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;

--- a/os/net/ipv6/uip6.c
+++ b/os/net/ipv6/uip6.c
@ -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"
--- a/os/net/mac/tsch/tsch-rpl.c
+++ b/os/net/mac/tsch/tsch-rpl.c
@ -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"
--- a/os/net/mac/tsch/tsch-rpl.h
+++ b/os/net/mac/tsch/tsch-rpl.h
@ -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 *********/
--- a/os/net/mac/tsch/tsch.c
+++ b/os/net/mac/tsch/tsch.c
@ -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"
--- a/os/net/routing/routing.h
+++ b/os/net/routing/routing.h
@ -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_ */
--- a/os/net/rpl-classic/rpl-dag-root.c
+++ b/os/net/rpl-classic/rpl-dag-root.c
@ -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>
--- a/os/net/rpl-classic/rpl-dag.c
+++ b/os/net/rpl-classic/rpl-dag.c
@ -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"
--- a/os/net/rpl-lite/rpl-icmp6.h
+++ b/os/net/rpl-lite/rpl-icmp6.h
@ -44,6 +44,7 @@

 #include "uip.h"
 #include "uip-ds6.h"
+#include "uip-ds6-nbr.h"

 /********** Data structures **********/

--- a/os/services/lwm2m/lwm2m-engine.c
+++ b/os/services/lwm2m/lwm2m-engine.c
@ -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>
--- a/os/services/orchestra/orchestra-rule-unicast-per-neighbor-rpl-storing.c
+++ b/os/services/orchestra/orchestra-rule-unicast-per-neighbor-rpl-storing.c
@ -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,
--- a/os/services/orchestra/orchestra.c
+++ b/os/services/orchestra/orchestra.c
@ -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"
--- a/os/services/rpl-border-router/embedded/border-router-embedded.c
+++ b/os/services/rpl-border-router/embedded/border-router-embedded.c
@ -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"
--- a/os/services/rpl-border-router/native/border-router-cmds.c
+++ b/os/services/rpl-border-router/native/border-router-cmds.c
@ -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"
--- a/os/services/rpl-border-router/native/border-router-native.c
+++ b/os/services/rpl-border-router/native/border-router-native.c
@ -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"
--- a/os/services/rpl-border-router/rpl-border-router.c
+++ b/os/services/rpl-border-router/rpl-border-router.c
@ -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"
--- a/os/services/shell/shell-commands.c
+++ b/os/services/shell/shell-commands.c
@ -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>
--- a/tests/07-simulation-base/code-ipv6/sender/unicast-sender.c
+++ b/tests/07-simulation-base/code-ipv6/sender/unicast-sender.c
@ -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>

--- a/tests/07-simulation-base/code-slip-radio/wait-dag.c
+++ b/tests/07-simulation-base/code-slip-radio/wait-dag.c
@ -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>

--- a/tests/14-rpl-lite/code/receiver-node.c
+++ b/tests/14-rpl-lite/code/receiver-node.c
@ -38,7 +38,7 @@

 #include "simple-udp.h"

-#include "rpl.h"
+#include "net/routing/routing.h"
 #include "dev/leds.h"

 #include <stdio.h>
--- a/tests/14-rpl-lite/code/root-node.c
+++ b/tests/14-rpl-lite/code/root-node.c
@ -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>
--- a/tests/15-rpl-classic/code/receiver-node.c
+++ b/tests/15-rpl-classic/code/receiver-node.c
@ -38,7 +38,7 @@

 #include "simple-udp.h"

-#include "rpl.h"
+#include "net/routing/routing.h"
 #include "dev/leds.h"

 #include <stdio.h>
--- a/tests/15-rpl-classic/code/root-node.c
+++ b/tests/15-rpl-classic/code/root-node.c
@ -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>