FreeTDM: Fix for race condition on FreeTDM init for freetdm-master timer (JIRA:OPENZA...

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index 133420922ba190f2d839d15790adb7240ec70f08..86b8580ed7d910613ce250c5905385b7cd50c960 100644 (file)
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -2335,7 +2335,7 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_indicate(const char *file, const ch
                break;
        case FTDM_CHANNEL_INDICATE_PROCEED:
                if (!ftdm_test_flag(ftdmchan->span, FTDM_SPAN_USE_PROCEED_STATE) ||
-                       ftdmchan->state == FTDM_CHANNEL_STATE_PROCEED) {
+                       ftdmchan->state >= FTDM_CHANNEL_STATE_PROCEED) {
                        ftdm_ack_indication(ftdmchan, indication, status);
                        goto done;
                }
@@ -5611,17 +5611,30 @@ FT_DECLARE(ftdm_status_t) ftdm_global_init(void)
        ftdm_mutex_create(&globals.call_id_mutex);
        
        ftdm_sched_global_init();
+       globals.running = 1;
        if (ftdm_sched_create(&globals.timingsched, "freetdm-master") != FTDM_SUCCESS) {
                ftdm_log(FTDM_LOG_CRIT, "Failed to create master timing schedule context\n");
-               return FTDM_FAIL;
+               goto global_init_fail;
        }
        if (ftdm_sched_free_run(globals.timingsched) != FTDM_SUCCESS) {
                ftdm_log(FTDM_LOG_CRIT, "Failed to run master timing schedule context\n");
-               return FTDM_FAIL;
+               goto global_init_fail;
        }
-
-       globals.running = 1;
+       
        return FTDM_SUCCESS;
+       
+global_init_fail:
+       globals.running = 0;
+       ftdm_mutex_destroy(&globals.mutex);
+       ftdm_mutex_destroy(&globals.span_mutex);
+       ftdm_mutex_destroy(&globals.group_mutex);
+       ftdm_mutex_destroy(&globals.call_id_mutex);     
+       hashtable_destroy(globals.interface_hash);
+       hashtable_destroy(globals.module_hash);
+       hashtable_destroy(globals.span_hash);
+       hashtable_destroy(globals.group_hash);
+       
+       return FTDM_FAIL;
 }
 
 FT_DECLARE(ftdm_status_t) ftdm_global_configuration(void)

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
index bcc7d938b7b783a8fc8e903aeea4833f20536dda..7b8f16435720c110fc26e32f2c9dd981f5a984b3 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
@@ -644,7 +644,7 @@ void sngisdn_process_rel_ind (sngisdn_event_data_t *sngisdn_event)
                        break;
                case FTDM_CHANNEL_STATE_TERMINATING:
                        if (sngisdn_test_flag(sngisdn_info, FLAG_GLARE) &&
-                                                               sngisdn_info->glare.suInstId != suInstId) {
+                               sngisdn_info->glare.suInstId != suInstId) {
                                /* This release if for the outbound call that we already started clearing */
 
                                ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Received RELEASE for local glared call\n");
@@ -662,7 +662,6 @@ void sngisdn_process_rel_ind (sngisdn_event_data_t *sngisdn_event)
                default:
                        ftdm_log_chan(ftdmchan, FTDM_LOG_CRIT, "Received RELEASE in an invalid state (%s)\n",
                                                        ftdm_channel_state2str(ftdmchan->state));
-
                        break;
        }