Commit 43cded5d authored by Pekka Pessi's avatar Pekka Pessi
Browse files

nta.c: use already-resolved transport for CANCEL/ACK to [3456]XX

Ignore-this: 62035ca32fdbf89ce7e7b81fc5b2be4e

darcs-hash:20090302175801-db55f-e867bc437073e52f92ed4280215158f0dbf186f8.gz
parent 457957db
......@@ -7679,7 +7679,17 @@ nta_outgoing_t *outgoing_create(nta_agent_t *agent,
}
}
if (route_url && !orq->orq_user_tport) {
if (tpn) {
/* CANCEL or ACK to [3456]XX */
invalid = tport_name_dup(home, orq->orq_tpn, tpn);
#if HAVE_SOFIA_SRESOLV
assert(tport_name_is_resolved(orq->orq_tpn));
#endif
resolved = tport_name_is_resolved(orq->orq_tpn);
orq->orq_url = url_hdup(home, sip->sip_request->rq_url);
scheme = "sip"; /* XXX */
}
else if (route_url && !orq->orq_user_tport) {
invalid = nta_tpn_by_url(home, orq->orq_tpn, &scheme, &port, route_url);
if (override_tport) { /* Use transport protocol name from transport */
......@@ -7692,15 +7702,6 @@ nta_outgoing_t *outgoing_create(nta_agent_t *agent,
if (route_url != (url_string_t *)agent->sa_default_proxy)
orq->orq_route = url_hdup(home, route_url->us_url);
}
else if (tpn) {
invalid = tport_name_dup(home, orq->orq_tpn, tpn);
#if HAVE_SOFIA_SRESOLV
assert(tport_name_is_resolved(orq->orq_tpn));
#endif
resolved = tport_name_is_resolved(orq->orq_tpn);
orq->orq_url = url_hdup(home, sip->sip_request->rq_url);
scheme = "sip"; /* XXX */
}
else {
invalid = nta_tpn_by_url(home, orq->orq_tpn, &scheme, &port,
(url_string_t *)sip->sip_request->rq_url);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment