<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14173] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14173">14173</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-09 11:17:07 -0500 (Thu, 09 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tue Jul 7 13:49:23 CDT 2009 Pekka Pessi <first.last@nokia.com>
* nta: fixing old resolver bugs
Ignore-this: 6e9bb9dadc0b08e6436655b6d4ea322
- Resolving NAPTR records for SIPS (sf.net #1292657)
- Selecting single transport when resolving</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssofiasipupdate">freeswitch/trunk/libs/sofia-sip/.update</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuantantac">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibssofiasipupdate"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/.update (14172 => 14173)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/.update 2009-07-09 16:15:06 UTC (rev 14172)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-07-09 16:17:07 UTC (rev 14173)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Thu Jul 9 11:05:06 CDT 2009
</del><ins>+Thu Jul 9 11:14:29 CDT 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuantantac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (14172 => 14173)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c 2009-07-09 16:15:06 UTC (rev 14172)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c 2009-07-09 16:17:07 UTC (rev 14173)
</span><span class="lines">@@ -510,6 +510,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned short orq_status;
</span><span class="cx"> unsigned char orq_retries; /**< Number of tries this far */
</span><ins>+
</ins><span class="cx"> unsigned orq_default:1; /**< This is default transaction */
</span><span class="cx"> unsigned orq_inserted:1;
</span><span class="cx"> unsigned orq_resolved:1;
</span><span class="lines">@@ -2621,11 +2622,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Get transport name from URL. */
</span><del>-int nta_tpn_by_url(su_home_t *home,
- tp_name_t *tpn,
- char const **scheme,
- char const **port,
- url_string_t const *us)
</del><ins>+static int
+nta_tpn_by_url(su_home_t *home,
+ tp_name_t *tpn,
+ char const **scheme,
+ char const **port,
+ url_string_t const *us)
</ins><span class="cx"> {
</span><span class="cx"> url_t url[1];
</span><span class="cx"> isize_t n;
</span><span class="lines">@@ -2650,10 +2652,8 @@
</span><span class="cx"> SU_DEBUG_7(("nta: selecting scheme %s\n", url->url_scheme));
</span><span class="cx">
</span><span class="cx"> *scheme = url->url_scheme;
</span><del>- if (su_casematch(url->url_scheme, "sips"))
- tpn->tpn_proto = "tls";
- else
- tpn->tpn_proto = "*";
</del><ins>+
+ tpn->tpn_proto = NULL;
</ins><span class="cx"> tpn->tpn_canon = url->url_host;
</span><span class="cx"> tpn->tpn_host = url->url_host;
</span><span class="cx">
</span><span class="lines">@@ -2678,6 +2678,14 @@
</span><span class="cx">
</span><span class="cx"> tpn->tpn_ident = NULL;
</span><span class="cx">
</span><ins>+ if (tpn->tpn_proto)
+ return 1;
+
+ if (su_casematch(url->url_scheme, "sips"))
+ tpn->tpn_proto = "tls";
+ else
+ tpn->tpn_proto = "*";
+
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -7105,7 +7113,7 @@
</span><span class="cx"> sip_t const *sip);
</span><span class="cx">
</span><span class="cx"> #if HAVE_SOFIA_SRESOLV
</span><del>-static void outgoing_resolve(nta_outgoing_t *orq);
</del><ins>+static void outgoing_resolve(nta_outgoing_t *orq, int explicit_transport);
</ins><span class="cx"> su_inline void outgoing_cancel_resolver(nta_outgoing_t *orq);
</span><span class="cx"> su_inline void outgoing_destroy_resolver(nta_outgoing_t *orq);
</span><span class="cx"> static int outgoing_other_destinations(nta_outgoing_t const *orq);
</span><span class="lines">@@ -7654,8 +7662,9 @@
</span><span class="cx"> ta_list ta;
</span><span class="cx"> char const *scheme = NULL;
</span><span class="cx"> char const *port = NULL;
</span><del>- int invalid, resolved, stateless = 0, user_via = agent->sa_user_via;
</del><ins>+ int invalid, resolved = 0, stateless = 0, user_via = agent->sa_user_via;
</ins><span class="cx"> int invite_100rel = agent->sa_invite_100rel;
</span><ins>+ int explicit_transport = 1;
</ins><span class="cx">
</span><span class="cx"> tagi_t const *t;
</span><span class="cx"> tport_t *override_tport = NULL;
</span><span class="lines">@@ -7778,23 +7787,28 @@
</span><span class="cx"> }
</span><span class="cx"> else if (route_url && !orq->orq_user_tport) {
</span><span class="cx"> invalid = nta_tpn_by_url(home, orq->orq_tpn, &scheme, &port, route_url);
</span><ins>+ if (invalid >= 0) {
+ explicit_transport = invalid > 0;
+ if (override_tport) { /* Use transport protocol name from transport */
+ if (strcmp(orq->orq_tpn->tpn_proto, "*") == 0)
+ orq->orq_tpn->tpn_proto = tport_name(override_tport)->tpn_proto;
+ }
</ins><span class="cx">
</span><del>- if (override_tport) { /* Use transport protocol name from transport */
- if (strcmp(orq->orq_tpn->tpn_proto, "*") == 0)
- orq->orq_tpn->tpn_proto = tport_name(override_tport)->tpn_proto;
</del><ins>+ resolved = tport_name_is_resolved(orq->orq_tpn);
+ orq->orq_url = url_hdup(home, sip->sip_request->rq_url);
+ if (route_url != (url_string_t *)agent->sa_default_proxy)
+ orq->orq_route = url_hdup(home, route_url->us_url);
</ins><span class="cx"> }
</span><del>-
- resolved = tport_name_is_resolved(orq->orq_tpn);
- orq->orq_url = url_hdup(home, sip->sip_request->rq_url);
- if (route_url != (url_string_t *)agent->sa_default_proxy)
- orq->orq_route = url_hdup(home, route_url->us_url);
</del><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> invalid = nta_tpn_by_url(home, orq->orq_tpn, &scheme, &port,
</span><span class="cx"> (url_string_t *)sip->sip_request->rq_url);
</span><del>- resolved = tport_name_is_resolved(orq->orq_tpn);
</del><ins>+ if (invalid >= 0) {
+ explicit_transport = invalid > 0;
+ resolved = tport_name_is_resolved(orq->orq_tpn);
+ sip_fragment_clear(sip->sip_request->rq_common);
+ }
</ins><span class="cx"> orq->orq_url = url_hdup(home, sip->sip_request->rq_url);
</span><del>- sip_fragment_clear(sip->sip_request->rq_common);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!override_tport)
</span><span class="lines">@@ -7892,7 +7906,7 @@
</span><span class="cx"> outgoing_prepare_send(orq);
</span><span class="cx"> #if HAVE_SOFIA_SRESOLV
</span><span class="cx"> else
</span><del>- outgoing_resolve(orq);
</del><ins>+ outgoing_resolve(orq, explicit_transport);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (stateless &&
</span><span class="lines">@@ -9697,6 +9711,8 @@
</span><span class="cx">
</span><span class="cx"> struct sipdns_query *sr_done; /**< Completed intermediate results */
</span><span class="cx">
</span><ins>+ struct sipdns_tport const *sr_tport; /**< Selected transport */
+
</ins><span class="cx"> /** Transports to consider for this request */
</span><span class="cx"> struct sipdns_tport const *sr_tports[SIPDNS_TRANSPORTS + 1];
</span><span class="cx">
</span><span class="lines">@@ -9761,10 +9777,11 @@
</span><span class="cx">
</span><span class="cx"> /** Resolve a request destination */
</span><span class="cx"> static void
</span><del>-outgoing_resolve(nta_outgoing_t *orq)
</del><ins>+outgoing_resolve(nta_outgoing_t *orq, int explicit_transport)
</ins><span class="cx"> {
</span><span class="cx"> struct sipdns_resolver *sr = NULL;
</span><span class="cx"> char const *tpname = orq->orq_tpn->tpn_proto;
</span><ins>+ int tport_known = strcmp(tpname, "*") != 0;
</ins><span class="cx">
</span><span class="cx"> if (orq->orq_agent->sa_resolver)
</span><span class="cx"> orq->orq_resolver = sr = su_zalloc(orq->orq_agent->sa_home, (sizeof *sr));
</span><span class="lines">@@ -9796,14 +9813,15 @@
</span><span class="cx"> */
</span><span class="cx"> if (sr->sr_tpn->tpn_port)
</span><span class="cx"> sr->sr_use_naptr = 0, sr->sr_use_srv = 0;
</span><ins>+
</ins><span class="cx"> /* RFC3263:
</span><span class="cx"> If [...] a transport was specified explicitly, the client performs an
</span><span class="cx"> SRV query for that specific transport,
</span><span class="cx"> */
</span><del>- else if (strcmp(tpname, "*") != 0)
</del><ins>+ if (explicit_transport)
</ins><span class="cx"> sr->sr_use_naptr = 0;
</span><span class="cx">
</span><del>- if (sr->sr_use_srv || sr->sr_use_naptr) {
</del><ins>+ {
</ins><span class="cx"> /* Initialize sr_tports */
</span><span class="cx"> tport_t *tport;
</span><span class="cx"> char const *ident = sr->sr_tpn->tpn_ident;
</span><span class="lines">@@ -9813,7 +9831,7 @@
</span><span class="cx"> tport;
</span><span class="cx"> tport = tport_next(tport)) {
</span><span class="cx"> tp_name_t const *tpn = tport_name(tport);
</span><del>- if (strcmp(tpname, "*") && !su_casematch(tpn->tpn_proto, tpname))
</del><ins>+ if (tport_known && !su_casematch(tpn->tpn_proto, tpname))
</ins><span class="cx"> continue;
</span><span class="cx"> if (ident && (tpn->tpn_ident == NULL || strcmp(ident, tpn->tpn_ident)))
</span><span class="cx"> continue;
</span><span class="lines">@@ -9833,8 +9851,10 @@
</span><span class="cx"> }
</span><span class="cx"> sr->sr_tports[i] = sipdns_tports + j;
</span><span class="cx">
</span><del>- if (strcmp(tpname, "*")) /* Looking for only one transport */
</del><ins>+ if (tport_known) /* Looking for only one transport */ {
+ sr->sr_tport = sipdns_tports + j;
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Nothing found */
</span><span class="lines">@@ -10082,9 +10102,9 @@
</span><span class="cx"> struct sipdns_resolver *sr = orq->orq_resolver;
</span><span class="cx"> su_home_t *home = msg_home(orq->orq_request);
</span><span class="cx"> struct sipdns_query *sq;
</span><del>- char const *host;
</del><ins>+ char const *host, *prefix;
</ins><span class="cx"> int i;
</span><del>- size_t hlen;
</del><ins>+ size_t hlen, plen;
</ins><span class="cx">
</span><span class="cx"> sr->sr_use_srv = 0;
</span><span class="cx">
</span><span class="lines">@@ -10092,9 +10112,12 @@
</span><span class="cx"> hlen = strlen(host) + 1;
</span><span class="cx">
</span><span class="cx"> for (i = 0; sr->sr_tports[i]; i++) {
</span><del>- char const *prefix = sr->sr_tports[i]->prefix;
- size_t plen = strlen(prefix);
</del><ins>+ if (sr->sr_tport && sr->sr_tports[i] != sr->sr_tport)
+ continue;
</ins><span class="cx">
</span><ins>+ prefix = sr->sr_tports[i]->prefix;
+ plen = strlen(prefix);
+
</ins><span class="cx"> sq = su_zalloc(home, (sizeof *sq) + plen + hlen);
</span><span class="cx"> if (sq) {
</span><span class="cx"> *sr->sr_tail = sq, sr->sr_tail = &sq->sq_next;
</span><span class="lines">@@ -10225,6 +10248,7 @@
</span><span class="cx">
</span><span class="cx"> for (i = 0; answers && answers[i]; i++) {
</span><span class="cx"> sres_naptr_record_t const *na = answers[i]->sr_naptr;
</span><ins>+ struct sipdns_tport const *tport = NULL;
</ins><span class="cx"> uint16_t type;
</span><span class="cx">
</span><span class="cx"> if (na->na_record->r_status)
</span><span class="lines">@@ -10253,8 +10277,12 @@
</span><span class="cx"> /* Use NAPTR results, don't try extra SRV/A/AAAA records */
</span><span class="cx"> sr->sr_use_srv = 0, sr->sr_use_a_aaaa = 0;
</span><span class="cx">
</span><ins>+ if (sr->sr_tport) {
+ if (su_casematch(na->na_services, sr->sr_tport->service))
+ tport = sr->sr_tport;
+ }
</ins><span class="cx"> /* Check if we have a transport mathing with service */
</span><del>- for (j = 0; sr->sr_tports[j]; j++) {
</del><ins>+ else for (j = 0; sr->sr_tports[j]; j++) {
</ins><span class="cx"> /*
</span><span class="cx"> * Syntax of services is actually more complicated
</span><span class="cx"> * but comparing the values in the transport list
</span><span class="lines">@@ -10265,8 +10293,10 @@
</span><span class="cx">
</span><span class="cx"> tpn->tpn_proto = sr->sr_tports[j]->name;
</span><span class="cx">
</span><del>- if (tport_primary_by_name(agent->sa_tports, tpn))
</del><ins>+ if (tport_primary_by_name(agent->sa_tports, tpn)) {
+ tport = sr->sr_tport = sr->sr_tports[j];
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SU_DEBUG_5(("nta: %s IN NAPTR %u %u \"%s\" \"%s\" \"%s\" %s%s\n",
</span><span class="lines">@@ -10274,9 +10304,9 @@
</span><span class="cx"> na->na_order, na->na_prefer,
</span><span class="cx"> na->na_flags, na->na_services,
</span><span class="cx"> na->na_regexp, na->na_replace,
</span><del>- !sr->sr_tports[j] ? " (not supported)" : ""));
</del><ins>+ tport ? "" : " (not used)"));
</ins><span class="cx">
</span><del>- if (!sr->sr_tports[j])
</del><ins>+ if (!tport)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> /* OK, we found matching NAPTR */
</span><span class="lines">@@ -10303,10 +10333,10 @@
</span><span class="cx"> *tail = sq, tail = &sq->sq_next;
</span><span class="cx"> sq->sq_otype = sres_type_naptr;
</span><span class="cx"> sq->sq_priority = na->na_prefer;
</span><del>- sq->sq_weight = j;
</del><ins>+ sq->sq_weight = 1;
</ins><span class="cx"> sq->sq_type = type;
</span><span class="cx"> sq->sq_domain = memcpy(sq + 1, na->na_replace, rlen);
</span><del>- sq->sq_proto = sr->sr_tports[j]->name;
</del><ins>+ sq->sq_proto = tport->name;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sres_free_answers(orq->orq_agent->sa_resolver, answers);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>