Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

apps/er-coap-07/er-coap-07-engine.c

@@ -153,7 +153,14 @@ handle_incoming_data(void)
               if (coap_error_code==NO_ERROR)
               {
                 /* Apply blockwise transfers. */
-                if ( IS_OPTION(message, COAP_OPTION_BLOCK2) )
+                if ( IS_OPTION(message, COAP_OPTION_BLOCK1) && response->code<BAD_REQUEST_4_00 && !IS_OPTION(response, COAP_OPTION_BLOCK1) )
+                {
+                  PRINTF("Block1 NOT IMPLEMENTED\n");
+
+                  coap_error_code = NOT_IMPLEMENTED_5_01;
+                  coap_error_message = "NoBlock1Support";
+                }
+                else if ( IS_OPTION(message, COAP_OPTION_BLOCK2) )
                 {
                   /* unchanged new_offset indicates that resource is unaware of blockwise transfer */
                   if (new_offset==block_offset)
@@ -207,8 +214,8 @@ handle_incoming_data(void)
           } /* if (service callback) */
 
         } else {
-            coap_error_code = MEMORY_ALLOCATION_ERROR;
-            coap_error_message = "Transaction buffer allocation failed";
+            coap_error_code = SERVICE_UNAVAILABLE_5_03;
+            coap_error_message = "NoFreeTraBuffer";
         } /* if (transaction buffer) */
       }
       else

apps/er-coap-07/er-coap-07.c

@@ -697,10 +697,12 @@ coap_parse_message(void *packet, uint8_t *data, uint16_t data_len)
           PRINTF("Block2 [%lu%s (%u B/blk)]\n", coap_pkt->block2_num, coap_pkt->block2_more ? "+" : "", coap_pkt->block2_size);
           break;
         case COAP_OPTION_BLOCK1:
-          PRINTF("Block1 NOT IMPLEMENTED\n");
-          /*TODO implement */
-          coap_error_message = "Blockwise POST/PUT not supported";
-          return NOT_IMPLEMENTED_5_01;
+          coap_pkt->block1_num = parse_int_option(current_option, option_len);
+          coap_pkt->block1_more = (coap_pkt->block1_num & 0x08)>>3;
+          coap_pkt->block1_size = 16 << (coap_pkt->block1_num & 0x07);
+          coap_pkt->block1_offset = (coap_pkt->block1_num & ~0x0000000F)<<(coap_pkt->block1_num & 0x07);
+          coap_pkt->block1_num >>= 4;
+          PRINTF("Block1 [%lu%s (%u B/blk)]\n", coap_pkt->block1_num, coap_pkt->block1_more ? "+" : "", coap_pkt->block1_size);
           break;
         case COAP_OPTION_IF_NONE_MATCH:
           coap_pkt->if_none_match = 1;
@@ -779,7 +781,11 @@ coap_set_status_code(void *packet, unsigned int code)
 unsigned int
 coap_get_header_content_type(void *packet)
 {
-  return ((coap_packet_t *)packet)->content_type;
+  coap_packet_t *const coap_pkt = (coap_packet_t *) packet;
+
+  if (!IS_OPTION(coap_pkt, COAP_OPTION_CONTENT_TYPE)) return -1;
+
+  return coap_pkt->content_type;
 }
 
 int

examples/er-rest-example/Makefile

