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

Merge pull request #71 from simonduq/pr/rename-rpl

Browse Source 
Rename old RPL implementation as rpl-legacy (update: rpl-classic)
This commit is contained in:
Nicolas Tsiftes 2017-09-15 14:50:59 +02:00 committed by GitHub
commit 8ae774d413
26 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.include
View File

@ -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

4
os/net/ip/tcpip.c
View File

@ -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

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

@ -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"

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

@ -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"

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

@ -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 */

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

@ -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

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

@ -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 */

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

@ -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

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

@ -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"

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

@ -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"

0
os/net/rpl/rpl-conf.h → os/net/rpl-classic/rpl-conf.h
View File

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

@ -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 <string.h>

0
os/net/rpl/rpl-dag-root.h → os/net/rpl-classic/rpl-dag-root.h
View File

2
os/net/rpl/rpl-dag.c → os/net/rpl-classic/rpl-dag.c
View File

@ -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"

4
os/net/rpl/rpl-ext-header.c → os/net/rpl-classic/rpl-ext-header.c
View File

@ -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

4
os/net/rpl/rpl-icmp6.c → os/net/rpl-classic/rpl-icmp6.c
View File

@ -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"

4
os/net/rpl/rpl-mrhof.c → os/net/rpl-classic/rpl-mrhof.c
View File

@ -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"

2
os/net/rpl/rpl-nbr-policy.c → os/net/rpl-classic/rpl-nbr-policy.c
View File

@ -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"

6
os/net/rpl/rpl-ns.c → os/net/rpl-classic/rpl-ns.c
View File

@ -37,14 +37,14 @@
* \author Simon Duquennoy <simon.duquennoy@inria.fr>
*/
#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"

2
os/net/rpl/rpl-ns.h → os/net/rpl-classic/rpl-ns.h
View File

@ -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

4
os/net/rpl/rpl-of0.c → os/net/rpl-classic/rpl-of0.c
View File

@ -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"

4
os/net/rpl/rpl-private.h → os/net/rpl-classic/rpl-private.h
View File

@ -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"
/*---------------------------------------------------------------------------*/

4
os/net/rpl/rpl-timers.c → os/net/rpl-classic/rpl-timers.c
View File

@ -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"

4
os/net/rpl/rpl.c → os/net/rpl-classic/rpl.c
View File

@ -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

2
os/net/rpl/rpl.h → os/net/rpl-classic/rpl.h
View File

@ -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"

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

@ -59,8 +59,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 <stdlib.h>