From 4654fe761dee8250d1b1f4e489dea68944e9a15a Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Tue, 31 Oct 2017 22:10:37 +0000 Subject: [PATCH] Combine all RPL Border Routers under a single, modular example --- examples/native-border-router/Makefile.target | 1 - examples/rpl-border-router/Makefile | 37 ++- .../common}/httpd-simple.c | 0 .../common}/httpd-simple.h | 0 examples/rpl-border-router/embedded/Makefile | 16 ++ .../{ => embedded}/border-router.c | 11 +- .../{ => embedded}/project-conf.h | 0 .../{ => embedded}/sky/Makefile.sky | 0 .../{ => embedded}/sky/slip-bridge-putchar.c | 0 .../{ => embedded}/sky/target-conf.h | 0 .../{ => embedded}/slip-bridge.c | 0 examples/rpl-border-router/httpd-simple.c | 261 ------------------ examples/rpl-border-router/httpd-simple.h | 74 ----- .../native}/Makefile | 5 - .../native}/README.md | 0 .../native}/border-router-cmds.c | 0 .../native}/border-router-cmds.h | 0 .../native}/border-router-mac.c | 0 .../native}/border-router.c | 0 .../native}/border-router.h | 0 .../native}/project-conf.h | 0 .../native}/slip-config.c | 0 .../native}/slip-dev.c | 0 .../native}/tun-bridge.c | 0 tests/01-compile-base/Makefile | 3 +- tests/02-compile-arm-ports/Makefile | 2 + tests/03-compile-nxp-ports/Makefile | 1 + 27 files changed, 44 insertions(+), 367 deletions(-) delete mode 100644 examples/native-border-router/Makefile.target rename examples/{native-border-router => rpl-border-router/common}/httpd-simple.c (100%) rename examples/{native-border-router => rpl-border-router/common}/httpd-simple.h (100%) create mode 100644 examples/rpl-border-router/embedded/Makefile rename examples/rpl-border-router/{ => embedded}/border-router.c (98%) rename examples/rpl-border-router/{ => embedded}/project-conf.h (100%) rename examples/rpl-border-router/{ => embedded}/sky/Makefile.sky (100%) rename examples/rpl-border-router/{ => embedded}/sky/slip-bridge-putchar.c (100%) rename examples/rpl-border-router/{ => embedded}/sky/target-conf.h (100%) rename examples/rpl-border-router/{ => embedded}/slip-bridge.c (100%) delete mode 100644 examples/rpl-border-router/httpd-simple.c delete mode 100644 examples/rpl-border-router/httpd-simple.h rename examples/{native-border-router => rpl-border-router/native}/Makefile (74%) rename examples/{native-border-router => rpl-border-router/native}/README.md (100%) rename examples/{native-border-router => rpl-border-router/native}/border-router-cmds.c (100%) rename examples/{native-border-router => rpl-border-router/native}/border-router-cmds.h (100%) rename examples/{native-border-router => rpl-border-router/native}/border-router-mac.c (100%) rename examples/{native-border-router => rpl-border-router/native}/border-router.c (100%) rename examples/{native-border-router => rpl-border-router/native}/border-router.h (100%) rename examples/{native-border-router => rpl-border-router/native}/project-conf.h (100%) rename examples/{native-border-router => rpl-border-router/native}/slip-config.c (100%) rename examples/{native-border-router => rpl-border-router/native}/slip-dev.c (100%) rename examples/{native-border-router => rpl-border-router/native}/tun-bridge.c (100%) diff --git a/examples/native-border-router/Makefile.target b/examples/native-border-router/Makefile.target deleted file mode 100644 index 12b0e8c74..000000000 --- a/examples/native-border-router/Makefile.target +++ /dev/null @@ -1 +0,0 @@ -TARGET = native diff --git a/examples/rpl-border-router/Makefile b/examples/rpl-border-router/Makefile index d20bec220..22d8d743f 100644 --- a/examples/rpl-border-router/Makefile +++ b/examples/rpl-border-router/Makefile @@ -1,30 +1,29 @@ -CONTIKI_PROJECT=border-router -all: $(CONTIKI_PROJECT) +PROJECTDIRS += common CONTIKI=../.. -ifeq ($(TARGET),) - -include Makefile.target +-include $(CONTIKI)/Makefile.identify-target + +all: border-router.$(TARGET) + +ifeq ($(TARGET),native) + SOURCES_DIR = native +else + SOURCES_DIR = embedded endif -### Optionally, the target can add its own Makefile, to do things like e.g. -### add more source files to the build or define make variables. --include $(TARGET)/Makefile.$(TARGET) +include $(SOURCES_DIR)/Makefile -PROJECTDIRS += $(TARGET) -PROJECT_SOURCEFILES += slip-bridge.c httpd-simple.c +PROJECTDIRS += $(SOURCES_DIR) +CFLAGS += -DPROJECT_CONF_PATH=\"$(SOURCES_DIR)/project-conf.h\" + +border-router.$(TARGET): $(SOURCES_DIR)/border-router.$(TARGET) + cp $< $@ + +CLEAN += border-router.$(TARGET) $(SOURCES_DIR)/border-router.$(TARGET) ifeq ($(PREFIX),) - PREFIX = fd00::1/64 + 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/native-border-router/httpd-simple.c b/examples/rpl-border-router/common/httpd-simple.c similarity index 100% rename from examples/native-border-router/httpd-simple.c rename to examples/rpl-border-router/common/httpd-simple.c diff --git a/examples/native-border-router/httpd-simple.h b/examples/rpl-border-router/common/httpd-simple.h similarity index 100% rename from examples/native-border-router/httpd-simple.h rename to examples/rpl-border-router/common/httpd-simple.h diff --git a/examples/rpl-border-router/embedded/Makefile b/examples/rpl-border-router/embedded/Makefile new file mode 100644 index 000000000..5a7b1cd55 --- /dev/null +++ b/examples/rpl-border-router/embedded/Makefile @@ -0,0 +1,16 @@ +### Optionally, the target can add its own Makefile, to do things like e.g. +### add more source files to the build or define make variables. +-include $(SOURCES_DIR)/$(TARGET)/Makefile.$(TARGET) + +PROJECTDIRS += $(SOURCES_DIR)/$(TARGET) + +PROJECT_SOURCEFILES += slip-bridge.c httpd-simple.c + +$(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/border-router.c b/examples/rpl-border-router/embedded/border-router.c similarity index 98% rename from examples/rpl-border-router/border-router.c rename to examples/rpl-border-router/embedded/border-router.c index ada1a7888..a6ecb065e 100644 --- a/examples/rpl-border-router/border-router.c +++ b/examples/rpl-border-router/embedded/border-router.c @@ -61,7 +61,7 @@ /* Log configuration */ #include "sys/log.h" #define LOG_MODULE "BR" -#define LOG_LEVEL LOG_LEVEL_NONE +#define LOG_LEVEL LOG_LEVEL_INFO /*---------------------------------------------------------------------------*/ static uip_ipaddr_t prefix; static uint8_t prefix_set; @@ -355,14 +355,13 @@ print_local_addresses(void) int i; uint8_t state; - printf("Server IPv6 addresses:\n"); + LOG_INFO("Server IPv6 addresses:\n"); for(i = 0; i < UIP_DS6_ADDR_NB; i++) { state = uip_ds6_if.addr_list[i].state; if(uip_ds6_if.addr_list[i].isused && (state == ADDR_TENTATIVE || state == ADDR_PREFERRED)) { - printf(" "); - uip_debug_ipaddr_print(&uip_ds6_if.addr_list[i].ipaddr); - printf("\n"); + LOG_INFO_6ADDR(&uip_ds6_if.addr_list[i].ipaddr); + LOG_INFO_("\n"); } } } @@ -405,7 +404,7 @@ PROCESS_THREAD(border_router_process, ev, data) SENSORS_ACTIVATE(button_sensor); - printf("RPL-Border router started\n"); + LOG_INFO("RPL-Border router started\n"); /* Request prefix until it has been received */ while(!prefix_set) { diff --git a/examples/rpl-border-router/project-conf.h b/examples/rpl-border-router/embedded/project-conf.h similarity index 100% rename from examples/rpl-border-router/project-conf.h rename to examples/rpl-border-router/embedded/project-conf.h diff --git a/examples/rpl-border-router/sky/Makefile.sky b/examples/rpl-border-router/embedded/sky/Makefile.sky similarity index 100% rename from examples/rpl-border-router/sky/Makefile.sky rename to examples/rpl-border-router/embedded/sky/Makefile.sky diff --git a/examples/rpl-border-router/sky/slip-bridge-putchar.c b/examples/rpl-border-router/embedded/sky/slip-bridge-putchar.c similarity index 100% rename from examples/rpl-border-router/sky/slip-bridge-putchar.c rename to examples/rpl-border-router/embedded/sky/slip-bridge-putchar.c diff --git a/examples/rpl-border-router/sky/target-conf.h b/examples/rpl-border-router/embedded/sky/target-conf.h similarity index 100% rename from examples/rpl-border-router/sky/target-conf.h rename to examples/rpl-border-router/embedded/sky/target-conf.h diff --git a/examples/rpl-border-router/slip-bridge.c b/examples/rpl-border-router/embedded/slip-bridge.c similarity index 100% rename from examples/rpl-border-router/slip-bridge.c rename to examples/rpl-border-router/embedded/slip-bridge.c diff --git a/examples/rpl-border-router/httpd-simple.c b/examples/rpl-border-router/httpd-simple.c deleted file mode 100644 index 7a6ad7500..000000000 --- a/examples/rpl-border-router/httpd-simple.c +++ /dev/null @@ -1,261 +0,0 @@ -/* - * Copyright (c) 2010, Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -/** - * \file - * A simple web server forwarding page generation to a protothread - * \author - * Adam Dunkels - * Niclas Finne - * Joakim Eriksson - */ - -#include -#include - -#include "contiki-net.h" - -//#include "urlconv.h" - -#include "httpd-simple.h" -#define webserver_log_file(...) -#define webserver_log(...) - -#ifndef WEBSERVER_CONF_CFS_CONNS -#define CONNS UIP_TCP_CONNS -#else /* WEBSERVER_CONF_CFS_CONNS */ -#define CONNS WEBSERVER_CONF_CFS_CONNS -#endif /* WEBSERVER_CONF_CFS_CONNS */ - -#ifndef WEBSERVER_CONF_CFS_URLCONV -#define URLCONV 0 -#else /* WEBSERVER_CONF_CFS_URLCONV */ -#define URLCONV WEBSERVER_CONF_CFS_URLCONV -#endif /* WEBSERVER_CONF_CFS_URLCONV */ - -#define STATE_WAITING 0 -#define STATE_OUTPUT 1 - -MEMB(conns, struct httpd_state, CONNS); - -#define ISO_nl 0x0a -#define ISO_space 0x20 -#define ISO_period 0x2e -#define ISO_slash 0x2f - -/*---------------------------------------------------------------------------*/ -static const char *NOT_FOUND = "" -"
" -"

