obgm/libcoap
2
0 Fork 0
mirror of https://github.com/obgm/libcoap.git synced 2026-11-12 11:40:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #239 from mrdeep1/delayqueue-flush

Browse Source 
net.c: Flush out delayqueue if a CON times out
This commit is contained in:
obgm authored and GitHub committed 2018-09-24 17:54:22 +02:00
2 parents 354c7b4e9c 9db731d218
commit a2986f1bdb
2 files changed
+11 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/coap_session.c
+4 -2
View File
@@ -334,13 +334,15 @@ void coap_session_connected(coap_session_t *session) {
while (session->delayqueue && session->state == COAP_SESSION_STATE_ESTABLISHED) {
ssize_t bytes_written;
coap_queue_t *q = session->delayqueue;
session->delayqueue = q->next;
q->next = NULL;
if (q->pdu->type == COAP_MESSAGE_CON && COAP_PROTO_NOT_RELIABLE(session->proto)) {
if (session->con_active >= COAP_DEFAULT_NSTART)
break;
session->con_active++;
}
/* Take entry off the queue */
session->delayqueue = q->next;
q->next = NULL;
coap_log(LOG_DEBUG, "** %s: tid=%d: transmitted after delay\n",
coap_session_str(session), (int)q->pdu->tid);
bytes_written = coap_session_send_pdu(session, q->pdu);
src/net.c
+7 -3
View File
@@ -983,8 +983,12 @@ coap_retransmit(coap_context_t *context, coap_queue_t *node) {
coap_handle_failed_notify(context, node->session, &token);
}
#endif /* WITHOUT_OBSERVE */
if (node->session->con_active)
if (node->session->con_active) {
node->session->con_active--;
if (node->session->state == COAP_SESSION_STATE_ESTABLISHED)
/* Flush out any entries on session->delayqueue */
coap_session_connected(node->session);
}
/* And finally delete the node */
if (node->pdu->type == COAP_MESSAGE_CON && context->nack_handler)
@@ -2152,7 +2156,7 @@ coap_dispatch(coap_context_t *context, coap_session_t *session,
if (session->con_active) {
session->con_active--;
if (session->state == COAP_SESSION_STATE_ESTABLISHED)
/* Flush out any entries on session->sendqueue */
/* Flush out any entries on session->delayqueue */
coap_session_connected(session);
}
if (pdu->code == 0)
@@ -2178,7 +2182,7 @@ coap_dispatch(coap_context_t *context, coap_session_t *session,
if (session->con_active) {
session->con_active--;
if (session->state == COAP_SESSION_STATE_ESTABLISHED)
/* Flush out any entries on session->sendqueue */
/* Flush out any entries on session->delayqueue */
coap_session_connected(session);
}