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

Use full include path for rpl and rpl-lite .h files, in core

This commit is contained in:
Simon Duquennoy 2017-06-22 09:49:01 +02:00
parent 7e9d68a2ef
commit 250707c2d7
36 changed files with 96 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/net/ip/tcpip.c
View File

@ -45,10 +45,12 @@
#include "net/ipv6/uip-ds6.h"
#if UIP_CONF_IPV6_RPL
#include "rpl.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#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"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#endif
#include <string.h>
@ -66,10 +68,6 @@
extern struct uip_fallback_interface UIP_FALLBACK_INTERFACE;
#endif
#if UIP_CONF_IPV6_RPL
#include "rpl.h"
#endif
process_event_t tcpip_event;
#if UIP_CONF_ICMP6
process_event_t tcpip_icmp6_event;

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

@ -46,7 +46,12 @@
#include "net/ipv6/multicast/uip-mcast6-route.h"
#include "net/ipv6/multicast/uip-mcast6-stats.h"
#include "net/ipv6/multicast/esmrf.h"
#include "rpl.h"
#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"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/ip/uip.h"
#include "net/netstack.h"
#include "net/packetbuf.h"

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

@ -47,7 +47,11 @@
#include "net/ipv6/multicast/uip-mcast6-route.h"
#include "net/ipv6/multicast/uip-mcast6-stats.h"
#include "net/ipv6/multicast/smrf.h"
#include "rpl.h"
#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"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/netstack.h"
#include "net/packetbuf.h"
#include <string.h>

6
core/net/ipv6/uip-ds6-route.h
View File

@ -45,7 +45,11 @@
#include "sys/stimer.h"
#include "lib/list.h"
#if UIP_CONF_IPV6_RPL
#include "rpl-conf.h"
#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"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#endif
#ifdef UIP_CONF_MAX_ROUTES

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

@ -59,10 +59,12 @@
#define UIP_FIRST_EXT_BUF ((struct uip_ext_hdr *)&uip_buf[UIP_LLIPH_LEN])
#if UIP_CONF_IPV6_RPL
#include "rpl.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#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"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#endif /* UIP_CONF_IPV6_RPL */
/** \brief temporary IP address */

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

@ -81,10 +81,12 @@
#include "net/ipv6/multicast/uip-mcast6.h"
#if UIP_CONF_IPV6_RPL
#include "rpl.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#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"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#endif
#if UIP_ND6_SEND_NS

10
core/net/mac/tsch/tsch-rpl.c
View File

@ -38,10 +38,12 @@
#if UIP_CONF_IPV6_RPL
#include "contiki.h"
#include "rpl.h"
#if UIP_CONF_IPV6_RPL_LITE == 0
#include "rpl-private.h"
#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */
#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"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/mac/tsch/tsch.h"
#include "net/mac/tsch/tsch-private.h"
#include "net/mac/tsch/tsch-schedule.h"

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

@ -34,7 +34,11 @@
/********** Includes **********/
#include "rpl.h"
#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"
#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */
#include "net/mac/tsch/tsch-queue.h"
/********** Functions *********/

2
core/net/rpl-lite/rpl-dag-root.c
View File

@ -32,7 +32,7 @@
#include "contiki.h"
#include "contiki-net.h"
#include "rpl.h"
#include "net/rpl-lite/rpl.h"
#include "net/ipv6/uip-ds6-route.h"
#include <string.h>

2
core/net/rpl-lite/rpl-dag.c
View File

