<!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][17362] </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=17362">17362</a></dd>
<dt>Author</dt> <dd>moises.silva</dd>
<dt>Date</dt> <dd>2010-04-21 13:53:23 -0500 (Wed, 21 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>freetdm: make sure gains are not applied to non-voice channels</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmsrcftdm_ioc">freeswitch/trunk/libs/freetdm/src/ftdm_io.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmsrcftdm_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c (17361 => 17362)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-21 18:57:23 UTC (rev 17361)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-21 18:53:23 UTC (rev 17362)
</span><span class="lines">@@ -2050,6 +2050,10 @@
</span><span class="cx">
</span><span class="cx"> case FTDM_COMMAND_SET_RX_GAIN:
</span><span class="cx"> {
</span><ins>+ if (!FTDM_IS_VOICE_CHANNEL(ftdmchan)) {
+ ftdm_log(FTDM_LOG_ERROR, "Cannot set rx gain in non-voice channel of type: %s\n", ftdm_chan_type2str(ftdmchan->type));
+ GOTO_STATUS(done, FTDM_FAIL);
+ }
</ins><span class="cx"> ftdmchan->rxgain = FTDM_COMMAND_OBJ_FLOAT;
</span><span class="cx"> reset_gain_table(ftdmchan->rxgain_table, ftdmchan->rxgain, ftdmchan->native_codec);
</span><span class="cx"> if (ftdmchan->rxgain == 0.0) {
</span><span class="lines">@@ -2068,6 +2072,10 @@
</span><span class="cx"> break;
</span><span class="cx"> case FTDM_COMMAND_SET_TX_GAIN:
</span><span class="cx"> {
</span><ins>+ if (!FTDM_IS_VOICE_CHANNEL(ftdmchan)) {
+ ftdm_log(FTDM_LOG_ERROR, "Cannot set tx gain in non-voice channel of type: %s\n", ftdm_chan_type2str(ftdmchan->type));
+ GOTO_STATUS(done, FTDM_FAIL);
+ }
</ins><span class="cx"> ftdmchan->txgain = FTDM_COMMAND_OBJ_FLOAT;
</span><span class="cx"> reset_gain_table(ftdmchan->txgain_table, ftdmchan->txgain, ftdmchan->native_codec);
</span><span class="cx"> if (ftdmchan->txgain == 0.0) {
</span><span class="lines">@@ -2468,17 +2476,17 @@
</span><span class="cx"> ftdm_assert_return(ftdmchan != NULL, FTDM_FAIL, "ftdmchan is null\n");
</span><span class="cx"> ftdm_assert_return(ftdmchan->fio != NULL, FTDM_FAIL, "No I/O module attached to ftdmchan\n");
</span><span class="cx">
</span><del>- if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OPEN)) {
</del><ins>+ if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OPEN)) {
</ins><span class="cx"> snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "channel not open");
</span><del>- return FTDM_FAIL;
- }
</del><ins>+ return FTDM_FAIL;
+ }
</ins><span class="cx">
</span><span class="cx"> if (!ftdmchan->fio->read) {
</span><span class="cx"> snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "method not implemented");
</span><span class="cx"> return FTDM_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- status = ftdmchan->fio->read(ftdmchan, data, datalen);
</del><ins>+ status = ftdmchan->fio->read(ftdmchan, data, datalen);
</ins><span class="cx"> if (ftdmchan->fds[0] > -1) {
</span><span class="cx"> int dlen = (int) *datalen;
</span><span class="cx"> if (write(ftdmchan->fds[0], data, dlen) != dlen) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>