<!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][17418] </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=17418">17418</a></dd>
<dt>Author</dt> <dd>dyatsin</dd>
<dt>Date</dt> <dd>2010-04-27 16:21:57 -0500 (Tue, 27 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>freetdm: moved type inside ftdm_configure_span_channels</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="#freeswitchtrunklibsfreetdmsrcincludefreetdmh">freeswitch/trunk/libs/freetdm/src/include/freetdm.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 (17417 => 17418)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-27 20:12:22 UTC (rev 17417)
+++ freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-27 21:21:57 UTC (rev 17418)
</span><span class="lines">@@ -1954,10 +1954,10 @@
</span><span class="cx"> break;
</span><span class="cx"> case FTDM_SIGEVENT_SIGSTATUS_CHANGED:
</span><span class="cx"> {
</span><ins>+ ftdm_signaling_status_t *sigstatus = (ftdm_signaling_status_t*)(sigmsg->raw_data);
</ins><span class="cx"> if (*((ftdm_signaling_status_t*)(sigmsg->raw_data)) == FTDM_SIG_STATE_UP) {
</span><del>- ftdm_set_flag(sigmsg->channel, FTDM_CHANNEL_SIG_UP);
- } else {
- ftdm_clear_flag(sigmsg->channel, FTDM_CHANNEL_SIG_UP);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%d:%d signalling changed to :%s\n",
+ sigmsg->channel->span_id, sigmsg->channel->chan_id, ftdm_signaling_status2str(*sigstatus));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> break;
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftdm_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c (17417 => 17418)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-27 20:12:22 UTC (rev 17417)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-27 21:21:57 UTC (rev 17418)
</span><span class="lines">@@ -2902,10 +2902,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-FT_DECLARE(ftdm_status_t) ftdm_configure_span_channels(ftdm_span_t *span, const char* str, ftdm_channel_config_t *chan_config, ftdm_chan_type_t type, unsigned *configured)
</del><ins>+FT_DECLARE(ftdm_status_t) ftdm_configure_span_channels(ftdm_span_t *span, const char* str, ftdm_channel_config_t *chan_config, unsigned *configured)
</ins><span class="cx"> {
</span><span class="cx"> int currindex = span->chan_count;
</span><del>- *configured += span->fio->configure_span(span, str, type, chan_config->name, chan_config->number);
</del><ins>+ *configured += span->fio->configure_span(span, str, chan_config->type, chan_config->name, chan_config->number);
</ins><span class="cx">
</span><span class="cx"> if (ftdm_group_add_channels(span, currindex, chan_config->group_name) != FTDM_SUCCESS) {
</span><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "%d:Failed to add channels to group %s\n", span->span_id, chan_config->group_name);
</span><span class="lines">@@ -3043,7 +3043,8 @@
</span><span class="cx"> ftdm_analog_start_type2str(span->start_type));
</span><span class="cx"> }
</span><span class="cx"> if (span->trunk_type == FTDM_TRUNK_FXO) {
</span><del>- ftdm_configure_span_channels(span, val, &chan_config, FTDM_CHAN_TYPE_FXO, &configured);
</del><ins>+ chan_config.type = FTDM_CHAN_TYPE_FXO;
+ ftdm_configure_span_channels(span, val, &chan_config, &configured);
</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">@@ -3054,7 +3055,8 @@
</span><span class="cx"> ftdm_analog_start_type2str(span->start_type));
</span><span class="cx"> }
</span><span class="cx"> if (span->trunk_type == FTDM_TRUNK_FXS) {
</span><del>- ftdm_configure_span_channels(span, val, &chan_config, FTDM_CHAN_TYPE_FXS, &configured);
</del><ins>+ chan_config.type = FTDM_CHAN_TYPE_FXS;
+ ftdm_configure_span_channels(span, val, &chan_config, &configured);
</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">@@ -3065,28 +3067,30 @@
</span><span class="cx"> ftdm_analog_start_type2str(span->start_type));
</span><span class="cx"> }
</span><span class="cx"> if (span->trunk_type == FTDM_TRUNK_EM) {
</span><del>- ftdm_configure_span_channels(span, val, &chan_config, FTDM_CHAN_TYPE_EM, &configured);
</del><ins>+ chan_config.type = FTDM_CHAN_TYPE_EM;
+ ftdm_configure_span_channels(span, val, &chan_config, &configured);
</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><del>- ftdm_configure_span_channels(span, val, &chan_config, FTDM_CHAN_TYPE_B, &configured);
</del><ins>+ chan_config.type = FTDM_CHAN_TYPE_B;
+ ftdm_configure_span_channels(span, val, &chan_config, &configured);
</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="cx"> } else {
</span><del>- ftdm_chan_type_t qtype;
</del><span class="cx"> if (!strncasecmp(val, "lapd:", 5)) {
</span><del>- qtype = FTDM_CHAN_TYPE_DQ931;
</del><ins>+ chan_config.type = FTDM_CHAN_TYPE_DQ931;
</ins><span class="cx"> val += 5;
</span><span class="cx"> } else {
</span><del>- qtype = FTDM_CHAN_TYPE_DQ921;
</del><ins>+ chan_config.type = FTDM_CHAN_TYPE_DQ921;
</ins><span class="cx"> }
</span><del>- ftdm_configure_span_channels(span, val, &chan_config, qtype, &configured);
</del><ins>+ ftdm_configure_span_channels(span, val, &chan_config, &configured);
</ins><span class="cx"> d++;
</span><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(var, "cas-channel")) {
</span><del>- ftdm_configure_span_channels(span, val, &chan_config, FTDM_CHAN_TYPE_CAS, &configured);
</del><ins>+ chan_config.type = FTDM_CHAN_TYPE_CAS;
+ ftdm_configure_span_channels(span, val, &chan_config, &configured);
</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="lines">@@ -3674,19 +3678,24 @@
</span><span class="cx"> FT_DECLARE(ftdm_status_t) ftdm_span_send_signal(ftdm_span_t *span, ftdm_sigmsg_t *sigmsg)
</span><span class="cx"> {
</span><span class="cx"> ftdm_status_t status = FTDM_FAIL;
</span><ins>+ if (sigmsg->channel) {
+ ftdm_mutex_lock(sigmsg->channel->mutex);
+ }
</ins><span class="cx">
</span><ins>+ if (sigmsg->event_id == FTDM_SIGEVENT_SIGSTATUS_CHANGED) {
+ if (*((ftdm_signaling_status_t*)(sigmsg->raw_data)) == FTDM_SIG_STATE_UP) {
+ ftdm_set_flag(sigmsg->channel, FTDM_CHANNEL_SIG_UP);
+ } else {
+ ftdm_clear_flag(sigmsg->channel, FTDM_CHANNEL_SIG_UP);
+ }
+ }
</ins><span class="cx"> if (span->signal_cb) {
</span><del>- if (sigmsg->channel) {
- ftdm_mutex_lock(sigmsg->channel->mutex);
- }
-
</del><span class="cx"> status = span->signal_cb(sigmsg);
</span><ins>+ }
</ins><span class="cx">
</span><del>- if (sigmsg->channel) {
- ftdm_mutex_unlock(sigmsg->channel->mutex);
- }
</del><ins>+ if (sigmsg->channel) {
+ ftdm_mutex_unlock(sigmsg->channel->mutex);
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludefreetdmh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h (17417 => 17418)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-27 20:12:22 UTC (rev 17417)
+++ freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-27 21:21:57 UTC (rev 17418)
</span><span class="lines">@@ -614,10 +614,11 @@
</span><span class="cx"> float txgain;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-struct ftdm_channel_config {
</del><ins>+struct ftdm_channel_config {
</ins><span class="cx"> char name[FTDM_MAX_NAME_STR_SZ];
</span><span class="cx"> char number[FTDM_MAX_NUMBER_STR_SZ];
</span><span class="cx"> char group_name[FTDM_MAX_NAME_STR_SZ];
</span><ins>+ ftdm_chan_type_t type;
</ins><span class="cx"> float rxgain;
</span><span class="cx"> float txgain;
</span><span class="cx"> };
</span><span class="lines">@@ -843,7 +844,7 @@
</span><span class="cx"> FT_DECLARE(ftdm_status_t) ftdm_conf_node_destroy(ftdm_conf_node_t *node);
</span><span class="cx">
</span><span class="cx">
</span><del>-FT_DECLARE(ftdm_status_t) ftdm_configure_span_channels(ftdm_span_t *span, const char *str, ftdm_channel_config_t *chan_config, ftdm_chan_type_t type, unsigned *configured);
</del><ins>+FT_DECLARE(ftdm_status_t) ftdm_configure_span_channels(ftdm_span_t *span, const char *str, ftdm_channel_config_t *chan_config, unsigned *configured);
</ins><span class="cx">
</span><span class="cx"> FIO_CODEC_FUNCTION(fio_slin2ulaw);
</span><span class="cx"> FIO_CODEC_FUNCTION(fio_ulaw2slin);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>