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

Move rpl-lite and rpl-classic to os/net/routing

This commit is contained in:
Simon Duquennoy 2017-12-09 04:55:57 -08:00
parent 14ccd337c9
commit 7ddee2c66a
38 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.include
View File

@ -153,11 +153,11 @@ endif
ifeq ($(MAKE_ROUTING),MAKE_ROUTING_RPL_CLASSIC)
CFLAGS += -DUIP_CONF_IPV6_RPL=1
CFLAGS += -DUIP_CONF_IPV6_RPL_CLASSIC=1
MODULES += os/net/rpl-classic
MODULES += os/net/routing/rpl-classic
else ifeq ($(MAKE_ROUTING),MAKE_ROUTING_RPL_LITE)
CFLAGS += -DUIP_CONF_IPV6_RPL=1
CFLAGS += -DUIP_CONF_IPV6_RPL_LITE=1
MODULES += os/net/rpl-lite
MODULES += os/net/routing/rpl-lite
else
CFLAGS += -DUIP_CONF_IPV6_RPL=0
endif

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

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

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

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

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

@ -47,8 +47,8 @@
#include "net/ipv6/uip.h"
#include "net/ipv6/tcpip.h"
#include "net/ipv6/uip-ds6.h"
#include "net/rpl-classic/rpl-private.h"
#include "net/rpl-classic/rpl-ns.h"
#include "net/routing/rpl-classic/rpl-private.h"
#include "net/routing/rpl-classic/rpl-ns.h"
#include "net/packetbuf.h"
#define DEBUG DEBUG_NONE

4
os/net/rpl-classic/rpl-icmp6.c → os/net/routing/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-classic/rpl-private.h"
#include "net/rpl-classic/rpl-ns.h"
#include "net/routing/rpl-classic/rpl-private.h"
#include "net/routing/rpl-classic/rpl-ns.h"
#include "net/packetbuf.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#include "random.h"

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

