deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cleanup UIP_CONF_IPV6_RPL configuration

Browse source
This commit is contained in:
Simon Duquennoy 2014-12-02 11:29:49 +01:00
parent 6891bcdd20
commit c2ca3e9fdb
21 changed files with 11 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.include
View file

@ -88,10 +88,16 @@ endif
ifeq ($(CONTIKI_WITH_IPV6),1) ifeq ($(CONTIKI_WITH_IPV6),1)
CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1 CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1
ifneq ($(CONTIKI_WITH_RPL),0) ifneq ($(CONTIKI_WITH_RPL),0)
CONTIKI_WITH_RPL = 1
endif
MODULES += core/net/ipv6 core/net/ip
endif
ifeq ($(CONTIKI_WITH_RPL),1)
CFLAGS += -DUIP_CONF_IPV6_RPL=1 CFLAGS += -DUIP_CONF_IPV6_RPL=1
MODULES += core/net/rpl MODULES += core/net/rpl
endif # UIP_CONF_RPL else
MODULES += core/net/ipv6 core/net/ip CFLAGS += -DUIP_CONF_IPV6_RPL=0
endif endif
CONTIKI_SOURCEFILES += $(CONTIKIFILES) CONTIKI_SOURCEFILES += $(CONTIKIFILES)

2
core/net/ip/tcpip.c
View file

@ -616,7 +616,7 @@ tcpip_ipv6_output(void)
rpl_repair_root(instance->instance_id); rpl_repair_root(instance->instance_id);
} }
#endif /* UIP_CONF_RPL */ #endif /* UIP_CONF_IPV6_RPL */
uip_ds6_route_rm(route); uip_ds6_route_rm(route);
/* We don't have a nexthop to send the packet to, so we drop /* We don't have a nexthop to send the packet to, so we drop

2
examples/er-rest-example/Makefile
View file

@ -41,7 +41,7 @@ ${info INFO: er-example compiling with large buffers}
CFLAGS += -DUIP_CONF_BUFFER_SIZE=1300 CFLAGS += -DUIP_CONF_BUFFER_SIZE=1300
CFLAGS += -DREST_MAX_CHUNK_SIZE=1024 CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
CFLAGS += -DCOAP_MAX_HEADER_SIZE=176 CFLAGS += -DCOAP_MAX_HEADER_SIZE=176
UIP_CONF_RPL=0 CONTIKI_WITH_RPL=0
endif endif
# optional rules to get assembly # optional rules to get assembly

1
examples/ipv6/multicast/project-conf.h
View file

@ -52,7 +52,6 @@
#undef UIP_CONF_IPV6_RPL #undef UIP_CONF_IPV6_RPL
#undef UIP_CONF_ND6_SEND_RA #undef UIP_CONF_ND6_SEND_RA
#undef UIP_CONF_ROUTER #undef UIP_CONF_ROUTER
#define UIP_CONF_IPV6_RPL 1
#define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#define UIP_MCAST6_ROUTE_CONF_ROUTES 1 #define UIP_MCAST6_ROUTE_CONF_ROUTES 1

1
platform/avr-raven/contiki-conf.h
View file

@ -162,7 +162,6 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_ICMP6 1 #define UIP_CONF_ICMP6 1
#define UIP_CONF_UDP 1 #define UIP_CONF_UDP 1
#define UIP_CONF_TCP 1 #define UIP_CONF_TCP 1
//#define UIP_CONF_IPV6_RPL 0
#define NETSTACK_CONF_NETWORK sicslowpan_driver #define NETSTACK_CONF_NETWORK sicslowpan_driver
#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
#else #else

2
platform/avr-ravenusb/contiki-conf.h
View file

@ -222,7 +222,6 @@ extern void mac_log_802_15_4_rx(const uint8_t* buffer, size_t total_len);
#define UIP_CONF_ICMP6 1 #define UIP_CONF_ICMP6 1
#define UIP_CONF_UDP 1 #define UIP_CONF_UDP 1
#define UIP_CONF_TCP 0 #define UIP_CONF_TCP 0
//#define UIP_CONF_IPV6_RPL 0
#define NETSTACK_CONF_NETWORK sicslowpan_driver #define NETSTACK_CONF_NETWORK sicslowpan_driver
#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
#else #else
@ -380,7 +379,6 @@ typedef unsigned short uip_stats_t;
//#pragma mark RPL Settings //#pragma mark RPL Settings
/* ************************************************************************** */ /* ************************************************************************** */
#define UIP_CONF_IPV6_RPL 0
#if UIP_CONF_IPV6_RPL #if UIP_CONF_IPV6_RPL
/* Not completely working yet. Works on Ubuntu after $ifconfig usb0 -arp to drop the neighbor solitications */ /* Not completely working yet. Works on Ubuntu after $ifconfig usb0 -arp to drop the neighbor solitications */

4
platform/cc2538dk/contiki-conf.h
View file

@ -445,10 +445,6 @@ typedef uint32_t rtimer_clock_t;
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#endif #endif
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif
#define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#define RPL_CONF_STATS 0 #define RPL_CONF_STATS 0

2
platform/cooja/Makefile.cooja
View file

@ -98,5 +98,5 @@ ifeq ($(CONTIKI_WITH_IPV6),1)
CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1 CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1
ifneq ($(CONTIKI_WITH_RPL),0) ifneq ($(CONTIKI_WITH_RPL),0)
CFLAGS += -DUIP_CONF_IPV6_RPL=1 CFLAGS += -DUIP_CONF_IPV6_RPL=1
endif # UIP_CONF_RPL endif
endif endif

