From c023faead2c48f37e099ff8c5bb2dc2f8b802ceb Mon Sep 17 00:00:00 2001 From: Matthias Kovatsch Date: Fri, 23 Mar 2012 16:37:11 +0100 Subject: [PATCH] Added Content-Type to observe notifications. --- apps/erbium/erbium.h | 2 +- examples/er-rest-example/plugtest-server.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/erbium/erbium.h b/apps/erbium/erbium.h index 72b995db0..2a511e8e1 100644 --- a/apps/erbium/erbium.h +++ b/apps/erbium/erbium.h @@ -259,7 +259,7 @@ resource_t resource_##name = {NULL, flags, url, attributes, name##_handler, NULL * Macro to define a sub-resource * Make sure to define its parent resource beforehand and set 'parent' to that name. */ -#define SUB_RESOURCE(name, flags, url, attributes, parent) \ +#define SUB_RESOURCE(name, flags, url, attributes, parent) \ resource_t resource_##name = {NULL, flags, url, attributes, parent##_handler, NULL, NULL, NULL} /* diff --git a/examples/er-rest-example/plugtest-server.c b/examples/er-rest-example/plugtest-server.c index 0d4eb5c7b..1375681d2 100644 --- a/examples/er-rest-example/plugtest-server.c +++ b/examples/er-rest-example/plugtest-server.c @@ -482,9 +482,12 @@ obs_periodic_handler(resource_t *r) PRINTF("TICK %u for /%s\n", obs_counter, r->url); /* Build notification. */ + /*TODO: REST.new_response() */ coap_packet_t notification[1]; /* This way the packet can be treated as pointer as usual. */ coap_init_message(notification, COAP_TYPE_NON, CONTENT_2_05, 0 ); - coap_set_payload(notification, obs_content, snprintf(obs_content, sizeof(obs_content), "TICK %u", obs_counter)); + + REST.set_response_payload(notification, obs_content, snprintf(obs_content, sizeof(obs_content), "TICK %u", obs_counter)); + REST.set_header_content_type(notification, REST.type.TEXT_PLAIN); /* Notify the registered observers with the given message type, observe option, and payload. */ REST.notify_subscribers(r, obs_counter, notification);