freetdm: ss7 - bug fix: fix for bug introduced by merge of RELAY work

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
index c971179f1aabfa1f460cc9c468e6be5d5b8cdb97..adee000abbb1345053594aa5d85e87adf9110c9a 100644 (file)
--- 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
@@ -495,8 +495,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
        /**************************************************************************/
        case FTDM_CHANNEL_STATE_COLLECT:        /* IAM received but wating on digits */
 
-               isup_intf = &g_ftdm_sngss7_data.cfg.isupIntf[sngss7_info->circuit->infId];
-
                if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
                        SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
                        break;
@@ -516,8 +514,8 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
                        /*now go to the RING state */
                        ftdm_set_state_locked (ftdmchan, FTDM_CHANNEL_STATE_RING);
                        
-               } else if (i >= isup_intf->min_digits) {
-                       SS7_DEBUG_CHAN(ftdmchan, "Received %d digits (min digits = %d)\n", i, isup_intf->min_digits);
+               } else if (i >= sngss7_info->circuit->min_digits) {
+                       SS7_DEBUG_CHAN(ftdmchan, "Received %d digits (min digits = %d)\n", i, sngss7_info->circuit->min_digits);
 
                        /*now go to the RING state */
                        ftdm_set_state_locked (ftdmchan, FTDM_CHANNEL_STATE_RING);
@@ -527,7 +525,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
                        if (ftdmchan->last_state != FTDM_CHANNEL_STATE_IDLE) {
                                SS7_INFO_CHAN(ftdmchan,"Received %d out of %d so far: %s...starting T35\n",
                                                                                i,
-                                                                               isup_intf->min_digits,
+                                                                               sngss7_info->circuit->min_digits,
                                                                                ftdmchan->caller_data.dnis.digits);
                
                                /* start ISUP t35 */

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
index 93f2678d085c6012ffb82eb62f465b6f3ce199ce..d2fa9733939e9f589acdd09ea5bc2761897ef55c 100644 (file)
--- 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
@@ -1509,11 +1509,6 @@ static int ftmod_ss7_parse_isup_interface(ftdm_conf_node_t *isup_interface)
 
                        SS7_DEBUG("Found an isup mptRouteId = %d\n", sng_isup.mtpRouteId);
                /**********************************************************************/
-               } else if (!strcasecmp(parm->var, "min_digits")) {
-                       sng_isup.min_digits = atoi(parm->val);
-
-                       SS7_DEBUG("\tFound min_digits = %d\n", sng_isup.min_digits);
-               /**********************************************************************/
                } else if (!strcasecmp(parm->var, "ssf")) {
                /**********************************************************************/
                        ret = find_ssf_type_in_map(parm->val);