3
platform/cooja/contiki-conf.h
View file

@ -124,9 +124,6 @@
#define UIP_CONF_LLH_LEN 0 #define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif /* UIP_CONF_IPV6_RPL */
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS #ifndef NBR_TABLE_CONF_MAX_NEIGHBORS

4
platform/econotag/contiki-conf.h
View file

@ -180,10 +180,6 @@
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#endif #endif
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif
#define NBR_TABLE_CONF_MAX_NEIGHBORS 30 #define NBR_TABLE_CONF_MAX_NEIGHBORS 30
#define UIP_CONF_MAX_ROUTES 30 #define UIP_CONF_MAX_ROUTES 30

4
platform/ev-aducrf101mkxz/contiki-conf.h
View file

@ -127,10 +127,6 @@
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#endif #endif
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif
#define NBR_TABLE_CONF_MAX_NEIGHBORS 16 #define NBR_TABLE_CONF_MAX_NEIGHBORS 16
#define UIP_CONF_MAX_ROUTES 16 #define UIP_CONF_MAX_ROUTES 16

4
platform/eval-adf7xxxmb4z/contiki-conf.h
View file

@ -130,10 +130,6 @@
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#endif #endif
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif
#define NBR_TABLE_CONF_MAX_NEIGHBORS 30 #define NBR_TABLE_CONF_MAX_NEIGHBORS 30
#define UIP_CONF_MAX_ROUTES 30 #define UIP_CONF_MAX_ROUTES 30

3
platform/exp5438/contiki-conf.h
View file

@ -143,9 +143,6 @@
#define UIP_CONF_LLH_LEN 0 #define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif /* UIP_CONF_IPV6_RPL */
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS #ifndef NBR_TABLE_CONF_MAX_NEIGHBORS

1
platform/mbxxx/contiki-conf.h
View file

@ -135,7 +135,6 @@
#endif /* WITH_COAP */ #endif /* WITH_COAP */
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#define UIP_CONF_IPV6_RPL 1
#define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_ND6_SEND_RA 0
#define NETSTACK_CONF_WITH_IPV6 1 #define NETSTACK_CONF_WITH_IPV6 1

1
platform/micaz/contiki-conf.h
View file

@ -123,7 +123,6 @@
#define UIP_CONF_LLH_LEN 0 #define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 0 #define UIP_CONF_ROUTER 0
#define UIP_CONF_IPV6_RPL 1
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#define NBR_TABLE_CONF_MAX_NEIGHBORS 5 #define NBR_TABLE_CONF_MAX_NEIGHBORS 5

1
platform/minimal-net/contiki-conf.h
View file

@ -89,7 +89,6 @@ typedef unsigned short uip_stats_t;
#define WEBSERVER_CONF_STATUSPAGE 1 #define WEBSERVER_CONF_STATUSPAGE 1
/* RPL currently works only on Windows. *nix would require converting the tun interface to two pcap tees. */ /* RPL currently works only on Windows. *nix would require converting the tun interface to two pcap tees. */
//#define UIP_CONF_IPV6_RPL 0
//#define RPL_BORDER_ROUTER 0 //#define RPL_BORDER_ROUTER 0
#endif #endif

3
platform/native/contiki-conf.h
View file

@ -102,9 +102,6 @@ typedef unsigned short uip_stats_t;
#define NETSTACK_CONF_NETWORK sicslowpan_driver #define NETSTACK_CONF_NETWORK sicslowpan_driver
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif /* UIP_CONF_IPV6_RPL */
#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 #define SICSLOWPAN_CONF_COMPRESSION_IPV6 0
#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 #define SICSLOWPAN_CONF_COMPRESSION_HC1 1

3
platform/seedeye/contiki-conf.h
View file

@ -89,9 +89,6 @@ typedef uint32_t rtimer_clock_t;
#ifdef NETSTACK_CONF_WITH_IPV6 #ifdef NETSTACK_CONF_WITH_IPV6
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif /* UIP_CONF_IPV6_RPL */
/* IPv6 configuration options */ /* IPv6 configuration options */
#define NETSTACK_CONF_WITH_IPV6 1 #define NETSTACK_CONF_WITH_IPV6 1

3
platform/sky/contiki-conf.h
View file

@ -143,9 +143,6 @@
#define UIP_CONF_LLH_LEN 0 #define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif /* UIP_CONF_IPV6_RPL */
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS #ifndef NBR_TABLE_CONF_MAX_NEIGHBORS

3
platform/wismote/contiki-conf.h
View file

@ -127,9 +127,6 @@
#define UIP_CONF_LLH_LEN 0 #define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#ifndef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 1
#endif /* UIP_CONF_IPV6_RPL */
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS #ifndef NBR_TABLE_CONF_MAX_NEIGHBORS

1
platform/z1/contiki-conf.h
View file

@ -138,7 +138,6 @@
#define UIP_CONF_LLH_LEN 0 #define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#define UIP_CONF_IPV6_RPL 1
/* Handle 10 neighbors */ /* Handle 10 neighbors */
#define NBR_TABLE_CONF_MAX_NEIGHBORS 15 #define NBR_TABLE_CONF_MAX_NEIGHBORS 15