diff --git a/Makefile.include b/Makefile.include index 0c2988548..d427d8c6b 100644 --- a/Makefile.include +++ b/Makefile.include @@ -21,6 +21,17 @@ ifeq ($(DEFINES),) endif endif +ifndef HOST_OS + ifeq ($(OS),Windows_NT) + ## TODO: detect more specific Windows set-ups, + ## e.g. CygWin, MingW, VisualC, Watcom, Interix + $(warning Windows (NT) detected.) + HOST_OS := Windows + else + HOST_OS := $(shell uname) + endif +endif + usage: @echo "make MAKETARGETS... [TARGET=(TARGET)] [savetarget] [targets]" diff --git a/apps/er-coap-03/er-coap-03-engine.c b/apps/er-coap-03/er-coap-03-engine.c index 610209f13..048261349 100644 --- a/apps/er-coap-03/er-coap-03-engine.c +++ b/apps/er-coap-03/er-coap-03-engine.c @@ -206,7 +206,7 @@ handle_incoming_data(void) } } else { - error = MEMORY_ALLOC_ERR; + error = MEMORY_ALLOCATION_ERROR; } } else diff --git a/apps/er-coap-03/er-coap-03-observing.c b/apps/er-coap-03/er-coap-03-observing.c index 2da95248c..dc8fbc048 100644 --- a/apps/er-coap-03/er-coap-03-observing.c +++ b/apps/er-coap-03/er-coap-03-observing.c @@ -58,7 +58,7 @@ LIST(observers_list); /*-----------------------------------------------------------------------------------*/ coap_observer_t * -coap_add_observer(const char *url, uip_ipaddr_t *addr, uint16_t port, const uint8_t *token, size_t token_len) +coap_add_observer(uip_ipaddr_t *addr, uint16_t port, const uint8_t *token, size_t token_len, const char *url) { coap_observer_t *o = memb_alloc(&observers_memb); @@ -173,7 +173,7 @@ coap_observe_handler(resource_t *resource, void *request, void *response) { if (IS_OPTION((coap_packet_t *)request, COAP_OPTION_TOKEN)) { - if (coap_add_observer(resource->url, &UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, ((coap_packet_t *)request)->token, ((coap_packet_t *)request)->token_len)) + if (coap_add_observer(&UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, ((coap_packet_t *)request)->token, ((coap_packet_t *)request)->token_len, resource->url)) { coap_set_header_observe(response, 0); coap_set_payload(response, (uint8_t *)content, snprintf(content, sizeof(content), "Added as observer %u/%u", list_length(observers_list), COAP_MAX_OBSERVERS)); diff --git a/apps/er-coap-03/er-coap-03-observing.h b/apps/er-coap-03/er-coap-03-observing.h index 90cbdf0b0..287c11e9f 100644 --- a/apps/er-coap-03/er-coap-03-observing.h +++ b/apps/er-coap-03/er-coap-03-observing.h @@ -65,7 +65,7 @@ typedef struct coap_observer { } coap_observer_t; list_t coap_get_observers(void); -coap_observer_t *coap_add_observer(const char *url, uip_ipaddr_t *addr, uint16_t port, const uint8_t *token, size_t token_len); +coap_observer_t *coap_add_observer(uip_ipaddr_t *addr, uint16_t port, const uint8_t *token, size_t token_len, const char *url); void coap_remove_observer(coap_observer_t *o); int coap_remove_observer_by_client(uip_ipaddr_t *addr, uint16_t port); int coap_remove_observer_by_token(uip_ipaddr_t *addr, uint16_t port, uint8_t *token, size_t token_len); diff --git a/apps/er-coap-03/er-coap-03.c b/apps/er-coap-03/er-coap-03.c index 10b95f59f..4f7a5b81c 100644 --- a/apps/er-coap-03/er-coap-03.c +++ b/apps/er-coap-03/er-coap-03.c @@ -191,7 +191,7 @@ coap_get_tid() } /*-----------------------------------------------------------------------------------*/ void -coap_send_message(uip_ipaddr_t *addr, uint16_t port, uint8_t *data, uint16_t length) +coap_send_message(uip_ipaddr_t *addr, uint16_t port, const uint8_t *data, uint16_t length) { /*configure connection to reply to client*/ uip_ipaddr_copy(&udp_conn->ripaddr, addr); @@ -586,7 +586,7 @@ coap_get_header_etag(void *packet, const uint8_t **etag) } int -coap_set_header_etag(void *packet, uint8_t *etag, size_t etag_len) +coap_set_header_etag(void *packet, const uint8_t *etag, size_t etag_len) { ((coap_packet_t *)packet)->etag_len = MIN(COAP_ETAG_LEN, etag_len); memcpy(((coap_packet_t *)packet)->etag, etag, ((coap_packet_t *)packet)->etag_len); @@ -605,9 +605,9 @@ coap_get_header_uri_host(void *packet, const char **host) } int -coap_set_header_uri_host(void *packet, char *host) +coap_set_header_uri_host(void *packet, const char *host) { - ((coap_packet_t *)packet)->uri_host = (char *) host; + ((coap_packet_t *)packet)->uri_host = host; ((coap_packet_t *)packet)->uri_host_len = strlen(host); SET_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_HOST); @@ -615,20 +615,20 @@ coap_set_header_uri_host(void *packet, char *host) } /*-----------------------------------------------------------------------------------*/ int -coap_get_header_location(void *packet, const char **uri) +coap_get_header_location(void *packet, const char **location) { if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_PATH)) return 0; - *uri = ((coap_packet_t *)packet)->location_path; + *location = ((coap_packet_t *)packet)->location_path; return ((coap_packet_t *)packet)->location_path_len; } int -coap_set_header_location(void *packet, char *location) +coap_set_header_location(void *packet, const char *location) { while (location[0]=='/') ++location; - ((coap_packet_t *)packet)->location_path = (char *) location; + ((coap_packet_t *)packet)->location_path = location; ((coap_packet_t *)packet)->location_path_len = strlen(location); SET_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_PATH); @@ -645,11 +645,11 @@ coap_get_header_uri_path(void *packet, const char **path) } int -coap_set_header_uri_path(void *packet, char *path) +coap_set_header_uri_path(void *packet, const char *path) { while (path[0]=='/') ++path; - ((coap_packet_t *)packet)->uri_path = (char *) path; + ((coap_packet_t *)packet)->uri_path = path; ((coap_packet_t *)packet)->uri_path_len = strlen(path); SET_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_PATH); @@ -683,7 +683,7 @@ coap_get_header_token(void *packet, const uint8_t **token) } int -coap_set_header_token(void *packet, uint8_t *token, size_t token_len) +coap_set_header_token(void *packet, const uint8_t *token, size_t token_len) { ((coap_packet_t *)packet)->token_len = MIN(COAP_TOKEN_LEN, token_len); memcpy(((coap_packet_t *)packet)->token, token, ((coap_packet_t *)packet)->token_len); @@ -731,7 +731,7 @@ coap_get_header_uri_query(void *packet, const char **query) } int -coap_set_header_uri_query(void *packet, char *query) +coap_set_header_uri_query(void *packet, const char *query) { while (query[0]=='?') ++query; @@ -745,7 +745,7 @@ coap_set_header_uri_query(void *packet, char *query) /*- PAYLOAD -------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/ int -coap_get_payload(void *packet, const uint8_t **payload) +coap_get_payload(void *packet, uint8_t **payload) { if (((coap_packet_t *)packet)->payload) { *payload = ((coap_packet_t *)packet)->payload; @@ -757,11 +757,11 @@ coap_get_payload(void *packet, const uint8_t **payload) } int -coap_set_payload(void *packet, uint8_t *payload, size_t length) +coap_set_payload(void *packet, const void *payload, size_t length) { PRINTF("setting payload (%u/%u)\n", length, REST_MAX_CHUNK_SIZE); - ((coap_packet_t *)packet)->payload = payload; + ((coap_packet_t *)packet)->payload = (uint8_t *) payload; ((coap_packet_t *)packet)->payload_len = MIN(REST_MAX_CHUNK_SIZE, length); return ((coap_packet_t *)packet)->payload_len; diff --git a/apps/er-coap-03/er-coap-03.h b/apps/er-coap-03/er-coap-03.h index 169188aab..ebd2f164f 100644 --- a/apps/er-coap-03/er-coap-03.h +++ b/apps/er-coap-03/er-coap-03.h @@ -200,11 +200,11 @@ typedef struct { uint8_t etag_len; uint8_t etag[COAP_ETAG_LEN]; uint8_t uri_host_len; - char *uri_host; + const char *uri_host; uint8_t location_path_len; - char *location_path; + const char *location_path; uint8_t uri_path_len; - char *uri_path; + const char *uri_path; uint32_t observe; /* 0-4 bytes for coap-03 */ uint8_t token_len; uint8_t token[COAP_TOKEN_LEN]; @@ -213,7 +213,7 @@ typedef struct { uint16_t block_size; uint32_t block_offset; uint8_t uri_query_len; - char *uri_query; + const char *uri_query; uint16_t payload_len; uint8_t *payload; @@ -226,7 +226,7 @@ typedef enum NO_ERROR, /* Memory errors */ - MEMORY_ALLOC_ERR, + MEMORY_ALLOCATION_ERROR, MEMORY_BOUNDARY_EXCEEDED, /* CoAP errors */ @@ -236,7 +236,7 @@ typedef enum void coap_init_connection(uint16_t port); uint16_t coap_get_tid(void); -void coap_send_message(uip_ipaddr_t *addr, uint16_t port, uint8_t *data, uint16_t length); +void coap_send_message(uip_ipaddr_t *addr, uint16_t port, const uint8_t *data, uint16_t length); void coap_init_message(void *packet, coap_message_type_t type, uint8_t code, uint16_t tid); int coap_serialize_message(void *packet, uint8_t *buffer); @@ -255,30 +255,30 @@ int coap_get_header_max_age(void *packet, uint32_t *age); int coap_set_header_max_age(void *packet, uint32_t age); int coap_get_header_etag(void *packet, const uint8_t **etag); -int coap_set_header_etag(void *packet, uint8_t *etag, size_t etag_len); +int coap_set_header_etag(void *packet, const uint8_t *etag, size_t etag_len); int coap_get_header_uri_host(void *packet, const char **host); /*CAUTION in-place string might not be 0-terminated */ -int coap_set_header_uri_host(void *packet, char *host); +int coap_set_header_uri_host(void *packet, const char *host); int coap_get_header_location(void *packet, const char **uri); /*CAUTION in-place string might not be 0-terminated */ -int coap_set_header_location(void *packet, char *uri); +int coap_set_header_location(void *packet, const char *uri); int coap_get_header_uri_path(void *packet, const char **uri); /*CAUTION in-place string might not be 0-terminated */ -int coap_set_header_uri_path(void *packet, char *uri); +int coap_set_header_uri_path(void *packet, const char *uri); int coap_get_header_observe(void *packet, uint32_t *observe); int coap_set_header_observe(void *packet, uint32_t observe); int coap_get_header_token(void *packet, const uint8_t **token); -int coap_set_header_token(void *packet, uint8_t *token, size_t token_len); +int coap_set_header_token(void *packet, const uint8_t *token, size_t token_len); int coap_get_header_block(void *packet, uint32_t *num, uint8_t *more, uint16_t *size, uint32_t *offset); int coap_set_header_block(void *packet, uint32_t num, uint8_t more, uint16_t size); int coap_get_header_uri_query(void *packet, const char **query); /*CAUTION in-place string might not be 0-terminated */ -int coap_set_header_uri_query(void *packet, char *query); +int coap_set_header_uri_query(void *packet, const char *query); -int coap_get_payload(void *packet, const uint8_t **payload); -int coap_set_payload(void *packet, uint8_t *payload, size_t length); +int coap_get_payload(void *packet, uint8_t **payload); +int coap_set_payload(void *packet, const void *payload, size_t length); #endif /* COAP_03_H_ */ diff --git a/apps/er-coap-06/Makefile.er-coap-06 b/apps/er-coap-06/Makefile.er-coap-06 deleted file mode 100644 index ea6f4e9f4..000000000 --- a/apps/er-coap-06/Makefile.er-coap-06 +++ /dev/null @@ -1 +0,0 @@ -er-coap-06_src = er-coap-06-engine.c er-coap-06.c er-coap-06-transactions.c er-coap-06-observing.c er-coap-06-separate.c diff --git a/apps/er-coap-06/er-coap-06-engine.c b/apps/er-coap-06/er-coap-06-engine.c deleted file mode 100644 index f03e279f3..000000000 --- a/apps/er-coap-06/er-coap-06-engine.c +++ /dev/null @@ -1,561 +0,0 @@ -/* - * Copyright (c) 2011, Institute for Pervasive Computing, ETH Zurich - * 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 - * CoAP implementation of the REST Engine - * \author - * Matthias Kovatsch - */ - -#include -#include -#include -#include "contiki.h" -#include "contiki-net.h" - -#include "er-coap-06-engine.h" - -#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]) -#define PRINTBITS(buf,len) { \ - int i,j=0; \ - for (i=0; i=0; --j) { \ - PRINTF("%c", (((char *)buf)[i] & 1<srcipaddr); - PRINTF(":%u\n Length: %u\n Data: ", uip_ntohs(UIP_UDP_BUF->srcport), uip_datalen() ); - PRINTBITS(uip_appdata, uip_datalen()); - PRINTF("\n"); - - coap_error_code = coap_parse_message(message, uip_appdata, uip_datalen()); - - if (coap_error_code==NO_ERROR) - { - - /*TODO duplicates suppression, if required */ - - PRINTF(" Parsed: v %u, t %u, oc %u, c %u, tid %u\n", message->version, message->type, message->option_count, message->code, message->tid); - PRINTF(" URL: %.*s\n", message->uri_path_len, message->uri_path); - PRINTF(" Payload: %.*s\n", message->payload_len, message->payload); - - /* Handle requests. */ - if (message->code >= COAP_GET && message->code <= COAP_DELETE) - { - /* Use transaction buffer for response to confirmable request. */ - if ( (transaction = coap_new_transaction(message->tid, &UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport)) ) - { - static uint32_t block_num = 0; - static uint16_t block_size = REST_MAX_CHUNK_SIZE; - static uint32_t block_offset = 0; - static int32_t new_offset = 0; - - /* prepare response */ - if (message->type==COAP_TYPE_CON) - { - /* Reliable CON requests are answered with an ACK. */ - coap_init_message(response, COAP_TYPE_ACK, CONTENT_2_05, message->tid); - } - else - { - /* Unreliable NON requests are answered with a NON as well. */ - coap_init_message(response, COAP_TYPE_NON, CONTENT_2_05, coap_get_tid()); - } - - /* resource handlers must take care of different handling (e.g., TOKEN_OPTION_REQUIRED_240) */ - if (IS_OPTION(message, COAP_OPTION_TOKEN)) - { - coap_set_header_token(response, message->token, message->token_len); - SET_OPTION(response, COAP_OPTION_TOKEN); - } - - /* get offset for blockwise transfers */ - if (coap_get_header_block2(message, &block_num, NULL, &block_size, &block_offset)) - { - PRINTF("Blockwise: block request %lu (%u/%u) @ %lu bytes\n", block_num, block_size, REST_MAX_CHUNK_SIZE, block_offset); - block_size = MIN(block_size, REST_MAX_CHUNK_SIZE); - new_offset = block_offset; - } - else - { - new_offset = 0; - } - - /* Invoke resource handler. */ - if (service_cbk) - { - /* Call REST framework and check if found and allowed. */ - if (service_cbk(message, response, transaction->packet+COAP_MAX_HEADER_SIZE, block_size, &new_offset)) - { - /* Apply blockwise transfers. */ - if ( IS_OPTION(message, COAP_OPTION_BLOCK2) ) - { - /* unchanged new_offset indicates that resource is unaware of blockwise transfer */ - if (new_offset==block_offset) - { - PRINTF("Blockwise: unaware resource with payload length %u/%u\n", response->payload_len, block_size); - if (block_offset >= response->payload_len) - { - PRINTF("handle_incoming_data(): block_offset >= response->payload_len\n"); - - response->code = BAD_OPTION_4_02; - coap_set_payload(response, (uint8_t*)"Block out of scope", 18); - } - else - { - coap_set_header_block2(response, block_num, response->payload_len - block_offset > block_size, block_size); - coap_set_payload(response, response->payload+block_offset, MIN(response->payload_len - block_offset, block_size)); - } /* if (valid offset) */ - } - else - { - /* resource provides chunk-wise data */ - PRINTF("Blockwise: blockwise resource, new offset %ld\n", new_offset); - coap_set_header_block2(response, block_num, new_offset!=-1 || response->payload_len > block_size, block_size); - if (response->payload_len > block_size) coap_set_payload(response, response->payload, block_size); - } /* if (resource aware of blockwise) */ - } - else if (new_offset!=0) - { - PRINTF("Blockwise: no block option for blockwise resource, using block size %u\n", REST_MAX_CHUNK_SIZE); - - coap_set_header_block2(response, 0, new_offset!=-1, REST_MAX_CHUNK_SIZE); - coap_set_payload(response, response->payload, MIN(response->payload_len, REST_MAX_CHUNK_SIZE)); - } /* if (blockwise request) */ - } - } - else - { - coap_error_code = INTERNAL_SERVER_ERROR_5_00; - coap_error_message = "Service callback undefined"; - } /* if (service callback) */ - - /* serialize Response. */ - if ((transaction->packet_len = coap_serialize_message(response, transaction->packet))==0) - { - coap_error_code = PACKET_SERIALIZATION_ERROR; - } - - } else { - coap_error_code = MEMORY_ALLOC_ERR; - coap_error_message = "Transaction buffer allocation failed"; - } /* if (transaction buffer) */ - } - else - { - /* Responses */ - - if (message->type==COAP_TYPE_ACK) - { - PRINTF("Received ACK\n"); - } - else if (message->type==COAP_TYPE_RST) - { - PRINTF("Received RST\n"); - /* Cancel possible subscriptions. */ - if (IS_OPTION(message, COAP_OPTION_TOKEN)) - { - PRINTF(" Token 0x%02X%02X\n", message->token[0], message->token[1]); - coap_remove_observer_by_token(&UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, message->token, message->token_len); - } - } - - if ( (transaction = coap_get_transaction_by_tid(message->tid)) ) - { - /* Free transaction memory before callback, as it may create a new transaction. */ - restful_response_handler callback = transaction->callback; - void *callback_data = transaction->callback_data; - coap_clear_transaction(transaction); - - /* Check if someone registered for the response */ - if (callback) { - callback(callback_data, message); - } - } /* if (ACKed transaction) */ - transaction = NULL; - } - } /* if (parsed correctly) */ - - if (coap_error_code==NO_ERROR) { - if (transaction) coap_send_transaction(transaction); - } - else - { - PRINTF("ERROR %u: %s\n", coap_error_code, coap_error_message); - coap_clear_transaction(transaction); - - /* Set to sendable error code. */ - if (coap_error_code >= 192) - { - coap_error_code = INTERNAL_SERVER_ERROR_5_00; - } - /* Reuse input buffer for error message. */ - coap_init_message(message, COAP_TYPE_ACK, coap_error_code, message->tid); - coap_set_payload(message, (uint8_t *) coap_error_message, strlen(coap_error_message)); - coap_send_message(&UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, uip_appdata, coap_serialize_message(message, uip_appdata)); - } - } /* if (new data) */ - - return coap_error_code; -} -/*-----------------------------------------------------------------------------------*/ -void -coap_receiver_init() -{ - process_start(&coap_receiver, NULL); -} -/*-----------------------------------------------------------------------------------*/ -void -coap_set_service_callback(service_callback_t callback) -{ - service_cbk = callback; -} -/*-----------------------------------------------------------------------------------*/ -rest_resource_flags_t -coap_get_rest_method(void *packet) -{ - return (rest_resource_flags_t)(1 << (((coap_packet_t *)packet)->code - 1)); -} -/*-----------------------------------------------------------------------------------*/ -int -coap_set_rest_status(void *packet, unsigned int code) -{ - if (code <= 0xFF) - { - ((coap_packet_t *)packet)->code = (uint8_t) code; - return 1; - } - else - { - return 0; - } -} -/*-----------------------------------------------------------------------------------*/ -/*- Server part ---------------------------------------------------------------------*/ -/*-----------------------------------------------------------------------------------*/ -/* The discover resource is automatically included for CoAP. */ -RESOURCE(well_known_core, METHOD_GET, ".well-known/core", ""); -void -well_known_core_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset) -{ - /* Response might be NULL for non-confirmable requests. */ - if (response) - { - size_t strpos = 0; - size_t bufpos = 0; - resource_t* resource = NULL; - - for (resource = (resource_t*)list_head(rest_get_resources()); resource; resource = resource->next) - { - strpos += snprintf((char *) buffer + bufpos, REST_MAX_CHUNK_SIZE - bufpos + 1, - "%s%s%s", - resource->url, - resource->attributes[0] ? ";" : "", - resource->attributes, - resource->next ? "," : "" ); - - PRINTF("discover: %s\n", resource->url); - - if (strpos <= *offset) - { - /* Discard output before current block */ - PRINTF(" if %d <= %ld B\n", strpos, *offset); - PRINTF(" %s\n", buffer); - bufpos = 0; - } - else /* (strpos > *offset) */ - { - /* output partly in block */ - size_t len = MIN(strpos - *offset, preferred_size); - - PRINTF(" el %d/%d @ %ld B\n", len, preferred_size, *offset); - - /* Block might start in the middle of the output; align with buffer start. */ - if (bufpos == 0) - { - memmove(buffer, buffer+strlen((char *)buffer)-strpos+*offset, len); - } - - bufpos = len; - PRINTF(" %s\n", buffer); - - if (bufpos >= preferred_size) - { - break; - } - } - } - - if (bufpos>0) { - coap_set_payload(response, buffer, bufpos ); - coap_set_header_content_type(response, APPLICATION_LINK_FORMAT); - } - else - { - PRINTF("well_known_core_handler(): bufpos<=0\n"); - - coap_set_rest_status(response, BAD_OPTION_4_02); - coap_set_payload(response, (uint8_t*)"Block out of scope", 18); - } - - if (resource==NULL) { - *offset = -1; - } - else - { - *offset += bufpos; - } - } -} -/*-----------------------------------------------------------------------------------*/ -PROCESS_THREAD(coap_receiver, ev, data) -{ - PROCESS_BEGIN(); - PRINTF("Starting CoAP-06 receiver...\n"); - - rest_activate_resource(&resource_well_known_core); - - coap_register_as_transaction_handler(); - coap_init_connection(SERVER_LISTEN_PORT); - - while(1) { - PROCESS_YIELD(); - - if(ev == tcpip_event) { - handle_incoming_data(); - } else if (ev == PROCESS_EVENT_TIMER) { - /* retransmissions are handled here */ - coap_check_transactions(); - } - } /* while (1) */ - - PROCESS_END(); -} -/*-----------------------------------------------------------------------------------*/ -/*- Client part ---------------------------------------------------------------------*/ -/*-----------------------------------------------------------------------------------*/ -void blocking_request_callback(void *callback_data, void *response) { - struct request_state_t *state = (struct request_state_t *) callback_data; - state->response = (coap_packet_t*) response; - process_poll(state->process); -} -/*-----------------------------------------------------------------------------------*/ -PT_THREAD(coap_blocking_request(struct request_state_t *state, process_event_t ev, - uip_ipaddr_t *remote_ipaddr, uint16_t remote_port, - coap_packet_t *request, - blocking_response_handler request_callback)) { - PT_BEGIN(&state->pt); - - static uint8_t more; - static uint32_t res_block; - static uint8_t block_error; - - state->block_num = 0; - state->response = NULL; - state->process = PROCESS_CURRENT(); - - more = 0; - res_block = 0; - block_error = 0; - - do { - request->tid = coap_get_tid(); - if ((state->transaction = coap_new_transaction(request->tid, remote_ipaddr, remote_port))) - { - state->transaction->callback = blocking_request_callback; - state->transaction->callback_data = state; - - if (state->block_num>0) - { - coap_set_header_block2(request, state->block_num, 0, REST_MAX_CHUNK_SIZE); - } - - state->transaction->packet_len = coap_serialize_message(request, state->transaction->packet); - - coap_send_transaction(state->transaction); - PRINTF("Requested #%lu (TID %u)\n", state->block_num, request->tid); - - PT_YIELD_UNTIL(&state->pt, ev == PROCESS_EVENT_POLL); - - if (!state->response) - { - PRINTF("Server not responding\n"); - PT_EXIT(&state->pt); - } - - coap_get_header_block2(state->response, &res_block, &more, NULL, NULL); - - PRINTF("Received #%lu%s (%u bytes)\n", res_block, more ? "+" : "", state->response->payload_len); - - if (res_block==state->block_num) - { - request_callback(state->response); - ++(state->block_num); - } - else - { - PRINTF("WRONG BLOCK %lu/%lu\n", res_block, state->block_num); - ++block_error; - } - } - else - { - PRINTF("Could not allocate transaction buffer"); - PT_EXIT(&state->pt); - } - } while (more && block_errorpt); -} -/*-----------------------------------------------------------------------------------*/ -/*- Engine Interface ----------------------------------------------------------------*/ -/*-----------------------------------------------------------------------------------*/ -const struct rest_implementation coap_rest_implementation = { - "CoAP-06", - - coap_receiver_init, - coap_set_service_callback, - - coap_get_header_uri_path, - coap_set_header_uri_path, - coap_get_rest_method, - coap_set_rest_status, - - coap_get_header_content_type, - coap_set_header_content_type, - NULL, - coap_get_header_max_age, - coap_set_header_max_age, - coap_set_header_etag, - NULL, - NULL, - coap_get_header_uri_host, - coap_set_header_location_path, - - coap_get_payload, - coap_set_payload, - - coap_get_header_uri_query, - coap_get_query_variable, - coap_get_post_variable, - - coap_notify_observers, - (restful_post_handler) coap_observe_handler, - - NULL, /* default pre-handler (set separate handler after activation if needed) */ - NULL, /* default post-handler for non-observable resources */ - - { - CONTENT_2_05, - CREATED_2_01, - CHANGED_2_04, - DELETED_2_02, - VALID_2_03, - BAD_REQUEST_4_00, - UNAUTHORIZED_4_01, - BAD_OPTION_4_02, - FORBIDDEN_4_03, - NOT_FOUND_4_04, - METHOD_NOT_ALLOWED_4_05, - REQUEST_ENTITY_TOO_LARGE_4_13, - UNSUPPORTED_MADIA_TYPE_4_15, - INTERNAL_SERVER_ERROR_5_00, - NOT_IMPLEMENTED_5_01, - BAD_GATEWAY_5_02, - SERVICE_UNAVAILABLE_5_03, - GATEWAY_TIMEOUT_5_04, - PROXYING_NOT_SUPPORTED_5_05 - }, - - { - TEXT_PLAIN, - TEXT_XML, - TEXT_CSV, - TEXT_HTML, - IMAGE_GIF, - IMAGE_JPEG, - IMAGE_PNG, - IMAGE_TIFF, - AUDIO_RAW, - VIDEO_RAW, - APPLICATION_LINK_FORMAT, - APPLICATION_XML, - APPLICATION_OCTET_STREAM, - APPLICATION_RDF_XML, - APPLICATION_SOAP_XML, - APPLICATION_ATOM_XML, - APPLICATION_XMPP_XML, - APPLICATION_EXI, - APPLICATION_FASTINFOSET, - APPLICATION_SOAP_FASTINFOSET, - APPLICATION_JSON, - APPLICATION_X_OBIX_BINARY - } -}; diff --git a/apps/er-coap-06/er-coap-06-engine.h b/apps/er-coap-06/er-coap-06-engine.h deleted file mode 100644 index c8c907d40..000000000 --- a/apps/er-coap-06/er-coap-06-engine.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2011, Institute for Pervasive Computing, ETH Zurich - * 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 - * CoAP implementation of the REST Engine - * \author - * Matthias Kovatsch - */ - -#ifndef COAP_SERVER_H_ -#define COAP_SERVER_H_ - -#if !defined(REST) -#error "Define REST to \"coap_rest_implementation\"" -#endif - -#include "er-coap-06.h" -#include "er-coap-06-transactions.h" -#include "er-coap-06-observing.h" -#include "er-coap-06-separate.h" - -#include "pt.h" - -/* Declare server process */ -PROCESS_NAME(coap_receiver); - -#define SERVER_LISTEN_PORT UIP_HTONS(COAP_SERVER_PORT) - -typedef coap_packet_t rest_request_t; -typedef coap_packet_t rest_response_t; - -extern const struct rest_implementation coap_rest_implementation; - -void coap_receiver_init(void); - -/*-----------------------------------------------------------------------------------*/ -/*- Client part ---------------------------------------------------------------------*/ -/*-----------------------------------------------------------------------------------*/ -struct request_state_t { - struct pt pt; - struct process *process; - coap_transaction_t *transaction; - coap_packet_t *response; - uint32_t block_num; -}; - -typedef void (*blocking_response_handler) (void* response); - -PT_THREAD(coap_blocking_request(struct request_state_t *state, process_event_t ev, - uip_ipaddr_t *remote_ipaddr, uint16_t remote_port, - coap_packet_t *request, - blocking_response_handler request_callback)); - -#define COAP_BLOCKING_REQUEST(server_addr, server_port, request, chunk_handler) \ -static struct request_state_t request_state; \ -PT_SPAWN(process_pt, &request_state.pt, \ - coap_blocking_request(&request_state, ev, \ - server_addr, server_port, \ - request, chunk_handler) \ - ); -/*-----------------------------------------------------------------------------------*/ - -#endif /* COAP_SERVER_H_ */ diff --git a/apps/er-coap-06/er-coap-06-observing.c b/apps/er-coap-06/er-coap-06-observing.c deleted file mode 100644 index 06c454883..000000000 --- a/apps/er-coap-06/er-coap-06-observing.c +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright (c) 2011, Institute for Pervasive Computing, ETH Zurich - * 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 - * CoAP module for observing resources - * \author - * Matthias Kovatsch - */ - -#include -#include - -#include "er-coap-06-observing.h" - -#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 - - -MEMB(observers_memb, coap_observer_t, COAP_MAX_OBSERVERS); -LIST(observers_list); - -/*-----------------------------------------------------------------------------------*/ -coap_observer_t * -coap_add_observer(const char *url, uip_ipaddr_t *addr, uint16_t port, const uint8_t *token, size_t token_len) -{ - coap_observer_t *o = memb_alloc(&observers_memb); - - if (o) - { - o->url = url; - uip_ipaddr_copy(&o->addr, addr); - o->port = port; - o->token_len = token_len; - memcpy(o->token, token, token_len); - - stimer_set(&o->refresh_timer, COAP_OBSERVING_REFRESH_INTERVAL); - - PRINTF("Adding observer for /%s [0x%02X%02X]\n", o->url, o->token[0], o->token[1]); - list_add(observers_list, o); - } - - return o; -} -/*-----------------------------------------------------------------------------------*/ -void -coap_remove_observer(coap_observer_t *o) -{ - PRINTF("Removing observer for /%s [0x%02X%02X]\n", o->url, o->token[0], o->token[1]); - - memb_free(&observers_memb, o); - list_remove(observers_list, o); -} - -int -coap_remove_observer_by_client(uip_ipaddr_t *addr, uint16_t port) -{ - int removed = 0; - coap_observer_t* obs = NULL; - - for (obs = (coap_observer_t*)list_head(observers_list); obs; obs = obs->next) - { - PRINTF("Remove check client "); - PRINT6ADDR(addr); - PRINTF(":%u\n", port); - if (uip_ipaddr_cmp(&obs->addr, addr) && obs->port==port) - { - coap_remove_observer(obs); - removed++; - } - } - return removed; -} -int -coap_remove_observer_by_token(uip_ipaddr_t *addr, uint16_t port, uint8_t *token, size_t token_len) -{ - int removed = 0; - coap_observer_t* obs = NULL; - - for (obs = (coap_observer_t*)list_head(observers_list); obs; obs = obs->next) - { - PRINTF("Remove check Token 0x%02X%02X\n", token[0], token[1]); - if (uip_ipaddr_cmp(&obs->addr, addr) && obs->port==port && memcmp(obs->token, token, token_len)==0) - { - coap_remove_observer(obs); - removed++; - } - } - return removed; -} -/*-----------------------------------------------------------------------------------*/ -void -coap_notify_observers(const char *url, int type, uint32_t observe, uint8_t *payload, size_t payload_len) -{ - coap_observer_t* obs = NULL; - for (obs = (coap_observer_t*)list_head(observers_list); obs; obs = obs->next) - { - if (obs->url==url) /* using RESOURCE url pointer as handle */ - { - coap_transaction_t *transaction = NULL; - - /*TODO implement special transaction for CON, sharing the same buffer to allow for more observers */ - - if ( (transaction = coap_new_transaction(coap_get_tid(), &obs->addr, obs->port)) ) - { - /* Use CON to check whether client is still there/interested after COAP_OBSERVING_REFRESH_INTERVAL. */ - if (stimer_expired(&obs->refresh_timer)) - { - PRINTF("Observing: Refresh client with CON\n"); - type = COAP_TYPE_CON; - stimer_restart(&obs->refresh_timer); - } - - /* prepare response */ - coap_packet_t push[1]; /* This way the packet can be treated as pointer as usual. */ - coap_init_message(push, (coap_message_type_t)type, CONTENT_2_05, transaction->tid ); - coap_set_header_observe(push, observe); - coap_set_header_token(push, obs->token, obs->token_len); - coap_set_payload(push, payload, payload_len); - transaction->packet_len = coap_serialize_message(push, transaction->packet); - - PRINTF("Observing: Notify from /%s for ", url); - PRINT6ADDR(&obs->addr); - PRINTF(":%u\n", obs->port); - PRINTF(" %.*s\n", payload_len, payload); - - coap_send_transaction(transaction); - } - } - } -} -/*-----------------------------------------------------------------------------------*/ -void -coap_observe_handler(resource_t *resource, void *request, void *response) -{ - static char content[26]; - - if (response && ((coap_packet_t *)response)->code<128) /* response without error code */ - { - if (IS_OPTION((coap_packet_t *)request, COAP_OPTION_OBSERVE)) - { - if (!IS_OPTION((coap_packet_t *)request, COAP_OPTION_TOKEN)) - { - /* Set default token. */ - coap_set_header_token(request, (uint8_t *)"", 1); - } - - if (coap_add_observer(resource->url, &UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, ((coap_packet_t *)request)->token, ((coap_packet_t *)request)->token_len)) - { - coap_set_header_observe(response, 0); - coap_set_payload(response, (uint8_t *)content, snprintf(content, sizeof(content), "Added as observer %u/%u", list_length(observers_list), COAP_MAX_OBSERVERS)); - } - else - { - ((coap_packet_t *)response)->code = SERVICE_UNAVAILABLE_5_03; - coap_set_payload(response, (uint8_t *)"Too many observers", 18); - } /* if (added observer) */ - } - else /* if (observe) */ - { - /* Remove client if it is currently observing. */ - coap_remove_observer_by_client(&UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport); - } /* if (observe) */ - } -} diff --git a/apps/er-coap-06/er-coap-06-observing.h b/apps/er-coap-06/er-coap-06-observing.h deleted file mode 100644 index b3f266dd0..000000000 --- a/apps/er-coap-06/er-coap-06-observing.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2011, Institute for Pervasive Computing, ETH Zurich - * 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 - * CoAP module for observing resources - * \author - * Matthias Kovatsch - */ - -#ifndef COAP_OBSERVING_H_ -#define COAP_OBSERVING_H_ - -#include "er-coap-06.h" -#include "er-coap-06-transactions.h" - -#ifndef COAP_MAX_OBSERVERS -#define COAP_MAX_OBSERVERS 4 -#endif /* COAP_MAX_OBSERVERS */ - -/* Interval in seconds in which NON notifies are changed to CON notifies to check client. */ -#define COAP_OBSERVING_REFRESH_INTERVAL 60 - -#if COAP_MAX_OPEN_TRANSACTIONS - */ - -#include -#include - -#include "er-coap-06-separate.h" - -#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 - -/*-----------------------------------------------------------------------------------*/ -void coap_separate_handler(resource_t *resource, void *request, void *response) -{ - if (resource->benchmark > COAP_SEPARATE_THRESHOLD) - { - PRINTF("Separate response for /%s \n", resource->url); - /* send separate ACK. */ - coap_packet_t ack[1]; - /* ACK with empty code (0) */ - coap_init_message(ack, COAP_TYPE_ACK, 0, ((coap_packet_t *)request)->tid); - /* Should only overwrite Header which is already parsed to request. */ - coap_send_message(&UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, (uip_appdata + uip_ext_len), coap_serialize_message(ack, (uip_appdata + uip_ext_len))); - - /* Change response to separate response. */ - ((coap_packet_t *)response)->type = COAP_TYPE_CON; - ((coap_packet_t *)response)->tid = coap_get_tid(); - } -} diff --git a/apps/er-coap-06/er-coap-06-separate.h b/apps/er-coap-06/er-coap-06-separate.h deleted file mode 100644 index 079384f0c..000000000 --- a/apps/er-coap-06/er-coap-06-separate.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2011, Institute for Pervasive Computing, ETH Zurich - * 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 - * CoAP module for separate responses - * \author - * Matthias Kovatsch - */ - -#ifndef COAP_SEPARATE_H_ -#define COAP_SEPARATE_H_ - -#include "er-coap-06.h" - -#ifndef COAP_SEPARATE_THRESHOLD -#define COAP_SEPARATE_THRESHOLD 42 -#endif - -void coap_separate_handler(resource_t *resource, void *request, void *response); - -#endif /* COAP_SEPARATE_H_ */ diff --git a/apps/er-coap-06/er-coap-06-transactions.c b/apps/er-coap-06/er-coap-06-transactions.c deleted file mode 100644 index 47958bd8d..000000000 --- a/apps/er-coap-06/er-coap-06-transactions.c +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright (c) 2011, Institute for Pervasive Computing, ETH Zurich - * 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 - * CoAP module for reliable transport - * \author - * Matthias Kovatsch - */ - -#include "contiki.h" -#include "contiki-net.h" - -#include "er-coap-06-transactions.h" - -/* - * Modulo mask (+1 and +0.5 for rounding) for a random number to get the tick number for the random - * retransmission time between COAP_RESPONSE_TIMEOUT and COAP_RESPONSE_TIMEOUT*COAP_RESPONSE_RANDOM_FACTOR. - */ -#define COAP_RESPONSE_TIMEOUT_TICKS (CLOCK_SECOND * COAP_RESPONSE_TIMEOUT) -#define COAP_RESPONSE_TIMEOUT_BACKOFF_MASK ((CLOCK_SECOND * COAP_RESPONSE_TIMEOUT * (COAP_RESPONSE_RANDOM_FACTOR - 1)) + 1.5) - -#define DEBUG 0 -#if DEBUG -#include -#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 - - -MEMB(transactions_memb, coap_transaction_t, COAP_MAX_OPEN_TRANSACTIONS); -LIST(transactions_list); - - -static struct process *transaction_handler_process = NULL; - -void -coap_register_as_transaction_handler() -{ - transaction_handler_process = PROCESS_CURRENT(); -} - -coap_transaction_t * -coap_new_transaction(uint16_t tid, uip_ipaddr_t *addr, uint16_t port) -{ - coap_transaction_t *t = memb_alloc(&transactions_memb); - - if (t) - { - t->tid = tid; - t->retrans_counter = 0; - - /* save client address */ - uip_ipaddr_copy(&t->addr, addr); - t->port = port; - } - - return t; -} - -void -coap_send_transaction(coap_transaction_t *t) -{ - PRINTF("Sending transaction %u\n", t->tid); - - coap_send_message(&t->addr, t->port, t->packet, t->packet_len); - - if (COAP_TYPE_CON==((COAP_HEADER_TYPE_MASK & t->packet[0])>>COAP_HEADER_TYPE_POSITION)) - { - if (t->retrans_countertid); - - if (t->retrans_counter==0) - { - t->retrans_timer.timer.interval = COAP_RESPONSE_TIMEOUT_TICKS + (random_rand() % (clock_time_t) COAP_RESPONSE_TIMEOUT_BACKOFF_MASK); - PRINTF("Initial interval %f\n", (float)t->retrans_timer.timer.interval/CLOCK_SECOND); - } - else - { - t->retrans_timer.timer.interval <<= 1; /* double */ - PRINTF("Doubled (%u) interval %f\n", t->retrans_counter, (float)t->retrans_timer.timer.interval/CLOCK_SECOND); - } - - /*FIXME hack, maybe there is a better way, but avoid posting everything to the process */ - struct process *process_actual = PROCESS_CURRENT(); - process_current = transaction_handler_process; - etimer_restart(&t->retrans_timer); /* interval updated above */ - process_current = process_actual; - - list_add(transactions_list, t); /* List itself makes sure same element is not added twice. */ - - t = NULL; - } - else - { - /* timeout */ - PRINTF("Timeout\n"); - restful_response_handler callback = t->callback; - void *callback_data = t->callback_data; - - /* handle observers */ - coap_remove_observer_by_client(&t->addr, t->port); - - coap_clear_transaction(t); - - if (callback) { - callback(callback_data, NULL); - } - } - } - else - { - coap_clear_transaction(t); - } -} - -void -coap_clear_transaction(coap_transaction_t *t) -{ - if (t) - { - PRINTF("Freeing transaction %u: %p\n", t->tid, t); - - etimer_stop(&t->retrans_timer); - list_remove(transactions_list, t); - memb_free(&transactions_memb, t); - } -} - -coap_transaction_t * -coap_get_transaction_by_tid(uint16_t tid) -{ - coap_transaction_t *t = NULL; - - for (t = (coap_transaction_t*)list_head(transactions_list); t; t = t->next) - { - if (t->tid==tid) - { - PRINTF("Found transaction for TID %u: %p\n", t->tid, t); - return t; - } - } - return NULL; -} - -void -coap_check_transactions() -{ - coap_transaction_t *t = NULL; - - for (t = (coap_transaction_t*)list_head(transactions_list); t; t = t->next) - { - if (etimer_expired(&t->retrans_timer)) - { - ++(t->retrans_counter); - PRINTF("Retransmitting %u (%u)\n", t->tid, t->retrans_counter); - coap_send_transaction(t); - } - } -} diff --git a/apps/er-coap-06/er-coap-06-transactions.h b/apps/er-coap-06/er-coap-06-transactions.h deleted file mode 100644 index f5e97454f..000000000 --- a/apps/er-coap-06/er-coap-06-transactions.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2011, Institute for Pervasive Computing, ETH Zurich - * 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 - * CoAP module for reliable transport - * \author - * Matthias Kovatsch - */ - -#ifndef COAP_TRANSACTIONS_H_ -#define COAP_TRANSACTIONS_H_ - -#include "er-coap-06.h" -#include "er-coap-06-observing.h" - -/* - * The number of concurrent messages that can be stored for retransmission in the transaction layer. - */ -#ifndef COAP_MAX_OPEN_TRANSACTIONS -#define COAP_MAX_OPEN_TRANSACTIONS 4 -#endif /* COAP_MAX_OPEN_TRANSACTIONS */ - -/* container for transactions with message buffer and retransmission info */ -typedef struct coap_transaction { - struct coap_transaction *next; /* for LIST */ - - uint16_t tid; - struct etimer retrans_timer; - uint8_t retrans_counter; - - uip_ipaddr_t addr; - uint16_t port; - - restful_response_handler callback; - void *callback_data; - - uint16_t packet_len; - uint8_t packet[COAP_MAX_PACKET_SIZE+1]; /* +1 for the terminating '\0' to simply and savely use snprintf(buf, len+1, "", ...) in the resource handler. */ -} coap_transaction_t; - -void coap_register_as_transaction_handler(); - -coap_transaction_t *coap_new_transaction(uint16_t tid, uip_ipaddr_t *addr, uint16_t port); -void coap_send_transaction(coap_transaction_t *t); -void coap_clear_transaction(coap_transaction_t *t); -coap_transaction_t *coap_get_transaction_by_tid(uint16_t tid); - -void coap_check_transactions(); - -#endif /* COAP_TRANSACTIONS_H_ */ diff --git a/apps/er-coap-06/er-coap-06.c b/apps/er-coap-06/er-coap-06.c deleted file mode 100644 index 62b86eb2d..000000000 --- a/apps/er-coap-06/er-coap-06.c +++ /dev/null @@ -1,986 +0,0 @@ -/* - * Copyright (c) 2011, Institute for Pervasive Computing, ETH Zurich - * 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 - * An implementation of the Constrained Application Protocol (draft 06) - * \author - * Matthias Kovatsch - */ - -#include "contiki.h" -#include "contiki-net.h" -#include -#include - -#include "er-coap-06.h" -#include "er-coap-06-transactions.h" - -#define DEBUG 0 -#if DEBUG -#include -#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 - -/*-----------------------------------------------------------------------------------*/ -/*- Variables -----------------------------------------------------------------------*/ -/*-----------------------------------------------------------------------------------*/ -static struct uip_udp_conn *udp_conn = NULL; -static uint16_t current_tid = 0; - -coap_status_t coap_error_code = NO_ERROR; -char *coap_error_message = ""; -/*-----------------------------------------------------------------------------------*/ -/*- LOCAL HELP FUNCTIONS ------------------------------------------------------------*/ -/*-----------------------------------------------------------------------------------*/ -static -uint16_t -log_2(uint16_t value) -{ - uint16_t result = 0; - do { - value = value >> 1; - result++; - } while (value); - - return result ? result - 1 : result; -} -/*-----------------------------------------------------------------------------------*/ -static -uint32_t -parse_int_option(uint8_t *bytes, uint16_t length) -{ - uint32_t var = 0; - int i = 0; - while (i 15) - { - uint8_t delta = COAP_OPTION_FENCE_POST - (*current_number%COAP_OPTION_FENCE_POST); - set_option_header(delta, 0, &buffer[i++]); - *current_number += delta; - - PRINTF("OPTION FENCE POST delta %u\n", delta); - } - return i; -} -/*-----------------------------------------------------------------------------------*/ -static -size_t -serialize_int_option(int number, int current_number, uint8_t *buffer, uint32_t value) -{ - /* Insert fence-posts for large deltas */ - size_t i = insert_option_fence_posts(number, ¤t_number, buffer); - size_t start_i = i; - - uint8_t *option = &buffer[i]; - - if (0xFF000000 & value) buffer[++i] = (uint8_t) (0xFF & value>>24); - if (0xFFFF0000 & value) buffer[++i] = (uint8_t) (0xFF & value>>16); - if (0xFFFFFF00 & value) buffer[++i] = (uint8_t) (0xFF & value>>8); - if ( value) buffer[++i] = (uint8_t) (0xFF & value); - - i += set_option_header(number - current_number, i-start_i, option); - - PRINTF("OPTION type %u, delta %u, len %u\n", number, number - current_number, i-start_i); - - return i; -} -/*-----------------------------------------------------------------------------------*/ -static -size_t -serialize_array_option(int number, int current_number, uint8_t *buffer, uint8_t *array, size_t length, uint8_t *split_option) -{ - /* Insert fence-posts for large deltas */ - size_t i = insert_option_fence_posts(number, ¤t_number, buffer); - - if (split_option!=NULL) - { - int j; - uint8_t *part_start = array; - uint8_t *part_end = NULL; - size_t temp_length; - - char split_char = *split_option; - *split_option = 0; /* Ensure reflecting the created option count */ - - for (j = 0; j<=length; ++j) - { - if (array[j]==split_char || j==length) - { - part_end = array + j; - temp_length = part_end-part_start; - - i += set_option_header(number - current_number, temp_length, &buffer[i]); - memcpy(&buffer[i], part_start, temp_length); - i += temp_length; - - PRINTF("OPTION type %u, delta %u, len %u, part [%.*s]\n", number, number - current_number, i, temp_length, part_start); - - ++(*split_option); - ++j; /* skip the slash */ - current_number = number; - while( array[j]=='/') ++j; - part_start = array + j; - } - } /* for */ - } - else - { - i += set_option_header(number - current_number, length, &buffer[i]); - memcpy(&buffer[i], array, length); - i += length; - - PRINTF("OPTION type %u, delta %u, len %u\n", number, number - current_number, i); - } - - return i; -} -/*-----------------------------------------------------------------------------------*/ -static -void -coap_merge_multi_option(char **dst, size_t *dst_len, uint8_t *option, size_t option_len, char separator) -{ - /* Merge multiple options. */ - if (*dst_len > 0) - { - (*dst)[*dst_len] = separator; - *dst_len += 1; - - /* memmove handles 2-byte option headers */ - memmove((*dst)+(*dst_len), option, option_len); - - *dst_len += option_len; - } - else - { - *dst = (char *) option; /* thus pointer pointer */ - *dst_len = option_len; - } -} -/*-----------------------------------------------------------------------------------*/ -static -int -coap_get_variable(const char *buffer, size_t length, const char *name, const char **output) -{ - const char *start = NULL; - const char *end = NULL; - const char *value_end = NULL; - size_t name_len = 0; - - /*initialize the output buffer first*/ - *output = 0; - - name_len = strlen(name); - end = buffer + length; - - for (start = buffer; start + name_len < end; ++start){ - if ((start == buffer || start[-1] == '&') && start[name_len] == '=' && - strncmp(name, start, name_len)==0) { - - /* Point start to variable value */ - start += name_len + 1; - - /* Point end to the end of the value */ - value_end = (const char *) memchr(start, '&', end - start); - if (value_end == NULL) { - value_end = end; - } - - *output = start; - - return (value_end - start); - } - } - - return 0; -} -/*-----------------------------------------------------------------------------------*/ -/*- MEASSAGE SENDING ----------------------------------------------------------------*/ -/*-----------------------------------------------------------------------------------*/ -void -coap_init_connection(uint16_t port) -{ - /* new connection with remote host */ - udp_conn = udp_new(NULL, 0, NULL); - udp_bind(udp_conn, port); - PRINTF("Listening on port %u\n", uip_ntohs(udp_conn->lport)); - - /* Initialize transaction ID. */ - current_tid = random_rand(); -} -/*-----------------------------------------------------------------------------------*/ -uint16_t -coap_get_tid() -{ - return ++current_tid; -} -/*-----------------------------------------------------------------------------------*/ -/*- MEASSAGE PROCESSING -------------------------------------------------------------*/ -/*-----------------------------------------------------------------------------------*/ -void -coap_init_message(void *packet, coap_message_type_t type, uint8_t code, uint16_t tid) -{ - /* Important thing */ - memset(packet, 0, sizeof(coap_packet_t)); - - ((coap_packet_t *)packet)->type = type; - ((coap_packet_t *)packet)->code = code; - ((coap_packet_t *)packet)->tid = tid; -} -/*-----------------------------------------------------------------------------------*/ -size_t -coap_serialize_message(void *packet, uint8_t *buffer) -{ - /* Initialize */ - ((coap_packet_t *)packet)->buffer = buffer; - ((coap_packet_t *)packet)->version = 1; - ((coap_packet_t *)packet)->option_count = 0; - - /* serialize options */ - uint8_t *option = ((coap_packet_t *)packet)->buffer + COAP_HEADER_LEN; - int current_number = 0; - - PRINTF("-Serializing options-\n"); - - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_CONTENT_TYPE)) { - PRINTF("Content-Type [%u]\n", ((coap_packet_t *)packet)->content_type); - - option += serialize_int_option(COAP_OPTION_CONTENT_TYPE, current_number, option, ((coap_packet_t *)packet)->content_type); - ((coap_packet_t *)packet)->option_count += 1; - current_number = COAP_OPTION_CONTENT_TYPE; - } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_MAX_AGE)) { - PRINTF("Max-Age [%lu]\n", ((coap_packet_t *)packet)->max_age); - - option += serialize_int_option(COAP_OPTION_MAX_AGE, current_number, option, ((coap_packet_t *)packet)->max_age); - ((coap_packet_t *)packet)->option_count += 1; - current_number = COAP_OPTION_MAX_AGE; - } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_PROXY_URI)) { - PRINTF("Proxy-Uri [%.*s]\n", ((coap_packet_t *)packet)->proxy_uri_len, ((coap_packet_t *)packet)->proxy_uri); - - int length = ((coap_packet_t *)packet)->proxy_uri_len; - int j = 0; - while (length>0) - { - option += serialize_array_option(COAP_OPTION_PROXY_URI, current_number, option, (uint8_t *) ((coap_packet_t *)packet)->proxy_uri + j*270, MIN(270, length), NULL); - ((coap_packet_t *)packet)->option_count += 1; - current_number = COAP_OPTION_PROXY_URI; - - ++j; - length -= 270; - } - } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_ETAG)) { - PRINTF("ETag %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", ((coap_packet_t *)packet)->etag_len, - ((coap_packet_t *)packet)->etag[0], - ((coap_packet_t *)packet)->etag[1], - ((coap_packet_t *)packet)->etag[2], - ((coap_packet_t *)packet)->etag[3], - ((coap_packet_t *)packet)->etag[4], - ((coap_packet_t *)packet)->etag[5], - ((coap_packet_t *)packet)->etag[6], - ((coap_packet_t *)packet)->etag[7] - ); /*FIXME always prints 8 bytes */ - - option += serialize_array_option(COAP_OPTION_ETAG, current_number, option, ((coap_packet_t *)packet)->etag, ((coap_packet_t *)packet)->etag_len, NULL); - ((coap_packet_t *)packet)->option_count += 1; - current_number = COAP_OPTION_ETAG; - } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_HOST)) { - PRINTF("Uri-Host [%.*s]\n", ((coap_packet_t *)packet)->uri_host_len, ((coap_packet_t *)packet)->uri_host); - - option += serialize_array_option(COAP_OPTION_URI_HOST, current_number, option, (uint8_t *) ((coap_packet_t *)packet)->uri_host, ((coap_packet_t *)packet)->uri_host_len, NULL); - ((coap_packet_t *)packet)->option_count += 1; - current_number = COAP_OPTION_URI_HOST; - } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_PATH)) { - PRINTF("Location [%.*s]\n", ((coap_packet_t *)packet)->location_path_len, ((coap_packet_t *)packet)->location_path); - - uint8_t split_options = '/'; - - option += serialize_array_option(COAP_OPTION_LOCATION_PATH, current_number, option, (uint8_t *) ((coap_packet_t *)packet)->location_path, ((coap_packet_t *)packet)->location_path_len, &split_options); - ((coap_packet_t *)packet)->option_count += split_options; - current_number = COAP_OPTION_LOCATION_PATH; - } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_PORT)) { - PRINTF("Uri-Port [%u]\n", ((coap_packet_t *)packet)->uri_port); - - option += serialize_int_option(COAP_OPTION_URI_PORT, current_number, option, ((coap_packet_t *)packet)->uri_port); - ((coap_packet_t *)packet)->option_count += 1; - current_number = COAP_OPTION_URI_PORT; - } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_QUERY)) { - PRINTF("Location-Query [%.*s]\n", ((coap_packet_t *)packet)->location_query_len, ((coap_packet_t *)packet)->location_query); - - uint8_t split_options = '&'; - - option += serialize_array_option(COAP_OPTION_LOCATION_QUERY, current_number, option, (uint8_t *) ((coap_packet_t *)packet)->location_query, ((coap_packet_t *)packet)->location_query_len, &split_options); - ((coap_packet_t *)packet)->option_count += split_options; - current_number = COAP_OPTION_LOCATION_QUERY; - } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_PATH)) { - PRINTF("Uri-Path [%.*s]\n", ((coap_packet_t *)packet)->uri_path_len, ((coap_packet_t *)packet)->uri_path); - - uint8_t split_options = '/'; - - option += serialize_array_option(COAP_OPTION_URI_PATH, current_number, option, (uint8_t *) ((coap_packet_t *)packet)->uri_path, ((coap_packet_t *)packet)->uri_path_len, &split_options); - ((coap_packet_t *)packet)->option_count += split_options; - current_number = COAP_OPTION_URI_PATH; - } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_OBSERVE)) { - PRINTF("Observe [%u]\n", ((coap_packet_t *)packet)->observe); - - option += serialize_int_option(COAP_OPTION_OBSERVE, current_number, option, ((coap_packet_t *)packet)->observe); - ((coap_packet_t *)packet)->option_count += 1; - current_number = COAP_OPTION_OBSERVE; - } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_TOKEN)) { - PRINTF("Token %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", ((coap_packet_t *)packet)->token_len, - ((coap_packet_t *)packet)->token[0], - ((coap_packet_t *)packet)->token[1], - ((coap_packet_t *)packet)->token[2], - ((coap_packet_t *)packet)->token[3], - ((coap_packet_t *)packet)->token[4], - ((coap_packet_t *)packet)->token[5], - ((coap_packet_t *)packet)->token[6], - ((coap_packet_t *)packet)->token[7] - ); /*FIXME always prints 8 bytes */ - - option += serialize_array_option(COAP_OPTION_TOKEN, current_number, option, ((coap_packet_t *)packet)->token, ((coap_packet_t *)packet)->token_len, NULL); - ((coap_packet_t *)packet)->option_count += 1; - current_number = COAP_OPTION_TOKEN; - } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_QUERY)) { - PRINTF("Uri-Query [%.*s]\n", ((coap_packet_t *)packet)->uri_query_len, ((coap_packet_t *)packet)->uri_query); - - uint8_t split_options = '&'; - - option += serialize_array_option(COAP_OPTION_URI_QUERY, current_number, option, (uint8_t *) ((coap_packet_t *)packet)->uri_query, ((coap_packet_t *)packet)->uri_query_len, &split_options); - ((coap_packet_t *)packet)->option_count += split_options + (COAP_OPTION_URI_QUERY-current_number)/COAP_OPTION_FENCE_POST; - current_number = COAP_OPTION_URI_QUERY; - } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_BLOCK2)) - { - PRINTF("Block2 [%lu%s (%u B/blk)]\n", ((coap_packet_t *)packet)->block2_num, ((coap_packet_t *)packet)->block2_more ? "+" : "", ((coap_packet_t *)packet)->block2_size); - - uint32_t block = ((coap_packet_t *)packet)->block2_num << 4; - if (((coap_packet_t *)packet)->block2_more) block |= 0x8; - block |= 0xF & log_2(((coap_packet_t *)packet)->block2_size/16); - - PRINTF("Block2 encoded: 0x%lX\n", block); - - option += serialize_int_option(COAP_OPTION_BLOCK2, current_number, option, block); - - ((coap_packet_t *)packet)->option_count += 1 + (COAP_OPTION_BLOCK2-current_number)/COAP_OPTION_FENCE_POST; - current_number = COAP_OPTION_BLOCK2; - } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_BLOCK1)) - { - PRINTF("Block1 [%lu%s (%u B/blk)]\n", ((coap_packet_t *)packet)->block1_num, ((coap_packet_t *)packet)->block1_more ? "+" : "", ((coap_packet_t *)packet)->block1_size); - - uint32_t block = ((coap_packet_t *)packet)->block1_num << 4; - if (((coap_packet_t *)packet)->block1_more) block |= 0x8; - block |= 0xF & log_2(((coap_packet_t *)packet)->block1_size/16); - - PRINTF("Block1 encoded: 0x%lX\n", block); - - option += serialize_int_option(COAP_OPTION_BLOCK1, current_number, option, block); - - ((coap_packet_t *)packet)->option_count += 1 + (COAP_OPTION_BLOCK1-current_number)/COAP_OPTION_FENCE_POST; - current_number = COAP_OPTION_BLOCK1; - } - - /* pack payload */ - if ((option - ((coap_packet_t *)packet)->buffer)<=COAP_MAX_HEADER_SIZE) - { - memmove(option, ((coap_packet_t *)packet)->payload, ((coap_packet_t *)packet)->payload_len); - } - else - { - /* An error occured. Caller must check for !=0. */ - ((coap_packet_t *)packet)->buffer = NULL; - coap_error_message = "Serialized header exceeds COAP_MAX_HEADER_SIZE"; - return 0; - } - - /* set header fields */ - ((coap_packet_t *)packet)->buffer[0] = 0x00; - ((coap_packet_t *)packet)->buffer[0] |= COAP_HEADER_VERSION_MASK & (((coap_packet_t *)packet)->version)<buffer[0] |= COAP_HEADER_TYPE_MASK & (((coap_packet_t *)packet)->type)<buffer[0] |= COAP_HEADER_OPTION_COUNT_MASK & (((coap_packet_t *)packet)->option_count)<buffer[1] = ((coap_packet_t *)packet)->code; - ((coap_packet_t *)packet)->buffer[2] = 0xFF & (((coap_packet_t *)packet)->tid)>>8; - ((coap_packet_t *)packet)->buffer[3] = 0xFF & ((coap_packet_t *)packet)->tid; - - PRINTF("-Done %u options, header len %u, payload len %u-\n", ((coap_packet_t *)packet)->option_count, option - buffer, ((coap_packet_t *)packet)->payload_len); - - return (option - buffer) + ((coap_packet_t *)packet)->payload_len; /* packet length */ -} -/*-----------------------------------------------------------------------------------*/ -void -coap_send_message(uip_ipaddr_t *addr, uint16_t port, uint8_t *data, uint16_t length) -{ - /*configure connection to reply to client*/ - uip_ipaddr_copy(&udp_conn->ripaddr, addr); - udp_conn->rport = port; - - uip_udp_packet_send(udp_conn, data, length); - PRINTF("-sent UDP datagram (%u)-\n", length); - - /* Restore server connection to allow data from any node */ - memset(&udp_conn->ripaddr, 0, sizeof(udp_conn->ripaddr)); - udp_conn->rport = 0; -} -/*-----------------------------------------------------------------------------------*/ -coap_status_t -coap_parse_message(void *packet, uint8_t *data, uint16_t data_len) -{ - /* Initialize packet */ - memset(packet, 0, sizeof(coap_packet_t)); - - /* pointer to packet bytes */ - ((coap_packet_t *)packet)->buffer = data; - - /* parse header fields */ - ((coap_packet_t *)packet)->version = (COAP_HEADER_VERSION_MASK & ((coap_packet_t *)packet)->buffer[0])>>COAP_HEADER_VERSION_POSITION; - ((coap_packet_t *)packet)->type = (COAP_HEADER_TYPE_MASK & ((coap_packet_t *)packet)->buffer[0])>>COAP_HEADER_TYPE_POSITION; - ((coap_packet_t *)packet)->option_count = (COAP_HEADER_OPTION_COUNT_MASK & ((coap_packet_t *)packet)->buffer[0])>>COAP_HEADER_OPTION_COUNT_POSITION; - ((coap_packet_t *)packet)->code = ((coap_packet_t *)packet)->buffer[1]; - ((coap_packet_t *)packet)->tid = ((coap_packet_t *)packet)->buffer[2]<<8 | ((coap_packet_t *)packet)->buffer[3]; - - if (((coap_packet_t *)packet)->version != 1) - { - coap_error_message = "CoAP version must be 1"; - return BAD_REQUEST_4_00; - } - - /* parse options */ - ((coap_packet_t *)packet)->options = 0x0000; - uint8_t *current_option = data + COAP_HEADER_LEN; - - if (((coap_packet_t *)packet)->option_count) - { - uint8_t option_index = 0; - - uint8_t current_number = 0; - size_t option_len = 0; - - PRINTF("-Parsing %u options-\n", ((coap_packet_t *)packet)->option_count); - for (option_index=0; option_index < ((coap_packet_t *)packet)->option_count; ++option_index) { - - current_number += current_option[0]>>4; - - PRINTF("OPTION %u (type %u, delta %u, len %u): ", option_index, current_number, current_option[0]>>4, (0x0F & current_option[0]) < 15 ? (0x0F & current_option[0]) : current_option[1] + 15); - - if ((0x0F & current_option[0]) < 15) { - option_len = 0x0F & current_option[0]; - current_option += 1; - } else { - option_len = current_option[1] + 15; - current_option += 2; - } - - SET_OPTION((coap_packet_t *)packet, current_number); - - switch (current_number) { - case COAP_OPTION_CONTENT_TYPE: - ((coap_packet_t *)packet)->content_type = parse_int_option(current_option, option_len); - PRINTF("Content-Type [%u]\n", ((coap_packet_t *)packet)->content_type); - break; - case COAP_OPTION_MAX_AGE: - ((coap_packet_t *)packet)->max_age = parse_int_option(current_option, option_len); - PRINTF("Max-Age [%lu]\n", ((coap_packet_t *)packet)->max_age); - break; - case COAP_OPTION_PROXY_URI: - /*FIXME check for own end-point */ - ((coap_packet_t *)packet)->proxy_uri = (char *) current_option; - ((coap_packet_t *)packet)->proxy_uri_len = option_len; - /*TODO length > 270 not implemented (actually not required) */ - PRINTF("Proxy-Uri NOT IMPLEMENTED [%.*s]\n", ((coap_packet_t *)packet)->proxy_uri_len, ((coap_packet_t *)packet)->proxy_uri); - coap_error_message = "This is a constrained server (Contiki)"; - return PROXYING_NOT_SUPPORTED_5_05; - break; - case COAP_OPTION_ETAG: - ((coap_packet_t *)packet)->etag_len = MIN(COAP_ETAG_LEN, option_len); - memcpy(((coap_packet_t *)packet)->etag, current_option, ((coap_packet_t *)packet)->etag_len); - PRINTF("ETag %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", ((coap_packet_t *)packet)->etag_len, - ((coap_packet_t *)packet)->etag[0], - ((coap_packet_t *)packet)->etag[1], - ((coap_packet_t *)packet)->etag[2], - ((coap_packet_t *)packet)->etag[3], - ((coap_packet_t *)packet)->etag[4], - ((coap_packet_t *)packet)->etag[5], - ((coap_packet_t *)packet)->etag[6], - ((coap_packet_t *)packet)->etag[7] - ); /*FIXME always prints 8 bytes */ - break; - case COAP_OPTION_URI_HOST: - ((coap_packet_t *)packet)->uri_host = (char *) current_option; - ((coap_packet_t *)packet)->uri_host_len = option_len; - PRINTF("Uri-Host [%.*s]\n", ((coap_packet_t *)packet)->uri_host_len, ((coap_packet_t *)packet)->uri_host); - break; - case COAP_OPTION_LOCATION_PATH: - coap_merge_multi_option(&(((coap_packet_t *)packet)->location_path), &(((coap_packet_t *)packet)->location_path_len), current_option, option_len, '/'); - PRINTF("Location-Path [%.*s]\n", ((coap_packet_t *)packet)->location_path_len, ((coap_packet_t *)packet)->location_path); - break; - case COAP_OPTION_URI_PORT: - ((coap_packet_t *)packet)->uri_port = parse_int_option(current_option, option_len); - PRINTF("Uri-Port [%u]\n", ((coap_packet_t *)packet)->uri_port); - break; - case COAP_OPTION_LOCATION_QUERY: - coap_merge_multi_option(&(((coap_packet_t *)packet)->location_query), &(((coap_packet_t *)packet)->location_query_len), current_option, option_len, '&'); - PRINTF("Location-Query [%.*s]\n", ((coap_packet_t *)packet)->location_query_len, ((coap_packet_t *)packet)->location_query); - break; - case COAP_OPTION_URI_PATH: - coap_merge_multi_option(&(((coap_packet_t *)packet)->uri_path), &(((coap_packet_t *)packet)->uri_path_len), current_option, option_len, '/'); - PRINTF("Uri-Path [%.*s]\n", ((coap_packet_t *)packet)->uri_path_len, ((coap_packet_t *)packet)->uri_path); - break; - case COAP_OPTION_OBSERVE: - ((coap_packet_t *)packet)->observe = parse_int_option(current_option, option_len); - PRINTF("Observe [%u]\n", ((coap_packet_t *)packet)->observe); - break; - case COAP_OPTION_TOKEN: - ((coap_packet_t *)packet)->token_len = MIN(COAP_TOKEN_LEN, option_len); - memcpy(((coap_packet_t *)packet)->token, current_option, ((coap_packet_t *)packet)->token_len); - PRINTF("Token %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", ((coap_packet_t *)packet)->token_len, - ((coap_packet_t *)packet)->token[0], - ((coap_packet_t *)packet)->token[1], - ((coap_packet_t *)packet)->token[2], - ((coap_packet_t *)packet)->token[3], - ((coap_packet_t *)packet)->token[4], - ((coap_packet_t *)packet)->token[5], - ((coap_packet_t *)packet)->token[6], - ((coap_packet_t *)packet)->token[7] - ); /*FIXME always prints 8 bytes */ - break; - case COAP_OPTION_FENCE_POST: - PRINTF("Fence-Post\n"); - break; - case COAP_OPTION_URI_QUERY: - coap_merge_multi_option(&(((coap_packet_t *)packet)->uri_query), &(((coap_packet_t *)packet)->uri_query_len), current_option, option_len, '&'); - PRINTF("Uri-Query [%.*s]\n", ((coap_packet_t *)packet)->uri_query_len, ((coap_packet_t *)packet)->uri_query); - break; - case COAP_OPTION_BLOCK2: - ((coap_packet_t *)packet)->block2_num = parse_int_option(current_option, option_len); - ((coap_packet_t *)packet)->block2_more = (((coap_packet_t *)packet)->block2_num & 0x08)>>3; - ((coap_packet_t *)packet)->block2_size = 16 << (((coap_packet_t *)packet)->block2_num & 0x07); - ((coap_packet_t *)packet)->block2_offset = (((coap_packet_t *)packet)->block2_num & ~0x0F)<<(((coap_packet_t *)packet)->block2_num & 0x07); - ((coap_packet_t *)packet)->block2_num >>= 4; - PRINTF("Block2 [%lu%s (%u B/blk)]\n", ((coap_packet_t *)packet)->block2_num, ((coap_packet_t *)packet)->block2_more ? "+" : "", ((coap_packet_t *)packet)->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; - break; - default: - PRINTF("unknown (%u)\n", current_number); - /* Check if critical (odd) */ - if (current_number & 1) - { - coap_error_message = "Unsupported critical option"; - return BAD_OPTION_4_02; - } - } - - current_option += option_len; - } /* for */ - PRINTF("-Done parsing-------\n"); - } /* if (oc) */ - - ((coap_packet_t *)packet)->payload = current_option; - ((coap_packet_t *)packet)->payload_len = data_len - (((coap_packet_t *)packet)->payload - data); - - return NO_ERROR; -} -/*-----------------------------------------------------------------------------------*/ -/*- REST FRAMEWORK FUNCTIONS --------------------------------------------------------*/ -/*-----------------------------------------------------------------------------------*/ -int -coap_get_query_variable(void *packet, const char *name, const char **output) -{ - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_QUERY)) { - return coap_get_variable(((coap_packet_t *)packet)->uri_query, ((coap_packet_t *)packet)->uri_query_len, name, output); - } - return 0; -} - -int -coap_get_post_variable(void *packet, const char *name, const char **output) -{ - if (((coap_packet_t *)packet)->payload_len) { - return coap_get_variable((const char *)((coap_packet_t *)packet)->payload, ((coap_packet_t *)packet)->payload_len, name, output); - } - return 0; -} -/*-----------------------------------------------------------------------------------*/ -/*- HEADER OPTION GETTERS AND SETTERS -----------------------------------------------*/ -/*-----------------------------------------------------------------------------------*/ -unsigned int -coap_get_header_content_type(void *packet) -{ - return ((coap_packet_t *)packet)->content_type; -} - -int -coap_set_header_content_type(void *packet, unsigned int content_type) -{ - ((coap_packet_t *)packet)->content_type = (coap_content_type_t) content_type; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_CONTENT_TYPE); - return 1; -} -/*-----------------------------------------------------------------------------------*/ -int -coap_get_header_max_age(void *packet, uint32_t *age) -{ - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_MAX_AGE)) { - *age = COAP_DEFAULT_MAX_AGE; - } else { - *age = ((coap_packet_t *)packet)->max_age; - } - return 1; -} - -int -coap_set_header_max_age(void *packet, uint32_t age) -{ - ((coap_packet_t *)packet)->max_age = age; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_MAX_AGE); - return 1; -} -/*-----------------------------------------------------------------------------------*/ -int -coap_get_header_etag(void *packet, const uint8_t **etag) -{ - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_ETAG)) return 0; - - *etag = ((coap_packet_t *)packet)->etag; - return ((coap_packet_t *)packet)->etag_len; -} - -int -coap_set_header_etag(void *packet, uint8_t *etag, size_t etag_len) -{ - ((coap_packet_t *)packet)->etag_len = MIN(COAP_ETAG_LEN, etag_len); - memcpy(((coap_packet_t *)packet)->etag, etag, ((coap_packet_t *)packet)->etag_len); - - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_ETAG); - return ((coap_packet_t *)packet)->etag_len; -} -/*-----------------------------------------------------------------------------------*/ -int -coap_get_header_token(void *packet, const uint8_t **token) -{ - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_TOKEN)) return 0; - - *token = ((coap_packet_t *)packet)->token; - return ((coap_packet_t *)packet)->token_len; -} - -int -coap_set_header_token(void *packet, uint8_t *token, size_t token_len) -{ - ((coap_packet_t *)packet)->token_len = MIN(COAP_TOKEN_LEN, token_len); - memcpy(((coap_packet_t *)packet)->token, token, ((coap_packet_t *)packet)->token_len); - - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_TOKEN); - return ((coap_packet_t *)packet)->token_len; -} -/*-----------------------------------------------------------------------------------*/ -int -coap_get_header_proxy_uri(void *packet, const char **uri) -{ - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_PROXY_URI)) return 0; - - *uri = ((coap_packet_t *)packet)->proxy_uri; - return ((coap_packet_t *)packet)->proxy_uri_len; -} - -int -coap_set_header_proxy_uri(void *packet, char *uri) -{ - ((coap_packet_t *)packet)->proxy_uri = uri; - ((coap_packet_t *)packet)->proxy_uri_len = strlen(uri); - - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_PROXY_URI); - return ((coap_packet_t *)packet)->proxy_uri_len; -} -/*-----------------------------------------------------------------------------------*/ -int -coap_get_header_uri_host(void *packet, const char **host) -{ - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_HOST)) return 0; - - *host = ((coap_packet_t *)packet)->uri_host; - return ((coap_packet_t *)packet)->uri_host_len; -} - -int -coap_set_header_uri_host(void *packet, char *host) -{ - ((coap_packet_t *)packet)->uri_host = host; - ((coap_packet_t *)packet)->uri_host_len = strlen(host); - - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_HOST); - return ((coap_packet_t *)packet)->uri_host_len; -} -/*-----------------------------------------------------------------------------------*/ -int -coap_get_header_uri_path(void *packet, const char **path) -{ - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_PATH)) return 0; - - *path = ((coap_packet_t *)packet)->uri_path; - return ((coap_packet_t *)packet)->uri_path_len; -} - -int -coap_set_header_uri_path(void *packet, char *path) -{ - while (path[0]=='/') ++path; - - ((coap_packet_t *)packet)->uri_path = path; - ((coap_packet_t *)packet)->uri_path_len = strlen(path); - - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_PATH); - return ((coap_packet_t *)packet)->uri_path_len; -} -/*-----------------------------------------------------------------------------------*/ -int -coap_get_header_uri_query(void *packet, const char **query) -{ - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_QUERY)) return 0; - - *query = ((coap_packet_t *)packet)->uri_query; - return ((coap_packet_t *)packet)->uri_query_len; -} - -int -coap_set_header_uri_query(void *packet, char *query) -{ - while (query[0]=='?') ++query; - - ((coap_packet_t *)packet)->uri_query = query; - ((coap_packet_t *)packet)->uri_query_len = strlen(query); - - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_QUERY); - return ((coap_packet_t *)packet)->uri_query_len; -} -/*-----------------------------------------------------------------------------------*/ -int -coap_get_header_location_path(void *packet, const char **path) -{ - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_PATH)) return 0; - - *path = ((coap_packet_t *)packet)->location_path; - return ((coap_packet_t *)packet)->location_path_len; -} - -int -coap_set_header_location_path(void *packet, char *path) -{ - char *query; - - while (path[0]=='/') ++path; - - if ((query = strchr(path, '?'))) - { - coap_set_header_location_query(packet, query+1); - ((coap_packet_t *)packet)->location_path_len = query - path; - } - else - { - ((coap_packet_t *)packet)->location_path_len = strlen(path); - } - - ((coap_packet_t *)packet)->location_path = path; - - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_PATH); - return ((coap_packet_t *)packet)->location_path_len; -} -/*-----------------------------------------------------------------------------------*/ -int -coap_get_header_location_query(void *packet, const char **query) -{ - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_QUERY)) return 0; - - *query = ((coap_packet_t *)packet)->location_query; - return ((coap_packet_t *)packet)->location_query_len; -} - -int -coap_set_header_location_query(void *packet, char *query) -{ - while (query[0]=='?') ++query; - - ((coap_packet_t *)packet)->location_query = query; - ((coap_packet_t *)packet)->location_query_len = strlen(query); - - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_QUERY); - return ((coap_packet_t *)packet)->location_query_len; -} -/*-----------------------------------------------------------------------------------*/ -int -coap_get_header_observe(void *packet, uint32_t *observe) -{ - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_OBSERVE)) return 0; - - *observe = ((coap_packet_t *)packet)->observe; - return 1; -} - -int -coap_set_header_observe(void *packet, uint32_t observe) -{ - ((coap_packet_t *)packet)->observe = observe; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_OBSERVE); - return 1; -} -/*-----------------------------------------------------------------------------------*/ -int -coap_get_header_block2(void *packet, uint32_t *num, uint8_t *more, uint16_t *size, uint32_t *offset) -{ - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_BLOCK2)) return 0; - - /* pointers may be NULL to get only specific block parameters */ - if (num!=NULL) *num = ((coap_packet_t *)packet)->block2_num; - if (more!=NULL) *more = ((coap_packet_t *)packet)->block2_more; - if (size!=NULL) *size = ((coap_packet_t *)packet)->block2_size; - if (offset!=NULL) *offset = ((coap_packet_t *)packet)->block2_offset; - - return 1; -} - -int -coap_set_header_block2(void *packet, uint32_t num, uint8_t more, uint16_t size) -{ - if (size<16) return 0; - if (size>2048) return 0; - if (num>0x0FFFFF) return 0; - - ((coap_packet_t *)packet)->block2_num = num; - ((coap_packet_t *)packet)->block2_more = more; - ((coap_packet_t *)packet)->block2_size = size; - - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_BLOCK2); - return 1; -} -/*-----------------------------------------------------------------------------------*/ -int -coap_get_header_block1(void *packet, uint32_t *num, uint8_t *more, uint16_t *size, uint32_t *offset) -{ - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_BLOCK1)) return 0; - - /* pointers may be NULL to get only specific block parameters */ - if (num!=NULL) *num = ((coap_packet_t *)packet)->block1_num; - if (more!=NULL) *more = ((coap_packet_t *)packet)->block1_more; - if (size!=NULL) *size = ((coap_packet_t *)packet)->block1_size; - if (offset!=NULL) *offset = ((coap_packet_t *)packet)->block1_offset; - - return 1; -} - -int -coap_set_header_block1(void *packet, uint32_t num, uint8_t more, uint16_t size) -{ - if (size<16) return 0; - if (size>2048) return 0; - if (num>0x0FFFFF) return 0; - - ((coap_packet_t *)packet)->block1_num = num; - ((coap_packet_t *)packet)->block1_more = more; - ((coap_packet_t *)packet)->block1_size = size; - - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_BLOCK1); - return 1; -} -/*-----------------------------------------------------------------------------------*/ -/*- PAYLOAD -------------------------------------------------------------------------*/ -/*-----------------------------------------------------------------------------------*/ -int -coap_get_payload(void *packet, const uint8_t **payload) -{ - if (((coap_packet_t *)packet)->payload) { - *payload = ((coap_packet_t *)packet)->payload; - return ((coap_packet_t *)packet)->payload_len; - } else { - *payload = NULL; - return 0; - } -} - -int -coap_set_payload(void *packet, uint8_t *payload, size_t length) -{ - PRINTF("setting payload (%u/%u)\n", length, REST_MAX_CHUNK_SIZE); - - ((coap_packet_t *)packet)->payload = payload; - ((coap_packet_t *)packet)->payload_len = MIN(REST_MAX_CHUNK_SIZE, length); - - return ((coap_packet_t *)packet)->payload_len; -} -/*-----------------------------------------------------------------------------------*/ diff --git a/apps/er-coap-06/er-coap-06.h b/apps/er-coap-06/er-coap-06.h deleted file mode 100644 index a5ad954e6..000000000 --- a/apps/er-coap-06/er-coap-06.h +++ /dev/null @@ -1,300 +0,0 @@ -/* - * Copyright (c) 2011, Institute for Pervasive Computing, ETH Zurich - * 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 - * An implementation of the Constrained Application Protocol (draft 06) - * \author - * Matthias Kovatsch - */ - -#ifndef COAP_06_H_ -#define COAP_06_H_ - -#include /* for size_t */ -#include "contiki-net.h" -#include "erbium.h" - -#define COAP_DEFAULT_PORT 5683 - -#ifndef COAP_SERVER_PORT -#define COAP_SERVER_PORT COAP_DEFAULT_PORT -#endif - -#define COAP_DEFAULT_MAX_AGE 60 -#define COAP_RESPONSE_TIMEOUT 2 -#define COAP_RESPONSE_RANDOM_FACTOR 1.5 -#define COAP_MAX_RETRANSMIT 4 - -#define COAP_HEADER_LEN 4 /* | oc:0xF0 type:0x0C version:0x03 | code | tid:0x00FF | tid:0xFF00 | */ -#define COAP_ETAG_LEN 8 /* The maximum number of bytes for the ETag */ -#define COAP_TOKEN_LEN 8 /* The maximum number of bytes for the Token */ - -#define COAP_HEADER_VERSION_MASK 0xC0 -#define COAP_HEADER_VERSION_POSITION 6 -#define COAP_HEADER_TYPE_MASK 0x30 -#define COAP_HEADER_TYPE_POSITION 4 -#define COAP_HEADER_OPTION_COUNT_MASK 0x0F -#define COAP_HEADER_OPTION_COUNT_POSITION 0 - -#define COAP_HEADER_OPTION_DELTA_MASK 0xF0 -#define COAP_HEADER_OPTION_SHORT_LENGTH_MASK 0x0F - -/* - * Conservative size limit, as not all options have to be set at the same time. - */ -/* Hdr CoT Age Tag Obs Tok Blo strings */ -#define COAP_MAX_HEADER_SIZE (4 + 3 + 5 + 1+COAP_ETAG_LEN + 3 + 1+COAP_TOKEN_LEN + 4 + 10) /* 50 */ -#define COAP_MAX_PACKET_SIZE (COAP_MAX_HEADER_SIZE + REST_MAX_CHUNK_SIZE) -/* 0/14 48 for IPv6 (28 for IPv4) */ -#if COAP_MAX_PACKET_SIZE > (UIP_BUFSIZE - UIP_LLH_LEN - UIP_IPUDPH_LEN) -#error "UIP_CONF_BUFFER_SIZE too small for REST_MAX_CHUNK_SIZE" -#endif - -/* - * Maximum number of failed request attempts before action - */ -#ifndef COAP_MAX_ATTEMPTS -#define COAP_MAX_ATTEMPTS 4 -#endif /* COAP_MAX_ATTEMPTS */ - -#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) -#define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[uip_l2_l3_hdr_len]) - -#define SET_OPTION(packet, opt) ((packet)->options |= 1L<options & 1L<version, message->type, message->option_count, message->code, message->tid); + PRINTF(" Parsed: v %u, t %u, oc %u, c %u, mid %u\n", message->version, message->type, message->option_count, message->code, message->mid); PRINTF(" URL: %.*s\n", message->uri_path_len, message->uri_path); PRINTF(" Payload: %.*s\n", message->payload_len, message->payload); @@ -110,23 +110,23 @@ handle_incoming_data(void) if (message->code >= COAP_GET && message->code <= COAP_DELETE) { /* Use transaction buffer for response to confirmable request. */ - if ( (transaction = coap_new_transaction(message->tid, &UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport)) ) + if ( (transaction = coap_new_transaction(message->mid, &UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport)) ) { - static uint32_t block_num = 0; - static uint16_t block_size = REST_MAX_CHUNK_SIZE; - static uint32_t block_offset = 0; - static int32_t new_offset = 0; + uint32_t block_num = 0; + uint16_t block_size = REST_MAX_CHUNK_SIZE; + uint32_t block_offset = 0; + int32_t new_offset = 0; /* prepare response */ if (message->type==COAP_TYPE_CON) { /* Reliable CON requests are answered with an ACK. */ - coap_init_message(response, COAP_TYPE_ACK, CONTENT_2_05, message->tid); + coap_init_message(response, COAP_TYPE_ACK, CONTENT_2_05, message->mid); } else { /* Unreliable NON requests are answered with a NON as well. */ - coap_init_message(response, COAP_TYPE_NON, CONTENT_2_05, coap_get_tid()); + coap_init_message(response, COAP_TYPE_NON, CONTENT_2_05, coap_get_mid()); } /* resource handlers must take care of different handling (e.g., TOKEN_OPTION_REQUIRED_240) */ @@ -143,11 +143,6 @@ handle_incoming_data(void) block_size = MIN(block_size, REST_MAX_CHUNK_SIZE); new_offset = block_offset; } - else - { - block_size = REST_MAX_CHUNK_SIZE; - new_offset = 0; - } /* Invoke resource handler. */ if (service_cbk) @@ -155,42 +150,55 @@ handle_incoming_data(void) /* Call REST framework and check if found and allowed. */ if (service_cbk(message, response, transaction->packet+COAP_MAX_HEADER_SIZE, block_size, &new_offset)) { - /* Apply blockwise transfers. */ - if ( IS_OPTION(message, COAP_OPTION_BLOCK2) ) + if (coap_error_code==NO_ERROR) { - /* unchanged new_offset indicates that resource is unaware of blockwise transfer */ - if (new_offset==block_offset) + /* Apply blockwise transfers. */ + if ( IS_OPTION(message, COAP_OPTION_BLOCK2) ) { - PRINTF("Blockwise: unaware resource with payload length %u/%u\n", response->payload_len, block_size); - if (block_offset >= response->payload_len) + /* unchanged new_offset indicates that resource is unaware of blockwise transfer */ + if (new_offset==block_offset) { - PRINTF("handle_incoming_data(): block_offset >= response->payload_len\n"); + PRINTF("Blockwise: unaware resource with payload length %u/%u\n", response->payload_len, block_size); + if (block_offset >= response->payload_len) + { + PRINTF("handle_incoming_data(): block_offset >= response->payload_len\n"); - response->code = BAD_OPTION_4_02; - coap_set_payload(response, (uint8_t*)"BlockOutOfScope", 15); + response->code = BAD_OPTION_4_02; + coap_set_payload(response, "BlockOutOfScope", 15); /* a const char str[] and sizeof(str) produces larger code size */ + } + else + { + coap_set_header_block2(response, block_num, response->payload_len - block_offset > block_size, block_size); + coap_set_payload(response, response->payload+block_offset, MIN(response->payload_len - block_offset, block_size)); + } /* if (valid offset) */ } else { - coap_set_header_block2(response, block_num, response->payload_len - block_offset > block_size, block_size); - coap_set_payload(response, response->payload+block_offset, MIN(response->payload_len - block_offset, block_size)); - } /* if (valid offset) */ + /* resource provides chunk-wise data */ + PRINTF("Blockwise: blockwise resource, new offset %ld\n", new_offset); + coap_set_header_block2(response, block_num, new_offset!=-1 || response->payload_len > block_size, block_size); + if (response->payload_len > block_size) coap_set_payload(response, response->payload, block_size); + } /* if (resource aware of blockwise) */ } - else + else if (new_offset!=0) { - /* resource provides chunk-wise data */ - PRINTF("Blockwise: blockwise resource, new offset %ld\n", new_offset); - coap_set_header_block2(response, block_num, new_offset!=-1 || response->payload_len > block_size, block_size); - if (response->payload_len > block_size) coap_set_payload(response, response->payload, block_size); - } /* if (resource aware of blockwise) */ - } - else if (new_offset!=0) - { - PRINTF("Blockwise: no block option for blockwise resource, using block size %u\n", REST_MAX_CHUNK_SIZE); + PRINTF("Blockwise: no block option for blockwise resource, using block size %u\n", REST_MAX_CHUNK_SIZE); - coap_set_header_block2(response, 0, new_offset!=-1, REST_MAX_CHUNK_SIZE); - coap_set_payload(response, response->payload, MIN(response->payload_len, REST_MAX_CHUNK_SIZE)); - } /* if (blockwise request) */ + coap_set_header_block2(response, 0, new_offset!=-1, REST_MAX_CHUNK_SIZE); + coap_set_payload(response, response->payload, MIN(response->payload_len, REST_MAX_CHUNK_SIZE)); + } /* if (blockwise request) */ + } /* no errors/hooks */ + } /* successful service callback */ + + /* Serialize response. */ + if (coap_error_code==NO_ERROR) + { + if ((transaction->packet_len = coap_serialize_message(response, transaction->packet))==0) + { + coap_error_code = PACKET_SERIALIZATION_ERROR; + } } + } else { @@ -198,14 +206,8 @@ handle_incoming_data(void) coap_error_message = "Service callback undefined"; } /* if (service callback) */ - /* serialize Response. */ - if ((transaction->packet_len = coap_serialize_message(response, transaction->packet))==0) - { - coap_error_code = PACKET_SERIALIZATION_ERROR; - } - } else { - coap_error_code = MEMORY_ALLOC_ERR; + coap_error_code = MEMORY_ALLOCATION_ERROR; coap_error_message = "Transaction buffer allocation failed"; } /* if (transaction buffer) */ } @@ -221,14 +223,10 @@ handle_incoming_data(void) { PRINTF("Received RST\n"); /* Cancel possible subscriptions. */ - if (IS_OPTION(message, COAP_OPTION_TOKEN)) - { - PRINTF(" Token 0x%02X%02X\n", message->token[0], message->token[1]); - coap_remove_observer_by_token(&UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, message->token, message->token_len); - } + coap_remove_observer_by_mid(&UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, message->mid); } - if ( (transaction = coap_get_transaction_by_tid(message->tid)) ) + if ( (transaction = coap_get_transaction_by_mid(message->mid)) ) { /* Free transaction memory before callback, as it may create a new transaction. */ restful_response_handler callback = transaction->callback; @@ -241,12 +239,20 @@ handle_incoming_data(void) } } /* if (ACKed transaction) */ transaction = NULL; - } + + } /* Request or Response */ + } /* if (parsed correctly) */ - if (coap_error_code==NO_ERROR) { + if (coap_error_code==NO_ERROR) + { if (transaction) coap_send_transaction(transaction); } + else if (coap_error_code==MANUAL_RESPONSE) + { + PRINTF("Clearing transaction for manual response"); + coap_clear_transaction(transaction); + } else { PRINTF("ERROR %u: %s\n", coap_error_code, coap_error_message); @@ -258,8 +264,8 @@ handle_incoming_data(void) coap_error_code = INTERNAL_SERVER_ERROR_5_00; } /* Reuse input buffer for error message. */ - coap_init_message(message, COAP_TYPE_ACK, coap_error_code, message->tid); - coap_set_payload(message, (uint8_t *) coap_error_message, strlen(coap_error_message)); + coap_init_message(message, COAP_TYPE_ACK, coap_error_code, message->mid); + coap_set_payload(message, coap_error_message, strlen(coap_error_message)); coap_send_message(&UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, uip_appdata, coap_serialize_message(message, uip_appdata)); } } /* if (new data) */ @@ -285,29 +291,16 @@ coap_get_rest_method(void *packet) return (rest_resource_flags_t)(1 << (((coap_packet_t *)packet)->code - 1)); } /*-----------------------------------------------------------------------------------*/ -int -coap_set_rest_status(void *packet, unsigned int code) -{ - if (code <= 0xFF) - { - ((coap_packet_t *)packet)->code = (uint8_t) code; - return 1; - } - else - { - return 0; - } -} -/*-----------------------------------------------------------------------------------*/ /*- Server part ---------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/ + /* The discover resource is automatically included for CoAP. */ RESOURCE(well_known_core, METHOD_GET, ".well-known/core", "ct=40"); void well_known_core_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset) { - size_t strpos = 0; - size_t bufpos = 0; + size_t strpos = 0; /* position in overall string (which is larger than the buffer) */ + size_t bufpos = 0; /* position within buffer (bytes written) */ size_t tmplen = 0; resource_t* resource = NULL; @@ -333,6 +326,10 @@ well_known_core_handler(void* request, void* response, uint8_t *buffer, uint16_t bufpos += snprintf((char *) buffer + bufpos, preferred_size - bufpos + 1, "%s", resource->url + ((*offset-(int32_t)strpos > 0) ? (*offset-(int32_t)strpos) : 0)); /* minimal-net requires these casts */ + if (bufpos >= preferred_size) + { + break; + } } strpos += tmplen; @@ -355,6 +352,10 @@ well_known_core_handler(void* request, void* response, uint8_t *buffer, uint16_t { bufpos += snprintf((char *) buffer + bufpos, preferred_size - bufpos + 1, "%s", resource->attributes + (*offset-(int32_t)strpos > 0 ? *offset-(int32_t)strpos : 0)); + if (bufpos >= preferred_size) + { + break; + } } strpos += tmplen; } @@ -386,8 +387,8 @@ well_known_core_handler(void* request, void* response, uint8_t *buffer, uint16_t { PRINTF("well_known_core_handler(): bufpos<=0\n"); - coap_set_rest_status(response, BAD_OPTION_4_02); - coap_set_payload(response, (uint8_t*)"BlockOutOfScope", 15); + coap_set_status_code(response, BAD_OPTION_4_02); + coap_set_payload(response, "BlockOutOfScope", 15); } if (resource==NULL) { @@ -397,7 +398,7 @@ well_known_core_handler(void* request, void* response, uint8_t *buffer, uint16_t else { PRINTF("res: MORE at %s (%p)\n", resource->url, resource); - *offset += bufpos; + *offset += preferred_size; } } /*-----------------------------------------------------------------------------------*/ @@ -453,8 +454,8 @@ PT_THREAD(coap_blocking_request(struct request_state_t *state, process_event_t e block_error = 0; do { - request->tid = coap_get_tid(); - if ((state->transaction = coap_new_transaction(request->tid, remote_ipaddr, remote_port))) + request->mid = coap_get_mid(); + if ((state->transaction = coap_new_transaction(request->mid, remote_ipaddr, remote_port))) { state->transaction->callback = blocking_request_callback; state->transaction->callback_data = state; @@ -467,7 +468,7 @@ PT_THREAD(coap_blocking_request(struct request_state_t *state, process_event_t e state->transaction->packet_len = coap_serialize_message(request, state->transaction->packet); coap_send_transaction(state->transaction); - PRINTF("Requested #%lu (TID %u)\n", state->block_num, request->tid); + PRINTF("Requested #%lu (MID %u)\n", state->block_num, request->mid); PT_YIELD_UNTIL(&state->pt, ev == PROCESS_EVENT_POLL); @@ -513,7 +514,7 @@ const struct rest_implementation coap_rest_implementation = { coap_get_header_uri_path, coap_set_header_uri_path, coap_get_rest_method, - coap_set_rest_status, + coap_set_status_code, coap_get_header_content_type, coap_set_header_content_type, diff --git a/apps/er-coap-07/er-coap-07-observing.c b/apps/er-coap-07/er-coap-07-observing.c index f242165be..11eef1935 100644 --- a/apps/er-coap-07/er-coap-07-observing.c +++ b/apps/er-coap-07/er-coap-07-observing.c @@ -58,7 +58,7 @@ LIST(observers_list); /*-----------------------------------------------------------------------------------*/ coap_observer_t * -coap_add_observer(const char *url, uip_ipaddr_t *addr, uint16_t port, const uint8_t *token, size_t token_len) +coap_add_observer(uip_ipaddr_t *addr, uint16_t port, const uint8_t *token, size_t token_len, const char *url) { coap_observer_t *o = memb_alloc(&observers_memb); @@ -69,6 +69,7 @@ coap_add_observer(const char *url, uip_ipaddr_t *addr, uint16_t port, const uint o->port = port; o->token_len = token_len; memcpy(o->token, token, token_len); + o->last_mid = 0; stimer_set(&o->refresh_timer, COAP_OBSERVING_REFRESH_INTERVAL); @@ -107,6 +108,7 @@ coap_remove_observer_by_client(uip_ipaddr_t *addr, uint16_t port) } return removed; } + int coap_remove_observer_by_token(uip_ipaddr_t *addr, uint16_t port, uint8_t *token, size_t token_len) { @@ -116,7 +118,7 @@ coap_remove_observer_by_token(uip_ipaddr_t *addr, uint16_t port, uint8_t *token, for (obs = (coap_observer_t*)list_head(observers_list); obs; obs = obs->next) { PRINTF("Remove check Token 0x%02X%02X\n", token[0], token[1]); - if (uip_ipaddr_cmp(&obs->addr, addr) && obs->port==port && memcmp(obs->token, token, token_len)==0) + if (uip_ipaddr_cmp(&obs->addr, addr) && obs->port==port && obs->token_len==token_len && memcmp(obs->token, token, token_len)==0) { coap_remove_observer(obs); removed++; @@ -124,8 +126,9 @@ coap_remove_observer_by_token(uip_ipaddr_t *addr, uint16_t port, uint8_t *token, } return removed; } + int -coap_remove_observer_by_url(const char *url) +coap_remove_observer_by_url(uip_ipaddr_t *addr, uint16_t port, const char *url) { int removed = 0; coap_observer_t* obs = NULL; @@ -133,7 +136,25 @@ coap_remove_observer_by_url(const char *url) for (obs = (coap_observer_t*)list_head(observers_list); obs; obs = obs->next) { PRINTF("Remove check URL %p\n", url); - if (obs->url==url || memcmp(obs->url, url, strlen(obs->url))==0) + if (uip_ipaddr_cmp(&obs->addr, addr) && obs->port==port && (obs->url==url || memcmp(obs->url, url, strlen(obs->url))==0)) + { + coap_remove_observer(obs); + removed++; + } + } + return removed; +} + +int +coap_remove_observer_by_mid(uip_ipaddr_t *addr, uint16_t port, uint16_t mid) +{ + int removed = 0; + coap_observer_t* obs = NULL; + + for (obs = (coap_observer_t*)list_head(observers_list); obs; obs = obs->next) + { + PRINTF("Remove check MID %u\n", mid); + if (uip_ipaddr_cmp(&obs->addr, addr) && obs->port==port && obs->last_mid==mid) { coap_remove_observer(obs); removed++; @@ -154,7 +175,7 @@ coap_notify_observers(const char *url, int type, uint32_t observe, uint8_t *payl /*TODO implement special transaction for CON, sharing the same buffer to allow for more observers */ - if ( (transaction = coap_new_transaction(coap_get_tid(), &obs->addr, obs->port)) ) + if ( (transaction = coap_new_transaction(coap_get_mid(), &obs->addr, obs->port)) ) { /* Use CON to check whether client is still there/interested after COAP_OBSERVING_REFRESH_INTERVAL. */ if (stimer_expired(&obs->refresh_timer)) @@ -166,7 +187,7 @@ coap_notify_observers(const char *url, int type, uint32_t observe, uint8_t *payl /* prepare response */ coap_packet_t push[1]; /* This way the packet can be treated as pointer as usual. */ - coap_init_message(push, (coap_message_type_t)type, CONTENT_2_05, transaction->tid ); + coap_init_message(push, (coap_message_type_t)type, CONTENT_2_05, transaction->mid ); coap_set_header_observe(push, observe); coap_set_header_token(push, obs->token, obs->token_len); coap_set_payload(push, payload, payload_len); @@ -177,6 +198,9 @@ coap_notify_observers(const char *url, int type, uint32_t observe, uint8_t *payl PRINTF(":%u\n", obs->port); PRINTF(" %.*s\n", payload_len, payload); + /* Update last MID for RST matching. */ + obs->last_mid = transaction->mid; + coap_send_transaction(transaction); } } @@ -186,33 +210,35 @@ coap_notify_observers(const char *url, int type, uint32_t observe, uint8_t *payl void coap_observe_handler(resource_t *resource, void *request, void *response) { - static char content[26]; + coap_packet_t *const coap_req = (coap_packet_t *) request; + coap_packet_t *const coap_res = (coap_packet_t *) response; - if (response && ((coap_packet_t *)response)->code<128) /* response without error code */ + static char content[16]; + + if (coap_req->code==COAP_GET && coap_res->code<128) /* GET request and response without error code */ { - if (IS_OPTION((coap_packet_t *)request, COAP_OPTION_OBSERVE)) + if (IS_OPTION(coap_req, COAP_OPTION_OBSERVE)) { - if (!IS_OPTION((coap_packet_t *)request, COAP_OPTION_TOKEN)) - { - /* Set default token. */ - coap_set_header_token(request, (uint8_t *)"", 1); - } - if (coap_add_observer(resource->url, &UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, ((coap_packet_t *)request)->token, ((coap_packet_t *)request)->token_len)) + if (coap_add_observer(&UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, coap_req->token, coap_req->token_len, resource->url)) { - coap_set_header_observe(response, 0); - coap_set_payload(response, (uint8_t *)content, snprintf(content, sizeof(content), "Added as observer %u/%u", list_length(observers_list), COAP_MAX_OBSERVERS)); + coap_set_header_observe(coap_res, 0); + /* + * For demonstration purposes only. A subscription should return the same representation as a normal GET. + * TODO: Comment the following line for any real application. + */ + coap_set_payload(coap_res, content, snprintf(content, sizeof(content), "Added %u/%u", list_length(observers_list), COAP_MAX_OBSERVERS)); } else { - ((coap_packet_t *)response)->code = SERVICE_UNAVAILABLE_5_03; - coap_set_payload(response, (uint8_t *)"Too many observers", 18); + coap_res->code = SERVICE_UNAVAILABLE_5_03; + coap_set_payload(coap_res, "TooManyObservers", 16); } /* if (added observer) */ } else /* if (observe) */ { /* Remove client if it is currently observing. */ - coap_remove_observer_by_client(&UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport); + coap_remove_observer_by_url(&UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, resource->url); } /* if (observe) */ } } diff --git a/apps/er-coap-07/er-coap-07-observing.h b/apps/er-coap-07/er-coap-07-observing.h index 078e9b430..7b09ba83e 100644 --- a/apps/er-coap-07/er-coap-07-observing.h +++ b/apps/er-coap-07/er-coap-07-observing.h @@ -61,17 +61,19 @@ typedef struct coap_observer { uint16_t port; uint8_t token_len; uint8_t token[COAP_TOKEN_LEN]; + uint16_t last_mid; struct stimer refresh_timer; } coap_observer_t; list_t coap_get_observers(void); -coap_observer_t *coap_add_observer(const char *url, uip_ipaddr_t *addr, uint16_t port, const uint8_t *token, size_t token_len); -void coap_remove_observer(coap_observer_t *o); +coap_observer_t *coap_add_observer(uip_ipaddr_t *addr, uint16_t port, const uint8_t *token, size_t token_len, const char *url); +void coap_remove_observer(coap_observer_t *o); int coap_remove_observer_by_client(uip_ipaddr_t *addr, uint16_t port); int coap_remove_observer_by_token(uip_ipaddr_t *addr, uint16_t port, uint8_t *token, size_t token_len); -int coap_remove_observer_by_url(const char *url); +int coap_remove_observer_by_url(uip_ipaddr_t *addr, uint16_t port, const char *url); +int coap_remove_observer_by_mid(uip_ipaddr_t *addr, uint16_t port, uint16_t mid); void coap_notify_observers(const char *url, int type, uint32_t observe, uint8_t *payload, size_t payload_len); diff --git a/apps/er-coap-07/er-coap-07-separate.c b/apps/er-coap-07/er-coap-07-separate.c index 8cd89dcbe..b5f9c5c3a 100644 --- a/apps/er-coap-07/er-coap-07-separate.c +++ b/apps/er-coap-07/er-coap-07-separate.c @@ -40,6 +40,7 @@ #include #include "er-coap-07-separate.h" +#include "er-coap-07-transactions.h" #define DEBUG 0 #if DEBUG @@ -53,17 +54,66 @@ #endif /*-----------------------------------------------------------------------------------*/ -void coap_separate_handler(resource_t *resource, void *request, void *response) +int coap_separate_handler(resource_t *resource, void *request, void *response) { - PRINTF("Separate response for /%s \n", resource->url); - /* send separate ACK. */ - coap_packet_t ack[1]; - /* ACK with empty code (0) */ - coap_init_message(ack, COAP_TYPE_ACK, 0, ((coap_packet_t *)request)->tid); - /* Should only overwrite Header which is already parsed to request. */ - coap_send_message(&UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, (uip_appdata + uip_ext_len), coap_serialize_message(ack, (uip_appdata + uip_ext_len))); + coap_packet_t *const coap_req = (coap_packet_t *) request; + coap_packet_t *const coap_res = (coap_packet_t *) response; - /* Change response to separate response. */ - ((coap_packet_t *)response)->type = COAP_TYPE_CON; - ((coap_packet_t *)response)->tid = coap_get_tid(); + PRINTF("Separate response for /%s MID %u\n", resource->url, coap_res->mid); + + /* Only ack CON requests. */ + if (coap_req->type==COAP_TYPE_CON) + { + coap_transaction_t *const t = coap_get_transaction_by_mid(coap_res->mid); + + /* send separate ACK. */ + coap_packet_t ack[1]; + /* ACK with empty code (0) */ + coap_init_message(ack, COAP_TYPE_ACK, 0, coap_req->mid); + /* Serializing into IPBUF: Only overwrites header parts that are already parsed into the request struct. */ + coap_send_message(&UIP_IP_BUF->srcipaddr, UIP_UDP_BUF->srcport, (uip_appdata), coap_serialize_message(ack, uip_appdata)); + + /* Change response to separate response. */ + coap_res->type = COAP_TYPE_CON; + coap_res->mid = coap_get_mid(); + + /* Update MID in transaction for identification. */ + t->mid = coap_res->mid; + } + + /* Pre-handlers could skip the handling by returning 0. */ + return 1; +} + +int +coap_separate_response(void *response, coap_separate_t *separate_store) +{ + coap_packet_t *const coap_res = (coap_packet_t *) response; + coap_transaction_t *const t = coap_get_transaction_by_mid(coap_res->mid); + + if (t) + { + uip_ipaddr_copy(&separate_store->addr, &t->addr); + separate_store->port = t->port; + + separate_store->mid = coap_res->mid; + separate_store->type = coap_res->type; + + memcpy(separate_store->token, coap_res->token, coap_res->token_len); + separate_store->token_len = coap_res->token_len; + + separate_store->block2_num = coap_res->block2_num; + separate_store->block2_more = coap_res->block2_more; + separate_store->block2_size = coap_res->block2_size; + separate_store->block2_offset = coap_res->block2_offset; + + /* Signal the engine to skip automatic response and clear transaction by engine. */ + coap_error_code = MANUAL_RESPONSE; + + return 1; + } + else + { + return 0; + } } diff --git a/apps/er-coap-07/er-coap-07-separate.h b/apps/er-coap-07/er-coap-07-separate.h index ace2388f5..8d677ea0d 100644 --- a/apps/er-coap-07/er-coap-07-separate.h +++ b/apps/er-coap-07/er-coap-07-separate.h @@ -41,6 +41,28 @@ #include "er-coap-07.h" -void coap_separate_handler(resource_t *resource, void *request, void *response); +typedef struct coap_separate { + + uip_ipaddr_t addr; + uint16_t port; + + coap_message_type_t type; + uint16_t mid; + + uint8_t token_len; + uint8_t token[COAP_TOKEN_LEN]; + + uint32_t block2_num; + uint8_t block2_more; + uint16_t block2_size; + uint32_t block2_offset; + + /* Add fields for addition information to be saved here, e.g.: */ + char buffer[17]; + +} coap_separate_t; + +int coap_separate_handler(resource_t *resource, void *request, void *response); +int coap_separate_response(void *response, coap_separate_t *separate_store); #endif /* COAP_SEPARATE_H_ */ diff --git a/apps/er-coap-07/er-coap-07-transactions.c b/apps/er-coap-07/er-coap-07-transactions.c index bfca2a23b..10070a29e 100644 --- a/apps/er-coap-07/er-coap-07-transactions.c +++ b/apps/er-coap-07/er-coap-07-transactions.c @@ -75,18 +75,20 @@ coap_register_as_transaction_handler() } coap_transaction_t * -coap_new_transaction(uint16_t tid, uip_ipaddr_t *addr, uint16_t port) +coap_new_transaction(uint16_t mid, uip_ipaddr_t *addr, uint16_t port) { coap_transaction_t *t = memb_alloc(&transactions_memb); if (t) { - t->tid = tid; + t->mid = mid; t->retrans_counter = 0; /* save client address */ uip_ipaddr_copy(&t->addr, addr); t->port = port; + + list_add(transactions_list, t); /* List itself makes sure same element is not added twice. */ } return t; @@ -95,7 +97,7 @@ coap_new_transaction(uint16_t tid, uip_ipaddr_t *addr, uint16_t port) void coap_send_transaction(coap_transaction_t *t) { - PRINTF("Sending transaction %u\n", t->tid); + PRINTF("Sending transaction %u\n", t->mid); coap_send_message(&t->addr, t->port, t->packet, t->packet_len); @@ -103,7 +105,7 @@ coap_send_transaction(coap_transaction_t *t) { if (t->retrans_countertid); + PRINTF("Keeping transaction %u\n", t->mid); if (t->retrans_counter==0) { @@ -122,8 +124,6 @@ coap_send_transaction(coap_transaction_t *t) etimer_restart(&t->retrans_timer); /* interval updated above */ process_current = process_actual; - list_add(transactions_list, t); /* List itself makes sure same element is not added twice. */ - t = NULL; } else @@ -154,7 +154,7 @@ coap_clear_transaction(coap_transaction_t *t) { if (t) { - PRINTF("Freeing transaction %u: %p\n", t->tid, t); + PRINTF("Freeing transaction %u: %p\n", t->mid, t); etimer_stop(&t->retrans_timer); list_remove(transactions_list, t); @@ -163,15 +163,15 @@ coap_clear_transaction(coap_transaction_t *t) } coap_transaction_t * -coap_get_transaction_by_tid(uint16_t tid) +coap_get_transaction_by_mid(uint16_t mid) { coap_transaction_t *t = NULL; for (t = (coap_transaction_t*)list_head(transactions_list); t; t = t->next) { - if (t->tid==tid) + if (t->mid==mid) { - PRINTF("Found transaction for TID %u: %p\n", t->tid, t); + PRINTF("Found transaction for MID %u: %p\n", t->mid, t); return t; } } @@ -188,7 +188,7 @@ coap_check_transactions() if (etimer_expired(&t->retrans_timer)) { ++(t->retrans_counter); - PRINTF("Retransmitting %u (%u)\n", t->tid, t->retrans_counter); + PRINTF("Retransmitting %u (%u)\n", t->mid, t->retrans_counter); coap_send_transaction(t); } } diff --git a/apps/er-coap-07/er-coap-07-transactions.h b/apps/er-coap-07/er-coap-07-transactions.h index e78a2ef55..0301ec13d 100644 --- a/apps/er-coap-07/er-coap-07-transactions.h +++ b/apps/er-coap-07/er-coap-07-transactions.h @@ -52,7 +52,7 @@ typedef struct coap_transaction { struct coap_transaction *next; /* for LIST */ - uint16_t tid; + uint16_t mid; struct etimer retrans_timer; uint8_t retrans_counter; @@ -68,10 +68,10 @@ typedef struct coap_transaction { void coap_register_as_transaction_handler(); -coap_transaction_t *coap_new_transaction(uint16_t tid, uip_ipaddr_t *addr, uint16_t port); +coap_transaction_t *coap_new_transaction(uint16_t mid, uip_ipaddr_t *addr, uint16_t port); void coap_send_transaction(coap_transaction_t *t); void coap_clear_transaction(coap_transaction_t *t); -coap_transaction_t *coap_get_transaction_by_tid(uint16_t tid); +coap_transaction_t *coap_get_transaction_by_mid(uint16_t mid); void coap_check_transactions(); diff --git a/apps/er-coap-07/er-coap-07.c b/apps/er-coap-07/er-coap-07.c index a9aed1791..70d13d2e9 100644 --- a/apps/er-coap-07/er-coap-07.c +++ b/apps/er-coap-07/er-coap-07.c @@ -61,7 +61,7 @@ /*- Variables -----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/ static struct uip_udp_conn *udp_conn = NULL; -static uint16_t current_tid = 0; +static uint16_t current_mid = 0; coap_status_t coap_error_code = NO_ERROR; char *coap_error_message = ""; @@ -209,6 +209,7 @@ coap_merge_multi_option(char **dst, size_t *dst_len, uint8_t *option, size_t opt /* Merge multiple options. */ if (*dst_len > 0) { + /* dst already contains an option: concatenate */ (*dst)[*dst_len] = separator; *dst_len += 1; @@ -219,7 +220,8 @@ coap_merge_multi_option(char **dst, size_t *dst_len, uint8_t *option, size_t opt } else { - *dst = (char *) option; /* thus pointer pointer */ + /* dst is empty: set to option */ + *dst = (char *) option; *dst_len = option_len; } } @@ -272,248 +274,252 @@ coap_init_connection(uint16_t port) PRINTF("Listening on port %u\n", uip_ntohs(udp_conn->lport)); /* Initialize transaction ID. */ - current_tid = random_rand(); + current_mid = random_rand(); } /*-----------------------------------------------------------------------------------*/ uint16_t -coap_get_tid() +coap_get_mid() { - return ++current_tid; + return ++current_mid; } /*-----------------------------------------------------------------------------------*/ /*- MEASSAGE PROCESSING -------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/ void -coap_init_message(void *packet, coap_message_type_t type, uint8_t code, uint16_t tid) +coap_init_message(void *packet, coap_message_type_t type, uint8_t code, uint16_t mid) { - /* Important thing */ - memset(packet, 0, sizeof(coap_packet_t)); + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - ((coap_packet_t *)packet)->type = type; - ((coap_packet_t *)packet)->code = code; - ((coap_packet_t *)packet)->tid = tid; + /* Important thing */ + memset(coap_pkt, 0, sizeof(coap_packet_t)); + + coap_pkt->type = type; + coap_pkt->code = code; + coap_pkt->mid = mid; } /*-----------------------------------------------------------------------------------*/ size_t coap_serialize_message(void *packet, uint8_t *buffer) { + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + /* Initialize */ - ((coap_packet_t *)packet)->buffer = buffer; - ((coap_packet_t *)packet)->version = 1; - ((coap_packet_t *)packet)->option_count = 0; + coap_pkt->buffer = buffer; + coap_pkt->version = 1; + coap_pkt->option_count = 0; /* serialize options */ - uint8_t *option = ((coap_packet_t *)packet)->buffer + COAP_HEADER_LEN; + uint8_t *option = coap_pkt->buffer + COAP_HEADER_LEN; int current_number = 0; PRINTF("-Serializing options-\n"); - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_CONTENT_TYPE)) { - PRINTF("Content-Type [%u]\n", ((coap_packet_t *)packet)->content_type); + if (IS_OPTION(coap_pkt, COAP_OPTION_CONTENT_TYPE)) { + PRINTF("Content-Type [%u]\n", coap_pkt->content_type); - option += serialize_int_option(COAP_OPTION_CONTENT_TYPE, current_number, option, ((coap_packet_t *)packet)->content_type); - ((coap_packet_t *)packet)->option_count += 1; + option += serialize_int_option(COAP_OPTION_CONTENT_TYPE, current_number, option, coap_pkt->content_type); + coap_pkt->option_count += 1; current_number = COAP_OPTION_CONTENT_TYPE; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_MAX_AGE)) { - PRINTF("Max-Age [%lu]\n", ((coap_packet_t *)packet)->max_age); + if (IS_OPTION(coap_pkt, COAP_OPTION_MAX_AGE)) { + PRINTF("Max-Age [%lu]\n", coap_pkt->max_age); - option += serialize_int_option(COAP_OPTION_MAX_AGE, current_number, option, ((coap_packet_t *)packet)->max_age); - ((coap_packet_t *)packet)->option_count += 1; + option += serialize_int_option(COAP_OPTION_MAX_AGE, current_number, option, coap_pkt->max_age); + coap_pkt->option_count += 1; current_number = COAP_OPTION_MAX_AGE; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_PROXY_URI)) { - PRINTF("Proxy-Uri [%.*s]\n", ((coap_packet_t *)packet)->proxy_uri_len, ((coap_packet_t *)packet)->proxy_uri); + if (IS_OPTION(coap_pkt, COAP_OPTION_PROXY_URI)) { + PRINTF("Proxy-Uri [%.*s]\n", coap_pkt->proxy_uri_len, coap_pkt->proxy_uri); - int length = ((coap_packet_t *)packet)->proxy_uri_len; + int length = coap_pkt->proxy_uri_len; int j = 0; while (length>0) { - option += serialize_array_option(COAP_OPTION_PROXY_URI, current_number, option, (uint8_t *) ((coap_packet_t *)packet)->proxy_uri + j*270, MIN(270, length), NULL); - ((coap_packet_t *)packet)->option_count += 1; + option += serialize_array_option(COAP_OPTION_PROXY_URI, current_number, option, (uint8_t *) coap_pkt->proxy_uri + j*270, MIN(270, length), NULL); + coap_pkt->option_count += 1; current_number = COAP_OPTION_PROXY_URI; ++j; length -= 270; } } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_ETAG)) { - PRINTF("ETag %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", ((coap_packet_t *)packet)->etag_len, - ((coap_packet_t *)packet)->etag[0], - ((coap_packet_t *)packet)->etag[1], - ((coap_packet_t *)packet)->etag[2], - ((coap_packet_t *)packet)->etag[3], - ((coap_packet_t *)packet)->etag[4], - ((coap_packet_t *)packet)->etag[5], - ((coap_packet_t *)packet)->etag[6], - ((coap_packet_t *)packet)->etag[7] + if (IS_OPTION(coap_pkt, COAP_OPTION_ETAG)) { + PRINTF("ETag %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", coap_pkt->etag_len, + coap_pkt->etag[0], + coap_pkt->etag[1], + coap_pkt->etag[2], + coap_pkt->etag[3], + coap_pkt->etag[4], + coap_pkt->etag[5], + coap_pkt->etag[6], + coap_pkt->etag[7] ); /*FIXME always prints 8 bytes */ - option += serialize_array_option(COAP_OPTION_ETAG, current_number, option, ((coap_packet_t *)packet)->etag, ((coap_packet_t *)packet)->etag_len, NULL); - ((coap_packet_t *)packet)->option_count += 1; + option += serialize_array_option(COAP_OPTION_ETAG, current_number, option, coap_pkt->etag, coap_pkt->etag_len, NULL); + coap_pkt->option_count += 1; current_number = COAP_OPTION_ETAG; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_HOST)) { - PRINTF("Uri-Host [%.*s]\n", ((coap_packet_t *)packet)->uri_host_len, ((coap_packet_t *)packet)->uri_host); + if (IS_OPTION(coap_pkt, COAP_OPTION_URI_HOST)) { + PRINTF("Uri-Host [%.*s]\n", coap_pkt->uri_host_len, coap_pkt->uri_host); - option += serialize_array_option(COAP_OPTION_URI_HOST, current_number, option, (uint8_t *) ((coap_packet_t *)packet)->uri_host, ((coap_packet_t *)packet)->uri_host_len, NULL); - ((coap_packet_t *)packet)->option_count += 1; + option += serialize_array_option(COAP_OPTION_URI_HOST, current_number, option, (uint8_t *) coap_pkt->uri_host, coap_pkt->uri_host_len, NULL); + coap_pkt->option_count += 1; current_number = COAP_OPTION_URI_HOST; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_PATH)) { - PRINTF("Location [%.*s]\n", ((coap_packet_t *)packet)->location_path_len, ((coap_packet_t *)packet)->location_path); + if (IS_OPTION(coap_pkt, COAP_OPTION_LOCATION_PATH)) { + PRINTF("Location [%.*s]\n", coap_pkt->location_path_len, coap_pkt->location_path); uint8_t split_options = '/'; - option += serialize_array_option(COAP_OPTION_LOCATION_PATH, current_number, option, (uint8_t *) ((coap_packet_t *)packet)->location_path, ((coap_packet_t *)packet)->location_path_len, &split_options); - ((coap_packet_t *)packet)->option_count += split_options; + option += serialize_array_option(COAP_OPTION_LOCATION_PATH, current_number, option, (uint8_t *) coap_pkt->location_path, coap_pkt->location_path_len, &split_options); + coap_pkt->option_count += split_options; current_number = COAP_OPTION_LOCATION_PATH; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_PORT)) { - PRINTF("Uri-Port [%u]\n", ((coap_packet_t *)packet)->uri_port); + if (IS_OPTION(coap_pkt, COAP_OPTION_URI_PORT)) { + PRINTF("Uri-Port [%u]\n", coap_pkt->uri_port); - option += serialize_int_option(COAP_OPTION_URI_PORT, current_number, option, ((coap_packet_t *)packet)->uri_port); - ((coap_packet_t *)packet)->option_count += 1; + option += serialize_int_option(COAP_OPTION_URI_PORT, current_number, option, coap_pkt->uri_port); + coap_pkt->option_count += 1; current_number = COAP_OPTION_URI_PORT; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_QUERY)) { - PRINTF("Location-Query [%.*s]\n", ((coap_packet_t *)packet)->location_query_len, ((coap_packet_t *)packet)->location_query); + if (IS_OPTION(coap_pkt, COAP_OPTION_LOCATION_QUERY)) { + PRINTF("Location-Query [%.*s]\n", coap_pkt->location_query_len, coap_pkt->location_query); uint8_t split_options = '&'; - option += serialize_array_option(COAP_OPTION_LOCATION_QUERY, current_number, option, (uint8_t *) ((coap_packet_t *)packet)->location_query, ((coap_packet_t *)packet)->location_query_len, &split_options); - ((coap_packet_t *)packet)->option_count += split_options; + option += serialize_array_option(COAP_OPTION_LOCATION_QUERY, current_number, option, (uint8_t *) coap_pkt->location_query, coap_pkt->location_query_len, &split_options); + coap_pkt->option_count += split_options; current_number = COAP_OPTION_LOCATION_QUERY; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_PATH)) { - PRINTF("Uri-Path [%.*s]\n", ((coap_packet_t *)packet)->uri_path_len, ((coap_packet_t *)packet)->uri_path); + if (IS_OPTION(coap_pkt, COAP_OPTION_URI_PATH)) { + PRINTF("Uri-Path [%.*s]\n", coap_pkt->uri_path_len, coap_pkt->uri_path); uint8_t split_options = '/'; - option += serialize_array_option(COAP_OPTION_URI_PATH, current_number, option, (uint8_t *) ((coap_packet_t *)packet)->uri_path, ((coap_packet_t *)packet)->uri_path_len, &split_options); - ((coap_packet_t *)packet)->option_count += split_options; + option += serialize_array_option(COAP_OPTION_URI_PATH, current_number, option, (uint8_t *) coap_pkt->uri_path, coap_pkt->uri_path_len, &split_options); + coap_pkt->option_count += split_options; current_number = COAP_OPTION_URI_PATH; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_OBSERVE)) { - PRINTF("Observe [%u]\n", ((coap_packet_t *)packet)->observe); + if (IS_OPTION(coap_pkt, COAP_OPTION_OBSERVE)) { + PRINTF("Observe [%u]\n", coap_pkt->observe); - option += serialize_int_option(COAP_OPTION_OBSERVE, current_number, option, ((coap_packet_t *)packet)->observe); - ((coap_packet_t *)packet)->option_count += 1; + option += serialize_int_option(COAP_OPTION_OBSERVE, current_number, option, coap_pkt->observe); + coap_pkt->option_count += 1; current_number = COAP_OPTION_OBSERVE; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_TOKEN)) { - PRINTF("Token %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", ((coap_packet_t *)packet)->token_len, - ((coap_packet_t *)packet)->token[0], - ((coap_packet_t *)packet)->token[1], - ((coap_packet_t *)packet)->token[2], - ((coap_packet_t *)packet)->token[3], - ((coap_packet_t *)packet)->token[4], - ((coap_packet_t *)packet)->token[5], - ((coap_packet_t *)packet)->token[6], - ((coap_packet_t *)packet)->token[7] + if (IS_OPTION(coap_pkt, COAP_OPTION_TOKEN)) { + PRINTF("Token %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", coap_pkt->token_len, + coap_pkt->token[0], + coap_pkt->token[1], + coap_pkt->token[2], + coap_pkt->token[3], + coap_pkt->token[4], + coap_pkt->token[5], + coap_pkt->token[6], + coap_pkt->token[7] ); /*FIXME always prints 8 bytes */ - option += serialize_array_option(COAP_OPTION_TOKEN, current_number, option, ((coap_packet_t *)packet)->token, ((coap_packet_t *)packet)->token_len, NULL); - ((coap_packet_t *)packet)->option_count += 1; + option += serialize_array_option(COAP_OPTION_TOKEN, current_number, option, coap_pkt->token, coap_pkt->token_len, NULL); + coap_pkt->option_count += 1; current_number = COAP_OPTION_TOKEN; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_ACCEPT)) { + if (IS_OPTION(coap_pkt, COAP_OPTION_ACCEPT)) { int i; - for (i=0; i<((coap_packet_t *)packet)->accept_num; ++i) + for (i=0; iaccept_num; ++i) { - PRINTF("Accept [%u]\n", ((coap_packet_t *)packet)->accept[i]); + PRINTF("Accept [%u]\n", coap_pkt->accept[i]); - option += serialize_int_option(COAP_OPTION_ACCEPT, current_number, option, (uint32_t)((coap_packet_t *)packet)->accept[i]); - ((coap_packet_t *)packet)->option_count += 1; + option += serialize_int_option(COAP_OPTION_ACCEPT, current_number, option, (uint32_t)coap_pkt->accept[i]); + coap_pkt->option_count += 1; current_number = COAP_OPTION_ACCEPT; } } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_IF_MATCH)) { + if (IS_OPTION(coap_pkt, COAP_OPTION_IF_MATCH)) { PRINTF("If-Match [FIXME]\n"); - option += serialize_array_option(COAP_OPTION_IF_MATCH, current_number, option, ((coap_packet_t *)packet)->if_match, ((coap_packet_t *)packet)->if_match_len, NULL); - ((coap_packet_t *)packet)->option_count += 1; + option += serialize_array_option(COAP_OPTION_IF_MATCH, current_number, option, coap_pkt->if_match, coap_pkt->if_match_len, NULL); + coap_pkt->option_count += 1; current_number = COAP_OPTION_IF_MATCH; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_QUERY)) { - PRINTF("Uri-Query [%.*s]\n", ((coap_packet_t *)packet)->uri_query_len, ((coap_packet_t *)packet)->uri_query); + if (IS_OPTION(coap_pkt, COAP_OPTION_URI_QUERY)) { + PRINTF("Uri-Query [%.*s]\n", coap_pkt->uri_query_len, coap_pkt->uri_query); uint8_t split_options = '&'; - option += serialize_array_option(COAP_OPTION_URI_QUERY, current_number, option, (uint8_t *) ((coap_packet_t *)packet)->uri_query, ((coap_packet_t *)packet)->uri_query_len, &split_options); - ((coap_packet_t *)packet)->option_count += split_options + (COAP_OPTION_URI_QUERY-current_number)/COAP_OPTION_FENCE_POST; + option += serialize_array_option(COAP_OPTION_URI_QUERY, current_number, option, (uint8_t *) coap_pkt->uri_query, coap_pkt->uri_query_len, &split_options); + coap_pkt->option_count += split_options + (COAP_OPTION_URI_QUERY-current_number)/COAP_OPTION_FENCE_POST; current_number = COAP_OPTION_URI_QUERY; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_BLOCK2)) + if (IS_OPTION(coap_pkt, COAP_OPTION_BLOCK2)) { - PRINTF("Block2 [%lu%s (%u B/blk)]\n", ((coap_packet_t *)packet)->block2_num, ((coap_packet_t *)packet)->block2_more ? "+" : "", ((coap_packet_t *)packet)->block2_size); + PRINTF("Block2 [%lu%s (%u B/blk)]\n", coap_pkt->block2_num, coap_pkt->block2_more ? "+" : "", coap_pkt->block2_size); - uint32_t block = ((coap_packet_t *)packet)->block2_num << 4; - if (((coap_packet_t *)packet)->block2_more) block |= 0x8; - block |= 0xF & log_2(((coap_packet_t *)packet)->block2_size/16); + uint32_t block = coap_pkt->block2_num << 4; + if (coap_pkt->block2_more) block |= 0x8; + block |= 0xF & log_2(coap_pkt->block2_size/16); PRINTF("Block2 encoded: 0x%lX\n", block); option += serialize_int_option(COAP_OPTION_BLOCK2, current_number, option, block); - ((coap_packet_t *)packet)->option_count += 1 + (COAP_OPTION_BLOCK2-current_number)/COAP_OPTION_FENCE_POST; + coap_pkt->option_count += 1 + (COAP_OPTION_BLOCK2-current_number)/COAP_OPTION_FENCE_POST; current_number = COAP_OPTION_BLOCK2; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_BLOCK1)) + if (IS_OPTION(coap_pkt, COAP_OPTION_BLOCK1)) { - PRINTF("Block1 [%lu%s (%u B/blk)]\n", ((coap_packet_t *)packet)->block1_num, ((coap_packet_t *)packet)->block1_more ? "+" : "", ((coap_packet_t *)packet)->block1_size); + PRINTF("Block1 [%lu%s (%u B/blk)]\n", coap_pkt->block1_num, coap_pkt->block1_more ? "+" : "", coap_pkt->block1_size); - uint32_t block = ((coap_packet_t *)packet)->block1_num << 4; - if (((coap_packet_t *)packet)->block1_more) block |= 0x8; - block |= 0xF & log_2(((coap_packet_t *)packet)->block1_size/16); + uint32_t block = coap_pkt->block1_num << 4; + if (coap_pkt->block1_more) block |= 0x8; + block |= 0xF & log_2(coap_pkt->block1_size/16); PRINTF("Block1 encoded: 0x%lX\n", block); option += serialize_int_option(COAP_OPTION_BLOCK1, current_number, option, block); - ((coap_packet_t *)packet)->option_count += 1 + (COAP_OPTION_BLOCK1-current_number)/COAP_OPTION_FENCE_POST; + coap_pkt->option_count += 1 + (COAP_OPTION_BLOCK1-current_number)/COAP_OPTION_FENCE_POST; current_number = COAP_OPTION_BLOCK1; } - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_IF_NONE_MATCH)) { + if (IS_OPTION(coap_pkt, COAP_OPTION_IF_NONE_MATCH)) { PRINTF("If-None-Match\n"); option += serialize_int_option(COAP_OPTION_IF_NONE_MATCH, current_number, option, 0); - ((coap_packet_t *)packet)->option_count += 1 + (COAP_OPTION_IF_NONE_MATCH-current_number)/COAP_OPTION_FENCE_POST; + coap_pkt->option_count += 1 + (COAP_OPTION_IF_NONE_MATCH-current_number)/COAP_OPTION_FENCE_POST; current_number = COAP_OPTION_IF_NONE_MATCH; } /* pack payload */ - if ((option - ((coap_packet_t *)packet)->buffer)<=COAP_MAX_HEADER_SIZE) + if ((option - coap_pkt->buffer)<=COAP_MAX_HEADER_SIZE) { - memmove(option, ((coap_packet_t *)packet)->payload, ((coap_packet_t *)packet)->payload_len); + memmove(option, coap_pkt->payload, coap_pkt->payload_len); } else { /* An error occured. Caller must check for !=0. */ - ((coap_packet_t *)packet)->buffer = NULL; + coap_pkt->buffer = NULL; coap_error_message = "Serialized header exceeds COAP_MAX_HEADER_SIZE"; return 0; } /* set header fields */ - ((coap_packet_t *)packet)->buffer[0] = 0x00; - ((coap_packet_t *)packet)->buffer[0] |= COAP_HEADER_VERSION_MASK & (((coap_packet_t *)packet)->version)<buffer[0] |= COAP_HEADER_TYPE_MASK & (((coap_packet_t *)packet)->type)<buffer[0] |= COAP_HEADER_OPTION_COUNT_MASK & (((coap_packet_t *)packet)->option_count)<buffer[1] = ((coap_packet_t *)packet)->code; - ((coap_packet_t *)packet)->buffer[2] = 0xFF & (((coap_packet_t *)packet)->tid)>>8; - ((coap_packet_t *)packet)->buffer[3] = 0xFF & ((coap_packet_t *)packet)->tid; + coap_pkt->buffer[0] = 0x00; + coap_pkt->buffer[0] |= COAP_HEADER_VERSION_MASK & (coap_pkt->version)<buffer[0] |= COAP_HEADER_TYPE_MASK & (coap_pkt->type)<buffer[0] |= COAP_HEADER_OPTION_COUNT_MASK & (coap_pkt->option_count)<buffer[1] = coap_pkt->code; + coap_pkt->buffer[2] = 0xFF & (coap_pkt->mid)>>8; + coap_pkt->buffer[3] = 0xFF & coap_pkt->mid; - PRINTF("-Done %u options, header len %u, payload len %u-\n", ((coap_packet_t *)packet)->option_count, option - buffer, ((coap_packet_t *)packet)->payload_len); + PRINTF("-Done %u options, header len %u, payload len %u-\n", coap_pkt->option_count, option - buffer, coap_pkt->payload_len); - return (option - buffer) + ((coap_packet_t *)packet)->payload_len; /* packet length */ + return (option - buffer) + coap_pkt->payload_len; /* packet length */ } /*-----------------------------------------------------------------------------------*/ void coap_send_message(uip_ipaddr_t *addr, uint16_t port, uint8_t *data, uint16_t length) { - /*configure connection to reply to client*/ + /* Configure connection to reply to client */ uip_ipaddr_copy(&udp_conn->ripaddr, addr); udp_conn->rport = port; @@ -528,38 +534,40 @@ coap_send_message(uip_ipaddr_t *addr, uint16_t port, uint8_t *data, uint16_t len coap_status_t coap_parse_message(void *packet, uint8_t *data, uint16_t data_len) { + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + /* Initialize packet */ - memset(packet, 0, sizeof(coap_packet_t)); + memset(coap_pkt, 0, sizeof(coap_packet_t)); /* pointer to packet bytes */ - ((coap_packet_t *)packet)->buffer = data; + coap_pkt->buffer = data; /* parse header fields */ - ((coap_packet_t *)packet)->version = (COAP_HEADER_VERSION_MASK & ((coap_packet_t *)packet)->buffer[0])>>COAP_HEADER_VERSION_POSITION; - ((coap_packet_t *)packet)->type = (COAP_HEADER_TYPE_MASK & ((coap_packet_t *)packet)->buffer[0])>>COAP_HEADER_TYPE_POSITION; - ((coap_packet_t *)packet)->option_count = (COAP_HEADER_OPTION_COUNT_MASK & ((coap_packet_t *)packet)->buffer[0])>>COAP_HEADER_OPTION_COUNT_POSITION; - ((coap_packet_t *)packet)->code = ((coap_packet_t *)packet)->buffer[1]; - ((coap_packet_t *)packet)->tid = ((coap_packet_t *)packet)->buffer[2]<<8 | ((coap_packet_t *)packet)->buffer[3]; + coap_pkt->version = (COAP_HEADER_VERSION_MASK & coap_pkt->buffer[0])>>COAP_HEADER_VERSION_POSITION; + coap_pkt->type = (COAP_HEADER_TYPE_MASK & coap_pkt->buffer[0])>>COAP_HEADER_TYPE_POSITION; + coap_pkt->option_count = (COAP_HEADER_OPTION_COUNT_MASK & coap_pkt->buffer[0])>>COAP_HEADER_OPTION_COUNT_POSITION; + coap_pkt->code = coap_pkt->buffer[1]; + coap_pkt->mid = coap_pkt->buffer[2]<<8 | coap_pkt->buffer[3]; - if (((coap_packet_t *)packet)->version != 1) + if (coap_pkt->version != 1) { coap_error_message = "CoAP version must be 1"; return BAD_REQUEST_4_00; } /* parse options */ - ((coap_packet_t *)packet)->options = 0x0000; + coap_pkt->options = 0x0000; uint8_t *current_option = data + COAP_HEADER_LEN; - if (((coap_packet_t *)packet)->option_count) + if (coap_pkt->option_count) { uint8_t option_index = 0; uint8_t current_number = 0; size_t option_len = 0; - PRINTF("-Parsing %u options-\n", ((coap_packet_t *)packet)->option_count); - for (option_index=0; option_index < ((coap_packet_t *)packet)->option_count; ++option_index) { + PRINTF("-Parsing %u options-\n", coap_pkt->option_count); + for (option_index=0; option_index < coap_pkt->option_count; ++option_index) { current_number += current_option[0]>>4; @@ -573,116 +581,120 @@ coap_parse_message(void *packet, uint8_t *data, uint16_t data_len) current_option += 2; } - SET_OPTION((coap_packet_t *)packet, current_number); + SET_OPTION(coap_pkt, current_number); switch (current_number) { case COAP_OPTION_CONTENT_TYPE: - ((coap_packet_t *)packet)->content_type = parse_int_option(current_option, option_len); - PRINTF("Content-Type [%u]\n", ((coap_packet_t *)packet)->content_type); + coap_pkt->content_type = parse_int_option(current_option, option_len); + PRINTF("Content-Type [%u]\n", coap_pkt->content_type); break; case COAP_OPTION_MAX_AGE: - ((coap_packet_t *)packet)->max_age = parse_int_option(current_option, option_len); - PRINTF("Max-Age [%lu]\n", ((coap_packet_t *)packet)->max_age); + coap_pkt->max_age = parse_int_option(current_option, option_len); + PRINTF("Max-Age [%lu]\n", coap_pkt->max_age); break; case COAP_OPTION_PROXY_URI: /*FIXME check for own end-point */ - ((coap_packet_t *)packet)->proxy_uri = (char *) current_option; - ((coap_packet_t *)packet)->proxy_uri_len = option_len; + coap_pkt->proxy_uri = (char *) current_option; + coap_pkt->proxy_uri_len = option_len; /*TODO length > 270 not implemented (actually not required) */ - PRINTF("Proxy-Uri NOT IMPLEMENTED [%.*s]\n", ((coap_packet_t *)packet)->proxy_uri_len, ((coap_packet_t *)packet)->proxy_uri); + PRINTF("Proxy-Uri NOT IMPLEMENTED [%.*s]\n", coap_pkt->proxy_uri_len, coap_pkt->proxy_uri); coap_error_message = "This is a constrained server (Contiki)"; return PROXYING_NOT_SUPPORTED_5_05; break; case COAP_OPTION_ETAG: - ((coap_packet_t *)packet)->etag_len = MIN(COAP_ETAG_LEN, option_len); - memcpy(((coap_packet_t *)packet)->etag, current_option, ((coap_packet_t *)packet)->etag_len); - PRINTF("ETag %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", ((coap_packet_t *)packet)->etag_len, - ((coap_packet_t *)packet)->etag[0], - ((coap_packet_t *)packet)->etag[1], - ((coap_packet_t *)packet)->etag[2], - ((coap_packet_t *)packet)->etag[3], - ((coap_packet_t *)packet)->etag[4], - ((coap_packet_t *)packet)->etag[5], - ((coap_packet_t *)packet)->etag[6], - ((coap_packet_t *)packet)->etag[7] + coap_pkt->etag_len = MIN(COAP_ETAG_LEN, option_len); + memcpy(coap_pkt->etag, current_option, coap_pkt->etag_len); + PRINTF("ETag %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", coap_pkt->etag_len, + coap_pkt->etag[0], + coap_pkt->etag[1], + coap_pkt->etag[2], + coap_pkt->etag[3], + coap_pkt->etag[4], + coap_pkt->etag[5], + coap_pkt->etag[6], + coap_pkt->etag[7] ); /*FIXME always prints 8 bytes */ break; case COAP_OPTION_URI_HOST: - ((coap_packet_t *)packet)->uri_host = (char *) current_option; - ((coap_packet_t *)packet)->uri_host_len = option_len; - PRINTF("Uri-Host [%.*s]\n", ((coap_packet_t *)packet)->uri_host_len, ((coap_packet_t *)packet)->uri_host); + coap_pkt->uri_host = (char *) current_option; + coap_pkt->uri_host_len = option_len; + PRINTF("Uri-Host [%.*s]\n", coap_pkt->uri_host_len, coap_pkt->uri_host); break; case COAP_OPTION_LOCATION_PATH: - coap_merge_multi_option(&(((coap_packet_t *)packet)->location_path), &(((coap_packet_t *)packet)->location_path_len), current_option, option_len, '/'); - PRINTF("Location-Path [%.*s]\n", ((coap_packet_t *)packet)->location_path_len, ((coap_packet_t *)packet)->location_path); + /* coap_merge_multi_option() operates in-place on the IPBUF, but final packet field should be const string -> cast to string */ + coap_merge_multi_option( (char **) &(coap_pkt->location_path), &(coap_pkt->location_path_len), current_option, option_len, '/'); + PRINTF("Location-Path [%.*s]\n", coap_pkt->location_path_len, coap_pkt->location_path); break; case COAP_OPTION_URI_PORT: - ((coap_packet_t *)packet)->uri_port = parse_int_option(current_option, option_len); - PRINTF("Uri-Port [%u]\n", ((coap_packet_t *)packet)->uri_port); + coap_pkt->uri_port = parse_int_option(current_option, option_len); + PRINTF("Uri-Port [%u]\n", coap_pkt->uri_port); break; case COAP_OPTION_LOCATION_QUERY: - coap_merge_multi_option(&(((coap_packet_t *)packet)->location_query), &(((coap_packet_t *)packet)->location_query_len), current_option, option_len, '&'); - PRINTF("Location-Query [%.*s]\n", ((coap_packet_t *)packet)->location_query_len, ((coap_packet_t *)packet)->location_query); + /* coap_merge_multi_option() operates in-place on the IPBUF, but final packet field should be const string -> cast to string */ + coap_merge_multi_option( (char **) &(coap_pkt->location_query), &(coap_pkt->location_query_len), current_option, option_len, '&'); + PRINTF("Location-Query [%.*s]\n", coap_pkt->location_query_len, coap_pkt->location_query); break; case COAP_OPTION_URI_PATH: - coap_merge_multi_option(&(((coap_packet_t *)packet)->uri_path), &(((coap_packet_t *)packet)->uri_path_len), current_option, option_len, '/'); - PRINTF("Uri-Path [%.*s]\n", ((coap_packet_t *)packet)->uri_path_len, ((coap_packet_t *)packet)->uri_path); + /* coap_merge_multi_option() operates in-place on the IPBUF, but final packet field should be const string -> cast to string */ + coap_merge_multi_option( (char **) &(coap_pkt->uri_path), &(coap_pkt->uri_path_len), current_option, option_len, '/'); + PRINTF("Uri-Path [%.*s]\n", coap_pkt->uri_path_len, coap_pkt->uri_path); break; case COAP_OPTION_OBSERVE: - ((coap_packet_t *)packet)->observe = parse_int_option(current_option, option_len); - PRINTF("Observe [%u]\n", ((coap_packet_t *)packet)->observe); + coap_pkt->observe = parse_int_option(current_option, option_len); + PRINTF("Observe [%u]\n", coap_pkt->observe); break; case COAP_OPTION_TOKEN: - ((coap_packet_t *)packet)->token_len = MIN(COAP_TOKEN_LEN, option_len); - memcpy(((coap_packet_t *)packet)->token, current_option, ((coap_packet_t *)packet)->token_len); - PRINTF("Token %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", ((coap_packet_t *)packet)->token_len, - ((coap_packet_t *)packet)->token[0], - ((coap_packet_t *)packet)->token[1], - ((coap_packet_t *)packet)->token[2], - ((coap_packet_t *)packet)->token[3], - ((coap_packet_t *)packet)->token[4], - ((coap_packet_t *)packet)->token[5], - ((coap_packet_t *)packet)->token[6], - ((coap_packet_t *)packet)->token[7] + coap_pkt->token_len = MIN(COAP_TOKEN_LEN, option_len); + memcpy(coap_pkt->token, current_option, coap_pkt->token_len); + PRINTF("Token %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", coap_pkt->token_len, + coap_pkt->token[0], + coap_pkt->token[1], + coap_pkt->token[2], + coap_pkt->token[3], + coap_pkt->token[4], + coap_pkt->token[5], + coap_pkt->token[6], + coap_pkt->token[7] ); /*FIXME always prints 8 bytes */ break; case COAP_OPTION_ACCEPT: - if (((coap_packet_t *)packet)->accept_num < COAP_MAX_ACCEPT_NUM) + if (coap_pkt->accept_num < COAP_MAX_ACCEPT_NUM) { - ((coap_packet_t *)packet)->accept[((coap_packet_t *)packet)->accept_num] = parse_int_option(current_option, option_len); - ((coap_packet_t *)packet)->accept_num += 1; - PRINTF("Accept [%u]\n", ((coap_packet_t *)packet)->content_type); + coap_pkt->accept[coap_pkt->accept_num] = parse_int_option(current_option, option_len); + coap_pkt->accept_num += 1; + PRINTF("Accept [%u]\n", coap_pkt->content_type); } break; case COAP_OPTION_IF_MATCH: /*FIXME support multiple ETags */ - ((coap_packet_t *)packet)->if_match_len = MIN(COAP_ETAG_LEN, option_len); - memcpy(((coap_packet_t *)packet)->if_match, current_option, ((coap_packet_t *)packet)->if_match_len); - PRINTF("If-Match %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", ((coap_packet_t *)packet)->if_match_len, - ((coap_packet_t *)packet)->if_match[0], - ((coap_packet_t *)packet)->if_match[1], - ((coap_packet_t *)packet)->if_match[2], - ((coap_packet_t *)packet)->if_match[3], - ((coap_packet_t *)packet)->if_match[4], - ((coap_packet_t *)packet)->if_match[5], - ((coap_packet_t *)packet)->if_match[6], - ((coap_packet_t *)packet)->if_match[7] + coap_pkt->if_match_len = MIN(COAP_ETAG_LEN, option_len); + memcpy(coap_pkt->if_match, current_option, coap_pkt->if_match_len); + PRINTF("If-Match %u [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n", coap_pkt->if_match_len, + coap_pkt->if_match[0], + coap_pkt->if_match[1], + coap_pkt->if_match[2], + coap_pkt->if_match[3], + coap_pkt->if_match[4], + coap_pkt->if_match[5], + coap_pkt->if_match[6], + coap_pkt->if_match[7] ); /*FIXME always prints 8 bytes */ break; case COAP_OPTION_FENCE_POST: PRINTF("Fence-Post\n"); break; case COAP_OPTION_URI_QUERY: - coap_merge_multi_option(&(((coap_packet_t *)packet)->uri_query), &(((coap_packet_t *)packet)->uri_query_len), current_option, option_len, '&'); - PRINTF("Uri-Query [%.*s]\n", ((coap_packet_t *)packet)->uri_query_len, ((coap_packet_t *)packet)->uri_query); + /* coap_merge_multi_option() operates in-place on the IPBUF, but final packet field should be const string -> cast to string */ + coap_merge_multi_option( (char **) &(coap_pkt->uri_query), &(coap_pkt->uri_query_len), current_option, option_len, '&'); + PRINTF("Uri-Query [%.*s]\n", coap_pkt->uri_query_len, coap_pkt->uri_query); break; case COAP_OPTION_BLOCK2: - ((coap_packet_t *)packet)->block2_num = parse_int_option(current_option, option_len); - ((coap_packet_t *)packet)->block2_more = (((coap_packet_t *)packet)->block2_num & 0x08)>>3; - ((coap_packet_t *)packet)->block2_size = 16 << (((coap_packet_t *)packet)->block2_num & 0x07); - ((coap_packet_t *)packet)->block2_offset = (((coap_packet_t *)packet)->block2_num & ~0x0000000F)<<(((coap_packet_t *)packet)->block2_num & 0x07); - ((coap_packet_t *)packet)->block2_num >>= 4; - PRINTF("Block2 [%lu%s (%u B/blk)]\n", ((coap_packet_t *)packet)->block2_num, ((coap_packet_t *)packet)->block2_more ? "+" : "", ((coap_packet_t *)packet)->block2_size); + coap_pkt->block2_num = parse_int_option(current_option, option_len); + coap_pkt->block2_more = (coap_pkt->block2_num & 0x08)>>3; + coap_pkt->block2_size = 16 << (coap_pkt->block2_num & 0x07); + coap_pkt->block2_offset = (coap_pkt->block2_num & ~0x0000000F)<<(coap_pkt->block2_num & 0x07); + coap_pkt->block2_num >>= 4; + 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"); @@ -691,7 +703,7 @@ coap_parse_message(void *packet, uint8_t *data, uint16_t data_len) return NOT_IMPLEMENTED_5_01; break; case COAP_OPTION_IF_NONE_MATCH: - ((coap_packet_t *)packet)->if_none_match = 1; + coap_pkt->if_none_match = 1; PRINTF("If-None-Match\n"); break; default: @@ -709,8 +721,17 @@ coap_parse_message(void *packet, uint8_t *data, uint16_t data_len) PRINTF("-Done parsing-------\n"); } /* if (oc) */ - ((coap_packet_t *)packet)->payload = current_option; - ((coap_packet_t *)packet)->payload_len = data_len - (((coap_packet_t *)packet)->payload - data); + coap_pkt->payload = current_option; + coap_pkt->payload_len = data_len - (coap_pkt->payload - data); + + /* also for receiving, the Erbium upper bound is REST_MAX_CHUNK_SIZE */ + if (coap_pkt->payload_len > REST_MAX_CHUNK_SIZE) + { + coap_pkt->payload_len = REST_MAX_CHUNK_SIZE; + } + + /* Null-terminate payload */ + coap_pkt->payload[coap_pkt->payload_len] = '\0'; return NO_ERROR; } @@ -720,8 +741,10 @@ coap_parse_message(void *packet, uint8_t *data, uint16_t data_len) int coap_get_query_variable(void *packet, const char *name, const char **output) { - if (IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_QUERY)) { - return coap_get_variable(((coap_packet_t *)packet)->uri_query, ((coap_packet_t *)packet)->uri_query_len, name, output); + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + + if (IS_OPTION(coap_pkt, COAP_OPTION_URI_QUERY)) { + return coap_get_variable(coap_pkt->uri_query, coap_pkt->uri_query_len, name, output); } return 0; } @@ -729,12 +752,28 @@ coap_get_query_variable(void *packet, const char *name, const char **output) int coap_get_post_variable(void *packet, const char *name, const char **output) { - if (((coap_packet_t *)packet)->payload_len) { - return coap_get_variable((const char *)((coap_packet_t *)packet)->payload, ((coap_packet_t *)packet)->payload_len, name, output); + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + + if (coap_pkt->payload_len) { + return coap_get_variable((const char *)coap_pkt->payload, coap_pkt->payload_len, name, output); } return 0; } /*-----------------------------------------------------------------------------------*/ +int +coap_set_status_code(void *packet, unsigned int code) +{ + if (code <= 0xFF) + { + ((coap_packet_t *)packet)->code = (uint8_t) code; + return 1; + } + else + { + return 0; + } +} +/*-----------------------------------------------------------------------------------*/ /*- HEADER OPTION GETTERS AND SETTERS -----------------------------------------------*/ /*-----------------------------------------------------------------------------------*/ unsigned int @@ -746,40 +785,48 @@ coap_get_header_content_type(void *packet) int coap_set_header_content_type(void *packet, unsigned int content_type) { - ((coap_packet_t *)packet)->content_type = (coap_content_type_t) content_type; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_CONTENT_TYPE); + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + + coap_pkt->content_type = (coap_content_type_t) content_type; + SET_OPTION(coap_pkt, COAP_OPTION_CONTENT_TYPE); return 1; } /*-----------------------------------------------------------------------------------*/ int -coap_get_header_accept(void *packet, uint16_t **accept) +coap_get_header_accept(void *packet, const uint16_t **accept) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_ACCEPT)) return 0; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - *accept = ((coap_packet_t *)packet)->accept; - return ((coap_packet_t *)packet)->accept_num; + if (!IS_OPTION(coap_pkt, COAP_OPTION_ACCEPT)) return 0; + + *accept = coap_pkt->accept; + return coap_pkt->accept_num; } int coap_set_header_accept(void *packet, uint16_t accept) { - if (((coap_packet_t *)packet)->accept_num < COAP_MAX_ACCEPT_NUM) - { - ((coap_packet_t *)packet)->accept[((coap_packet_t *)packet)->accept_num] = accept; - ((coap_packet_t *)packet)->accept_num += 1; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_ACCEPT); + if (coap_pkt->accept_num < COAP_MAX_ACCEPT_NUM) + { + coap_pkt->accept[coap_pkt->accept_num] = accept; + coap_pkt->accept_num += 1; + + SET_OPTION(coap_pkt, COAP_OPTION_ACCEPT); } - return ((coap_packet_t *)packet)->accept_num; + return coap_pkt->accept_num; } /*-----------------------------------------------------------------------------------*/ int coap_get_header_max_age(void *packet, uint32_t *age) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_MAX_AGE)) { + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + + if (!IS_OPTION(coap_pkt, COAP_OPTION_MAX_AGE)) { *age = COAP_DEFAULT_MAX_AGE; } else { - *age = ((coap_packet_t *)packet)->max_age; + *age = coap_pkt->max_age; } return 1; } @@ -787,48 +834,58 @@ coap_get_header_max_age(void *packet, uint32_t *age) int coap_set_header_max_age(void *packet, uint32_t age) { - ((coap_packet_t *)packet)->max_age = age; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_MAX_AGE); + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + + coap_pkt->max_age = age; + SET_OPTION(coap_pkt, COAP_OPTION_MAX_AGE); return 1; } /*-----------------------------------------------------------------------------------*/ int coap_get_header_etag(void *packet, const uint8_t **etag) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_ETAG)) return 0; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - *etag = ((coap_packet_t *)packet)->etag; - return ((coap_packet_t *)packet)->etag_len; + if (!IS_OPTION(coap_pkt, COAP_OPTION_ETAG)) return 0; + + *etag = coap_pkt->etag; + return coap_pkt->etag_len; } int -coap_set_header_etag(void *packet, uint8_t *etag, size_t etag_len) +coap_set_header_etag(void *packet, const uint8_t *etag, size_t etag_len) { - ((coap_packet_t *)packet)->etag_len = MIN(COAP_ETAG_LEN, etag_len); - memcpy(((coap_packet_t *)packet)->etag, etag, ((coap_packet_t *)packet)->etag_len); + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_ETAG); - return ((coap_packet_t *)packet)->etag_len; + coap_pkt->etag_len = MIN(COAP_ETAG_LEN, etag_len); + memcpy(coap_pkt->etag, etag, coap_pkt->etag_len); + + SET_OPTION(coap_pkt, COAP_OPTION_ETAG); + return coap_pkt->etag_len; } /*-----------------------------------------------------------------------------------*/ /*FIXME support multiple ETags */ int coap_get_header_if_match(void *packet, const uint8_t **etag) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_IF_MATCH)) return 0; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - *etag = ((coap_packet_t *)packet)->if_match; - return ((coap_packet_t *)packet)->if_match_len; + if (!IS_OPTION(coap_pkt, COAP_OPTION_IF_MATCH)) return 0; + + *etag = coap_pkt->if_match; + return coap_pkt->if_match_len; } int -coap_set_header_if_match(void *packet, uint8_t *etag, size_t etag_len) +coap_set_header_if_match(void *packet, const uint8_t *etag, size_t etag_len) { - ((coap_packet_t *)packet)->if_match_len = MIN(COAP_ETAG_LEN, etag_len); - memcpy(((coap_packet_t *)packet)->if_match, etag, ((coap_packet_t *)packet)->if_match_len); + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_IF_MATCH); - return ((coap_packet_t *)packet)->if_match_len; + coap_pkt->if_match_len = MIN(COAP_ETAG_LEN, etag_len); + memcpy(coap_pkt->if_match, etag, coap_pkt->if_match_len); + + SET_OPTION(coap_pkt, COAP_OPTION_IF_MATCH); + return coap_pkt->if_match_len; } /*-----------------------------------------------------------------------------------*/ int @@ -847,114 +904,138 @@ coap_set_header_if_none_match(void *packet) int coap_get_header_token(void *packet, const uint8_t **token) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_TOKEN)) return 0; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - *token = ((coap_packet_t *)packet)->token; - return ((coap_packet_t *)packet)->token_len; + if (!IS_OPTION(coap_pkt, COAP_OPTION_TOKEN)) return 0; + + *token = coap_pkt->token; + return coap_pkt->token_len; } int -coap_set_header_token(void *packet, uint8_t *token, size_t token_len) +coap_set_header_token(void *packet, const uint8_t *token, size_t token_len) { - ((coap_packet_t *)packet)->token_len = MIN(COAP_TOKEN_LEN, token_len); - memcpy(((coap_packet_t *)packet)->token, token, ((coap_packet_t *)packet)->token_len); + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_TOKEN); - return ((coap_packet_t *)packet)->token_len; + coap_pkt->token_len = MIN(COAP_TOKEN_LEN, token_len); + memcpy(coap_pkt->token, token, coap_pkt->token_len); + + SET_OPTION(coap_pkt, COAP_OPTION_TOKEN); + return coap_pkt->token_len; } /*-----------------------------------------------------------------------------------*/ int coap_get_header_proxy_uri(void *packet, const char **uri) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_PROXY_URI)) return 0; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - *uri = ((coap_packet_t *)packet)->proxy_uri; - return ((coap_packet_t *)packet)->proxy_uri_len; + if (!IS_OPTION(coap_pkt, COAP_OPTION_PROXY_URI)) return 0; + + *uri = coap_pkt->proxy_uri; + return coap_pkt->proxy_uri_len; } int -coap_set_header_proxy_uri(void *packet, char *uri) +coap_set_header_proxy_uri(void *packet, const char *uri) { - ((coap_packet_t *)packet)->proxy_uri = uri; - ((coap_packet_t *)packet)->proxy_uri_len = strlen(uri); + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_PROXY_URI); - return ((coap_packet_t *)packet)->proxy_uri_len; + coap_pkt->proxy_uri = uri; + coap_pkt->proxy_uri_len = strlen(uri); + + SET_OPTION(coap_pkt, COAP_OPTION_PROXY_URI); + return coap_pkt->proxy_uri_len; } /*-----------------------------------------------------------------------------------*/ int coap_get_header_uri_host(void *packet, const char **host) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_HOST)) return 0; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - *host = ((coap_packet_t *)packet)->uri_host; - return ((coap_packet_t *)packet)->uri_host_len; + if (!IS_OPTION(coap_pkt, COAP_OPTION_URI_HOST)) return 0; + + *host = coap_pkt->uri_host; + return coap_pkt->uri_host_len; } int -coap_set_header_uri_host(void *packet, char *host) +coap_set_header_uri_host(void *packet, const char *host) { - ((coap_packet_t *)packet)->uri_host = host; - ((coap_packet_t *)packet)->uri_host_len = strlen(host); + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_HOST); - return ((coap_packet_t *)packet)->uri_host_len; + coap_pkt->uri_host = host; + coap_pkt->uri_host_len = strlen(host); + + SET_OPTION(coap_pkt, COAP_OPTION_URI_HOST); + return coap_pkt->uri_host_len; } /*-----------------------------------------------------------------------------------*/ int coap_get_header_uri_path(void *packet, const char **path) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_PATH)) return 0; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - *path = ((coap_packet_t *)packet)->uri_path; - return ((coap_packet_t *)packet)->uri_path_len; + if (!IS_OPTION(coap_pkt, COAP_OPTION_URI_PATH)) return 0; + + *path = coap_pkt->uri_path; + return coap_pkt->uri_path_len; } int -coap_set_header_uri_path(void *packet, char *path) +coap_set_header_uri_path(void *packet, const char *path) { + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + while (path[0]=='/') ++path; - ((coap_packet_t *)packet)->uri_path = path; - ((coap_packet_t *)packet)->uri_path_len = strlen(path); + coap_pkt->uri_path = path; + coap_pkt->uri_path_len = strlen(path); - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_PATH); - return ((coap_packet_t *)packet)->uri_path_len; + SET_OPTION(coap_pkt, COAP_OPTION_URI_PATH); + return coap_pkt->uri_path_len; } /*-----------------------------------------------------------------------------------*/ int coap_get_header_uri_query(void *packet, const char **query) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_QUERY)) return 0; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - *query = ((coap_packet_t *)packet)->uri_query; - return ((coap_packet_t *)packet)->uri_query_len; + if (!IS_OPTION(coap_pkt, COAP_OPTION_URI_QUERY)) return 0; + + *query = coap_pkt->uri_query; + return coap_pkt->uri_query_len; } int -coap_set_header_uri_query(void *packet, char *query) +coap_set_header_uri_query(void *packet, const char *query) { + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + while (query[0]=='?') ++query; - ((coap_packet_t *)packet)->uri_query = query; - ((coap_packet_t *)packet)->uri_query_len = strlen(query); + coap_pkt->uri_query = query; + coap_pkt->uri_query_len = strlen(query); - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_URI_QUERY); - return ((coap_packet_t *)packet)->uri_query_len; + SET_OPTION(coap_pkt, COAP_OPTION_URI_QUERY); + return coap_pkt->uri_query_len; } /*-----------------------------------------------------------------------------------*/ int coap_get_header_location_path(void *packet, const char **path) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_PATH)) return 0; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - *path = ((coap_packet_t *)packet)->location_path; - return ((coap_packet_t *)packet)->location_path_len; + if (!IS_OPTION(coap_pkt, COAP_OPTION_LOCATION_PATH)) return 0; + + *path = coap_pkt->location_path; + return coap_pkt->location_path_len; } int -coap_set_header_location_path(void *packet, char *path) +coap_set_header_location_path(void *packet, const char *path) { + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + char *query; while (path[0]=='/') ++path; @@ -962,67 +1043,77 @@ coap_set_header_location_path(void *packet, char *path) if ((query = strchr(path, '?'))) { coap_set_header_location_query(packet, query+1); - ((coap_packet_t *)packet)->location_path_len = query - path; + coap_pkt->location_path_len = query - path; } else { - ((coap_packet_t *)packet)->location_path_len = strlen(path); + coap_pkt->location_path_len = strlen(path); } - ((coap_packet_t *)packet)->location_path = path; + coap_pkt->location_path = path; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_PATH); - return ((coap_packet_t *)packet)->location_path_len; + SET_OPTION(coap_pkt, COAP_OPTION_LOCATION_PATH); + return coap_pkt->location_path_len; } /*-----------------------------------------------------------------------------------*/ int coap_get_header_location_query(void *packet, const char **query) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_QUERY)) return 0; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - *query = ((coap_packet_t *)packet)->location_query; - return ((coap_packet_t *)packet)->location_query_len; + if (!IS_OPTION(coap_pkt, COAP_OPTION_LOCATION_QUERY)) return 0; + + *query = coap_pkt->location_query; + return coap_pkt->location_query_len; } int -coap_set_header_location_query(void *packet, char *query) +coap_set_header_location_query(void *packet, const char *query) { + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + while (query[0]=='?') ++query; - ((coap_packet_t *)packet)->location_query = query; - ((coap_packet_t *)packet)->location_query_len = strlen(query); + coap_pkt->location_query = query; + coap_pkt->location_query_len = strlen(query); - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_LOCATION_QUERY); - return ((coap_packet_t *)packet)->location_query_len; + SET_OPTION(coap_pkt, COAP_OPTION_LOCATION_QUERY); + return coap_pkt->location_query_len; } /*-----------------------------------------------------------------------------------*/ int coap_get_header_observe(void *packet, uint32_t *observe) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_OBSERVE)) return 0; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; - *observe = ((coap_packet_t *)packet)->observe; + if (!IS_OPTION(coap_pkt, COAP_OPTION_OBSERVE)) return 0; + + *observe = coap_pkt->observe; return 1; } int coap_set_header_observe(void *packet, uint32_t observe) { - ((coap_packet_t *)packet)->observe = observe; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_OBSERVE); + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + + coap_pkt->observe = observe; + SET_OPTION(coap_pkt, COAP_OPTION_OBSERVE); return 1; } /*-----------------------------------------------------------------------------------*/ int coap_get_header_block2(void *packet, uint32_t *num, uint8_t *more, uint16_t *size, uint32_t *offset) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_BLOCK2)) return 0; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + + if (!IS_OPTION(coap_pkt, COAP_OPTION_BLOCK2)) return 0; /* pointers may be NULL to get only specific block parameters */ - if (num!=NULL) *num = ((coap_packet_t *)packet)->block2_num; - if (more!=NULL) *more = ((coap_packet_t *)packet)->block2_more; - if (size!=NULL) *size = ((coap_packet_t *)packet)->block2_size; - if (offset!=NULL) *offset = ((coap_packet_t *)packet)->block2_offset; + if (num!=NULL) *num = coap_pkt->block2_num; + if (more!=NULL) *more = coap_pkt->block2_more; + if (size!=NULL) *size = coap_pkt->block2_size; + if (offset!=NULL) *offset = coap_pkt->block2_offset; return 1; } @@ -1030,28 +1121,32 @@ coap_get_header_block2(void *packet, uint32_t *num, uint8_t *more, uint16_t *siz int coap_set_header_block2(void *packet, uint32_t num, uint8_t more, uint16_t size) { + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + if (size<16) return 0; if (size>2048) return 0; if (num>0x0FFFFF) return 0; - ((coap_packet_t *)packet)->block2_num = num; - ((coap_packet_t *)packet)->block2_more = more ? 1 : 0; - ((coap_packet_t *)packet)->block2_size = size; + coap_pkt->block2_num = num; + coap_pkt->block2_more = more ? 1 : 0; + coap_pkt->block2_size = size; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_BLOCK2); + SET_OPTION(coap_pkt, COAP_OPTION_BLOCK2); return 1; } /*-----------------------------------------------------------------------------------*/ int coap_get_header_block1(void *packet, uint32_t *num, uint8_t *more, uint16_t *size, uint32_t *offset) { - if (!IS_OPTION((coap_packet_t *)packet, COAP_OPTION_BLOCK1)) return 0; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + + if (!IS_OPTION(coap_pkt, COAP_OPTION_BLOCK1)) return 0; /* pointers may be NULL to get only specific block parameters */ - if (num!=NULL) *num = ((coap_packet_t *)packet)->block1_num; - if (more!=NULL) *more = ((coap_packet_t *)packet)->block1_more; - if (size!=NULL) *size = ((coap_packet_t *)packet)->block1_size; - if (offset!=NULL) *offset = ((coap_packet_t *)packet)->block1_offset; + if (num!=NULL) *num = coap_pkt->block1_num; + if (more!=NULL) *more = coap_pkt->block1_more; + if (size!=NULL) *size = coap_pkt->block1_size; + if (offset!=NULL) *offset = coap_pkt->block1_offset; return 1; } @@ -1059,26 +1154,30 @@ coap_get_header_block1(void *packet, uint32_t *num, uint8_t *more, uint16_t *siz int coap_set_header_block1(void *packet, uint32_t num, uint8_t more, uint16_t size) { + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + if (size<16) return 0; if (size>2048) return 0; if (num>0x0FFFFF) return 0; - ((coap_packet_t *)packet)->block1_num = num; - ((coap_packet_t *)packet)->block1_more = more; - ((coap_packet_t *)packet)->block1_size = size; + coap_pkt->block1_num = num; + coap_pkt->block1_more = more; + coap_pkt->block1_size = size; - SET_OPTION((coap_packet_t *)packet, COAP_OPTION_BLOCK1); + SET_OPTION(coap_pkt, COAP_OPTION_BLOCK1); return 1; } /*-----------------------------------------------------------------------------------*/ /*- PAYLOAD -------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/ int -coap_get_payload(void *packet, const uint8_t **payload) +coap_get_payload(void *packet, uint8_t **payload) { - if (((coap_packet_t *)packet)->payload) { - *payload = ((coap_packet_t *)packet)->payload; - return ((coap_packet_t *)packet)->payload_len; + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + + if (coap_pkt->payload) { + *payload = coap_pkt->payload; + return coap_pkt->payload_len; } else { *payload = NULL; return 0; @@ -1086,13 +1185,15 @@ coap_get_payload(void *packet, const uint8_t **payload) } int -coap_set_payload(void *packet, uint8_t *payload, size_t length) +coap_set_payload(void *packet, const void *payload, size_t length) { + coap_packet_t *const coap_pkt = (coap_packet_t *) packet; + PRINTF("setting payload (%u/%u)\n", length, REST_MAX_CHUNK_SIZE); - ((coap_packet_t *)packet)->payload = payload; - ((coap_packet_t *)packet)->payload_len = MIN(REST_MAX_CHUNK_SIZE, length); + coap_pkt->payload = (uint8_t *) payload; + coap_pkt->payload_len = MIN(REST_MAX_CHUNK_SIZE, length); - return ((coap_packet_t *)packet)->payload_len; + return coap_pkt->payload_len; } /*-----------------------------------------------------------------------------------*/ diff --git a/apps/er-coap-07/er-coap-07.h b/apps/er-coap-07/er-coap-07.h index 13c83b1e0..2284f0a00 100644 --- a/apps/er-coap-07/er-coap-07.h +++ b/apps/er-coap-07/er-coap-07.h @@ -54,7 +54,7 @@ #define COAP_RESPONSE_RANDOM_FACTOR 1.5 #define COAP_MAX_RETRANSMIT 4 -#define COAP_HEADER_LEN 4 /* | oc:0xF0 type:0x0C version:0x03 | code | tid:0x00FF | tid:0xFF00 | */ +#define COAP_HEADER_LEN 4 /* | oc:0xF0 type:0x0C version:0x03 | code | mid:0x00FF | mid:0xFF00 | */ #define COAP_ETAG_LEN 8 /* The maximum number of bytes for the ETag */ #define COAP_TOKEN_LEN 8 /* The maximum number of bytes for the Token */ #define COAP_MAX_ACCEPT_NUM 2 /* The maximum number of accept preferences to parse/store */ @@ -140,15 +140,13 @@ typedef enum { GATEWAY_TIMEOUT_5_04 = 164, /* GATEWAY_TIMEOUT */ PROXYING_NOT_SUPPORTED_5_05 = 165, /* PROXYING_NOT_SUPPORTED */ - /* Memory errors */ - IMPLEMENTATION_ERROR = 192, - MEMORY_ALLOC_ERR = 193, - MEMORY_BOUNDARY_EXCEEDED = 194, + /* Erbium errors */ + MEMORY_ALLOCATION_ERROR = 192, + PACKET_SERIALIZATION_ERROR, + + /* Erbium hooks */ + MANUAL_RESPONSE - /* CoAP errors */ - UNIMPLEMENTED_CRITICAL_OPTION, - UNKNOWN_CRITICAL_OPTION, - PACKET_SERIALIZATION_ERROR } coap_status_t; /* CoAP header options */ @@ -206,25 +204,25 @@ typedef struct { coap_message_type_t type; uint8_t option_count; uint8_t code; - uint16_t tid; + uint16_t mid; uint32_t options; /* Bitmap to check if option is set */ coap_content_type_t content_type; /* Parse options once and store; allows setting options in random order */ uint32_t max_age; size_t proxy_uri_len; - char *proxy_uri; + const char *proxy_uri; uint8_t etag_len; uint8_t etag[COAP_ETAG_LEN]; size_t uri_host_len; - char *uri_host; + const char *uri_host; size_t location_path_len; - char *location_path; + const char *location_path; uint16_t uri_port; size_t location_query_len; - char *location_query; + const char *location_query; size_t uri_path_len; - char *uri_path; + const char *uri_path; uint16_t observe; uint8_t token_len; uint8_t token[COAP_TOKEN_LEN]; @@ -241,7 +239,7 @@ typedef struct { uint16_t block1_size; uint32_t block1_offset; size_t uri_query_len; - char *uri_query; + const char *uri_query; uint8_t if_none_match; uint16_t payload_len; @@ -255,9 +253,9 @@ extern coap_status_t coap_error_code; extern char *coap_error_message; void coap_init_connection(uint16_t port); -uint16_t coap_get_tid(void); +uint16_t coap_get_mid(void); -void coap_init_message(void *packet, coap_message_type_t type, uint8_t code, uint16_t tid); +void coap_init_message(void *packet, coap_message_type_t type, uint8_t code, uint16_t mid); size_t coap_serialize_message(void *packet, uint8_t *buffer); void coap_send_message(uip_ipaddr_t *addr, uint16_t port, uint8_t *data, uint16_t length); coap_status_t coap_parse_message(void *request, uint8_t *data, uint16_t data_len); @@ -265,44 +263,48 @@ coap_status_t coap_parse_message(void *request, uint8_t *data, uint16_t data_len int coap_get_query_variable(void *packet, const char *name, const char **output); int coap_get_post_variable(void *packet, const char *name, const char **output); +/*-----------------------------------------------------------------------------------*/ + +int coap_set_status_code(void *packet, unsigned int code); + unsigned int coap_get_header_content_type(void *packet); int coap_set_header_content_type(void *packet, unsigned int content_type); -int coap_get_header_accept(void *packet, uint16_t **accept); +int coap_get_header_accept(void *packet, const uint16_t **accept); int coap_set_header_accept(void *packet, uint16_t accept); int coap_get_header_max_age(void *packet, uint32_t *age); int coap_set_header_max_age(void *packet, uint32_t age); int coap_get_header_etag(void *packet, const uint8_t **etag); -int coap_set_header_etag(void *packet, uint8_t *etag, size_t etag_len); +int coap_set_header_etag(void *packet, const uint8_t *etag, size_t etag_len); int coap_get_header_if_match(void *packet, const uint8_t **etag); -int coap_set_header_if_match(void *packet, uint8_t *etag, size_t etag_len); +int coap_set_header_if_match(void *packet, const uint8_t *etag, size_t etag_len); int coap_get_header_if_none_match(void *packet); int coap_set_header_if_none_match(void *packet); int coap_get_header_token(void *packet, const uint8_t **token); -int coap_set_header_token(void *packet, uint8_t *token, size_t token_len); +int coap_set_header_token(void *packet, const uint8_t *token, size_t token_len); int coap_get_header_proxy_uri(void *packet, const char **uri); /* In-place string might not be 0-terminated. */ -int coap_set_header_proxy_uri(void *packet, char *uri); +int coap_set_header_proxy_uri(void *packet, const char *uri); int coap_get_header_uri_host(void *packet, const char **host); /* In-place string might not be 0-terminated. */ -int coap_set_header_uri_host(void *packet, char *host); +int coap_set_header_uri_host(void *packet, const char *host); int coap_get_header_uri_path(void *packet, const char **path); /* In-place string might not be 0-terminated. */ -int coap_set_header_uri_path(void *packet, char *path); +int coap_set_header_uri_path(void *packet, const char *path); int coap_get_header_uri_query(void *packet, const char **query); /* In-place string might not be 0-terminated. */ -int coap_set_header_uri_query(void *packet, char *query); +int coap_set_header_uri_query(void *packet, const char *query); int coap_get_header_location_path(void *packet, const char **path); /* In-place string might not be 0-terminated. */ -int coap_set_header_location_path(void *packet, char *path); /* Also splits optional query into Location-Query option. */ +int coap_set_header_location_path(void *packet, const char *path); /* Also splits optional query into Location-Query option. */ int coap_get_header_location_query(void *packet, const char **query); /* In-place string might not be 0-terminated. */ -int coap_set_header_location_query(void *packet, char *query); +int coap_set_header_location_query(void *packet, const char *query); int coap_get_header_observe(void *packet, uint32_t *observe); int coap_set_header_observe(void *packet, uint32_t observe); @@ -313,7 +315,7 @@ int coap_set_header_block2(void *packet, uint32_t num, uint8_t more, uint16_t si int coap_get_header_block1(void *packet, uint32_t *num, uint8_t *more, uint16_t *size, uint32_t *offset); int coap_set_header_block1(void *packet, uint32_t num, uint8_t more, uint16_t size); -int coap_get_payload(void *packet, const uint8_t **payload); -int coap_set_payload(void *packet, uint8_t *payload, size_t length); +int coap_get_payload(void *packet, uint8_t **payload); +int coap_set_payload(void *packet, const void *payload, size_t length); #endif /* COAP_07_H_ */ diff --git a/apps/erbium/erbium.c b/apps/erbium/erbium.c index 165a9c252..f624dd594 100644 --- a/apps/erbium/erbium.c +++ b/apps/erbium/erbium.c @@ -59,35 +59,8 @@ LIST(restful_services); LIST(restful_periodic_services); -#ifdef WITH_HTTP - -char * -rest_to_http_max_age(uint32_t age) -{ - /* Cache-Control: max-age=age for HTTP */ - static char temp_age[19]; - snprintf(temp_age, sizeof(temp_age), "max-age=%lu", age); - return temp_age; -} - -char * -rest_to_http_etag(uint8_t *etag, uint8_t etag_len) -{ - static char temp_etag[17]; - int index = 0; - - for (index = 0; index

