<!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][17443] </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=17443">17443</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-04-28 17:17:51 -0500 (Wed, 28 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>freetdm: fix boost glare invalid state transition
show physical status in ftdm list command
update list of events</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmmod_freetdmmod_freetdmc">freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.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>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludefreetdmh">freeswitch/trunk/libs/freetdm/src/include/freetdm.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeftdm_declareh">freeswitch/trunk/libs/freetdm/src/include/ftdm_declare.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeprivatelibteletoneh">freeswitch/trunk/libs/freetdm/src/include/private/libteletone.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeprivatelibteletone_detecth">freeswitch/trunk/libs/freetdm/src/include/private/libteletone_detect.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeprivatelibteletone_generateh">freeswitch/trunk/libs/freetdm/src/include/private/libteletone_generate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmmod_freetdmmod_freetdmc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c (17442 => 17443)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-28 22:17:51 UTC (rev 17442)
+++ freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-28 22:17:51 UTC (rev 17443)
</span><span class="lines">@@ -3295,6 +3295,8 @@
</span><span class="cx"> int j;
</span><span class="cx"> for (j = 0 ; j < FTDM_MAX_SPANS_INTERFACE; j++) {
</span><span class="cx"> if (SPAN_CONFIG[j].span) {
</span><ins>+ ftdm_channel_t *fchan;
+ ftdm_alarm_flag_t alarmbits = FTDM_ALARM_NONE;
</ins><span class="cx"> const char *flags = "none";
</span><span class="cx"> ftdm_signaling_status_t sigstatus;
</span><span class="cx">
</span><span class="lines">@@ -3303,12 +3305,17 @@
</span><span class="cx"> } else if (SPAN_CONFIG[j].analog_options & ANALOG_OPTION_CALL_SWAP) {
</span><span class="cx"> flags = "call swap";
</span><span class="cx"> }
</span><ins>+ fchan = ftdm_span_get_channel(SPAN_CONFIG[j].span, 1);
+ if (fchan) {
+ ftdm_channel_get_alarms(fchan, &alarmbits);
+ }
</ins><span class="cx">
</span><span class="cx"> if ((FTDM_SUCCESS == ftdm_span_get_sig_status(SPAN_CONFIG[j].span, &sigstatus))) {
</span><span class="cx"> stream->write_function(stream,
</span><span class="cx"> "+OK\n"
</span><span class="cx"> "span: %u (%s)\n"
</span><span class="cx"> "type: %s\n"
</span><ins>+ "physical_status: %s\n"
</ins><span class="cx"> "signaling_status: %s\n"
</span><span class="cx"> "chan_count: %u\n"
</span><span class="cx"> "dialplan: %s\n"
</span><span class="lines">@@ -3320,6 +3327,7 @@
</span><span class="cx"> j,
</span><span class="cx"> ftdm_span_get_name(SPAN_CONFIG[j].span),
</span><span class="cx"> SPAN_CONFIG[j].type,
</span><ins>+ alarmbits ? "alarmed" : "ok",
</ins><span class="cx"> ftdm_signaling_status2str(sigstatus),
</span><span class="cx"> ftdm_span_get_chan_count(SPAN_CONFIG[j].span),
</span><span class="cx"> SPAN_CONFIG[j].dialplan,
</span><span class="lines">@@ -3334,6 +3342,7 @@
</span><span class="cx"> "+OK\n"
</span><span class="cx"> "span: %u (%s)\n"
</span><span class="cx"> "type: %s\n"
</span><ins>+ "physical_status: %s\n"
</ins><span class="cx"> "chan_count: %u\n"
</span><span class="cx"> "dialplan: %s\n"
</span><span class="cx"> "context: %s\n"
</span><span class="lines">@@ -3344,6 +3353,7 @@
</span><span class="cx"> j,
</span><span class="cx"> ftdm_span_get_name(SPAN_CONFIG[j].span),
</span><span class="cx"> SPAN_CONFIG[j].type,
</span><ins>+ alarmbits ? "alarmed" : "ok",
</ins><span class="cx"> ftdm_span_get_chan_count(SPAN_CONFIG[j].span),
</span><span class="cx"> SPAN_CONFIG[j].dialplan,
</span><span class="cx"> SPAN_CONFIG[j].context,
</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 (17442 => 17443)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-28 22:17:51 UTC (rev 17442)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-28 22:17:51 UTC (rev 17443)
</span><span class="lines">@@ -266,12 +266,12 @@
</span><span class="cx"> break;
</span><span class="cx"> } else {
</span><span class="cx"> ftdmchan = NULL;
</span><del>- ftdm_log(FTDM_LOG_DEBUG, "Channel %d:%d ~ %d:%d is already in use.\n",
</del><ins>+ ftdm_log(FTDM_LOG_DEBUG, "Channel %d:%d ~ %d:%d is already in use in state %s\n",
</ins><span class="cx"> span->channels[i]->span_id,
</span><span class="cx"> span->channels[i]->chan_id,
</span><span class="cx"> span->channels[i]->physical_span_id,
</span><del>- span->channels[i]->physical_chan_id
- );
</del><ins>+ span->channels[i]->physical_chan_id,
+ ftdm_channel_state2str(span->channels[i]->state));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1001,26 +1001,41 @@
</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, "s%dc%d:FTDMCHAN STATE UP -> Changed to TERMINATING\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</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, "s%dc%d:FTDMCHAN STATE HANGUP -> Changed to HANGUP COMPLETE\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</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><span class="cx"> } else if (ftdmchan->state == FTDM_CHANNEL_STATE_DIALING) {
</span><del>- 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));
- ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
</del><ins>+ 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));
+ /* dont hangup the outgoing call, the other side will send a call start nack too
+ * and there we will move to terminating. If we move to terminating here. We used to move
+ * to terminating here, but that introduces a problem in handle_call_start_nack where
+ * when receiving call start nack we move the channel from DOWN to TERMINATING ( cuz we already
+ * hangup here ) and the channel gets stuck in terminating forever. So at this point we're trusting
+ * the other side to send the call start nack ( or proceed with the call )
+ * ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
+ */
</ins><span class="cx"> } else {
</span><del>- 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));
</del><ins>+ ftdm_log(FTDM_LOG_ERROR, "s%dc%d: rejecting incoming call in channel state %s\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><ins>+ } else {
+ ftdm_log(FTDM_LOG_CRIT, "s%dc%d: incoming call in invalid channel (channel not found)!\n",
+ BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</ins><span class="cx"> }
</span><del>- 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));
</del><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, "s%dc%d:START CANT OPEN CHAN\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</del><ins>+ ftdm_log(FTDM_LOG_ERROR, "s%dc%d: failed to open channel on incoming call, rejecting!\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">@@ -1271,7 +1286,7 @@
</span><span class="cx">
</span><span class="cx"> /* process all pending state changes for that channel before
</span><span class="cx"> * processing the new boost event */
</span><del>- ftdmchan = event_process_states(span, event);
</del><ins>+ ftdmchan = event_process_states(span, event);
</ins><span class="cx">
</span><span class="cx"> switch(event->event_id) {
</span><span class="cx"> case SIGBOOST_EVENT_CALL_START:
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludefreetdmh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h (17442 => 17443)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-28 22:17:51 UTC (rev 17442)
+++ freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-28 22:17:51 UTC (rev 17443)
</span><span class="lines">@@ -292,9 +292,9 @@
</span><span class="cx"> FTDM_SIGEVENT_SIGSTATUS_CHANGED, /*!< Signaling protocol status changed (ie: D-chan up), see new status in raw_data ftdm_sigmsg_t member */
</span><span class="cx"> FTDM_SIGEVENT_INVALID
</span><span class="cx"> } ftdm_signal_event_t;
</span><del>-#define SIGNAL_STRINGS "START", "STOP", "TRANSFER", "ANSWER", "UP", "FLASH", "PROGRESS", \
- "PROGRESS_MEDIA", "NOTIFY", "TONE_DETECTED", "ALARM_TRAP", "ALARM_CLEAR", "MISC", \
- "COLLECTED_DIGIT", "ADD_CALL", "RESTART", "SIGLINK_CHANGED", "INVALID"
</del><ins>+#define SIGNAL_STRINGS "START", "STOP", "ANSWER", "UP", "FLASH", "PROGRESS", \
+ "PROGRESS_MEDIA", "TONE_DETECTED", "ALARM_TRAP", "ALARM_CLEAR", \
+ "COLLECTED_DIGIT", "ADD_CALL", "RESTART", "SIGSTATUS_CHANGED", "INVALID"
</ins><span class="cx">
</span><span class="cx"> /*! \brief Move from string to ftdm_signal_event_t and viceversa */
</span><span class="cx"> FTDM_STR2ENUM_P(ftdm_str2ftdm_signal_event, ftdm_signal_event2str, ftdm_signal_event_t)
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeftdm_declareh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/ftdm_declare.h (17442 => 17443)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/ftdm_declare.h 2010-04-28 22:17:51 UTC (rev 17442)
+++ freeswitch/trunk/libs/freetdm/src/include/ftdm_declare.h 2010-04-28 22:17:51 UTC (rev 17443)
</span><span class="lines">@@ -119,8 +119,21 @@
</span><span class="cx"> #include <stdarg.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+/*!
+ * \brief FreeTDM channel.
+ * This is the basic data structure used to place calls and I/O operations
+ */
</ins><span class="cx"> typedef struct ftdm_channel ftdm_channel_t;
</span><ins>+
+/*!
+ * \brief FreeTDM span.
+ * Channel and signaling configuration container.
+ * This is a logical span structure, a span may ( or may note ) contain channels
+ * of other physical spans, depending on configuration (freetdm.conf) or if you
+ * are not using configuration depends on how you call ftdm_span_add_channel
+ */
</ins><span class="cx"> typedef struct ftdm_span ftdm_span_t;
</span><ins>+
</ins><span class="cx"> typedef struct ftdm_event ftdm_event_t;
</span><span class="cx"> typedef struct ftdm_conf_node ftdm_conf_node_t;
</span><span class="cx"> typedef struct ftdm_group ftdm_group_t;
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeprivatelibteletoneh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/private/libteletone.h (17442 => 17443)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/private/libteletone.h 2010-04-28 22:17:51 UTC (rev 17442)
+++ freeswitch/trunk/libs/freetdm/src/include/private/libteletone.h 2010-04-28 22:17:51 UTC (rev 17443)
</span><span class="lines">@@ -136,8 +136,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#include <libteletone_generate.h>
-#include <libteletone_detect.h>
</del><ins>+#include "libteletone_generate.h"
+#include "libteletone_detect.h"
</ins><span class="cx">
</span><span class="cx"> #ifdef HAVE_STRING_H
</span><span class="cx"> #include <string.h>
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeprivatelibteletone_detecth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/private/libteletone_detect.h (17442 => 17443)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/private/libteletone_detect.h 2010-04-28 22:17:51 UTC (rev 17442)
+++ freeswitch/trunk/libs/freetdm/src/include/private/libteletone_detect.h 2010-04-28 22:17:51 UTC (rev 17443)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span><del>-#include <libteletone.h>
</del><ins>+#include "libteletone.h"
</ins><span class="cx">
</span><span class="cx"> /*! \file libteletone_detect.h
</span><span class="cx"> \brief Tone Detection Routines
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeprivatelibteletone_generateh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/private/libteletone_generate.h (17442 => 17443)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/private/libteletone_generate.h 2010-04-28 22:17:51 UTC (rev 17442)
+++ freeswitch/trunk/libs/freetdm/src/include/private/libteletone_generate.h 2010-04-28 22:17:51 UTC (rev 17443)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #include <assert.h>
</span><span class="cx"> #include <stdarg.h>
</span><del>-#include <libteletone.h>
</del><ins>+#include "libteletone.h"
</ins><span class="cx">
</span><span class="cx"> #define TELETONE_VOL_DB_MAX 0
</span><span class="cx"> #define TELETONE_VOL_DB_MIN -63
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>