kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into smgmaster

This commit is contained in:
Konrad Hammel 2011-02-11 11:15:37 -05:00
parent f35dc589bb edfb1e9943
commit d5b11de846
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
View File

@ -1749,33 +1749,46 @@ static int ftmod_ss7_parse_isup_interface(ftdm_conf_node_t *isup_interface)
/* default the interface to paused state */ /* default the interface to paused state */
sngss7_set_flag(&sng_isup, SNGSS7_PAUSED); sngss7_set_flag(&sng_isup, SNGSS7_PAUSED);
/* trickle down the SPC to all sub entities */ /* trickle down the SPC to all sub entities */
lnkSet = &g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].lnkSets; lnkSet = &g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].lnkSets;
g_ftdm_sngss7_data.cfg.mtp3Link[lnkSet->lsId].spc = sng_isup.spc;
lnkSet = lnkSet->next;
while (lnkSet->next != NULL) { while (lnkSet->next != NULL) {
g_ftdm_sngss7_data.cfg.mtp3Link[lnkSet->lsId].spc = sng_isup.spc; /**************************************************************************/
lnkSet = lnkSet->next; /* go through all the links and check if they belong to this linkset*/
i = 1;
while (g_ftdm_sngss7_data.cfg.mtp3Link[i].id != 0) {
/* check if this link is in the linkset */
if (g_ftdm_sngss7_data.cfg.mtp3Link[i].linkSetId == lnkSet->lsId) {
/* fill in the spc */
g_ftdm_sngss7_data.cfg.mtp3Link[i].spc = sng_isup.spc;
} }
i++;
}
/* move to the next lnkSet */
lnkSet = lnkSet->next;
/**************************************************************************/
} /* while (lnkSet->next != NULL) */
/* pull values from the lower levels */ /* pull values from the lower levels */
sng_isap.switchType = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].switchType;
/* fill in the isap */
ftmod_ss7_fill_in_isap(&sng_isap);
/* pull values from the lower levels */
sng_isup.isap = sng_isap.id;
sng_isup.dpc = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].dpc; sng_isup.dpc = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].dpc;
sng_isup.switchType = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].switchType; sng_isup.switchType = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].switchType;
sng_isup.nwId = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].nwId; sng_isup.nwId = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].nwId;
sng_isap.switchType = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].switchType; /* fill in the isup interface */
ftmod_ss7_fill_in_isap(&sng_isap);
sng_isup.isap = sng_isap.id;
ftmod_ss7_fill_in_isup_interface(&sng_isup); ftmod_ss7_fill_in_isup_interface(&sng_isup);
/* setup the self mtp3 route */ /* setup the self mtp3 route */
i = sng_isup.mtpRouteId; i = sng_isup.mtpRouteId;
if(ftmod_ss7_fill_in_self_route(sng_isup.spc, 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].linkType,
g_ftdm_sngss7_data.cfg.mtpRoute[i].switchType, g_ftdm_sngss7_data.cfg.mtpRoute[i].switchType,