Skip to content

nta: Ensure forked transactions are removed from parent's fork list #311

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nta: Ensure forked transactions are removed from parent's fork list #311

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
18 changes: 12 additions & 6 deletions libsofia-sip-ua/nta/nta.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8888,11 +8888,6 @@ outgoing_cut_off(nta_outgoing_t *orq)
if (outgoing_is_queued(orq))
outgoing_remove(orq);

#if 0
if (orq->orq_forked)
outgoing_remove_fork(orq);
#endif

outgoing_reset_timer(orq);

if (orq->orq_pending) {
Expand Down Expand Up @@ -8983,11 +8978,21 @@ void outgoing_destroy(nta_outgoing_t *orq)
&& !orq->orq_canceled
/* or it has been forked */
&& !orq->orq_forking && !orq->orq_forks) {
/* This transaction is not a fork */
orq->orq_destroyed = 1;
outgoing_terminate(orq);
return;
}

if (orq->orq_forked) {
/* This transaction is a fork */
outgoing_remove_fork(orq);
orq->orq_destroyed = 1;
outgoing_terminate(orq);
return;
}

/* This transaction is not a fork */
orq->orq_destroyed = 1;
orq->orq_callback = outgoing_default_cb;
orq->orq_magic = NULL;
Expand Down Expand Up @@ -9340,10 +9345,11 @@ outgoing_remove_fork(nta_outgoing_t *orq)
orq->orq_forks = NULL;
orq->orq_forking = NULL;
orq->orq_forked = 0;
return;
}
}

assert(orq == NULL);
assert(orq->orq_forking == NULL);
}

/** Terminate a client transaction. */
Expand Down