@@ -1,4 +1,4 @@
-all: rest-server-example coap-client-example
+all: rest-server-example coap-client-example plugtest-server
 
 CONTIKI=../..
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
@@ -25,6 +25,8 @@ else
 ${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
@@ -78,3 +80,6 @@ connect-router:	$(CONTIKI)/tools/tunslip6
 
 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

examples/er-rest-example/coap-client-example.c

@@ -43,7 +43,7 @@
 #include "contiki.h"
 #include "contiki-net.h"
 
-#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET)
+#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET) && !defined (CONTIKI_TARGET_NATIVE)
 #warning "Compiling with static routing!"
 #include "static-routing.h"
 #endif

examples/er-rest-example/plugtest-server.c

@@ -0,0 +1,565 @@
+/*
+ * 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);
+
+  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("/test           ");
+  if (method & METHOD_GET)
+  {
+    PRINTF("GET ");
+    /* Code 2.05 CONTENT is default. */
+  }
+  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("BUSY ");
+    REST.set_response_status(response, REST.status.SERVICE_UNAVAILABLE);
+    const char *msg = "AlreadyInUse";
+    REST.set_response_payload(response, msg, strlen(msg));
+  }
+  else
+  {
+    PRINTF("ACKED ");
+    separate_active = 1;
+
+    /* Take over and skip response by engine. */
+    coap_separate_yield(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);
+}
+
+int
+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");
+
+      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;
+
+      return 1;
+    } else {
+      PRINTF("ERROR (transaction)");
+    }
+  } /* if (separate_active) */
+
+  return 0;
+}
+#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 {
+    const 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 method = REST.get_method_type(request);
+
+  const 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 uint32_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, buffer, snprintf((char *)buffer, 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.
+ */
+int
+obs_periodic_handler(resource_t *r)
+{
+
+  PRINTF("TICK /%s\n", r->url);
+  obs_counter = obs_counter + 1;
+
+  /* Notify the registered observers with the given message type, observe option, and payload. */
+  REST.notify_subscribers(r->url, 1, obs_counter, (uint8_t *)obs_content, snprintf(obs_content, sizeof(obs_content), "TICK %lu", obs_counter));
+  /*                              |-> implementation-specific, e.g. CoAP: 0=CON and 1=NON notification */
+
+  return 1;
+}
+#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_set_pre_handler(&resource_separate, coap_separate_handler);
+  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();
+}

examples/er-rest-example/rest-server-example.c

@@ -57,7 +57,7 @@
 
 
 
-#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET)
+#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET) && !defined (CONTIKI_TARGET_NATIVE)
 #warning "Compiling with static routing!"
 #include "static-routing.h"
 #endif
@@ -447,7 +447,7 @@ separate_finalize_handler()
  * It takes an additional period parameter, which defines the interval to call [name]_periodic_handler().
  * A default post_handler takes care of subscriptions by managing a list of subscribers to notify.
  */
-PERIODIC_RESOURCE(pushing, METHOD_GET, "debug/push", "title=\"Periodic demo\";rt=\"Observable\"", 5*CLOCK_SECOND);
+PERIODIC_RESOURCE(pushing, METHOD_GET, "debug/push", "title=\"Periodic demo\";obs", 5*CLOCK_SECOND);
 
 void
 pushing_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
@@ -476,7 +476,7 @@ pushing_periodic_handler(resource_t *r)
 
   /* Notify the registered observers with the given message type, observe option, and payload. */
   REST.notify_subscribers(r->url, 1, periodic_i, (uint8_t *)content, snprintf(content, sizeof(content), "TICK %lu", periodic_i));
-  /*                              |-> implementation-specific, e.g. CoAP: 1=CON and 0=NON notification */
+  /*                              |-> implementation-specific, e.g. CoAP: 0=CON and 1=NON notification */
 
   return 1;
 }
@@ -488,7 +488,7 @@ pushing_periodic_handler(resource_t *r)
  * Additionally takes a period parameter that defines the interval to call [name]_periodic_handler().
  * A default post_handler takes care of subscriptions and manages a list of subscribers to notify.
  */
-EVENT_RESOURCE(event, METHOD_GET, "sensors/button", "title=\"Event demo\";rt=\"Observable\"");
+EVENT_RESOURCE(event, METHOD_GET, "sensors/button", "title=\"Event demo\";obs");
 
 void
 event_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)

examples/ipv6/native-border-router/border-router-rdc.c

@@ -117,8 +117,10 @@ send_packet(mac_callback_t sent, void *ptr)
 
   } else {
     /* here we send the data over SLIP to the radio-chip */
-
+    size = 0;
+#if SERIALIZE_ATTRIBUTES
     size = packetutils_serialize_atts(&buf[3], sizeof(buf) - 3);
+#endif
     if(size < 0 || size + packetbuf_totlen() + 3 > sizeof(buf)) {
       PRINTF("br-rdc: send failed, too large header\n");
       mac_call_sent_callback(sent, ptr, MAC_TX_ERR_FATAL, 1);

examples/ipv6/native-border-router/project-conf.h

@@ -45,6 +45,8 @@
 #undef WEBSERVER_CONF_CFS_CONNS
 #define WEBSERVER_CONF_CFS_CONNS 2
 
+#define SERIALIZE_ATTRIBUTES 1
+
 #define CMD_CONF_OUTPUT border_router_cmd_output
 
 #undef NETSTACK_CONF_RDC