michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: rename path size define

Browse source 
Rename max path constant to prevent string length vs data size confusion

Signed-off-by: Pascal Brogle <pascal.brogle@husqvarnagroup.com>
This commit is contained in:
Pascal Brogle 2023-01-10 18:05:41 +01:00 • committed by Fabio Baltieri
commit b6bc324a1d
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/zephyr/net/lwm2m.h
View file

@ -1398,7 +1398,7 @@ void lwm2m_rd_client_update(void);
/** /**
* @brief LwM2M path maximum length * @brief LwM2M path maximum length
*/ */
#define LWM2M_MAX_PATH_STR_LEN sizeof("65535/65535/65535/65535") #define LWM2M_MAX_PATH_STR_SIZE sizeof("65535/65535/65535/65535")
/** /**
* @brief Helper function to print path objects' contents to log * @brief Helper function to print path objects' contents to log

2
samples/net/lwm2m_client/src/lwm2m-client.c
View file

@ -283,7 +283,7 @@ static void rd_client_event(struct lwm2m_ctx *client,
static void observe_cb(enum lwm2m_observe_event event, static void observe_cb(enum lwm2m_observe_event event,
struct lwm2m_obj_path *path, void *user_data) struct lwm2m_obj_path *path, void *user_data)
{ {
char buf[LWM2M_MAX_PATH_STR_LEN]; char buf[LWM2M_MAX_PATH_STR_SIZE];
switch (event) { switch (event) {

4
subsys/net/lib/lwm2m/lwm2m_obj_firmware.c
View file

@ -97,7 +97,7 @@ uint8_t lwm2m_firmware_get_update_state(void)
void lwm2m_firmware_set_update_state_inst(uint16_t obj_inst_id, uint8_t state) void lwm2m_firmware_set_update_state_inst(uint16_t obj_inst_id, uint8_t state)
{ {
bool error = false; bool error = false;
char path[LWM2M_MAX_PATH_STR_LEN]; char path[LWM2M_MAX_PATH_STR_SIZE];
snprintk(path, sizeof(path), "%" PRIu16 "/%" PRIu16 "/%" PRIu16, snprintk(path, sizeof(path), "%" PRIu16 "/%" PRIu16 "/%" PRIu16,
LWM2M_OBJECT_FIRMWARE_ID, obj_inst_id, FIRMWARE_UPDATE_RESULT_ID); LWM2M_OBJECT_FIRMWARE_ID, obj_inst_id, FIRMWARE_UPDATE_RESULT_ID);
@ -164,7 +164,7 @@ void lwm2m_firmware_set_update_result_inst(uint16_t obj_inst_id, uint8_t result)
{ {
uint8_t state; uint8_t state;
bool error = false; bool error = false;
char path[LWM2M_MAX_PATH_STR_LEN]; char path[LWM2M_MAX_PATH_STR_SIZE];
/* Check LWM2M SPEC appendix E.6.1 */ /* Check LWM2M SPEC appendix E.6.1 */
switch (result) { switch (result) {

6
subsys/net/lib/lwm2m/lwm2m_obj_swmgmt.c
View file

@ -205,7 +205,7 @@ static void *callback_read_not_defined(uint16_t obj_inst_id, uint16_t res_id, ui
static void set_sw_update_state(struct lwm2m_swmgmt_data *instance, uint8_t state) static void set_sw_update_state(struct lwm2m_swmgmt_data *instance, uint8_t state)
{ {
int ret; int ret;
char obj_path[LWM2M_MAX_PATH_STR_LEN]; char obj_path[LWM2M_MAX_PATH_STR_SIZE];
(void)snprintk(obj_path, sizeof(obj_path), "%d/%d/%d", LWM2M_OBJECT_SOFTWARE_MANAGEMENT_ID, (void)snprintk(obj_path, sizeof(obj_path), "%d/%d/%d", LWM2M_OBJECT_SOFTWARE_MANAGEMENT_ID,
instance->obj_inst_id, SWMGMT_UPDATE_STATE_ID); instance->obj_inst_id, SWMGMT_UPDATE_STATE_ID);
@ -218,7 +218,7 @@ static void set_sw_update_state(struct lwm2m_swmgmt_data *instance, uint8_t stat
static void set_sw_update_result(struct lwm2m_swmgmt_data *instance, uint8_t result) static void set_sw_update_result(struct lwm2m_swmgmt_data *instance, uint8_t result)
{ {
int ret; int ret;
char obj_path[LWM2M_MAX_PATH_STR_LEN]; char obj_path[LWM2M_MAX_PATH_STR_SIZE];
(void)snprintk(obj_path, sizeof(obj_path), "%d/%d/%d", LWM2M_OBJECT_SOFTWARE_MANAGEMENT_ID, (void)snprintk(obj_path, sizeof(obj_path), "%d/%d/%d", LWM2M_OBJECT_SOFTWARE_MANAGEMENT_ID,
instance->obj_inst_id, SWMGMT_UPDATE_RESULT_ID); instance->obj_inst_id, SWMGMT_UPDATE_RESULT_ID);
@ -231,7 +231,7 @@ static void set_sw_update_result(struct lwm2m_swmgmt_data *instance, uint8_t res
static void set_sw_update_act_state(struct lwm2m_swmgmt_data *instance, bool state) static void set_sw_update_act_state(struct lwm2m_swmgmt_data *instance, bool state)
{ {
int ret; int ret;
char obj_path[LWM2M_MAX_PATH_STR_LEN]; char obj_path[LWM2M_MAX_PATH_STR_SIZE];
(void)snprintk(obj_path, sizeof(obj_path), "%d/%d/%d", LWM2M_OBJECT_SOFTWARE_MANAGEMENT_ID, (void)snprintk(obj_path, sizeof(obj_path), "%d/%d/%d", LWM2M_OBJECT_SOFTWARE_MANAGEMENT_ID,
instance->obj_inst_id, SWMGMT_ACTIVATION_UPD_STATE_ID); instance->obj_inst_id, SWMGMT_ACTIVATION_UPD_STATE_ID);

4
subsys/net/lib/lwm2m/lwm2m_observation.c
View file

@ -459,7 +459,7 @@ static void engine_observe_node_init(struct observe_node *obs, const uint8_t *to
static void remove_observer_path_from_list(struct lwm2m_ctx *ctx, struct observe_node *obs, static void remove_observer_path_from_list(struct lwm2m_ctx *ctx, struct observe_node *obs,
struct lwm2m_obj_path_list *o_p, sys_snode_t *prev_node) struct lwm2m_obj_path_list *o_p, sys_snode_t *prev_node)
{ {
char buf[LWM2M_MAX_PATH_STR_LEN]; char buf[LWM2M_MAX_PATH_STR_SIZE];
LOG_DBG("Removing observer %p for path %s", obs, lwm2m_path_log_buf(buf, &o_p->path)); LOG_DBG("Removing observer %p for path %s", obs, lwm2m_path_log_buf(buf, &o_p->path));
if (ctx->observe_cb) { if (ctx->observe_cb) {
@ -799,7 +799,7 @@ char *lwm2m_path_log_buf(char *buf, struct lwm2m_obj_path *path)
#if defined(CONFIG_LWM2M_CANCEL_OBSERVE_BY_PATH) #if defined(CONFIG_LWM2M_CANCEL_OBSERVE_BY_PATH)
static int engine_remove_observer_by_path(struct lwm2m_ctx *ctx, struct lwm2m_obj_path *path) static int engine_remove_observer_by_path(struct lwm2m_ctx *ctx, struct lwm2m_obj_path *path)
{ {
char buf[LWM2M_MAX_PATH_STR_LEN]; char buf[LWM2M_MAX_PATH_STR_SIZE];
struct observe_node *obs; struct observe_node *obs;
struct lwm2m_obj_path_list obs_path_list_buf; struct lwm2m_obj_path_list obs_path_list_buf;
sys_slist_t lwm2m_path_list; sys_slist_t lwm2m_path_list;