<h1>Project "FreeSWITCH Source" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
discards acd6333e33b9ff9e0f1a424cb7dc5e5b1d063b6a (commit)
discards d8b11ce63b908ae893feda5345ed712c9125623a (commit)
discards b8afa79b4446b80336285d1ce0bb4293cb9e04ed (commit)
discards 2582d71689191909fd8a62b5f5693ebd1b4dc8d1 (commit)
discards 3546654615f88058fb6769fe79e07162602fa4af (commit)
discards 1e09a4d2dafdd9a5ffa2ab606d2caebf52baf25f (commit)
discards 92f51bd60332511c5689c0993cf561f4a5493297 (commit)
discards 23b387b7f5f4b13ca40c9d62ab06a04c66810e63 (commit)
via: c17da69d6773e2ac37bc256ad0669ea901525bec (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 (acd6333e33b9ff9e0f1a424cb7dc5e5b1d063b6a)
\
N -- N -- N (c17da69d6773e2ac37bc256ad0669ea901525bec)
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: Konrad Hammel
comments:
freetdm: ss7 - added hardware dtmf
<span style="color: #000080; font-weight: bold">diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c</span>
<span style="color: #000080; font-weight: bold">index 2f2e502..d38d25f 100644</span>
<span style="color: #A00000">--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c</span>
<span style="color: #00A000">+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c</span>
<span style="color: #800080; font-weight: bold">@@ -273,6 +273,7 @@ static void *ftdm_sangoma_ss7_run(ftdm_thread_t * me, void *obj)</span>
ftdm_interrupt_t *ftdm_sangoma_ss7_int[2];
ftdm_span_t *ftdmspan = (ftdm_span_t *) obj;
ftdm_channel_t *ftdmchan = NULL;
<span style="color: #00A000">+ ftdm_event_t *event = NULL;</span>
sngss7_event_data_t *sngss7_event = NULL;
sngss7_span_data_t *sngss7_span = (sngss7_span_data_t *)ftdmspan->signal_data;
<span style="color: #800080; font-weight: bold">@@ -363,6 +364,22 @@ static void *ftdm_sangoma_ss7_run(ftdm_thread_t * me, void *obj)</span>
/* check each channel on the span to see if there is an un-procressed SUS/RES flag */
check_for_res_sus_flag(ftdmspan);
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ /* Poll for events, e.g HW DTMF */</span>
<span style="color: #00A000">+ switch (ftdm_span_poll_event(ftdmspan, 0)) {</span>
<span style="color: #00A000">+ /**********************************************************************/</span>
<span style="color: #00A000">+ case FTDM_SUCCESS:</span>
<span style="color: #00A000">+ while (ftdm_span_next_event(ftdmspan, &event) == FTDM_SUCCESS);</span>
<span style="color: #00A000">+ break;</span>
<span style="color: #00A000">+ /**********************************************************************/</span>
<span style="color: #00A000">+ case FTDM_TIMEOUT:</span>
<span style="color: #00A000">+ /* No events pending */</span>
<span style="color: #00A000">+ break;</span>
<span style="color: #00A000">+ /**********************************************************************/</span>
<span style="color: #00A000">+ default:</span>
<span style="color: #00A000">+ SS7_ERROR("%s:Failed to poll span event\n", ftdmspan->name);</span>
<span style="color: #00A000">+ /**********************************************************************/</span>
<span style="color: #00A000">+ } /* switch (ftdm_span_poll_event(span, 0)) */</span>
} /* master while loop */
/* clear the IN_THREAD flag so that we know the thread is done */
</pre></div>
========================================================================<pre>
Summary of changes:
libs/freetdm/mod_freetdm/mod_freetdm.c | 12 +++++++++++-
libs/freetdm/src/ftdm_io.c | 12 +++++++-----
.../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c | 17 +++++++++++++++++
libs/iksemel/configure.ac | 8 ++++----
4 files changed, 39 insertions(+), 10 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>