michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m2: LwM2M Composite-Write operation

Browse source 
CoAP method iPATCH enable LwM2M Composite-Write operation.

Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
This commit is contained in:
Juha Heiskanen 2022-01-21 03:23:56 -08:00 • committed by Carles Cufí
commit 98cd71eef2
1 changed files with 56 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3852,6 +3852,22 @@ static int do_write_op(struct lwm2m_message *msg,
} }
} }
static int do_composite_write_op(struct lwm2m_message *msg,
uint16_t format)
{
switch (format) {
#if defined(CONFIG_LWM2M_RW_SENML_JSON_SUPPORT)
case LWM2M_FORMAT_APP_SEML_JSON:
return do_write_op_senml_json(msg);
#endif
default:
LOG_ERR("Unsupported format: %u", format);
return -ENOMSG;
}
}
#if defined(CONFIG_LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP) #if defined(CONFIG_LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
static bool bootstrap_delete_allowed(int obj_id, int obj_inst_id) static bool bootstrap_delete_allowed(int obj_id, int obj_inst_id)
{ {
@ -3928,6 +3944,28 @@ static int bootstrap_delete(struct lwm2m_message *msg)
} }
#endif #endif
static bool lwm2m_engine_path_included(uint8_t code, bool bootstrap_mode)
{
switch (code & COAP_REQUEST_MASK) {
#if defined(CONFIG_LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
case COAP_METHOD_DELETE:
case COAP_METHOD_GET:
if (bootstrap_mode) {
return false;
}
break;
#endif
case COAP_METHOD_FETCH:
/* Composite Read operation */
case COAP_METHOD_IPATCH:
/* Composite write operation */
return false;
default:
break;
}
return true;
}
static int handle_request(struct coap_packet *request, static int handle_request(struct coap_packet *request,
struct lwm2m_message *msg) struct lwm2m_message *msg)
{ {
@ -3978,28 +4016,13 @@ static int handle_request(struct coap_packet *request,
r = 0; r = 0;
} }
if (r == 0) { if (r == 0 && lwm2m_engine_path_included(code, msg->ctx->bootstrap_mode)) {
/* No URI path or empty URI path option - allowed only during /* No URI path or empty URI path option - allowed only during
* bootstrap or CoAP Fetch. * bootstrap or CoAP Fetch or iPATCH.
*/ */
switch (code & COAP_REQUEST_MASK) {
#if defined(CONFIG_LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
case COAP_METHOD_DELETE:
case COAP_METHOD_GET:
if (msg->ctx->bootstrap_mode) {
break;
}
r = -EPERM; r = -EPERM;
goto error; goto error;
#endif
case COAP_METHOD_FETCH:
break;
default:
r = -EPERM;
goto error;
}
} }
#if defined(CONFIG_LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP) #if defined(CONFIG_LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
@ -4051,8 +4074,8 @@ static int handle_request(struct coap_packet *request,
goto error; goto error;
} }
/* Do Only Object find if Method is not a FETCH */ /* Do Only Object find if path have been parsed */
if ((code & COAP_REQUEST_MASK) != COAP_METHOD_FETCH) { if (lwm2m_engine_path_included(code, msg->ctx->bootstrap_mode)) {
if (!(msg->ctx->bootstrap_mode && msg->path.level == LWM2M_PATH_LEVEL_NONE)) { if (!(msg->ctx->bootstrap_mode && msg->path.level == LWM2M_PATH_LEVEL_NONE)) {
/* find registered obj */ /* find registered obj */
obj = get_engine_obj(msg->path.obj_id); obj = get_engine_obj(msg->path.obj_id);
@ -4093,6 +4116,11 @@ static int handle_request(struct coap_packet *request,
msg->code = COAP_RESPONSE_CODE_CONTENT; msg->code = COAP_RESPONSE_CODE_CONTENT;
break; break;
case COAP_METHOD_IPATCH:
msg->operation = LWM2M_OP_WRITE;
msg->code = COAP_RESPONSE_CODE_CHANGED;
break;
case COAP_METHOD_POST: case COAP_METHOD_POST:
if (msg->path.level == 1U) { if (msg->path.level == 1U) {
/* create an object instance */ /* create an object instance */
@ -4265,7 +4293,13 @@ static int handle_request(struct coap_packet *request,
case LWM2M_OP_WRITE: case LWM2M_OP_WRITE:
case LWM2M_OP_CREATE: case LWM2M_OP_CREATE:
if ((code & COAP_REQUEST_MASK) == COAP_METHOD_IPATCH) {
/* iPATCH is for Composite purpose */
r = do_composite_write_op(msg, format);
} else {
/* Single resource write Operation */
r = do_write_op(msg, format); r = do_write_op(msg, format);
}
break; break;
case LWM2M_OP_WRITE_ATTR: case LWM2M_OP_WRITE_ATTR: