From 1ac5d85042ab7474f75cd2643e78303de3a9270d Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Sun, 10 May 2015 19:51:16 +0200 Subject: [PATCH] Enable NA in examples that need it --- examples/cc2530dk/udp-ipv6/project-conf.h | 1 + examples/cc2538dk/udp-ipv6-echo-server/Makefile | 1 + examples/sensinode/udp-ipv6/project-conf.h | 1 + examples/udp-ipv6/Makefile | 1 + regression-tests/11-ipv6/code/receiver/project-conf.h | 3 ++- regression-tests/11-ipv6/code/sender/project-conf.h | 3 ++- 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/examples/cc2530dk/udp-ipv6/project-conf.h b/examples/cc2530dk/udp-ipv6/project-conf.h index fb37ebfc3..adb4fc0f0 100644 --- a/examples/cc2530dk/udp-ipv6/project-conf.h +++ b/examples/cc2530dk/udp-ipv6/project-conf.h @@ -45,5 +45,6 @@ #define BUTTON_SENSOR_CONF_ON 1 #define UIP_CONF_ICMP6 1 #define RIMESTATS_CONF_ENABLED 1 +#define UIP_CONF_ND6_SEND_NA 1 #endif /* PROJECT_CONF_H_ */ diff --git a/examples/cc2538dk/udp-ipv6-echo-server/Makefile b/examples/cc2538dk/udp-ipv6-echo-server/Makefile index 32b3ca79f..4988d0b52 100644 --- a/examples/cc2538dk/udp-ipv6-echo-server/Makefile +++ b/examples/cc2538dk/udp-ipv6-echo-server/Makefile @@ -4,4 +4,5 @@ all: $(CONTIKI_PROJECT) CONTIKI = ../../.. CONTIKI_WITH_IPV6 = 1 +CFLAGS += -DUIP_CONF_ND6_SEND_NA=1 include $(CONTIKI)/Makefile.include diff --git a/examples/sensinode/udp-ipv6/project-conf.h b/examples/sensinode/udp-ipv6/project-conf.h index 4e74d406e..bb755aee9 100644 --- a/examples/sensinode/udp-ipv6/project-conf.h +++ b/examples/sensinode/udp-ipv6/project-conf.h @@ -47,5 +47,6 @@ #define BUTTON_SENSOR_CONF_ON 1 #define RIMESTATS_CONF_ENABLED 1 #define VIZTOOL_CONF_ON 0 +#define UIP_CONF_ND6_SEND_NA 1 #endif /* PROJECT_CONF_H_ */ diff --git a/examples/udp-ipv6/Makefile b/examples/udp-ipv6/Makefile index 62118cb49..7a38bdbc5 100644 --- a/examples/udp-ipv6/Makefile +++ b/examples/udp-ipv6/Makefile @@ -2,4 +2,5 @@ all: udp-server udp-client CONTIKI = ../.. CONTIKI_WITH_IPV6 = 1 +CFLAGS += -DUIP_CONF_ND6_SEND_NA=1 include $(CONTIKI)/Makefile.include diff --git a/regression-tests/11-ipv6/code/receiver/project-conf.h b/regression-tests/11-ipv6/code/receiver/project-conf.h index 877ed0ac4..17a25e129 100644 --- a/regression-tests/11-ipv6/code/receiver/project-conf.h +++ b/regression-tests/11-ipv6/code/receiver/project-conf.h @@ -1,4 +1,5 @@ - +#undef UIP_CONF_ND6_SEND_NA +#define UIP_CONF_ND6_SEND_NA 1 #ifdef BUFSIZE #undef UIP_CONF_BUFFER_SIZE diff --git a/regression-tests/11-ipv6/code/sender/project-conf.h b/regression-tests/11-ipv6/code/sender/project-conf.h index 877ed0ac4..17a25e129 100644 --- a/regression-tests/11-ipv6/code/sender/project-conf.h +++ b/regression-tests/11-ipv6/code/sender/project-conf.h @@ -1,4 +1,5 @@ - +#undef UIP_CONF_ND6_SEND_NA +#define UIP_CONF_ND6_SEND_NA 1 #ifdef BUFSIZE #undef UIP_CONF_BUFFER_SIZE