kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Mon Mar 2 11:58:01 CST 2009 Pekka Pessi <first.last@nokia.com> 

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



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12379 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-03-03 17:21:26 +00:00
parent 0d237485a9
commit 62fdae5055
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Tue Mar 3 11:20:37 CST 2009
Tue Mar 3 11:21:02 CST 2009

21
libs/sofia-sip/libsofia-sip-ua/nta/nta.c
View File

@ -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);