<!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][14180] </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=14180">14180</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-09 19:42:37 -0500 (Thu, 09 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Mon May 25 10:32:56 CDT 2009 Pekka Pessi <first.last@nokia.com>
* test_nta.c: use s2_fast_forward()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssofiasipupdate">freeswitch/trunk/libs/sofia-sip/.update</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuantaMakefileam">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am</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 (14179 => 14180)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:41:42 UTC (rev 14179)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:42:37 UTC (rev 14180)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Thu Jul 9 19:39:59 CDT 2009
</del><ins>+Thu Jul 9 19:40:57 CDT 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuantaMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am (14179 => 14180)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am 2009-07-10 00:41:42 UTC (rev 14179)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am 2009-07-10 00:42:37 UTC (rev 14180)
</span><span class="lines">@@ -60,7 +60,8 @@
</span><span class="cx"> ../url/liburl.la \
</span><span class="cx"> ../msg/libmsg.la \
</span><span class="cx"> ../bnf/libbnf.la \
</span><del>- ../su/libsu.la
</del><ins>+ ../su/libsu.la \
+ ${top_builddir}/s2check/libs2.a
</ins><span class="cx">
</span><span class="cx"> test_nta_LDFLAGS = -static
</span><span class="cx">
</span><span class="lines">@@ -72,8 +73,7 @@
</span><span class="cx"> check_nta_api.c \
</span><span class="cx"> check_nta_client.c
</span><span class="cx">
</span><del>-check_nta_LDADD = ${LDADD} ${top_builddir}/s2check/libs2.a \
- @CHECK_LIBS@
</del><ins>+check_nta_LDADD = ${LDADD} @CHECK_LIBS@
</ins><span class="cx">
</span><span class="cx"> else
</span><span class="cx"> check_nta_SOURCES = $(top_srcdir)/s2check/exit77.c
</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 (14179 => 14180)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c 2009-07-10 00:41:42 UTC (rev 14179)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c 2009-07-10 00:42:37 UTC (rev 14180)
</span><span class="lines">@@ -72,6 +72,8 @@
</span><span class="cx"> #include <assert.h>
</span><span class="cx"> #include <unistd.h>
</span><span class="cx">
</span><ins>+#include "s2util.h"
+
</ins><span class="cx"> #if HAVE_OPEN_C
</span><span class="cx"> #include <sys/param.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -501,6 +503,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static
</span><ins>+void fast_final_received(client_t *c)
+{
+ for (c->c_final = 0; !c->c_final; ) {
+ if (tstflags & tst_verbatim) {
+ fputs(".", stdout); fflush(stdout);
+ }
+ s2_fast_forward(500, c->c_ag->ag_root);
+ }
+}
+
+static
</ins><span class="cx"> int client_run(client_t *c, int expected)
</span><span class="cx"> {
</span><span class="cx"> return client_run_with(c, expected, until_final_received);
</span><span class="lines">@@ -1616,15 +1629,8 @@
</span><span class="cx"> url_t url[1];
</span><span class="cx"> client_t ctx[1] = {{ ag, "Test 0.9" }};
</span><span class="cx">
</span><del>- printf("%s: starting MESSAGE timeout test, completing in 4 seconds\n",
- name);
-
</del><span class="cx"> nta_agent_set_params(ag->ag_agent,
</span><span class="cx"> NTATAG_TIMEOUT_408(1),
</span><del>- NTATAG_SIP_T1(25),
- NTATAG_SIP_T1X64(64 * 25),
- NTATAG_SIP_T2(8 * 25),
- NTATAG_SIP_T4(10 * 25),
</del><span class="cx"> TAG_END());
</span><span class="cx">
</span><span class="cx"> *url = *ag->ag_aliases->m_url;
</span><span class="lines">@@ -1644,14 +1650,10 @@
</span><span class="cx"> SIPTAG_CONTACT(ag->ag_m_bob),
</span><span class="cx"> TAG_END());
</span><span class="cx">
</span><del>- TEST_1(!client_run(ctx, 408));
</del><ins>+ TEST_1(!client_run_with(ctx, 408, fast_final_received));
</ins><span class="cx"> TEST_P(ag->ag_latest_leg, NULL);
</span><span class="cx">
</span><span class="cx"> nta_agent_set_params(ag->ag_agent,
</span><del>- NTATAG_SIP_T1(500),
- NTATAG_SIP_T1X64(64 * 500),
- NTATAG_SIP_T2(NTA_SIP_T2),
- NTATAG_SIP_T4(NTA_SIP_T4),
</del><span class="cx"> TAG_END());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3958,6 +3960,9 @@
</span><span class="cx"> retval |= test_prack(ag); SINGLE_FAILURE_CHECK();
</span><span class="cx"> retval |= test_fix_467(ag); SINGLE_FAILURE_CHECK();
</span><span class="cx"> }
</span><ins>+
+ s2_fast_forward(64000, ag->ag_root);
+
</ins><span class="cx"> retval |= test_deinit(ag); fflush(stdout);
</span><span class="cx">
</span><span class="cx"> su_home_deinit(ag->ag_home);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>