michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: fix registration content format and use plain/text

Browse source 
1. According to the specification 5.3.1, it's a MUST to specify
   (1) content format: app link format (2) supported lwm2m version.
   Also, we should use text/plain instead of LWM2M's (obsolete).
2. Use LWM2M_FORMAT_OMA_TLV as default accept format when accept option
   is not given from the caller for TLV is a MUST have in LwM2M spec and
   it can deals w/ multiple resources read

Signed-off-by: Robert Chou <robert.ch.chou@acer.com>
This commit is contained in:
Robert Chou 2017-07-05 10:54:31 +08:00 • committed by Jukka Rissanen
commit 37e21a4152
3 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

25
subsys/net/lib/lwm2m/lwm2m_engine.c
View file

@ -54,19 +54,6 @@
#define ENGINE_UPDATE_INTERVAL 500
/* LWM2M / CoAP Content-Formats */
#define LWM2M_FORMAT_PLAIN_TEXT 0
#define LWM2M_FORMAT_APP_LINK_FORMAT 40
#define LWM2M_FORMAT_APP_OCTET_STREAM 42
#define LWM2M_FORMAT_APP_EXI 47
#define LWM2M_FORMAT_APP_JSON 50
#define LWM2M_FORMAT_OMA_PLAIN_TEXT 1541
#define LWM2M_FORMAT_OMA_OLD_TLV 1542
#define LWM2M_FORMAT_OMA_OLD_JSON 1543
#define LWM2M_FORMAT_OMA_OLD_OPAQUE 1544
#define LWM2M_FORMAT_OMA_TLV 11542
#define LWM2M_FORMAT_OMA_JSON 11543
#define DISCOVER_PREFACE "</.well-known/core>;ct=40"
#define BUF_ALLOC_TIMEOUT K_SECONDS(1)
@ -662,7 +649,7 @@ static u16_t select_writer(struct lwm2m_output_context *out, u16_t accept)
SYS_LOG_ERR("Unknown Accept type %u, using LWM2M plain text",
accept);
out->writer = &plain_text_writer;
accept = LWM2M_FORMAT_OMA_PLAIN_TEXT;
accept = LWM2M_FORMAT_PLAIN_TEXT;
break;
}
@ -674,6 +661,7 @@ static u16_t select_reader(struct lwm2m_input_context *in, u16_t format)
{
switch (format) {
case LWM2M_FORMAT_PLAIN_TEXT:
case LWM2M_FORMAT_OMA_PLAIN_TEXT:
in->reader = &plain_text_reader;
break;
@ -687,7 +675,7 @@ static u16_t select_reader(struct lwm2m_input_context *in, u16_t format)
SYS_LOG_ERR("Unknown content type %u, using LWM2M plain text",
format);
in->reader = &plain_text_reader;
format = LWM2M_FORMAT_OMA_PLAIN_TEXT;
format = LWM2M_FORMAT_PLAIN_TEXT;
break;
}
@ -1976,7 +1964,7 @@ static int handle_request(struct zoap_packet *request,
format = zoap_option_value_to_int(&options[0]);
} else {
SYS_LOG_DBG("No content-format given. Assume text plain.");
format = LWM2M_FORMAT_OMA_PLAIN_TEXT;
format = LWM2M_FORMAT_PLAIN_TEXT;
}
/* read Accept */
@ -1984,9 +1972,8 @@ static int handle_request(struct zoap_packet *request,
if (r > 0) {
accept = zoap_option_value_to_int(&options[0]);
} else {
SYS_LOG_DBG("No Accept header: use same as content-format(%d)",
format);
accept = format;
SYS_LOG_DBG("No accept option given. Assume OMA TLV.");
accept = LWM2M_FORMAT_OMA_TLV;
}
/* TODO: Handle bootstrap deleted -- re-add when DTLS support ready */