[nrf fromlist] mgmt: Adapt to API changes in zcbor 0.8.0

zcbor_new_state and zcbor_tstr_put_term

Signed-off-by: Øyvind Rønningstad <[email protected]>

Author: oyvindronningstad

include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt_client.h

@@ -45,11 +45,12 @@ void os_mgmt_client_init(struct os_mgmt_client *client, struct smp_client_object
  *
  * @param client OS mgmt client object
  * @param echo_string Echo string
+ * @param max_len Max length of @p echo_string
  *
  * @return 0 on success.
  * @return @ref mcumgr_err_t code on failure.
  */
-int os_mgmt_client_echo(struct os_mgmt_client *client, const char *echo_string);
+int os_mgmt_client_echo(struct os_mgmt_client *client, const char *echo_string, size_t max_len);
 
 /**
  * @brief Send SMP Reset command.

subsys/mgmt/mcumgr/grp/fs_mgmt/src/fs_mgmt.c

@@ -783,7 +783,7 @@ static int fs_mgmt_file_hash_checksum(struct smp_streamer *ctxt)
 	}
 
 	ok &= zcbor_tstr_put_lit(zse, "type")	&&
-	      zcbor_tstr_put_term(zse, type_arr);
+	      zcbor_tstr_put_term(zse, type_arr, sizeof(type_arr));
 
 	if (off != 0) {
 		ok &= zcbor_tstr_put_lit(zse, "off")	&&

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c

@@ -443,11 +443,11 @@ static bool img_mgmt_state_encode_slot(zcbor_state_t *zse, uint32_t slot, int st
 			ok = zcbor_tstr_put_lit(zse, "<\?\?\?>");
 		} else {
 			vers_str[sizeof(vers_str) - 1] = '\0';
-			ok = zcbor_tstr_put_term(zse, vers_str);
+			ok = zcbor_tstr_put_term(zse, vers_str, sizeof(vers_str));
 		}
 	}
 
-	ok = ok && zcbor_tstr_put_term(zse, "hash")						&&
+	ok = ok && zcbor_tstr_put_lit(zse, "hash")						&&
 	     zcbor_bstr_encode(zse, &zhash)						&&
 	     ZCBOR_ENCODE_FLAG(zse, "bootable", !(flags & IMAGE_F_NON_BOOTABLE))	&&
 	     ZCBOR_ENCODE_FLAG(zse, "pending", state_flags & REPORT_SLOT_PENDING)	&&

subsys/mgmt/mcumgr/grp/img_mgmt_client/src/img_mgmt_client.c

@@ -74,7 +74,7 @@ static int image_state_res_fn(struct net_buf *nb, void *user_data)
 		goto out;
 	}
 
-	zcbor_new_decode_state(zsd, ARRAY_SIZE(zsd), nb->data, nb->len, 1);
+	zcbor_new_decode_state(zsd, ARRAY_SIZE(zsd), nb->data, nb->len, 1, NULL, 0);
 
 	ok = zcbor_map_start_decode(zsd);
 	if (!ok) {
@@ -201,7 +201,7 @@ static int image_upload_res_fn(struct net_buf *nb, void *user_data)
 		goto end;
 	}
 
-	zcbor_new_decode_state(zsd, ARRAY_SIZE(zsd), nb->data, nb->len, 1);
+	zcbor_new_decode_state(zsd, ARRAY_SIZE(zsd), nb->data, nb->len, 1, NULL, 0);
 
 	rc = zcbor_map_decode_bulk(zsd, upload_res_decode, ARRAY_SIZE(upload_res_decode), &decoded);
 	if (rc || image_upload_buf->image_upload_offset == SIZE_MAX) {
@@ -233,7 +233,7 @@ static int erase_res_fn(struct net_buf *nb, void *user_data)
 		goto end;
 	}
 
-	zcbor_new_decode_state(zsd, ARRAY_SIZE(zsd), nb->data, nb->len, 1);
+	zcbor_new_decode_state(zsd, ARRAY_SIZE(zsd), nb->data, nb->len, 1, NULL, 0);
 
 	rc = zcbor_map_decode_bulk(zsd, upload_res_decode, ARRAY_SIZE(upload_res_decode), &decoded);
 	if (rc) {

subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c

@@ -207,7 +207,7 @@ os_mgmt_taskstat_encode_thread_name(zcbor_state_t *zse, int idx,
 	snprintf(thread_name, sizeof(thread_name) - 1, "%d", idx);
 	thread_name[sizeof(thread_name) - 1] = 0;
 
-	return zcbor_tstr_put_term(zse, thread_name);
+	return zcbor_tstr_put_term(zse, thread_name, sizeof(thread_name));
 }
 
 #endif

subsys/mgmt/mcumgr/grp/os_mgmt_client/src/os_mgmt_client.c

@@ -104,7 +104,7 @@ static int echo_res_fn(struct net_buf *nb, void *user_data)
 	}
 
 	/* Init ZCOR decoder state */
-	zcbor_new_decode_state(zsd, ARRAY_SIZE(zsd), nb->data, nb->len, 1);
+	zcbor_new_decode_state(zsd, ARRAY_SIZE(zsd), nb->data, nb->len, 1, NULL, 0);
 
 	ok = zcbor_map_decode_bulk(zsd, echo_response, ARRAY_SIZE(echo_response), &decoded) == 0;
 
@@ -119,7 +119,7 @@ static int echo_res_fn(struct net_buf *nb, void *user_data)
 	return rc;
 }
 
