<!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][17230] </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=17230">17230</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-04-06 13:41:30 -0500 (Tue, 06 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>import fix for <a href="http://jira.freeswitch.org/browse/OPENZAP-76">OPENZAP-76</a> from openzap and other minor fixes</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_ztftmod_ztc">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c</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 (17229 => 17230)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-06 17:39:03 UTC (rev 17229)
+++ freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-06 18:41:30 UTC (rev 17230)
</span><span class="lines">@@ -2852,7 +2852,7 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#define FT_SYNTAX "list || dump <span_id> [<chan_id>] || q931_pcap <span_id> on|off [pcapfilename without suffix] || gains <span> <txgain> <rxgain>"
</del><ins>+#define FT_SYNTAX "list || dump <span_id> [<chan_id>] || q931_pcap <span_id> on|off [pcapfilename without suffix] || gains <txgain> <rxgain> <span_id> [<chan_id>]"
</ins><span class="cx"> SWITCH_STANDARD_API(ft_function)
</span><span class="cx"> {
</span><span class="cx"> char *mycmd = NULL, *argv[10] = { 0 };
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftdm_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c (17229 => 17230)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-06 17:39:03 UTC (rev 17229)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-06 18:41:30 UTC (rev 17230)
</span><span class="lines">@@ -660,10 +660,10 @@
</span><span class="cx">
</span><span class="cx"> #define FTDM_SLINEAR_MAX_VALUE 32767
</span><span class="cx"> #define FTDM_SLINEAR_MIN_VALUE -32767
</span><del>-static void reset_gain_table(unsigned char *gain_table, float new_gain, ftdm_codec_t codec_gain)
</del><ins>+static void reset_gain_table(uint8_t *gain_table, float new_gain, ftdm_codec_t codec_gain)
</ins><span class="cx"> {
</span><span class="cx"> /* sample value */
</span><del>- unsigned char sv = 0;
</del><ins>+ uint8_t sv = 0;
</ins><span class="cx"> /* linear gain factor */
</span><span class="cx"> float lingain = 0;
</span><span class="cx"> /* linear value for each table sample */
</span><span class="lines">@@ -2043,11 +2043,13 @@
</span><span class="cx"> } else {
</span><span class="cx"> ftdm_set_flag(ftdmchan, FTDM_CHANNEL_USE_RX_GAIN);
</span><span class="cx"> }
</span><ins>+ GOTO_STATUS(done, FTDM_SUCCESS);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case FTDM_COMMAND_GET_RX_GAIN:
</span><span class="cx"> {
</span><span class="cx"> FTDM_COMMAND_OBJ_FLOAT = ftdmchan->rxgain;
</span><ins>+ GOTO_STATUS(done, FTDM_SUCCESS);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case FTDM_COMMAND_SET_TX_GAIN:
</span><span class="lines">@@ -2059,11 +2061,13 @@
</span><span class="cx"> } else {
</span><span class="cx"> ftdm_set_flag(ftdmchan, FTDM_CHANNEL_USE_TX_GAIN);
</span><span class="cx"> }
</span><ins>+ GOTO_STATUS(done, FTDM_SUCCESS);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case FTDM_COMMAND_GET_TX_GAIN:
</span><span class="cx"> {
</span><span class="cx"> FTDM_COMMAND_OBJ_FLOAT = ftdmchan->txgain;
</span><ins>+ GOTO_STATUS(done, FTDM_SUCCESS);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -2076,7 +2080,7 @@
</span><span class="cx"> GOTO_STATUS(done, FTDM_FAIL);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- status = ftdmchan->fio->command(ftdmchan, command, obj);
</del><ins>+ status = ftdmchan->fio->command(ftdmchan, command, obj);
</ins><span class="cx">
</span><span class="cx"> if (status == FTDM_NOTIMPL) {
</span><span class="cx"> snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "I/O command %d not implemented in backend", command);
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_ztftmod_ztc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c (17229 => 17230)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c 2010-04-06 17:39:03 UTC (rev 17229)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c 2010-04-06 18:41:30 UTC (rev 17230)
</span><span class="lines">@@ -542,29 +542,39 @@
</span><span class="cx"> } else if (!strcasecmp(var, "echo_cancel_level")) {
</span><span class="cx"> num = atoi(val);
</span><span class="cx"> if (num < 0 || num > 256) {
</span><del>- ftdm_log(FTDM_LOG_WARNING, "invalid echo can val at line %d\n", lineno);
- } else {
- zt_globals.eclevel = num;
- }
-
</del><ins>+ ftdm_log(FTDM_LOG_WARNING, "invalid echo can val at line %d\n", lineno);
+ } else {
+ zt_globals.eclevel = num;
+ }
+ } else if (!strcasecmp(var, "echo_train_level")) {
+ if (zt_globals.eclevel < 1) {
+ ftdm_log(FTDM_LOG_WARNING, "can't set echo train level without setting echo cancel level first at line %d\n", lineno);
+ } else {
+ num = atoi(val);
+ if (num < 0 || num > 256) {
+ ftdm_log(FTDM_LOG_WARNING, "invalid echo train val at line %d\n", lineno);
+ } else {
+ zt_globals.etlevel = num;
+ }
+ }
</ins><span class="cx"> } else if (!strcasecmp(var, "rxgain")) {
</span><span class="cx"> fnum = (float)atof(val);
</span><span class="cx"> if (fnum < -100.0 || fnum > 100.0) {
</span><del>- ftdm_log(FTDM_LOG_WARNING, "invalid rxgain val at line %d\n", lineno);
- } else {
- zt_globals.rxgain = fnum;
- ftdm_log(FTDM_LOG_INFO, "Setting rxgain val to %f\n", fnum);
- }
-
</del><ins>+ ftdm_log(FTDM_LOG_WARNING, "invalid rxgain val at line %d\n", lineno);
+ } else {
+ zt_globals.rxgain = fnum;
+ ftdm_log(FTDM_LOG_INFO, "Setting rxgain val to %f\n", fnum);
+ }
</ins><span class="cx"> } else if (!strcasecmp(var, "txgain")) {
</span><span class="cx"> fnum = (float)atof(val);
</span><span class="cx"> if (fnum < -100.0 || fnum > 100.0) {
</span><del>- ftdm_log(FTDM_LOG_WARNING, "invalid txgain val at line %d\n", lineno);
- } else {
- zt_globals.txgain = fnum;
- ftdm_log(FTDM_LOG_INFO, "Setting txgain val to %f\n", fnum);
- }
-
</del><ins>+ ftdm_log(FTDM_LOG_WARNING, "invalid txgain val at line %d\n", lineno);
+ } else {
+ zt_globals.txgain = fnum;
+ ftdm_log(FTDM_LOG_INFO, "Setting txgain val to %f\n", fnum);
+ }
+ } else {
+ ftdm_log(FTDM_LOG_WARNING, "Ignoring unknown setting '%s'\n", var);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -601,52 +611,42 @@
</span><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "%s\n", ftdmchan->last_error);
</span><span class="cx"> return FTDM_FAIL;
</span><span class="cx"> }
</span><del>- } else if (ftdmchan->type == FTDM_CHAN_TYPE_FXS || ftdmchan->type == FTDM_CHAN_TYPE_FXO || ftdmchan->type == FTDM_CHAN_TYPE_EM) {
</del><ins>+ }
+ if (zt_globals.rxgain || zt_globals.txgain) {
+ struct zt_gains gains;
+ memset(&gains, 0, sizeof(gains));
+
+ gains.chan_no = ftdmchan->physical_chan_id;
+ zt_build_gains(&gains, zt_globals.rxgain, zt_globals.txgain, ftdmchan->native_codec);
+
+ if (zt_globals.rxgain)
+ ftdm_log(FTDM_LOG_INFO, "Setting rxgain to %f on channel %d\n", zt_globals.rxgain, gains.chan_no);
+
+ if (zt_globals.txgain)
+ ftdm_log(FTDM_LOG_INFO, "Setting txgain to %f on channel %d\n", zt_globals.txgain, gains.chan_no);
+
+ if (ioctl(ftdmchan->sockfd, codes.SETGAINS, &gains) < 0) {
+ ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as FreeTDM device %d:%d fd:%d\n", chanpath, ftdmchan->span_id, ftdmchan->chan_id, ftdmchan->sockfd);
+ }
+ }
+
+ if (zt_globals.eclevel >= 0) {
</ins><span class="cx"> int len = zt_globals.eclevel;
</span><ins>+ if (len) {
+ ftdm_log(FTDM_LOG_INFO, "Setting echo cancel to %d taps for %d:%d\n", len, ftdmchan->span_id, ftdmchan->chan_id);
+ } else {
+ ftdm_log(FTDM_LOG_INFO, "Disable echo cancel for %d:%d\n", ftdmchan->span_id, ftdmchan->chan_id);
+ }
</ins><span class="cx"> if (ioctl(ftdmchan->sockfd, codes.ECHOCANCEL, &len)) {
</span><span class="cx"> ftdm_log(FTDM_LOG_WARNING, "Echo cancel not available for %d:%d\n", ftdmchan->span_id, ftdmchan->chan_id);
</span><del>- //snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "%s", strerror(errno));
- //ftdm_log(FTDM_LOG_ERROR, "%s\n", ftdmchan->last_error);
- //return FTDM_FAIL;
- } else {
</del><ins>+ } else if (zt_globals.etlevel >= 0) {
</ins><span class="cx"> len = zt_globals.etlevel;
</span><span class="cx"> if (ioctl(ftdmchan->sockfd, codes.ECHOTRAIN, &len)) {
</span><span class="cx"> ftdm_log(FTDM_LOG_WARNING, "Echo training not available for %d:%d\n", ftdmchan->span_id, ftdmchan->chan_id);
</span><del>- //snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "%s", strerror(errno));
- //ftdm_log(FTDM_LOG_ERROR, "%s\n", ftdmchan->last_error);
- //return FTDM_FAIL;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if(zt_globals.rxgain || zt_globals.txgain) {
- struct zt_gains gains;
- memset(&gains, 0, sizeof(gains));
</del><span class="cx">
</span><del>- gains.chan_no = ftdmchan->physical_chan_id;
- zt_build_gains(&gains, zt_globals.rxgain, zt_globals.txgain, ftdmchan->native_codec);
-
- if(zt_globals.rxgain)
- ftdm_log(FTDM_LOG_INFO, "Setting rxgain to %f on channel %d\n", zt_globals.rxgain, gains.chan_no);
-
- if(zt_globals.txgain)
- ftdm_log(FTDM_LOG_INFO, "Setting txgain to %f on channel %d\n", zt_globals.txgain, gains.chan_no);
-
- if (ioctl(ftdmchan->sockfd, codes.SETGAINS, &gains) < 0) {
- ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as FreeTDM device %d:%d fd:%d\n", chanpath, ftdmchan->span_id, ftdmchan->chan_id, ftdmchan->sockfd);
- }
- }
-
- int len = zt_globals.eclevel;
- ftdm_log(FTDM_LOG_INFO, "Setting echo cancel to %d taps for %d:%d\n", len, ftdmchan->span_id, ftdmchan->chan_id);
- if (ioctl(ftdmchan->sockfd, codes.ECHOCANCEL, &len)) {
- ftdm_log(FTDM_LOG_WARNING, "Echo cancel not available for %d:%d\n", ftdmchan->span_id, ftdmchan->chan_id);
- } else {
- len = zt_globals.etlevel;
- if (ioctl(ftdmchan->sockfd, codes.ECHOTRAIN, &len)) {
- ftdm_log(FTDM_LOG_WARNING, "Echo training not available for %d:%d\n", ftdmchan->span_id, ftdmchan->chan_id);
- }
- }
-
</del><span class="cx"> }
</span><span class="cx"> return FTDM_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1179,7 +1179,7 @@
</span><span class="cx"> zt_globals.codec_ms = 20;
</span><span class="cx"> zt_globals.wink_ms = 150;
</span><span class="cx"> zt_globals.flash_ms = 750;
</span><del>- zt_globals.eclevel = 64;
</del><ins>+ zt_globals.eclevel = 0;
</ins><span class="cx"> zt_globals.etlevel = 0;
</span><span class="cx">
</span><span class="cx"> zt_interface.name = "zt";
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>