From 9b5841381de34188afb16af57c2c0f33907a0945 Mon Sep 17 00:00:00 2001 From: Jon Shallow Date: Mon, 8 Oct 2018 22:56:31 +0100 Subject: [PATCH] src/net.c: coap_delete_node() not removing node from context->sendqueue When coap_wait_ack() is called, it sets node->session with a bumped reference counter and does a coap_insert_node(&context->sendqueue, node). [I cannot find anywhere else where node->session gets set] If coap_delte_node(node) is called, and node-session is set, it previously only did a coap_session_release(node->session). Then when coap_write() is called, it does a coap_retransmit() on all the context->sendqueue entries, one or more of which could now be a deleted node..... The node is now removed if appropriate from context->sendqueue by coap_delete_node(). --- src/net.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/net.c b/src/net.c index 042f51ec..9add25da 100644 --- a/src/net.c +++ b/src/net.c @@ -227,8 +227,15 @@ coap_delete_node(coap_queue_t *node) { return 0; coap_delete_pdu(node->pdu); - if ( node->session ) + if ( node->session ) { + /* + * Need to remove out of context->sendqueue as added in by coap_wait_ack() + */ + if (node->session->context->sendqueue) { + LL_DELETE(node->session->context->sendqueue, node); + } coap_session_release(node->session); + } coap_free_node(node); return 1; @@ -985,9 +992,17 @@ coap_retransmit(coap_context_t *context, coap_queue_t *node) { #endif /* WITHOUT_OBSERVE */ if (node->session->con_active) { node->session->con_active--; - if (node->session->state == COAP_SESSION_STATE_ESTABLISHED) - /* Flush out any entries on session->delayqueue */ + if (node->session->state == COAP_SESSION_STATE_ESTABLISHED) { + /* + * As there may be another CON in a different queue entry on the same + * session that needs to be immediately released, + * coap_session_connected() is called. + * However, there is the possibility coap_wait_ack() may be called for + * this node (queue) and re-added to context->sendqueue. + * coap_delete_node(node) called shortly will handle this and remove it. + */ coap_session_connected(node->session); + } } /* And finally delete the node */