<!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][14168] </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=14168">14168</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-09 11:01:56 -0500 (Thu, 09 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tue Jul 7 15:41:36 CDT 2009 Pekka Pessi <first.last@nokia.com>
* check_session.c: testcase for INVITE forked with 100rel terminating properly</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssofiasipupdate">freeswitch/trunk/libs/sofia-sip/.update</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanuacheck_nuac">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanuacheck_sessionc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.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 (14167 => 14168)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/.update 2009-07-09 16:00:36 UTC (rev 14167)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-07-09 16:01:56 UTC (rev 14168)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Thu Jul 9 10:56:15 CDT 2009
</del><ins>+Thu Jul 9 11:00:14 CDT 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanuacheck_nuac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c (14167 => 14168)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c 2009-07-09 16:00:36 UTC (rev 14167)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c 2009-07-09 16:01:56 UTC (rev 14168)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> int main(int argc, char *argv[])
</span><span class="cx"> {
</span><span class="cx"> int i, failed = 0, selected = 0;
</span><del>- int threading;
</del><ins>+ int threading, single_thread, multi_thread;
</ins><span class="cx"> char const *xml = NULL;
</span><span class="cx"> Suite *suite = suite_create("Unit tests for Sofia-SIP UA Engine");
</span><span class="cx"> SRunner *runner;
</span><span class="lines">@@ -100,16 +100,28 @@
</span><span class="cx"> if (!selected)
</span><span class="cx"> s2_select_tests(getenv("CHECK_NUA_CASES"));
</span><span class="cx">
</span><del>- check_register_cases(suite, threading = 0);
- check_simple_cases(suite, threading = 0);
- check_session_cases(suite, threading = 0);
- check_etsi_cases(suite, threading = 0);
</del><ins>+ if (getenv("CHECK_NUA_THREADING")) {
+ single_thread = strcmp(getenv("CHECK_NUA_THREADING"), "no");
+ multi_thread = !single_thread;
+ }
+ else {
+ single_thread = multi_thread = 1;
+ }
</ins><span class="cx">
</span><del>- check_register_cases(suite, threading = 1);
- check_session_cases(suite, threading = 1);
- check_etsi_cases(suite, threading = 1);
- check_simple_cases(suite, threading = 1);
</del><ins>+ if (single_thread) {
+ check_register_cases(suite, threading = 0);
+ check_simple_cases(suite, threading = 0);
+ check_session_cases(suite, threading = 0);
+ check_etsi_cases(suite, threading = 0);
+ }
</ins><span class="cx">
</span><ins>+ if (multi_thread) {
+ check_register_cases(suite, threading = 1);
+ check_session_cases(suite, threading = 1);
+ check_etsi_cases(suite, threading = 1);
+ check_simple_cases(suite, threading = 1);
+ }
+
</ins><span class="cx"> runner = srunner_create(suite);
</span><span class="cx">
</span><span class="cx"> if (xml)
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanuacheck_sessionc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c (14167 => 14168)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c 2009-07-09 16:00:36 UTC (rev 14167)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c 2009-07-09 16:01:56 UTC (rev 14168)
</span><span class="lines">@@ -1496,7 +1496,80 @@
</span><span class="cx"> }
</span><span class="cx"> END_TEST
</span><span class="cx">
</span><ins>+START_TEST(call_2_4_5)
+{
+ nua_handle_t *nh;
+ struct message *invite, *prack, *cancel;
+ int i;
+ int with_sdp;
+ sip_from_t *branch1, *branch2;
</ins><span class="cx">
</span><ins>+ /* Testcase for bug FSCORE-338 -
+ forked transactions getting canceled and terminated properly. */
+
+ S2_CASE("2.4.5", "Destroy proceeding call with 100rel",
+ "NUA sends INVITE, "
+ "receives 183, sends PRACK, receives 200 for it, "
+ "receives 180, sends PRACK, receives 200 for it, "
+ "handle is destroyed.");
+
+ nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END());
+
+ invite = invite_sent_by_nua(
+ nh,
+ NUTAG_PROXY(s2sip->tcp.contact->m_url),
+ NUTAG_MEDIA_ENABLE(0),
+ NUTAG_AUTOACK(0),
+ SIPTAG_CONTENT_TYPE_STR("application/sdp"),
+ SIPTAG_PAYLOAD_STR(
+ "v=0" CRLF
+ "o=- 6805647540234172778 5821668777690722690 IN IP4 127.0.0.1" CRLF
+ "s=-" CRLF
+ "c=IN IP4 127.0.0.1" CRLF
+ "m=audio 5004 RTP/AVP 0 8" CRLF),
+ TAG_END());
+
+ prack = respond_with_100rel(invite, dialog, with_sdp = 0,
+ SIP_183_SESSION_PROGRESS,
+ SIPTAG_CONTACT(s2sip->tcp.contact),
+ TAG_END());
+ s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END());
+ s2_sip_free_message(prack), prack = NULL;
+ fail_unless(s2_check_callstate(nua_callstate_proceeding));
+ fail_unless_event(nua_r_prack, 200);
+
+ prack = respond_with_100rel(invite, dialog, with_sdp = 0,
+ SIP_180_RINGING,
+ SIPTAG_CONTACT(s2sip->tcp.contact),
+ TAG_END());
+ s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END());
+ s2_sip_free_message(prack), prack = NULL;
+ fail_unless(s2_check_callstate(nua_callstate_proceeding));
+ fail_unless_event(nua_r_prack, 200);
+
+ branch1 = dialog->local;
+ branch2 = dialog->local = sip_from_dup(dialog->home, invite->sip->sip_to);
+ sip_from_tag(dialog->home, dialog->local, s2_sip_generate_tag(dialog->home));
+
+ nua_handle_destroy(nh), nh = NULL;
+
+ cancel = s2_sip_wait_for_request(SIP_METHOD_CANCEL);
+ s2_sip_respond_to(cancel, dialog, SIP_200_OK, TAG_END());
+
+ for (i = 1; i < 4; i++) {
+ s2_nua_fast_forward(1, s2base->root);
+ }
+
+ s2_sip_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END());
+ fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
+
+ /* Time out requests */
+ for (i = 1; i < 128; i++) {
+ s2_nua_fast_forward(1, s2base->root);
+ }
+}
+END_TEST
+
</ins><span class="cx"> TCase *invite_100rel_tcase(int threading)
</span><span class="cx"> {
</span><span class="cx"> TCase *tc = tcase_create("2.4 - INVITE with 100rel");
</span><span class="lines">@@ -1506,6 +1579,7 @@
</span><span class="cx"> tcase_add_test(tc, call_2_4_2);
</span><span class="cx"> tcase_add_test(tc, call_2_4_3);
</span><span class="cx"> tcase_add_test(tc, call_2_4_4);
</span><ins>+ tcase_add_test(tc, call_2_4_5);
</ins><span class="cx"> }
</span><span class="cx"> return tc;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>