<!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][14187] </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=14187">14187</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-09 19:48:37 -0500 (Thu, 09 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tue Jul 7 19:19:07 CDT 2009 Pekka Pessi <first.last@nokia.com>
* tests/test_basic_call.c: do not use INFO to terminate session usage</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssofiasipupdate">freeswitch/trunk/libs/sofia-sip/.update</a></li>
<li><a href="#freeswitchtrunklibssofiasipteststest_basic_callc">freeswitch/trunk/libs/sofia-sip/tests/test_basic_call.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 (14186 => 14187)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:48:06 UTC (rev 14186)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:48:37 UTC (rev 14187)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Thu Jul 9 19:46:28 CDT 2009
</del><ins>+Thu Jul 9 19:47:01 CDT 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibssofiasipteststest_basic_callc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/tests/test_basic_call.c (14186 => 14187)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/tests/test_basic_call.c 2009-07-10 00:48:06 UTC (rev 14186)
+++ freeswitch/trunk/libs/sofia-sip/tests/test_basic_call.c 2009-07-10 00:48:37 UTC (rev 14187)
</span><span class="lines">@@ -567,7 +567,9 @@
</span><span class="cx"> TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
</span><span class="cx"> TEST(callstate(e->data->e_tags), nua_callstate_terminated); /* TERMINATED */
</span><span class="cx"> TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_info);
</span><del>- TEST_1(e->data->e_status >= 900 || e->data->e_status == 481);
</del><ins>+ TEST_1(e->data->e_status >= 900 || e->data->e_status == 481 ||
+ /* INFO received outside dialog where it is Allow:ed */
+ e->data->e_status == 405);
</ins><span class="cx"> TEST_1(!e->next);
</span><span class="cx"> free_events_in_list(ctx, b->events);
</span><span class="cx">
</span><span class="lines">@@ -1656,7 +1658,7 @@
</span><span class="cx"> Server transitions:
</span><span class="cx"> INIT -(S1)-> RECEIVED -(S2a)-> EARLY -(S3b)-> COMPLETED -(S4)-> READY
</span><span class="cx">
</span><del>- A send INFO:
</del><ins>+ A sends UPDATE:
</ins><span class="cx"> READY -(T1)-> TERMINATED
</span><span class="cx">
</span><span class="cx"> B sends BYE:
</span><span class="lines">@@ -1665,7 +1667,7 @@
</span><span class="cx"> See @page nua_call_model in nua.docs for more information
</span><span class="cx"> */
</span><span class="cx"> int reject_method(CONDITION_PARAMS);
</span><del>-int reject_info(CONDITION_PARAMS);
</del><ins>+int reject_update(CONDITION_PARAMS);
</ins><span class="cx">
</span><span class="cx"> int test_basic_call_7(struct context *ctx)
</span><span class="cx"> {
</span><span class="lines">@@ -1897,19 +1899,21 @@
</span><span class="cx"> TEST_1(!e->next);
</span><span class="cx"> free_events_in_list(ctx, b->events);
</span><span class="cx">
</span><del>- /* Let A allow INFO */
- nua_set_params(a->nua, NUTAG_ALLOW("INFO"), TAG_END());
- /* Make B to process INFO at application level */
- nua_set_hparams(b_call->nh, NUTAG_APPL_METHOD("INFO"),
- NUTAG_ALLOW("INFO"),
</del><ins>+ /* Let A allow UPDATE */
+ nua_set_params(a->nua, NUTAG_ALLOW("UPDATE"), TAG_END());
+ /* Make B to process UPDATE at application level */
+ nua_set_hparams(b_call->nh, NUTAG_APPL_METHOD("UPDATE"),
+ NUTAG_ALLOW("UPDATE"),
</ins><span class="cx"> TAG_END());
</span><span class="cx"> run_ab_until(ctx, nua_r_set_params, NULL, nua_r_set_params, NULL);
</span><span class="cx">
</span><del>- INFO(a, a_call, a_call->nh, TAG_END());
</del><ins>+ UPDATE(a, a_call, a_call->nh, TAG_END());
</ins><span class="cx">
</span><del>- run_ab_until(ctx, -1, until_terminated, -1, reject_info);
</del><ins>+ run_ab_until(ctx, -1, until_terminated, -1, reject_update);
</ins><span class="cx">
</span><del>- TEST_1(e = a->events->head); TEST_E(e->data->e_event, nua_r_info);
</del><ins>+ TEST_1(e = a->events->head); TEST_E(e->data->e_event, nua_i_state);
+ TEST(callstate(e->data->e_tags), nua_callstate_calling);
+ TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_update);
</ins><span class="cx"> TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
</span><span class="cx"> TEST(callstate(e->data->e_tags), nua_callstate_terminated); /* TERMINATED */
</span><span class="cx"> TEST_1(!e->next);
</span><span class="lines">@@ -1917,11 +1921,17 @@
</span><span class="cx">
</span><span class="cx"> TEST_1(!nua_handle_has_active_call(a_call->nh));
</span><span class="cx">
</span><del>- TEST_1(e = b->events->head); TEST_E(e->data->e_event, nua_i_info);
</del><ins>+ TEST_1(e = b->events->head); TEST_E(e->data->e_event, nua_i_update);
+ TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
+ TEST(callstate(e->data->e_tags), nua_callstate_received); /* TERMINATED */
+ TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
+ TEST(callstate(e->data->e_tags), nua_callstate_terminated); /* TERMINATED */
</ins><span class="cx"> TEST_1(!e->next);
</span><span class="cx"> free_events_in_list(ctx, b->events);
</span><span class="cx">
</span><del>- TEST_1(nua_handle_has_active_call(b_call->nh));
</del><ins>+#if nomore
+ /* Used to use INFO instead of UPDATE and INFO was asymmetric */
+ TEST_1(!nua_handle_has_active_call(b_call->nh));
</ins><span class="cx">
</span><span class="cx"> INFO(b, b_call, b_call->nh, TAG_END());
</span><span class="cx"> run_b_until(ctx, -1, until_terminated);
</span><span class="lines">@@ -1935,6 +1945,7 @@
</span><span class="cx"> TEST(callstate(e->data->e_tags), nua_callstate_terminated); /* TERMINATED */
</span><span class="cx"> TEST_1(!e->next);
</span><span class="cx"> free_events_in_list(ctx, b->events);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> TEST_1(!nua_handle_has_active_call(b_call->nh));
</span><span class="cx">
</span><span class="lines">@@ -1966,7 +1977,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int reject_info(CONDITION_PARAMS)
</del><ins>+int reject_update(CONDITION_PARAMS)
</ins><span class="cx"> {
</span><span class="cx"> msg_t *current = nua_current_request(nua);
</span><span class="cx">
</span><span class="lines">@@ -1975,7 +1986,7 @@
</span><span class="cx">
</span><span class="cx"> save_event_in_list(ctx, event, ep, call);
</span><span class="cx">
</span><del>- if (event == nua_i_info) {
</del><ins>+ if (event == nua_i_update) {
</ins><span class="cx"> RESPOND(ep, call, nh,
</span><span class="cx"> SIP_480_TEMPORARILY_UNAVAILABLE,
</span><span class="cx"> NUTAG_WITH(current),
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>