patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

net: lwm2m: Refactor to use coap_get_option_int

Browse source 
Small clean-up to use coap_get_option_int.

Signed-off-by: Gerson Fernando Budke <nandojve@gmail.com>
This commit is contained in:
Gerson Fernando Budke 2020-05-28 00:00:38 -03:00 committed by Jukka Rissanen
parent ce26bb5365
commit ebe5345e87
1 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -142,10 +142,6 @@ static int sock_nfds;
/* TODO: figure out what's correct value */ /* TODO: figure out what's correct value */
#define TIMEOUT_BLOCKWISE_TRANSFER_MS (MSEC_PER_SEC * 30) #define TIMEOUT_BLOCKWISE_TRANSFER_MS (MSEC_PER_SEC * 30)
#define GET_BLOCK_NUM(v) ((v) >> 4)
#define GET_BLOCK_SIZE(v) (((v) & 0x7))
#define GET_MORE(v) (!!((v) & 0x08))
struct block_context { struct block_context {
struct coap_block_context ctx; struct coap_block_context ctx;
int64_t timestamp; int64_t timestamp;
@ -788,20 +784,6 @@ int lwm2m_delete_obj_inst(uint16_t obj_id, uint16_t obj_inst_id)
/* utility functions */ /* utility functions */
static int get_option_int(const struct coap_packet *cpkt, uint8_t opt)
{
struct coap_option option = {};
uint16_t count = 1U;
int r;
r = coap_find_options(cpkt, opt, &option, count);
if (r <= 0) {
return -ENOENT;
}
return coap_option_value_to_int(&option);
}
static uint16_t atou16(uint8_t *buf, uint16_t buflen, uint16_t *len) static uint16_t atou16(uint8_t *buf, uint16_t buflen, uint16_t *len)
{ {
uint16_t val = 0U; uint16_t val = 0U;
@ -2303,7 +2285,7 @@ int lwm2m_write_handler(struct lwm2m_engine_obj_inst *obj_inst,
if (res->post_write_cb) { if (res->post_write_cb) {
/* Get block1 option for checking MORE block flag */ /* Get block1 option for checking MORE block flag */
ret = get_option_int(msg->in.in_cpkt, COAP_OPTION_BLOCK1); ret = coap_get_option_int(msg->in.in_cpkt, COAP_OPTION_BLOCK1);
if (ret >= 0) { if (ret >= 0) {
last_block = !GET_MORE(ret); last_block = !GET_MORE(ret);
@ -3398,7 +3380,8 @@ static int handle_request(struct coap_packet *request,
} }
/* check for observe */ /* check for observe */
observe = get_option_int(msg->in.in_cpkt, COAP_OPTION_OBSERVE); observe = coap_get_option_int(msg->in.in_cpkt,
COAP_OPTION_OBSERVE);
msg->code = COAP_RESPONSE_CODE_CONTENT; msg->code = COAP_RESPONSE_CODE_CONTENT;
break; break;
@ -3443,7 +3426,7 @@ static int handle_request(struct coap_packet *request,
coap_packet_get_payload(msg->in.in_cpkt, &payload_len); coap_packet_get_payload(msg->in.in_cpkt, &payload_len);
/* Check for block transfer */ /* Check for block transfer */
r = get_option_int(msg->in.in_cpkt, COAP_OPTION_BLOCK1); r = coap_get_option_int(msg->in.in_cpkt, COAP_OPTION_BLOCK1);
if (r > 0) { if (r > 0) {
last_block = !GET_MORE(r); last_block = !GET_MORE(r);