Fri May 16 10:44:06 EDT 2008 Pekka Pessi <first.last@nokia.com>

  * test_s2.c: cope if test nua uses default port

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8465 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 2df38e100f2e3899706bdee75f075503edb05d47..df0c04876519c2ef65e56fead5f9a68714306630 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Mon May 19 12:54:40 EDT 2008
+Mon May 19 12:55:08 EDT 2008

diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c b/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c
index 1639ae98fff9b2962d7fc79664e1c584fb8a35e9..6c3abfcb52c3d79d364ce09f59344702f519fdb1 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c
@@ -583,8 +583,12 @@ s2_request_to(struct dialog *d,
   assert(tport);
 
   *tpn = *tport_name(tport);
-  tpn->tpn_host = d->target->m_url->url_host;
-  tpn->tpn_port = d->target->m_url->url_port;
+  if (tport_is_udp(tport)) {
+    tpn->tpn_host = d->target->m_url->url_host;
+    tpn->tpn_port = url_port(d->target->m_url);
+    if (!tpn->tpn_port || !tpn->tpn_port[0])
+      tpn->tpn_port = url_port_default(d->target->m_url->url_type);
+  }
 
   magic = tport_magic(tport);
   assert(magic != NULL);
@@ -778,7 +782,6 @@ void s2_case(char const *number,
   _s2case = number;
 }
 
-
 /* ---------------------------------------------------------------------- */
 /* tport interface */
 static void