michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: fix log_strdup missing errors

Browse source 
Due to commit a211afb0 ("logging: Add option to detect missed
transient string duplication"), the logs for LwM2M subsystem
is now spamming missing log_strdup() calls.

Let's add log_strdup() where needed.

Signed-off-by: Michael Scott <mike@foundries.io>
This commit is contained in:
Michael Scott 2019-05-29 16:49:18 -07:00 • committed by Jukka Rissanen
commit a46db55d0a
2 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -448,7 +448,8 @@ static int engine_add_observer(struct lwm2m_message *msg,
LOG_DBG("OBSERVER DUPLICATE %u/%u/%u(%u) [%s]", LOG_DBG("OBSERVER DUPLICATE %u/%u/%u(%u) [%s]",
msg->path.obj_id, msg->path.obj_inst_id, msg->path.obj_id, msg->path.obj_inst_id,
msg->path.res_id, msg->path.level, msg->path.res_id, msg->path.level,
lwm2m_sprint_ip_addr(&msg->ctx->remote_addr)); log_strdup(
lwm2m_sprint_ip_addr(&msg->ctx->remote_addr)));
return 0; return 0;
} }
@ -548,8 +549,8 @@ static int engine_add_observer(struct lwm2m_message *msg,
LOG_DBG("OBSERVER ADDED %u/%u/%u(%u) token:'%s' addr:%s", LOG_DBG("OBSERVER ADDED %u/%u/%u(%u) token:'%s' addr:%s",
msg->path.obj_id, msg->path.obj_inst_id, msg->path.obj_id, msg->path.obj_inst_id,
msg->path.res_id, msg->path.level, msg->path.res_id, msg->path.level,
sprint_token(token, tkl), log_strdup(sprint_token(token, tkl)),
lwm2m_sprint_ip_addr(&msg->ctx->remote_addr)); log_strdup(lwm2m_sprint_ip_addr(&msg->ctx->remote_addr)));
return 0; return 0;
} }
@ -582,7 +583,7 @@ static int engine_remove_observer(const u8_t *token, u8_t tkl)
sys_slist_remove(&engine_observer_list, prev_node, &found_obj->node); sys_slist_remove(&engine_observer_list, prev_node, &found_obj->node);
(void)memset(found_obj, 0, sizeof(*found_obj)); (void)memset(found_obj, 0, sizeof(*found_obj));
LOG_DBG("observer '%s' removed", sprint_token(token, tkl)); LOG_DBG("observer '%s' removed", log_strdup(sprint_token(token, tkl)));
return 0; return 0;
} }
@ -1313,7 +1314,7 @@ int lwm2m_engine_create_obj_inst(char *pathstr)
struct lwm2m_engine_obj_inst *obj_inst; struct lwm2m_engine_obj_inst *obj_inst;
int ret = 0; int ret = 0;
LOG_DBG("path:%s", pathstr); LOG_DBG("path:%s", log_strdup(pathstr));
/* translate path -> path_obj */ /* translate path -> path_obj */
ret = string_to_path(pathstr, &path, '/'); ret = string_to_path(pathstr, &path, '/');
@ -1372,7 +1373,7 @@ static int lwm2m_engine_set(char *pathstr, void *value, u16_t len)
int ret = 0; int ret = 0;
bool changed = false; bool changed = false;
LOG_DBG("path:%s, value:%p, len:%d", pathstr, value, len); LOG_DBG("path:%s, value:%p, len:%d", log_strdup(pathstr), value, len);
/* translate path -> path_obj */ /* translate path -> path_obj */
ret = string_to_path(pathstr, &path, '/'); ret = string_to_path(pathstr, &path, '/');
@ -1617,7 +1618,7 @@ static int lwm2m_engine_get(char *pathstr, void *buf, u16_t buflen)
void *data_ptr = NULL; void *data_ptr = NULL;
size_t data_len = 0; size_t data_len = 0;
LOG_DBG("path:%s, buf:%p, buflen:%d", pathstr, buf, buflen); LOG_DBG("path:%s, buf:%p, buflen:%d", log_strdup(pathstr), buf, buflen);
/* translate path -> path_obj */ /* translate path -> path_obj */
ret = string_to_path(pathstr, &path, '/'); ret = string_to_path(pathstr, &path, '/');
@ -2401,7 +2402,7 @@ static int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj,
if (ret < 0) { if (ret < 0) {
LOG_ERR("invalid attr[%s] value", LOG_ERR("invalid attr[%s] value",
LWM2M_ATTR_STR[type]); log_strdup(LWM2M_ATTR_STR[type]));
/* bad request */ /* bad request */
return -EEXIST; return -EEXIST;
} }
@ -2450,7 +2451,8 @@ static int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj,
type = attr->type; type = attr->type;
if (!(BIT(type) & nattrs.flags)) { if (!(BIT(type) & nattrs.flags)) {
LOG_DBG("Unset attr %s", LWM2M_ATTR_STR[type]); LOG_DBG("Unset attr %s",
log_strdup(LWM2M_ATTR_STR[type]));
(void)memset(attr, 0, sizeof(*attr)); (void)memset(attr, 0, sizeof(*attr));
if (type <= LWM2M_ATTR_PMAX) { if (type <= LWM2M_ATTR_PMAX) {
@ -2479,7 +2481,8 @@ static int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj,
sizeof(float32_value_t)); sizeof(float32_value_t));
} }
LOG_DBG("Update %s to %d.%06d", LWM2M_ATTR_STR[type], LOG_DBG("Update %s to %d.%06d",
log_strdup(LWM2M_ATTR_STR[type]),
attr->float_val.val1, attr->float_val.val2); attr->float_val.val1, attr->float_val.val2);
} }
@ -2513,7 +2516,7 @@ static int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj,
} }
nattrs.flags &= ~BIT(type); nattrs.flags &= ~BIT(type);
LOG_DBG("Add %s to %d.%06d", LWM2M_ATTR_STR[type], LOG_DBG("Add %s to %d.%06d", log_strdup(LWM2M_ATTR_STR[type]),
attr->float_val.val1, attr->float_val.val2); attr->float_val.val1, attr->float_val.val2);
} }
@ -3470,7 +3473,7 @@ static void lwm2m_udp_receive(struct lwm2m_ctx *client_ctx,
} }
LOG_DBG("checking for reply from [%s]", LOG_DBG("checking for reply from [%s]",
lwm2m_sprint_ip_addr(from_addr)); log_strdup(lwm2m_sprint_ip_addr(from_addr)));
reply = coap_response_received(&response, from_addr, reply = coap_response_received(&response, from_addr,
client_ctx->replies, client_ctx->replies,
CONFIG_LWM2M_ENGINE_MAX_REPLIES); CONFIG_LWM2M_ENGINE_MAX_REPLIES);
@ -3607,7 +3610,7 @@ static int notify_message_reply_cb(const struct coap_packet *response,
type, type,
COAP_RESPONSE_CODE_CLASS(code), COAP_RESPONSE_CODE_CLASS(code),
COAP_RESPONSE_CODE_DETAIL(code), COAP_RESPONSE_CODE_DETAIL(code),
sprint_token(reply->token, reply->tkl)); log_strdup(sprint_token(reply->token, reply->tkl)));
/* remove observer on COAP_TYPE_RESET */ /* remove observer on COAP_TYPE_RESET */
if (type == COAP_TYPE_RESET) { if (type == COAP_TYPE_RESET) {
@ -3652,8 +3655,8 @@ static int generate_notify_message(struct observe_node *obs,
obs->path.obj_inst_id, obs->path.obj_inst_id,
obs->path.res_id, obs->path.res_id,
obs->path.level, obs->path.level,
sprint_token(obs->token, obs->tkl), log_strdup(sprint_token(obs->token, obs->tkl)),
lwm2m_sprint_ip_addr(&obs->ctx->remote_addr), log_strdup(lwm2m_sprint_ip_addr(&obs->ctx->remote_addr)),
k_uptime_get()); k_uptime_get());
obj_inst = get_engine_obj_inst(obs->path.obj_id, obj_inst = get_engine_obj_inst(obs->path.obj_id,
@ -3966,7 +3969,8 @@ static int load_tls_credential(struct lwm2m_ctx *client_ctx, u16_t res_id,
ret = lwm2m_engine_get_res_data(pathstr, &cred, &cred_len, &cred_flags); ret = lwm2m_engine_get_res_data(pathstr, &cred, &cred_len, &cred_flags);
if (ret < 0) { if (ret < 0) {
LOG_ERR("Unable to get resource data for '%s'", pathstr); LOG_ERR("Unable to get resource data for '%s'",
log_strdup(pathstr));
return ret; return ret;
} }
@ -3977,7 +3981,8 @@ static int load_tls_credential(struct lwm2m_ctx *client_ctx, u16_t res_id,
ret = tls_credential_add(client_ctx->tls_tag, type, cred, cred_len); ret = tls_credential_add(client_ctx->tls_tag, type, cred, cred_len);
if (ret < 0) { if (ret < 0) {
LOG_ERR("Unable to get resource data for '%s'", pathstr); LOG_ERR("Unable to get resource data for '%s'",
log_strdup(pathstr));
} }
return ret; return ret;
@ -4055,7 +4060,7 @@ int lwm2m_parse_peerinfo(char *url, struct sockaddr *addr, bool *use_dtls)
http_parser_url_init(&parser); http_parser_url_init(&parser);
ret = http_parser_parse_url(url, strlen(url), 0, &parser); ret = http_parser_parse_url(url, strlen(url), 0, &parser);
if (ret < 0) { if (ret < 0) {
LOG_ERR("Invalid url: %s", url); LOG_ERR("Invalid url: %s", log_strdup(url));
return -ENOTSUP; return -ENOTSUP;
} }

14
subsys/net/lib/lwm2m/lwm2m_rd_client.c
View file

@ -274,7 +274,7 @@ static int do_registration_reply_cb(const struct coap_packet *response,
client.server_ep[options[1].len] = '\0'; client.server_ep[options[1].len] = '\0';
set_sm_state(ENGINE_REGISTRATION_DONE); set_sm_state(ENGINE_REGISTRATION_DONE);
LOG_INF("Registration Done (EP='%s')", LOG_INF("Registration Done (EP='%s')",
client.server_ep); log_strdup(client.server_ep));
return 0; return 0;
} else if (code == COAP_RESPONSE_CODE_NOT_FOUND) { } else if (code == COAP_RESPONSE_CODE_NOT_FOUND) {
@ -488,7 +488,7 @@ static int sm_do_bootstrap_reg(void)
} }
LOG_INF("Bootstrap started with endpoint '%s' with client lifetime %d", LOG_INF("Bootstrap started with endpoint '%s' with client lifetime %d",
client.ep_name, client.lifetime); log_strdup(client.ep_name), client.lifetime);
ret = lwm2m_engine_start(client.ctx); ret = lwm2m_engine_start(client.ctx);
if (ret < 0) { if (ret < 0) {
@ -526,7 +526,7 @@ static int sm_do_bootstrap_reg(void)
/* log the bootstrap attempt */ /* log the bootstrap attempt */
LOG_DBG("Register ID with bootstrap server as '%s'", LOG_DBG("Register ID with bootstrap server as '%s'",
query_buffer); log_strdup(query_buffer));
ret = lwm2m_send_message(msg); ret = lwm2m_send_message(msg);
if (ret < 0) { if (ret < 0) {
@ -658,7 +658,7 @@ static int sm_send_registration(bool send_obj_support_data,
/* log the registration attempt */ /* log the registration attempt */
LOG_DBG("registration sent [%s]", LOG_DBG("registration sent [%s]",
lwm2m_sprint_ip_addr(&client.ctx->remote_addr)); log_strdup(lwm2m_sprint_ip_addr(&client.ctx->remote_addr)));
return 0; return 0;
@ -691,7 +691,7 @@ static int sm_do_registration(void)
} }
LOG_INF("RD Client started with endpoint '%s' with client lifetime %d", LOG_INF("RD Client started with endpoint '%s' with client lifetime %d",
client.ep_name, client.lifetime); log_strdup(client.ep_name), client.lifetime);
ret = lwm2m_engine_start(client.ctx); ret = lwm2m_engine_start(client.ctx);
if (ret < 0) { if (ret < 0) {
@ -771,7 +771,7 @@ static int sm_do_deregister(void)
client.server_ep, client.server_ep,
strlen(client.server_ep)); strlen(client.server_ep));
LOG_INF("Deregister from '%s'", client.server_ep); LOG_INF("Deregister from '%s'", log_strdup(client.server_ep));
ret = lwm2m_send_message(msg); ret = lwm2m_send_message(msg);
if (ret < 0) { if (ret < 0) {
@ -861,7 +861,7 @@ void lwm2m_rd_client_start(struct lwm2m_ctx *client_ctx, const char *ep_name,
set_sm_state(ENGINE_INIT); set_sm_state(ENGINE_INIT);
strncpy(client.ep_name, ep_name, CLIENT_EP_LEN - 1); strncpy(client.ep_name, ep_name, CLIENT_EP_LEN - 1);
LOG_INF("LWM2M Client: %s", client.ep_name); LOG_INF("LWM2M Client: %s", log_strdup(client.ep_name));
} }
static int lwm2m_rd_client_init(struct device *dev) static int lwm2m_rd_client_init(struct device *dev)