<!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][17462] </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=17462">17462</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-05-01 13:51:01 -0500 (Sat, 01 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>freetdm: fix leak of request ids in queue mode.
Macro BOOST_EVENT_CHAN and BOOST_EVENT_SPAN should always be used!</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftmod_sangoma_boostc">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostsangoma_boost_clienth">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 (17461 => 17462)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-05-01 09:20:11 UTC (rev 17461)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-05-01 18:51:01 UTC (rev 17462)
</span><span class="lines">@@ -125,6 +125,11 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * \brief Releases span and channel from setup grid
</span><ins>+ *
+ * \note This is ALWAYS based on freetdm span/chan numbers! not boost event numbers
+ * is totally brain damaged to use event->span or event->chan to release the request
+ * use BOOST_SPAN_EVENT and BOOST_SPAN_CHAN to get the right index!!
+ *
</ins><span class="cx"> * \param span Span number
</span><span class="cx"> * \param chan Channel number
</span><span class="cx"> * \param func Calling function
</span><span class="lines">@@ -248,12 +253,12 @@
</span><span class="cx"> to span. This can happen if RESTART is received on a
</span><span class="cx"> full load. Where stray ACK messages can arrive after
</span><span class="cx"> a RESTART has taken place.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> if (!span) {
</span><span class="cx"> ftdm_log(FTDM_LOG_CRIT, "No Span for Event=%s s%dc%d cid=%d\n",
</span><span class="cx"> BOOST_DECODE_EVENT_ID(event->event_id),
</span><del>- event->span,
- event->chan,
</del><ins>+ targetspan,
+ targetchan,
</ins><span class="cx"> event->call_setup_id);
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="lines">@@ -588,7 +593,7 @@
</span><span class="cx"> /* Only bind the setup id to GRID when we are sure that channel is ready
</span><span class="cx"> otherwise we could overwite the original call */
</span><span class="cx"> OUTBOUND_REQUESTS[event->call_setup_id].event = *event;
</span><del>- SETUP_GRID[event->span][event->chan] = event->call_setup_id;
</del><ins>+ SETUP_GRID[event_span][event_chan] = event->call_setup_id;
</ins><span class="cx">
</span><span class="cx"> ftdm_set_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND);
</span><span class="cx"> ftdm_set_flag_locked(ftdmchan, FTDM_CHANNEL_INUSE);
</span><span class="lines">@@ -643,14 +648,14 @@
</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, "FTDMCHAN 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, event_chan);
</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, "FTDMCHAN 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, event_chan);
</ins><span class="cx"> ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
</span><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_CRIT, "FTDMCHAN STATE INVALID State %s on IN CALL ACK %d:%d\n",
</span><del>- ftdm_channel_state2str(ftdmchan->state),event->span+1,event->chan+1);
</del><ins>+ ftdm_channel_state2str(ftdmchan->state), event_span, event_chan);
</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="lines">@@ -659,7 +664,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (!ftdmchan) {
</span><del>- ftdm_log(FTDM_LOG_CRIT, "START ACK CANT FIND A CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "START ACK CANT FIND A CHAN %d:%d\n", event_span, event_chan);
</ins><span class="cx"> } else {
</span><span class="cx"> /* only reason to be here is failed to open channel when we we're in sigmod */
</span><span class="cx"> ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
</span><span class="lines">@@ -722,7 +727,7 @@
</span><span class="cx"> if (event->call_setup_id) {
</span><span class="cx"> release_request_id(event->call_setup_id);
</span><span class="cx"> } else {
</span><del>- release_request_id_span_chan(event->span, event->chan);
</del><ins>+ release_request_id_span_chan(BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -823,10 +828,12 @@
</span><span class="cx"> ftdm_channel_t *ftdmchan;
</span><span class="cx">
</span><span class="cx"> if ((ftdmchan = find_ftdmchan(span, event, 1))) {
</span><del>- ftdm_log(FTDM_LOG_DEBUG, "Releasing completely chan s%dc%d\n", event->span, event->chan);
</del><ins>+ ftdm_log(FTDM_LOG_DEBUG, "Releasing completely chan s%dc%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event),
+ BOOST_EVENT_CHAN(mcon->sigmod, event));
</ins><span class="cx"> ftdm_channel_done(ftdmchan);
</span><span class="cx"> } else {
</span><del>- ftdm_log(FTDM_LOG_ERROR, "Odd, We could not find chan: s%dc%d to release the call completely!!\n", event->span, event->chan);
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "Odd, We could not find chan: s%dc%d to release the call completely!!\n",
+ BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -888,8 +895,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> } else { /* we have to do it ourselves.... */
</span><del>- ftdm_log(FTDM_LOG_ERROR, "Odd, We could not find chan: s%dc%d\n", event->span, event->chan);
- release_request_id_span_chan(event->span, event->chan);
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "Odd, We could not find chan: s%dc%d\n",
+ BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
+ release_request_id_span_chan(BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -912,7 +920,7 @@
</span><span class="cx">
</span><span class="cx"> /* NC: Do nothing here because we are in process
</span><span class="cx"> of stopping the call. So ignore the ANSWER. */
</span><del>- ftdm_log(FTDM_LOG_DEBUG, "ANSWER BUT CALL IS HANGUP %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event),
</del><ins>+ ftdm_log(FTDM_LOG_DEBUG, "Got answer but call is already hangup %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event),
</ins><span class="cx"> BOOST_EVENT_CHAN(mcon->sigmod, event));
</span><span class="cx">
</span><span class="cx"> } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HOLD) {
</span><span class="lines">@@ -924,13 +932,13 @@
</span><span class="cx"> }
</span><span class="cx"> ftdm_mutex_unlock(ftdmchan->mutex);
</span><span class="cx"> } else {
</span><del>- ftdm_log(FTDM_LOG_CRIT, "ANSWER CANT FIND A CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "Could not find channel %d:%d on answer message!\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</ins><span class="cx"> sangomabc_exec_command(mcon,
</span><del>- event->span,
- event->chan,
- event->call_setup_id,
- SIGBOOST_EVENT_CALL_STOPPED,
- FTDM_CAUSE_DESTINATION_OUT_OF_ORDER, 0);
</del><ins>+ event->span,
+ event->chan,
+ event->call_setup_id,
+ SIGBOOST_EVENT_CALL_STOPPED,
+ FTDM_CAUSE_DESTINATION_OUT_OF_ORDER, 0);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1204,9 +1212,9 @@
</span><span class="cx"> case SIGBOOST_EVENT_REMOVE_CHECK_LOOP:
</span><span class="cx"> case SIGBOOST_EVENT_CALL_RELEASED:
</span><span class="cx"> if (!(ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 1))) {
</span><del>- ftdm_log(FTDM_LOG_DEBUG, "PROCESS STATES CANT FIND CHAN %d:%d\n",
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "could not find channel %d:%d to process pending state changes!\n",
</ins><span class="cx"> BOOST_EVENT_SPAN(((ftdm_sangoma_boost_data_t*)(span->signal_data))->sigmod, event),
</span><del>- BOOST_EVENT_CHAN(((ftdm_sangoma_boost_data_t*)(span->signal_data))->sigmod, event));
</del><ins>+ BOOST_EVENT_CHAN(((ftdm_sangoma_boost_data_t*)(span->signal_data))->sigmod, event));
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -1216,7 +1224,7 @@
</span><span class="cx"> case SIGBOOST_EVENT_AUTO_CALL_GAP_ABATE:
</span><span class="cx"> return NULL;
</span><span class="cx"> default:
</span><del>- ftdm_log(FTDM_LOG_CRIT, "Unhandled event id:%d\n", event->event_id);
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "Unhandled event id: %d\n", event->event_id);
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1341,7 +1349,7 @@
</span><span class="cx"> int call_stopped_ack_sent = 0;
</span><span class="cx"> ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
</span><span class="cx">
</span><del>- release_request_id_span_chan(ftdmchan->physical_span_id-1, ftdmchan->physical_chan_id-1);
</del><ins>+ release_request_id_span_chan(ftdmchan->physical_span_id, ftdmchan->physical_chan_id);
</ins><span class="cx">
</span><span class="cx"> if (!ftdm_test_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG)) {
</span><span class="cx"> ftdm_set_sflag_locked(ftdmchan, SFLAG_SENT_FINAL_MSG);
</span><span class="lines">@@ -1366,7 +1374,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> ftdmchan->sflags = 0;
</span><del>- memset(ftdmchan->call_data,0,sizeof(sangoma_boost_call_t));
</del><ins>+ memset(ftdmchan->call_data, 0, sizeof(sangoma_boost_call_t));
</ins><span class="cx">
</span><span class="cx"> if (sangoma_boost_data->sigmod && call_stopped_ack_sent) {
</span><span class="cx"> /* we dont want to call ftdm_channel_done just yet until call released is received */
</span><span class="lines">@@ -1488,6 +1496,8 @@
</span><span class="cx">
</span><span class="cx"> event.span = (uint8_t)ftdmchan->physical_span_id;
</span><span class="cx"> event.chan = (uint8_t)ftdmchan->physical_chan_id;
</span><ins>+ /* because we already have a span/chan here we bind to the SETUP_GRID now and not on call start ack */
+ SETUP_GRID[event.span][event.chan] = event.call_setup_id;
</ins><span class="cx">
</span><span class="cx"> ftdm_set_string(event.calling_name, ftdmchan->caller_data.cid_name);
</span><span class="cx"> ftdm_set_string(event.rdnis.digits, ftdmchan->caller_data.rdnis.digits);
</span><span class="lines">@@ -2566,7 +2576,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (j = 1; j <= span->chan_count; j++) {
</span><del>- span->channels[j]->call_data = ftdm_calloc(1,sizeof(sangoma_boost_call_t));
</del><ins>+ span->channels[j]->call_data = ftdm_calloc(1, sizeof(sangoma_boost_call_t));
</ins><span class="cx"> if (!span->channels[j]->call_data) {
</span><span class="cx"> FAIL_CONFIG_RETURN(FTDM_FAIL);
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostsangoma_boost_clienth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.h (17461 => 17462)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.h 2010-05-01 09:20:11 UTC (rev 17461)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.h 2010-05-01 18:51:01 UTC (rev 17462)
</span><span class="lines">@@ -144,8 +144,8 @@
</span><span class="cx"> int sangomabc_exec_command(sangomabc_connection_t *mcon, int span, int chan, int id, int cmd, int cause, int flags);
</span><span class="cx"> int sangomabc_exec_commandp(sangomabc_connection_t *pcon, int span, int chan, int id, int cmd, int cause);
</span><span class="cx">
</span><del>-#define BOOST_EVENT_SPAN(sigmod, event) ((sigmod)? event->span:event->span+1)
-#define BOOST_EVENT_CHAN(sigmod, event) ((sigmod)? event->chan:event->chan+1)
</del><ins>+#define BOOST_EVENT_SPAN(sigmod, event) ((sigmod) ? event->span : event->span + 1)
+#define BOOST_EVENT_CHAN(sigmod, event) ((sigmod) ? event->chan : event->chan + 1)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>