[Freeswitch-trunk] [commit] r12379 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta

[FreeSWITCH SVN]

Author: mikej
Date: Tue Mar  3 11:21:26 2009
New Revision: 12379

Log:
Mon Mar  2 11:58:01 CST 2009  Pekka Pessi <first.last at nokia.com>
  * nta.c: use already-resolved transport for CANCEL/ACK to [3456]XX



Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Mar  3 11:21:26 2009
@@ -1 +1 @@
-Tue Mar  3 11:20:37 CST 2009
+Tue Mar  3 11:21:02 CST 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c	Tue Mar  3 11:21:26 2009
@@ -7679,7 +7679,17 @@
     }
   }
 
-  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 @@
     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);