This page has been sent %u times (%1u.%u sec)"; + static const char httpd_cgi_filestat1[] HTTPD_STRING_ATTR = "



This page has been sent %u times (%1u.%02u sec)"; #else static const char httpd_cgi_filestat1[] HTTPD_STRING_ATTR = "



This page has been sent %u times"; #endif @@ -301,7 +301,7 @@ generate_file_stats(void *arg) #if WEBSERVER_CONF_LOADTIME s->pagetime = clock_time() - s->pagetime; numprinted=httpd_snprintf((char *)uip_appdata, uip_mss(), httpd_cgi_filestat1, httpd_fs_open(s->filename, 0), - (unsigned int)s->pagetime/CLOCK_SECOND,(unsigned int)s->pagetime%CLOCK_SECOND); + (unsigned int)s->pagetime/CLOCK_SECOND,(100*((unsigned int)s->pagetime%CLOCK_SECOND))/CLOCK_SECOND); #else numprinted=httpd_snprintf((char *)uip_appdata, uip_mss(), httpd_cgi_filestat1, httpd_fs_open(s->filename, 0)); #endif @@ -433,10 +433,12 @@ PT_THREAD(processes(struct httpd_state *s, char *ptr)) #endif /* WEBSERVER_CONF_PROCESSES */ #if WEBSERVER_CONF_ADDRESSES || WEBSERVER_CONF_NEIGHBORS || WEBSERVER_CONF_ROUTES -static const char httpd_cgi_addrh[] HTTPD_STRING_ATTR = ""; -static const char httpd_cgi_addrf[] HTTPD_STRING_ATTR = "[Room for %u more]"; -static const char httpd_cgi_addrb[] HTTPD_STRING_ATTR = "
"; -static const char httpd_cgi_addrn[] HTTPD_STRING_ATTR = "(none)
"; +#if WEBSERVER_CONF_SHOW_ROOM +static const char httpd_cgi_addrf[] HTTPD_STRING_ATTR = "[Room for %u more]\n"; +#else +static const char httpd_cgi_addrf[] HTTPD_STRING_ATTR = "[Table is full]\n"; +#endif +static const char httpd_cgi_addrn[] HTTPD_STRING_ATTR = "[None]\n"; #endif #if WEBSERVER_CONF_ADDRESSES @@ -447,16 +449,21 @@ static unsigned short make_addresses(void *p) { uint8_t i,j=0; -uint16_t numprinted; - numprinted = httpd_snprintf((char *)uip_appdata, uip_mss(),httpd_cgi_addrh); +uint16_t numprinted = 0; for (i=0; istarti;j=s->startj; + for (;i (uip_mss() - 50)) { + s->savei=i;s->savej=j; + return numprinted; + } } } - numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf,UIP_DS6_NBR_NB-j); +#if WEBSERVER_CONF_SHOW_ROOM + numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf,UIP_DS6_NBR_NB-j); +#else + if(UIP_DS6_NBR_NB == j) { + numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf); + } +#endif + + /* Signal that this was the last segment */ + s->savei = 0; return numprinted; } /*---------------------------------------------------------------------------*/ @@ -496,7 +541,13 @@ PT_THREAD(neighbors(struct httpd_state *s, char *ptr)) { PSOCK_BEGIN(&s->sout); - PSOCK_GENERATOR_SEND(&s->sout, make_neighbors, s->u.ptr); + /* Send as many TCP segments as needed for the neighbor table */ + /* Move to next seqment after each successful transmission */ + s->starti=s->startj=0; + do { + PSOCK_GENERATOR_SEND(&s->sout, make_neighbors, (void *)s); + s->starti=s->savei+1;s->startj=s->savej; + } while(s->savei); PSOCK_END(&s->sout); } @@ -508,27 +559,57 @@ extern uip_ds6_route_t uip_ds6_routing_table[]; static unsigned short make_routes(void *p) { -static const char httpd_cgi_rtes1[] HTTPD_STRING_ATTR = "(%u (via "; -static const char httpd_cgi_rtes2[] HTTPD_STRING_ATTR = ") %lus
"; -static const char httpd_cgi_rtes3[] HTTPD_STRING_ATTR = ")
"; -uint8_t i,j=0; -uint16_t numprinted; - numprinted = httpd_snprintf((char *)uip_appdata, uip_mss(),httpd_cgi_addrh); - for (i=0; istarti;j=s->startj; + for (;i (uip_mss() - 200)) { + s->savei=i;s->savej=j; + return numprinted; + } } } if (j==0) numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrn); - numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf,UIP_DS6_ROUTE_NB-j); +#if WEBSERVER_CONF_SHOW_ROOM + numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf,UIP_DS6_ROUTE_NB-j); +#else + if(UIP_DS6_ROUTE_NB == j) { + numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrf); + } +#endif + + /* Signal that this was the last segment */ + s->savei = 0; return numprinted; } /*---------------------------------------------------------------------------*/ @@ -536,8 +617,14 @@ static PT_THREAD(routes(struct httpd_state *s, char *ptr)) { PSOCK_BEGIN(&s->sout); - - PSOCK_GENERATOR_SEND(&s->sout, make_routes, s->u.ptr); + + /* Send as many TCP segments as needed for the route table */ + /* Move to next seqment after each successful transmission */ + s->starti=s->startj=0; + do { + PSOCK_GENERATOR_SEND(&s->sout, make_routes, s); + s->starti=s->savei+1;s->startj=s->savej; + } while(s->savei); PSOCK_END(&s->sout); } @@ -548,18 +635,15 @@ PT_THREAD(routes(struct httpd_state *s, char *ptr)) static unsigned short generate_sensor_readings(void *arg) { - uint16_t numprinted; + uint16_t numprinted=0; uint16_t days,h,m,s; unsigned long seconds=clock_seconds(); - static const char httpd_cgi_sensor0[] HTTPD_STRING_ATTR = "[Updated %d seconds ago]

