<h1>Project "FreeSWITCH Source" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
discards c17da69d6773e2ac37bc256ad0669ea901525bec (commit)
discards 46215605f42bf534ab040e63b9bd84a6c34c3e05 (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 0e841a5f14810514ee60562481c405d7fb560e72 (commit)
discards a93623618b83fb08f2a0a728800f431856b29f92 (commit)
via: 381738f70027fb4641f840d16597151eed8d7f67 (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 (c17da69d6773e2ac37bc256ad0669ea901525bec)
\
N -- N -- N (381738f70027fb4641f840d16597151eed8d7f67)
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 - bug fix for configuration
<span style="color: #000080; font-weight: bold">diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c</span>
<span style="color: #000080; font-weight: bold">index 1b24e34..2f67d3f 100644</span>
<span style="color: #A00000">--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c</span>
<span style="color: #00A000">+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c</span>
<span style="color: #800080; font-weight: bold">@@ -1749,33 +1749,46 @@ static int ftmod_ss7_parse_isup_interface(ftdm_conf_node_t *isup_interface)</span>
/* default the interface to paused state */
sngss7_set_flag(&sng_isup, SNGSS7_PAUSED);
<span style="color: #A00000">- /* trickle down the SPC to all sub entities */</span>
<span style="color: #A00000">- lnkSet = &g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].lnkSets;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtp3Link[lnkSet->lsId].spc = sng_isup.spc;</span>
<span style="color: #A00000">- lnkSet = lnkSet->next;</span>
<span style="color: #00A000">+ /* trickle down the SPC to all sub entities */</span>
<span style="color: #00A000">+ lnkSet = &g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].lnkSets;</span>
while (lnkSet->next != NULL) {
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtp3Link[lnkSet->lsId].spc = sng_isup.spc;</span>
<span style="color: #00A000">+ /**************************************************************************/</span>
<span style="color: #00A000">+ /* go through all the links and check if they belong to this linkset*/</span>
<span style="color: #00A000">+ i = 1;</span>
<span style="color: #00A000">+ while (g_ftdm_sngss7_data.cfg.mtp3Link[i].id != 0) {</span>
<span style="color: #00A000">+ /* check if this link is in the linkset */</span>
<span style="color: #00A000">+ if (g_ftdm_sngss7_data.cfg.mtp3Link[i].linkSetId == lnkSet->lsId) {</span>
<span style="color: #00A000">+ /* fill in the spc */</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtp3Link[i].spc = sng_isup.spc;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ </span>
<span style="color: #00A000">+ i++;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ </span>
<span style="color: #00A000">+ /* move to the next lnkSet */</span>
lnkSet = lnkSet->next;
<span style="color: #A00000">- }</span>
<span style="color: #00A000">+ /**************************************************************************/</span>
<span style="color: #00A000">+ } /* while (lnkSet->next != NULL) */</span>
/* pull values from the lower levels */
<span style="color: #A00000">- sng_isup.dpc = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].dpc;</span>
<span style="color: #A00000">- sng_isup.switchType = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].switchType;</span>
<span style="color: #A00000">- sng_isup.nwId = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].nwId;</span>
<span style="color: #A00000">-</span>
sng_isap.switchType = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].switchType;
<span style="color: #00A000">+ /* fill in the isap */</span>
ftmod_ss7_fill_in_isap(&sng_isap);
<span style="color: #A00000">- sng_isup.isap = sng_isap.id;</span>
<span style="color: #00A000">+ /* pull values from the lower levels */</span>
<span style="color: #00A000">+ sng_isup.isap = sng_isap.id;</span>
<span style="color: #00A000">+ sng_isup.dpc = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].dpc;</span>
<span style="color: #00A000">+ sng_isup.switchType = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].switchType;</span>
<span style="color: #00A000">+ sng_isup.nwId = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].nwId;</span>
<span style="color: #00A000">+ /* fill in the isup interface */</span>
ftmod_ss7_fill_in_isup_interface(&sng_isup);
/* setup the self mtp3 route */
i = sng_isup.mtpRouteId;
<span style="color: #A00000">-</span>
if(ftmod_ss7_fill_in_self_route(sng_isup.spc,
g_ftdm_sngss7_data.cfg.mtpRoute[i].linkType,
g_ftdm_sngss7_data.cfg.mtpRoute[i].switchType,
</pre></div>
========================================================================<pre>
Summary of changes:
conf/autoload_configs/switch.conf.xml | 2 +-
libs/freetdm/src/ftdm_io.c | 48 ++++----------------
.../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c | 17 -------
.../ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c | 37 ++++++++++-----
.../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 +--
9 files changed, 62 insertions(+), 123 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>