<!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][14183] </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=14183">14183</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-09 19:44:40 -0500 (Thu, 09 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tue Jul 7 15:33:55 CDT 2009 Pekka Pessi <first.last@nokia.com>
* check_nta_client.c: check that nta tries to use TCP even if NAPTR points to UDP</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssofiasipupdate">freeswitch/trunk/libs/sofia-sip/.update</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuantacheck_nta_clientc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.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 (14182 => 14183)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:43:59 UTC (rev 14182)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:44:40 UTC (rev 14183)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Thu Jul 9 19:42:19 CDT 2009
</del><ins>+Thu Jul 9 19:42:57 CDT 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuantacheck_nta_clientc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c (14182 => 14183)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c 2009-07-10 00:43:59 UTC (rev 14182)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c 2009-07-10 00:44:40 UTC (rev 14183)
</span><span class="lines">@@ -345,12 +345,13 @@
</span><span class="cx"> *udpurl = *s2sip->tcp.contact->m_url;
</span><span class="cx"> udpurl->url_params = "transport=udp";
</span><span class="cx">
</span><del>- /* Create DNS records for both UDP and TCP */
</del><ins>+ /* Create DNS records for both UDP and TCP, resolver matches UDP */
</ins><span class="cx"> s2_dns_domain("udptcp.org", 1,
</span><span class="cx"> "s2", 1, udpurl,
</span><del>- "s2", 1, s2sip->tcp.contact->m_url,
</del><ins>+ "s2", 2, s2sip->tcp.contact->m_url,
</ins><span class="cx"> NULL);
</span><span class="cx">
</span><ins>+ /* Sent to tport selected by resolver */
</ins><span class="cx"> orq = nta_outgoing_tcreate(s2->default_leg,
</span><span class="cx"> s2_nta_orq_callback, NULL,
</span><span class="cx"> URL_STRING_MAKE("sip:udptcp.org"),
</span><span class="lines">@@ -359,8 +360,41 @@
</span><span class="cx"> SIPTAG_FROM_STR("<sip:client@example.net>"),
</span><span class="cx"> TAG_END());
</span><span class="cx"> fail_unless(orq != NULL);
</span><ins>+ response = s2_nta_wait_for(wait_for_orq, orq,
+ wait_for_status, 503,
+ 0);
+ s2_nta_free_event(response);
+ nta_outgoing_destroy(orq);
+
+ /* Message size exceeds 1300, tries to use TCP even if NAPTR points to UDP */
+ orq = nta_outgoing_tcreate(s2->default_leg,
+ s2_nta_orq_callback, NULL,
+ URL_STRING_MAKE("sip:udptcp.org"),
+ SIP_METHOD_MESSAGE,
+ URL_STRING_MAKE("sip:test2.0.example.org"),
+ SIPTAG_FROM_STR("<sip:client@example.net>"),
+#define ROW "012345678901234567890123456789012345678901234\n"
+ SIPTAG_PAYLOAD_STR( /* > 1300 bytes */
+ "0000 " ROW "0050 " ROW
+ "0100 " ROW "0150 " ROW
+ "0200 " ROW "0250 " ROW
+ "0300 " ROW "0350 " ROW
+ "0400 " ROW "0450 " ROW
+ "0500 " ROW "0550 " ROW
+ "0600 " ROW "0650 " ROW
+ "0700 " ROW "0750 " ROW
+ "0800 " ROW "0850 " ROW
+ "0900 " ROW "0950 " ROW
+ "1000 " ROW "1050 " ROW
+ "1100 " ROW "1150 " ROW
+ "1200 " ROW "1250 " ROW
+ ),
+#undef ROW
+ TAG_END());
+ fail_unless(orq != NULL);
</ins><span class="cx"> request = s2_sip_wait_for_request(SIP_METHOD_MESSAGE);
</span><span class="cx"> fail_unless(request != NULL);
</span><ins>+ fail_unless(request->sip->sip_via->v_protocol == sip_transport_tcp);
</ins><span class="cx"> s2_sip_respond_to(request, NULL, 200, "2.1.2", TAG_END());
</span><span class="cx"> s2_sip_free_message(request);
</span><span class="cx"> response = s2_nta_wait_for(wait_for_orq, orq,
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>