"; - static const char httpd_cgi_sensor1[] HTTPD_STRING_ATTR = "

Temperature: %s\n";
+  static const char httpd_cgi_sensor0[] HTTPD_STRING_ATTR = "[Updated %d seconds ago]\n";
+  static const char httpd_cgi_sensor1[] HTTPD_STRING_ATTR = "Temperature: %s\n";
   static const char httpd_cgi_sensor2[] HTTPD_STRING_ATTR = "Battery    : %s\n";
-//  static const char httpd_cgi_sensr12[] HTTPD_STRING_ATTR = "Temperature: %s   Battery: %s
";
   static const char httpd_cgi_sensor3[] HTTPD_STRING_ATTR = "Uptime     : %02d:%02d:%02d\n";
   static const char httpd_cgi_sensor3d[] HTTPD_STRING_ATTR = "Uptime    : %u days %02u:%02u:%02u\n";
-// static const char httpd_cgi_sensor4[] HTTPD_STRING_ATTR = "Sleeping time : %02d:%02d:%02d (%d%%)
";
 
-  numprinted=0;
   /* Generate temperature and voltage strings for each platform */
 #if CONTIKI_TARGET_AVR_ATMEGA128RFA1  
 {uint8_t i;
@@ -623,29 +707,36 @@ generate_sensor_readings(void *arg)
 #elif CONTIKI_TARGET_REDBEE_ECONOTAG
 //#include "adc.h"
 {
+#if 0
+/* Scan ADC channels if not already being done elsewhere */
 uint8_t c;
-		adc_reading[8]=0;
-		adc_init();
-		while (adc_reading[8]==0) adc_service();
-	//	for (c=0; csout);
 
   PSOCK_GENERATOR_SEND(&s->sout, generate_sensor_readings, s);
-#if RADIOSTATS
-  PSOCK_GENERATOR_SEND(&s->sout, generate_radio_stats, s);
+#if WEBSERVER_CONF_STATISTICS
+  PSOCK_GENERATOR_SEND(&s->sout, generate_stats, s);
 #endif
  
   PSOCK_END(&s->sout);
@@ -971,15 +1055,40 @@ PT_THREAD(ajax_call(struct httpd_state *s, char *ptr))
   SENSORS_DEACTIVATE(acc_sensor);
 
 #elif CONTIKI_TARGET_REDBEE_ECONOTAG
-{	uint8_t c;
-	adc_reading[8]=0;
-	adc_init();
-	while (adc_reading[8]==0) adc_service();
-    adc_disable();
-    numprinted = snprintf(buf, sizeof(buf),"b(%u);adc(%u,%u,%u,%u,%u,%u,%u,%u);",
-        1200*0xfff/adc_reading[8],adc_reading[0],adc_reading[1],adc_reading[2],adc_reading[3],adc_reading[4],adc_reading[5],adc_reading[6],adc_reading[7]);
+#if 0
+/* Scan ADC channels if not already done elsewhere */
+{ uint8_t c;
+  adc_reading[8]=0;
+  adc_init();
+  while (adc_reading[8]==0) adc_service();
+  adc_disable();
+#endif
+
+#if 0
+   numprinted = snprintf(buf, sizeof(buf),"b(%u);adc(%u,%u,%u,%u,%u,%u,%u,%u);",
+      1200*0xfff/adc_reading[8],adc_reading[0],adc_reading[1],adc_reading[2],adc_reading[3],adc_reading[4],adc_reading[5],adc_reading[6],adc_reading[7]);
+#else
+ //    numprinted = snprintf(buf, sizeof(buf),"b(%u);",1200*0xfff/adc_reading[8]);
+        numprinted = snprintf(buf, sizeof(buf),"b(%u);adc(%u,%u,%u);",1200*0xfff/adc_reading[8],adc_reading[1],adc_reading[7],adc_reading[8]);
+#endif
 }
-		
+   if (iter<3) {
+    static const char httpd_cgi_ajax11[] HTTPD_STRING_ATTR = "wt('Econtag [";
+   static const char httpd_cgi_ajax12[] HTTPD_STRING_ATTR = "]');";
+    numprinted += httpd_snprintf(buf+numprinted, sizeof(buf)-numprinted,httpd_cgi_ajax11);
+#if WEBSERVER_CONF_PRINTADDR
+/* Note address table is filled from the end down */
+{int i;
+    for (i=0; i (RPL_LOLLIPOP_CIRCULAR_REGION + 1-
 			 RPL_LOLLIPOP_SEQUENCE_WINDOWS));
 }
-
 /************************************************************************/
 /* Remove DAG parents with a rank that is at least the same as minimum_rank. */
 static void
@@ -225,15 +210,15 @@ rpl_set_root(uint8_t instance_id, uip_ipaddr_t *dag_id)
 
   memcpy(&dag->dag_id, dag_id, sizeof(dag->dag_id));
 
-  instance->dio_intdoubl = DEFAULT_DIO_INTERVAL_DOUBLINGS;
-  instance->dio_intmin = DEFAULT_DIO_INTERVAL_MIN;
+  instance->dio_intdoubl = RPL_DIO_INTERVAL_DOUBLINGS;
+  instance->dio_intmin = RPL_DIO_INTERVAL_MIN;
   /* The current interval must differ from the minimum interval in order to
      trigger a DIO timer reset. */
-  instance->dio_intcurrent = DEFAULT_DIO_INTERVAL_MIN +
-    DEFAULT_DIO_INTERVAL_DOUBLINGS;
-  instance->dio_redundancy = DEFAULT_DIO_REDUNDANCY;
-  instance->max_rankinc = DEFAULT_MAX_RANKINC;
-  instance->min_hoprankinc = DEFAULT_MIN_HOPRANKINC;
+  instance->dio_intcurrent = RPL_DIO_INTERVAL_MIN +
+    RPL_DIO_INTERVAL_DOUBLINGS;
+  instance->dio_redundancy = RPL_DIO_REDUNDANCY;
+  instance->max_rankinc = RPL_MAX_RANKINC;
+  instance->min_hoprankinc = RPL_MIN_HOPRANKINC;
   instance->default_lifetime = RPL_DEFAULT_LIFETIME;
   instance->lifetime_unit = RPL_DEFAULT_LIFETIME_UNIT;
 
@@ -409,7 +394,7 @@ rpl_alloc_dodag(uint8_t instance_id, uip_ipaddr_t *dag_id)
     return dag;
   }
 
-  for(dag = &instance->dag_table[0], end = dag + RPL_MAX_DODAG_PER_INSTANCE; dag < end; ++dag) {
+  for(dag = &instance->dag_table[0], end = dag + RPL_MAX_DAG_PER_INSTANCE; dag < end; ++dag) {
     if(!dag->used) {
       memset(dag, 0, sizeof(*dag));
       dag->parents = &dag->parent_list;
@@ -438,8 +423,8 @@ rpl_free_instance(rpl_instance_t *instance)
 
   PRINTF("RPL: Leaving the instance %u\n", instance->instance_id);
 
-  /* Remove any DODAG inside this instance */
-  for(dag = &instance->dag_table[0], end = dag + RPL_MAX_DODAG_PER_INSTANCE; dag < end; ++dag) {
+  /* Remove any DAG inside this instance */
+  for(dag = &instance->dag_table[0], end = dag + RPL_MAX_DAG_PER_INSTANCE; dag < end; ++dag) {
     if(dag->used) {
       rpl_free_dodag(dag);
     }
@@ -519,7 +504,7 @@ find_parent_dag(rpl_instance_t *instance, uip_ipaddr_t *addr)
   rpl_parent_t *p;
   rpl_dag_t *dag, *end;
 
-  for(dag = &instance->dag_table[0], end = dag + RPL_MAX_DODAG_PER_INSTANCE; dag < end; ++dag) {
+  for(dag = &instance->dag_table[0], end = dag + RPL_MAX_DAG_PER_INSTANCE; dag < end; ++dag) {
     if(dag->used) {
       for(p = list_head(dag->parents); p != NULL; p = p->next) {
         if(uip_ipaddr_cmp(&p->addr, addr)) {
@@ -537,7 +522,7 @@ rpl_find_parent_any_dag(rpl_instance_t *instance, uip_ipaddr_t *addr)
   rpl_parent_t *p;
   rpl_dag_t *dag, *end;
 
-  for(dag = &instance->dag_table[0], end = dag + RPL_MAX_DODAG_PER_INSTANCE; dag < end; ++dag) {
+  for(dag = &instance->dag_table[0], end = dag + RPL_MAX_DAG_PER_INSTANCE; dag < end; ++dag) {
     if(dag->used) {
       for(p = list_head(dag->parents); p != NULL; p = p->next) {
         if(uip_ipaddr_cmp(&p->addr, addr)) {
@@ -567,7 +552,7 @@ rpl_select_dodag(rpl_instance_t *instance, rpl_parent_t *p)
       }
     } else if(p->dag == best_dag) {
       best_dag = NULL;
-      for(dag = &instance->dag_table[0], end = dag + RPL_MAX_DODAG_PER_INSTANCE; dag < end; ++dag) {
+      for(dag = &instance->dag_table[0], end = dag + RPL_MAX_DAG_PER_INSTANCE; dag < end; ++dag) {
         if(dag->used && dag->preferred_parent != NULL && dag->preferred_parent->rank != INFINITE_RANK) {
           if(best_dag == NULL) {
             best_dag = dag;
@@ -588,7 +573,7 @@ rpl_select_dodag(rpl_instance_t *instance, rpl_parent_t *p)
     /* Remove routes installed by DAOs. */
     rpl_remove_routes(instance->current_dag);
 
-    PRINTF("RPL: New preferred DODAG: ");
+    PRINTF("RPL: New preferred DAG: ");
     PRINT6ADDR(&best_dag->dag_id);
     PRINTF("\n");
 
@@ -613,7 +598,7 @@ rpl_select_dodag(rpl_instance_t *instance, rpl_parent_t *p)
     instance->current_dag->preferred_parent = NULL;
     if(instance->mop != RPL_MOP_NO_DOWNWARD_ROUTES && last_parent != NULL) {
       /* Send a No-Path DAO to the removed preferred parent. */
-      dao_output(last_parent, ZERO_LIFETIME);
+      dao_output(last_parent, RPL_ZERO_LIFETIME);
     }
     return NULL;
   }
@@ -626,7 +611,7 @@ rpl_select_dodag(rpl_instance_t *instance, rpl_parent_t *p)
     if(instance->mop != RPL_MOP_NO_DOWNWARD_ROUTES) {
       if(last_parent != NULL) {
         /* Send a No-Path DAO to the removed preferred parent. */
-        dao_output(last_parent, ZERO_LIFETIME);
+        dao_output(last_parent, RPL_ZERO_LIFETIME);
       }
       /* The DAO parent set changed - schedule a DAO transmission. */
       RPL_LOLLIPOP_INCREMENT(instance->dtsn_out);
@@ -692,7 +677,7 @@ rpl_nullify_parent(rpl_dag_t *dag, rpl_parent_t *parent)
         }
         dag->instance->def_route = NULL;
       }
-      dao_output(parent, ZERO_LIFETIME);
+      dao_output(parent, RPL_ZERO_LIFETIME);
     }
   }
 
@@ -768,7 +753,7 @@ rpl_get_dodag(uint8_t instance_id, uip_ipaddr_t *dag_id)
     return NULL;
   }
 
-  for(i = 0; i < RPL_MAX_DODAG_PER_INSTANCE; ++i) {
+  for(i = 0; i < RPL_MAX_DAG_PER_INSTANCE; ++i) {
     dag = &instance->dag_table[i];
     if(dag->used && uip_ipaddr_cmp(&dag->dag_id, dag_id)) {
       return dag;
@@ -1003,7 +988,7 @@ rpl_local_repair(rpl_instance_t *instance)
   int i;
 
   PRINTF("RPL: Starting a local instance repair\n");
-  for(i = 0; i < RPL_MAX_DODAG_PER_INSTANCE; i++) {
+  for(i = 0; i < RPL_MAX_DAG_PER_INSTANCE; i++) {
     if(instance->dag_table[i].used) {
       instance->dag_table[i].rank = INFINITE_RANK;
       nullify_parents(&instance->dag_table[i], 0);
@@ -1029,7 +1014,7 @@ rpl_recalculate_ranks(void)
    */
   for(instance = &instance_table[0], end = instance + RPL_MAX_INSTANCES; instance < end; ++instance) {
     if(instance->used) {
-      for(i = 0; i < RPL_MAX_DODAG_PER_INSTANCE; i++) {
+      for(i = 0; i < RPL_MAX_DAG_PER_INSTANCE; i++) {
         if(instance->dag_table[i].used) {
           for(p = list_head(instance->dag_table[i].parents); p != NULL; p = p->next) {
             if(p->updated) {
@@ -1190,7 +1175,7 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
   if(p == NULL) {
     previous_dag = find_parent_dag(instance, from);
     if(previous_dag == NULL) {
-      if(RPL_PARENT_COUNT(dag) == RPL_MAX_PARENTS_PER_DODAG) {
+      if(RPL_PARENT_COUNT(dag) == RPL_MAX_PARENTS_PER_DAG) {
         /* Make room for a new parent. */
         remove_worst_parent(dag, dio->rank);
       }
@@ -1222,7 +1207,7 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
     }
   }
 
-  PRINTF("RPL: preferred DODAG ");
+  PRINTF("RPL: preferred DAG ");
   PRINT6ADDR(&instance->current_dag->dag_id);
   PRINTF(", rank %u, min_rank %u, ",
 	 instance->current_dag->rank, instance->current_dag->min_rank);
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index efc9ee7fa..114b673e4 100755
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -92,6 +92,8 @@ void RPL_DEBUG_DIO_INPUT(uip_ipaddr_t *, rpl_dio_t *);
 void RPL_DEBUG_DAO_OUTPUT(rpl_parent_t *);
 #endif
 
+extern rpl_of_t RPL_OF;
+
 /*---------------------------------------------------------------------------*/
 static int
 get_global_addr(uip_ipaddr_t *addr)
@@ -209,9 +211,15 @@ dio_input(void)
 
   memset(&dio, 0, sizeof(dio));
 
-  dio.dag_intdoubl = DEFAULT_DIO_INTERVAL_DOUBLINGS;
-  dio.dag_intmin = DEFAULT_DIO_INTERVAL_MIN;
-  dio.dag_redund = DEFAULT_DIO_REDUNDANCY;
+  /* Set default values in case the DIO configuration option is missing. */
+  dio.dag_intdoubl = RPL_DIO_INTERVAL_DOUBLINGS;
+  dio.dag_intmin = RPL_DIO_INTERVAL_MIN;
+  dio.dag_redund = RPL_DIO_REDUNDANCY;
+  dio.dag_min_hoprankinc = RPL_MIN_HOPRANKINC;
+  dio.dag_max_rankinc = RPL_MAX_RANKINC;
+  dio.ocp = RPL_OF.ocp;
+  dio.default_lifetime = RPL_DEFAULT_LIFETIME;
+  dio.lifetime_unit = RPL_DEFAULT_LIFETIME_UNIT;
 
   uip_ipaddr_copy(&from, &UIP_IP_BUF->srcipaddr);
 
@@ -251,8 +259,10 @@ dio_input(void)
   dio.rank = get16(buffer, i);
   i += 2;
 
-  PRINTF("RPL: Incoming DIO InstanceID-Version %u-%u\n", (unsigned)dio.instance_id,(unsigned)dio.version);
-  PRINTF("RPL: Incoming DIO rank %u\n", (unsigned)dio.rank);
+  PRINTF("RPL: Incoming DIO (id, ver, rank) = (%u,%u,%u)\n",
+         (unsigned)dio.instance_id,
+         (unsigned)dio.version, 
+         (unsigned)dio.rank);
 
   dio.grounded = buffer[i] & RPL_DIO_GROUNDED;
   dio.mop = (buffer[i]& RPL_DIO_MOP_MASK) >> RPL_DIO_MOP_SHIFT;
@@ -265,9 +275,9 @@ dio_input(void)
   memcpy(&dio.dag_id, buffer + i, sizeof(dio.dag_id));
   i += sizeof(dio.dag_id);
 
-  PRINTF("RPL: Incoming DIO DODAG ");
+  PRINTF("RPL: Incoming DIO (dag_id, pref) = (");
   PRINT6ADDR(&dio.dag_id);
-  PRINTF(", preference: %u\n", dio.preference);
+  PRINTF(", %u)\n", dio.preference);
 
   /* Check if there are any DIO suboptions. */
   for(; i < buffer_length; i += len) {
@@ -326,7 +336,7 @@ dio_input(void)
         return;
       }
 
-      /* flags is both preference and flags for now */
+      /* The flags field includes the preference value. */
       dio.destination_prefix.length = buffer[i + 2];
       dio.destination_prefix.flags = buffer[i + 3];
       dio.destination_prefix.lifetime = get32(buffer, i + 4);
@@ -337,7 +347,7 @@ dio_input(void)
         memcpy(&dio.destination_prefix.prefix, &buffer[i + 8],
                (dio.destination_prefix.length + 7) / 8);
       } else {
-        PRINTF("RPL: Invalid route infoprefix option, len = %d\n", len);
+        PRINTF("RPL: Invalid route info option, len = %d\n", len);
 	RPL_STAT(rpl_stats.malformed_msgs++);
 	return;
       }
@@ -360,14 +370,14 @@ dio_input(void)
       /* buffer + 12 is reserved */
       dio.default_lifetime = buffer[i + 13];
       dio.lifetime_unit = get16(buffer, i + 14);
-      PRINTF("RPL: DIO Conf:dbl=%d, min=%d red=%d maxinc=%d mininc=%d ocp=%d d_l=%u l_u=%u\n",
+      PRINTF("RPL: DAG conf:dbl=%d, min=%d red=%d maxinc=%d mininc=%d ocp=%d d_l=%u l_u=%u\n",
              dio.dag_intdoubl, dio.dag_intmin, dio.dag_redund,
              dio.dag_max_rankinc, dio.dag_min_hoprankinc, dio.ocp,
              dio.default_lifetime, dio.lifetime_unit);
       break;
     case RPL_OPTION_PREFIX_INFO:
       if(len != 32) {
-        PRINTF("RPL: DAG Prefix info not ok, len != 32\n");
+        PRINTF("RPL: DAG prefix info not ok, len != 32\n");
 	RPL_STAT(rpl_stats.malformed_msgs++);
         return;
       }
@@ -398,6 +408,7 @@ dio_output(rpl_instance_t *instance, uip_ipaddr_t *uc_addr)
 {
   unsigned char *buffer;
   int pos;
+  rpl_dag_t *dag = instance->current_dag;
 #if !RPL_LEAF_ONLY
   uip_ipaddr_t addr;
 #endif /* !RPL_LEAF_ONLY */
@@ -409,8 +420,6 @@ dio_output(rpl_instance_t *instance, uip_ipaddr_t *uc_addr)
   }
 #endif /* RPL_LEAF_ONLY */
 
-  rpl_dag_t *dag = instance->current_dag;
-
   /* DAG Information Object */
   pos = 0;
 
@@ -436,9 +445,8 @@ dio_output(rpl_instance_t *instance, uip_ipaddr_t *uc_addr)
 
   buffer[pos++] = instance->dtsn_out;
 
-  if(RPL_LOLLIPOP_IS_INIT(instance->dtsn_out)) {
-    RPL_LOLLIPOP_INCREMENT(instance->dtsn_out);
-  }
+  /* always request new DAO to refresh route */
+  RPL_LOLLIPOP_INCREMENT(instance->dtsn_out);
 
   /* reserved 2 bytes */
   buffer[pos++] = 0; /* flags */
@@ -597,7 +605,7 @@ dao_input(void)
   /* Is the DAGID present? */
   if(flags & RPL_DAO_D_FLAG) {
     if(memcmp(&dag->dag_id, &buffer[pos], sizeof(dag->dag_id))) {
-      PRINTF("RPL: Ignoring a DAO for a DODAG different from ours\n");
+      PRINTF("RPL: Ignoring a DAO for a DAG different from ours\n");
       return;
     }
     pos += 16;
@@ -640,7 +648,7 @@ dao_input(void)
 
   rep = uip_ds6_route_lookup(&prefix);
 
-  if(lifetime == ZERO_LIFETIME) {
+  if(lifetime == RPL_ZERO_LIFETIME) {
     /* No-Path DAO received; invoke the route purging routine. */
     if(rep != NULL && rep->state.saved_lifetime == 0 && rep->length == prefixlen) {
       PRINTF("RPL: Setting expiration timer for prefix ");
@@ -733,19 +741,19 @@ dao_output(rpl_parent_t *n, uint8_t lifetime)
 
   buffer[pos++] = instance->instance_id;
   buffer[pos] = 0;
-#if RPL_DAO_SPECIFY_DODAG
+#if RPL_DAO_SPECIFY_DAG
   buffer[pos] |= RPL_DAO_D_FLAG;
-#endif /* RPL_DAO_SPECIFY_DODAG */
+#endif /* RPL_DAO_SPECIFY_DAG */
 #if RPL_CONF_DAO_ACK
   buffer[pos] |= RPL_DAO_K_FLAG;
 #endif /* RPL_CONF_DAO_ACK */
   ++pos;
   buffer[pos++] = 0; /* reserved */
   buffer[pos++] = dao_sequence;
-#if RPL_DAO_SPECIFY_DODAG
+#if RPL_DAO_SPECIFY_DAG
   memcpy(buffer + pos, &dag->dag_id, sizeof(dag->dag_id));
   pos+=sizeof(dag->dag_id);
-#endif /* RPL_DAO_SPECIFY_DODAG */
+#endif /* RPL_DAO_SPECIFY_DAG */
 
   /* create target subopt */
   prefixlen = sizeof(prefix) * CHAR_BIT;
diff --git a/core/net/rpl/rpl-of-etx.c b/core/net/rpl/rpl-of-etx.c
index 05a521c83..a7c0e4429 100644
--- a/core/net/rpl/rpl-of-etx.c
+++ b/core/net/rpl/rpl-of-etx.c
@@ -112,7 +112,7 @@ calculate_rank(rpl_parent_t *p, rpl_rank_t base_rank)
     if(base_rank == 0) {
       return INFINITE_RANK;
     }
-    rank_increase = NEIGHBOR_INFO_FIX2ETX(INITIAL_LINK_METRIC) * DEFAULT_MIN_HOPRANKINC;
+    rank_increase = NEIGHBOR_INFO_FIX2ETX(INITIAL_LINK_METRIC) * RPL_MIN_HOPRANKINC;
   } else {
     /* multiply first, then scale down to avoid truncation effects */
     rank_increase = NEIGHBOR_INFO_FIX2ETX(p->link_metric * p->dag->instance->min_hoprankinc);
diff --git a/core/net/rpl/rpl-of0.c b/core/net/rpl/rpl-of0.c
index 19ea4277c..49f3c99d0 100644
--- a/core/net/rpl/rpl-of0.c
+++ b/core/net/rpl/rpl-of0.c
@@ -50,7 +50,7 @@ static void reset(rpl_dag_t *);
 static rpl_parent_t *best_parent(rpl_parent_t *, rpl_parent_t *);
 static rpl_dag_t *best_dag(rpl_dag_t *, rpl_dag_t *);
 static rpl_rank_t calculate_rank(rpl_parent_t *, rpl_rank_t);
-static void update_metric_container(rpl_dag_t *);
+static void update_metric_container(rpl_instance_t *);
 
 rpl_of_t rpl_of0 = {
   reset,
@@ -62,7 +62,7 @@ rpl_of_t rpl_of0 = {
   0
 };
 
-#define DEFAULT_RANK_INCREMENT  DEFAULT_MIN_HOPRANKINC
+#define DEFAULT_RANK_INCREMENT  RPL_MIN_HOPRANKINC
 
 #define MIN_DIFFERENCE (NEIGHBOR_INFO_ETX_DIVISOR + NEIGHBOR_INFO_ETX_DIVISOR / 2)
 
@@ -83,7 +83,9 @@ calculate_rank(rpl_parent_t *p, rpl_rank_t base_rank)
     base_rank = p->rank;
   }
 
-  increment = p != NULL ? p->dag->min_hoprankinc : DEFAULT_RANK_INCREMENT;
+  increment = p != NULL ?
+                p->dag->instance->min_hoprankinc :
+                DEFAULT_RANK_INCREMENT;
 
   if((rpl_rank_t)(base_rank + increment) < base_rank) {
     PRINTF("RPL: OF0 rank %d incremented to infinite rank due to wrapping\n",
@@ -135,10 +137,10 @@ best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
         p2->link_metric, p2->rank);
 
 
-  r1 = DAG_RANK(p1->rank, (rpl_dag_t *)p1->dag) * NEIGHBOR_INFO_ETX_DIVISOR +
-    p1->link_metric;
-  r2 = DAG_RANK(p2->rank, (rpl_dag_t *)p1->dag) * NEIGHBOR_INFO_ETX_DIVISOR +
-    p2->link_metric;
+  r1 = DAG_RANK(p1->rank, p1->dag->instance) * NEIGHBOR_INFO_ETX_DIVISOR +
+         p1->link_metric;
+  r2 = DAG_RANK(p2->rank, p1->dag->instance) * NEIGHBOR_INFO_ETX_DIVISOR +
+         p2->link_metric;
   /* Compare two parents by looking both and their rank and at the ETX
      for that parent. We choose the parent that has the most
      favourable combination. */
diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h
index 94eaec0d8..f48d31afd 100644
--- a/core/net/rpl/rpl-private.h
+++ b/core/net/rpl/rpl-private.h
@@ -110,10 +110,10 @@
 /* Default values for RPL constants and variables. */
 
 /* The default value for the DAO timer. */
-#define DEFAULT_DAO_LATENCY             (CLOCK_SECOND * 8)
+#define RPL_DAO_LATENCY                 (CLOCK_SECOND * 4)
 
 /* Special value indicating immediate removal. */
-#define ZERO_LIFETIME                   0
+#define RPL_ZERO_LIFETIME               0
 
 /* Default route lifetime unit. */
 #define RPL_DEFAULT_LIFETIME_UNIT       0xffff
@@ -125,13 +125,14 @@
           ((unsigned long)(instance)->lifetime_unit * (lifetime))
 
 #ifndef RPL_CONF_MIN_HOPRANKINC
-#define DEFAULT_MIN_HOPRANKINC          256
+#define RPL_MIN_HOPRANKINC          256
 #else
-#define DEFAULT_MIN_HOPRANKINC          RPL_CONF_MIN_HOPRANKINC
+#define RPL_MIN_HOPRANKINC          RPL_CONF_MIN_HOPRANKINC
 #endif
-#define DEFAULT_MAX_RANKINC             (7 * DEFAULT_MIN_HOPRANKINC)
+#define RPL_MAX_RANKINC             (7 * RPL_MIN_HOPRANKINC)
 
-#define DAG_RANK(fixpt_rank, instance)	((fixpt_rank) / (instance)->min_hoprankinc)
+#define DAG_RANK(fixpt_rank, instance) \
+  ((fixpt_rank) / (instance)->min_hoprankinc)
 
 /* Rank of a virtual root node that coordinates DAG root nodes. */
 #define BASE_RANK                       0
@@ -148,23 +149,23 @@
    means 8 milliseconds, but that is an unreasonable value if
    using power-saving / duty-cycling    */
 #ifdef RPL_CONF_DIO_INTERVAL_MIN
-#define DEFAULT_DIO_INTERVAL_MIN        RPL_CONF_DIO_INTERVAL_MIN
+#define RPL_DIO_INTERVAL_MIN        RPL_CONF_DIO_INTERVAL_MIN
 #else
-#define DEFAULT_DIO_INTERVAL_MIN        12
+#define RPL_DIO_INTERVAL_MIN        12
 #endif
 
 /* Maximum amount of timer doublings. */
 #ifdef RPL_CONF_DIO_INTERVAL_DOUBLINGS
-#define DEFAULT_DIO_INTERVAL_DOUBLINGS  RPL_CONF_DIO_INTERVAL_DOUBLINGS
+#define RPL_DIO_INTERVAL_DOUBLINGS  RPL_CONF_DIO_INTERVAL_DOUBLINGS
 #else
-#define DEFAULT_DIO_INTERVAL_DOUBLINGS  8
+#define RPL_DIO_INTERVAL_DOUBLINGS  8
 #endif
 
 /* Default DIO redundancy. */
 #ifdef RPL_CONF_DIO_REDUNDANCY
-#define DEFAULT_DIO_REDUNDANCY          RPL_CONF_DIO_REDUNDANCY
+#define RPL_DIO_REDUNDANCY          RPL_CONF_DIO_REDUNDANCY
 #else
-#define DEFAULT_DIO_REDUNDANCY          10
+#define RPL_DIO_REDUNDANCY          10
 #endif
 
 /* Expire DAOs from neighbors that do not respond in this time. (seconds) */
@@ -207,6 +208,20 @@
 #endif
 #define RPL_DIS_START_DELAY             5
 /*---------------------------------------------------------------------------*/
+/* Lollipop counters */
+
+#define RPL_LOLLIPOP_MAX_VALUE           255
+#define RPL_LOLLIPOP_CIRCULAR_REGION     127
+#define RPL_LOLLIPOP_SEQUENCE_WINDOWS    16
+#define RPL_LOLLIPOP_INIT                (RPL_LOLLIPOP_MAX_VALUE - RPL_LOLLIPOP_SEQUENCE_WINDOWS + 1)
+#define RPL_LOLLIPOP_INCREMENT(counter)					\
+  ((counter) > RPL_LOLLIPOP_CIRCULAR_REGION ?				\
+   ++(counter) & RPL_LOLLIPOP_MAX_VALUE :				\
+   ++(counter) & RPL_LOLLIPOP_CIRCULAR_REGION)
+
+#define RPL_LOLLIPOP_IS_INIT(counter)		\
+  ((counter) > RPL_LOLLIPOP_CIRCULAR_REGION)
+/*---------------------------------------------------------------------------*/
 /* Logical representation of a DAG Information Object (DIO.) */
 struct rpl_dio {
   uip_ipaddr_t dag_id;
diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c
index 01cbe9138..0527d5363 100644
--- a/core/net/rpl/rpl-timers.c
+++ b/core/net/rpl/rpl-timers.c
@@ -225,8 +225,8 @@ rpl_schedule_dao(rpl_instance_t *instance)
   if(!etimer_expired(&instance->dao_timer.etimer)) {
     PRINTF("RPL: DAO timer already scheduled\n");
   } else {
-    expiration_time = DEFAULT_DAO_LATENCY / 2 +
-      (random_rand() % (DEFAULT_DAO_LATENCY));
+    expiration_time = RPL_DAO_LATENCY / 2 +
+      (random_rand() % (RPL_DAO_LATENCY));
     PRINTF("RPL: Scheduling DAO timer %u ticks in the future\n",
            (unsigned)expiration_time);
     ctimer_set(&instance->dao_timer, expiration_time,
diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h
index e039cf98d..90bf43626 100644
--- a/core/net/rpl/rpl.h
+++ b/core/net/rpl/rpl.h
@@ -97,24 +97,24 @@
 /*
  * Maximum of concurent dodag inside an instance
  */
-#ifndef RPL_CONF_MAX_DODAG_PER_INSTANCE
-#define RPL_MAX_DODAG_PER_INSTANCE     2
+#ifndef RPL_CONF_MAX_DAG_PER_INSTANCE
+#define RPL_MAX_DAG_PER_INSTANCE     2
 #else
-#define RPL_MAX_DODAG_PER_INSTANCE     RPL_CONF_MAX_DODAG_PER_INSTANCE
-#endif /* !RPL_CONF_MAX_DODAG_PER_INSTANCE */
+#define RPL_MAX_DAG_PER_INSTANCE     RPL_CONF_MAX_DAG_PER_INSTANCE
+#endif /* !RPL_CONF_MAX_DAG_PER_INSTANCE */
 
 /*
  * 
  */
-#ifndef RPL_CONF_DAO_SPECIFY_DODAG
-#if RPL_MAX_DODAG_PER_INSTANCE > 1
-#define RPL_DAO_SPECIFY_DODAG 1
-#else /* RPL_MAX_DODAG_PER_INSTANCE > 1*/
-#define RPL_DAO_SPECIFY_DODAG 0
-#endif /* RPL_MAX_DODAG_PER_INSTANCE > 1 */
-#else /* RPL_CONF_DAO_SPECIFY_DODAG */
-#define RPL_DAO_SPECIFY_DODAG RPL_CONF_DAO_SPECIFY_DODAG
-#endif /* RPL_CONF_DAO_SPECIFY_DODAG */
+#ifndef RPL_CONF_DAO_SPECIFY_DAG
+#if RPL_MAX_DAG_PER_INSTANCE > 1
+#define RPL_DAO_SPECIFY_DAG 1
+#else /* RPL_MAX_DAG_PER_INSTANCE > 1*/
+#define RPL_DAO_SPECIFY_DAG 0
+#endif /* RPL_MAX_DAG_PER_INSTANCE > 1 */
+#else /* RPL_CONF_DAO_SPECIFY_DAG */
+#define RPL_DAO_SPECIFY_DAG RPL_CONF_DAO_SPECIFY_DAG
+#endif /* RPL_CONF_DAO_SPECIFY_DAG */
 
 
 /*---------------------------------------------------------------------------*/
@@ -123,20 +123,6 @@
 /*---------------------------------------------------------------------------*/
 typedef uint16_t rpl_rank_t;
 typedef uint16_t rpl_ocp_t;
-
-/*---------------------------------------------------------------------------*/
-/* Lollipop counters */
-
-#define RPL_LOLLIPOP_MAX_VALUE           255
-#define RPL_LOLLIPOP_CIRCULAR_REGION     127
-#define RPL_LOLLIPOP_SEQUENCE_WINDOWS    16
-#define RPL_LOLLIPOP_INIT                RPL_LOLLIPOP_MAX_VALUE - RPL_LOLLIPOP_SEQUENCE_WINDOWS + 1
-#define RPL_LOLLIPOP_INCREMENT(ctr) (ctr > RPL_LOLLIPOP_CIRCULAR_REGION ? \
-				     ++ctr & RPL_LOLLIPOP_MAX_VALUE :     \
-				     ++ctr & RPL_LOLLIPOP_CIRCULAR_REGION)
-
-#define RPL_LOLLIPOP_IS_INIT(counter)    (counter > RPL_LOLLIPOP_CIRCULAR_REGION)
-
 /*---------------------------------------------------------------------------*/
 /* DAG Metric Container Object Types, to be confirmed by IANA. */
 #define RPL_DAG_MC_NONE			0 /* Local identifier for empty MC */
@@ -217,7 +203,7 @@ typedef struct rpl_prefix rpl_prefix_t;
 /* Directed Acyclic Graph */
 struct rpl_dag {
   uip_ipaddr_t dag_id;
-  rpl_rank_t min_rank; /* should be reset per DODAG iteration! */
+  rpl_rank_t min_rank; /* should be reset per DAG iteration! */
   uint8_t version;
   uint8_t grounded;
   uint8_t preference;
@@ -286,7 +272,7 @@ struct rpl_instance {
   rpl_metric_container_t mc;
   rpl_of_t *of;
   rpl_dag_t *current_dag;
-  rpl_dag_t dag_table[RPL_MAX_DODAG_PER_INSTANCE];
+  rpl_dag_t dag_table[RPL_MAX_DAG_PER_INSTANCE];
   /* The current default router - used for routing "upwards" */
   uip_ds6_defrt_t *def_route;
   uint8_t instance_id;
diff --git a/cpu/avr/Makefile.avr b/cpu/avr/Makefile.avr
index 8a94b9eb0..611c8d1a1 100644
--- a/cpu/avr/Makefile.avr
+++ b/cpu/avr/Makefile.avr
@@ -1,15 +1,5 @@
 # $Id: Makefile.avr,v 1.27 2010/12/22 21:13:09 dak664 Exp $
 	
-### Check if we are running under Windows
-
-ifndef WINDIR
-  ifdef OS
-    ifneq (,$(findstring Windows,$(OS)))
-      WINDIR := Windows
-    endif
-  endif
-endif
-
 .SUFFIXES:
 
 ### Optimization setting. $make OPTI=0 for easier debugging of changed source file(s)
diff --git a/cpu/avr/spi.c b/cpu/avr/spi.c
index 45fa011fa..c96f24032 100644
--- a/cpu/avr/spi.c
+++ b/cpu/avr/spi.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: spi.c,v 1.1 2007/01/25 18:22:55 bg- Exp $
  */
 
 #include 
@@ -48,11 +47,6 @@ unsigned char spi_busy = 0;
 void
 spi_init(void)
 {
-  static unsigned char spi_inited = 0;
-
-  if (spi_inited)
-    return;
-
   /* Initalize ports for communication with SPI units. */
   /* CSN=SS and must be output when master! */
   DDRB  |= BV(MOSI) | BV(SCK) | BV(CSN);
diff --git a/cpu/mc1322x/Makefile.mc1322x b/cpu/mc1322x/Makefile.mc1322x
index 389185b05..c0a95b009 100644
--- a/cpu/mc1322x/Makefile.mc1322x
+++ b/cpu/mc1322x/Makefile.mc1322x
@@ -72,8 +72,7 @@ CUSTOM_RULE_C_TO_O=yes
 CFLAGS += -I$(OBJECTDIR) -I$(CONTIKI_CPU)/board -DBOARD=$(TARGET)
 
 $(OBJECTDIR)/board.h: $(OBJECTDIR) 
-ifneq (,$(findstring Windows,$(OS)))
-	${info Cygwin detected.}
+ifeq ($(HOST_OS),Windows)
 	ln -f $(CONTIKI_CPU)/board/board.h $(OBJECTDIR)/board.h
 else
 	ln -sf ../$(CONTIKI_CPU)/board/board.h $(OBJECTDIR)/board.h
diff --git a/cpu/msp430/f1xxx/spi.c b/cpu/msp430/f1xxx/spi.c
index a88f69a57..0cf7c7715 100644
--- a/cpu/msp430/f1xxx/spi.c
+++ b/cpu/msp430/f1xxx/spi.c
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: spi.c,v 1.1 2006/06/17 22:41:21 adamdunkels Exp $
  */
 
 #include "contiki-conf.h"
@@ -46,11 +45,12 @@ unsigned char spi_busy = 0;
 void
 spi_init(void)
 {
+/*
   static unsigned char spi_inited = 0;
 
   if (spi_inited)
     return;
-
+*/
   /* Initalize ports for communication with SPI units. */
 
   U0CTL  = CHAR + SYNC + MM + SWRST; /* SW  reset,8-bit transfer, SPI master */
diff --git a/cpu/native/Makefile.native b/cpu/native/Makefile.native
index d2a8c1d3c..56fb6688b 100644
--- a/cpu/native/Makefile.native
+++ b/cpu/native/Makefile.native
@@ -14,7 +14,11 @@ CFLAGSWERROR=-Werror -pedantic -std=c99 -Werror
 endif
 CFLAGSNO = -Wall -g -I/usr/local/include $(CFLAGSWERROR)
 CFLAGS  += $(CFLAGSNO) -O
-LDFLAGS  = -Wl,-Map=contiki-$(TARGET).map,-export-dynamic
+ifeq ($(HOST_OS),Linux)
+  LDFLAGS  = -Wl,-Map=contiki-$(TARGET).map,-export-dynamic
+else
+  LDFLAGS  = -Wl
+endif
 
 ### Compilation rules
 
diff --git a/cpu/native/mtarch.c b/cpu/native/mtarch.c
index 5bb01a0cc..e9df427d0 100644
--- a/cpu/native/mtarch.c
+++ b/cpu/native/mtarch.c
@@ -40,7 +40,12 @@
 
 static void *main_fiber;
 
-#elif defined(__linux)
+#elif defined(__linux) || defined(__APPLE__)
+
+#ifdef __APPLE__
+/* Avoid deprecated error on Darwin */
+#define _XOPEN_SOURCE
+#endif
 
 #include 
 #include 
diff --git a/cpu/stm32w108/Makefile.stm32w108 b/cpu/stm32w108/Makefile.stm32w108
index 494de3a31..7eae06d4c 100644
--- a/cpu/stm32w108/Makefile.stm32w108
+++ b/cpu/stm32w108/Makefile.stm32w108
@@ -166,10 +166,8 @@ endif
 FLASHER = $(CONTIKI)/tools/stm32w/stm32w_flasher/stm32w_flasher
 
 # Check if we are running under Windows
-ifdef OS
-  ifneq (,$(findstring Windows,$(OS)))
-  	FLASHER = $(CONTIKI)/tools/stm32w/stm32w_flasher/stm32w_flasher.exe   
-  endif   
+ifeq ($(HOST_OS),Windows)
+  FLASHER = $(CONTIKI)/tools/stm32w/stm32w_flasher/stm32w_flasher.exe
 endif
 
 
diff --git a/cpu/x86/Makefile.x86 b/cpu/x86/Makefile.x86
index be3f62579..612603f52 100644
--- a/cpu/x86/Makefile.x86
+++ b/cpu/x86/Makefile.x86
@@ -10,7 +10,11 @@ OBJCOPY  = objcopy
 STRIP    = strip
 CFLAGSNO = -Wall -g -I/usr/local/include
 CFLAGS  += $(CFLAGSNO)
-LDFLAGS  = -Wl,-Map=contiki-$(TARGET).map,-export-dynamic
+ifeq ($(HOST_OS),Linux)
+  LDFLAGS  = -Wl,-Map=contiki-$(TARGET).map,-export-dynamic
+else
+  LDFLAGS  = -Wl
+endif
 
 ### Compilation rules
 
diff --git a/doc/Makefile b/doc/Makefile
index 36f37491e..5e1591985 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -13,12 +13,12 @@ export doclatex	:= NO
 export docroot	:= ../
 
 # Get appropriate root for doxygen path cutoff
-ifneq (,$(findstring Windows,$(OS)))
-# on windows need to convert cygwin path to windows path for doxygen
-ifneq (,$(findstring cygdrive,$(pwd)))
-	cygroot	= $(subst /,$(space),$(patsubst /cygdrive/%,%,$(pwd)))
-	export docroot = $(firstword $(cygroot)):/$(subst $(space),/,$(wordlist 2,$(words $(cygroot)),$(cygroot)))
-endif
+ifeq ($(HOST_OS),Windows)
+  # on windows need to convert cygwin path to windows path for doxygen
+  ifneq (,$(findstring cygdrive,$(pwd)))
+    cygroot = $(subst /,$(space),$(patsubst /cygdrive/%,%,$(pwd)))
+    export docroot = $(firstword $(cygroot)):/$(subst $(space),/,$(wordlist 2,$(words $(cygroot)),$(cygroot)))
+  endif
 endif
 
 .PHONY: clean html pdf upload
diff --git a/examples/er-rest-example/Makefile b/examples/er-rest-example/Makefile
index 7bf002ebc..3a9c02c58 100644
--- a/examples/er-rest-example/Makefile
+++ b/examples/er-rest-example/Makefile
@@ -14,7 +14,7 @@ WITH_UIP6=1
 UIP_CONF_IPV6=1
 
 # variable for this Makefile
-# configure CoAP implementation (3|6|7)
+# configure CoAP implementation (3|7)
 WITH_COAP=7
 
 # must be CFLAGS not variables
@@ -33,12 +33,6 @@ CFLAGS += -DWITH_COAP=7
 CFLAGS += -DREST=coap_rest_implementation
 CFLAGS += -DUIP_CONF_TCP=0
 APPS += er-coap-07
-else ifeq ($(WITH_COAP), 6)
-${info INFO: compiling with CoAP-06}
-CFLAGS += -DWITH_COAP=6
-CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap-06
 else ifeq ($(WITH_COAP), 3)
 ${info INFO: compiling with CoAP-03}
 CFLAGS += -DWITH_COAP=3
@@ -50,14 +44,28 @@ ${info INFO: compiling with HTTP}
 CFLAGS += -DWITH_HTTP
 CFLAGS += -DREST=http_rest_implementation
 CFLAGS += -DUIP_CONF_TCP=1
-APPS += rest-http-engine
+APPS += er-http-engine
 endif
 
 APPS += erbium
 
 
+#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
+#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1
+
 include $(CONTIKI)/Makefile.include
 
+#$(OBJECTDIR)/%.o: asmdir/%.S
+#	$(CC) $(CFLAGS) -MMD -c $< -o $@
+#	@$(FINALIZE_DEPENDENCY)
+#
+#asmdir/%.S: %.c
+#	$(CC) $(CFLAGS) -MMD -S $< -o $@
+ 
+ 
+
+
+
 $(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
diff --git a/examples/er-rest-example/README b/examples/er-rest-example/README
index 9a59cd8e9..39b364d6d 100644
--- a/examples/er-rest-example/README
+++ b/examples/er-rest-example/README
@@ -8,12 +8,16 @@ coap-client-example.c: A CoAP client that polls the /toggle resource every 10 se
 
 PRELIMINARIES
 -------------
-a) For convenience, define the Cooja addresses in /etc/hosts
+a) Make sure rpl-border-router has the same stack and fits into mote memory:
+   Disable RDC in border-router project-conf.h
+   #undef NETSTACK_CONF_RDC
+   #define NETSTACK_CONF_RDC     nullrdc_driver
+b) For convenience, define the Cooja addresses in /etc/hosts
    aaaa::0212:7401:0001:0101	cooja1
    aaaa::0212:7402:0002:0202	cooja2
    ...
-b) Get the Copper CoAP browser from https://addons.mozilla.org/en-US/firefox/addon/copper-270430/
-c) Optional: Save Tmotes as default target
+c) Get the Copper CoAP browser from https://addons.mozilla.org/en-US/firefox/addon/copper-270430/
+d) Optional: Save your target as default target
    $ make TARGET=sky savetarget
 
 COOJA HOWTO
@@ -26,8 +30,10 @@ Server only:
 
 With client:
 1) $ make TARGET=cooja coap-client-server-example.csc
-2) Wait until red LED toggles on mote 2 (server)
-3) Choose "Click button on Sky 3" from the context menu of mote 3 (client) and watch serial output
+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
 ------------
@@ -50,16 +56,26 @@ Add a client:
 
 DETAILS
 -------
-The Erbium CoAP currently implements draft 07.
+The Erbium CoAP currently implements draft 08 (name "er-coap-07" stems from last technical draft changes).
 Central features are commented in rest-server-example.c.
 In general, apps/er-coap-07 supports:
-* All CoAP-07 header options
+* All draft 08 header options
 * CON Retransmissions (note COAP_MAX_OPEN_TRANSACTIONS)
 * Blockwise Transfers (note REST_MAX_CHUNK_SIZE)
 * Separate Responses (see rest_set_pre_handler() and coap_separate_handler())
 * 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 REST Engine.
+* WITH_COAP=7 uses Erbium CoAP 07 apps/er-coap-07/.
+  The default port for coap-07 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
 -----
 * Blockwise uploads (for POST/PUT payload)
diff --git a/examples/er-rest-example/coap-client-example.c b/examples/er-rest-example/coap-client-example.c
index 0709449d2..aa40d9093 100644
--- a/examples/er-rest-example/coap-client-example.c
+++ b/examples/er-rest-example/coap-client-example.c
@@ -99,7 +99,8 @@ static int uri_switch = 0;
 void
 client_chunk_handler(void *response)
 {
-  const uint8_t *chunk;
+  uint8_t *chunk;
+
   int len = coap_get_payload(response, &chunk);
   printf("|%.*s", len, (char *)chunk);
 }
@@ -128,16 +129,13 @@ PROCESS_THREAD(coap_client_example, ev, data)
     if (etimer_expired(&et)) {
       printf("--Toggle timer--\n");
 
-#if PLATFORM_HAS_LEDS
       /* 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]);
-      coap_set_payload(request, (uint8_t *)"Toggle!", 8);
-#else
-      /* prepare request, TID is set by COAP_BLOCKING_REQUEST() */
-      coap_init_message(request, COAP_TYPE_CON, COAP_GET, 0 );
-      coap_set_header_uri_path(request, "hello");
-#endif
+
+      const char msg[] = "Toggle!";
+      coap_set_payload(request, (uint8_t *)msg, sizeof(msg)-1);
+
 
       PRINT6ADDR(&server_ipaddr);
       PRINTF(" : %u\n", UIP_HTONS(REMOTE_PORT));
diff --git a/examples/er-rest-example/project-conf.h b/examples/er-rest-example/project-conf.h
index 017f80701..0e91bedcd 100644
--- a/examples/er-rest-example/project-conf.h
+++ b/examples/er-rest-example/project-conf.h
@@ -57,7 +57,7 @@
 
 /* Must be <= open transaction number. */
 #ifndef COAP_MAX_OBSERVERS
-#define COAP_MAX_OBSERVERS      COAP_MAX_OPEN_TRANSACTIONS
+#define COAP_MAX_OBSERVERS      COAP_MAX_OPEN_TRANSACTIONS-1
 #endif
 
 
diff --git a/examples/er-rest-example/rest-server-example.c b/examples/er-rest-example/rest-server-example.c
index 68183d1b1..65ccdc48e 100644
--- a/examples/er-rest-example/rest-server-example.c
+++ b/examples/er-rest-example/rest-server-example.c
@@ -45,14 +45,15 @@
 
 /* Define which resources to include to meet memory constraints. */
 #define REST_RES_HELLO 1
-#define REST_RES_MIRROR 0
+#define REST_RES_MIRROR 0 /* causes largest code size */
 #define REST_RES_CHUNKS 1
-#define REST_RES_POLLING 0
+#define REST_RES_SEPARATE 1
+#define REST_RES_PUSHING 1
 #define REST_RES_EVENT 1
-#define REST_RES_LEDS 0
+#define REST_RES_LEDS 1
 #define REST_RES_TOGGLE 1
-#define REST_RES_LIGHT 1
-#define REST_RES_BATTERY 0
+#define REST_RES_LIGHT 0
+#define REST_RES_BATTERY 1
 
 
 
@@ -84,8 +85,6 @@
 /* For CoAP-specific example: not required for normal RESTful Web service. */
 #if WITH_COAP == 3
 #include "er-coap-03.h"
-#elif WITH_COAP == 6
-#include "er-coap-06.h"
 #elif WITH_COAP == 7
 #include "er-coap-07.h"
 #else
@@ -151,8 +150,7 @@ mirror_handler(void* request, void* response, uint8_t *buffer, uint16_t preferre
   /* The ETag and Token is copied to the header. */
   uint8_t opaque[] = {0x0A, 0xBC, 0xDE};
 
-  /* Strings are not copied and should be static or in program memory (char *str = "string in .text";).
-   * They must be '\0'-terminated as the setters use strlen(). */
+  /* Strings are not copied, so use static string buffers or strings in .text memory (char *str = "string in .text";). */
   static char location[] = {'/','f','/','a','?','k','&','e', 0};
 
   /* Getter for the header option Content-Type. If the option is not set, text/plain is returned by default. */
@@ -160,7 +158,7 @@ mirror_handler(void* request, void* response, uint8_t *buffer, uint16_t preferre
 
   /* The other getters copy the value (or string/array pointer) to the given pointers and return 1 for success or the length of strings/arrays. */
   uint32_t max_age = 0;
-  const char *str = "";
+  const char *str = NULL;
   uint32_t observe = 0;
   const uint8_t *bytes = NULL;
   uint32_t block_num = 0;
@@ -173,28 +171,29 @@ mirror_handler(void* request, void* response, uint8_t *buffer, uint16_t preferre
 
   int strpos = 0;
   /* snprintf() counts the terminating '\0' to the size parameter.
-   * Add +1 to fill the complete buffer.
-   * The additional byte is taken care of by allocating REST_MAX_CHUNK_SIZE+1 bytes in the REST framework. */
+   * The additional byte is taken care of by allocating REST_MAX_CHUNK_SIZE+1 bytes in the REST framework.
+   * Add +1 to fill the complete buffer. */
   strpos += snprintf((char *)buffer, REST_MAX_CHUNK_SIZE+1, "CT %u\n", content_type);
 
   /* Some getters such as for ETag or Location are omitted, as these options should not appear in a request.
    * Max-Age might appear in HTTP requests or used for special purposes in CoAP. */
-  if (REST.get_header_max_age(request, &max_age))
+  if (strpos<=REST_MAX_CHUNK_SIZE && REST.get_header_max_age(request, &max_age))
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "MA %lu\n", max_age);
   }
-  if ((len = REST.get_header_host(request, &str)))
+
+  if (strpos<=REST_MAX_CHUNK_SIZE && (len = REST.get_header_host(request, &str)))
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "UH %.*s\n", len, str);
   }
 
 /* CoAP-specific example: actions not required for normal RESTful Web service. */
 #if WITH_COAP > 1
-  if (coap_get_header_observe(request, &observe))
+  if (strpos<=REST_MAX_CHUNK_SIZE && coap_get_header_observe(request, &observe))
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "Ob %lu\n", observe);
   }
-  if ((len = coap_get_header_token(request, &bytes)))
+  if (strpos<=REST_MAX_CHUNK_SIZE && (len = coap_get_header_token(request, &bytes)))
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "To 0x");
     int index = 0;
@@ -203,7 +202,7 @@ mirror_handler(void* request, void* response, uint8_t *buffer, uint16_t preferre
     }
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "\n");
   }
-  if ((len = coap_get_header_etag(request, &bytes)))
+  if (strpos<=REST_MAX_CHUNK_SIZE && (len = coap_get_header_etag(request, &bytes)))
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "ET 0x");
     int index = 0;
@@ -212,54 +211,54 @@ mirror_handler(void* request, void* response, uint8_t *buffer, uint16_t preferre
     }
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "\n");
   }
-  if ((len = coap_get_header_uri_path(request, &str)))
+  if (strpos<=REST_MAX_CHUNK_SIZE && (len = coap_get_header_uri_path(request, &str)))
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "UP ");
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "%.*s\n", len, str);
   }
 #if WITH_COAP == 3
-  if ((len = coap_get_header_location(request, &str)))
+  if (strpos<=REST_MAX_CHUNK_SIZE && (len = coap_get_header_location(request, &str)))
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "Lo %.*s\n", len, str);
   }
-  if (coap_get_header_block(request, &block_num, &block_more, &block_size, NULL)) /* This getter allows NULL pointers to get only a subset of the block parameters. */
+  if (strpos<=REST_MAX_CHUNK_SIZE && coap_get_header_block(request, &block_num, &block_more, &block_size, NULL)) /* This getter allows NULL pointers to get only a subset of the block parameters. */
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "Bl %lu%s (%u)\n", block_num, block_more ? "+" : "", block_size);
   }
-#elif WITH_COAP >= 5
-  if ((len = coap_get_header_location_path(request, &str)))
+#else
+  if (strpos<=REST_MAX_CHUNK_SIZE && (len = coap_get_header_location_path(request, &str)))
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "LP %.*s\n", len, str);
   }
-  if ((len = coap_get_header_location_query(request, &str)))
+  if (strpos<=REST_MAX_CHUNK_SIZE && (len = coap_get_header_location_query(request, &str)))
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "LQ %.*s\n", len, str);
   }
-  if (coap_get_header_block2(request, &block_num, &block_more, &block_size, NULL)) /* This getter allows NULL pointers to get only a subset of the block parameters. */
+  if (strpos<=REST_MAX_CHUNK_SIZE && coap_get_header_block2(request, &block_num, &block_more, &block_size, NULL)) /* This getter allows NULL pointers to get only a subset of the block parameters. */
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "B2 %lu%s (%u)\n", block_num, block_more ? "+" : "", block_size);
   }
-  if (coap_get_header_block1(request, &block_num, &block_more, &block_size, NULL)) /* This getter allows NULL pointers to get only a subset of the block parameters. */
+  /*
+   * Critical Block1 option is currently rejected by engine.
+   *
+  if (strpos<=REST_MAX_CHUNK_SIZE && coap_get_header_block1(request, &block_num, &block_more, &block_size, NULL))
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "B1 %lu%s (%u)\n", block_num, block_more ? "+" : "", block_size);
   }
-#if WITH_COAP >= 7
-
-#endif
-
-#endif
+  */
+#endif /* CoAP > 03 */
 #endif /* CoAP-specific example */
 
-  if ((len = REST.get_query(request, &query)))
+  if (strpos<=REST_MAX_CHUNK_SIZE && (len = REST.get_query(request, &query)))
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "Qu %.*s\n", len, query);
   }
-  if ((len = REST.get_request_payload(request, &bytes)))
+  if (strpos<=REST_MAX_CHUNK_SIZE && (len = REST.get_request_payload(request, &bytes)))
   {
     strpos += snprintf((char *)buffer+strpos, REST_MAX_CHUNK_SIZE-strpos+1, "%.*s", len, bytes);
   }
 
-  if (strpos == REST_MAX_CHUNK_SIZE)
+  if (strpos >= REST_MAX_CHUNK_SIZE)
   {
       buffer[REST_MAX_CHUNK_SIZE-1] = 0xBB; /* 'ยป' to indicate truncation */
   }
@@ -280,16 +279,13 @@ mirror_handler(void* request, void* response, uint8_t *buffer, uint16_t preferre
   coap_set_header_observe(response, 10);
 #if WITH_COAP == 3
   coap_set_header_block(response, 42, 0, 64); /* The block option might be overwritten by the framework when blockwise transfer is requested. */
-#elif WITH_COAP >= 5
+#else
   coap_set_header_proxy_uri(response, "ftp://x");
   coap_set_header_block2(response, 42, 0, 64); /* The block option might be overwritten by the framework when blockwise transfer is requested. */
   coap_set_header_block1(response, 23, 0, 16);
-#if WITH_COAP >= 7
   coap_set_header_accept(response, TEXT_PLAIN);
   coap_set_header_if_none_match(response);
-#endif
-
-#endif
+#endif /* CoAP > 03 */
 #endif /* CoAP-specific example */
 }
 #endif /* REST_RES_MIRROR */
@@ -316,7 +312,9 @@ chunks_handler(void* request, void* response, uint8_t *buffer, uint16_t preferre
   {
     REST.set_response_status(response, REST.status.BAD_OPTION);
     /* A block error message should not exceed the minimum block size (16). */
-    REST.set_response_payload(response, (uint8_t*)"BlockOutOfScope", 15);
+
+    const char *error_msg = "BlockOutOfScope";
+    REST.set_response_payload(response, error_msg, strlen(error_msg));
     return;
   }
 
@@ -332,7 +330,7 @@ chunks_handler(void* request, void* response, uint8_t *buffer, uint16_t preferre
     strpos = preferred_size;
   }
 
-  /* Truncate if above total size. */
+  /* Truncate if above CHUNKS_TOTAL bytes. */
   if (*offset+(int32_t)strpos > CHUNKS_TOTAL)
   {
     strpos = CHUNKS_TOTAL - *offset;
@@ -351,19 +349,95 @@ chunks_handler(void* request, void* response, uint8_t *buffer, uint16_t preferre
 }
 #endif
 
-#if REST_RES_POLLING
+#if REST_RES_SEPARATE && WITH_COAP > 3
+/* Required to manually (=not by the engine) handle the response transaction. */
+#include "er-coap-07-separate.h"
+#include "er-coap-07-transactions.h"
+/*
+ * CoAP-specific example for separate responses.
+ * This resource is .
+ */
+RESOURCE(separate, METHOD_GET, "debug/separate", "title=\"Separate demo\"");
+
+static uint8_t separate_active = 0;
+static coap_separate_t separate_store[1];
+
+void
+separate_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+{
+  /*
+   * Example allows only one open separate response.
+   * For multiple, the application must manage the list of stores.
+   */
+  if (separate_active)
+  {
+    REST.set_response_status(response, REST.status.SERVICE_UNAVAILABLE);
+    const char *msg = "AlreadyInUse";
+    REST.set_response_payload(response, msg, strlen(msg));
+  }
+  else
+  {
+    separate_active = 1;
+
+    /* Take over and skip response by engine. */
+    coap_separate_response(response, separate_store);
+
+    /*
+     * At the moment, only the minimal information is stored in the store (client address, port, token, MID, type, and Block2).
+     * Extend the store, if the application requires additional information from this handler.
+     * buffer is an example field for custom information.
+     */
+    snprintf(separate_store->buffer, sizeof(separate_store->buffer), "StoredInfo");
+  }
+}
+
+void
+separate_finalize_handler()
+{
+  if (separate_active)
+  {
+    coap_transaction_t *transaction = NULL;
+    if ( (transaction = coap_new_transaction(separate_store->mid, &separate_store->addr, separate_store->port)) )
+    {
+      coap_packet_t response[1]; /* This way the packet can be treated as pointer as usual. */
+      coap_init_message(response, separate_store->type, CONTENT_2_05, separate_store->mid);
+
+      coap_set_payload(response, separate_store->buffer, strlen(separate_store->buffer));
+
+      /* 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
+    {
+      /*
+       * Set timer for retry, send error message, ...
+       * The example simply waits for another button press.
+       */
+    }
+  } /* if (separate_active) */
+}
+#endif
+
+#if REST_RES_PUSHING
 /*
  * Example for a periodic resource.
  * 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(polling, METHOD_GET, "debug/poll", "title=\"Periodic demo\";rt=\"Observable\"", 5*CLOCK_SECOND);
+PERIODIC_RESOURCE(pushing, METHOD_GET, "debug/push", "title=\"Periodic demo\";rt=\"Observable\"", 5*CLOCK_SECOND);
 
 void
-polling_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
+pushing_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_response_payload(response, (uint8_t *)"It's periodic!", 14);
+
+  /* Usually, a CoAP server would response with the resource representation matching the periodic_handler. */
+  const char *msg = "It's periodic!";
+  REST.set_response_payload(response, msg, strlen(msg));
 
   /* A post_handler that handles subscriptions will be called for periodic resources by the REST framework. */
 }
@@ -373,7 +447,7 @@ polling_handler(void* request, void* response, uint8_t *buffer, uint16_t preferr
  * It will be called by the REST manager process with the defined period.
  */
 int
-polling_periodic_handler(resource_t *r)
+pushing_periodic_handler(resource_t *r)
 {
   static uint32_t periodic_i = 0;
   static char content[16];
@@ -401,7 +475,9 @@ void
 event_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_response_payload(response, (uint8_t *)"It's eventful!", 14);
+  /* Usually, a CoAP server would response with the current resource representation. */
+  const char *msg = "It's eventful!";
+  REST.set_response_payload(response, (uint8_t *)msg, strlen(msg));
 
   /* A post_handler that handles subscriptions/observing will be called for periodic resources by the framework. */
 }
@@ -496,7 +572,7 @@ light_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred
   uint16_t light_photosynthetic = light_sensor.value(LIGHT_SENSOR_PHOTOSYNTHETIC);
   uint16_t light_solar = light_sensor.value(LIGHT_SENSOR_TOTAL_SOLAR);
 
-  uint16_t *accept = NULL;
+  const uint16_t *accept = NULL;
   int num = REST.get_header_accept(request, &accept);
 
   if ((num==0) || (num && accept[0]==REST.type.TEXT_PLAIN))
@@ -523,7 +599,8 @@ light_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred
   else
   {
     REST.set_response_status(response, REST.status.UNSUPPORTED_MADIA_TYPE);
-    REST.set_response_payload(response, (uint8_t *)"Supporting content-types text/plain, application/xml, and application/json", 74);
+    const char *msg = "Supporting content-types text/plain, application/xml, and application/json";
+    REST.set_response_payload(response, msg, strlen(msg));
   }
 }
 #endif /* PLATFORM_HAS_LIGHT */
@@ -536,7 +613,7 @@ battery_handler(void* request, void* response, uint8_t *buffer, uint16_t preferr
 {
   int battery = battery_sensor.value(0);
 
-  uint16_t *accept = NULL;
+  const uint16_t *accept = NULL;
   int num = REST.get_header_accept(request, &accept);
 
   if ((num==0) || (num && accept[0]==REST.type.TEXT_PLAIN))
@@ -556,7 +633,8 @@ battery_handler(void* request, void* response, uint8_t *buffer, uint16_t preferr
   else
   {
     REST.set_response_status(response, REST.status.UNSUPPORTED_MADIA_TYPE);
-    REST.set_response_payload(response, (uint8_t *)"Supporting content-types text/plain and application/json", 56);
+    const char *msg = "Supporting content-types text/plain and application/json";
+    REST.set_response_payload(response, msg, strlen(msg));
   }
 }
 #endif /* PLATFORM_HAS_BATTERY */
@@ -588,8 +666,8 @@ PROCESS_THREAD(rest_server_example, ev, data)
   configure_routing();
 #endif
 
-  /* Initialize the REST framework. */
-  rest_init_framework();
+  /* Initialize the REST engine. */
+  rest_init_engine();
 
   /* Activate the application-specific resources. */
 #if REST_RES_HELLO
@@ -601,9 +679,14 @@ PROCESS_THREAD(rest_server_example, ev, data)
 #if REST_RES_CHUNKS
   rest_activate_resource(&resource_chunks);
 #endif
-#if REST_RES_POLLING
-  rest_activate_periodic_resource(&periodic_resource_polling);
+#if REST_RES_PUSHING
+  rest_activate_periodic_resource(&periodic_resource_pushing);
 #endif
+#if REST_RES_SEPARATE && WITH_COAP > 3
+  rest_set_pre_handler(&resource_separate, coap_separate_handler);
+  rest_activate_resource(&resource_separate);
+#endif
+
 #if defined (PLATFORM_HAS_BUTTON) && REST_RES_EVENT
   SENSORS_ACTIVATE(button_sensor);
   rest_activate_event_resource(&resource_event);
@@ -628,11 +711,17 @@ PROCESS_THREAD(rest_server_example, ev, data)
   /* Define application-specific events here. */
   while(1) {
     PROCESS_WAIT_EVENT();
-#if defined (PLATFORM_HAS_BUTTON) && REST_RES_EVENT
+#if defined (PLATFORM_HAS_BUTTON)
     if (ev == sensors_event && data == &button_sensor) {
       PRINTF("BUTTON\n");
+#if REST_RES_EVENT
       /* Call the event_handler for this application-specific event. */
       event_event_handler(&resource_event);
+#endif
+#if REST_RES_SEPARATE && WITH_COAP>3
+      /* Also call the separate response example handler. */
+      separate_finalize_handler();
+#endif
     }
 #endif /* PLATFORM_HAS_BUTTON */
   } /* while (1) */
diff --git a/examples/ipv6/native-border-router/project-conf.h b/examples/ipv6/native-border-router/project-conf.h
index 6258b4eca..90576783a 100644
--- a/examples/ipv6/native-border-router/project-conf.h
+++ b/examples/ipv6/native-border-router/project-conf.h
@@ -37,7 +37,7 @@
 #define QUEUEBUF_CONF_NUM         4
 
 #undef UIP_CONF_BUFFER_SIZE
-#define UIP_CONF_BUFFER_SIZE    140
+#define UIP_CONF_BUFFER_SIZE    1280
 
 #undef UIP_CONF_RECEIVE_WINDOW
 #define UIP_CONF_RECEIVE_WINDOW  60
diff --git a/examples/ipv6/native-border-router/slip-config.c b/examples/ipv6/native-border-router/slip-config.c
index fb00d18cc..daad4907a 100644
--- a/examples/ipv6/native-border-router/slip-config.c
+++ b/examples/ipv6/native-border-router/slip-config.c
@@ -127,7 +127,11 @@ slip_config_handle_arguments(int argc, char **argv)
 fprintf(stderr,"usage:  %s [options] ipaddress\n", prog);
 fprintf(stderr,"example: border-router.native -L -v2 -s ttyUSB1 aaaa::1/64\n");
 fprintf(stderr,"Options are:\n");
+#ifdef linux
 fprintf(stderr," -B baudrate    9600,19200,38400,57600,115200,921600 (default 115200)\n");
+#else
+fprintf(stderr," -B baudrate    9600,19200,38400,57600,115200 (default 115200)\n");
+#endif
 fprintf(stderr," -H             Hardware CTS/RTS flow control (default disabled)\n");
 fprintf(stderr," -L             Log output format (adds time stamps)\n");
 fprintf(stderr," -s siodev      Serial device (default /dev/ttyUSB0)\n");
@@ -175,9 +179,11 @@ exit(1);
   case 115200:
     slip_config_b_rate = B115200;
     break;
+#ifdef linux
   case 921600:
     slip_config_b_rate = B921600;
     break;
+#endif
   default:
     err(1, "unknown baudrate %d", baudrate);
     break;
diff --git a/examples/ipv6/native-border-router/tun-bridge.c b/examples/ipv6/native-border-router/tun-bridge.c
index db695c289..54d16339c 100644
--- a/examples/ipv6/native-border-router/tun-bridge.c
+++ b/examples/ipv6/native-border-router/tun-bridge.c
@@ -125,13 +125,17 @@ void
 ifconf(const char *tundev, const char *ipaddr)
 {
 #ifdef linux
-  ssystem("ifconfig %s inet `hostname` up", tundev);
+  ssystem("ifconfig %s inet6 `hostname` up", tundev);
   ssystem("ifconfig %s add %s", tundev, ipaddr);
+#elif defined(__APPLE__)
+  ssystem("ifconfig %s inet6 %s up", tundev, ipaddr);
+  ssystem("sysctl -w net.inet.ip.forwarding=1");
 #else
-  ssystem("ifconfig %s inet `hostname` %s up", tundev, ipaddr);
+  ssystem("ifconfig %s inet6 `hostname` %s up", tundev, ipaddr);
   ssystem("sysctl -w net.inet.ip.forwarding=1");
 #endif /* !linux */
 
+  /* Print the configuration to the console. */
   ssystem("ifconfig %s\n", tundev);
 }
 /*---------------------------------------------------------------------------*/
diff --git a/examples/ipv6/rpl-border-router/border-router.c b/examples/ipv6/rpl-border-router/border-router.c
index 418425ff9..33d9f754b 100644
--- a/examples/ipv6/rpl-border-router/border-router.c
+++ b/examples/ipv6/rpl-border-router/border-router.c
@@ -74,6 +74,13 @@ AUTOSTART_PROCESSES(&border_router_process,&webserver_nogui_process);
 #else
 /* Use simple webserver with only one page */
 #include "httpd-simple.h"
+
+#define WEBSERVER_CONF_LOADTIME 0
+#define WEBSERVER_CONF_FILESTATS 0
+#define WEBSERVER_CONF_NEIGHBOR_STATUS 0
+#define WEBSERVER_CONF_ROUTE_LINKS 0
+#define BUF_USES_STACK 1
+
 PROCESS(webserver_nogui_process, "Web server");
 PROCESS_THREAD(webserver_nogui_process, ev, data)
 {
@@ -92,11 +99,19 @@ AUTOSTART_PROCESSES(&border_router_process,&webserver_nogui_process);
 
 static const char *TOP = "ContikiRPL\n";
 static const char *BOTTOM = "\n";
-static char buf[128];
+#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)
@@ -106,15 +121,12 @@ ipaddr_add(const uip_ipaddr_t *addr)
   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 && sizeof(buf) - blen >= 2) {
-        buf[blen++] = ':';
-        buf[blen++] = ':';
-      }
+      if(f++ == 0) ADD("::");
     } else {
       if(f > 0) {
         f = -1;
-      } else if(i > 0 && blen < sizeof(buf)) {
-        buf[blen++] = ':';
+      } else if(i > 0) {
+        ADD(":");
       }
       ADD("%x", a);
     }
@@ -125,46 +137,130 @@ 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
");
   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("
Routes
");
   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("");
+      ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
+      ADD("");
+#else
+      ipaddr_add(&uip_ds6_routing_table[i].ipaddr);
+#endif
+#else
+#if WEBSERVER_CONF_ROUTE_LINKS
+      ADD("");
+      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("");
+#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(uip_ds6_routing_table[i].state.lifetime < 600) {
+      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("
");
-//if(blen > 0) {
-    SEND_STRING(&s->sout, buf);
-// blen = 0;
-//}
 
+#if WEBSERVER_CONF_FILESTATS
+  static uint16_t numtimes;
+  ADD("
This page sent %u times",++numtimes);
+#endif
+
+#if WEBSERVER_CONF_LOADTIME
+  numticks = clock_time() - numticks + 1;
+  ADD(" (%u.%02u sec)",numticks/CLOCK_SECOND,(100*(numticks%CLOCK_SECOND))/CLOCK_SECOND));
+#endif
+
+  SEND_STRING(&s->sout, buf);
   SEND_STRING(&s->sout, BOTTOM);
 
   PSOCK_END(&s->sout);
@@ -173,6 +269,7 @@ PT_THREAD(generate_routes(struct httpd_state *s))
 httpd_simple_script_t
 httpd_simple_get_script(const char *name)
 {
+
   return generate_routes;
 }
 
@@ -226,19 +323,26 @@ PROCESS_THREAD(border_router_process, ev, data)
 
   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) {
@@ -253,6 +357,11 @@ PROCESS_THREAD(border_router_process, ev, data)
     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
diff --git a/platform/cooja/Makefile.cooja b/platform/cooja/Makefile.cooja
index 61c958735..e79fdbf1b 100644
--- a/platform/cooja/Makefile.cooja
+++ b/platform/cooja/Makefile.cooja
@@ -11,14 +11,6 @@ ifndef CONTIKI
   $(error CONTIKI not defined!)
 endif
 
-ifndef WINDIR
-  ifdef OS
-    ifneq (,$(findstring Windows,$(OS)))
-      WINDIR := Windows
-    endif
-  endif
-endif
-
 ### Assuming simulator quickstart if no JNI library name set from Cooja
 ifndef LIBNAME
 QUICKSTART=1
diff --git a/platform/esb/Makefile.esb b/platform/esb/Makefile.esb
index 91759f980..8aaf31edd 100644
--- a/platform/esb/Makefile.esb
+++ b/platform/esb/Makefile.esb
@@ -68,23 +68,15 @@ send:	$(CONTIKI)/tools/codeprop.c
 
 ### System dependent Makefile
 
-ifndef WINDIR
-  ifdef OS
-    ifneq (,$(findstring Windows,$(OS)))
-      WINDIR := Windows
-    endif
-  endif
-endif
-
-ifeq (${HOSTTYPE},FreeBSD)
+ifeq ($(HOST_OS),FreeBSD)
   # settings for FreeBSD
   -include $(CONTIKI)/platform/$(TARGET)/buildscripts/Makefile.freebsd
 else
-ifndef WINDIR
-  # settings for unix
-  -include $(CONTIKI)/platform/$(TARGET)/buildscripts/Makefile.unix
-else
-  # settings for windows
-  -include $(CONTIKI)/platform/$(TARGET)/buildscripts/Makefile.win
-endif
+  ifeq ($(HOST_OS),Windows)
+    # settings for Windows
+    -include $(CONTIKI)/platform/$(TARGET)/buildscripts/Makefile.win
+  else
+    # settings for an arbitary unix-like platform
+    -include $(CONTIKI)/platform/$(TARGET)/buildscripts/Makefile.unix
+  endif
 endif
diff --git a/platform/iris/Makefile.iris b/platform/iris/Makefile.iris
index 8d58e24d5..d7ce508bb 100644
--- a/platform/iris/Makefile.iris
+++ b/platform/iris/Makefile.iris
@@ -31,23 +31,15 @@ include $(CONTIKIAVR)/Makefile.avr
 	avr-objdump -zhD $< > $@
 
 
-ifndef WINDIR
-  ifdef OS
-    ifneq (,$(findstring Windows,$(OS)))
-      WINDIR := Windows
-    endif
-  endif
-endif
-
 ifeq ($(PRGBOARD), )
   PRGBOARD = mib510
 endif
 
 ifeq ($(PORT), )
-  ifndef WINDIR
-    PORT = /dev/ttyUSB0 
-  else
+  ifeq ($(HOST_OS), Windows)
     PORT = COM1
+  else
+    PORT = /dev/ttyUSB0
   endif
 endif
 
diff --git a/platform/mb851/Makefile.mb851 b/platform/mb851/Makefile.mb851
index f1b127fde..ba3ac91a2 100644
--- a/platform/mb851/Makefile.mb851
+++ b/platform/mb851/Makefile.mb851
@@ -19,10 +19,8 @@ include $(CONTIKI)/cpu/stm32w108/Makefile.stm32w108
 
 SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-linux
 
-ifdef OS
-  ifneq (,$(findstring Windows,$(OS)))
-    SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-windows
-  endif
+ifeq ($(HOST_OS),Windows)
+  SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-windows
 endif
 
 
diff --git a/platform/mbxxx/Makefile.mbxxx b/platform/mbxxx/Makefile.mbxxx
index e100e2991..6925a231f 100644
--- a/platform/mbxxx/Makefile.mbxxx
+++ b/platform/mbxxx/Makefile.mbxxx
@@ -18,10 +18,8 @@ include $(CONTIKI)/cpu/stm32w108/Makefile.stm32w108
 
 SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-linux
 
-ifdef OS
-  ifneq (,$(findstring Windows,$(OS)))
-    SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-windows
-  endif
+ifeq ($(HOST_OS),Windows)
+  SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-windows
 endif
 
 
diff --git a/platform/micaz/Makefile.micaz b/platform/micaz/Makefile.micaz
index 021444e14..49499cf1a 100644
--- a/platform/micaz/Makefile.micaz
+++ b/platform/micaz/Makefile.micaz
@@ -26,23 +26,15 @@ include $(CONTIKIAVR)/Makefile.avr
 	avr-objdump -zhD $< > $@
 
 
-ifndef WINDIR
-  ifdef OS
-    ifneq (,$(findstring Windows,$(OS)))
-      WINDIR := Windows
-    endif
-  endif
-endif
-
 ifeq ($(PRGBOARD), )
   PRGBOARD = mib510
 endif
 
 ifeq ($(PORT), )
-  ifndef WINDIR
-    PORT = /dev/ttyS0 
-  else
+  ifeq ($(HOST_OS),Windows)
     PORT = COM1
+  else
+    PORT = /dev/ttyS0
   endif
 endif
 
diff --git a/platform/minimal-net/Makefile.minimal-net b/platform/minimal-net/Makefile.minimal-net
index 37e487cbc..296d5684e 100644
--- a/platform/minimal-net/Makefile.minimal-net
+++ b/platform/minimal-net/Makefile.minimal-net
@@ -2,12 +2,16 @@ ifndef CONTIKI
   $(error CONTIKI not defined! You must specify where CONTIKI resides!)
 endif
 
+ifeq ($(HOST_OS),Darwin)
+  AROPTS = rc
+endif
+
 CONTIKI_TARGET_DIRS = .
 CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o}
 
 CONTIKI_TARGET_SOURCEFILES = contiki-main.c clock.c leds.c leds-arch.c cfs-posix.c cfs-posix-dir.c dlloader.c
 
-ifeq ($(OS),Windows_NT)
+ifeq ($(HOST_OS),Windows)
 CONTIKI_TARGET_SOURCEFILES += wpcap-drv.c wpcap.c
 else
 CONTIKI_TARGET_SOURCEFILES += tapdev-drv.c
@@ -21,7 +25,7 @@ endif
 
 CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
 
-ifeq ($(OS),Windows_NT)
+ifeq ($(HOST_OS),Windows)
 TARGET_LIBFILES = /lib/w32api/libws2_32.a /lib/w32api/libiphlpapi.a
 endif
 
diff --git a/platform/msb430/Makefile.msb430 b/platform/msb430/Makefile.msb430
index f74ce49bf..af5c95caa 100644
--- a/platform/msb430/Makefile.msb430
+++ b/platform/msb430/Makefile.msb430
@@ -24,25 +24,17 @@ endif
 
 ### System dependent Makefile
 
-ifndef WINDIR
-  ifdef OS
-    ifneq (,$(findstring Windows,$(OS)))
-      WINDIR := Windows
-    endif
-  endif
-endif
-
-ifeq (${HOSTTYPE},FreeBSD)
+ifeq ($(HOST_OS),FreeBSD)
   # settings for FreeBSD
   -include $(CONTIKI)/platform/$(TARGET)/buildscripts/Makefile.freebsd
 else
-ifndef WINDIR
-  # settings for unix
-  -include $(CONTIKI)/platform/$(TARGET)/buildscripts/Makefile.unix
-else
-  # settings for windows
-  -include $(CONTIKI)/platform/$(TARGET)/buildscripts/Makefile.win
-endif
+  ifeq ($(HOST_OS),Windows)
+    # settings for Windows
+    -include $(CONTIKI)/platform/$(TARGET)/buildscripts/Makefile.win
+  else
+    # settings for an arbitary unix-like platform
+    -include $(CONTIKI)/platform/$(TARGET)/buildscripts/Makefile.unix
+  endif
 endif
 
 # If we are not running under Windows, we assume Linux
diff --git a/platform/native/Makefile.native b/platform/native/Makefile.native
index eade2e7a4..36368e266 100644
--- a/platform/native/Makefile.native
+++ b/platform/native/Makefile.native
@@ -2,6 +2,10 @@ ifndef CONTIKI
   $(error CONTIKI not defined! You must specify where CONTIKI resides!)
 endif
 
+ifeq ($(HOST_OS),Darwin)
+  AROPTS = rc
+endif
+
 ifdef UIP_CONF_IPV6
 CFLAGS += -DWITH_UIP6=1
 endif
@@ -13,7 +17,7 @@ CONTIKI_TARGET_SOURCEFILES = contiki-main.c clock.c leds.c leds-arch.c \
                 button-sensor.c pir-sensor.c vib-sensor.c xmem.c \
                 sensors.c irq.c cfs-posix.c cfs-posix-dir.c
 
-ifeq ($(OS),Windows_NT)
+ifeq ($(HOST_OS),Windows)
 CONTIKI_TARGET_SOURCEFILES += wpcap-drv.c wpcap.c
 TARGET_LIBFILES = /lib/w32api/libws2_32.a /lib/w32api/libiphlpapi.a
 else
diff --git a/platform/redbee-econotag/contiki-conf.h b/platform/redbee-econotag/contiki-conf.h
index 1e87ea5e9..1aee86f44 100644
--- a/platform/redbee-econotag/contiki-conf.h
+++ b/platform/redbee-econotag/contiki-conf.h
@@ -227,7 +227,7 @@ typedef unsigned long rtimer_clock_t;
 
 #define UIP_CONF_DHCP_LIGHT
 #define UIP_CONF_LLH_LEN         0
-#define UIP_CONF_RECEIVE_WINDOW  48
+#define UIP_CONF_RECEIVE_WINDOW  300
 #define UIP_CONF_TCP_MSS         48
 #define UIP_CONF_MAX_CONNECTIONS 4
 #define UIP_CONF_MAX_LISTENPORTS 8
diff --git a/platform/sky/Makefile.common b/platform/sky/Makefile.common
index 066cad86b..d5f0c82d1 100644
--- a/platform/sky/Makefile.common
+++ b/platform/sky/Makefile.common
@@ -43,29 +43,27 @@ NUMPAR=20
 IHEXFILE=tmpimage.ihex
 
 # Check if we are running under Windows
-ifdef OS
-  ifneq (,$(findstring Windows,$(OS)))
-    USBDEVPREFIX=/dev/com
-    SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-windows
-    MOTELIST = $(CONTIKI)/tools/sky/motelist-windows
-    TMOTE_BSL_FILE = tmote-bsl
-    TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE).exe),1,0)
-    ifeq ($(TMOTE_BSL), 1)
-      NUMPAR = 1
-      BSL =  $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE)
-      MOTES = $(shell $(MOTELIST) | grep COM | \
-         cut -f 4 -d \  )
-    else
-      BSL = $(CONTIKI)/tools/sky/msp430-bsl-windows --telosb
-      BSL_FILETYPE = -I
-      MOTES = $(shell $(MOTELIST) | grep COM | \
-         cut -f 4 -d \  | \
-         perl -ne 'print $$1 - 1 . " " if(/COM(\d+)/);')
-    endif
-    CMOTES = $(shell $(MOTELIST) | grep COM | \
+ifeq ($(HOST_OS),Windows)
+  USBDEVPREFIX=/dev/com
+  SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-windows
+  MOTELIST = $(CONTIKI)/tools/sky/motelist-windows
+  TMOTE_BSL_FILE = tmote-bsl
+  TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE).exe),1,0)
+  ifeq ($(TMOTE_BSL), 1)
+    NUMPAR = 1
+    BSL =  $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE)
+    MOTES = $(shell $(MOTELIST) | grep COM | \
+       cut -f 4 -d \  )
+  else
+    BSL = $(CONTIKI)/tools/sky/msp430-bsl-windows --telosb
+    BSL_FILETYPE = -I
+    MOTES = $(shell $(MOTELIST) | grep COM | \
        cut -f 4 -d \  | \
-       perl -ne 'print $$1 . " " if(/COM(\d+)/);')
+       perl -ne 'print $$1 - 1 . " " if(/COM(\d+)/);')
   endif
+  CMOTES = $(shell $(MOTELIST) | grep COM | \
+     cut -f 4 -d \  | \
+     perl -ne 'print $$1 . " " if(/COM(\d+)/);')
 endif
 
 # If we are not running under Windows, we assume Linux
diff --git a/platform/stepper-robot/Makefile.stepper-robot b/platform/stepper-robot/Makefile.stepper-robot
index 6ad4065c8..b74e6180d 100644
--- a/platform/stepper-robot/Makefile.stepper-robot
+++ b/platform/stepper-robot/Makefile.stepper-robot
@@ -27,12 +27,3 @@ ifndef BASE_IP
 BASE_IP := 172.16.1.1
 endif
 
-### System dependent Makefile
-
-ifndef WINDIR
-  ifdef OS
-    ifneq (,$(findstring Windows,$(OS)))
-      WINDIR := Windows
-    endif
-  endif
-endif
diff --git a/platform/stm32test/Makefile.stm32test b/platform/stm32test/Makefile.stm32test
index 8f003a200..4c7cf90c9 100644
--- a/platform/stm32test/Makefile.stm32test
+++ b/platform/stm32test/Makefile.stm32test
@@ -24,12 +24,3 @@ ifndef BASE_IP
 BASE_IP := 172.16.1.1
 endif
 
-### System dependent Makefile
-
-ifndef WINDIR
-  ifdef OS
-    ifneq (,$(findstring Windows,$(OS)))
-      WINDIR := Windows
-    endif
-  endif
-endif
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
index f71d29fe2..217836800 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
@@ -59,6 +59,7 @@ import se.sics.cooja.mspmote.plugins.CodeVisualizerSkin;
 import se.sics.cooja.mspmote.plugins.MspBreakpointContainer;
 import se.sics.cooja.plugins.BufferListener.BufferAccess;
 import se.sics.cooja.plugins.Visualizer;
+import se.sics.mspsim.cli.CommandContext;
 import se.sics.mspsim.cli.CommandHandler;
 import se.sics.mspsim.cli.LineListener;
 import se.sics.mspsim.cli.LineOutputStream;
@@ -74,6 +75,7 @@ import se.sics.mspsim.util.DebugInfo;
 import se.sics.mspsim.util.ELF;
 import se.sics.mspsim.util.MapEntry;
 import se.sics.mspsim.util.MapTable;
+import se.sics.mspsim.util.SimpleProfiler;
 
 /**
  * @author Fredrik Osterlind
@@ -88,7 +90,6 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
   }
 
   private CommandHandler commandHandler;
-  private ArrayList commandListeners = new ArrayList();
   private MSP430 myCpu = null;
   private MspMoteType myMoteType = null;
   private MspMoteMemory myMemory = null;
@@ -150,24 +151,6 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
     return new MoteInterfaceHandler(this, getType().getMoteInterfaceClasses());
   }
 
-  public void sendCLICommand(String line) {
-    if (commandHandler != null) {
-      commandHandler.lineRead(line);
-    }
-  }
-
-  public boolean hasCLIListener() {
-    return !commandListeners.isEmpty();
-  }
-
-  public void addCLIListener(LineListener listener) {
-    commandListeners.add(listener);
-  }
-
-  public void removeCLIListener(LineListener listener) {
-    commandListeners.remove(listener);
-  }
-
   /**
    * @return MSP430 CPU
    */
@@ -234,17 +217,7 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
    * @throws IOException Preparing mote failed
    */
   protected void prepareMote(File fileELF, GenericNode node) throws IOException {
-    LineOutputStream lout = new LineOutputStream(new LineListener() {
-      public void lineRead(String line) {
-        for (LineListener l: commandListeners.toArray(new LineListener[0])) {
-          if (l == null) {
-            continue;
-          }
-          l.lineRead(line);
-        }
-      }});
-    PrintStream out = new PrintStream(lout);
-    this.commandHandler = new CommandHandler(out, out);
+    this.commandHandler = new CommandHandler(System.out, System.err);
     node.setCommandHandler(commandHandler);
 
     ConfigManager config = new ConfigManager();
@@ -271,6 +244,10 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
     myCpu.reset();
   }
 
+  public CommandHandler getCLICommandHandler() {
+    return commandHandler;
+  }
+
   /* called when moteID is updated */
   public void idUpdated(int newID) {
   }
@@ -344,13 +321,9 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
         myCpu.stepMicros(t - lastExecute, duration);
       lastExecute = t;
     } catch (EmulationException e) {
-      String stackTraceOutput = sendCLICommandAndPrint("stacktrace");
-      if (stackTraceOutput == null) {
-        stackTraceOutput = "";
-      }
-      stackTraceOutput = e.getMessage() + "\n\n" + stackTraceOutput;
+      String trace = e.getMessage() + "\n\n" + getStackTrace();
       throw (ContikiError)
-      new ContikiError(stackTraceOutput).initCause(e);
+      new ContikiError(trace).initCause(e);
     }
 
     /* Schedule wakeup */
@@ -377,22 +350,29 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
     }*/
   }
   
-  public String sendCLICommandAndPrint(String cmd) {
-  	String response = executeCLICommand(cmd); 
-  	logger.fatal(response);
-    return response;
+  public String getStackTrace() {
+    return executeCLICommand("stacktrace");
+  }
+
+  public int executeCLICommand(String cmd, CommandContext context) {
+    return commandHandler.executeCommand(cmd, context);
   }
   
   public String executeCLICommand(String cmd) {
     final StringBuilder sb = new StringBuilder();
-    LineListener tmp = new LineListener() {
+    LineListener ll = new LineListener() {
       public void lineRead(String line) {
-        sb.append(line + "\n");
+        sb.append(line).append("\n");
       }
     };
-    commandListeners.add(tmp);
-    sendCLICommand(cmd);
-    commandListeners.remove(tmp);
+    PrintStream po = new PrintStream(new LineOutputStream(ll));
+    CommandContext c = new CommandContext(commandHandler, null, "", new String[0], 1, null);
+    c.out = po;
+    c.err = po;
+    
+    if (0 != executeCLICommand(cmd, c)) {
+      sb.append("\nWarning: command failed");
+    }
     
     return sb.toString();
   }
@@ -507,7 +487,7 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
   }
 
   public String getPCString() {
-    int pc = myCpu.reg[MSP430Constants.PC];
+    int pc = myCpu.getPC();
     ELF elf = (ELF)myCpu.getRegistry().getComponent(ELF.class); 
     DebugInfo di = elf.getDebugInfo(pc);
     
@@ -517,6 +497,17 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
     }
     if (di == null) {
       /* Return PC value */
+      MapEntry mapEntry = ((SimpleProfiler)myCpu.getProfiler()).getCallMapEntry(0);
+      if (mapEntry != null) {
+        String file = mapEntry.getFile();
+        if (file != null) {
+          if (file.indexOf('/') >= 0) {
+            file = file.substring(file.lastIndexOf('/')+1);
+          }
+        }
+        String name = mapEntry.getName();
+        return file + ":?:" + name; 
+      }
       return String.format("*%02x", myCpu.reg[MSP430Constants.PC]);
     }
 
@@ -527,15 +518,19 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
       /* strip path */
       file = file.substring(file.lastIndexOf('/')+1, file.length());
     }
+    
     String function = di.getFunction();
-    function = function==null?"?":function;
+    function = function==null?"":function;
     if (function.contains(":")) {
       /* strip arguments */
       function = function.substring(0, function.lastIndexOf(':'));
     }
-    return file + ":" + function + ":" + lineNo;
+    if (function.equals("* not available")) {
+      function = "?";
+    }
+    return file + ":" + lineNo + ":" + function;
     
-    /*return executeCLICommand("line " + myCpu.reg[MSP430Constants.PC]);*/
+    /*return executeCLICommand("line " + myCpu.getPC());*/
   }
 
   public MemoryMonitor createMemoryMonitor(final MemoryEventHandler meh) {
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCLI.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCLI.java
index 5836b07be..6b375e0fa 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCLI.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCLI.java
@@ -36,6 +36,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
+import java.io.PrintStream;
+
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPopupMenu;
@@ -43,6 +45,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
+
 import se.sics.cooja.ClassDescription;
 import se.sics.cooja.GUI;
 import se.sics.cooja.Mote;
@@ -51,7 +54,9 @@ import se.sics.cooja.PluginType;
 import se.sics.cooja.Simulation;
 import se.sics.cooja.VisPlugin;
 import se.sics.cooja.mspmote.MspMote;
+import se.sics.mspsim.cli.CommandContext;
 import se.sics.mspsim.cli.LineListener;
+import se.sics.mspsim.cli.LineOutputStream;
 
 @ClassDescription("Msp CLI")
 @PluginType(PluginType.MOTE_PLUGIN)
@@ -66,8 +71,6 @@ public class MspCLI extends VisPlugin implements MotePlugin {
   private int historyPos = 0;
   private int historyCount = 0;
 
-  private LineListener myListener;
-
   public MspCLI(Mote mote, Simulation simulationToVisualize, GUI gui) {
     super("Msp CLI (" + mote.getID() + ')', gui);
     this.mspMote = (MspMote) mote;
@@ -79,20 +82,27 @@ public class MspCLI extends VisPlugin implements MotePlugin {
     logArea.setEditable(false);
     panel.add(new JScrollPane(logArea), BorderLayout.CENTER);
 
+    LineListener lineListener = new LineListener() {
+      public void lineRead(String line) {
+        addCLIData(line);
+      }
+    };
+    PrintStream po = new PrintStream(new LineOutputStream(lineListener));
+    final CommandContext commandContext = new CommandContext(mspMote.getCLICommandHandler(), null, "", new String[0], 1, null);
+    commandContext.out = po;
+    commandContext.err = po;
+
     JPopupMenu popupMenu = new JPopupMenu();
     JMenuItem clearItem = new JMenuItem("Clear");
     clearItem.addActionListener(new ActionListener() {
-
       public void actionPerformed(ActionEvent e) {
         logArea.setText("");
       }
-
     });
     popupMenu.add(clearItem);
     logArea.setComponentPopupMenu(popupMenu);
 
     ActionListener action = new ActionListener() {
-
       public void actionPerformed(ActionEvent e) {
         String command = trim(commandField.getText());
         if (command != null) {
@@ -107,15 +117,16 @@ public class MspCLI extends VisPlugin implements MotePlugin {
             }
             historyPos = historyCount;
             addCLIData("> " + command);
-            mspMote.sendCLICommand(command);
+
+            mspMote.executeCLICommand(command, commandContext);
             commandField.setText("");
           } catch (Exception ex) {
             System.err.println("could not send '" + command + "':");
             ex.printStackTrace();
             JOptionPane.showMessageDialog(panel,
-                                          "could not send '" + command + "':\n"
-                                          + ex, "ERROR",
-                                          JOptionPane.ERROR_MESSAGE);
+                "could not send '" + command + "':\n"
+                + ex, "ERROR",
+                JOptionPane.ERROR_MESSAGE);
           }
         } else {
           commandField.getToolkit().beep();
@@ -166,19 +177,9 @@ public class MspCLI extends VisPlugin implements MotePlugin {
 
     });
     panel.add(commandField, BorderLayout.SOUTH);
-
-    myListener = new LineListener() {
-      public void lineRead(String line) {
-        addCLIData(line);
-      }
-    };
-    mspMote.addCLIListener(myListener);
   }
 
   public void closePlugin() {
-    if (myListener != null) {
-      mspMote.addCLIListener(null);
-    }
   }
 
   public void addCLIData(final String text) {
@@ -199,7 +200,7 @@ public class MspCLI extends VisPlugin implements MotePlugin {
   private String trim(String text) {
     return (text != null) && ((text = text.trim()).length() > 0) ? text : null;
   }
-  
+
   public Mote getMote() {
     return mspMote;
   }
diff --git a/tools/cooja/java/se/sics/cooja/dialogs/TableColumnAdjuster.java b/tools/cooja/java/se/sics/cooja/dialogs/TableColumnAdjuster.java
index adf7c4825..af88396a2 100644
--- a/tools/cooja/java/se/sics/cooja/dialogs/TableColumnAdjuster.java
+++ b/tools/cooja/java/se/sics/cooja/dialogs/TableColumnAdjuster.java
@@ -40,6 +40,8 @@ package se.sics.cooja.dialogs;
 import java.awt.Component;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.Arrays;
+
 import javax.swing.JTable;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
@@ -68,16 +70,23 @@ public class TableColumnAdjuster implements PropertyChangeListener, TableModelLi
     this(table, 6);
   }
 
+  private boolean[] adjustColumns;
+
   /*
    *  Specify the table and spacing
    */
   public TableColumnAdjuster(JTable table, int spacing) {
     this.table = table;
     this.spacing = spacing;
+    TableColumnModel tcm = table.getColumnModel();
+    adjustColumns = new boolean[tcm.getColumnCount()];
+    Arrays.fill(adjustColumns, true);
+
     setColumnHeaderIncluded(true);
     setColumnDataIncluded(true);
     setOnlyAdjustLarger(true);
     setDynamicAdjustment(false);
+    
   }
 
   public void packColumns() {
@@ -97,10 +106,16 @@ public class TableColumnAdjuster implements PropertyChangeListener, TableModelLi
   public void adjustColumns() {
     TableColumnModel tcm = table.getColumnModel();
     for (int i = 0, n = tcm.getColumnCount(); i < n; i++) {
-      adjustColumn(i, isOnlyAdjustLarger);
+      if (adjustColumns[i]) {
+        adjustColumn(i, isOnlyAdjustLarger);
+      }
     }
   }
 
+  public void setAdjustColumn(int i, boolean adjust) {
+    adjustColumns[i] = adjust;
+  }
+  
   /*
    *  Adjust the width of the specified column in the table
    */
@@ -109,6 +124,9 @@ public class TableColumnAdjuster implements PropertyChangeListener, TableModelLi
   }
 
   private void adjustColumn(int column, boolean onlyAdjustLarger) {
+    if (!adjustColumns[column]) {
+      return;
+    }
     int viewColumn = table.convertColumnIndexToView(column);
     if (viewColumn < 0) {
       return;
@@ -194,6 +212,9 @@ public class TableColumnAdjuster implements PropertyChangeListener, TableModelLi
   private void adjustColumnsForNewRows(int firstRow, int lastRow) {
     TableColumnModel tcm = table.getColumnModel();
     for (int column = 0, n = tcm.getColumnCount(); column < n; column++) {
+      if (!adjustColumns[column]) {
+        continue;
+      }
       int viewColumn = table.convertColumnIndexToView(column);
       if (viewColumn < 0) {
         continue;
@@ -302,6 +323,9 @@ public class TableColumnAdjuster implements PropertyChangeListener, TableModelLi
 
       } else if (isOnlyAdjustLarger) {
         //  Only need to worry about an increase in width for these cells
+        if (!adjustColumns[column]) {
+          return;
+        }
         int viewColumn = table.convertColumnIndexToView(column);
         if (viewColumn < 0) {
           // Column is not visible
diff --git a/tools/cooja/java/se/sics/cooja/motes/AbstractEmulatedMote.java b/tools/cooja/java/se/sics/cooja/motes/AbstractEmulatedMote.java
index fae2c4e50..1d9dae44e 100644
--- a/tools/cooja/java/se/sics/cooja/motes/AbstractEmulatedMote.java
+++ b/tools/cooja/java/se/sics/cooja/motes/AbstractEmulatedMote.java
@@ -60,7 +60,11 @@ public abstract class AbstractEmulatedMote extends AbstractWakeupMote implements
   public String getPCString() {
     return null;
   }
-  
+
+  public String getStackTrace() {
+    return null;
+  }
+
   public interface MemoryMonitor {
     public boolean start(int address, int size);
     public void stop();
diff --git a/tools/cooja/java/se/sics/cooja/plugins/BufferListener.java b/tools/cooja/java/se/sics/cooja/plugins/BufferListener.java
index f7751aa22..6e4323650 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/BufferListener.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/BufferListener.java
@@ -198,6 +198,9 @@ public class BufferListener extends VisPlugin {
   private boolean hideReads = true;
   private JCheckBoxMenuItem hideReadsCheckbox;
   
+  private boolean withStackTrace = false;
+  private JCheckBoxMenuItem withStackTraceCheckbox;
+  
   private JMenu parserMenu = new JMenu("Parser");
   private JMenu bufferMenu = new JMenu("Buffer");
   
@@ -332,29 +335,44 @@ public class BufferListener extends VisPlugin {
         java.awt.Point p = e.getPoint();
         int rowIndex = rowAtPoint(p);
         int colIndex = columnAtPoint(p);
-        int columnIndex = convertColumnIndexToModel(colIndex);
-        if (rowIndex < 0 || columnIndex < 0) {
+        if (rowIndex < 0 || colIndex < 0) {
           return super.getToolTipText(e);
         }
-        Object v = getValueAt(rowIndex, columnIndex);
-        if (v instanceof BufferAccess && parser instanceof GraphicalParser) {
-          return
-          "" + 
-          StringUtils.hexDump(((BufferAccess)v).mem, 4, 4).replaceAll("\n", "
") + 
-          "";
+        int row = convertRowIndexToModel(rowIndex);
+        int column = convertColumnIndexToModel(colIndex);
+        if (row < 0 || column < 0) {
+          return super.getToolTipText(e);
         }
-        if (v != null) {
-          String t = v.toString();
-          if (t.length() > 60) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("");
-            do {
-              sb.append(t.substring(0, 60)).append("
");
-              t = t.substring(60);
-            } while (t.length() > 60);
-            return sb.append(t).append("").toString();
+        
+        if (column == COLUMN_SOURCE) {
+          BufferAccess ba = logs.get(row);
+          if (ba.stackTrace != null) {
+            return
+            "
" +
+            ba.stackTrace +
+            "
";
           }
+          return "No stack trace (enable in popup menu)";
         }
+        if (column == COLUMN_DATA) {
+          BufferAccess ba = logs.get(row);
+          if (parser instanceof GraphicalParser) {
+            return
+            "
" +
+            StringUtils.hexDump(ba.mem, 4, 4) +
+            "
";
+          }
+          
+          String baString = ba.getParsedString();
+          StringBuilder sb = new StringBuilder();
+          sb.append("");
+          while (baString.length() > 60) {
+            sb.append(baString.substring(0, 60)).append("
");
+            baString = baString.substring(60);
+          };
+          return sb.append(baString).append("").toString();
+        }
+
         return super.getToolTipText(e);
       }
     };
@@ -493,6 +511,7 @@ public class BufferListener extends VisPlugin {
     /* Automatically update column widths */
     final TableColumnAdjuster adjuster = new TableColumnAdjuster(logTable, 0);
     adjuster.packColumns();
+    logTable.getColumnModel().getColumn(COLUMN_DATA).setWidth(400);
 
     /* Popup menu */
     JPopupMenu popupMenu = new JPopupMenu();
@@ -555,7 +574,7 @@ public class BufferListener extends VisPlugin {
         repaint();
       }
     });
-    hideReadsCheckbox = new JCheckBoxMenuItem("Hide READs", true);
+    hideReadsCheckbox = new JCheckBoxMenuItem("Hide READs", hideReads);
     popupMenu.add(hideReadsCheckbox);
     hideReadsCheckbox.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
@@ -565,7 +584,16 @@ public class BufferListener extends VisPlugin {
       }
     });
 
-
+    withStackTraceCheckbox = new JCheckBoxMenuItem("Capture stack traces", withStackTrace);
+    popupMenu.add(withStackTraceCheckbox);
+    withStackTraceCheckbox.addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent e) {
+        withStackTrace = withStackTraceCheckbox.isSelected();
+        setFilter(getFilter());
+        repaint();
+      }
+    });
+    
     logTable.setComponentPopupMenu(popupMenu);
 
     /* Column width adjustment */
@@ -573,6 +601,7 @@ public class BufferListener extends VisPlugin {
       public void run() {
         /* Make sure this happens *after* adding history */
         adjuster.setDynamicAdjustment(true);
+        adjuster.setAdjustColumn(COLUMN_DATA, false);
       }
     });
 
@@ -775,6 +804,10 @@ public class BufferListener extends VisPlugin {
       element = new Element("showreads");
       config.add(element);
     }
+    if (withStackTrace) {
+      element = new Element("stacktrace");
+      config.add(element);
+    }
     element = new Element("parser");
     element.setText(parser.getClass().getName());
     config.add(element);
@@ -815,6 +848,9 @@ public class BufferListener extends VisPlugin {
       } else if ("showreads".equals(name)) {
         hideReads = false;
         hideReadsCheckbox.setSelected(false);
+      } else if ("stacktrace".equals(name)) {
+        withStackTrace = true;
+        withStackTraceCheckbox.setSelected(true);
       } else if ("formatted_time".equals(name)) {
         formatTimeString = true;
         repaintTimeColumn();
@@ -928,6 +964,7 @@ public class BufferListener extends VisPlugin {
     
     public final String typeStr;
     public final String sourceStr;
+    public final String stackTrace;
     public final byte[] mem;
     
     private boolean[] accessedBitpattern = null;
@@ -970,6 +1007,11 @@ public class BufferListener extends VisPlugin {
       typeStr = type.toString();
       String s = mote.getPCString();
       sourceStr = s==null?"[unknown]":s;
+      if (withStackTrace) {
+        this.stackTrace = mote.getStackTrace();
+      } else {
+        this.stackTrace = null;
+      }
     }
 
     public Object getParsedData() {
@@ -1285,8 +1327,7 @@ public class BufferListener extends VisPlugin {
     }
     
     parser = bp;
-    logTable.getColumnModel().getColumn(COLUMN_DATA).setHeaderValue(
-        GUI.getDescriptionOf(bp));
+    logTable.getColumnModel().getColumn(COLUMN_DATA).setHeaderValue(GUI.getDescriptionOf(bp));
 
     repaint();
   }
diff --git a/tools/mspsim/mspsim.jar b/tools/mspsim/mspsim.jar
index 43689baa7..fa3178fce 100644
Binary files a/tools/mspsim/mspsim.jar and b/tools/mspsim/mspsim.jar differ
diff --git a/tools/tunslip6.c b/tools/tunslip6.c
index 4192dae4f..3b6a51601 100644
--- a/tools/tunslip6.c
+++ b/tools/tunslip6.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: tunslip6.c,v 1.6 2010/11/29 18:14:54 joxe Exp $
  *
  */
 
@@ -596,6 +595,49 @@ ifconf(const char *tundev, const char *ipaddr)
   ssystem("ifconfig %s inet `hostname` up", tundev);
   if (timestamp) stamptime();
   ssystem("ifconfig %s add %s", tundev, ipaddr);
+
+/* radvd needs a link local address for routing */
+#if 0
+/* fe80::1/64 is good enough */
+  ssystem("ifconfig %s add fe80::1/64", tundev);
+#elif 1
+/* Generate a link local address a la sixxs/aiccu */
+/* First a full parse, stripping off the prefix length */
+{
+char lladdr[40];
+char c,*ptr=(char *)ipaddr;
+uint16_t digit,ai,a[8],cc,scc,i;
+  for(ai=0;ai<8;ai++) a[ai]=0;
+  ai=0;cc=scc=0;
+  while(c=*ptr++) {
+    if(c=='/') break;
+    if(c==':') {
+      if(cc) scc = ai;
+      cc = 1;
+      if (++ai>7) break;
+    } else {
+      cc=0;
+      digit = c-'0'; if (digit > 9) digit = 10 + (c & 0xdf) - 'A';
+      a[ai] = (a[ai] << 4) + digit;
+    }
+  }
+ /* Get # elided and shift what's after to the end */
+  cc=8-ai;
+  for(i=0;i