Skip to content
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

Avoid unexpected "482 Request Merged" #211

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Avoid unexpected "482 Request Merged" #211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
016cfe1
nta.c/leg_find: Fix 'by method' leg matching condition
Apr 10, 2023
6cf8d6a
nta.c/incoming_find: Fix "Merged Request" case matching /RFC3261 8.2.…
Apr 10, 2023
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
16 changes: 11 additions & 5 deletions libsofia-sip-ua/nta/nta.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5120,7 +5120,7 @@ nta_leg_t *leg_find(nta_agent_t const *sa,

if (leg_url && request_uri && url_cmp(leg_url, request_uri))
continue;
if (leg_method && method_name && !su_casematch(method_name, leg_method))
if (leg_method == NULL || method_name && !su_casematch(method_name, leg_method))
continue;

/* Perfect match if both local and To have tag
Expand Down Expand Up @@ -6238,10 +6238,16 @@ static nta_incoming_t *incoming_find(nta_agent_t const *agent,

/* RFC3261 - section 8.2.2.2 Merged Requests */
if (return_merge) {
if (irq->irq_cseq->cs_method == cseq->cs_method &&
strcmp(irq->irq_cseq->cs_method_name,
cseq->cs_method_name) == 0)
*return_merge = irq, return_merge = NULL;
/* RFC3261 - section 17.2.3 Matching Requests to Server Transactions */
if (irq->irq_via->v_branch &&
su_casematch(irq->irq_via->v_branch, v->v_branch) &&
su_casematch(irq->irq_via->v_host, v->v_host) &&
su_strmatch(irq->irq_via->v_port, v->v_port)) {
if (irq->irq_cseq->cs_method == cseq->cs_method &&
strcmp(irq->irq_cseq->cs_method_name,
cseq->cs_method_name) == 0)
*return_merge = irq, return_merge = NULL;
}
}
}

Expand Down