Skip to content

nta: don't abort on an outgoing transaction re-queued without progress #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
garacil wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nta: don't abort on an outgoing transaction re-queued without progress #333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion libsofia-sip-ua/nta/nta.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9172,7 +9172,17 @@ size_t outgoing_timer_bf(outgoing_queue_t *q,
else
outgoing_terminate(orq);

assert(q->q_head != orq || (int32_t)(orq->orq_timeout - now) > 0);
/* Anti-spin guard: outgoing_timeout() may re-queue orq at the head of the
* same queue (retry/resolve-next). Normally the re-queue sets a future
* timeout; if the same orq is back at the head with a non-advanced timeout,
* continuing would spin on it. Stop this pass and let the next timer turn
* retry it (agent_timer reschedules to now+1 for a still-due head) rather
* than aborting the process (this was an assert()). */
if (q->q_head == orq && (int32_t)(orq->orq_timeout - now) <= 0) {
SU_DEBUG_3(("nta: timer %s: %s (%u) re-queued without progress, deferring to next timer turn\n",
timer, orq->orq_method_name, orq->orq_cseq->cs_seq));
break;
}
}

return timeout;
Expand Down