net: lwm2m: LwM2M message allocation update

Allocated own message buffer for RD client interface.
This helps to cover if all messages are queued and need to do
registration or update.

Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
(cherry picked from commit 8dca91109d73a4a697e074c58ee9430d56c01a51)

Author: Juha Heiskanen

include/zephyr/net/lwm2m.h

@@ -113,9 +113,9 @@ struct lwm2m_ctx {
 	/** Destination address storage */
 	struct sockaddr remote_addr;
 
-	/** Private CoAP and networking structures */
-	struct coap_pending pendings[CONFIG_LWM2M_ENGINE_MAX_PENDING];
-	struct coap_reply replies[CONFIG_LWM2M_ENGINE_MAX_REPLIES];
+	/** Private CoAP and networking structures + 1 is for RD Client own message */
+	struct coap_pending pendings[CONFIG_LWM2M_ENGINE_MAX_PENDING + 1];
+	struct coap_reply replies[CONFIG_LWM2M_ENGINE_MAX_REPLIES + 1];
 	sys_slist_t pending_sends;
 #if defined(CONFIG_LWM2M_QUEUE_MODE_ENABLED)
 	sys_slist_t queued_messages;

subsys/net/lib/lwm2m/lwm2m_engine.c

@@ -1292,11 +1292,23 @@ static struct lwm2m_message *find_msg(struct coap_pending *pending,
 				      struct coap_reply *reply)
 {
 	size_t i;
+	struct lwm2m_message *msg;
 
 	if (!pending && !reply) {
 		return NULL;
 	}
 
+	msg = lwm2m_get_ongoing_rd_msg();
+	if (msg) {
+		if (pending != NULL && msg->pending == pending) {
+			return msg;
+		}
+
+		if (reply != NULL && msg->reply == reply) {
+			return msg;
+		}
+	}
+
 	for (i = 0; i < CONFIG_LWM2M_ENGINE_MAX_MESSAGES; i++) {
 		if (pending != NULL && messages[i].ctx &&
 		    messages[i].pending == pending) {
@@ -1326,7 +1338,7 @@ struct lwm2m_message *lwm2m_get_message(struct lwm2m_ctx *client_ctx)
 	return NULL;
 }
 
-static void lm2m_message_clear_allocations(struct lwm2m_message *msg)
+void lm2m_message_clear_allocations(struct lwm2m_message *msg)
 {
 	if (msg->pending) {
 		coap_pending_clear(msg->pending);
@@ -1399,7 +1411,7 @@ int lwm2m_init_message(struct lwm2m_message *msg)
 
 	msg->pending = coap_pending_next_unused(
 				msg->ctx->pendings,
-				CONFIG_LWM2M_ENGINE_MAX_PENDING);
+				ARRAY_SIZE(msg->ctx->pendings));
 	if (!msg->pending) {
 		LOG_ERR("Unable to find a free pending to track "
 			"retransmissions.");
@@ -1418,7 +1430,7 @@ int lwm2m_init_message(struct lwm2m_message *msg)
 	if (msg->reply_cb) {
 		msg->reply = coap_reply_next_unused(
 				msg->ctx->replies,
-				CONFIG_LWM2M_ENGINE_MAX_REPLIES);
+				ARRAY_SIZE(msg->ctx->replies));
 		if (!msg->reply) {
 			LOG_ERR("No resources for waiting for replies.");
 			r = -ENOMEM;
@@ -5094,7 +5106,7 @@ static int lwm2m_response_promote_to_con(struct lwm2m_message *msg)
 	/* Add the packet to the pending list. */
 	msg->pending = coap_pending_next_unused(
 				msg->ctx->pendings,
-				CONFIG_LWM2M_ENGINE_MAX_PENDING);
+				ARRAY_SIZE(msg->ctx->pendings));
 	if (!msg->pending) {
 		LOG_ERR("Unable to find a free pending to track "
 			"retransmissions.");
@@ -5133,7 +5145,7 @@ static void lwm2m_udp_receive(struct lwm2m_ctx *client_ctx,
 
 	tkl = coap_header_get_token(&response, token);
 	pending = coap_pending_received(&response, client_ctx->pendings,
-					CONFIG_LWM2M_ENGINE_MAX_PENDING);
+					ARRAY_SIZE(client_ctx->pendings));
 	if (pending && coap_header_get_type(&response) == COAP_TYPE_ACK) {
 		msg = find_msg(pending, NULL);
 		if (msg == NULL) {
@@ -5165,7 +5177,7 @@ static void lwm2m_udp_receive(struct lwm2m_ctx *client_ctx,
 		log_strdup(lwm2m_sprint_ip_addr(from_addr)));
 	reply = coap_response_received(&response, from_addr,
 				       client_ctx->replies,
-				       CONFIG_LWM2M_ENGINE_MAX_REPLIES);
+				       ARRAY_SIZE(client_ctx->replies));
 	if (reply) {
 		msg = find_msg(NULL, reply);
 
@@ -5251,7 +5263,7 @@ static int32_t retransmit_request(struct lwm2m_ctx *client_ctx,
 	int i;
 
 	for (i = 0, p = client_ctx->pendings;
-	     i < CONFIG_LWM2M_ENGINE_MAX_PENDING; i++, p++) {
+	     i < ARRAY_SIZE(client_ctx->pendings); i++, p++) {
 		if (!p->timeout) {
 			continue;
 		}
@@ -5607,9 +5619,10 @@ int lwm2m_engine_context_close(struct lwm2m_ctx *client_ctx)
 	}
 
 	coap_pendings_clear(client_ctx->pendings,
-			    CONFIG_LWM2M_ENGINE_MAX_PENDING);
+			    ARRAY_SIZE(client_ctx->pendings));
 	coap_replies_clear(client_ctx->replies,
-			   CONFIG_LWM2M_ENGINE_MAX_REPLIES);
+			   ARRAY_SIZE(client_ctx->replies));
+
 #if defined(CONFIG_LWM2M_QUEUE_MODE_ENABLED)
 	client_ctx->connection_suspended = false;
 	client_ctx->buffer_client_messages = true;

subsys/net/lib/lwm2m/lwm2m_engine.h

@@ -122,6 +122,7 @@ void lwm2m_engine_clear_duplicate_path(sys_slist_t *lwm2m_path_list, sys_slist_t
 /* LwM2M message functions */
 struct lwm2m_message *lwm2m_get_message(struct lwm2m_ctx *client_ctx);
 void lwm2m_reset_message(struct lwm2m_message *msg, bool release);
+void lm2m_message_clear_allocations(struct lwm2m_message *msg);
 int lwm2m_init_message(struct lwm2m_message *msg);
 int lwm2m_send_message_async(struct lwm2m_message *msg);
 /* Notification and Send operation */

subsys/net/lib/lwm2m/lwm2m_rd_client.c

@@ -100,9 +100,9 @@ enum sm_engine_state {
 
 struct lwm2m_rd_client_info {
 	struct k_mutex mutex;
-
-	uint32_t lifetime;
+	struct lwm2m_message rd_message;
 	struct lwm2m_ctx *ctx;
+	uint32_t lifetime;
 	uint8_t engine_state;
 	uint8_t retries;
 	uint8_t retry_delay;
@@ -127,6 +127,25 @@ struct lwm2m_rd_client_info {
  */
 static char query_buffer[MAX(32, sizeof("ep=") + CLIENT_EP_LEN)];
 
+static struct lwm2m_message *rd_get_message(void)
+{
+	if (client.rd_message.ctx) {
+		return NULL;
+	}
+
+	client.rd_message.ctx = client.ctx;
+	return &client.rd_message;
+
+}
+
+struct lwm2m_message *lwm2m_get_ongoing_rd_msg(void)
+{
+	if (!client.ctx || !client.rd_message.ctx) {
+		return NULL;
+	}
+	return &client.rd_message;
+}
+
 void engine_update_tx_time(void)
 {
 	client.last_tx = k_uptime_get();
@@ -618,7 +637,7 @@ static int sm_send_bootstrap_registration(void)
 	struct lwm2m_message *msg;
 	int ret;
 
-	msg = lwm2m_get_message(client.ctx);
+	msg = rd_get_message();
 	if (!msg) {
 		LOG_ERR("Unable to get a lwm2m message!");
 		return -ENOMEM;
@@ -745,7 +764,7 @@ static int sm_send_registration(bool send_obj_support_data,
 	char binding[CLIENT_BINDING_LEN];
 	char queue[CLIENT_QUEUE_LEN];
 
-	msg = lwm2m_get_message(client.ctx);
+	msg = rd_get_message();
 	if (!msg) {
 		LOG_ERR("Unable to get a lwm2m message!");
 		return -ENOMEM;
@@ -1001,7 +1020,7 @@ static int sm_do_deregister(void)
 	struct lwm2m_message *msg;
 	int ret;
 
-	msg = lwm2m_get_message(client.ctx);
+	msg = rd_get_message();
 	if (!msg) {
 		LOG_ERR("Unable to get a lwm2m message!");
 		ret = -ENOMEM;
@@ -1278,6 +1297,7 @@ bool lwm2m_rd_client_is_registred(struct lwm2m_ctx *client_ctx)
 static int lwm2m_rd_client_init(const struct device *dev)
 {
 	client.ctx = NULL;
+	client.rd_message.ctx = NULL;
 	client.engine_state = ENGINE_IDLE;
 	k_mutex_init(&client.mutex);
 

subsys/net/lib/lwm2m/lwm2m_rd_client.h

@@ -50,5 +50,6 @@ void engine_bootstrap_finish(void);
 int lwm2m_rd_client_connection_resume(struct lwm2m_ctx *client_ctx);
 #endif
 void engine_update_tx_time(void);
+struct lwm2m_message *lwm2m_get_ongoing_rd_msg(void);
 
 #endif /* LWM2M_RD_CLIENT_H */