<!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][17351] </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=17351">17351</a></dd>
<dt>Author</dt> <dd>dyatsin</dd>
<dt>Date</dt> <dd>2010-04-20 16:05:47 -0500 (Tue, 20 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>freetdm:Bug fixes in freetdm queue mode
freetdm:Added freetdm to compile/install list</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkbootstrapsh">freeswitch/trunk/bootstrap.sh</a></li>
<li><a href="#freeswitchtrunkconfigurein">freeswitch/trunk/configure.in</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftmod_sangoma_boostc">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#freeswitchtrunkbootstrapsh">freeswitch/trunk/bootstrap.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkbootstrapsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/bootstrap.sh (17350 => 17351)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/bootstrap.sh 2010-04-20 20:40:21 UTC (rev 17350)
+++ freeswitch/trunk/bootstrap.sh 2010-04-20 21:05:47 UTC (rev 17351)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> BASEDIR=`pwd`;
</span><span class="cx"> LIBDIR=${BASEDIR}/libs;
</span><span class="cx"> SUBDIRS="ilbc curl iksemel js js/nsprpub libdingaling libedit libsndfile pcre sofia-sip \
</span><del>- speex sqlite srtp openzap spandsp libg722_1 portaudio unimrcp tiff-3.8.2 broadvoice silk";
</del><ins>+ speex sqlite srtp openzap freetdm spandsp libg722_1 portaudio unimrcp tiff-3.8.2 broadvoice silk";
</ins><span class="cx">
</span><span class="cx"> if [ ! -f modules.conf ]; then
</span><span class="cx"> cp build/modules.conf.in modules.conf
</span></span></pre></div>
<a id="freeswitchtrunkconfigurein"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/configure.in (17350 => 17351)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/configure.in 2010-04-20 20:40:21 UTC (rev 17350)
+++ freeswitch/trunk/configure.in 2010-04-20 21:05:47 UTC (rev 17351)
</span><span class="lines">@@ -3,10 +3,10 @@
</span><span class="cx">
</span><span class="cx"> # Must change all of the below together
</span><span class="cx"> # For a release, set revision for that tagged release as well and uncomment
</span><del>-AC_INIT([freeswitch], [1.0.6], BUG-REPORT-ADDRESS)
</del><ins>+AC_INIT([freeswitch], [1.0.head], BUG-REPORT-ADDRESS)
</ins><span class="cx"> AC_SUBST(SWITCH_VERSION_MAJOR, [1])
</span><span class="cx"> AC_SUBST(SWITCH_VERSION_MINOR, [0])
</span><del>-AC_SUBST(SWITCH_VERSION_MICRO, [6])
</del><ins>+AC_SUBST(SWITCH_VERSION_MICRO, [head])
</ins><span class="cx"> #AC_SUBST(SWITCH_VERSION_REVISION, [])
</span><span class="cx">
</span><span class="cx"> AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template])
</span><span class="lines">@@ -954,6 +954,7 @@
</span><span class="cx"> AC_CONFIG_SUBDIRS([libs/speex])
</span><span class="cx"> AC_CONFIG_SUBDIRS([libs/portaudio])
</span><span class="cx"> AC_CONFIG_SUBDIRS([libs/openzap])
</span><ins>+AC_CONFIG_SUBDIRS([libs/freetdm])
</ins><span class="cx"> AC_CONFIG_SUBDIRS([libs/unimrcp])
</span><span class="cx"> AC_CONFIG_SUBDIRS([libs/tiff-3.8.2])
</span><span class="cx"> AC_CONFIG_SUBDIRS([libs/spandsp])
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftmod_sangoma_boostc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c (17350 => 17351)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-20 20:40:21 UTC (rev 17350)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-20 21:05:47 UTC (rev 17351)
</span><span class="lines">@@ -691,13 +691,13 @@
</span><span class="cx"> if (ftdmchan->state == FTDM_CHANNEL_STATE_UP ||
</span><span class="cx"> ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS_MEDIA ||
</span><span class="cx"> ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS) {
</span><del>- ftdm_log(FTDM_LOG_CRIT, "ZCHAN CALL ACK STATE UP -> Changed to TERMINATING %d:%d\n", event->span+1,event->chan+1);
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "FTDMCHAN CALL ACK STATE UP -> Changed to TERMINATING %d:%d\n", event->span+1,event->chan+1);
</ins><span class="cx"> ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
</span><span class="cx"> } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP || ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
</span><del>- ftdm_log(FTDM_LOG_CRIT, "ZCHAN CALL ACK STATE HANGUP -> Changed to HANGUP COMPLETE %d:%d\n", event->span+1,event->chan+1);
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "FTDMCHAN CALL ACK STATE HANGUP -> Changed to HANGUP COMPLETE %d:%d\n", event->span+1,event->chan+1);
</ins><span class="cx"> ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
</span><span class="cx"> } else {
</span><del>- ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE INVALID State %s on IN CALL ACK %d:%d\n",
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "FTDMCHAN STATE INVALID State %s on IN CALL ACK %d:%d\n",
</ins><span class="cx"> ftdm_channel_state2str(ftdmchan->state),event->span+1,event->chan+1);
</span><span class="cx"> }
</span><span class="cx"> ftdm_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
</span><span class="lines">@@ -817,7 +817,9 @@
</span><span class="cx"> if (sangoma_boost_data->sigmod) {
</span><span class="cx"> ftdmchan = OUTBOUND_REQUESTS[event->call_setup_id].ftdmchan;
</span><span class="cx"> CALL_DATA(ftdmchan)->last_event_id = event->event_id;
</span><ins>+ CALL_DATA(ftdmchan)->call_setup_id = event->call_setup_id;
</ins><span class="cx"> ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
</span><ins>+ ftdm_clear_sflag_locked(ftdmchan, SFLAG_SENT_FINAL_MSG);
</ins><span class="cx"> } else {
</span><span class="cx"> sangomabc_exec_command(mcon,
</span><span class="cx"> 0,
</span><span class="lines">@@ -859,7 +861,7 @@
</span><span class="cx"> sangomabc_exec_command(mcon,
</span><span class="cx"> event->span,
</span><span class="cx"> event->chan,
</span><del>- 0,
</del><ins>+ event->call_setup_id,
</ins><span class="cx"> SIGBOOST_EVENT_CALL_START_NACK_ACK,
</span><span class="cx"> 0, 0);
</span><span class="cx"> }
</span><span class="lines">@@ -1004,23 +1006,25 @@
</span><span class="cx"> if (ftdmchan->state == FTDM_CHANNEL_STATE_UP ||
</span><span class="cx"> ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS_MEDIA ||
</span><span class="cx"> ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS) {
</span><del>- ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE UP -> Changed to TERMINATING %d:%d\n", event->span+1,event->chan+1);
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "s%dc%d:FTDMCHAN STATE UP -> Changed to TERMINATING\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</ins><span class="cx"> ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
</span><span class="cx"> } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP || ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
</span><del>- ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE HANGUP -> Changed to HANGUP COMPLETE %d:%d\n", event->span+1,event->chan+1);
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "s%dc%d:FTDMCHAN STATE HANGUP -> Changed to HANGUP COMPLETE\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</ins><span class="cx"> ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
</span><ins>+ } else if (ftdmchan->state == FTDM_CHANNEL_STATE_DIALING) {
+ ftdm_log(FTDM_LOG_WARNING, "s%dc%d:Collision, hanging up incoming call\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</ins><span class="cx"> } else {
</span><del>- ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE INVALID %s on IN CALL %d:%d\n", ftdm_channel_state2str(ftdmchan->state),event->span+1,event->chan+1);
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "s%dc%d:FTDMCHAN STATE INVALID %s on IN CALL\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event), ftdm_channel_state2str(ftdmchan->state));
</ins><span class="cx"> }
</span><span class="cx"> ftdm_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
</span><span class="cx"> ftdmchan = NULL;
</span><span class="cx"> }
</span><del>- ftdm_log(FTDM_LOG_CRIT, "START CANT FIND CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "s%dc%d:START CANT FIND CHAN\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</ins><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
</span><del>- ftdm_log(FTDM_LOG_CRIT, "START CANT OPEN CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "s%dc%d:START CANT OPEN CHAN\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</ins><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1074,7 +1078,7 @@
</span><span class="cx"> sangomabc_exec_command(mcon,
</span><span class="cx"> event->span,
</span><span class="cx"> event->chan,
</span><del>- 0,
</del><ins>+ event->call_setup_id,
</ins><span class="cx"> SIGBOOST_EVENT_CALL_START_NACK,
</span><span class="cx"> hangup_cause, 0);
</span><span class="cx">
</span><span class="lines">@@ -1375,7 +1379,7 @@
</span><span class="cx"> sangomabc_exec_command(mcon,
</span><span class="cx"> BOOST_SPAN(ftdmchan),
</span><span class="cx"> BOOST_CHAN(ftdmchan),
</span><del>- 0,
</del><ins>+ CALL_DATA(ftdmchan)->call_setup_id,
</ins><span class="cx"> SIGBOOST_EVENT_CALL_START_NACK_ACK,
</span><span class="cx"> 0, 0);
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>