diff --git a/examples/coap-example/README.md b/examples/coap-example/README.md index c0ca817ca..f74ddfb9e 100644 --- a/examples/coap-example/README.md +++ b/examples/coap-example/README.md @@ -71,7 +71,7 @@ TMOTES HOWTO 2. Press reset button, get address, abort with Ctrl+C: Line: "Tentative link-local IPv6 address fe80:0000:0000:0000:____:____:____:____" - cd ../ipv6/rpl-border-router/ + cd ../rpl-border-router/ make TARGET=sky border-router.upload MOTE=1 make connect-router diff --git a/examples/coap-example/server-client-observe.csc b/examples/coap-example/server-client-observe.csc index 709b85e9d..0b6c51d44 100644 --- a/examples/coap-example/server-client-observe.csc +++ b/examples/coap-example/server-client-observe.csc @@ -25,9 +25,9 @@ org.contikios.cooja.mspmote.SkyMoteType rplroot Sky RPL Root - [CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.c + [CONTIKI_DIR]/examples/rpl-border-router/border-router.c make border-router.sky TARGET=sky - [CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.sky + [CONTIKI_DIR]/examples/rpl-border-router/border-router.sky org.contikios.cooja.interfaces.Position org.contikios.cooja.interfaces.RimeAddress org.contikios.cooja.interfaces.IPAddress diff --git a/examples/coap-example/server-client.csc b/examples/coap-example/server-client.csc index e6d1212db..9e8353d79 100644 --- a/examples/coap-example/server-client.csc +++ b/examples/coap-example/server-client.csc @@ -25,9 +25,9 @@ org.contikios.cooja.mspmote.SkyMoteType rplroot Sky RPL Root - [CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.c + [CONTIKI_DIR]/examples/rpl-border-router/border-router.c make border-router.sky TARGET=sky - [CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.sky + [CONTIKI_DIR]/examples/rpl-border-router/border-router.sky org.contikios.cooja.interfaces.Position org.contikios.cooja.interfaces.RimeAddress org.contikios.cooja.interfaces.IPAddress diff --git a/examples/coap-example/server-only.csc b/examples/coap-example/server-only.csc index 11636cda4..683a96a38 100644 --- a/examples/coap-example/server-only.csc +++ b/examples/coap-example/server-only.csc @@ -25,9 +25,9 @@ org.contikios.cooja.mspmote.SkyMoteType rplroot Sky RPL Root - [CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.c + [CONTIKI_DIR]/examples/rpl-border-router/border-router.c make border-router.sky TARGET=sky - [CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.sky + [CONTIKI_DIR]/examples/rpl-border-router/border-router.sky org.contikios.cooja.interfaces.Position org.contikios.cooja.interfaces.RimeAddress org.contikios.cooja.interfaces.IPAddress diff --git a/examples/ipv6/rpl-border-router/Makefile b/examples/ipv6/rpl-border-router/Makefile deleted file mode 100644 index c8a40f681..000000000 --- a/examples/ipv6/rpl-border-router/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -CONTIKI_PROJECT=border-router -all: $(CONTIKI_PROJECT) - -CONTIKI=../../.. - -PROJECT_SOURCEFILES += slip-bridge.c - -#Simple built-in webserver is the default. -#Override with make WITH_WEBSERVER=0 for no webserver. -#WITH_WEBSERVER=module-path will use the module if it can be found -#make clean before changing webservers! - -#Note /apps/webserver contains a 2500 byte style sheet which is a severe test -#of the slip connection. Large MSS together with low baud rates without flow -#control will overrun the transmit buffer when the style sheet is requested. - -WITH_WEBSERVER=1 -ifeq ($(WITH_WEBSERVER),1) -CFLAGS += -DWEBSERVER=1 -PROJECT_SOURCEFILES += httpd-simple.c -else ifneq ($(WITH_WEBSERVER), 0) -MODULES += $(WITH_WEBSERVER) -CFLAGS += -DWEBSERVER=2 -endif - -ifeq ($(PREFIX),) - PREFIX = fd00::1/64 -endif - -include $(CONTIKI)/Makefile.include - -$(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c - (cd $(CONTIKI)/tools && $(MAKE) tunslip6) - -connect-router: $(CONTIKI)/tools/tunslip6 - sudo $(CONTIKI)/tools/tunslip6 $(PREFIX) - -connect-router-cooja: $(CONTIKI)/tools/tunslip6 - sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 $(PREFIX) diff --git a/examples/rpl-border-router/Makefile b/examples/rpl-border-router/Makefile new file mode 100644 index 000000000..2f02a031e --- /dev/null +++ b/examples/rpl-border-router/Makefile @@ -0,0 +1,21 @@ +CONTIKI_PROJECT=border-router +all: $(CONTIKI_PROJECT) + +CONTIKI=../.. + +PROJECT_SOURCEFILES += slip-bridge.c httpd-simple.c + +ifeq ($(PREFIX),) + PREFIX = fd00::1/64 +endif + +include $(CONTIKI)/Makefile.include + +$(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c + (cd $(CONTIKI)/tools && $(MAKE) tunslip6) + +connect-router: $(CONTIKI)/tools/tunslip6 + sudo $(CONTIKI)/tools/tunslip6 $(PREFIX) + +connect-router-cooja: $(CONTIKI)/tools/tunslip6 + sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 $(PREFIX) diff --git a/examples/ipv6/rpl-border-router/border-router.c b/examples/rpl-border-router/border-router.c similarity index 98% rename from examples/ipv6/rpl-border-router/border-router.c rename to examples/rpl-border-router/border-router.c index ab3dc8086..c6a812d93 100644 --- a/examples/ipv6/rpl-border-router/border-router.c +++ b/examples/rpl-border-router/border-router.c @@ -65,14 +65,7 @@ static uint8_t prefix_set; PROCESS(border_router_process, "Border router process"); -#if WEBSERVER==0 -/* No webserver */ -AUTOSTART_PROCESSES(&border_router_process); -#elif WEBSERVER>1 -/* Use an external webserver application */ -#include "webserver-nogui.h" -AUTOSTART_PROCESSES(&border_router_process,&webserver_nogui_process); -#else +#if BORDER_ROUTER_CONF_WEBSERVER /* Use simple webserver with only one page for minimum footprint. * Multiple connections can result in interleaved tcp segments since * a single static buffer is used for all segments. @@ -346,12 +339,12 @@ PT_THREAD(generate_routes(struct httpd_state *s)) httpd_simple_script_t httpd_simple_get_script(const char *name) { - return generate_routes; } - -#endif /* WEBSERVER */ - +#else /* BORDER_ROUTER_CONF_WEBSERVER */ +/* No webserver */ +AUTOSTART_PROCESSES(&border_router_process); +#endif /* BORDER_ROUTER_CONF_WEBSERVER */ /*---------------------------------------------------------------------------*/ static void print_local_addresses(void) diff --git a/examples/ipv6/rpl-border-router/httpd-simple.c b/examples/rpl-border-router/httpd-simple.c similarity index 100% rename from examples/ipv6/rpl-border-router/httpd-simple.c rename to examples/rpl-border-router/httpd-simple.c diff --git a/examples/ipv6/rpl-border-router/httpd-simple.h b/examples/rpl-border-router/httpd-simple.h similarity index 100% rename from examples/ipv6/rpl-border-router/httpd-simple.h rename to examples/rpl-border-router/httpd-simple.h diff --git a/examples/ipv6/rpl-border-router/project-conf.h b/examples/rpl-border-router/project-conf.h similarity index 96% rename from examples/ipv6/rpl-border-router/project-conf.h rename to examples/rpl-border-router/project-conf.h index 63930dd77..32703ce45 100644 --- a/examples/ipv6/rpl-border-router/project-conf.h +++ b/examples/rpl-border-router/project-conf.h @@ -39,7 +39,9 @@ #define WEBSERVER_CONF_CFS_CONNS 2 #endif -#if WEBSERVER +#define BORDER_ROUTER_CONF_WEBSERVER 1 + +#if BORDER_ROUTER_CONF_WEBSERVER #define UIP_CONF_TCP 1 #endif diff --git a/examples/ipv6/rpl-border-router/slip-bridge.c b/examples/rpl-border-router/slip-bridge.c similarity index 100% rename from examples/ipv6/rpl-border-router/slip-bridge.c rename to examples/rpl-border-router/slip-bridge.c diff --git a/tests/02-compile-arm-ports/Makefile b/tests/02-compile-arm-ports/Makefile index bee5a35fb..35021b65c 100644 --- a/tests/02-compile-arm-ports/Makefile +++ b/tests/02-compile-arm-ports/Makefile @@ -12,7 +12,7 @@ platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1310 \ platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1350 \ platform-specific/cc26xx/very-sleepy-demo/srf06-cc26xx \ hello-world/cc2538dk \ -ipv6/rpl-border-router/cc2538dk \ +rpl-border-router/cc2538dk \ ipv6/rpl-udp/cc2538dk \ coap-example/cc2538dk \ ipso-objects/cc2538dk \