@ -44,7 +44,7 @@
* @{
*/
#include "rpl.h"
#include "net/rpl-lite/rpl.h"
#include "net/nbr-table.h"
#define DEBUG DEBUG_NONE

2
core/net/rpl-lite/rpl-ext-header.c
View File

@ -45,7 +45,7 @@
* @{
*/
#include "rpl.h"
#include "net/rpl-lite/rpl.h"
#include "net/packetbuf.h"
#define DEBUG DEBUG_NONE

2
core/net/rpl-lite/rpl-icmp6.c
View File

@ -46,7 +46,7 @@
* @{
*/
#include "rpl.h"
#include "net/rpl-lite/rpl.h"
#include "net/ipv6/uip-icmp6.h"
#include "net/packetbuf.h"
#include "lib/random.h"

2
core/net/rpl-lite/rpl-mrhof.c
View File

@ -47,7 +47,7 @@
* @{
*/
#include "rpl.h"
#include "net/rpl-lite/rpl.h"
#include "net/nbr-table.h"
#include "net/link-stats.h"

2
core/net/rpl-lite/rpl-nbr-policy.c
View File

@ -44,7 +44,7 @@
*
*/
#include "rpl.h"
#include "net/rpl-lite/rpl.h"
#include "net/nbr-table.h"
#define DEBUG DEBUG_NONE

2
core/net/rpl-lite/rpl-neighbor.c
View File

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

2
core/net/rpl-lite/rpl-neighbor.h
View File

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

2
core/net/rpl-lite/rpl-ns.c
View File

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

4
core/net/rpl-lite/rpl-ns.h
View File

@ -43,8 +43,8 @@
/********** Includes **********/
#include "uip.h"
#include "rpl.h"
#include "net/ip/uip.h"
#include "net/rpl-lite/rpl.h"
/**
* \addtogroup uip6

2
core/net/rpl-lite/rpl-of0.c
View File

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

2
core/net/rpl-lite/rpl-timers.c
View File

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

2
core/net/rpl-lite/rpl-timers.h
View File

@ -41,7 +41,7 @@
/********** Includes **********/
#include "rpl.h"
#include "net/rpl-lite/rpl.h"
/**
* \addtogroup uip6

2
core/net/rpl-lite/rpl.c
View File

@ -43,7 +43,7 @@
* @{
*/
#include "rpl.h"
#include "net/rpl-lite/rpl.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"

22
core/net/rpl-lite/rpl.h
View File

@ -41,17 +41,17 @@
/********** Includes **********/
#include "uip.h"
#include "rpl-const.h"
#include "rpl-conf.h"
#include "rpl-types.h"
#include "rpl-icmp6.h"
#include "rpl-dag.h"
#include "rpl-ns.h"
#include "rpl-dag-root.h"
#include "rpl-neighbor.h"
#include "rpl-ext-header.h"
#include "rpl-timers.h"
#include "net/ip/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"
/**
* \addtogroup uip6

6
core/net/rpl/rpl-dag-root.c
View File

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

2
core/net/rpl/rpl-dag.c
View File

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

4
core/net/rpl/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 "rpl-private.h"
#include "rpl-ns.h"
#include "net/rpl/rpl-private.h"
#include "net/rpl/rpl-ns.h"
#include "net/packetbuf.h"
#define DEBUG DEBUG_NONE

4
core/net/rpl/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 "rpl-private.h"
#include "rpl-ns.h"
#include "net/rpl/rpl-private.h"
#include "net/rpl/rpl-ns.h"
#include "net/packetbuf.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#include "random.h"

4
core/net/rpl/rpl-mrhof.c
View File

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

2
core/net/rpl/rpl-nbr-policy.c
View File

@ -44,7 +44,7 @@
*
*/
#include "rpl-private.h"
#include "net/rpl/rpl-private.h"
#include "net/nbr-table.h"
#include "net/ipv6/uip-ds6-nbr.h"
#include "net/ipv6/uip-ds6-route.h"

6
core/net/rpl/rpl-ns.c
View File

@ -37,14 +37,14 @@
* \author Simon Duquennoy <simon.duquennoy@inria.fr>
*/
#include "rpl-conf.h"
#include "net/rpl/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 "rpl-private.h"
#include "rpl-ns.h"
#include "net/rpl/rpl-private.h"
#include "net/rpl/rpl-ns.h"
#include "lib/list.h"
#include "lib/memb.h"

2
core/net/rpl/rpl-ns.h
View File

@ -41,7 +41,7 @@
#ifndef RPL_NS_H
#define RPL_NS_H
#include "rpl-conf.h"
#include "net/rpl/rpl-conf.h"
#ifdef RPL_NS_CONF_LINK_NUM
#define RPL_NS_LINK_NUM RPL_NS_CONF_LINK_NUM

4
core/net/rpl/rpl-of0.c
View File

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

6
core/net/rpl/rpl-private.h
View File

@ -37,7 +37,7 @@
#ifndef RPL_PRIVATE_H
#define RPL_PRIVATE_H
#include "rpl.h"
#include "net/rpl/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 "rpl-ns.h"
#include "net/rpl/rpl-ns.h"
#include "net/ipv6/multicast/uip-mcast6.h"
/*---------------------------------------------------------------------------*/
@ -252,7 +252,7 @@ struct rpl_dio {
};
typedef struct rpl_dio rpl_dio_t;
#if RPL_CONF_STATS
#if RPL_CONF_STATS
/* Statistics for fault management. */
struct rpl_stats {
uint16_t mem_overflows;

4
core/net/rpl/rpl-timers.c
View File

@ -42,8 +42,8 @@
*/
#include "contiki-conf.h"
#include "rpl-private.h"
#include "rpl-ns.h"
#include "net/rpl/rpl-private.h"
#include "net/rpl/rpl-ns.h"
#include "net/link-stats.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#include "lib/random.h"

4
core/net/rpl/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 "rpl-private.h"
#include "rpl-ns.h"
#include "net/rpl/rpl-private.h"
#include "net/rpl/rpl-ns.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#define DEBUG DEBUG_NONE

2
core/net/rpl/rpl.h
View File

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