@ -46,8 +46,8 @@
* @{
*/
#include "net/rpl-classic/rpl.h"
#include "net/rpl-classic/rpl-private.h"
#include "net/routing/rpl-classic/rpl.h"
#include "net/routing/rpl-classic/rpl-private.h"
#include "net/nbr-table.h"
#include "net/link-stats.h"

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

@ -44,7 +44,7 @@
*
*/
#include "net/rpl-classic/rpl-private.h"
#include "net/routing/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-classic/rpl-ns.c → os/net/routing/rpl-classic/rpl-ns.c
View File

@ -37,14 +37,14 @@
* \author Simon Duquennoy <simon.duquennoy@inria.fr>
*/
#include "net/rpl-classic/rpl-conf.h"
#include "net/routing/rpl-classic/rpl-conf.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/tcpip.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ipv6/uip-icmp6.h"
#include "net/rpl-classic/rpl-private.h"
#include "net/rpl-classic/rpl-ns.h"
#include "net/routing/rpl-classic/rpl-private.h"
#include "net/routing/rpl-classic/rpl-ns.h"
#include "lib/list.h"
#include "lib/memb.h"

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

@ -41,7 +41,7 @@
#ifndef RPL_NS_H
#define RPL_NS_H
#include "net/rpl-classic/rpl-conf.h"
#include "net/routing/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-classic/rpl-of0.c → os/net/routing/rpl-classic/rpl-of0.c
View File

@ -42,8 +42,8 @@
* @{
*/
#include "net/rpl-classic/rpl.h"
#include "net/rpl-classic/rpl-private.h"
#include "net/routing/rpl-classic/rpl.h"
#include "net/routing/rpl-classic/rpl-private.h"
#include "net/nbr-table.h"
#include "net/link-stats.h"

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

@ -37,7 +37,7 @@
#ifndef RPL_PRIVATE_H
#define RPL_PRIVATE_H
#include "net/rpl-classic/rpl.h"
#include "net/routing/rpl-classic/rpl.h"
#include "lib/list.h"
#include "net/ipv6/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-classic/rpl-ns.h"
#include "net/routing/rpl-classic/rpl-ns.h"
#include "net/ipv6/multicast/uip-mcast6.h"
/*---------------------------------------------------------------------------*/

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

@ -42,8 +42,8 @@
*/
#include "contiki.h"
#include "net/rpl-classic/rpl-private.h"
#include "net/rpl-classic/rpl-ns.h"
#include "net/routing/rpl-classic/rpl-private.h"
#include "net/routing/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-classic/rpl.c → os/net/routing/rpl-classic/rpl.c
View File

@ -46,8 +46,8 @@
#include "net/ipv6/tcpip.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ipv6/uip-icmp6.h"
#include "net/rpl-classic/rpl-private.h"
#include "net/rpl-classic/rpl-ns.h"
#include "net/routing/rpl-classic/rpl-private.h"
#include "net/routing/rpl-classic/rpl-ns.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#define DEBUG DEBUG_NONE

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

@ -38,7 +38,7 @@
#ifndef RPL_H
#define RPL_H
#include "net/rpl-classic/rpl-conf.h"
#include "net/routing/rpl-classic/rpl-conf.h"
#include "lib/list.h"
#include "net/ipv6/uip.h"

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

0
os/net/rpl-lite/rpl-const.h → os/net/routing/rpl-lite/rpl-const.h
View File

2
os/net/rpl-lite/rpl-dag-root.c → os/net/routing/rpl-lite/rpl-dag-root.c
View File

@ -40,7 +40,7 @@
#include "contiki.h"
#include "contiki-net.h"
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
#include "net/ipv6/uip-ds6-route.h"
/* Log configuration */

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

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

@ -42,7 +42,7 @@
* Contributors: George Oikonomou <oikonomou@users.sourceforge.net> (multicast)
*/
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
#include "net/nbr-table.h"
#include "net/link-stats.h"

0
os/net/rpl-lite/rpl-dag.h → os/net/routing/rpl-lite/rpl-dag.h
View File

2
os/net/rpl-lite/rpl-ext-header.c → os/net/routing/rpl-lite/rpl-ext-header.c
View File

@ -43,7 +43,7 @@
* Simon Duquennoy <simon.duquennoy@inria.fr>
*/
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
#include "net/packetbuf.h"
/* Log configuration */

0
os/net/rpl-lite/rpl-ext-header.h → os/net/routing/rpl-lite/rpl-ext-header.h
View File

2
os/net/rpl-lite/rpl-icmp6.c → os/net/routing/rpl-lite/rpl-icmp6.c
View File

@ -44,7 +44,7 @@
* George Oikonomou <oikonomou@users.sourceforge.net> (multicast)
*/
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
#include "net/ipv6/uip-icmp6.h"
#include "net/packetbuf.h"
#include "lib/random.h"

0
os/net/rpl-lite/rpl-icmp6.h → os/net/routing/rpl-lite/rpl-icmp6.h
View File

2
os/net/rpl-lite/rpl-mrhof.c → os/net/routing/rpl-lite/rpl-mrhof.c
View File

@ -45,7 +45,7 @@
* Simon Duquennoy <simon.duquennoy@inria.fr>
*/
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
#include "net/nbr-table.h"
#include "net/link-stats.h"

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

@ -42,7 +42,7 @@
*
*/
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
#include "net/nbr-table.h"
/* Log configuration */

2
os/net/rpl-lite/rpl-neighbor.c → os/net/routing/rpl-lite/rpl-neighbor.c
View File

@ -43,7 +43,7 @@
*/
#include "contiki.h"
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
#include "net/link-stats.h"
#include "net/nbr-table.h"

2
os/net/rpl-lite/rpl-neighbor.h → os/net/routing/rpl-lite/rpl-neighbor.h
View File

@ -47,7 +47,7 @@
/********** Includes **********/
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
#include "lib/list.h"
#include "net/ipv6/uip.h"
#include "net/ipv6/uip-ds6.h"

2
os/net/rpl-lite/rpl-ns.c → os/net/routing/rpl-lite/rpl-ns.c
View File

@ -40,7 +40,7 @@
* \author Simon Duquennoy <simon.duquennoy@inria.fr>
*/
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
#include "lib/list.h"
#include "lib/memb.h"

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

@ -47,7 +47,7 @@
/********** Includes **********/
#include "net/ipv6/uip.h"
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
/********** Data Structures **********/

2
os/net/rpl-lite/rpl-of0.c → os/net/routing/rpl-lite/rpl-of0.c
View File

@ -41,7 +41,7 @@
* Simon Duquennoy <simon.duquennoy@inria.fr>
*/
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
#include "net/nbr-table.h"
#include "net/link-stats.h"

2
os/net/rpl-lite/rpl-timers.c → os/net/routing/rpl-lite/rpl-timers.c
View File

@ -41,7 +41,7 @@
*/
#include "contiki.h"
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
#include "net/link-stats.h"
#include "lib/random.h"
#include "sys/ctimer.h"

2
os/net/rpl-lite/rpl-timers.h → os/net/routing/rpl-lite/rpl-timers.h
View File

@ -47,7 +47,7 @@
/********** Includes **********/
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
/********** Public functions **********/

0
os/net/rpl-lite/rpl-types.h → os/net/routing/rpl-lite/rpl-types.h
View File

2
os/net/rpl-lite/rpl.c → os/net/routing/rpl-lite/rpl.c
View File

@ -41,7 +41,7 @@
* Simon Duquennoy <simon.duquennoy@inria.fr>
*/
#include "net/rpl-lite/rpl.h"
#include "net/routing/rpl-lite/rpl.h"
/* Log configuration */
#include "sys/log.h"

20
os/net/rpl-lite/rpl.h → os/net/routing/rpl-lite/rpl.h
View File

@ -48,16 +48,16 @@
/********** Includes **********/
#include "net/ipv6/uip.h"
#include "net/rpl-lite/rpl-const.h"
#include "net/rpl-lite/rpl-conf.h"
#include "net/rpl-lite/rpl-types.h"
#include "net/rpl-lite/rpl-icmp6.h"
#include "net/rpl-lite/rpl-dag.h"
#include "net/rpl-lite/rpl-ns.h"
#include "net/rpl-lite/rpl-dag-root.h"
#include "net/rpl-lite/rpl-neighbor.h"
#include "net/rpl-lite/rpl-ext-header.h"
#include "net/rpl-lite/rpl-timers.h"
#include "net/routing/rpl-lite/rpl-const.h"
#include "net/routing/rpl-lite/rpl-conf.h"
#include "net/routing/rpl-lite/rpl-types.h"
#include "net/routing/rpl-lite/rpl-icmp6.h"
#include "net/routing/rpl-lite/rpl-dag.h"
#include "net/routing/rpl-lite/rpl-ns.h"
#include "net/routing/rpl-lite/rpl-dag-root.h"
#include "net/routing/rpl-lite/rpl-neighbor.h"
#include "net/routing/rpl-lite/rpl-ext-header.h"
#include "net/routing/rpl-lite/rpl-timers.h"
/********** Public symbols **********/