404 - file not found

" -"
" -"" -""; -/*---------------------------------------------------------------------------*/ -static -PT_THREAD(send_string(struct httpd_state *s, const char *str)) -{ - PSOCK_BEGIN(&s->sout); - - SEND_STRING(&s->sout, str); - - PSOCK_END(&s->sout); -} -/*---------------------------------------------------------------------------*/ -const char http_content_type_html[] = "Content-type: text/html\r\n\r\n"; -static -PT_THREAD(send_headers(struct httpd_state *s, const char *statushdr)) -{ - /* char *ptr; */ - - PSOCK_BEGIN(&s->sout); - - SEND_STRING(&s->sout, statushdr); - - /* ptr = strrchr(s->filename, ISO_period); */ - /* if(ptr == NULL) { */ - /* s->ptr = http_content_type_plain; */ - /* } else if(strcmp(http_html, ptr) == 0) { */ - /* s->ptr = http_content_type_html; */ - /* } else if(strcmp(http_css, ptr) == 0) { */ - /* s->ptr = http_content_type_css; */ - /* } else if(strcmp(http_png, ptr) == 0) { */ - /* s->ptr = http_content_type_png; */ - /* } else if(strcmp(http_gif, ptr) == 0) { */ - /* s->ptr = http_content_type_gif; */ - /* } else if(strcmp(http_jpg, ptr) == 0) { */ - /* s->ptr = http_content_type_jpg; */ - /* } else { */ - /* s->ptr = http_content_type_binary; */ - /* } */ - /* SEND_STRING(&s->sout, s->ptr); */ - SEND_STRING(&s->sout, http_content_type_html); - PSOCK_END(&s->sout); -} -/*---------------------------------------------------------------------------*/ -const char http_header_200[] = "HTTP/1.0 200 OK\r\nServer: Contiki/2.4 http://www.sics.se/contiki/\r\nConnection: close\r\n"; -const char http_header_404[] = "HTTP/1.0 404 Not found\r\nServer: Contiki/2.4 http://www.sics.se/contiki/\r\nConnection: close\r\n"; -static -PT_THREAD(handle_output(struct httpd_state *s)) -{ - PT_BEGIN(&s->outputpt); - - s->script = NULL; - s->script = httpd_simple_get_script(&s->filename[1]); - if(s->script == NULL) { - strncpy(s->filename, "/notfound.html", sizeof(s->filename)); - PT_WAIT_THREAD(&s->outputpt, - send_headers(s, http_header_404)); - PT_WAIT_THREAD(&s->outputpt, - send_string(s, NOT_FOUND)); - uip_close(); - webserver_log_file(&uip_conn->ripaddr, "404 - not found"); - PT_EXIT(&s->outputpt); - } else { - PT_WAIT_THREAD(&s->outputpt, - send_headers(s, http_header_200)); - PT_WAIT_THREAD(&s->outputpt, s->script(s)); - } - s->script = NULL; - PSOCK_CLOSE(&s->sout); - PT_END(&s->outputpt); -} -/*---------------------------------------------------------------------------*/ -const char http_get[] = "GET "; -const char http_index_html[] = "/index.html"; -//const char http_referer[] = "Referer:" -static -PT_THREAD(handle_input(struct httpd_state *s)) -{ - PSOCK_BEGIN(&s->sin); - - PSOCK_READTO(&s->sin, ISO_space); - - if(strncmp(s->inputbuf, http_get, 4) != 0) { - PSOCK_CLOSE_EXIT(&s->sin); - } - PSOCK_READTO(&s->sin, ISO_space); - - if(s->inputbuf[0] != ISO_slash) { - PSOCK_CLOSE_EXIT(&s->sin); - } - -#if URLCONV - s->inputbuf[PSOCK_DATALEN(&s->sin) - 1] = 0; - urlconv_tofilename(s->filename, s->inputbuf, sizeof(s->filename)); -#else /* URLCONV */ - if(s->inputbuf[1] == ISO_space) { - strncpy(s->filename, http_index_html, sizeof(s->filename)); - } else { - s->inputbuf[PSOCK_DATALEN(&s->sin) - 1] = 0; - strncpy(s->filename, s->inputbuf, sizeof(s->filename)); - } -#endif /* URLCONV */ - - webserver_log_file(&uip_conn->ripaddr, s->filename); - - s->state = STATE_OUTPUT; - - while(1) { - PSOCK_READTO(&s->sin, ISO_nl); -#if 0 - if(strncmp(s->inputbuf, http_referer, 8) == 0) { - s->inputbuf[PSOCK_DATALEN(&s->sin) - 2] = 0; - webserver_log(s->inputbuf); - } -#endif - } - - PSOCK_END(&s->sin); -} -/*---------------------------------------------------------------------------*/ -static void -handle_connection(struct httpd_state *s) -{ - handle_input(s); - if(s->state == STATE_OUTPUT) { - handle_output(s); - } -} - -/*---------------------------------------------------------------------------*/ -void -httpd_appcall(void *state) -{ - struct httpd_state *s = (struct httpd_state *)state; - - if(uip_closed() || uip_aborted() || uip_timedout()) { - if(s != NULL) { - s->script = NULL; - memb_free(&conns, s); - } - } else if(uip_connected()) { - s = (struct httpd_state *)memb_alloc(&conns); - if(s == NULL) { - uip_abort(); - webserver_log_file(&uip_conn->ripaddr, "reset (no memory block)"); - return; - } - tcp_markconn(uip_conn, s); - PSOCK_INIT(&s->sin, (uint8_t *)s->inputbuf, sizeof(s->inputbuf) - 1); - PSOCK_INIT(&s->sout, (uint8_t *)s->inputbuf, sizeof(s->inputbuf) - 1); - PT_INIT(&s->outputpt); - s->script = NULL; - s->state = STATE_WAITING; - timer_set(&s->timer, CLOCK_SECOND * 10); - handle_connection(s); - } else if(s != NULL) { - if(uip_poll()) { - if(timer_expired(&s->timer)) { - uip_abort(); - s->script = NULL; - memb_free(&conns, s); - webserver_log_file(&uip_conn->ripaddr, "reset (timeout)"); - } - } else { - timer_restart(&s->timer); - } - handle_connection(s); - } else { - uip_abort(); - } -} - -/*---------------------------------------------------------------------------*/ -void -httpd_init(void) -{ - - tcp_listen(UIP_HTONS(80)); - memb_init(&conns); -#if URLCONV - urlconv_init(); -#endif /* URLCONV */ -} -/*---------------------------------------------------------------------------*/ diff --git a/examples/rpl-border-router/httpd-simple.h b/examples/rpl-border-router/httpd-simple.h deleted file mode 100644 index a16dbd99e..000000000 --- a/examples/rpl-border-router/httpd-simple.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2010, Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -/** - * \file - * A simple webserver - * \author - * Adam Dunkels - * Niclas Finne - * Joakim Eriksson - */ - -#ifndef HTTPD_SIMPLE_H_ -#define HTTPD_SIMPLE_H_ - -#include "contiki-net.h" - -/* The current internal border router webserver ignores the requested file name */ -/* and needs no per-connection output buffer, so save some RAM */ -#ifndef WEBSERVER_CONF_CFS_PATHLEN -#define HTTPD_PATHLEN 2 -#else /* WEBSERVER_CONF_CFS_CONNS */ -#define HTTPD_PATHLEN WEBSERVER_CONF_CFS_PATHLEN -#endif /* WEBSERVER_CONF_CFS_CONNS */ - -struct httpd_state; -typedef char (* httpd_simple_script_t)(struct httpd_state *s); - -struct httpd_state { - struct timer timer; - struct psock sin, sout; - struct pt outputpt; - char inputbuf[HTTPD_PATHLEN + 24]; -/*char outputbuf[UIP_TCP_MSS]; */ - char filename[HTTPD_PATHLEN]; - httpd_simple_script_t script; - char state; -}; - -void httpd_init(void); -void httpd_appcall(void *state); - -httpd_simple_script_t httpd_simple_get_script(const char *name); - -#define SEND_STRING(s, str) PSOCK_SEND(s, (uint8_t *)str, strlen(str)) - -#endif /* HTTPD_SIMPLE_H_ */ diff --git a/examples/native-border-router/Makefile b/examples/rpl-border-router/native/Makefile similarity index 74% rename from examples/native-border-router/Makefile rename to examples/rpl-border-router/native/Makefile index d61b29f6e..53b5759e7 100644 --- a/examples/native-border-router/Makefile +++ b/examples/rpl-border-router/native/Makefile @@ -1,15 +1,10 @@ -CONTIKI_PROJECT=border-router -all: $(CONTIKI_PROJECT) MODULES += os/services/slip-cmd -CONTIKI=../.. - PROJECT_SOURCEFILES += border-router-cmds.c tun-bridge.c httpd-simple.c PROJECT_SOURCEFILES += slip-config.c slip-dev.c border-router-mac.c MAKE_MAC = MAKE_MAC_OTHER MAKE_NET = MAKE_NET_IPV6 -include $(CONTIKI)/Makefile.include connect-router: border-router.native sudo ./border-router.native fd00::1/64 diff --git a/examples/native-border-router/README.md b/examples/rpl-border-router/native/README.md similarity index 100% rename from examples/native-border-router/README.md rename to examples/rpl-border-router/native/README.md diff --git a/examples/native-border-router/border-router-cmds.c b/examples/rpl-border-router/native/border-router-cmds.c similarity index 100% rename from examples/native-border-router/border-router-cmds.c rename to examples/rpl-border-router/native/border-router-cmds.c diff --git a/examples/native-border-router/border-router-cmds.h b/examples/rpl-border-router/native/border-router-cmds.h similarity index 100% rename from examples/native-border-router/border-router-cmds.h rename to examples/rpl-border-router/native/border-router-cmds.h diff --git a/examples/native-border-router/border-router-mac.c b/examples/rpl-border-router/native/border-router-mac.c similarity index 100% rename from examples/native-border-router/border-router-mac.c rename to examples/rpl-border-router/native/border-router-mac.c diff --git a/examples/native-border-router/border-router.c b/examples/rpl-border-router/native/border-router.c similarity index 100% rename from examples/native-border-router/border-router.c rename to examples/rpl-border-router/native/border-router.c diff --git a/examples/native-border-router/border-router.h b/examples/rpl-border-router/native/border-router.h similarity index 100% rename from examples/native-border-router/border-router.h rename to examples/rpl-border-router/native/border-router.h diff --git a/examples/native-border-router/project-conf.h b/examples/rpl-border-router/native/project-conf.h similarity index 100% rename from examples/native-border-router/project-conf.h rename to examples/rpl-border-router/native/project-conf.h diff --git a/examples/native-border-router/slip-config.c b/examples/rpl-border-router/native/slip-config.c similarity index 100% rename from examples/native-border-router/slip-config.c rename to examples/rpl-border-router/native/slip-config.c diff --git a/examples/native-border-router/slip-dev.c b/examples/rpl-border-router/native/slip-dev.c similarity index 100% rename from examples/native-border-router/slip-dev.c rename to examples/rpl-border-router/native/slip-dev.c diff --git a/examples/native-border-router/tun-bridge.c b/examples/rpl-border-router/native/tun-bridge.c similarity index 100% rename from examples/native-border-router/tun-bridge.c rename to examples/rpl-border-router/native/tun-bridge.c diff --git a/tests/01-compile-base/Makefile b/tests/01-compile-base/Makefile index 5fa09d2e5..77cc30005 100644 --- a/tests/01-compile-base/Makefile +++ b/tests/01-compile-base/Makefile @@ -8,7 +8,8 @@ storage/eeprom-test/native \ multicast/sky \ libs/logging/native \ rpl-udp/sky \ -native-border-router/native \ +rpl-border-router/native \ +rpl-border-router/sky \ slip-radio/sky \ TOOLS= diff --git a/tests/02-compile-arm-ports/Makefile b/tests/02-compile-arm-ports/Makefile index 4a1395c56..172769621 100644 --- a/tests/02-compile-arm-ports/Makefile +++ b/tests/02-compile-arm-ports/Makefile @@ -13,6 +13,8 @@ platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1350 \ platform-specific/cc26xx/very-sleepy-demo/srf06-cc26xx \ hello-world/cc2538dk \ rpl-border-router/cc2538dk \ +rpl-border-router/srf06-cc26xx:BOARD=launchpad/cc2650 \ +rpl-border-router/zoul \ rpl-udp/cc2538dk \ coap-example/cc2538dk \ slip-radio/cc2538dk \ diff --git a/tests/03-compile-nxp-ports/Makefile b/tests/03-compile-nxp-ports/Makefile index 782ca92d2..b69444f65 100644 --- a/tests/03-compile-nxp-ports/Makefile +++ b/tests/03-compile-nxp-ports/Makefile @@ -16,6 +16,7 @@ platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/jn516x \ platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/jn516x \ platform-specific/jn516x/tsch/uart1-test-node/jn516x \ sensniff/jn516x \ +rpl-border-router/jn516x \ 6tisch/simple-node/jn516x \ 6tisch/simple-node/jn516x:MAKE_WITH_ORCHESTRA=1 \ 6tisch/simple-node/jn516x:MAKE_WITH_SECURITY=1 \