<!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][14181] </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=14181">14181</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-09 19:43:25 -0500 (Thu, 09 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tue Jul 7 13:46:51 CDT 2009 Pekka Pessi <first.last@nokia.com>
* nta: added test for sf.net bug #1292657</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssofiasipupdate">freeswitch/trunk/libs/sofia-sip/.update</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuantarun_test_nta">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuantatest_ntac">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_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 (14180 => 14181)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:42:37 UTC (rev 14180)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:43:25 UTC (rev 14181)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Thu Jul 9 19:40:57 CDT 2009
</del><ins>+Thu Jul 9 19:41:40 CDT 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuantarun_test_nta"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta (14180 => 14181)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta 2009-07-10 00:42:37 UTC (rev 14180)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta 2009-07-10 00:43:25 UTC (rev 14181)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> port=$(./portbind $v6flag $((port + 1))) down=$port
</span><span class="cx"> port=$(./portbind $v6flag $((port + 1))) bind=$port
</span><span class="cx"> port=$(./portbind $v6flag $((port + 1))) contact=$port
</span><ins>+port=$(./portbind $v6flag $((port + 1))) sips=$port
</ins><span class="cx">
</span><span class="cx"> # Disable IPv6 resolver for now
</span><span class="cx"> if false && eval $ipv6 ; then
</span><span class="lines">@@ -125,11 +126,11 @@
</span><span class="cx"> A 127.0.0.1
</span><span class="cx">
</span><span class="cx"> _sip._udp SRV 1 100 $contact me
</span><del>-_sips._tcp SRV 3 100 $contact me
</del><ins>+_sips._tcp SRV 3 100 $sips me
</ins><span class="cx"> _sip._tcp SRV 2 100 $contact me
</span><span class="cx">
</span><span class="cx"> _sip._udp.srv SRV 1 100 $contact a
</span><del>-_sips._tcp.srv SRV 3 100 $contact a
</del><ins>+_sips._tcp.srv SRV 3 100 $sips a
</ins><span class="cx"> _sip._tcp.srv SRV 2 100 $contact $aaaa
</span><span class="cx">
</span><span class="cx"> _sip._udp.srv2 SRV 1 200 $contact c
</span><span class="lines">@@ -155,10 +156,15 @@
</span><span class="cx"> nona NAPTR 20 15 "S" "ZIP+D2U" "" a2
</span><span class="cx"> _sip._udp.nona SRV 1 10 $contact ip4
</span><span class="cx">
</span><del>-; No SIP SRV match
</del><ins>+; First SIP SRV is not found
</ins><span class="cx"> nosrv NAPTR 20 1 "s" "SIP+D2U" "" _sip._udp.nosrv
</span><del>- NAPTR 20 2 "s" "SIP+D2U" "" _sip._udp.srv
</del><ins>+ NAPTR 20 2 "s" "SIP+D2T" "" _sip._tcp.nosrv
+ NAPTR 20 3 "s" "SIP+D2U" "" _sip._udp.srv
+ NAPTR 20 4 "s" "SIP+D2T" "" _sip._tcp.srv
</ins><span class="cx">
</span><ins>+; Redirect with TLS
+
+
</ins><span class="cx"> ; This fails (and we get 503)
</span><span class="cx"> a2 A 127.0.0.2
</span><span class="cx">
</span><span class="lines">@@ -198,6 +204,8 @@
</span><span class="cx"> sink=$sink down=$down \
</span><span class="cx"> ipv6=$ipv6 \
</span><span class="cx"> SIPCONTACT="sip:*:$contact;comp=sigcomp" \
</span><ins>+ SIPSCONTACT="sips:*:$sips;comp=sigcomp" \
+ TEST_NTA_CERTDIR=$srcdir/../tport/ \
</ins><span class="cx"> $VALGRIND ./test_nta "$@" - $resolvfile
</span><span class="cx"> exit=$?
</span><span class="cx"> kill $(cat $pidfile)
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuantatest_ntac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c (14180 => 14181)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c 2009-07-10 00:42:37 UTC (rev 14180)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c 2009-07-10 00:43:25 UTC (rev 14181)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">
</span><span class="cx"> #define NONE ((void *)-1)
</span><span class="cx">
</span><del>-int expensive_checks;
</del><ins>+int expensive_checks, test_nta_sips;
</ins><span class="cx">
</span><span class="cx"> #define EXPENSIVE_CHECKS (expensive_checks)
</span><span class="cx">
</span><span class="lines">@@ -635,6 +635,15 @@
</span><span class="cx"> TAG_END());
</span><span class="cx"> TEST_1(ag->ag_agent);
</span><span class="cx">
</span><ins>+ contact = getenv("SIPSCONTACT");
+ if (contact) {
+ if (nta_agent_add_tport(ag->ag_agent, URL_STRING_MAKE(contact),
+ TPTAG_CERTIFICATE(getenv("TEST_NTA_CERTDIR")),
+ TPTAG_TLS_VERIFY_POLICY(TPTLS_VERIFY_NONE),
+ TAG_END()) == 0)
+ test_nta_sips = 1;
+ }
+
</ins><span class="cx"> {
</span><span class="cx"> /* Initialize our headers */
</span><span class="cx"> sip_from_t from[1];
</span><span class="lines">@@ -2123,6 +2132,27 @@
</span><span class="cx"> url->url_params = NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (test_nta_sips) {
+ /* Test 1.8 - Send a message to sips:example.org
+ *
+ * Tests sf.net bug #1292657 (SIPS resolving with NAPTR).
+ */
+ client_t ctx[1] = {{ ag, "Test 1.8" }};
+ ag->ag_expect_leg = ag->ag_default_leg;
+ ctx->c_orq =
+ nta_outgoing_tcreate(ag->ag_default_leg, outgoing_callback, ctx,
+ ag->ag_obp,
+ SIP_METHOD_MESSAGE,
+ (url_string_t *)"sips:example.org",
+ SIPTAG_SUBJECT_STR(ctx->c_name),
+ SIPTAG_FROM(ag->ag_alice),
+ SIPTAG_TO(ag->ag_bob),
+ SIPTAG_CONTACT(ag->ag_m_alice),
+ TAG_END());
+ TEST_1(!client_run(ctx, 200));
+ TEST_P(ag->ag_latest_leg, ag->ag_default_leg);
+ }
+
</ins><span class="cx"> nta_agent_set_params(ag->ag_agent,
</span><span class="cx"> NTATAG_SIP_T1(500),
</span><span class="cx"> NTATAG_SIP_T1X64(64 * 500),
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>