<h1>Project "FreeSWITCH Source" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
via: 145884c94ce9bcb25aa14d45e6d689b0d4af75ed (commit)
via: acd6333e33b9ff9e0f1a424cb7dc5e5b1d063b6a (commit)
via: d8b11ce63b908ae893feda5345ed712c9125623a (commit)
via: b8afa79b4446b80336285d1ce0bb4293cb9e04ed (commit)
via: 2582d71689191909fd8a62b5f5693ebd1b4dc8d1 (commit)
via: 3546654615f88058fb6769fe79e07162602fa4af (commit)
via: 1e09a4d2dafdd9a5ffa2ab606d2caebf52baf25f (commit)
via: 92f51bd60332511c5689c0993cf561f4a5493297 (commit)
via: 23b387b7f5f4b13ca40c9d62ab06a04c66810e63 (commit)
from: e6be62b0e14a1865f14617abde8eafdb667bbadb (commit)
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Moises Silva
comments:
Merge remote branch 'fsorig/master'
</pre></div>
<div class="highlight"><pre>committer: Moises Silva
comments:
freetdm: disallow completely core variables for freetdm outbound variables
<span style="color: #000080; font-weight: bold">diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c</span>
<span style="color: #000080; font-weight: bold">index c0fdaa6..78874de 100755</span>
<span style="color: #A00000">--- a/libs/freetdm/mod_freetdm/mod_freetdm.c</span>
<span style="color: #00A000">+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c</span>
<span style="color: #800080; font-weight: bold">@@ -1055,28 +1055,18 @@ switch_io_routines_t freetdm_io_routines = {</span>
static const char* channel_get_variable(switch_core_session_t *session, switch_event_t *var_event, const char *variable_name)
{
const char *variable = NULL;
<span style="color: #A00000">-</span>
if (var_event) {
if ((variable = switch_event_get_header(var_event, variable_name))) {
return variable;
}
}
<span style="color: #00A000">+</span>
if (session) {
switch_channel_t *channel = switch_core_session_get_channel(session);
if ((variable = switch_channel_get_variable(channel, variable_name))) {
return variable;
}
}
<span style="color: #A00000">-</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- // This is unsafe, I don't see anywhere in the whole code where this is called with NULL session anyway.</span>
<span style="color: #A00000">- // There is a new switch_core_get_variable_dup that will strdup it for you and then you must free it.</span>
<span style="color: #A00000">- // That messes up the abstraction completely so I am just commenting it out for you.....</span>
<span style="color: #A00000">- /*</span>
<span style="color: #A00000">- if ((variable = switch_core_get_variable(variable_name))) {</span>
<span style="color: #A00000">- return variable;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- */</span>
return NULL;
}
</pre></div>
<div class="highlight"><pre>committer: Anthony Minessale
comments:
revert
<span style="color: #000080; font-weight: bold">diff --git a/src/mod/endpoints/mod_loopback/mod_loopback.c b/src/mod/endpoints/mod_loopback/mod_loopback.c</span>
<span style="color: #000080; font-weight: bold">index b098ede..be9b499 100644</span>
<span style="color: #A00000">--- a/src/mod/endpoints/mod_loopback/mod_loopback.c</span>
<span style="color: #00A000">+++ b/src/mod/endpoints/mod_loopback/mod_loopback.c</span>
<span style="color: #800080; font-weight: bold">@@ -637,13 +637,8 @@ static switch_status_t channel_write_frame(switch_core_session_t *session, switc</span>
tech_pvt->other_tech_pvt &&
switch_test_flag(tech_pvt, TFLAG_BRIDGE) &&
switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_BRIDGE) &&
<span style="color: #A00000">-</span>
switch_channel_test_flag(tech_pvt->channel, CF_BRIDGED) &&
switch_channel_test_flag(tech_pvt->other_channel, CF_BRIDGED) &&
<span style="color: #A00000">-</span>
<span style="color: #A00000">- !switch_channel_test_flag(tech_pvt->channel, CF_INNER_BRIDGE) &&</span>
<span style="color: #A00000">- !switch_channel_test_flag(tech_pvt->other_channel, CF_INNER_BRIDGE) &&</span>
<span style="color: #A00000">-</span>
switch_channel_test_flag(tech_pvt->channel, CF_ANSWERED) &&
switch_channel_test_flag(tech_pvt->other_channel, CF_ANSWERED) && !--tech_pvt->bowout_frame_count <= 0) {
const char *a_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE);
</pre></div>
<div class="highlight"><pre>committer: cypromis
comments:
Merge remote branch 'origin/master'
</pre></div>
<div class="highlight"><pre>committer: Moises Silva
comments:
freetdm: use packet_len as the base length in tone generation
<span style="color: #000080; font-weight: bold">diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c</span>
<span style="color: #000080; font-weight: bold">index 1e282d1..bd4e896 100644</span>
<span style="color: #A00000">--- a/libs/freetdm/src/ftdm_io.c</span>
<span style="color: #00A000">+++ b/libs/freetdm/src/ftdm_io.c</span>
<span style="color: #800080; font-weight: bold">@@ -3588,7 +3588,7 @@ static FIO_READ_FUNCTION(ftdm_raw_read)</span>
}
/* This function takes care of automatically generating DTMF or FSK tones when needed */
<span style="color: #A00000">-static ftdm_status_t handle_tone_generation(ftdm_channel_t *ftdmchan, ftdm_size_t datalen)</span>
<span style="color: #00A000">+static ftdm_status_t handle_tone_generation(ftdm_channel_t *ftdmchan)</span>
{
/*
* datalen: size in bytes of the chunk of data the user requested to read (this function
<span style="color: #800080; font-weight: bold">@@ -3650,9 +3650,7 @@ static ftdm_status_t handle_tone_generation(ftdm_channel_t *ftdmchan, ftdm_size_</span>
/* if we picked a buffer, time to read from it and write the linear data to the device */
if (buffer) {
uint8_t auxbuf[1024];
<span style="color: #A00000">- /* we initialize dlen to datalen, which is the size in bytes the </span>
<span style="color: #A00000">- * user wants to read (typically chunks of 160 bytes, 20ms G.711) */</span>
<span style="color: #A00000">- ftdm_size_t dlen = datalen;</span>
<span style="color: #00A000">+ ftdm_size_t dlen = ftdmchan->packet_len;</span>
ftdm_size_t len, br, max = sizeof(auxbuf);
/* if the codec is not linear, then data is really twice as much cuz
<span style="color: #800080; font-weight: bold">@@ -3662,10 +3660,10 @@ static ftdm_status_t handle_tone_generation(ftdm_channel_t *ftdmchan, ftdm_size_</span>
}
/* we do not expect the user chunks to be bigger than auxbuf */
<span style="color: #A00000">- ftdm_assert(dlen <= sizeof(auxbuf), "Unexpected size for user data chunk size\n");</span>
<span style="color: #00A000">+ ftdm_assert((dlen <= sizeof(auxbuf)), "Unexpected size for user data chunk size\n");</span>
/* dblen is the size in use for dtmf_buffer or fsk_buffer, and dlen is the size
<span style="color: #A00000">- * of the read chunks of the user, we pick the smaller one */</span>
<span style="color: #00A000">+ * of the io chunks to write, we pick the smaller one */</span>
len = dblen > dlen ? dlen : dblen;
/* we can't read more than the size of our auxiliary buffer */
<span style="color: #800080; font-weight: bold">@@ -3770,7 +3768,7 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_read(ftdm_channel_t *ftdmchan, void *data</span>
rdata[i] = ftdmchan->rxgain_table[rdata[i]];
}
}
<span style="color: #A00000">- handle_tone_generation(ftdmchan, *datalen);</span>
<span style="color: #00A000">+ handle_tone_generation(ftdmchan);</span>
if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_TRANSCODE) && ftdmchan->effective_codec != ftdmchan->native_codec) {
if (ftdmchan->native_codec == FTDM_CODEC_ULAW && ftdmchan->effective_codec == FTDM_CODEC_SLIN) {
</pre></div>
<div class="highlight"><pre>committer: Anthony Minessale
comments:
don't bow out on att_xfer bridge
<span style="color: #000080; font-weight: bold">diff --git a/src/mod/endpoints/mod_loopback/mod_loopback.c b/src/mod/endpoints/mod_loopback/mod_loopback.c</span>
<span style="color: #000080; font-weight: bold">index be9b499..b098ede 100644</span>
<span style="color: #A00000">--- a/src/mod/endpoints/mod_loopback/mod_loopback.c</span>
<span style="color: #00A000">+++ b/src/mod/endpoints/mod_loopback/mod_loopback.c</span>
<span style="color: #800080; font-weight: bold">@@ -637,8 +637,13 @@ static switch_status_t channel_write_frame(switch_core_session_t *session, switc</span>
tech_pvt->other_tech_pvt &&
switch_test_flag(tech_pvt, TFLAG_BRIDGE) &&
switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_BRIDGE) &&
<span style="color: #00A000">+</span>
switch_channel_test_flag(tech_pvt->channel, CF_BRIDGED) &&
switch_channel_test_flag(tech_pvt->other_channel, CF_BRIDGED) &&
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ !switch_channel_test_flag(tech_pvt->channel, CF_INNER_BRIDGE) &&</span>
<span style="color: #00A000">+ !switch_channel_test_flag(tech_pvt->other_channel, CF_INNER_BRIDGE) &&</span>
<span style="color: #00A000">+</span>
switch_channel_test_flag(tech_pvt->channel, CF_ANSWERED) &&
switch_channel_test_flag(tech_pvt->other_channel, CF_ANSWERED) && !--tech_pvt->bowout_frame_count <= 0) {
const char *a_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE);
</pre></div>
<div class="highlight"><pre>committer: cypromis
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch
</pre></div>
<div class="highlight"><pre>committer: cypromis
comments:
Merge remote branch 'origin/master'
</pre></div>
<div class="highlight"><pre>committer: cypromis
comments:
antoher try at c options to make iksemel right on solaris
<span style="color: #000080; font-weight: bold">diff --git a/libs/iksemel/configure.ac b/libs/iksemel/configure.ac</span>
<span style="color: #000080; font-weight: bold">index 49d8621..403725a 100644</span>
<span style="color: #A00000">--- a/libs/iksemel/configure.ac</span>
<span style="color: #00A000">+++ b/libs/iksemel/configure.ac</span>
<span style="color: #800080; font-weight: bold">@@ -83,12 +83,12 @@ AC_ARG_ENABLE(64,</span>
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
if test "${enable_64}" = "yes"; then
<span style="color: #A00000">- CFLAGS="$CFLAGS -xc99=all -mt -m64 -lgpg-error"</span>
<span style="color: #A00000">- CXXFLAGS="$CXXFLAGS -xc99=all -mt -m64 -lgpg-error"</span>
<span style="color: #00A000">+ CFLAGS="$CFLAGS -mt -m64 -lgpg-error"</span>
<span style="color: #00A000">+ CXXFLAGS="$CXXFLAGS -mt -m64 -lgpg-error"</span>
SUNFLAGS="-xc99=all -mt -m64 -lgpg-error"
else
<span style="color: #A00000">- CFLAGS="$CFLAGS -xc99=all -mt -lgpg-error"</span>
<span style="color: #A00000">- CXXFLAGS="$CXXFLAGS -xc99=all -mt -lgpg-error"</span>
<span style="color: #00A000">+ CFLAGS="$CFLAGS -mt -lgpg-error"</span>
<span style="color: #00A000">+ CXXFLAGS="$CXXFLAGS -mt -lgpg-error"</span>
SUNFLAGS="-xc99=all -mt -lgpg-error"
fi
fi
</pre></div>
========================================================================<pre>
Summary of changes:
libs/freetdm/mod_freetdm/mod_freetdm.c | 12 +-----------
libs/freetdm/src/ftdm_io.c | 12 +++++-------
libs/iksemel/configure.ac | 8 ++++----
3 files changed, 10 insertions(+), 22 deletions(-)
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH Source</p>