From: Michael Jerris Date: Mon, 19 May 2008 16:55:15 +0000 (+0000) Subject: Fri May 16 10:44:06 EDT 2008 Pekka Pessi X-Git-Tag: v1.0-rc6~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4795234198fd2e3dc91c6b91d2d1bb31fe50072a;p=thirdparty%2Ffreeswitch.git Fri May 16 10:44:06 EDT 2008 Pekka Pessi * 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 2df38e100f..df0c048765 100644 --- 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 1639ae98ff..6c3abfcb52 100644 --- 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