From 786cc13a95da2c28a83f4e72252c0632bb13ab50 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Sun, 10 Sep 2017 15:10:55 +0200 Subject: [PATCH] Rename old RPL implementation as rpl-classic --- Makefile.include | 2 +- os/net/ip/tcpip.c | 4 ++-- os/net/ipv6/multicast/esmrf.c | 4 ++-- os/net/ipv6/multicast/smrf.c | 2 +- os/net/ipv6/sicslowpan.c | 4 ++-- os/net/ipv6/uip-ds6-route.h | 2 +- os/net/ipv6/uip-icmp6.c | 4 ++-- os/net/ipv6/uip6.c | 4 ++-- os/net/mac/tsch/tsch-rpl.c | 4 ++-- os/net/mac/tsch/tsch-rpl.h | 2 +- os/net/{rpl => rpl-classic}/rpl-conf.h | 0 os/net/{rpl => rpl-classic}/rpl-dag-root.c | 6 +++--- os/net/{rpl => rpl-classic}/rpl-dag-root.h | 0 os/net/{rpl => rpl-classic}/rpl-dag.c | 2 +- os/net/{rpl => rpl-classic}/rpl-ext-header.c | 4 ++-- os/net/{rpl => rpl-classic}/rpl-icmp6.c | 4 ++-- os/net/{rpl => rpl-classic}/rpl-mrhof.c | 4 ++-- os/net/{rpl => rpl-classic}/rpl-nbr-policy.c | 2 +- os/net/{rpl => rpl-classic}/rpl-ns.c | 6 +++--- os/net/{rpl => rpl-classic}/rpl-ns.h | 2 +- os/net/{rpl => rpl-classic}/rpl-of0.c | 4 ++-- os/net/{rpl => rpl-classic}/rpl-private.h | 4 ++-- os/net/{rpl => rpl-classic}/rpl-timers.c | 4 ++-- os/net/{rpl => rpl-classic}/rpl.c | 4 ++-- os/net/{rpl => rpl-classic}/rpl.h | 2 +- os/services/shell/shell-commands.c | 4 ++-- 26 files changed, 42 insertions(+), 42 deletions(-) rename os/net/{rpl => rpl-classic}/rpl-conf.h (100%) rename os/net/{rpl => rpl-classic}/rpl-dag-root.c (98%) rename os/net/{rpl => rpl-classic}/rpl-dag-root.h (100%) rename os/net/{rpl => rpl-classic}/rpl-dag.c (99%) rename os/net/{rpl => rpl-classic}/rpl-ext-header.c (99%) rename os/net/{rpl => rpl-classic}/rpl-icmp6.c (99%) rename os/net/{rpl => rpl-classic}/rpl-mrhof.c (99%) rename os/net/{rpl => rpl-classic}/rpl-nbr-policy.c (99%) rename os/net/{rpl => rpl-classic}/rpl-ns.c (98%) rename os/net/{rpl => rpl-classic}/rpl-ns.h (98%) rename os/net/{rpl => rpl-classic}/rpl-of0.c (99%) rename os/net/{rpl => rpl-classic}/rpl-private.h (99%) rename os/net/{rpl => rpl-classic}/rpl-timers.c (99%) rename os/net/{rpl => rpl-classic}/rpl.c (99%) rename os/net/{rpl => rpl-classic}/rpl.h (99%) diff --git a/Makefile.include b/Makefile.include index d22372c8e..084574671 100644 --- a/Makefile.include +++ b/Makefile.include @@ -98,7 +98,7 @@ ifeq ($(CONTIKI_WITH_RPL),1) CFLAGS += -DUIP_CONF_IPV6_RPL_LITE=1 MODULES += os/net/rpl-lite else - MODULES += os/net/rpl + MODULES += os/net/rpl-classic endif else CFLAGS += -DUIP_CONF_IPV6_RPL=0 diff --git a/os/net/ip/tcpip.c b/os/net/ip/tcpip.c index 79ae9702f..a4c79f61c 100644 --- a/os/net/ip/tcpip.c +++ b/os/net/ip/tcpip.c @@ -48,8 +48,8 @@ #if UIP_CONF_IPV6_RPL_LITE == 1 #include "net/rpl-lite/rpl.h" #else /* UIP_CONF_IPV6_RPL_LITE == 1 */ -#include "net/rpl/rpl.h" -#include "net/rpl/rpl-private.h" +#include "net/rpl-classic/rpl.h" +#include "net/rpl-classic/rpl-private.h" #endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #endif diff --git a/os/net/ipv6/multicast/esmrf.c b/os/net/ipv6/multicast/esmrf.c index bdac61d9d..2666625c9 100644 --- a/os/net/ipv6/multicast/esmrf.c +++ b/os/net/ipv6/multicast/esmrf.c @@ -49,8 +49,8 @@ #if UIP_CONF_IPV6_RPL_LITE == 1 #include "net/rpl-lite/rpl.h" #else /* UIP_CONF_IPV6_RPL_LITE == 1 */ -#include "net/rpl/rpl.h" -#include "net/rpl/rpl-private.h" +#include "net/rpl-classic/rpl.h" +#include "net/rpl-classic/rpl-private.h" #endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #include "net/ip/uip.h" #include "net/netstack.h" diff --git a/os/net/ipv6/multicast/smrf.c b/os/net/ipv6/multicast/smrf.c index 97364e82a..d13979307 100644 --- a/os/net/ipv6/multicast/smrf.c +++ b/os/net/ipv6/multicast/smrf.c @@ -50,7 +50,7 @@ #if UIP_CONF_IPV6_RPL_LITE == 1 #include "net/rpl-lite/rpl.h" #else /* UIP_CONF_IPV6_RPL_LITE == 1 */ -#include "net/rpl/rpl.h" +#include "net/rpl-classic/rpl.h" #endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #include "net/netstack.h" #include "net/packetbuf.h" diff --git a/os/net/ipv6/sicslowpan.c b/os/net/ipv6/sicslowpan.c index 22569aebe..5fea84aaf 100644 --- a/os/net/ipv6/sicslowpan.c +++ b/os/net/ipv6/sicslowpan.c @@ -74,8 +74,8 @@ #if UIP_CONF_IPV6_RPL_LITE == 1 #include "net/rpl-lite/rpl.h" #else /* UIP_CONF_IPV6_RPL_LITE == 1 */ -#include "net/rpl/rpl.h" -#include "net/rpl/rpl-private.h" +#include "net/rpl-classic/rpl.h" +#include "net/rpl-classic/rpl-private.h" #endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ /* Log configuration */ diff --git a/os/net/ipv6/uip-ds6-route.h b/os/net/ipv6/uip-ds6-route.h index d900569fb..58fd2e80c 100644 --- a/os/net/ipv6/uip-ds6-route.h +++ b/os/net/ipv6/uip-ds6-route.h @@ -48,7 +48,7 @@ #if UIP_CONF_IPV6_RPL_LITE == 1 #include "net/rpl-lite/rpl-conf.h" #else /* UIP_CONF_IPV6_RPL_LITE == 1 */ -#include "net/rpl/rpl-conf.h" +#include "net/rpl-classic/rpl-conf.h" #endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #endif diff --git a/os/net/ipv6/uip-icmp6.c b/os/net/ipv6/uip-icmp6.c index c2dbe0f85..8941166a9 100644 --- a/os/net/ipv6/uip-icmp6.c +++ b/os/net/ipv6/uip-icmp6.c @@ -62,8 +62,8 @@ #if UIP_CONF_IPV6_RPL_LITE == 1 #include "net/rpl-lite/rpl.h" #else /* UIP_CONF_IPV6_RPL_LITE == 1 */ -#include "net/rpl/rpl.h" -#include "net/rpl/rpl-private.h" +#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 */ diff --git a/os/net/ipv6/uip6.c b/os/net/ipv6/uip6.c index 0df737f43..fc6efd2ca 100644 --- a/os/net/ipv6/uip6.c +++ b/os/net/ipv6/uip6.c @@ -84,8 +84,8 @@ #if UIP_CONF_IPV6_RPL_LITE == 1 #include "net/rpl-lite/rpl.h" #else /* UIP_CONF_IPV6_RPL_LITE == 1 */ -#include "net/rpl/rpl.h" -#include "net/rpl/rpl-private.h" +#include "net/rpl-classic/rpl.h" +#include "net/rpl-classic/rpl-private.h" #endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #endif diff --git a/os/net/mac/tsch/tsch-rpl.c b/os/net/mac/tsch/tsch-rpl.c index a609d614a..a18dfbb3e 100644 --- a/os/net/mac/tsch/tsch-rpl.c +++ b/os/net/mac/tsch/tsch-rpl.c @@ -41,8 +41,8 @@ #if UIP_CONF_IPV6_RPL_LITE == 1 #include "net/rpl-lite/rpl.h" #else /* UIP_CONF_IPV6_RPL_LITE == 1 */ -#include "net/rpl/rpl.h" -#include "net/rpl/rpl-private.h" +#include "net/rpl-classic/rpl.h" +#include "net/rpl-classic/rpl-private.h" #endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #include "net/mac/tsch/tsch.h" #include "net/mac/tsch/tsch-private.h" diff --git a/os/net/mac/tsch/tsch-rpl.h b/os/net/mac/tsch/tsch-rpl.h index 7ff681f02..d468e3d17 100644 --- a/os/net/mac/tsch/tsch-rpl.h +++ b/os/net/mac/tsch/tsch-rpl.h @@ -37,7 +37,7 @@ #if UIP_CONF_IPV6_RPL_LITE == 1 #include "net/rpl-lite/rpl.h" #else /* UIP_CONF_IPV6_RPL_LITE == 1 */ -#include "net/rpl/rpl.h" +#include "net/rpl-classic/rpl.h" #endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #include "net/mac/tsch/tsch-queue.h" diff --git a/os/net/rpl/rpl-conf.h b/os/net/rpl-classic/rpl-conf.h similarity index 100% rename from os/net/rpl/rpl-conf.h rename to os/net/rpl-classic/rpl-conf.h diff --git a/os/net/rpl/rpl-dag-root.c b/os/net/rpl-classic/rpl-dag-root.c similarity index 98% rename from os/net/rpl/rpl-dag-root.c rename to os/net/rpl-classic/rpl-dag-root.c index 0738a01a7..2b38d21a7 100644 --- a/os/net/rpl/rpl-dag-root.c +++ b/os/net/rpl-classic/rpl-dag-root.c @@ -32,9 +32,9 @@ #include "contiki.h" #include "contiki-net.h" -#include "net/rpl/rpl.h" -#include "net/rpl/rpl-private.h" -#include "net/rpl/rpl-dag-root.h" +#include "net/rpl-classic/rpl.h" +#include "net/rpl-classic/rpl-private.h" +#include "net/rpl-classic/rpl-dag-root.h" #include "net/ipv6/uip-ds6-route.h" #include diff --git a/os/net/rpl/rpl-dag-root.h b/os/net/rpl-classic/rpl-dag-root.h similarity index 100% rename from os/net/rpl/rpl-dag-root.h rename to os/net/rpl-classic/rpl-dag-root.h diff --git a/os/net/rpl/rpl-dag.c b/os/net/rpl-classic/rpl-dag.c similarity index 99% rename from os/net/rpl/rpl-dag.c rename to os/net/rpl-classic/rpl-dag.c index 4df466973..13eb6d2a5 100644 --- a/os/net/rpl/rpl-dag.c +++ b/os/net/rpl-classic/rpl-dag.c @@ -45,7 +45,7 @@ #include "contiki.h" #include "net/link-stats.h" -#include "net/rpl/rpl-private.h" +#include "net/rpl-classic/rpl-private.h" #include "net/ip/uip.h" #include "net/ipv6/uip-nd6.h" #include "net/ipv6/uip-ds6-nbr.h" diff --git a/os/net/rpl/rpl-ext-header.c b/os/net/rpl-classic/rpl-ext-header.c similarity index 99% rename from os/net/rpl/rpl-ext-header.c rename to os/net/rpl-classic/rpl-ext-header.c index e64d94d24..00f6015a2 100644 --- a/os/net/rpl/rpl-ext-header.c +++ b/os/net/rpl-classic/rpl-ext-header.c @@ -47,8 +47,8 @@ #include "net/ip/uip.h" #include "net/ip/tcpip.h" #include "net/ipv6/uip-ds6.h" -#include "net/rpl/rpl-private.h" -#include "net/rpl/rpl-ns.h" +#include "net/rpl-classic/rpl-private.h" +#include "net/rpl-classic/rpl-ns.h" #include "net/packetbuf.h" #define DEBUG DEBUG_NONE diff --git a/os/net/rpl/rpl-icmp6.c b/os/net/rpl-classic/rpl-icmp6.c similarity index 99% rename from os/net/rpl/rpl-icmp6.c rename to os/net/rpl-classic/rpl-icmp6.c index e7f58a4bd..e53c52391 100644 --- a/os/net/rpl/rpl-icmp6.c +++ b/os/net/rpl-classic/rpl-icmp6.c @@ -50,8 +50,8 @@ #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-nd6.h" #include "net/ipv6/uip-icmp6.h" -#include "net/rpl/rpl-private.h" -#include "net/rpl/rpl-ns.h" +#include "net/rpl-classic/rpl-private.h" +#include "net/rpl-classic/rpl-ns.h" #include "net/packetbuf.h" #include "net/ipv6/multicast/uip-mcast6.h" #include "random.h" diff --git a/os/net/rpl/rpl-mrhof.c b/os/net/rpl-classic/rpl-mrhof.c similarity index 99% rename from os/net/rpl/rpl-mrhof.c rename to os/net/rpl-classic/rpl-mrhof.c index 541b101a0..162ac6b7f 100644 --- a/os/net/rpl/rpl-mrhof.c +++ b/os/net/rpl-classic/rpl-mrhof.c @@ -46,8 +46,8 @@ * @{ */ -#include "net/rpl/rpl.h" -#include "net/rpl/rpl-private.h" +#include "net/rpl-classic/rpl.h" +#include "net/rpl-classic/rpl-private.h" #include "net/nbr-table.h" #include "net/link-stats.h" diff --git a/os/net/rpl/rpl-nbr-policy.c b/os/net/rpl-classic/rpl-nbr-policy.c similarity index 99% rename from os/net/rpl/rpl-nbr-policy.c rename to os/net/rpl-classic/rpl-nbr-policy.c index 60894ba21..fb544d7e3 100644 --- a/os/net/rpl/rpl-nbr-policy.c +++ b/os/net/rpl-classic/rpl-nbr-policy.c @@ -44,7 +44,7 @@ * */ -#include "net/rpl/rpl-private.h" +#include "net/rpl-classic/rpl-private.h" #include "net/nbr-table.h" #include "net/ipv6/uip-ds6-nbr.h" #include "net/ipv6/uip-ds6-route.h" diff --git a/os/net/rpl/rpl-ns.c b/os/net/rpl-classic/rpl-ns.c similarity index 98% rename from os/net/rpl/rpl-ns.c rename to os/net/rpl-classic/rpl-ns.c index 30ff2da1f..efdf99d8c 100644 --- a/os/net/rpl/rpl-ns.c +++ b/os/net/rpl-classic/rpl-ns.c @@ -37,14 +37,14 @@ * \author Simon Duquennoy */ -#include "net/rpl/rpl-conf.h" +#include "net/rpl-classic/rpl-conf.h" #include "net/ip/uip.h" #include "net/ip/tcpip.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-icmp6.h" -#include "net/rpl/rpl-private.h" -#include "net/rpl/rpl-ns.h" +#include "net/rpl-classic/rpl-private.h" +#include "net/rpl-classic/rpl-ns.h" #include "lib/list.h" #include "lib/memb.h" diff --git a/os/net/rpl/rpl-ns.h b/os/net/rpl-classic/rpl-ns.h similarity index 98% rename from os/net/rpl/rpl-ns.h rename to os/net/rpl-classic/rpl-ns.h index e4de26a24..f6ae4c2c6 100644 --- a/os/net/rpl/rpl-ns.h +++ b/os/net/rpl-classic/rpl-ns.h @@ -41,7 +41,7 @@ #ifndef RPL_NS_H #define RPL_NS_H -#include "net/rpl/rpl-conf.h" +#include "net/rpl-classic/rpl-conf.h" #ifdef RPL_NS_CONF_LINK_NUM #define RPL_NS_LINK_NUM RPL_NS_CONF_LINK_NUM diff --git a/os/net/rpl/rpl-of0.c b/os/net/rpl-classic/rpl-of0.c similarity index 99% rename from os/net/rpl/rpl-of0.c rename to os/net/rpl-classic/rpl-of0.c index 50190b18f..378d32a55 100644 --- a/os/net/rpl/rpl-of0.c +++ b/os/net/rpl-classic/rpl-of0.c @@ -42,8 +42,8 @@ * @{ */ -#include "net/rpl/rpl.h" -#include "net/rpl/rpl-private.h" +#include "net/rpl-classic/rpl.h" +#include "net/rpl-classic/rpl-private.h" #include "net/nbr-table.h" #include "net/link-stats.h" diff --git a/os/net/rpl/rpl-private.h b/os/net/rpl-classic/rpl-private.h similarity index 99% rename from os/net/rpl/rpl-private.h rename to os/net/rpl-classic/rpl-private.h index ce4d88db4..baef4483c 100644 --- a/os/net/rpl/rpl-private.h +++ b/os/net/rpl-classic/rpl-private.h @@ -37,7 +37,7 @@ #ifndef RPL_PRIVATE_H #define RPL_PRIVATE_H -#include "net/rpl/rpl.h" +#include "net/rpl-classic/rpl.h" #include "lib/list.h" #include "net/ip/uip.h" @@ -45,7 +45,7 @@ #include "sys/ctimer.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-ds6-route.h" -#include "net/rpl/rpl-ns.h" +#include "net/rpl-classic/rpl-ns.h" #include "net/ipv6/multicast/uip-mcast6.h" /*---------------------------------------------------------------------------*/ diff --git a/os/net/rpl/rpl-timers.c b/os/net/rpl-classic/rpl-timers.c similarity index 99% rename from os/net/rpl/rpl-timers.c rename to os/net/rpl-classic/rpl-timers.c index ef5baebfe..3ac39679f 100644 --- a/os/net/rpl/rpl-timers.c +++ b/os/net/rpl-classic/rpl-timers.c @@ -42,8 +42,8 @@ */ #include "contiki.h" -#include "net/rpl/rpl-private.h" -#include "net/rpl/rpl-ns.h" +#include "net/rpl-classic/rpl-private.h" +#include "net/rpl-classic/rpl-ns.h" #include "net/link-stats.h" #include "net/ipv6/multicast/uip-mcast6.h" #include "lib/random.h" diff --git a/os/net/rpl/rpl.c b/os/net/rpl-classic/rpl.c similarity index 99% rename from os/net/rpl/rpl.c rename to os/net/rpl-classic/rpl.c index 8db6013a4..c87bc0975 100644 --- a/os/net/rpl/rpl.c +++ b/os/net/rpl-classic/rpl.c @@ -46,8 +46,8 @@ #include "net/ip/tcpip.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-icmp6.h" -#include "net/rpl/rpl-private.h" -#include "net/rpl/rpl-ns.h" +#include "net/rpl-classic/rpl-private.h" +#include "net/rpl-classic/rpl-ns.h" #include "net/ipv6/multicast/uip-mcast6.h" #define DEBUG DEBUG_NONE diff --git a/os/net/rpl/rpl.h b/os/net/rpl-classic/rpl.h similarity index 99% rename from os/net/rpl/rpl.h rename to os/net/rpl-classic/rpl.h index 524865350..abf8ba757 100644 --- a/os/net/rpl/rpl.h +++ b/os/net/rpl-classic/rpl.h @@ -38,7 +38,7 @@ #ifndef RPL_H #define RPL_H -#include "net/rpl/rpl-conf.h" +#include "net/rpl-classic/rpl-conf.h" #include "lib/list.h" #include "net/ip/uip.h" diff --git a/os/services/shell/shell-commands.c b/os/services/shell/shell-commands.c index 89e4bf79f..d92445a22 100644 --- a/os/services/shell/shell-commands.c +++ b/os/services/shell/shell-commands.c @@ -58,8 +58,8 @@ #if UIP_CONF_IPV6_RPL_LITE == 1 #include "net/rpl-lite/rpl.h" #else /* UIP_CONF_IPV6_RPL_LITE == 1 */ -#include "net/rpl/rpl.h" -#include "net/rpl/rpl-private.h" +#include "net/rpl-classic/rpl.h" +#include "net/rpl-classic/rpl-private.h" #endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #include