<!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][17453] </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=17453">17453</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-04-30 15:01:24 -0500 (Fri, 30 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>freetdm: do not dial until DIALING state handler
add ftdm_declare.h to list of headers</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmMakefileam">freeswitch/trunk/libs/freetdm/Makefile.am</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftdm_ioc">freeswitch/trunk/libs/freetdm/src/ftdm_io.c</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/Makefile.am (17452 => 17453)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/Makefile.am 2010-04-30 20:01:00 UTC (rev 17452)
+++ freeswitch/trunk/libs/freetdm/Makefile.am 2010-04-30 20:01:24 UTC (rev 17453)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx">
</span><span class="cx"> library_include_HEADERS = \
</span><span class="cx"> $(SRC)/include/freetdm.h \
</span><ins>+$(SRC)/include/ftdm_declare.h \
</ins><span class="cx"> $(SRC)/include/ftdm_threadmutex.h \
</span><span class="cx"> $(SRC)/include/ftdm_os.h
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftdm_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c (17452 => 17453)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-30 20:01:00 UTC (rev 17452)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-30 20:01:24 UTC (rev 17453)
</span><span class="lines">@@ -1359,10 +1359,8 @@
</span><span class="cx"> check->state == FTDM_CHANNEL_STATE_DOWN &&
</span><span class="cx"> FTDM_IS_VOICE_CHANNEL(check)
</span><span class="cx"> ) {
</span><del>- ftdm_span_t* span = NULL;
- ftdm_span_find(check->span_id, &span);
- if (span && span->channel_request) {
- status = span->channel_request(span, check->chan_id, direction, caller_data, ftdmchan);
</del><ins>+ if (check->span->channel_request) {
+ status = check->span->channel_request(check->span, check->chan_id, direction, caller_data, ftdmchan);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1606,13 +1604,14 @@
</span><span class="cx"> ftdm_channel_t *check;
</span><span class="cx"> ftdm_status_t status = FTDM_FAIL;
</span><span class="cx"> ftdm_span_t *span = NULL;
</span><ins>+ *ftdmchan = NULL;
</ins><span class="cx">
</span><del>- ftdm_mutex_unlock(globals.mutex);
</del><ins>+ ftdm_mutex_lock(globals.mutex);
+
</ins><span class="cx"> ftdm_span_find(span_id, &span);
</span><span class="cx">
</span><span class="cx"> if (!span || !ftdm_test_flag(span, FTDM_SPAN_CONFIGURED) || chan_id >= FTDM_MAX_CHANNELS_SPAN) {
</span><del>- ftdm_log(FTDM_LOG_CRIT, "SPAN NOT DEFINED!\n");
- *ftdmchan = NULL;
</del><ins>+ ftdm_log(FTDM_LOG_CRIT, "Could not find span!\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</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 (17452 => 17453)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-30 20:01:00 UTC (rev 17452)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-30 20:01:24 UTC (rev 17453)
</span><span class="lines">@@ -501,58 +501,16 @@
</span><span class="cx"> */
</span><span class="cx"> static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(sangoma_boost_outgoing_call)
</span><span class="cx"> {
</span><del>- char dnis[128] = "";
- sangoma_boost_request_id_t r;
- sangomabc_event_t event = {0};
</del><span class="cx"> ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
</span><ins>+
</ins><span class="cx"> if (!sangoma_boost_data->sigmod) {
</span><span class="cx"> return FTDM_SUCCESS;
</span><span class="cx"> }
</span><del>- ftdm_set_string(dnis, ftdmchan->caller_data.dnis.digits);
</del><span class="cx">
</span><del>- r = next_request_id();
- if (r == 0) {
- ftdm_log(FTDM_LOG_CRIT, "All boost request ids are busy.\n");
- return FTDM_FAIL;
- }
-
</del><span class="cx"> ftdm_set_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND);
</span><span class="cx">
</span><del>- sangomabc_call_init(&event, ftdmchan->caller_data.cid_num.digits, dnis, r);
-
- event.span = (uint8_t)ftdmchan->physical_span_id;
- event.chan = (uint8_t)ftdmchan->physical_chan_id;
-
- ftdm_set_string(event.calling_name, ftdmchan->caller_data.cid_name);
- ftdm_set_string(event.rdnis.digits, ftdmchan->caller_data.rdnis.digits);
- if (strlen(ftdmchan->caller_data.rdnis.digits)) {
- event.rdnis.digits_count = (uint8_t)strlen(ftdmchan->caller_data.rdnis.digits)+1;
- event.rdnis.ton = ftdmchan->caller_data.rdnis.type;
- event.rdnis.npi = ftdmchan->caller_data.rdnis.plan;
- }
-
- event.calling.screening_ind = ftdmchan->caller_data.screen;
- event.calling.presentation_ind = ftdmchan->caller_data.pres;
-
- event.calling.ton = ftdmchan->caller_data.cid_num.type;
- event.calling.npi = ftdmchan->caller_data.cid_num.plan;
-
- event.called.ton = ftdmchan->caller_data.dnis.type;
- event.called.npi = ftdmchan->caller_data.dnis.plan;
-
- OUTBOUND_REQUESTS[r].status = BST_WAITING;
- OUTBOUND_REQUESTS[r].span = ftdmchan->span;
- OUTBOUND_REQUESTS[r].ftdmchan = ftdmchan;
-
</del><span class="cx"> ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DIALING);
</span><span class="cx">
</span><del>- ftdm_log(FTDM_LOG_DEBUG, "Dialing number %s over boost channel with request id %d\n", event.called_number_digits, r);
- if (sangomabc_connection_write(&sangoma_boost_data->mcon, &event) <= 0) {
- release_request_id(r);
- ftdm_log(FTDM_LOG_CRIT, "Failed to tx boost event [%s]\n", strerror(errno));
- return FTDM_FAIL;
- }
-
</del><span class="cx"> return FTDM_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -623,7 +581,7 @@
</span><span class="cx">
</span><span class="cx"> if (ftdmchan) {
</span><span class="cx"> ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
</span><del>- if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
</del><ins>+ if (!mcon->sigmod && ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
</ins><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "Failed to open FTDM channel [%s]\n", ftdmchan->last_error);
</span><span class="cx"> } else {
</span><span class="cx">
</span><span class="lines">@@ -1511,6 +1469,54 @@
</span><span class="cx"> break;
</span><span class="cx"> case FTDM_CHANNEL_STATE_DIALING:
</span><span class="cx"> {
</span><ins>+ char dnis[128] = "";
+ sangoma_boost_request_id_t r;
+ sangomabc_event_t event = {0};
+
+ ftdm_assert(sangoma_boost_data->sigmod != NULL, "We should be in sigmod here!\n");
+
+ ftdm_set_string(dnis, ftdmchan->caller_data.dnis.digits);
+
+ r = next_request_id();
+ if (r == 0) {
+ ftdm_log(FTDM_LOG_CRIT, "All boost request ids are busy.\n");
+ ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
+ break;
+ }
+
+ sangomabc_call_init(&event, ftdmchan->caller_data.cid_num.digits, dnis, r);
+
+ event.span = (uint8_t)ftdmchan->physical_span_id;
+ event.chan = (uint8_t)ftdmchan->physical_chan_id;
+
+ ftdm_set_string(event.calling_name, ftdmchan->caller_data.cid_name);
+ ftdm_set_string(event.rdnis.digits, ftdmchan->caller_data.rdnis.digits);
+ if (strlen(ftdmchan->caller_data.rdnis.digits)) {
+ event.rdnis.digits_count = (uint8_t)strlen(ftdmchan->caller_data.rdnis.digits)+1;
+ event.rdnis.ton = ftdmchan->caller_data.rdnis.type;
+ event.rdnis.npi = ftdmchan->caller_data.rdnis.plan;
+ }
+
+ event.calling.screening_ind = ftdmchan->caller_data.screen;
+ event.calling.presentation_ind = ftdmchan->caller_data.pres;
+
+ event.calling.ton = ftdmchan->caller_data.cid_num.type;
+ event.calling.npi = ftdmchan->caller_data.cid_num.plan;
+
+ event.called.ton = ftdmchan->caller_data.dnis.type;
+ event.called.npi = ftdmchan->caller_data.dnis.plan;
+
+ OUTBOUND_REQUESTS[r].status = BST_WAITING;
+ OUTBOUND_REQUESTS[r].span = ftdmchan->span;
+ OUTBOUND_REQUESTS[r].ftdmchan = ftdmchan;
+
+ ftdm_log(FTDM_LOG_DEBUG, "Dialing number %s over boost channel with request id %d\n", event.called_number_digits, r);
+ if (sangomabc_connection_write(&sangoma_boost_data->mcon, &event) <= 0) {
+ release_request_id(r);
+ ftdm_log(FTDM_LOG_CRIT, "Failed to tx boost event [%s]\n", strerror(errno));
+ ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
+ }
+
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case FTDM_CHANNEL_STATE_HANGUP_COMPLETE:
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>