michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: fix sending packet w/o token setup when error

Browse source 
Token is missing when we jump to the error and token is not yet setup.
To correct it, we grab the token from the input packet at the beginning
of the handle_request()

Signed-off-by: Robert Chou <robert.ch.chou@acer.com>
This commit is contained in:
Robert Chou 2017-11-15 16:20:05 +08:00 • committed by Jukka Rissanen
commit 9dcbbdb3e2
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2421,6 +2421,13 @@ static int handle_request(struct coap_packet *request,
code = coap_header_get_code(in.in_cpkt); code = coap_header_get_code(in.in_cpkt);
/* setup response token */
tkl = coap_header_get_token(in.in_cpkt, token);
if (tkl) {
msg->tkl = tkl;
msg->token = token;
}
/* parse the URL path into components */ /* parse the URL path into components */
r = coap_find_options(in.in_cpkt, COAP_OPTION_URI_PATH, options, 4); r = coap_find_options(in.in_cpkt, COAP_OPTION_URI_PATH, options, 4);
if (r <= 0) { if (r <= 0) {
@ -2529,13 +2536,6 @@ static int handle_request(struct coap_packet *request,
break; break;
} }
/* setup response token */
tkl = coap_header_get_token(in.in_cpkt, token);
if (tkl) {
msg->tkl = tkl;
msg->token = token;
}
/* setup incoming data */ /* setup incoming data */
in.frag = coap_packet_get_payload(in.in_cpkt, &in.offset, in.frag = coap_packet_get_payload(in.in_cpkt, &in.offset,
&in.payload_len); &in.payload_len);