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

freetdm: fixed cgu/cgb commands wrongly setting cic status when 

the range covers one or more signaling links
This commit is contained in:
James Zhang 2012-02-09 14:32:08 -05:00
parent b78b612b47
commit 7b3a3d86b9
1 changed files with 73 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
View File

@ -2415,9 +2415,7 @@ ftdm_status_t handle_cgb_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
else { else {
if (extract_chan_data(x, &sngss7_info, &ftdmchan)) { if (extract_chan_data(x, &sngss7_info, &ftdmchan)) {
SS7_ERROR("Failed to extract channel data for circuit = %d!\n", x); SS7_ERROR("Failed to extract channel data for circuit = %d!\n", x);
break; } else {
}
ftdm_mutex_lock(ftdmchan->mutex); ftdm_mutex_lock(ftdmchan->mutex);
if (status[byte] & (1 << bit)) { if (status[byte] & (1 << bit)) {
switch (blockType) { switch (blockType) {
@ -2452,6 +2450,7 @@ ftdm_status_t handle_cgb_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
bit = 0; bit = 0;
} }
} }
}
x++; x++;
} }
@ -2616,7 +2615,10 @@ ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
loop_range++; loop_range++;
} }
else { else {
/* lock the channel */ if (extract_chan_data(x, &sngss7_info, &ftdmchan)) {
SS7_ERROR("Failed to extract channel data for circuit = %d!\n", x);
}
else {
ftdm_mutex_lock(ftdmchan->mutex); ftdm_mutex_lock(ftdmchan->mutex);
if (status[byte] & (1 << bit)) { if (status[byte] & (1 << bit)) {
@ -2650,7 +2652,6 @@ ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP); sngss7_set_sig_status(sngss7_info, FTDM_SIG_STATE_UP);
} }
/* unlock the channel again before we exit */
ftdm_mutex_unlock(ftdmchan->mutex); ftdm_mutex_unlock(ftdmchan->mutex);
/* update the bit and byte counter*/ /* update the bit and byte counter*/
@ -2660,6 +2661,7 @@ ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
bit = 0; bit = 0;
} }
} }
}
x++; x++;
} }
#if 0 #if 0