patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

net: lwm2m: fix retransmit_request() pending process / packet send

Browse source 
During the CoAP API change, slight changes were made the ref / unref
packet pending process.  Let's re-align with the coap-client sample
in how we apply the packet refs in retransmit_request() and also
replace the lwm2m_send_message() call with a direct call of
net_app_send_pkt().  This avoids a second processing of the pending
packets and keeps the ref/unref flow cleaner.

Signed-off-by: Michael Scott <michael@opensourcefoundries.com>
This commit is contained in:
Michael Scott 2018-01-30 13:50:59 -08:00 committed by Jukka Rissanen
parent db09596b1d
commit afb9830441
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3464,24 +3464,43 @@ static void retransmit_request(struct k_work *work)
return;
}
/* ref pkt to avoid being freed after net_app_send_pkt() */
net_pkt_ref(pending->pkt);
SYS_LOG_DBG("Resending message: %p", msg);
msg->send_attempts++;
/*
* Don't use lwm2m_send_message() because it calls
* coap_pending_cycle() / coap_pending_cycle() in a different order
* and under different circumstances. It also does it's own ref /
* unref of the net_pkt. Keep it simple and call net_app_send_pkt()
* directly here.
*/
r = net_app_send_pkt(&msg->ctx->net_app_ctx, msg->cpkt.pkt,
&msg->ctx->net_app_ctx.default_ctx->remote,
NET_SOCKADDR_MAX_SIZE, K_NO_WAIT, NULL);
if (r < 0) {
SYS_LOG_ERR("Error sending lwm2m message: %d", r);
/* don't error here, retry until timeout */
net_pkt_unref(pending->pkt);
}
if (!coap_pending_cycle(pending)) {
/* pending request has expired */
if (msg->message_timeout_cb) {
msg->message_timeout_cb(msg);
}
/* final unref to release pkt */
net_pkt_unref(pending->pkt);
/*
* coap_pending_clear() is called in lwm2m_reset_message()
* which balances the ref we made in coap_pending_cycle()
*/
lwm2m_reset_message(msg, true);
return;
}
r = lwm2m_send_message(msg);
if (r < 0) {
SYS_LOG_ERR("Error sending lwm2m message: %d", r);
/* don't error here, retry until timeout */
}
/* unref to balance ref we made for sendto() */
net_pkt_unref(pending->pkt);
k_delayed_work_submit(&client_ctx->retransmit_work, pending->timeout);
}