diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c index 5dddeb19759..92d5081b3b4 100644 --- a/subsys/net/lib/lwm2m/lwm2m_engine.c +++ b/subsys/net/lib/lwm2m/lwm2m_engine.c @@ -948,8 +948,7 @@ int lwm2m_init_message(struct lwm2m_message *msg) } r = coap_packet_init(&msg->cpkt, msg->msg_data, sizeof(msg->msg_data), - 1, msg->type, tokenlen, token, msg->code, - (msg->mid == LWM2M_MSG_ID_GENERATE_NEW ? coap_next_id() : msg->mid)); + 1, msg->type, tokenlen, token, msg->code, msg->mid); if (r < 0) { LOG_ERR("coap packet init error (err:%d)", r); goto cleanup; @@ -3973,7 +3972,7 @@ static int generate_notify_message(struct observe_node *obs, msg->type = COAP_TYPE_CON; msg->code = COAP_RESPONSE_CODE_CONTENT; - msg->mid = LWM2M_MSG_ID_GENERATE_NEW; + msg->mid = coap_next_id(); msg->token = obs->token; msg->tkl = obs->tkl; msg->reply_cb = notify_message_reply_cb; diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.h b/subsys/net/lib/lwm2m/lwm2m_engine.h index 677e9a77742..94fe10993b4 100644 --- a/subsys/net/lib/lwm2m/lwm2m_engine.h +++ b/subsys/net/lib/lwm2m/lwm2m_engine.h @@ -41,9 +41,6 @@ /* Use this value to skip token generation */ #define LWM2M_MSG_TOKEN_LEN_SKIP 0xFF -/* Use this value to generate a new message id */ -#define LWM2M_MSG_ID_GENERATE_NEW 0U - /* length of time in milliseconds to wait for buffer allocations */ #define BUF_ALLOC_TIMEOUT K_SECONDS(1) diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_firmware_pull.c b/subsys/net/lib/lwm2m/lwm2m_obj_firmware_pull.c index 21aa2902b11..156ca4dee22 100644 --- a/subsys/net/lib/lwm2m/lwm2m_obj_firmware_pull.c +++ b/subsys/net/lib/lwm2m/lwm2m_obj_firmware_pull.c @@ -84,7 +84,7 @@ static int transfer_request(struct coap_block_context *ctx, msg->type = COAP_TYPE_CON; msg->code = COAP_METHOD_GET; - msg->mid = LWM2M_MSG_ID_GENERATE_NEW; + msg->mid = coap_next_id(); msg->token = token; msg->tkl = tkl; msg->reply_cb = reply_cb; diff --git a/subsys/net/lib/lwm2m/lwm2m_rd_client.c b/subsys/net/lib/lwm2m/lwm2m_rd_client.c index 6b4f46ba5ba..e20646e8197 100644 --- a/subsys/net/lib/lwm2m/lwm2m_rd_client.c +++ b/subsys/net/lib/lwm2m/lwm2m_rd_client.c @@ -549,7 +549,7 @@ static int sm_do_bootstrap_reg(void) msg->type = COAP_TYPE_CON; msg->code = COAP_METHOD_POST; - msg->mid = LWM2M_MSG_ID_GENERATE_NEW; + msg->mid = coap_next_id(); msg->reply_cb = do_bootstrap_reply_cb; msg->message_timeout_cb = do_bootstrap_reg_timeout_cb; @@ -629,7 +629,7 @@ static int sm_send_registration(bool send_obj_support_data, msg->type = COAP_TYPE_CON; msg->code = COAP_METHOD_POST; - msg->mid = LWM2M_MSG_ID_GENERATE_NEW; + msg->mid = coap_next_id(); msg->reply_cb = reply_cb; msg->message_timeout_cb = timeout_cb; @@ -821,7 +821,7 @@ static int sm_do_deregister(void) msg->type = COAP_TYPE_CON; msg->code = COAP_METHOD_DELETE; - msg->mid = LWM2M_MSG_ID_GENERATE_NEW; + msg->mid = coap_next_id(); msg->reply_cb = do_deregister_reply_cb; msg->message_timeout_cb = do_deregister_timeout_cb;