<h1>Project "FreeSWITCH Source" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
discards c0e340b188f8899767e1e347cc011ee3c0a6e88a (commit)
discards 4f254ebe15c6c512570cd8968d36e936a07a25f2 (commit)
discards 145884c94ce9bcb25aa14d45e6d689b0d4af75ed (commit)
discards e6be62b0e14a1865f14617abde8eafdb667bbadb (commit)
discards edfb1e9943b12a085ebb90190c5119721bee8550 (commit)
discards 381738f70027fb4641f840d16597151eed8d7f67 (commit)
discards acd6333e33b9ff9e0f1a424cb7dc5e5b1d063b6a (commit)
discards d8b11ce63b908ae893feda5345ed712c9125623a (commit)
discards b8afa79b4446b80336285d1ce0bb4293cb9e04ed (commit)
discards 2582d71689191909fd8a62b5f5693ebd1b4dc8d1 (commit)
discards c17da69d6773e2ac37bc256ad0669ea901525bec (commit)
discards 3546654615f88058fb6769fe79e07162602fa4af (commit)
discards 46215605f42bf534ab040e63b9bd84a6c34c3e05 (commit)
discards 361178089943c14bb3f842d7ff5cd8950cbe2493 (commit)
discards 1ee94c11c7b2fd46508eebb463ffd9a1cf9b19ce (commit)
discards 6f9da9a070517ce30e9edec6a7d2536db0646c33 (commit)
discards eeac03ef5028b565b28364752ef5a48307ca17d4 (commit)
discards 8037b69f40413784631c59942b5d4fc856cff845 (commit)
discards 67edc7c3215f6476452f3ff7ee82ba559c39656f (commit)
discards 2adfc50af7958eea12c15e023bcf80b18a4c73f9 (commit)
discards 0cbac4ad25ed3921262a7676397206f824aade32 (commit)
discards 2401fec54b48d8dfb1ec5a2f33a092dac076c0f3 (commit)
discards 330d741853f4f7c548b61dbcb717266a2bf24107 (commit)
discards 93501b288b34a7d4f5287f7bc2b498a2321d73c5 (commit)
discards df4a18dcba1ad6a3ac20f67982642e8fe0e35471 (commit)
discards 0e841a5f14810514ee60562481c405d7fb560e72 (commit)
discards a93623618b83fb08f2a0a728800f431856b29f92 (commit)
discards 1e09a4d2dafdd9a5ffa2ab606d2caebf52baf25f (commit)
discards 92f51bd60332511c5689c0993cf561f4a5493297 (commit)
discards 23b387b7f5f4b13ca40c9d62ab06a04c66810e63 (commit)
via: c81bf01fc977fd1a12b521cf29abb5b466f1fda2 (commit)
via: 25f9bba3743c72970c3285509129b09d93b6c22b (commit)
via: c467886267db6b842b9bed9f50ee812d4ee427e4 (commit)
via: 6cecbca2bbb8dc7cc4511e91a992ce77cb126d17 (commit)
via: b6afdadc82a3d9c95ff61bad4a7f869d220cd0f9 (commit)
via: c339d6f2e1e8111da4150974ca324d3c3b9393c0 (commit)
via: 14e931ffbb1d0e3196420b0eceb7a21fcd09abf4 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (c0e340b188f8899767e1e347cc011ee3c0a6e88a)
\
N -- N -- N (c81bf01fc977fd1a12b521cf29abb5b466f1fda2)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Moises Silva
comments:
freetdm: ftmod_r2 - set MF dump directory default to logdir
<span style="color: #000080; font-weight: bold">diff --git a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c</span>
<span style="color: #000080; font-weight: bold">index d86fb43..83705d9 100644</span>
<span style="color: #A00000">--- a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c</span>
<span style="color: #00A000">+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c</span>
<span style="color: #800080; font-weight: bold">@@ -725,9 +725,10 @@ static void dump_mf(openr2_chan_t *r2chan)</span>
if (r2data->mf_dump_size) {
char *logname = R2CALL(ftdmchan)->logname;
<span style="color: #A00000">- ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Dumping IO output in prefix %s\n", logname);</span>
<span style="color: #A00000">- snprintf(dfile, sizeof(dfile), logname ? "%s.s%dc%d.input.alaw" : "%s/s%dc%d.input.alaw", </span>
<span style="color: #A00000">- logname ? logname : r2data->logdir, ftdmchan->span_id, ftdmchan->chan_id);</span>
<span style="color: #00A000">+ ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Dumping IO output in prefix %s\n", !ftdm_strlen_zero(logname)</span>
<span style="color: #00A000">+ ? logname : r2data->logdir);</span>
<span style="color: #00A000">+ snprintf(dfile, sizeof(dfile), !ftdm_strlen_zero(logname) ? "%s.s%dc%d.input.alaw" : "%s/s%dc%d.input.alaw", </span>
<span style="color: #00A000">+ !ftdm_strlen_zero(logname) ? logname : r2data->logdir, ftdmchan->span_id, ftdmchan->chan_id);</span>
f = fopen(dfile, "wb");
if (f) {
ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Dumping IO input in file %s\n", dfile);
<span style="color: #800080; font-weight: bold">@@ -737,8 +738,8 @@ static void dump_mf(openr2_chan_t *r2chan)</span>
ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Could not dump IO input in file %s, error: %s", dfile, strerror(errno));
}
<span style="color: #A00000">- snprintf(dfile, sizeof(dfile), logname ? "%s.s%dc%d.output.alaw" : "%s/s%dc%d.output.alaw", </span>
<span style="color: #A00000">- logname ? logname : r2data->logdir, ftdmchan->span_id, ftdmchan->chan_id);</span>
<span style="color: #00A000">+ snprintf(dfile, sizeof(dfile), !ftdm_strlen_zero(logname) ? "%s.s%dc%d.output.alaw" : "%s/s%dc%d.output.alaw", </span>
<span style="color: #00A000">+ !ftdm_strlen_zero(logname) ? logname : r2data->logdir, ftdmchan->span_id, ftdmchan->chan_id);</span>
f = fopen(dfile, "wb");
if (f) {
ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Dumping IO output in file %s\n", dfile);
</pre></div>
<div class="highlight"><pre>committer: David Yat Sin
comments:
Merge branch 'master' into netborder
</pre></div>
<div class="highlight"><pre>committer: David Yat Sin
comments:
freetdm: Added sigmsg->call_priv member that contains caller_data.priv originally set by user
<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 c9000de..906fbfe 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">@@ -5504,6 +5504,7 @@ FT_DECLARE(ftdm_status_t) ftdm_span_send_signal(ftdm_span_t *span, ftdm_sigmsg_t</span>
sigmsg->chan_id = sigmsg->channel->chan_id;
sigmsg->span_id = sigmsg->channel->span_id;
sigmsg->call_id = sigmsg->channel->caller_data.call_id;
<span style="color: #00A000">+ sigmsg->call_priv = sigmsg->channel->caller_data.priv;</span>
}
/* some core things to do on special events */
<span style="color: #000080; font-weight: bold">diff --git a/libs/freetdm/src/include/freetdm.h b/libs/freetdm/src/include/freetdm.h</span>
<span style="color: #000080; font-weight: bold">index 588dc31..77abf6a 100644</span>
<span style="color: #A00000">--- a/libs/freetdm/src/include/freetdm.h</span>
<span style="color: #00A000">+++ b/libs/freetdm/src/include/freetdm.h</span>
<span style="color: #800080; font-weight: bold">@@ -554,6 +554,7 @@ struct ftdm_sigmsg {</span>
uint32_t chan_id; /*!< easy access to chan id */
uint32_t span_id; /*!< easy access to span_id */
uint32_t call_id; /*!< unique call id for this call */
<span style="color: #00A000">+ void *call_priv; /*!< Private data for the FreeTDM user from ftdm_caller_data->priv */</span>
union {
ftdm_event_sigstatus_t sigstatus; /*!< valid if event_id is FTDM_SIGEVENT_SIGSTATUS_CHANGED */
ftdm_event_trace_t trace; /*!< valid if event_id is FTDM_SIGEVENT_TRACE or FTDM_SIGEVENT_TRACE_RAW */
</pre></div>
<div class="highlight"><pre>committer: David Yat Sin
comments:
freetdm: ISDN - Removed unnecessay locks since lock is now done by ftdm core
<span style="color: #000080; font-weight: bold">diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c</span>
<span style="color: #000080; font-weight: bold">index 5702b72..608b0b6 100644</span>
<span style="color: #A00000">--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c</span>
<span style="color: #00A000">+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c</span>
<span style="color: #800080; font-weight: bold">@@ -912,9 +912,6 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(ftdm_sangoma_isdn_outgoing_call)</span>
sngisdn_chan_data_t *sngisdn_info = ftdmchan->call_data;
ftdm_status_t status = FTDM_FAIL;
<span style="color: #A00000">- /* lock the channel while we check whether it is availble */</span>
<span style="color: #A00000">- ftdm_channel_lock(ftdmchan);</span>
<span style="color: #A00000">-</span>
switch (ftdmchan->state) {
case FTDM_CHANNEL_STATE_DOWN:
<span style="color: #800080; font-weight: bold">@@ -939,10 +936,9 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(ftdm_sangoma_isdn_outgoing_call)</span>
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "Outgoing call requested channel in already in use\n");
status = FTDM_BREAK;
}
<span style="color: #A00000">- break; </span>
<span style="color: #00A000">+ break;</span>
}
<span style="color: #A00000">- ftdm_channel_unlock(ftdmchan);</span>
return status;
}
static FIO_CHANNEL_GET_SIG_STATUS_FUNCTION(ftdm_sangoma_isdn_get_chan_sig_status)
</pre></div>
<div class="highlight"><pre>committer: Moises Silva
comments:
no test
<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 3ac9f4c..529a30f 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">@@ -37,10 +37,6 @@</span>
*
*/
<span style="color: #A00000">-#ifdef MOYTEST</span>
<span style="color: #A00000">-crap</span>
<span style="color: #A00000">-#endif</span>
<span style="color: #A00000">-</span>
#define _GNU_SOURCE
#include "private/ftdm_core.h"
#include <stdarg.h>
</pre></div>
<div class="highlight"><pre>committer: Moises Silva
comments:
test
<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 529a30f..3ac9f4c 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">@@ -37,6 +37,10 @@</span>
*
*/
<span style="color: #00A000">+#ifdef MOYTEST</span>
<span style="color: #00A000">+crap</span>
<span style="color: #00A000">+#endif</span>
<span style="color: #00A000">+</span>
#define _GNU_SOURCE
#include "private/ftdm_core.h"
#include <stdarg.h>
</pre></div>
<div class="highlight"><pre>committer: David Yat Sin
comments:
Merge branch 'master' of git://git.freeswitch.org/freeswitch into netborder
</pre></div>
========================================================================<pre>
Summary of changes:
conf/autoload_configs/switch.conf.xml | 2 +-
libs/freetdm/mod_freetdm/mod_freetdm.c | 12 ++-
libs/freetdm/src/ftdm_io.c | 47 ++------
libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c | 11 +-
.../ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c | 6 +-
.../ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c | 2 -
.../ftmod_sangoma_isdn_stack_cfg.c | 38 +++----
.../ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c | 22 +++-
.../ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c | 4 +-
.../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c | 17 ---
.../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h | 6 -
.../ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c | 125 ++++++++------------
libs/freetdm/src/include/freetdm.h | 1 +
libs/iksemel/configure.ac | 8 +-
.../applications/mod_conference/mod_conference.c | 45 +++-----
src/mod/applications/mod_dptools/mod_dptools.c | 2 -
src/mod/applications/mod_voicemail/mod_voicemail.c | 26 ++---
src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c | 2 +-
src/mod/endpoints/mod_sofia/mod_sofia.c | 6 +-
19 files changed, 149 insertions(+), 233 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>