<h1>Project "FreeSWITCH Source" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
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 804fc61a6c28f85321614ab74ba3986e2cd7a771 (commit)
discards 428ef9666734805fa7f97f8291c06252a4f1b798 (commit)
discards f64b03bd8b25deb191fd456a1854b02fd73626fc (commit)
discards 3830484155cfa3bd8ef09b88515e8afa6c251121 (commit)
discards bcb2262fdc48b36bd2e6bfe45adcbaecd1d091ee (commit)
discards f0a31e1bfff2d49d97bc0ee83627c426fa311bfc (commit)
discards 526e6fe48cadc9418d64f2b639bad68d8883dcdd (commit)
discards 8c12162a9d92ceac55c6305f2336efcf7157b923 (commit)
discards bab7a2392f955facbb91d0f30512682e2b38773e (commit)
discards 12c13e115b96e9e036bd65655c1f12a72a83510e (commit)
discards cf83f9c381a6abb988efc41b8711271b4665b79e (commit)
discards 080c5ae98167e590bebf698439c550bdb656925e (commit)
discards 0806c3880104fff154802adb010713365ef6a0ed (commit)
discards d4b5b07b2a76404ed8bf5adf8bc2bc9c0cbd9f04 (commit)
discards 2b4f163826132cf55698008a22c065374320796a (commit)
discards 7386b9f8f55e6b2648bcfb3f9dafaf62dccd772e (commit)
discards 0d5fcf65a0fef932f32874da6f4bdddb69279c53 (commit)
discards b3086c1d6b6f4900ec770e22878038ac565424d9 (commit)
discards 294436486302d0547b34ba26e5fa402c4ebaa58f (commit)
discards 998a04d2cfa361a4d600175809d5fef02374c720 (commit)
discards e7d68a79dc7838d74e7b8985494dcde532910d32 (commit)
discards 8f565277e3a9e814c12779f3d51f2527a081ef99 (commit)
discards 20976da4114c2c5fc0213fa4cda91f7f4bf8a136 (commit)
discards e37dd41e311986015393befed7160e27a6450933 (commit)
discards b8b7266abb7a6c081ad1e1531aea69daf5d7509c (commit)
discards f4481b05ab8ae1faf6eedb438085e688371e79c6 (commit)
discards e9e33f5160fb5272c4f912dac6a29415215bba1c (commit)
discards 36f6218b8bba3233cf3fb501b01a0288a08e9f00 (commit)
discards 2ec2a9b0d335a8d6a30ab5a92448ac3ad63649ff (commit)
discards 46f6c6e42d2775ccfecb8f445ebbaaf32ab34df7 (commit)
discards b6ac001276961761b14a89270da02498b4d3e740 (commit)
discards 2d190b37abe00999a2e76861b8c88f0053e0b78f (commit)
discards dc436b82a52da05686ac178ad7854556e9688ed8 (commit)
discards bdf678e401a8077aab06b9c04004c92ef6631e26 (commit)
discards e79174cacf6abb943fe34840a5261b940b281c91 (commit)
discards 33b74ca8c710a58d245ea8903f98e0e86cffe164 (commit)
discards 68d08547f36777e2c091008b5e1207ca5b15e9e2 (commit)
discards 673678509f0f3ea0464ea45798c0cdbc4843946b (commit)
discards 45ec088753031fc60b1b1abeb25536b7ac042374 (commit)
discards 53aeb1c1a71e6546950721d9f79f4a6131eb3071 (commit)
discards 4371d3c804d890315ca623e2930286154d80a9a8 (commit)
discards 231a7ffaa19886653705c217a73d8e25b705503c (commit)
discards 9a8eea27feb6f300d5adeb078cad82974681bca7 (commit)
discards f37390f0a7f1ca636d54c23d6873510fcf26e91e (commit)
discards 1388ed811a2369b26778c4cce158691f285c45b4 (commit)
via: 1ee94c11c7b2fd46508eebb463ffd9a1cf9b19ce (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 (6f9da9a070517ce30e9edec6a7d2536db0646c33)
\
N -- N -- N (1ee94c11c7b2fd46508eebb463ffd9a1cf9b19ce)
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 SPC no longer being part sng_gen config
<span style="color: #000080; font-weight: bold">diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c</span>
<span style="color: #000080; font-weight: bold">index 20bcc3a..df0414a 100644</span>
<span style="color: #A00000">--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c</span>
<span style="color: #00A000">+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c</span>
<span style="color: #800080; font-weight: bold">@@ -352,22 +352,6 @@ int ft_to_sngss7_cfg_all(void)</span>
x++;
} /* while (g_ftdm_sngss7_data.cfg.mtpRoute[x].id != 0) */
<span style="color: #A00000">- if (g_ftdm_sngss7_data.cfg.mtpRoute[1].id != 0) {</span>
<span style="color: #A00000">- if (!(g_ftdm_sngss7_data.cfg.mtpRoute[0].flags & SNGSS7_CONFIGURED)) {</span>
<span style="color: #A00000">- </span>
<span style="color: #A00000">- if (ftmod_ss7_mtp3_route_config(0)) {</span>
<span style="color: #A00000">- SS7_CRITICAL("MTP3 ROUTE 0 configuration FAILED!\n");</span>
<span style="color: #A00000">- return 1;</span>
<span style="color: #A00000">- } else {</span>
<span style="color: #A00000">- SS7_INFO("MTP3 ROUTE 0 configuration DONE!\n");</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">- </span>
<span style="color: #A00000">- /* set the SNGSS7_CONFIGURED flag */</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].flags |= SNGSS7_CONFIGURED;</span>
<span style="color: #A00000">- } /* if !SNGSS7_CONFIGURED */</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">-</span>
x = 1;
while (g_ftdm_sngss7_data.cfg.isap[x].id != 0) {
/* check if this link has been configured already */
<span style="color: #800080; font-weight: bold">@@ -1161,10 +1145,10 @@ int ftmod_ss7_mtp3_route_config(int id)</span>
cfg.t.cfg.s.snRout.swtchType = k->linkType; /* switch type */
cfg.t.cfg.s.snRout.upSwtch = k->switchType; /* user part switch type */
cfg.t.cfg.s.snRout.cmbLnkSetId = k->cmbLinkSetId; /* combined link set ID */
<span style="color: #A00000">- if (k->id == 0) {</span>
<span style="color: #A00000">- cfg.t.cfg.s.snRout.dir = LSN_RTE_UP; /* direction */</span>
<span style="color: #00A000">+ if (k->dir == SNG_RTE_UP) {</span>
<span style="color: #00A000">+ cfg.t.cfg.s.snRout.dir = LSN_RTE_UP; /* direction */</span>
} else {
<span style="color: #A00000">- cfg.t.cfg.s.snRout.dir = LSN_RTE_DN; /* direction */</span>
<span style="color: #00A000">+ cfg.t.cfg.s.snRout.dir = LSN_RTE_DN; /* direction */</span>
}
cfg.t.cfg.s.snRout.rteToAdjSp = 0; /* flag indicating this route to adjacent SP */
cfg.t.cfg.s.snRout.ssf = k->ssf; /* sub service field */
<span style="color: #000080; font-weight: bold">diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h</span>
<span style="color: #000080; font-weight: bold">index fe291fb..05c6351 100644</span>
<span style="color: #A00000">--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h</span>
<span style="color: #00A000">+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h</span>
<span style="color: #800080; font-weight: bold">@@ -83,6 +83,11 @@ typedef enum {</span>
} sng_ckt_type_t;
typedef enum {
<span style="color: #00A000">+ SNG_RTE_UP = 0,</span>
<span style="color: #00A000">+ SNG_RTE_DN</span>
<span style="color: #00A000">+} sng_route_direction_t;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+typedef enum {</span>
SNGSS7_LPA_FOR_COT = (1 << 0), /* send LPA when COT arrives */
SNGSS7_ACM_OBCI_BITA = (1 << 10) /* in-band indication */
} sng_intf_options_t;
<span style="color: #800080; font-weight: bold">@@ -236,6 +241,7 @@ typedef struct sng_route {</span>
uint32_t ssf;
uint32_t nwId;
uint32_t isSTP;
<span style="color: #00A000">+ uint32_t dir;</span>
uint32_t t6;
uint32_t t8;
uint32_t t10;
<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 46df990..1b24e34 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">@@ -2383,6 +2383,7 @@ static int ftmod_ss7_fill_in_mtp3_route(sng_route_t *mtp3_route)</span>
g_ftdm_sngss7_data.cfg.mtpRoute[i].nwId = mtp3_route->nwId;
g_ftdm_sngss7_data.cfg.mtpRoute[i].lnkSets = mtp3_route->lnkSets;
g_ftdm_sngss7_data.cfg.mtpRoute[i].ssf = mtp3_route->ssf;
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].dir = SNG_RTE_DN;</span>
if (mtp3_route->t6 != 0) {
g_ftdm_sngss7_data.cfg.mtpRoute[i].t6 = mtp3_route->t6;
} else {
<span style="color: #800080; font-weight: bold">@@ -2443,6 +2444,52 @@ static int ftmod_ss7_fill_in_mtp3_route(sng_route_t *mtp3_route)</span>
}
/******************************************************************************/
<span style="color: #00A000">+static int ftmod_ss7_fill_in_self_route(int spc, int linkType, int switchType, int ssf)</span>
<span style="color: #00A000">+{</span>
<span style="color: #00A000">+ int i = 1;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ while (g_ftdm_sngss7_data.cfg.mtpRoute[i].id != 0) {</span>
<span style="color: #00A000">+ if (g_ftdm_sngss7_data.cfg.mtpRoute[i].dpc == spc) {</span>
<span style="color: #00A000">+ /* we have a match so break out of this loop */</span>
<span style="color: #00A000">+ break;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ /* move on to the next one */</span>
<span style="color: #00A000">+ i++;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ if (g_ftdm_sngss7_data.cfg.mtpRoute[i].id == 0) {</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].id = i;</span>
<span style="color: #00A000">+ SS7_DEBUG("found new mtp3 self route\n");</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].id = i;</span>
<span style="color: #00A000">+ SS7_DEBUG("found existing mtp3 self route\n");</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ strncpy((char *)g_ftdm_sngss7_data.cfg.mtpRoute[i].name, "self-route", MAX_NAME_LEN-1);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].id = i;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].dpc = spc;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].linkType = linkType;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].switchType = switchType;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].cmbLinkSetId = i;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].isSTP = 0;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].ssf = ssf;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].dir = SNG_RTE_UP;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].t6 = 8;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].t8 = 12;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].t10 = 300;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].t11 = 300;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].t15 = 30;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].t16 = 20;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].t18 = 200;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].t19 = 690;</span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].t21 = 650; </span>
<span style="color: #00A000">+ g_ftdm_sngss7_data.cfg.mtpRoute[i].t25 = 100;</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ return 0;</span>
<span style="color: #00A000">+}</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+/******************************************************************************/</span>
static int ftmod_ss7_fill_in_nsap(sng_route_t *mtp3_route)
{
int i;
<span style="color: #800080; font-weight: bold">@@ -2755,45 +2802,6 @@ static int ftmod_ss7_fill_in_isap(sng_isap_t *sng_isap)</span>
}
/******************************************************************************/
<span style="color: #A00000">-static int ftmod_ss7_fill_in_self_route(int spc, int linkType, int switchType, int ssf)</span>
<span style="color: #A00000">-{</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- if (g_ftdm_sngss7_data.cfg.mtpRoute[0].dpc == 0){</span>
<span style="color: #A00000">- SS7_DEBUG("found new mtp3 self route\n");</span>
<span style="color: #A00000">- } else if (g_ftdm_sngss7_data.cfg.mtpRoute[0].dpc == spc) {</span>
<span style="color: #A00000">- SS7_DEBUG("found existing mtp3 self route\n");</span>
<span style="color: #A00000">- return FTDM_SUCCESS;</span>
<span style="color: #A00000">- } else {</span>
<span style="color: #A00000">- SS7_ERROR("found new mtp3 self route but it does not match the route already configured (dpc=%d:spc=%d)\n",</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].dpc,</span>
<span style="color: #A00000">- spc);</span>
<span style="color: #A00000">- return FTDM_FAIL;</span>
<span style="color: #A00000">- }</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- strncpy((char *)g_ftdm_sngss7_data.cfg.mtpRoute[0].name, "self-route", MAX_NAME_LEN-1);</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].id = 0;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].dpc = spc;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].linkType = linkType;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].switchType = switchType;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].cmbLinkSetId = 0;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].isSTP = 0;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].ssf = ssf;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].t6 = 8;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].t8 = 12;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].t10 = 300;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].t11 = 300;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].t15 = 30;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].t16 = 20;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].t18 = 200;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].t19 = 690;</span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].t21 = 650; </span>
<span style="color: #A00000">- g_ftdm_sngss7_data.cfg.mtpRoute[0].t25 = 100;</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">- return 0;</span>
<span style="color: #A00000">-}</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">-/******************************************************************************/</span>
static int ftmod_ss7_fill_in_ccSpan(sng_ccSpan_t *ccSpan)
{
sng_timeslot_t timeslot;
</pre></div>
========================================================================<pre>
Summary of changes:
Freeswitch.2010.sln | 24 +-
build/modules.conf.in | 1 -
conf/autoload_configs/cdr_pg_csv.conf.xml | 35 +-
conf/autoload_configs/modules.conf.xml | 1 -
conf/autoload_configs/switch.conf.xml | 4 -
libs/esl/fs_cli.c | 44 +-
libs/freetdm/src/ftdm_io.c | 61 +-
.../ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c | 2 -
.../ftmod_sangoma_isdn_stack_cfg.c | 38 +-
.../ftmod_sangoma_isdn_stack_hndl.c | 17 -
.../ftmod_sangoma_ss7/ftmod_sangoma_ss7_cfg.c | 22 +-
.../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h | 6 +
.../ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c | 86 +-
libs/ilbc/src/iLBC_decode.c | 2 -
libs/portaudio/build/msvc/portaudio.2010.vcxproj | 136 ++-
src/mod/applications/mod_commands/mod_commands.c | 18 +-
.../applications/mod_conference/mod_conference.c | 45 +-
src/mod/applications/mod_dptools/mod_dptools.c | 12 +-
src/mod/applications/mod_fsk/mod_fsk.c | 4 +-
src/mod/applications/mod_voicemail/mod_voicemail.c | 22 +-
src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c | 51 +-
src/mod/codecs/mod_opus/Makefile | 28 -
src/mod/codecs/mod_opus/mod_opus.c | 200 ----
.../mod_dialplan_asterisk/mod_dialplan_asterisk.c | 6 +-
src/mod/endpoints/mod_portaudio/mod_portaudio.c | 1046 +++++++-------------
src/mod/endpoints/mod_sofia/mod_sofia.c | 8 +-
src/mod/endpoints/mod_sofia/sofia_glue.c | 2 +-
src/mod/endpoints/mod_sofia/sofia_presence.c | 2 +-
.../event_handlers/mod_cdr_pg_csv/mod_cdr_pg_csv.c | 396 +++++----
src/mod/languages/mod_lua/mod_lua_extra.c | 4 +-
src/mod/languages/mod_lua/mod_lua_extra.h | 4 +-
src/mod/languages/mod_lua/mod_lua_wrap.cpp | 50 -
.../languages/mod_spidermonkey/mod_spidermonkey.c | 10 -
src/switch_core.c | 2 +-
src/switch_core_session.c | 15 -
src/switch_rtp.c | 4 -
src/switch_xml_config.c | 2 +-
support-d/prereq.sh | 2 +-
38 files changed, 829 insertions(+), 1583 deletions(-)
delete mode 100644 src/mod/codecs/mod_opus/Makefile
delete mode 100644 src/mod/codecs/mod_opus/mod_opus.c
</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>