<!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][17415] </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=17415">17415</a></dd>
<dt>Author</dt> <dd>dyatsin</dd>
<dt>Date</dt> <dd>2010-04-27 13:32:36 -0500 (Tue, 27 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>freetdm: Added signalling status report
Fix for ftmod_libpri not reporting proper physical and protocol alarms on init</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="#freeswitchtrunklibsfreetdmsrcftdm_ioc">freeswitch/trunk/libs/freetdm/src/ftdm_io.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_analogftmod_analogc">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_analog_emftmod_analog_emc">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_libpriftmod_libpric">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_libprilpwrap_pric">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludefreetdmh">freeswitch/trunk/libs/freetdm/src/include/freetdm.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeftdm_typesh">freeswitch/trunk/libs/freetdm/src/include/ftdm_types.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 (17414 => 17415)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-23 21:35:21 UTC (rev 17414)
+++ freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-27 18:32:36 UTC (rev 17415)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Anthony Minessale II <anthmct@yahoo.com>
</span><span class="cx"> * Moises Silva <moy@sangoma.com>
</span><ins>+ * David Yat Sin <dyatsin@sangoma.com>
</ins><span class="cx"> *
</span><span class="cx"> *
</span><span class="cx"> * mod_freetdm.c -- FreeTDM Endpoint Module
</span><span class="lines">@@ -3002,8 +3003,8 @@
</span><span class="cx"> "chan_id: %u\n"
</span><span class="cx"> "physical_span_id: %u\n"
</span><span class="cx"> "physical_chan_id: %u\n"
</span><del>- "physical_state: %s\n"
- "signaling_state: %s\n"
</del><ins>+ "physical_status: %s\n"
+ "signaling_status: %s\n"
</ins><span class="cx"> "type: %s\n"
</span><span class="cx"> "state: %s\n"
</span><span class="cx"> "last_state: %s\n"
</span><span class="lines">@@ -3051,8 +3052,8 @@
</span><span class="cx"> " <chan-id>%u</chan-id>>\n"
</span><span class="cx"> " <physical-span-id>%u</physical-span-id>\n"
</span><span class="cx"> " <physical-chan-id>%u</physical-chan-id>\n"
</span><del>- " <physical-state>%s</physical-state>\n"
- " <signaling-state>%s</signaling-state>\n"
</del><ins>+ " <physical-status>%s</physical-status>\n"
+ " <signaling-status>%s</signaling-status>\n"
</ins><span class="cx"> " <type>%s</type>\n"
</span><span class="cx"> " <state>%s</state>\n"
</span><span class="cx"> " <last-state>%s</last-state>\n"
</span><span class="lines">@@ -3186,7 +3187,7 @@
</span><span class="cx"> stream->write_function(stream,
</span><span class="cx"> "+OK\n"
</span><span class="cx"> "span: %u (%s)\n"
</span><del>- "type: %s\n"
</del><ins>+ "type: %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></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftdm_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c (17414 => 17415)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-23 21:35:21 UTC (rev 17414)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-27 18:32:36 UTC (rev 17415)
</span><span class="lines">@@ -143,6 +143,8 @@
</span><span class="cx"> FTDM_ENUM_NAMES(SIGNALING_STATUS_NAMES, SIGSTATUS_STRINGS)
</span><span class="cx"> FTDM_STR2ENUM(ftdm_str2ftdm_signaling_status, ftdm_signaling_status2str, ftdm_signaling_status_t, SIGNALING_STATUS_NAMES, FTDM_SIG_STATE_INVALID)
</span><span class="cx">
</span><ins>+static ftdm_status_t ftdm_group_add_channels(ftdm_span_t* span, int currindex, const char* name);
+
</ins><span class="cx"> static const char *cut_path(const char *in)
</span><span class="cx"> {
</span><span class="cx"> const char *p, *ret = in;
</span><span class="lines">@@ -775,7 +777,7 @@
</span><span class="cx"> i++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ftdm_set_flag(new_chan, FTDM_CHANNEL_CONFIGURED | FTDM_CHANNEL_READY);
</del><ins>+ ftdm_set_flag(new_chan, FTDM_CHANNEL_CONFIGURED | FTDM_CHANNEL_READY);
</ins><span class="cx"> *chan = new_chan;
</span><span class="cx"> return FTDM_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -2853,26 +2855,71 @@
</span><span class="cx"> return rval;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void ftdm_set_channels_gains(ftdm_span_t *span, int currindex, float rxgain, float txgain)
</del><ins>+static ftdm_status_t ftdm_set_channels_gains(ftdm_span_t *span, int currindex, float rxgain, float txgain)
</ins><span class="cx"> {
</span><span class="cx"> unsigned chan_index = 0;
</span><span class="cx">
</span><span class="cx"> if (!span->chan_count) {
</span><del>- return;
</del><ins>+ ftdm_log(FTDM_LOG_ERROR, "%d:Failed to set gains because span has no channels\n");
+ return FTDM_FAIL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (chan_index = currindex+1; chan_index <= span->chan_count; chan_index++) {
</span><span class="cx"> if (!FTDM_IS_VOICE_CHANNEL(span->channels[chan_index])) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- ftdm_channel_command(span->channels[chan_index], FTDM_COMMAND_SET_RX_GAIN, &rxgain);
- ftdm_channel_command(span->channels[chan_index], FTDM_COMMAND_SET_TX_GAIN, &txgain);
</del><ins>+ if (ftdm_channel_command(span->channels[chan_index], FTDM_COMMAND_SET_RX_GAIN, &rxgain) != FTDM_SUCCESS) {
+ return FTDM_FAIL;
+ }
+ if (ftdm_channel_command(span->channels[chan_index], FTDM_COMMAND_SET_TX_GAIN, &txgain) != FTDM_SUCCESS) {
+ return FTDM_FAIL;
+ }
</ins><span class="cx"> }
</span><ins>+ return FTDM_SUCCESS;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static ftdm_status_t ftdm_set_channels_alarms(ftdm_span_t *span, int currindex) {
+ unsigned chan_index = 0;
</ins><span class="cx">
</span><ins>+ if (!span->chan_count) {
+ ftdm_log(FTDM_LOG_ERROR, "%d:Failed to set alarms because span has no channels\n");
+ return FTDM_FAIL;
+ }
</ins><span class="cx">
</span><del>-static ftdm_status_t ftdm_group_add_channels(const char* name, ftdm_span_t* span, int currindex);
</del><ins>+ if (!span->fio->get_alarms) {
+ ftdm_log(FTDM_LOG_WARNING, "%d: Span does not support alarms\n", span->span_id);
+ return FTDM_SUCCESS;
+ }
+
+ for (chan_index = currindex+1; chan_index <= span->chan_count; chan_index++) {
+ /* fio->get_alarms will update ftdm_chan->alarm_flags */
+ if (span->fio->get_alarms(span->channels[chan_index]) != FTDM_SUCCESS) {
+ ftdm_log(FTDM_LOG_ERROR, "%d:%d: Failed to get alarms\n", span->channels[chan_index]->physical_span_id, span->channels[chan_index]->physical_chan_id);
+ return FTDM_FAIL;
+ }
+ }
+ return FTDM_SUCCESS;
+}
+
+
+FT_DECLARE(ftdm_status_t) ftdm_configure_span_channels(ftdm_span_t *span, int currindex, ftdm_channel_config_t *chan_config)
+{
+ if (ftdm_group_add_channels(span, currindex, chan_config->group_name) != FTDM_SUCCESS) {
+ ftdm_log(FTDM_LOG_ERROR, "%d:Failed to add channels to group %s\n", span->span_id, chan_config->group_name);
+ return FTDM_FAIL;
+ }
+ if (ftdm_set_channels_alarms(span, currindex) != FTDM_SUCCESS) {
+ ftdm_log(FTDM_LOG_ERROR, "%d:Failed to set channel alarms\n", span->span_id);
+ return FTDM_FAIL;
+ }
+ if (ftdm_set_channels_gains(span, currindex, chan_config->rxgain, chan_config->txgain) != FTDM_SUCCESS) {
+ ftdm_log(FTDM_LOG_ERROR, "%d:Failed to set channel gains\n", span->span_id);
+ return FTDM_FAIL;
+ }
+ return FTDM_SUCCESS;
+}
+
+
</ins><span class="cx"> static ftdm_status_t load_config(void)
</span><span class="cx"> {
</span><span class="cx"> char cfg_name[] = "freetdm.conf";
</span><span class="lines">@@ -2883,15 +2930,16 @@
</span><span class="cx"> int currindex = 0;
</span><span class="cx"> ftdm_span_t *span = NULL;
</span><span class="cx"> unsigned configured = 0, d = 0;
</span><del>- char name[80] = "";
</del><ins>+ char name[FTDM_MAX_NAME_STR_SZ] = "";
</ins><span class="cx"> char number[25] = "";
</span><del>- char group_name[80] = "default";
</del><span class="cx"> ftdm_io_interface_t *fio = NULL;
</span><span class="cx"> ftdm_analog_start_type_t tmp;
</span><del>- float rxgain = 0.0;
- float txgain = 0.0;
</del><span class="cx"> ftdm_size_t len = 0;
</span><ins>+ ftdm_channel_config_t chan_config;
</ins><span class="cx">
</span><ins>+ memset(&chan_config, 0, sizeof(chan_config));
+ sprintf(chan_config.group_name,"default");
+
</ins><span class="cx"> if (!ftdm_config_open_file(&cfg, cfg_name)) {
</span><span class="cx"> return FTDM_FAIL;
</span><span class="cx"> }
</span><span class="lines">@@ -2997,8 +3045,7 @@
</span><span class="cx"> if (span->trunk_type == FTDM_TRUNK_FXO) {
</span><span class="cx"> currindex = span->chan_count;
</span><span class="cx"> configured += fio->configure_span(span, val, FTDM_CHAN_TYPE_FXO, name, number);
</span><del>- ftdm_set_channels_gains(span, currindex, rxgain, txgain);
- ftdm_group_add_channels(group_name, span, currindex);
</del><ins>+ ftdm_configure_span_channels(span, currindex, &chan_config);
</ins><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_WARNING, "Cannot add FXO channels to an FXS trunk!\n");
</span><span class="cx"> }
</span><span class="lines">@@ -3011,8 +3058,7 @@
</span><span class="cx"> if (span->trunk_type == FTDM_TRUNK_FXS) {
</span><span class="cx"> currindex = span->chan_count;
</span><span class="cx"> configured += fio->configure_span(span, val, FTDM_CHAN_TYPE_FXS, name, number);
</span><del>- ftdm_set_channels_gains(span, currindex, rxgain, txgain);
- ftdm_group_add_channels(group_name, span, currindex);
</del><ins>+ ftdm_configure_span_channels(span, currindex, &chan_config);
</ins><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_WARNING, "Cannot add FXS channels to an FXO trunk!\n");
</span><span class="cx"> }
</span><span class="lines">@@ -3025,16 +3071,14 @@
</span><span class="cx"> if (span->trunk_type == FTDM_TRUNK_EM) {
</span><span class="cx"> currindex = span->chan_count;
</span><span class="cx"> configured += fio->configure_span(span, val, FTDM_CHAN_TYPE_EM, name, number);
</span><del>- ftdm_set_channels_gains(span, currindex, rxgain, txgain);
- ftdm_group_add_channels(group_name, span, currindex);
</del><ins>+ ftdm_configure_span_channels(span, currindex, &chan_config);
</ins><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_WARNING, "Cannot add EM channels to a non-EM trunk!\n");
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(var, "b-channel")) {
</span><span class="cx"> currindex = span->chan_count;
</span><span class="cx"> configured += fio->configure_span(span, val, FTDM_CHAN_TYPE_B, name, number);
</span><del>- ftdm_set_channels_gains(span, currindex, rxgain, txgain);
- ftdm_group_add_channels(group_name, span, currindex);
</del><ins>+ ftdm_configure_span_channels(span, currindex, &chan_config);
</ins><span class="cx"> } else if (!strcasecmp(var, "d-channel")) {
</span><span class="cx"> if (d) {
</span><span class="cx"> ftdm_log(FTDM_LOG_WARNING, "ignoring extra d-channel\n");
</span><span class="lines">@@ -3051,28 +3095,27 @@
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(var, "cas-channel")) {
</span><span class="cx"> currindex = span->chan_count;
</span><del>- configured += fio->configure_span(span, val, FTDM_CHAN_TYPE_CAS, name, number);
- ftdm_set_channels_gains(span, currindex, rxgain, txgain);
- ftdm_group_add_channels(group_name, span, currindex);
</del><ins>+ configured += fio->configure_span(span, val, FTDM_CHAN_TYPE_CAS, name, number);
+ ftdm_configure_span_channels(span, currindex, &chan_config);
</ins><span class="cx"> } else if (!strcasecmp(var, "dtmf_hangup")) {
</span><span class="cx"> span->dtmf_hangup = ftdm_strdup(val);
</span><span class="cx"> span->dtmf_hangup_len = strlen(val);
</span><span class="cx"> } else if (!strcasecmp(var, "txgain")) {
</span><del>- if (sscanf(val, "%f", &txgain) != 1) {
</del><ins>+ if (sscanf(val, "%f", &(chan_config.txgain)) != 1) {
</ins><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "invalid txgain: '%s'\n", val);
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(var, "rxgain")) {
</span><del>- if (sscanf(val, "%f", &rxgain) != 1) {
</del><ins>+ if (sscanf(val, "%f", &(chan_config.rxgain)) != 1) {
</ins><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "invalid rxgain: '%s'\n", val);
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(var, "group")) {
</span><span class="cx"> len = strlen(val);
</span><del>- if (len >= sizeof(group_name)) {
- len = sizeof(group_name) - 1;
</del><ins>+ if (len >= FTDM_MAX_NAME_STR_SZ) {
+ len = FTDM_MAX_NAME_STR_SZ - 1;
</ins><span class="cx"> ftdm_log(FTDM_LOG_WARNING, "Truncating group name %s to %zd length\n", val, len);
</span><span class="cx"> }
</span><del>- memcpy(group_name, val, len);
- group_name[len] = '\0';
</del><ins>+ memcpy(chan_config.group_name, val, len);
+ chan_config.group_name[len] = '\0';
</ins><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "unknown span variable '%s'\n", var);
</span><span class="cx"> }
</span><span class="lines">@@ -3529,7 +3572,7 @@
</span><span class="cx"> return FTDM_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static ftdm_status_t ftdm_group_add_channels(const char* name, ftdm_span_t* span, int currindex)
</del><ins>+static ftdm_status_t ftdm_group_add_channels(ftdm_span_t* span, int currindex, const char* name)
</ins><span class="cx"> {
</span><span class="cx"> unsigned chan_index = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_analogftmod_analogc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.c (17414 => 17415)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.c 2010-04-23 21:35:21 UTC (rev 17414)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.c 2010-04-27 18:32:36 UTC (rev 17415)
</span><span class="lines">@@ -85,6 +85,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * \brief Returns the signalling status on a channel
+ * \param ftdmchan Channel to get status on
+ * \param status Pointer to set signalling status
+ * \return Success or failure
+ */
+
+static FIO_CHANNEL_GET_SIG_STATUS_FUNCTION(analog_get_channel_sig_status)
+{
+ *status = FTDM_SIG_STATE_UP;
+ return FTDM_SUCCESS;
+}
+
+/**
+ * \brief Returns the signalling status on a span
+ * \param span Span to get status on
+ * \param status Pointer to set signalling status
+ * \return Success or failure
+ */
+
+static FIO_SPAN_GET_SIG_STATUS_FUNCTION(analog_get_span_sig_status)
+{
+ *status = FTDM_SIG_STATE_UP;
+ return FTDM_SUCCESS;
+}
+
+/**
</ins><span class="cx"> * \brief Starts an analog span thread (monitor)
</span><span class="cx"> * \param span Span to monitor
</span><span class="cx"> * \return Success or failure
</span><span class="lines">@@ -181,6 +207,9 @@
</span><span class="cx"> span->signal_type = FTDM_SIGTYPE_ANALOG;
</span><span class="cx"> span->signal_data = analog_data;
</span><span class="cx"> span->outgoing_call = span->trunk_type == FTDM_TRUNK_FXS ? analog_fxs_outgoing_call : analog_fxo_outgoing_call;
</span><ins>+ span->get_channel_sig_status = analog_get_channel_sig_status;
+ span->get_span_sig_status = analog_get_span_sig_status;
+
</ins><span class="cx"> ftdm_span_load_tones(span, tonemap);
</span><span class="cx">
</span><span class="cx"> return FTDM_SUCCESS;
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_analog_emftmod_analog_emc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.c (17414 => 17415)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.c 2010-04-23 21:35:21 UTC (rev 17414)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.c 2010-04-27 18:32:36 UTC (rev 17415)
</span><span class="lines">@@ -83,6 +83,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * \brief Returns the signalling status on a channel
+ * \param ftdmchan Channel to get status on
+ * \param status Pointer to set signalling status
+ * \return Success or failure
+ */
+
+static FIO_CHANNEL_GET_SIG_STATUS_FUNCTION(analog_em_get_channel_sig_status)
+{
+ *status = FTDM_SIG_STATE_UP;
+ return FTDM_SUCCESS;
+}
+
+/**
+ * \brief Returns the signalling status on a span
+ * \param span Span to get status on
+ * \param status Pointer to set signalling status
+ * \return Success or failure
+ */
+
+static FIO_SPAN_GET_SIG_STATUS_FUNCTION(analog_em_get_span_sig_status)
+{
+ *status = FTDM_SIG_STATE_UP;
+ return FTDM_SUCCESS;
+}
+
+/**
</ins><span class="cx"> * \brief Initialises an EM span from configuration variables
</span><span class="cx"> * \param span Span to configure
</span><span class="cx"> * \param sig_cb Callback function for event signals
</span><span class="lines">@@ -149,6 +175,8 @@
</span><span class="cx"> span->signal_type = FTDM_SIGTYPE_ANALOG;
</span><span class="cx"> span->signal_data = analog_data;
</span><span class="cx"> span->outgoing_call = analog_em_outgoing_call;
</span><ins>+ span->get_channel_sig_status = analog_em_get_channel_sig_status;
+ span->get_span_sig_status = analog_em_get_span_sig_status;
</ins><span class="cx"> ftdm_span_load_tones(span, tonemap);
</span><span class="cx">
</span><span class="cx"> return FTDM_SUCCESS;
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_libpriftmod_libpric"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c (17414 => 17415)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c 2010-04-23 21:35:21 UTC (rev 17414)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c 2010-04-27 18:32:36 UTC (rev 17415)
</span><span class="lines">@@ -44,6 +44,43 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * \brief Returns the signalling status on a channel
+ * \param ftdmchan Channel to get status on
+ * \param status Pointer to set signalling status
+ * \return Success or failure
+ */
+
+static FIO_CHANNEL_GET_SIG_STATUS_FUNCTION(isdn_get_channel_sig_status)
+{
+ *status = FTDM_SIG_STATE_DOWN;
+
+ ftdm_libpri_data_t *isdn_data = ftdmchan->span->signal_data;
+ if (ftdm_test_flag(&(isdn_data->spri), LPWRAP_PRI_READY)) {
+ *status = FTDM_SIG_STATE_UP;
+ }
+ return FTDM_SUCCESS;
+}
+
+/**
+ * \brief Returns the signalling status on a span
+ * \param span Span to get status on
+ * \param status Pointer to set signalling status
+ * \return Success or failure
+ */
+
+static FIO_SPAN_GET_SIG_STATUS_FUNCTION(isdn_get_span_sig_status)
+{
+ *status = FTDM_SIG_STATE_DOWN;
+
+ ftdm_libpri_data_t *isdn_data = span->signal_data;
+ if (ftdm_test_flag(&(isdn_data->spri), LPWRAP_PRI_READY)) {
+ *status = FTDM_SIG_STATE_UP;
+ }
+ return FTDM_SUCCESS;
+}
+
+
+/**
</ins><span class="cx"> * \brief Starts a libpri channel (outgoing call)
</span><span class="cx"> * \param ftdmchan Channel to initiate call on
</span><span class="cx"> * \return Success or failure
</span><span class="lines">@@ -937,13 +974,27 @@
</span><span class="cx"> */
</span><span class="cx"> static int on_dchan_up(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
</span><span class="cx"> {
</span><del>-
</del><span class="cx"> if (!ftdm_test_flag(spri, LPWRAP_PRI_READY)) {
</span><ins>+ ftdm_signaling_status_t status = FTDM_SIG_STATE_UP;
+ ftdm_channel_t *ftdmchan = NULL;
+ ftdm_sigmsg_t sig;
+ int i;
</ins><span class="cx"> ftdm_log(FTDM_LOG_INFO, "Span %d D-Chan UP!\n", spri->span->span_id);
</span><span class="cx"> ftdm_set_flag(spri, LPWRAP_PRI_READY);
</span><span class="cx"> ftdm_set_state_all(spri->span, FTDM_CHANNEL_STATE_RESTART);
</span><ins>+
+ ftdm_log(FTDM_LOG_NOTICE, "%d:Signaling link status changed to %s\n", spri->span->span_id, ftdm_signaling_status2str(status));
+ for(i=1; i <= spri->span->chan_count; i++) {
+ ftdmchan = spri->span->channels[i];
+ memset(&sig, 0, sizeof(sig));
+ sig.chan_id = ftdmchan->chan_id;
+ sig.span_id = ftdmchan->span_id;
+ sig.channel = ftdmchan;
+ sig.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
+ sig.raw_data = &status;
+ ftdm_span_send_signal(spri->span, &sig);
+ }
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -955,13 +1006,28 @@
</span><span class="cx"> * \return 0
</span><span class="cx"> */
</span><span class="cx"> static int on_dchan_down(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
</span><del>-{
-
</del><ins>+{
</ins><span class="cx"> if (ftdm_test_flag(spri, LPWRAP_PRI_READY)) {
</span><ins>+ ftdm_signaling_status_t status = FTDM_SIG_STATE_DOWN;
+ ftdm_channel_t *ftdmchan = NULL;
+ ftdm_sigmsg_t sig;
+ int i;
</ins><span class="cx"> ftdm_log(FTDM_LOG_INFO, "Span %d D-Chan DOWN!\n", spri->span->span_id);
</span><span class="cx"> ftdm_clear_flag(spri, LPWRAP_PRI_READY);
</span><span class="cx"> ftdm_set_state_all(spri->span, FTDM_CHANNEL_STATE_RESTART);
</span><del>-
</del><ins>+
+
+ ftdm_log(FTDM_LOG_NOTICE, "%d:Signaling link status changed to %s\n", spri->span->span_id, ftdm_signaling_status2str(status));
+ for(i=1; i <= spri->span->chan_count; i++) {
+ ftdmchan = spri->span->channels[i];
+ memset(&sig, 0, sizeof(sig));
+ sig.chan_id = ftdmchan->chan_id;
+ sig.span_id = ftdmchan->span_id;
+ sig.channel = ftdmchan;
+ sig.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
+ sig.raw_data = &status;
+ ftdm_span_send_signal(spri->span, &sig);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return 0;
</span><span class="lines">@@ -1329,6 +1395,9 @@
</span><span class="cx"> span->signal_type = FTDM_SIGTYPE_ISDN;
</span><span class="cx"> span->outgoing_call = isdn_outgoing_call;
</span><span class="cx">
</span><ins>+ span->get_channel_sig_status = isdn_get_channel_sig_status;
+ span->get_span_sig_status = isdn_get_span_sig_status;
+
</ins><span class="cx"> if ((isdn_data->opts & FTMOD_LIBPRI_OPT_SUGGEST_CHANNEL)) {
</span><span class="cx"> span->channel_request = isdn_channel_request;
</span><span class="cx"> ftdm_set_flag(span, FTDM_SPAN_SUGGEST_CHAN_ID);
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_libprilpwrap_pric"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c (17414 => 17415)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c 2010-04-23 21:35:21 UTC (rev 17414)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c 2010-04-27 18:32:36 UTC (rev 17415)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> size_t buflen = sizeof(buf), len = 0;
</span><span class="cx"> pri_set_debug(spri->pri, debug);
</span><span class="cx"> ret = 0;
</span><del>- ftdm_set_flag(spri, LPWRAP_PRI_READY);
</del><ins>+
</ins><span class="cx"> ftdm_channel_write(spri->dchan, buf, buflen, &len);
</span><span class="cx"> } else {
</span><span class="cx"> fprintf(stderr, "Unable to create PRI\n");
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludefreetdmh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h (17414 => 17415)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-23 21:35:21 UTC (rev 17414)
+++ freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-27 18:32:36 UTC (rev 17415)
</span><span class="lines">@@ -198,6 +198,8 @@
</span><span class="cx"> #define FTDM_MAX_CHANNELS_GROUP 1024
</span><span class="cx"> #define FTDM_MAX_GROUPS_INTERFACE FTDM_MAX_SPANS_INTERFACE
</span><span class="cx">
</span><ins>+#define FTDM_MAX_NAME_STR_SZ 80
+
</ins><span class="cx"> #define GOTO_STATUS(label,st) status = st; goto label ;
</span><span class="cx">
</span><span class="cx"> #define ftdm_copy_string(x,y,z) strncpy(x, y, z - 1)
</span><span class="lines">@@ -611,7 +613,13 @@
</span><span class="cx"> float txgain;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+struct ftdm_channel_config {
+ char group_name[FTDM_MAX_NAME_STR_SZ];
+ float rxgain;
+ float txgain;
+};
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> struct ftdm_sigmsg {
</span><span class="cx"> ftdm_signal_event_t event_id;
</span><span class="cx"> uint32_t chan_id;
</span><span class="lines">@@ -831,6 +839,9 @@
</span><span class="cx"> FT_DECLARE(ftdm_status_t) ftdm_conf_node_add_param(ftdm_conf_node_t *node, const char *param, const char *val);
</span><span class="cx"> FT_DECLARE(ftdm_status_t) ftdm_conf_node_destroy(ftdm_conf_node_t *node);
</span><span class="cx">
</span><ins>+
+FT_DECLARE(ftdm_status_t) ftdm_configure_span_channels(ftdm_span_t *span, int currindex, ftdm_channel_config_t *chan_config);
+
</ins><span class="cx"> FIO_CODEC_FUNCTION(fio_slin2ulaw);
</span><span class="cx"> FIO_CODEC_FUNCTION(fio_ulaw2slin);
</span><span class="cx"> FIO_CODEC_FUNCTION(fio_slin2alaw);
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeftdm_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h (17414 => 17415)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h 2010-04-23 21:35:21 UTC (rev 17414)
+++ freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h 2010-04-27 18:32:36 UTC (rev 17415)
</span><span class="lines">@@ -468,6 +468,7 @@
</span><span class="cx"> } ftdm_conf_parameter_t;
</span><span class="cx">
</span><span class="cx"> typedef struct ftdm_channel ftdm_channel_t;
</span><ins>+typedef struct ftdm_channel_config ftdm_channel_config_t;
</ins><span class="cx"> typedef struct ftdm_event ftdm_event_t;
</span><span class="cx"> typedef struct ftdm_sigmsg ftdm_sigmsg_t;
</span><span class="cx"> typedef struct ftdm_span ftdm_span_t;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>