michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: fix Leshan discover OP

Browse source 
When using Leshan REST API to perform a discover OP on a client, only an
accept field is sent with "application/link-format".  Current logic uses
the content-type to determine when a discover OP is indicated.  Let's
handle this case as well.

Signed-off-by: Michael Scott <michael.scott@linaro.org>
This commit is contained in:
Michael Scott 2017-10-15 13:42:45 -07:00 • committed by Jukka Rissanen
commit ebe3660308
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -979,6 +979,10 @@ static u16_t select_writer(struct lwm2m_output_context *out, u16_t accept)
{ {
switch (accept) { switch (accept) {
case LWM2M_FORMAT_APP_LINK_FORMAT:
/* TODO: rewrite do_discover as content formatter */
break;
case LWM2M_FORMAT_PLAIN_TEXT: case LWM2M_FORMAT_PLAIN_TEXT:
case LWM2M_FORMAT_OMA_PLAIN_TEXT: case LWM2M_FORMAT_OMA_PLAIN_TEXT:
out->writer = &plain_text_writer; out->writer = &plain_text_writer;
@ -2433,7 +2437,12 @@ static int handle_request(struct coap_packet *request,
switch (code & COAP_REQUEST_MASK) { switch (code & COAP_REQUEST_MASK) {
case COAP_METHOD_GET: case COAP_METHOD_GET:
if (discover || format == LWM2M_FORMAT_APP_LINK_FORMAT) { /*
* Leshan sends only an accept=LWM2M_FORMAT_APP_LINK_FORMAT to
* indicate a discover OP
*/
if (discover || format == LWM2M_FORMAT_APP_LINK_FORMAT ||
accept == LWM2M_FORMAT_APP_LINK_FORMAT) {
context.operation = LWM2M_OP_DISCOVER; context.operation = LWM2M_OP_DISCOVER;
accept = LWM2M_FORMAT_APP_LINK_FORMAT; accept = LWM2M_FORMAT_APP_LINK_FORMAT;
} else { } else {