Skip to content

nta: ACK and BYE an orphan 2xx over the connection the INVITE was sent on #346

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

nta: ACK and BYE an orphan 2xx over the connection the INVITE was sent on #346

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
16 changes: 14 additions & 2 deletions libsofia-sip-ua/nta/nta.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3930,7 +3930,17 @@ int complete_response(msg_t *response,
* let it terminate the session. As of @VERSION_1_12_7, this function just
* returns -1.
*/
static int nta_msg_ackbye_tport(nta_agent_t *agent, msg_t *msg, tport_t *tport);

int nta_msg_ackbye(nta_agent_t *agent, msg_t *msg)
{
return nta_msg_ackbye_tport(agent, msg, NULL);
}

/* ACK and BYE over the transport the orphan 2XX arrived on when given:
* WebSocket clients (RFC 7118) use an unroutable ".invalid" Contact and
* are reachable only over their existing connection. */
static int nta_msg_ackbye_tport(nta_agent_t *agent, msg_t *msg, tport_t *tport)
{
sip_t *sip = sip_object(msg);
msg_t *amsg = nta_msg_create(agent, 0);
Expand Down Expand Up @@ -3992,6 +4002,7 @@ int nta_msg_ackbye(nta_agent_t *agent, msg_t *msg)
if (!(ack = nta_outgoing_mcreate(agent, NULL, NULL, NULL, amsg,
NTATAG_ACK_BRANCH(sip->sip_via->v_branch),
NTATAG_STATELESS(1),
TAG_IF(tport, NTATAG_TPORT(tport)),
TAG_END())))
goto err;
else
Expand All @@ -4011,6 +4022,7 @@ int nta_msg_ackbye(nta_agent_t *agent, msg_t *msg)

if (!nta_outgoing_mcreate(agent, NULL, NULL, NULL, bmsg,
NTATAG_STATELESS(1),
TAG_IF(tport, NTATAG_TPORT(tport)),
TAG_END()))
goto err;

Expand Down Expand Up @@ -9549,7 +9561,7 @@ int outgoing_recv(nta_outgoing_t *_orq,
if (orq->orq_uas && su_strcasecmp(sip->sip_to->a_tag, orq->orq_tag) != 0) {
/* Orphan 200 Ok to INVITE. ACK and BYE it */
SU_DEBUG_5(("nta: Orphan 200 Ok send ACK&BYE %p\n", (void *)orq));
return nta_msg_ackbye(sa, msg);
return nta_msg_ackbye_tport(sa, msg, orq->orq_tport);
}
return -1; /* Proxy statelessly (RFC3261 section 16.11) */
}
Expand Down Expand Up @@ -9611,7 +9623,7 @@ int outgoing_recv(nta_outgoing_t *_orq,

/* Orphan 200 Ok to INVITE. ACK and BYE it */
SU_DEBUG_5(("nta: Orphan 200 Ok send ACK&BYE" VA_NONE));
return nta_msg_ackbye(sa, msg);
return nta_msg_ackbye_tport(sa, msg, orq->orq_tport);
}
}

Expand Down