michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: fix error handling in handle_request()

Browse source 
Let's reset the payload and return correct response error codes.

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

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

@ -2515,7 +2515,10 @@ static int handle_request(struct coap_packet *request,
}
/* render CoAP packet header */
lwm2m_init_message(msg);
r = lwm2m_init_message(msg);
if (r < 0) {
goto error;
}
switch (context.operation) {
@ -2526,9 +2529,10 @@ static int handle_request(struct coap_packet *request,
r = coap_append_option_int(out.out_cpkt,
COAP_OPTION_OBSERVE,
1);
if (r) {
if (r < 0) {
SYS_LOG_ERR("OBSERVE option error: %d",
r);
goto error;
}
r = engine_add_observer(msg, token, tkl, &path,
@ -2551,9 +2555,10 @@ static int handle_request(struct coap_packet *request,
r = coap_append_option_int(out.out_cpkt,
COAP_OPTION_CONTENT_FORMAT,
accept);
if (r > 0) {
if (r < 0) {
SYS_LOG_ERR("Error setting response content-format: %d",
r);
goto error;
}
r = do_read_op(obj, &context);
@ -2585,7 +2590,7 @@ static int handle_request(struct coap_packet *request,
r = -EINVAL;
}
if (r) {
if (r < 0) {
goto error;
}
@ -2614,7 +2619,7 @@ static int handle_request(struct coap_packet *request,
return 0;
error:
/* TODO: reset CoAP packet and empty payload */
lwm2m_reset_message(msg, false);
if (r == -ENOENT) {
msg->code = COAP_RESPONSE_CODE_NOT_FOUND;
} else if (r == -EPERM) {
@ -2628,6 +2633,11 @@ error:
msg->code = COAP_RESPONSE_CODE_INTERNAL_ERROR;
}
r = lwm2m_init_message(msg);
if (r < 0) {
SYS_LOG_ERR("Error recreating message: %d", r);
}
/* Free block context when error happened */
free_block_ctx(block_ctx);