initial upload

2012-10-30 14:37:05 +01:00 · 2012-10-30 14:37:05 +01:00 · 17c7e35621
commit 17c7e35621
parent eb0676212c
21 changed files with 3729 additions and 0 deletions
--- a/examples/osd/README
+++ b/examples/osd/README
@ -0,0 +1,13 @@
+OSDOMOTIS
+
+www.osdomotics.com
+
+Plattform: osd-er-lp24
+
+make clean TARGET=osd-er-lp24
+make TARGET=osd-er-lp24
+avr-size -C --mcu=MCU=atmega128rfa1 border-router.osd-er-lp24
+avr-objcopy -j .text -j .data -O ihex border-router.osd-er-lp24 border-router.osd-er-lp24.hex
+avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex border-router.osd-er-lp24 border-router.osd-er-lp24.eep
+ 
+sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:border-router.osd-er-lp24.hex:a -U eeprom:w:border-router.osd-er-lp24.eep:a
--- a/examples/osd/er-rest-example-toggleboard-ds1820/Makefile
+++ b/examples/osd/er-rest-example-toggleboard-ds1820/Makefile
@ -0,0 +1,88 @@
+all: er-example-server er-example-client
+# Use this target explicitly if requried: er-plugtest-server
+
+CONTIKI=../../..
+CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
+
+# for static routing, if enabled
+ifneq ($(TARGET), minimal-net)
+ifneq ($(TARGET), native)
+ifneq ($(findstring avr,$(TARGET)), avr)
+PROJECT_SOURCEFILES += static-routing.c
+endif
+endif
+endif
+
+# variable for root Makefile.include
+WITH_UIP6=1
+# for some platforms
+UIP_CONF_IPV6=1
+
+# variable for this Makefile
+# configure CoAP implementation (3|7) (er-coap-07 also supports CoAP draft 08)
+WITH_COAP=7
+
+# new variable since slip-radio
+ifneq ($(TARGET), minimal-net)
+UIP_CONF_RPL=1
+else
+# minimal-net does not support RPL under Linux and is mostly used to test CoAP only
+${info INFO: compiling without RPL}
+UIP_CONF_RPL=0
+CFLAGS += -DUIP_CONF_ND6_DEF_MAXDADNS=0
+CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\"
+CFLAGS += -DUIP_CONF_BUFFER_SIZE=1280
+endif
+
+# linker optimizations
+SMALL=1
+
+# REST framework, requires WITH_COAP
+ifeq ($(WITH_COAP), 7)
+${info INFO: compiling with CoAP-08}
+CFLAGS += -DWITH_COAP=7
+CFLAGS += -DREST=coap_rest_implementation
+CFLAGS += -DUIP_CONF_TCP=0
+APPS += er-coap-07
+else ifeq ($(WITH_COAP), 3)
+${info INFO: compiling with CoAP-03}
+CFLAGS += -DWITH_COAP=3
+CFLAGS += -DREST=coap_rest_implementation
+CFLAGS += -DUIP_CONF_TCP=0
+APPS += er-coap-03
+else
+${info INFO: compiling with HTTP}
+CFLAGS += -DWITH_HTTP
+CFLAGS += -DREST=http_rest_implementation
+CFLAGS += -DUIP_CONF_TCP=1
+APPS += er-http-engine
+endif
+
+APPS += erbium
+
+# optional rules to get assembly
+#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
+#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1
+
+include $(CONTIKI)/Makefile.include
+
+# optional rules to get assembly
+#$(OBJECTDIR)/%.o: asmdir/%.S
+#	$(CC) $(CFLAGS) -MMD -c $< -o $@
+#	@$(FINALIZE_DEPENDENCY)
+#
+#asmdir/%.S: %.c
+#	$(CC) $(CFLAGS) -MMD -S $< -o $@
+
+# border router rules
+$(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
+	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
+
+connect-router:	$(CONTIKI)/tools/tunslip6
+	sudo $(CONTIKI)/tools/tunslip6 aaaa::1/64
+
+connect-router-cooja:	$(CONTIKI)/tools/tunslip6
+	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 aaaa::1/64
+
+tap0up:
+	sudo ip address add fdfd::1/64 dev tap0
--- a/examples/osd/er-rest-example-toggleboard-ds1820/README
+++ b/examples/osd/er-rest-example-toggleboard-ds1820/README
@ -0,0 +1,88 @@
+A Quick Introduction to the Erbium (Er) REST Engine
+===================================================
+
+sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-er-lp24.hex:a -U eeprom:w:er-example-server.osd-er-lp24.eep:a
+
+EXAMPLE FILES
+-------------
+er-example-server.c: A RESTful server example showing how to use the REST layer to develop server-side applications (at the moment only CoAP is implemented for the REST Engine).
+er-example-client.c: A CoAP client that polls the /actuators/toggle resource every 10 seconds and cycles through 4 resources on button press (target address is hard-coded).
+er-plugtest-server.c: The server used for draft compliance testing at ETSI IoT CoAP Plugtest in Paris, France, March 2012 (configured for minimal-net).
+
+PRELIMINARIES
+-------------
+-  Make sure rpl-border-router has the same stack and fits into mote memory:
+   You can disable RDC in border-router project-conf.h (not really required as BR keeps radio turned on).
+   #undef NETSTACK_CONF_RDC
+   #define NETSTACK_CONF_RDC     nullrdc_driver
+-  For convenience, define the Cooja addresses in /etc/hosts
+   aaaa::0212:7401:0001:0101	cooja1
+   aaaa::0212:7402:0002:0202	cooja2
+   ...
+-  Get the Copper (Cu) CoAP user-agent from https://addons.mozilla.org/en-US/firefox/addon/copper-270430/
+-  Optional: Save your target as default target
+   $ make TARGET=sky savetarget
+
+COOJA HOWTO
+-----------
+Server only:
+1) $ make TARGET=cooja server-only.csc
+2) Open new terminal
+3) $ make connect-router-cooja
+4) Start Copper and discover resources at coap://cooja2:5683/
+-  Choose "Click button on Sky 2" from the context menu of mote 2 (server) after requesting /test/separate
+-  Do the same when observing /test/event
+
+With client:
+1) $ make TARGET=cooja server-client.csc
+2) Open new terminal
+3) $ make connect-router-cooja
+4) Wait until red LED toggles on mote 2 (server)
+5) Choose "Click button on Sky 3" from the context menu of mote 3 (client) and watch serial output
+
+TMOTES HOWTO
+------------
+Server:
+1) Connect two Tmote Skys (check with $ make TARGET=sky sky-motelist)
+2) $ make TARGET=sky er-example-server.upload MOTE=2
+3) $ make TARGET=sky login MOTE=2
+4) Press reset button, get address, abort with Ctrl+C:
+   Line: "Tentative link-local IPv6 address fe80:0000:0000:0000:____:____:____:____"
+5) $ cd ../ipv6/rpl-border-router/
+6) $ make TARGET=sky border-router.upload MOTE=1
+7) $ make connect-router
+   For a BR tty other than USB0: $ make connect-router-port PORT=X
+8) Start Copper and discover resources at coap://[aaaa::____:____:____:____]:5683/
+
+Add a client:
+1) Change the hard-coded server address in er-example-client.c to aaaa::____:____:____:____
+2) Connect a third Tmote Sky
+3) $ make TARGET=sky er-example-client.upload MOTE=3
+
+DETAILS
+-------
+Erbium currently implements draft 08 (name "er-coap-07" stems from last technical draft changes).
+Central features are commented in er-example-server.c.
+In general, apps/er-coap-07 supports:
+* All draft 08 header options
+* CON Retransmissions (note COAP_MAX_OPEN_TRANSACTIONS)
+* Blockwise Transfers (note REST_MAX_CHUNK_SIZE, see er-plugtest-server.c for Block1 uploads)
+* Separate Responses (no rest_set_pre_handler() required anymore, note coap_separate_accept(), _reject(), and _resume())
+* Resource Discovery
+* Observing Resources (see EVENT_ and PRERIODIC_RESOURCE, note COAP_MAX_OBSERVERS)
+
+REST IMPLEMENTATIONS
+--------------------
+The Makefile uses WITH_COAP to configure different implementations for the Erbium (Er) REST Engine.
+* WITH_COAP=7 uses Erbium CoAP 08 apps/er-coap-07/.
+  The default port for coap-07/-08 is 5683.
+* WITH_COAP=3 uses Erbium CoAP 03 apps/er-coap-03/.
+  The default port for coap-03 is 61616.
+  er-coap-03 produces some warnings, as it not fully maintained anymore.
+* WITH_COAP=0 is a stub to link an Erbium HTTP engine that uses the same resource abstraction (REST.x() functions and RESOURCE macros. 
+
+TODOs
+-----
+* Observe client
+* Multiple If-Match ETags
+* (Message deduplication)
--- a/examples/osd/er-rest-example-toggleboard-ds1820/er-example-client.c
+++ b/examples/osd/er-rest-example-toggleboard-ds1820/er-example-client.c
@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2011, Matthias Kovatsch and other contributors.
+ * 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.
+ *
+ * This file is part of the Contiki operating system.
+ */
+
+/**
+ * \file
+ *      Erbium (Er) CoAP client example
+ * \author
+ *      Matthias Kovatsch <kovatsch@inf.ethz.ch>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "contiki.h"
+#include "contiki-net.h"
+
+#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET) && !defined (CONTIKI_TARGET_NATIVE)
+#warning "Compiling with static routing!"
+#include "static-routing.h"
+#endif
+
+#include "dev/button-sensor.h"
+
+#if WITH_COAP == 3
+#include "er-coap-03-engine.h"
+#elif WITH_COAP == 6
+#include "er-coap-06-engine.h"
+#elif WITH_COAP == 7
+#include "er-coap-07-engine.h"
+#else
+#error "CoAP version defined by WITH_COAP not implemented"
+#endif
+
+
+#define DEBUG 0
+#if DEBUG
+#define PRINTF(...) printf(__VA_ARGS__)
+#define PRINT6ADDR(addr) PRINTF("[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
+#define PRINTLLADDR(lladdr) PRINTF("[%02x:%02x:%02x:%02x:%02x:%02x]",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5])
+#else
+#define PRINTF(...)
+#define PRINT6ADDR(addr)
+#define PRINTLLADDR(addr)
+#endif
+
+/* TODO: This server address is hard-coded for Cooja. */
+#define SERVER_NODE(ipaddr)   uip_ip6addr(ipaddr, 0xaaaa, 0, 0, 0, 0x0212, 0x7402, 0x0002, 0x0202) /* cooja2 */
+
+#define LOCAL_PORT      UIP_HTONS(COAP_DEFAULT_PORT+1)
+#define REMOTE_PORT     UIP_HTONS(COAP_DEFAULT_PORT)
+
+#define TOGGLE_INTERVAL 10
+
+PROCESS(coap_client_example, "COAP Client Example");
+AUTOSTART_PROCESSES(&coap_client_example);
+
+
+uip_ipaddr_t server_ipaddr;
+static struct etimer et;
+
+/* Example URIs that can be queried. */
+#define NUMBER_OF_URLS 4
+/* leading and ending slashes only for demo purposes, get cropped automatically when setting the Uri-Path */
+char* service_urls[NUMBER_OF_URLS] = {".well-known/core", "/actuators/toggle", "battery/", "error/in//path"};
+#if PLATFORM_HAS_BUTTON
+static int uri_switch = 0;
+#endif
+
+/* This function is will be passed to COAP_BLOCKING_REQUEST() to handle responses. */
+void
+client_chunk_handler(void *response)
+{
+  uint8_t *chunk;
+
+  int len = coap_get_payload(response, &chunk);
+  printf("|%.*s", len, (char *)chunk);
+}
+
+
+PROCESS_THREAD(coap_client_example, ev, data)
+{
+  PROCESS_BEGIN();
+
+  static coap_packet_t request[1]; /* This way the packet can be treated as pointer as usual. */
+  SERVER_NODE(&server_ipaddr);
+
+  /* receives all CoAP messages */
+  coap_receiver_init();
+
+  etimer_set(&et, TOGGLE_INTERVAL * CLOCK_SECOND);
+
+#if PLATFORM_HAS_BUTTON
+  SENSORS_ACTIVATE(button_sensor);
+  printf("Press a button to request %s\n", service_urls[uri_switch]);
+#endif
+
+  while(1) {
+    PROCESS_YIELD();
+
+    if (etimer_expired(&et)) {
+      printf("--Toggle timer--\n");
+
+      /* prepare request, TID is set by COAP_BLOCKING_REQUEST() */
+      coap_init_message(request, COAP_TYPE_CON, COAP_POST, 0 );
+      coap_set_header_uri_path(request, service_urls[1]);
+
+      const char msg[] = "Toggle!";
+      coap_set_payload(request, (uint8_t *)msg, sizeof(msg)-1);
+
+
+      PRINT6ADDR(&server_ipaddr);
+      PRINTF(" : %u\n", UIP_HTONS(REMOTE_PORT));
+
+      COAP_BLOCKING_REQUEST(&server_ipaddr, REMOTE_PORT, request, client_chunk_handler);
+
+      printf("\n--Done--\n");
+
+      etimer_reset(&et);
+
+#if PLATFORM_HAS_BUTTON
+    } else if (ev == sensors_event && data == &button_sensor) {
+
+      /* send a request to notify the end of the process */
+
+      coap_init_message(request, COAP_TYPE_CON, COAP_GET, 0);
+      coap_set_header_uri_path(request, service_urls[uri_switch]);
+
+      printf("--Requesting %s--\n", service_urls[uri_switch]);
+
+      PRINT6ADDR(&server_ipaddr);
+      PRINTF(" : %u\n", UIP_HTONS(REMOTE_PORT));
+
+      COAP_BLOCKING_REQUEST(&server_ipaddr, REMOTE_PORT, request, client_chunk_handler);
+
+      printf("\n--Done--\n");
+
+      uri_switch = (uri_switch+1) % NUMBER_OF_URLS;
+#endif
+
+    }
+  }
+
+  PROCESS_END();
+}
--- a/examples/osd/er-rest-example-toggleboard-ds1820/er-example-server.c
+++ b/examples/osd/er-rest-example-toggleboard-ds1820/er-example-server.c
--- a/examples/osd/er-rest-example-toggleboard-ds1820/er-plugtest-server.c
+++ b/examples/osd/er-rest-example-toggleboard-ds1820/er-plugtest-server.c
@ -0,0 +1,561 @@
+/*
+ * Copyright (c) 2011, Matthias Kovatsch and other contributors.
+ * 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.
+ *
+ * This file is part of the Contiki operating system.
+ */
+
+/**
+ * \file
+ *      Server for the ETSI IoT CoAP Plugtests, Paris, France, 24 - 25 March 2012
+ * \author
+ *      Matthias Kovatsch <kovatsch@inf.ethz.ch>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "contiki.h"
+#include "contiki-net.h"
+
+#define MAX_PLUGFEST_PAYLOAD 64+1 /* +1 for the terminating zero, which is not transmitted */
+
+/* Define which resources to include to meet memory constraints. */
+#define REST_RES_TEST 1
+#define REST_RES_LONG 1
+#define REST_RES_QUERY 1
+#define REST_RES_SEPARATE 1
+#define REST_RES_LARGE 1
+#define REST_RES_LARGE_UPDATE 1
+#define REST_RES_LARGE_CREATE 1
+#define REST_RES_OBS 1
+
+
+#if !defined (CONTIKI_TARGET_MINIMAL_NET)
+#warning "Should only be compiled for minimal-net!"
+#endif
+
+
+#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET) && !defined (CONTIKI_TARGET_NATIVE)
+#warning "Compiling with static routing!"
+#include "static-routing.h"
+#endif
+
+#include "erbium.h"
+
+/* For CoAP-specific example: not required for normal RESTful Web service. */
+#if WITH_COAP==7
+#include "er-coap-07.h"
+#else
+#error "Plugtests server without CoAP"
+#endif /* CoAP-specific example */
+
+#define DEBUG 1
+#if DEBUG
+#define PRINTF(...) printf(__VA_ARGS__)
+#define PRINT6ADDR(addr) PRINTF("[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
+#define PRINTLLADDR(lladdr) PRINTF("[%02x:%02x:%02x:%02x:%02x:%02x]",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5])
+#else
+#define PRINTF(...)
+#define PRINT6ADDR(addr)
+#define PRINTLLADDR(addr)
+#endif
+
+
+#if REST_RES_TEST
+/*
+ * Default test resource
+ */
+RESOURCE(test, METHOD_GET|METHOD_POST|METHOD_PUT|METHOD_DELETE, "test", "title=\"Default test resource\"");
+
+void
+test_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  coap_packet_t *const coap_req = (coap_packet_t *) request;
+
+  uint8_t method = REST.get_method_type(request);
+
+  PRINTF("/test           ");
+  if (method & METHOD_GET)
+  {
+    PRINTF("GET ");
+    /* Code 2.05 CONTENT is default. */
+    REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
+    REST.set_response_payload(response, buffer, snprintf((char *)buffer, MAX_PLUGFEST_PAYLOAD, "Type: %u\nCode: %u\nMID: %u", coap_req->type, coap_req->code, coap_req->mid));
+  }
+  else if (method & METHOD_POST)
+  {
+    PRINTF("POST ");
+    REST.set_response_status(response, REST.status.CREATED);
+    REST.set_header_location(response, "/nirvana");
+  }
+  else if (method & METHOD_PUT)
+  {
+    PRINTF("PUT ");
+    REST.set_response_status(response, REST.status.CHANGED);
+  }
+  else if (method & METHOD_DELETE)
+  {
+    PRINTF("DELETE ");
+    REST.set_response_status(response, REST.status.DELETED);
+  }
+
+  PRINTF("(%s %u)\n", coap_req->type==COAP_TYPE_CON?"CON":"NON", coap_req->mid);
+}
+#endif
+
+#if REST_RES_LONG
+/*
+ * Long path resource
+ */
+RESOURCE(longpath, METHOD_GET, "seg1/seg2/seg3", "title=\"Long path resource\"");
+
+void
+longpath_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  coap_packet_t *const coap_req = (coap_packet_t *) request;
+
+  uint8_t method = REST.get_method_type(request);
+
+  PRINTF("/seg1/seg2/seg3 ");
+  if (method & METHOD_GET)
+  {
+    PRINTF("GET ");
+    /* Code 2.05 CONTENT is default. */
+    REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
+    REST.set_response_payload(response, buffer, snprintf((char *)buffer, MAX_PLUGFEST_PAYLOAD, "Type: %u\nCode: %u\nMID: %u", coap_req->type, coap_req->code, coap_req->mid));
+  }
+  PRINTF("(%s %u)\n", coap_req->type==COAP_TYPE_CON?"CON":"NON", coap_req->mid);
+}
+#endif
+
+#if REST_RES_QUERY
+/*
+ * Resource accepting query parameters
+ */
+RESOURCE(query, METHOD_GET, "query", "title=\"Resource accepting query parameters\"");
+
+void
+query_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  coap_packet_t *const coap_req = (coap_packet_t *) request;
+  int len = 0;
+  const char *query = NULL;
+
+  PRINTF("/query          GET (%s %u)\n", coap_req->type==COAP_TYPE_CON?"CON":"NON", coap_req->mid);
+
+  if ((len = REST.get_query(request, &query)))
+  {
+    PRINTF("Query: %.*s\n", len, query);
+  }
+
+  /* Code 2.05 CONTENT is default. */
+  REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
+  REST.set_response_payload(response, buffer, snprintf((char *)buffer, MAX_PLUGFEST_PAYLOAD, "Type: %u\nCode: %u\nMID: %u\nQuery: %.*s", coap_req->type, coap_req->code, coap_req->mid, len, query));
+}
+#endif
+
+#if REST_RES_SEPARATE
+/* Required to manually (=not by the engine) handle the response transaction. */
+#include "er-coap-07-separate.h"
+#include "er-coap-07-transactions.h"
+/*
+ * Resource which cannot be served immediately and which cannot be acknowledged in a piggy-backed way
+ */
+PERIODIC_RESOURCE(separate, METHOD_GET, "separate", "title=\"Resource which cannot be served immediately and which cannot be acknowledged in a piggy-backed way\"", 3*CLOCK_SECOND);
+
+/* A structure to store the required information */
+typedef struct application_separate_store {
+  /* Provided by Erbium to store generic request information such as remote address and token. */
+  coap_separate_t request_metadata;
+  /* Add fields for addition information to be stored for finalizing, e.g.: */
+  char buffer[MAX_PLUGFEST_PAYLOAD];
+} application_separate_store_t;
+
+static uint8_t separate_active = 0;
+static application_separate_store_t separate_store[1];
+
+void
+separate_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  coap_packet_t *const coap_req = (coap_packet_t *) request;
+
+  PRINTF("/separate       ");
+  if (separate_active)
+  {
+    PRINTF("REJECTED ");
+    coap_separate_reject();
+  }
+  else
+  {
+    PRINTF("STORED ");
+    separate_active = 1;
+
+    /* Take over and skip response by engine. */
+    coap_separate_accept(request, &separate_store->request_metadata);
+    /* Be aware to respect the Block2 option, which is also stored in the coap_separate_t. */
+
+    snprintf(separate_store->buffer, MAX_PLUGFEST_PAYLOAD, "Type: %u\nCode: %u\nMID: %u", coap_req->type, coap_req->code, coap_req->mid);
+  }
+
+  PRINTF("(%s %u)\n", coap_req->type==COAP_TYPE_CON?"CON":"NON", coap_req->mid);
+}
+
+void
+separate_periodic_handler(resource_t *resource)
+{
+  if (separate_active)
+  {
+    PRINTF("/separate       ");
+    coap_transaction_t *transaction = NULL;
+    if ( (transaction = coap_new_transaction(separate_store->request_metadata.mid, &separate_store->request_metadata.addr, separate_store->request_metadata.port)) )
+    {
+      PRINTF("RESPONSE (%s %u)\n", separate_store->request_metadata.type==COAP_TYPE_CON?"CON":"NON", separate_store->request_metadata.mid);
+
+      coap_packet_t response[1]; /* This way the packet can be treated as pointer as usual. */
+
+      /* Restore the request information for the response. */
+      coap_separate_resume(response, &separate_store->request_metadata, CONTENT_2_05);
+
+      REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
+      coap_set_payload(response, separate_store->buffer, strlen(separate_store->buffer));
+
+      /*
+       * Be aware to respect the Block2 option, which is also stored in the coap_separate_t.
+       * As it is a critical option, this example resource pretends to handle it for compliance.
+       */
+      coap_set_header_block2(response, separate_store->request_metadata.block2_num, 0, separate_store->request_metadata.block2_size);
+
+      /* Warning: No check for serialization error. */
+      transaction->packet_len = coap_serialize_message(response, transaction->packet);
+      coap_send_transaction(transaction);
+      /* The engine will clear the transaction (right after send for NON, after acked for CON). */
+
+      separate_active = 0;
+    } else {
+      PRINTF("ERROR (transaction)\n");
+    }
+  } /* if (separate_active) */
+}
+#endif
+
+#if REST_RES_LARGE
+/*
+ * Large resource
+ */
+RESOURCE(large, METHOD_GET, "large", "title=\"Large resource\";rt=\"block\"");
+
+#define CHUNKS_TOTAL    1280
+
+void
+large_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  int32_t strpos = 0;
+
+  /* Check the offset for boundaries of the resource data. */
+  if (*offset>=CHUNKS_TOTAL)
+  {
+    REST.set_response_status(response, REST.status.BAD_OPTION);
+    /* A block error message should not exceed the minimum block size (16). */
+
+    const char *error_msg = "BlockOutOfScope";
+    REST.set_response_payload(response, error_msg, strlen(error_msg));
+    return;
+  }
+
+  /* Generate data until reaching CHUNKS_TOTAL. */
+  while (strpos<preferred_size)
+  {
+    strpos += snprintf((char *)buffer+strpos, preferred_size-strpos+1, "|%ld|", *offset);
+  }
+
+  /* snprintf() does not adjust return value if truncated by size. */
+  if (strpos > preferred_size)
+  {
+    strpos = preferred_size;
+  }
+
+  /* Truncate if above CHUNKS_TOTAL bytes. */
+  if (*offset+(int32_t)strpos > CHUNKS_TOTAL)
+  {
+    strpos = CHUNKS_TOTAL - *offset;
+  }
+
+  REST.set_response_payload(response, buffer, strpos);
+  REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
+
+  /* IMPORTANT for chunk-wise resources: Signal chunk awareness to REST engine. */
+  *offset += strpos;
+
+  /* Signal end of resource representation. */
+  if (*offset>=CHUNKS_TOTAL)
+  {
+    *offset = -1;
+  }
+}
+#endif
+
+#if REST_RES_LARGE_UPDATE
+/*
+ * Large resource that can be updated using PUT method
+ */
+RESOURCE(large_update, METHOD_GET|METHOD_PUT, "large-update", "title=\"Large resource that can be updated using PUT method\";rt=\"block\"");
+
+static int32_t large_update_size = 1280;
+static uint8_t large_update_store[2048] = {0};
+static unsigned int large_update_ct = -1;
+
+void
+large_update_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  coap_packet_t *const coap_req = (coap_packet_t *) request;
+  uint8_t method = REST.get_method_type(request);
+
+  if (method & METHOD_GET)
+  {
+    /* Check the offset for boundaries of the resource data. */
+    if (*offset>=large_update_size)
+    {
+      REST.set_response_status(response, REST.status.BAD_OPTION);
+      /* A block error message should not exceed the minimum block size (16). */
+
+      const char *error_msg = "BlockOutOfScope";
+      REST.set_response_payload(response, error_msg, strlen(error_msg));
+      return;
+    }
+
+    REST.set_response_payload(response, large_update_store+*offset, preferred_size);
+    REST.set_header_content_type(response, large_update_ct);
+
+    /* IMPORTANT for chunk-wise resources: Signal chunk awareness to REST engine. */
+    *offset += preferred_size;
+
+    /* Signal end of resource representation. */
+    if (*offset>=large_update_size)
+    {
+      *offset = -1;
+    }
+  } else {
+    uint8_t *incoming = NULL;
+    size_t len = 0;
+
+    unsigned int ct = REST.get_header_content_type(request);
+    if (ct==-1)
+    {
+      REST.set_response_status(response, REST.status.BAD_REQUEST);
+      const char *error_msg = "NoContentType";
+      REST.set_response_payload(response, error_msg, strlen(error_msg));
+      return;
+    }
+
+    if ((len = REST.get_request_payload(request, &incoming)))
+    {
+      if (coap_req->block1_num*coap_req->block1_size+len <= sizeof(large_update_store))
+      {
+        memcpy(large_update_store+coap_req->block1_num*coap_req->block1_size, incoming, len);
+        large_update_size = coap_req->block1_num*coap_req->block1_size+len;
+        large_update_ct = REST.get_header_content_type(request);
+
+        REST.set_response_status(response, REST.status.CHANGED);
+        coap_set_header_block1(response, coap_req->block1_num, 0, coap_req->block1_size);
+      }
+      else
+      {
+        REST.set_response_status(response, REST.status.REQUEST_ENTITY_TOO_LARGE);
+        REST.set_response_payload(response, buffer, snprintf((char *)buffer, MAX_PLUGFEST_PAYLOAD, "%uB max.", sizeof(large_update_store)));
+        return;
+      }
+    }
+    else
+    {
+      REST.set_response_status(response, REST.status.BAD_REQUEST);
+      const char *error_msg = "NoPayload";
+      REST.set_response_payload(response, error_msg, strlen(error_msg));
+      return;
+    }
+  }
+}
+#endif
+
+#if REST_RES_LARGE_CREATE
+/*
+ * Large resource that can be created using POST method
+ */
+RESOURCE(large_create, METHOD_POST, "large-create", "title=\"Large resource that can be created using POST method\";rt=\"block\"");
+
+void
+large_create_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  coap_packet_t *const coap_req = (coap_packet_t *) request;
+
+  uint8_t *incoming = NULL;
+  size_t len = 0;
+
+  unsigned int ct = REST.get_header_content_type(request);
+  if (ct==-1)
+  {
+    REST.set_response_status(response, REST.status.BAD_REQUEST);
+    const char *error_msg = "NoContentType";
+    REST.set_response_payload(response, error_msg, strlen(error_msg));
+    return;
+  }
+
+  if ((len = REST.get_request_payload(request, &incoming)))
+  {
+    if (coap_req->block1_num*coap_req->block1_size+len <= 2048)
+    {
+      REST.set_response_status(response, REST.status.CREATED);
+      REST.set_header_location(response, "/nirvana");
+      coap_set_header_block1(response, coap_req->block1_num, 0, coap_req->block1_size);
+    }
+    else
+    {
+      REST.set_response_status(response, REST.status.REQUEST_ENTITY_TOO_LARGE);
+      const char *error_msg = "2048B max.";
+      REST.set_response_payload(response, error_msg, strlen(error_msg));
+      return;
+    }
+  }
+  else
+  {
+    REST.set_response_status(response, REST.status.BAD_REQUEST);
+    const char *error_msg = "NoPayload";
+    REST.set_response_payload(response, error_msg, strlen(error_msg));
+    return;
+  }
+}
+#endif
+
+#if REST_RES_OBS
+/*
+ * Observable resource which changes every 5 seconds
+ */
+PERIODIC_RESOURCE(obs, METHOD_GET, "obs", "title=\"Observable resource which changes every 5 seconds\";obs;rt=\"observe\"", 5*CLOCK_SECOND);
+
+static uint16_t obs_counter = 0;
+static char obs_content[16];
+
+void
+obs_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
+  REST.set_header_max_age(response, 5);
+
+  REST.set_response_payload(response, obs_content, snprintf(obs_content, MAX_PLUGFEST_PAYLOAD, "TICK %lu", obs_counter));
+
+  /* A post_handler that handles subscriptions will be called for periodic resources by the REST framework. */
+}
+
+/*
+ * Additionally, a handler function named [resource name]_handler must be implemented for each PERIODIC_RESOURCE.
+ * It will be called by the REST manager process with the defined period.
+ */
+void
+obs_periodic_handler(resource_t *r)
+{
+  ++obs_counter;
+
+  PRINTF("TICK %u for /%s\n", obs_counter, r->url);
+
+  /* Build notification. */
+  /*TODO: REST.new_response() */
+  coap_packet_t notification[1]; /* This way the packet can be treated as pointer as usual. */
+  coap_init_message(notification, COAP_TYPE_NON, CONTENT_2_05, 0 );
+
+  /* Better use a generator function for both handlers that only takes *resonse. */
+  obs_handler(NULL, notification, NULL, 0, NULL);
+
+  /* Notify the registered observers with the given message type, observe option, and payload. */
+  REST.notify_subscribers(r, obs_counter, notification);
+}
+#endif
+
+PROCESS(plugtest_server, "PlugtestServer");
+AUTOSTART_PROCESSES(&plugtest_server);
+
+PROCESS_THREAD(plugtest_server, ev, data)
+{
+  PROCESS_BEGIN();
+
+  PRINTF("ETSI IoT CoAP Plugtests Server\n");
+
+#ifdef RF_CHANNEL
+  PRINTF("RF channel: %u\n", RF_CHANNEL);
+#endif
+#ifdef IEEE802154_PANID
+  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
+#endif
+
+  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
+  PRINTF("LL header: %u\n", UIP_LLH_LEN);
+  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
+  PRINTF("REST max chunk: %u\n", REST_MAX_CHUNK_SIZE);
+
+/* if static routes are used rather than RPL */
+#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET)
+  set_global_address();
+  configure_routing();
+#endif
+
+  /* Initialize the REST engine. */
+  rest_init_engine();
+
+  /* Activate the application-specific resources. */
+#if REST_RES_TEST
+  rest_activate_resource(&resource_test);
+#endif
+#if REST_RES_LONG
+  rest_activate_resource(&resource_longpath);
+#endif
+#if REST_RES_QUERY
+  rest_activate_resource(&resource_query);
+#endif
+#if REST_RES_SEPARATE
+  rest_activate_periodic_resource(&periodic_resource_separate);
+#endif
+#if REST_RES_LARGE
+  rest_activate_resource(&resource_large);
+#endif
+#if REST_RES_LARGE_UPDATE
+  large_update_ct = REST.type.APPLICATION_OCTET_STREAM;
+  rest_activate_resource(&resource_large_update);
+#endif
+#if REST_RES_LARGE_CREATE
+  rest_activate_resource(&resource_large_create);
+#endif
+#if REST_RES_OBS
+  rest_activate_periodic_resource(&periodic_resource_obs);
+#endif
+
+  /* Define application-specific events here. */
+  while(1) {
+    PROCESS_WAIT_EVENT();
+
+  } /* while (1) */
+
+  PROCESS_END();
+}
--- a/examples/osd/er-rest-example-toggleboard-ds1820/project-conf.h
+++ b/examples/osd/er-rest-example-toggleboard-ds1820/project-conf.h
@ -0,0 +1,67 @@
+/*
+ * 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.
+ *
+ *
+ */
+
+#ifndef __PROJECT_RPL_WEB_CONF_H__
+#define __PROJECT_RPL_WEB_CONF_H__
+
+#define SICSLOWPAN_CONF_FRAG	1
+
+/* Disabling RDC for demo purposes. Core updates often require more memory. */
+/* For projects, optimize memory and enable RDC again. */
+//#undef NETSTACK_CONF_RDC
+//#define NETSTACK_CONF_RDC     nullrdc_driver
+
+/* Save some memory for the sky platform. */
+#undef UIP_CONF_DS6_NBR_NBU
+#define UIP_CONF_DS6_NBR_NBU     10
+#undef UIP_CONF_DS6_ROUTE_NBU
+#define UIP_CONF_DS6_ROUTE_NBU   10
+
+/* Increase rpl-border-router IP-buffer when using 128. */
+#ifndef REST_MAX_CHUNK_SIZE
+#define REST_MAX_CHUNK_SIZE    64
+#endif
+
+/* Multiplies with chunk size, be aware of memory constraints. */
+#ifndef COAP_MAX_OPEN_TRANSACTIONS
+#define COAP_MAX_OPEN_TRANSACTIONS   2
+#endif
+
+/* Must be <= open transaction number. */
+#ifndef COAP_MAX_OBSERVERS
+#define COAP_MAX_OBSERVERS      COAP_MAX_OPEN_TRANSACTIONS-1
+#endif
+
+/* Reduce 802.15.4 frame queue to save RAM. */
+#undef QUEUEBUF_CONF_NUM
+#define QUEUEBUF_CONF_NUM               4
+
+#endif /* __PROJECT_RPL_WEB_CONF_H__ */
--- a/examples/osd/er-rest-example-toggleboard-ds1820/run.sh
+++ b/examples/osd/er-rest-example-toggleboard-ds1820/run.sh
@ -0,0 +1,7 @@
+#!/bin/bash
+make clean TARGET=osd-er-lp24
+make TARGET=osd-er-lp24
+avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-er-lp24
+avr-objcopy -j .text -j .data -O ihex er-example-server.osd-er-lp24 er-example-server.osd-er-lp24.hex
+avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-er-lp24 er-example-server.osd-er-lp24.eep
+
--- a/examples/osd/er-rest-example-toggleboard-ds1820/server-client.csc
+++ b/examples/osd/er-rest-example-toggleboard-ds1820/server-client.csc
@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mrm</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mspsim</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/avrora</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/serial_socket</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/collect-view</project>
+  <simulation>
+    <title>REST with RPL router</title>
+    <delaytime>-2147483648</delaytime>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      se.sics.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      se.sics.cooja.mspmote.SkyMoteType
+      <identifier>rplroot</identifier>
+      <description>Sky RPL Root</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.c</source>
+      <commands EXPORT="discard">make border-router.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
+    </motetype>
+    <motetype>
+      se.sics.cooja.mspmote.SkyMoteType
+      <identifier>server</identifier>
+      <description>Erbium Server</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.c</source>
+      <commands EXPORT="discard">make er-example-server.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
+    </motetype>
+    <motetype>
+      se.sics.cooja.mspmote.SkyMoteType
+      <identifier>client</identifier>
+      <description>Erbium Client</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/er-rest-example/er-example-client.c</source>
+      <commands EXPORT="discard">make er-example-client.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/er-rest-example/er-example-client.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
+    </motetype>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>33.260163187353555</x>
+        <y>30.643217359962595</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>rplroot</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>46.57186415376375</x>
+        <y>40.35946215910942</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>2</id>
+      </interface_config>
+      <motetype_identifier>server</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>18.638049428485125</x>
+        <y>47.55034515769599</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>3</id>
+      </interface_config>
+      <motetype_identifier>client</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>259</width>
+    <z>0</z>
+    <height>179</height>
+    <location_x>0</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.AttributeVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.LEDVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.AddressVisualizerSkin</skin>
+      <viewport>3.61568947862321 0.0 0.0 3.61568947862321 15.610600779367 -85.92728269158351</viewport>
+    </plugin_config>
+    <width>300</width>
+    <z>2</z>
+    <height>178</height>
+    <location_x>261</location_x>
+    <location_y>1</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <coloring />
+    </plugin_config>
+    <width>762</width>
+    <z>3</z>
+    <height>491</height>
+    <location_x>2</location_x>
+    <location_y>182</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.RadioLogger
+    <plugin_config>
+      <split>150</split>
+      <analyzers name="6lowpan" />
+    </plugin_config>
+    <width>451</width>
+    <z>-1</z>
+    <height>305</height>
+    <location_x>73</location_x>
+    <location_y>140</location_y>
+    <minimized>true</minimized>
+  </plugin>
+  <plugin>
+    SerialSocketServer
+    <mote_arg>0</mote_arg>
+    <width>422</width>
+    <z>4</z>
+    <height>74</height>
+    <location_x>578</location_x>
+    <location_y>18</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.TimeLine
+    <plugin_config>
+      <mote>0</mote>
+      <mote>1</mote>
+      <mote>2</mote>
+      <showRadioRXTX />
+      <showRadioHW />
+      <showLEDs />
+      <showWatchpoints />
+      <split>125</split>
+      <zoomfactor>25.49079397896416</zoomfactor>
+    </plugin_config>
+    <width>1624</width>
+    <z>5</z>
+    <height>252</height>
+    <location_x>6</location_x>
+    <location_y>712</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.MoteInterfaceViewer
+    <mote_arg>2</mote_arg>
+    <plugin_config>
+      <interface>Serial port</interface>
+      <scrollpos>0,0</scrollpos>
+    </plugin_config>
+    <width>853</width>
+    <z>1</z>
+    <height>491</height>
+    <location_x>765</location_x>
+    <location_y>182</location_y>
+  </plugin>
+</simconf>
+
--- a/examples/osd/er-rest-example-toggleboard-ds1820/server-only.csc
+++ b/examples/osd/er-rest-example-toggleboard-ds1820/server-only.csc
@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mrm</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/mspsim</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/avrora</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/serial_socket</project>
+  <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/collect-view</project>
+  <simulation>
+    <title>REST with RPL router</title>
+    <delaytime>-2147483648</delaytime>
+    <randomseed>123456</randomseed>
+    <motedelay_us>1000000</motedelay_us>
+    <radiomedium>
+      se.sics.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>50.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <events>
+      <logoutput>40000</logoutput>
+    </events>
+    <motetype>
+      se.sics.cooja.mspmote.SkyMoteType
+      <identifier>rplroot</identifier>
+      <description>Sky RPL Root</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.c</source>
+      <commands EXPORT="discard">make border-router.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
+    </motetype>
+    <motetype>
+      se.sics.cooja.mspmote.SkyMoteType
+      <identifier>server</identifier>
+      <description>Erbium Server</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.c</source>
+      <commands EXPORT="discard">make er-example-server.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.sky</firmware>
+      <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
+      <moteinterface>se.sics.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
+    </motetype>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>33.260163187353555</x>
+        <y>30.643217359962595</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+      <motetype_identifier>rplroot</motetype_identifier>
+    </mote>
+    <mote>
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>35.100895239785295</x>
+        <y>39.70574552287428</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>2</id>
+      </interface_config>
+      <motetype_identifier>server</motetype_identifier>
+    </mote>
+  </simulation>
+  <plugin>
+    se.sics.cooja.plugins.SimControl
+    <width>259</width>
+    <z>5</z>
+    <height>179</height>
+    <location_x>0</location_x>
+    <location_y>0</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.AttributeVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.LEDVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.AddressVisualizerSkin</skin>
+      <viewport>7.9849281638410705 0.0 0.0 7.9849281638410705 -133.27812697619663 -225.04752569190535</viewport>
+    </plugin_config>
+    <width>300</width>
+    <z>4</z>
+    <height>175</height>
+    <location_x>263</location_x>
+    <location_y>3</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.LogListener
+    <plugin_config>
+      <filter />
+      <coloring />
+    </plugin_config>
+    <width>560</width>
+    <z>1</z>
+    <height>326</height>
+    <location_x>1</location_x>
+    <location_y>293</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.RadioLogger
+    <plugin_config>
+      <split>150</split>
+      <analyzers name="6lowpan" />
+    </plugin_config>
+    <width>451</width>
+    <z>-1</z>
+    <height>305</height>
+    <location_x>73</location_x>
+    <location_y>140</location_y>
+    <minimized>true</minimized>
+  </plugin>
+  <plugin>
+    SerialSocketServer
+    <mote_arg>0</mote_arg>
+    <width>422</width>
+    <z>2</z>
+    <height>74</height>
+    <location_x>39</location_x>
+    <location_y>199</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.TimeLine
+    <plugin_config>
+      <mote>0</mote>
+      <mote>1</mote>
+      <showRadioRXTX />
+      <showRadioHW />
+      <showLEDs />
+      <showWatchpoints />
+      <split>125</split>
+      <zoomfactor>25.49079397896416</zoomfactor>
+    </plugin_config>
+    <width>1624</width>
+    <z>3</z>
+    <height>252</height>
+    <location_x>4</location_x>
+    <location_y>622</location_y>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.MoteInterfaceViewer
+    <mote_arg>1</mote_arg>
+    <plugin_config>
+      <interface>Serial port</interface>
+      <scrollpos>0,0</scrollpos>
+    </plugin_config>
+    <width>702</width>
+    <z>0</z>
+    <height>646</height>
+    <location_x>564</location_x>
+    <location_y>2</location_y>
+  </plugin>
+</simconf>
+
--- a/examples/osd/er-rest-example-toggleboard-ds1820/static-routing.c
+++ b/examples/osd/er-rest-example-toggleboard-ds1820/static-routing.c
@ -0,0 +1,155 @@
+/*
+ * static-routing.c
+ *
+ *  Created on: Oct 12, 2010
+ *      Author: simonduq
+ */
+
+#include <stdio.h>
+#include "static-routing.h"
+
+#define DEBUG 0
+#if DEBUG
+#include <stdio.h>
+#define PRINTF(...) printf(__VA_ARGS__)
+#define PRINT6ADDR(addr) PRINTF(" %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x ", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
+#define PRINTLLADDR(lladdr) PRINTF(" %02x:%02x:%02x:%02x:%02x:%02x ",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5])
+#else
+#define PRINTF(...)
+#define PRINT6ADDR(addr)
+#define PRINTLLADDR(addr)
+#endif
+
+#include "contiki-net.h"
+#include "node-id.h"
+
+int node_rank;
+
+struct id_to_addrs {
+    int id;
+    uint32_t addr;
+};
+
+const struct id_to_addrs motes_addrs[] = {
+/*
+ * Static routing requires a map nodeid => address.
+ * The nodeid can be programmed with the sky-shell.
+ * The addresses should also be added to /etc/hosts.
+ *
+ * aaaa::212:7400:1160:f62d        sky1
+ * aaaa::212:7400:0da0:d748        sky2
+ * aaaa::212:7400:116e:c325        sky3
+ * aaaa::212:7400:116e:c444        sky4
+ * aaaa::212:7400:115e:b717        sky5
+ *
+ * Add the nodeid and last 4 bytes of the address to the map.
+ */
+    {1, 0x1160f62d},
+    {2, 0x0da0d748},
+    {3, 0x116ec325},
+    {4, 0x116ec444},
+    {5, 0x115eb717},
+};
+/* Define the size of the map. */
+#define NODES_IN_MAP    5
+
+uint32_t get_mote_suffix(int rank) {
+    if(--rank >=0 && rank<(sizeof(motes_addrs)/sizeof(struct id_to_addrs))) {
+      return motes_addrs[rank].addr;
+    }
+    return 0;
+}
+
+int get_mote_id(uint32_t suffix) {
+#if IN_COOJA
+    return suffix & 0xff;
+#else
+    int i;
+    for(i=0; i<(sizeof(motes_addrs)/sizeof(struct id_to_addrs)); i++) {
+      if(suffix == motes_addrs[i].addr) {
+        return motes_addrs[i].id;
+      }
+    }
+    return 0;
+#endif
+}
+
+void set_global_address(void) {
+  uip_ipaddr_t ipaddr;
+
+  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+}
+
+static void add_route_ext(int dest, int next) {
+  PRINTF("add route ext %d %d\n", dest, next);
+    uip_ipaddr_t ipaddr_dest, ipaddr_next;
+    uip_ip6addr(&ipaddr_dest, 0xaaaa, 0, 0, 0, 0, 0, 0, dest);
+#if IN_COOJA
+    uip_ip6addr(&ipaddr_next, 0xfe80, 0, 0, 0, 0x0212, 0x7400 | next, next, next<<8 | next);
+#else
+    uint32_t next_suffix = get_mote_suffix(next);
+    uip_ip6addr(&ipaddr_next, 0xfe80, 0, 0, 0, 0x0212, 0x7400, (next_suffix >> 16) & 0xffff, next_suffix & 0xffff);
+#endif
+    uip_ds6_route_add(&ipaddr_dest, 128, &ipaddr_next, 0);
+}
+
+void add_route(int dest, int next) {
+  PRINTF("add route %d %d\n", dest, next);
+    uip_ipaddr_t ipaddr_dest, ipaddr_next;
+#if IN_COOJA
+    uip_ip6addr(&ipaddr_dest, 0xaaaa, 0, 0, 0, 0x0212, 0x7400 | dest, dest, dest<<8 | dest);
+    uip_ip6addr(&ipaddr_next, 0xfe80, 0, 0, 0, 0x0212, 0x7400 | next, next, next<<8 | next);
+#else
+    uint32_t dest_suffix = get_mote_suffix(dest);
+    uint32_t next_suffix = get_mote_suffix(next);
+    uip_ip6addr(&ipaddr_dest, 0xaaaa, 0, 0, 0, 0x0212, 0x7400, (dest_suffix >> 16) & 0xffff, dest_suffix & 0xffff);
+    uip_ip6addr(&ipaddr_next, 0xfe80, 0, 0, 0, 0x0212, 0x7400, (next_suffix >> 16) & 0xffff, next_suffix & 0xffff);
+#endif
+    uip_ds6_route_add(&ipaddr_dest, 128, &ipaddr_next, 0);
+}
+
+void configure_routing(void) {
+  int i;
+#if IN_COOJA
+  node_rank = node_id;
+#else
+  node_rank = -1;
+  for(i=0; i<(sizeof(motes_addrs)/sizeof(struct id_to_addrs)); ++i) {
+    if(node_id == motes_addrs[i].id) {
+      node_rank = i+1;
+      break;
+    }
+  }
+
+  if(node_rank == -1) {
+    printf("unable to configure routing, node_id=%d\n", node_id);
+    return;
+  }
+#endif
+
+  printf("configure_routing, node_id=%d, node_rank %d\n", node_id, node_rank);
+
+  if (node_rank == 1) { /* border router #1 */
+    add_route_ext(2, 2);
+    for(i=2; i<=NODES_IN_MAP; ++i) {
+      add_route(i, 2);
+    }
+  } else if (node_rank < NODES_IN_MAP) { /* other node */
+    add_route_ext(1, node_rank-1);
+    add_route_ext(2, node_rank+1);
+    for(i=1; i<=NODES_IN_MAP; ++i) {
+      if(i<node_rank) {
+        add_route(i, node_rank-1);
+      } else if(i>node_rank) {
+        add_route(i, node_rank+1);
+      }
+    }
+  } else if (node_rank == NODES_IN_MAP) { /* 2nd border router */
+    add_route_ext(1, NODES_IN_MAP-1);
+    for(i=1; i<=NODES_IN_MAP-1; ++i) {
+      add_route(i, NODES_IN_MAP-1);
+    }
+  }
+}
--- a/examples/osd/er-rest-example-toggleboard-ds1820/static-routing.h
+++ b/examples/osd/er-rest-example-toggleboard-ds1820/static-routing.h
@ -0,0 +1,20 @@
+/*
+ * static-routing.h
+ *
+ *  Created on: Oct 12, 2010
+ *      Author: simonduq
+ */
+
+#ifndef STATICROUTING_H_
+#define STATICROUTING_H_
+
+#include "contiki.h"
+
+extern int node_rank;
+extern uint32_t get_mote_suffix(int id);
+extern int get_mote_id(uint32_t suffix);
+extern void add_route(int dest, int next);
+extern void set_global_address(void);
+extern void configure_routing(void);
+
+#endif /* STATICROUTING_H_ */
--- a/examples/osd/rpl-border-router/Makefile
+++ b/examples/osd/rpl-border-router/Makefile
@ -0,0 +1,50 @@
+CONTIKI_PROJECT=border-router
+all: $(CONTIKI_PROJECT) 
+
+CONTIKI=../../..
+
+WITH_UIP6=1
+UIP_CONF_IPV6=1
+CFLAGS+= -DUIP_CONF_IPV6_RPL
+
+#linker optimizations
+SMALL=1
+
+CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
+PROJECT_SOURCEFILES += slip-bridge.c
+
+#Simple built-in webserver is the default.
+#Override with make WITH_WEBSERVER=0 for no webserver.
+#WITH_WEBSERVER=webserver-name will use /apps/webserver-name if it can be
+#found in the /apps, /platform/$(TARGET)/apps/, or current directory (in that order).
+# WITH_WEBSERVER=webserver for /apps/webserver
+# WITH_WEBSERVER=raven-webserver for /platform/avr-raven/apps/raven-webserver/
+#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)
+APPS += $(WITH_WEBSERVER)
+CFLAGS += -DWEBSERVER=2
+endif
+
+ifeq ($(PREFIX),)
+ PREFIX = aaaa::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)
--- a/examples/osd/rpl-border-router/README
+++ b/examples/osd/rpl-border-router/README
@ -0,0 +1,13 @@
+OSDOMOTIS
+
+www.osdomotics.com
+
+Plattform: osd-er-lp24
+
+make clean TARGET=osd-er-lp24
+make TARGET=osd-er-lp24
+avr-size -C --mcu=MCU=atmega128rfa1 border-router.osd-er-lp24
+avr-objcopy -j .text -j .data -O ihex border-router.osd-er-lp24 border-router.osd-er-lp24.hex
+avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex border-router.osd-er-lp24 border-router.osd-er-lp24.eep
+
+sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:border-router.osd-er-lp24.hex:a -U eeprom:w:border-router.osd-er-lp24.eep:a
--- a/examples/osd/rpl-border-router/border-router.c
+++ b/examples/osd/rpl-border-router/border-router.c
@ -0,0 +1,391 @@
+/*
+ * 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ */
+/**
+ * \file
+ *         border-router
+ * \author
+ *         Niclas Finne <nfi@sics.se>
+ *         Joakim Eriksson <joakime@sics.se>
+ *         Nicolas Tsiftes <nvt@sics.se>
+ */
+
+#include "contiki.h"
+#include "contiki-lib.h"
+#include "contiki-net.h"
+#include "net/uip.h"
+#include "net/uip-ds6.h"
+#include "net/rpl/rpl.h"
+
+#include "net/netstack.h"
+#include "dev/button-sensor.h"
+#include "dev/slip.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#define DEBUG DEBUG_NONE
+#include "net/uip-debug.h"
+
+uint16_t dag_id[] = {0x1111, 0x1100, 0, 0, 0, 0, 0, 0x0011};
+
+extern uip_ds6_nbr_t uip_ds6_nbr_cache[];
+extern uip_ds6_route_t uip_ds6_routing_table[];
+
+static uip_ipaddr_t prefix;
+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
+/* 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.
+ */
+#include "httpd-simple.h"
+/* The internal webserver can provide additional information if
+ * enough program flash is available.
+ */
+#define WEBSERVER_CONF_LOADTIME 0
+#define WEBSERVER_CONF_FILESTATS 0
+#define WEBSERVER_CONF_NEIGHBOR_STATUS 0
+/* Adding links requires a larger RAM buffer. To avoid static allocation
+ * the stack can be used for formatting; however tcp retransmissions
+ * and multiple connections can result in garbled segments.
+ * TODO:use PSOCk_GENERATOR_SEND and tcp state storage to fix this.
+ */
+#define WEBSERVER_CONF_ROUTE_LINKS 0
+#if WEBSERVER_CONF_ROUTE_LINKS
+#define BUF_USES_STACK 1
+#endif
+
+PROCESS(webserver_nogui_process, "Web server");
+PROCESS_THREAD(webserver_nogui_process, ev, data)
+{
+  PROCESS_BEGIN();
+
+  httpd_init();
+
+  while(1) {
+    PROCESS_WAIT_EVENT_UNTIL(ev == tcpip_event);
+    httpd_appcall(data);
+  }
+  
+  PROCESS_END();
+}
+AUTOSTART_PROCESSES(&border_router_process,&webserver_nogui_process);
+
+static const char *TOP = "<html><head><title>ContikiRPL</title></head><body>\n";
+static const char *BOTTOM = "</body></html>\n";
+#if BUF_USES_STACK
+static char *bufptr, *bufend;
+#define ADD(...) do {                                                   \
+    bufptr += snprintf(bufptr, bufend - bufptr, __VA_ARGS__);      \
+  } while(0)
+#else
+static char buf[256];
+static int blen;
+#define ADD(...) do {                                                   \
+    blen += snprintf(&buf[blen], sizeof(buf) - blen, __VA_ARGS__);      \
+  } while(0)
+#endif
+
+/*---------------------------------------------------------------------------*/
+static void
+ipaddr_add(const uip_ipaddr_t *addr)
+{
+  uint16_t a;
+  int i, f;
+  for(i = 0, f = 0; i < sizeof(uip_ipaddr_t); i += 2) {
+    a = (addr->u8[i] << 8) + addr->u8[i + 1];
+    if(a == 0 && f >= 0) {
+      if(f++ == 0) ADD("::");
+    } else {
+      if(f > 0) {
+        f = -1;
+      } else if(i > 0) {
+        ADD(":");
+      }
+      ADD("%x", a);
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+static
+PT_THREAD(generate_routes(struct httpd_state *s))
+{
+  static int i;
+#if BUF_USES_STACK
+  char buf[256];
+#endif
+#if WEBSERVER_CONF_LOADTIME
+  static clock_time_t numticks;
+  numticks = clock_time();
+#endif
+
+  PSOCK_BEGIN(&s->sout);
+
+  SEND_STRING(&s->sout, TOP);
+#if BUF_USES_STACK
+  bufptr = buf;bufend=bufptr+sizeof(buf);
+#else
+  blen = 0;
+#endif
+  ADD("Neighbors<pre>");
+  for(i = 0; i < UIP_DS6_NBR_NB; i++) {
+    if(uip_ds6_nbr_cache[i].isused) {
+
+#if WEBSERVER_CONF_NEIGHBOR_STATUS
+#if BUF_USES_STACK
+{char* j=bufptr+25;
+      ipaddr_add(&uip_ds6_nbr_cache[i].ipaddr);
+      while (bufptr < j) ADD(" ");
+      switch (uip_ds6_nbr_cache[i].state) {
+      case NBR_INCOMPLETE: ADD(" INCOMPLETE");break;
+      case NBR_REACHABLE: ADD(" REACHABLE");break;
+      case NBR_STALE: ADD(" STALE");break;      
+      case NBR_DELAY: ADD(" DELAY");break;
+      case NBR_PROBE: ADD(" NBR_PROBE");break;
+      }
+}
+#else
+{uint8_t j=blen+25;
+      ipaddr_add(&uip_ds6_nbr_cache[i].ipaddr);
+      while (blen < j) ADD(" ");
+      switch (uip_ds6_nbr_cache[i].state) {
+      case NBR_INCOMPLETE: ADD(" INCOMPLETE");break;
+      case NBR_REACHABLE: ADD(" REACHABLE");break;
+      case NBR_STALE: ADD(" STALE");break;      
+      case NBR_DELAY: ADD(" DELAY");break;
+      case NBR_PROBE: ADD(" NBR_PROBE");break;
+      }
+}
+#endif
+#else
+      ipaddr_add(&uip_ds6_nbr_cache[i].ipaddr);
+#endif
+
+      ADD("\n");
+#if BUF_USES_STACK
+      if(bufptr > bufend - 45) {
+        SEND_STRING(&s->sout, buf);
+        bufptr = buf; bufend = bufptr + sizeof(buf);
+      }
+#else
+      if(blen > sizeof(buf) - 45) {
+        SEND_STRING(&s->sout, buf);
+        blen = 0;
+      }
+#endif
+    }
+  }
+  ADD("</pre>Routes<pre>");
+  SEND_STRING(&s->sout, buf);
+#if BUF_USES_STACK
+  bufptr = buf; bufend = bufptr + sizeof(buf);
+#else
+  blen = 0;
+#endif
+  for(i = 0; i < UIP_DS6_ROUTE_NB; i++) {
+    if(uip_ds6_routing_table[i].isused) {
+#if BUF_USES_STACK
+#if WEBSERVER_CONF_ROUTE_LINKS
+      ADD("<a href=http://[");
+      ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
+      ADD("]/status.shtml>");
+      ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
+      ADD("</a>");
+#else
+      ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
+#endif
+#else
+#if WEBSERVER_CONF_ROUTE_LINKS
+      ADD("<a href=http://[");
+      ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
+      ADD("]/status.shtml>");
+      SEND_STRING(&s->sout, buf); //TODO: why tunslip6 needs an output here, wpcapslip does not
+      blen = 0;
+      ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
+      ADD("</a>");
+#else
+      ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
+#endif
+#endif
+      ADD("/%u (via ", uip_ds6_routing_table[i].length);
+      ipaddr_add(&uip_ds6_routing_table[i].nexthop);
+      if(1 || (uip_ds6_routing_table[i].state.lifetime < 600)) {
+        ADD(") %lus\n", uip_ds6_routing_table[i].state.lifetime);
+      } else {
+        ADD(")\n");
+      }
+      SEND_STRING(&s->sout, buf);
+#if BUF_USES_STACK
+      bufptr = buf; bufend = bufptr + sizeof(buf);
+#else
+      blen = 0;
+#endif
+    }
+  }
+  ADD("</pre>");
+
+#if WEBSERVER_CONF_FILESTATS
+  static uint16_t numtimes;
+  ADD("<br><i>This page sent %u times</i>",++numtimes);
+#endif
+
+#if WEBSERVER_CONF_LOADTIME
+  numticks = clock_time() - numticks + 1;
+  ADD(" <i>(%u.%02u sec)</i>",numticks/CLOCK_SECOND,(100*(numticks%CLOCK_SECOND))/CLOCK_SECOND));
+#endif
+
+  SEND_STRING(&s->sout, buf);
+  SEND_STRING(&s->sout, BOTTOM);
+
+  PSOCK_END(&s->sout);
+}
+/*---------------------------------------------------------------------------*/
+httpd_simple_script_t
+httpd_simple_get_script(const char *name)
+{
+
+  return generate_routes;
+}
+
+#endif /* WEBSERVER */
+
+/*---------------------------------------------------------------------------*/
+static void
+print_local_addresses(void)
+{
+  int i;
+  uint8_t state;
+
+  PRINTA("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)) {
+      PRINTA(" ");
+      uip_debug_ipaddr_print(&uip_ds6_if.addr_list[i].ipaddr);
+      PRINTA("\n");
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+void
+request_prefix(void)
+{
+  /* mess up uip_buf with a dirty request... */
+  uip_buf[0] = '?';
+  uip_buf[1] = 'P';
+  uip_len = 2;
+  slip_send();
+  uip_len = 0;
+}
+/*---------------------------------------------------------------------------*/
+void
+set_prefix_64(uip_ipaddr_t *prefix_64)
+{
+  uip_ipaddr_t ipaddr;
+  memcpy(&prefix, prefix_64, 16);
+  memcpy(&ipaddr, prefix_64, 16);
+  prefix_set = 1;
+  uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
+  uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
+}
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(border_router_process, ev, data)
+{
+  static struct etimer et;
+  rpl_dag_t *dag;
+
+  PROCESS_BEGIN();
+
+/* While waiting for the prefix to be sent through the SLIP connection, the future
+ * border router can join an existing DAG as a parent or child, or acquire a default 
+ * router that will later take precedence over the SLIP fallback interface.
+ * Prevent that by turning the radio off until we are initialized as a DAG root.
+ */
+  prefix_set = 0;
+  NETSTACK_MAC.off(0);
+
+  PROCESS_PAUSE();
+
+  SENSORS_ACTIVATE(button_sensor);
+
+  PRINTF("RPL-Border router started\n");
+#if 0
+   /* The border router runs with a 100% duty cycle in order to ensure high
+     packet reception rates.
+     Note if the MAC RDC is not turned off now, aggressive power management of the
+     cpu will interfere with establishing the SLIP connection */
+  NETSTACK_MAC.off(1);
+#endif
+ 
+  /* Request prefix until it has been received */
+  while(!prefix_set) {
+    etimer_set(&et, CLOCK_SECOND);
+    request_prefix();
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+  }
+
+  dag = rpl_set_root(RPL_DEFAULT_INSTANCE,(uip_ip6addr_t *)dag_id);
+  if(dag != NULL) {
+    rpl_set_prefix(dag, &prefix, 64);
+    PRINTF("created a new RPL dag\n");
+  }
+
+  /* Now turn the radio on, but disable radio duty cycling.
+   * Since we are the DAG root, reception delays would constrain mesh throughbut.
+   */
+  NETSTACK_MAC.off(1);
+  
+#if DEBUG || 1
+  print_local_addresses();
+#endif
+
+  while(1) {
+    PROCESS_YIELD();
+    if (ev == sensors_event && data == &button_sensor) {
+      PRINTF("Initiating global repair\n");
+      rpl_repair_root(RPL_DEFAULT_INSTANCE);
+    }
+  }
+
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
--- a/examples/osd/rpl-border-router/httpd-simple.c
+++ b/examples/osd/rpl-border-router/httpd-simple.c
@ -0,0 +1,262 @@
+/*
+ * 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.
+ *
+ * $Id: httpd-simple.c,v 1.5 2010/10/19 18:29:04 adamdunkels Exp $
+ */
+
+/**
+ * \file
+ *         A simple web server forwarding page generation to a protothread
+ * \author
+ *         Adam Dunkels <adam@sics.se>
+ *         Niclas Finne <nfi@sics.se>
+ *         Joakim Eriksson <joakime@sics.se>
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#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_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 = "<html><body bgcolor=\"white\">"
+"<center>"
+"<h1>404 - file not found</h1>"
+"</center>"
+"</body>"
+"</html>";
+/*---------------------------------------------------------------------------*/
+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 */
+}
+/*---------------------------------------------------------------------------*/
--- a/examples/osd/rpl-border-router/httpd-simple.h
+++ b/examples/osd/rpl-border-router/httpd-simple.h
@ -0,0 +1,74 @@
+/*
+ * 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 <adam@sics.se>
+ *         Niclas Finne <nfi@sics.se>
+ *         Joakim Eriksson <joakime@sics.se>
+ */
+
+#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__ */
--- a/examples/osd/rpl-border-router/project-conf.h
+++ b/examples/osd/rpl-border-router/project-conf.h
@ -0,0 +1,55 @@
+/*
+ * 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.
+ *
+ * $Id: project-conf.h,v 1.1 2010/10/21 18:23:44 joxe Exp $
+ */
+
+#ifndef __PROJECT_ROUTER_CONF_H__
+#define __PROJECT_ROUTER_CONF_H__
+
+#ifndef UIP_FALLBACK_INTERFACE
+#define UIP_FALLBACK_INTERFACE rpl_interface
+#endif
+
+#ifndef QUEUEBUF_CONF_NUM
+#define QUEUEBUF_CONF_NUM          4
+#endif
+
+#ifndef UIP_CONF_BUFFER_SIZE
+#define UIP_CONF_BUFFER_SIZE    140
+#endif
+
+#ifndef UIP_CONF_RECEIVE_WINDOW
+#define UIP_CONF_RECEIVE_WINDOW  60
+#endif
+
+#ifndef WEBSERVER_CONF_CFS_CONNS
+#define WEBSERVER_CONF_CFS_CONNS 2
+#endif
+
+#endif /* __PROJECT_ROUTER_CONF_H__ */
--- a/examples/osd/rpl-border-router/run-test.sh
+++ b/examples/osd/rpl-border-router/run-test.sh
@ -0,0 +1,7 @@
+#!/bin/bash
+make clean TARGET=atmega128rfa1
+make TARGET=atmega128rfa1
+avr-size -C --mcu=MCU=atmega128rfa1 rest-server-example.osd-er-lp24
+avr-objcopy -j .text -j .data -O ihex border-router.osd-er-lp24 border-router.osd-er-lp24.hex
+avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex border-router.osd-er-lp24 border-router.osd-er-lp24.eep
+#sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:border-router.osd-er-lp24.hex:a -U eeprom:w:border-router.osd-er-lp24.eep:a
--- a/examples/osd/rpl-border-router/run.sh
+++ b/examples/osd/rpl-border-router/run.sh
@ -0,0 +1,7 @@
+#!/bin/bash
+make clean TARGET=osd-er-lp24
+make TARGET=osd-er-lp24
+avr-size -C --mcu=MCU=atmega128rfa1 border-router.osd-er-lp24
+avr-objcopy -j .text -j .data -O ihex border-router.osd-er-lp24 border-router.osd-er-lp24.hex
+avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex border-router.osd-er-lp24 border-router.osd-er-lp24.eep
+#sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:border-router.osd-er-lp24.hex:a -U eeprom:w:border-router.osd-er-lp24.eep:a
--- a/examples/osd/rpl-border-router/slip-bridge.c
+++ b/examples/osd/rpl-border-router/slip-bridge.c
@ -0,0 +1,153 @@
+/*
+ * 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.
+ *
+ * $Id: slip-bridge.c,v 1.6 2011/01/17 20:05:51 joxe Exp $
+ */
+
+/**
+ * \file
+ *         Slip fallback interface
+ * \author
+ *         Niclas Finne <nfi@sics.se>
+ *         Joakim Eriksson <joakime@sics.se>
+ *         Joel Hoglund <joel@sics.se>
+ *         Nicolas Tsiftes <nvt@sics.se>
+ */
+
+#include "net/uip.h"
+#include "net/uip-ds6.h"
+#include "dev/slip.h"
+#include "dev/uart1.h"
+#include <string.h>
+
+#define UIP_IP_BUF        ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
+
+#define DEBUG DEBUG_PRINT
+#include "net/uip-debug.h"
+
+void set_prefix_64(uip_ipaddr_t *);
+
+static uip_ipaddr_t last_sender;
+/*---------------------------------------------------------------------------*/
+static void
+slip_input_callback(void)
+{
+ // PRINTF("SIN: %u\n", uip_len);
+  if(uip_buf[0] == '!') {
+    PRINTF("Got configuration message of type %c\n", uip_buf[1]);
+    uip_len = 0;
+    if(uip_buf[1] == 'P') {
+      uip_ipaddr_t prefix;
+      /* Here we set a prefix !!! */
+      memset(&prefix, 0, 16);
+      memcpy(&prefix, &uip_buf[2], 8);
+      PRINTF("Setting prefix ");
+      PRINT6ADDR(&prefix);
+      PRINTF("\n");
+      set_prefix_64(&prefix);
+    }
+  } else if (uip_buf[0] == '?') {
+    PRINTF("Got request message of type %c\n", uip_buf[1]);
+    if(uip_buf[1] == 'M') {
+      char* hexchar = "0123456789abcdef";
+      int j;
+      /* this is just a test so far... just to see if it works */
+      uip_buf[0] = '!';
+      for(j = 0; j < 8; j++) {
+        uip_buf[2 + j * 2] = hexchar[uip_lladdr.addr[j] >> 4];
+        uip_buf[3 + j * 2] = hexchar[uip_lladdr.addr[j] & 15];
+      }
+      uip_len = 18;
+      slip_send();
+      
+    }
+    uip_len = 0;
+  }
+  /* Save the last sender received over SLIP to avoid bouncing the
+     packet back if no route is found */
+  uip_ipaddr_copy(&last_sender, &UIP_IP_BUF->srcipaddr);
+}
+/*---------------------------------------------------------------------------*/
+static void
+init(void)
+{
+  slip_arch_init(BAUD2UBR(115200));
+  process_start(&slip_process, NULL);
+  slip_set_input_callback(slip_input_callback);
+}
+/*---------------------------------------------------------------------------*/
+static void
+output(void)
+{
+  if(uip_ipaddr_cmp(&last_sender, &UIP_IP_BUF->srcipaddr)) {
+    /* Do not bounce packets back over SLIP if the packet was received
+       over SLIP */
+    PRINTF("slip-bridge: Destination off-link but no route src=");
+    PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
+    PRINTF(" dst=");
+    PRINT6ADDR(&UIP_IP_BUF->destipaddr);
+    PRINTF("\n");
+  } else {
+ //   PRINTF("SUT: %u\n", uip_len);
+    slip_send();
+  }
+}
+
+/*---------------------------------------------------------------------------*/
+#undef putchar
+int
+putchar(int c)
+{
+#define SLIP_END     0300
+  static char debug_frame = 0;
+
+  if(!debug_frame) {            /* Start of debug output */
+    slip_arch_writeb(SLIP_END);
+    slip_arch_writeb('\r');     /* Type debug line == '\r' */
+    debug_frame = 1;
+  }
+
+  /* Need to also print '\n' because for example COOJA will not show
+     any output before line end */
+  slip_arch_writeb((char)c);
+
+  /*
+   * Line buffered output, a newline marks the end of debug output and
+   * implicitly flushes debug output.
+   */
+  if(c == '\n') {
+    slip_arch_writeb(SLIP_END);
+    debug_frame = 0;
+  }
+  return c;
+}
+/*---------------------------------------------------------------------------*/
+const struct uip_fallback_interface rpl_interface = {
+  init, output
+};
+/*---------------------------------------------------------------------------*/