-int os_mgmt_client_echo(struct os_mgmt_client *client, const char *echo_string)
+int os_mgmt_client_echo(struct os_mgmt_client *client, const char *echo_string, size_t max_len)
 {
 	struct net_buf *nb;
 	int rc;
@@ -138,7 +138,8 @@ int os_mgmt_client_echo(struct os_mgmt_client *client, const char *echo_string)
 	zcbor_new_encode_state(zse, ARRAY_SIZE(zse), nb->data + nb->len, net_buf_tailroom(nb), 0);
 
 	ok = zcbor_map_start_encode(zse, 2) &&
-	     zcbor_tstr_put_lit(zse, "d") && zcbor_tstr_put_term(zse, echo_string) &&
+	     zcbor_tstr_put_lit(zse, "d") &&
+	     zcbor_tstr_put_term(zse, echo_string, max_len) &&
 	     zcbor_map_end_encode(zse, 2);
 
 	if (!ok) {

subsys/mgmt/mcumgr/grp/stat_mgmt/Kconfig

@@ -32,6 +32,14 @@ config MCUMGR_GRP_STAT_MAX_NAME_LEN
 	  stat read commands.  If a stat group's name exceeds this limit, it will
 	  be impossible to retrieve its values with a stat show command.
 
+config MCUMGR_STAT_MAX_NAME_LEN
+	int "Maximum stat name length"
+	default MCUMGR_GRP_STAT_MAX_NAME_LEN
+	depends on MCUMGR_GRP_STAT
+	help
+	  Limits the maximum length of stat names in MCUmgr requests, in bytes.
+	  This applies to both s_name and snm_name.
+
 module = MCUMGR_GRP_STAT
 module-str = mcumgr_grp_stat
 source "subsys/logging/Kconfig.template.log_config"

subsys/mgmt/mcumgr/grp/stat_mgmt/src/stat_mgmt.c

@@ -110,7 +110,7 @@ stat_mgmt_foreach_entry(zcbor_state_t *zse, const char *group_name, stat_mgmt_fo
 static int
 stat_mgmt_cb_encode(zcbor_state_t *zse, struct stat_mgmt_entry *entry)
 {
-	bool ok = zcbor_tstr_put_term(zse, entry->name) &&
+	bool ok = zcbor_tstr_put_term(zse, entry->name, CONFIG_MCUMGR_STAT_MAX_NAME_LEN) &&
 		  zcbor_uint32_put(zse, entry->value);
 
 	return ok ? MGMT_ERR_EOK : MGMT_ERR_EMSGSIZE;
@@ -215,7 +215,7 @@ stat_mgmt_list(struct smp_streamer *ctxt)
 	do {
 		cur = stats_group_get_next(cur);
 		if (cur != NULL) {
-			ok = zcbor_tstr_put_term(zse, cur->s_name);
+			ok = zcbor_tstr_put_term(zse, cur->s_name, CONFIG_MCUMGR_STAT_MAX_NAME_LEN);
 		}
 	} while (ok && cur != NULL);
 

subsys/mgmt/mcumgr/smp/src/smp.c

@@ -53,7 +53,7 @@ static void cbor_nb_reader_init(struct cbor_nb_reader *cnr, struct net_buf *nb)
 {
 	cnr->nb = nb;
 	zcbor_new_decode_state(cnr->zs, ARRAY_SIZE(cnr->zs), nb->data,
-			       nb->len, 1);
+			       nb->len, 1, NULL, 0);
 }
 
 static void cbor_nb_writer_init(struct cbor_nb_writer *cnw, struct net_buf *nb)
@@ -125,7 +125,7 @@ static int smp_build_err_rsp(struct smp_streamer *streamer, const struct smp_hdr
 #ifdef CONFIG_MCUMGR_SMP_VERBOSE_ERR_RESPONSE
 	if (ok && rc_rsn != NULL) {
 		ok = zcbor_tstr_put_lit(zsp, "rsn")			&&
-		     zcbor_tstr_put_term(zsp, rc_rsn);
+		     zcbor_tstr_put_term(zsp, rc_rsn, CONFIG_ZCBOR_MAX_STR_LEN);
 	}
 #else
 	ARG_UNUSED(rc_rsn);