<!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][14177] </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=14177">14177</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-09 19:39:58 -0500 (Thu, 09 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tue Jul 7 15:29:27 CDT 2009 Pekka Pessi <first.last@nokia.com>
* nta.c: if NAPTRs has protocols with same preference, select one preferred locally</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 (14176 => 14177)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/.update 2009-07-09 17:30:41 UTC (rev 14176)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:39:58 UTC (rev 14177)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Thu Jul 9 11:14:29 CDT 2009
</del><ins>+Thu Jul 9 19:38:10 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 (14176 => 14177)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c 2009-07-09 17:30:41 UTC (rev 14176)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c 2009-07-10 00:39:58 UTC (rev 14177)
</span><span class="lines">@@ -9747,6 +9747,8 @@
</span><span class="cx"> static int outgoing_query_naptr(nta_outgoing_t *orq, char const *domain);
</span><span class="cx"> static void outgoing_answer_naptr(sres_context_t *orq, sres_query_t *q,
</span><span class="cx"> sres_record_t *answers[]);
</span><ins>+struct sipdns_tport const *outgoing_naptr_tport(nta_outgoing_t *orq,
+ sres_record_t *answers[]);
</ins><span class="cx">
</span><span class="cx"> static int outgoing_make_srv_query(nta_outgoing_t *orq);
</span><span class="cx"> static int outgoing_make_a_aaaa_query(nta_outgoing_t *orq);
</span><span class="lines">@@ -10229,10 +10231,9 @@
</span><span class="cx"> sres_query_t *q,
</span><span class="cx"> sres_record_t *answers[])
</span><span class="cx"> {
</span><del>- int i, j, order = -1;
</del><ins>+ int i, order = -1;
</ins><span class="cx"> size_t rlen;
</span><span class="cx"> su_home_t *home = msg_home(orq->orq_request);
</span><del>- nta_agent_t *agent = orq->orq_agent;
</del><span class="cx"> struct sipdns_resolver *sr = orq->orq_resolver;
</span><span class="cx"> tp_name_t tpn[1];
</span><span class="cx"> struct sipdns_query *sq, *selected = NULL, **tail = &selected, **at;
</span><span class="lines">@@ -10246,28 +10247,19 @@
</span><span class="cx"> /* The NAPTR results are sorted first by Order then by Preference */
</span><span class="cx"> sres_sort_answers(orq->orq_agent->sa_resolver, answers);
</span><span class="cx">
</span><ins>+ if (sr->sr_tport == NULL)
+ sr->sr_tport = outgoing_naptr_tport(orq, answers);
+
</ins><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><del>- struct sipdns_tport const *tport = NULL;
</del><span class="cx"> uint16_t type;
</span><ins>+ int valid_tport;
</ins><span class="cx">
</span><span class="cx"> if (na->na_record->r_status)
</span><span class="cx"> continue;
</span><span class="cx"> if (na->na_record->r_type != sres_type_naptr)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- /* RFC 2915 p 4:
- * Order
- * A 16-bit unsigned integer specifying the order in which the
- * NAPTR records MUST be processed to ensure the correct ordering
- * of rules. Low numbers are processed before high numbers, and
- * once a NAPTR is found whose rule "matches" the target, the
- * client MUST NOT consider any NAPTRs with a higher value for
- * order (except as noted below for the Flags field).
- */
- if (order >= 0 && order != na->na_order)
- break;
-
</del><span class="cx"> /* Check if NAPTR matches our target */
</span><span class="cx"> if (!su_casenmatch(na->na_services, "SIP+", 4) &&
</span><span class="cx"> !su_casenmatch(na->na_services, "SIPS+", 5))
</span><span class="lines">@@ -10277,37 +10269,30 @@
</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><del>- if (sr->sr_tport) {
- if (su_casematch(na->na_services, sr->sr_tport->service))
- tport = sr->sr_tport;
- }
- /* Check if we have a transport mathing with service */
- else for (j = 0; sr->sr_tports[j]; j++) {
- /*
- * Syntax of services is actually more complicated
- * but comparing the values in the transport list
- * match with those values that make any sense
- */
- if (!su_casematch(na->na_services, sr->sr_tports[j]->service))
- continue;
</del><ins>+ valid_tport = sr->sr_tport &&
+ su_casematch(na->na_services, sr->sr_tport->service);
</ins><span class="cx">
</span><del>- tpn->tpn_proto = sr->sr_tports[j]->name;
-
- if (tport_primary_by_name(agent->sa_tports, tpn)) {
- tport = sr->sr_tport = sr->sr_tports[j];
- break;
- }
- }
-
</del><span class="cx"> SU_DEBUG_5(("nta: %s IN NAPTR %u %u \"%s\" \"%s\" \"%s\" %s%s\n",
</span><span class="cx"> na->na_record->r_name,
</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>- tport ? "" : " (not used)"));
</del><ins>+ order >= 0 && order != na->na_order ? " (out of order)" :
+ valid_tport ? "" : " (tport not used)"));
</ins><span class="cx">
</span><del>- if (!tport)
</del><ins>+ /* RFC 2915 p 4:
+ * Order
+ * A 16-bit unsigned integer specifying the order in which the
+ * NAPTR records MUST be processed to ensure the correct ordering
+ * of rules. Low numbers are processed before high numbers, and
+ * once a NAPTR is found whose rule "matches" the target, the
+ * client MUST NOT consider any NAPTRs with a higher value for
+ * order (except as noted below for the Flags field).
+ */
+ if (order >= 0 && order != na->na_order)
</ins><span class="cx"> continue;
</span><ins>+ if (!valid_tport)
+ continue;
</ins><span class="cx">
</span><span class="cx"> /* OK, we found matching NAPTR */
</span><span class="cx"> order = na->na_order;
</span><span class="lines">@@ -10336,7 +10321,7 @@
</span><span class="cx"> sq->sq_weight = 1;
</span><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 = tport->name;
</del><ins>+ sq->sq_proto = sr->sr_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 class="lines">@@ -10366,6 +10351,49 @@
</span><span class="cx"> outgoing_resolve_next(orq);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* Find first supported protocol in order and preference */
+struct sipdns_tport const *
+outgoing_naptr_tport(nta_outgoing_t *orq, sres_record_t *answers[])
+{
+ int i, j, order, pref;
+ int orders[SIPDNS_TRANSPORTS], prefs[SIPDNS_TRANSPORTS];
+ struct sipdns_tport const *tport;
+
+ struct sipdns_resolver *sr = orq->orq_resolver;
+
+ for (j = 0; sr->sr_tports[j]; j++) {
+ tport = sr->sr_tports[j];
+
+ orders[j] = 65536, prefs[j] = 65536;
+
+ /* Find transport order */
+ for (i = 0; answers && answers[i]; i++) {
+ sres_naptr_record_t const *na = answers[i]->sr_naptr;
+ if (na->na_record->r_status)
+ continue;
+ if (na->na_record->r_type != sres_type_naptr)
+ continue;
+ /* Check if NAPTR matches transport */
+ if (!su_casematch(na->na_services, tport->service))
+ continue;
+ orders[j] = na->na_order;
+ prefs[j] = na->na_prefer;
+ break;
+ }
+ }
+
+ tport = sr->sr_tports[0], order = orders[0], pref = prefs[0];
+
+ for (j = 1; sr->sr_tports[j]; j++) {
+ if (orders[j] <= order && prefs[j] < pref) {
+ tport = sr->sr_tports[j], order = orders[j], pref = prefs[j];
+ }
+ }
+
+ return tport;
+}
+
+
</ins><span class="cx"> /* Query SRV records */
</span><span class="cx"> static
</span><span class="cx"> int outgoing_query_srv(nta_outgoing_t *orq,
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>