Diff
Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c (17214 => 17215)
--- freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-06 01:03:20 UTC (rev 17214)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-05 20:01:08 UTC (rev 17215)
@@ -412,7 +412,9 @@
}
/* destroy final basic resources of the span data structure */
- ftdm_queue_destroy(&span->pendingchans);
+ if (span->pendingchans) {
+ ftdm_queue_destroy(&span->pendingchans);
+ }
ftdm_mutex_unlock(span->mutex);
ftdm_mutex_destroy(&span->mutex);
ftdm_safe_free(span->signal_data);
@@ -518,9 +520,6 @@
status = ftdm_mutex_create(&new_span->mutex);
ftdm_assert(status == FTDM_SUCCESS, "mutex creation failed\n");
- status = ftdm_queue_create(&new_span->pendingchans, SPAN_PENDING_CHANS_QUEUE_SIZE);
- ftdm_assert(status == FTDM_SUCCESS, "span chans queue creation failed\n");
-
ftdm_set_flag(new_span, FTDM_SPAN_CONFIGURED);
new_span->span_id = ++globals.span_index;
new_span->fio = fio;
@@ -1163,7 +1162,9 @@
ftdm_mutex_lock(ftdmchan->span->mutex);
ftdm_set_flag(ftdmchan->span, FTDM_SPAN_STATE_CHANGE);
- ftdm_queue_enqueue(ftdmchan->span->pendingchans, ftdmchan);
+ if (ftdmchan->span->pendingchans) {
+ ftdm_queue_enqueue(ftdmchan->span->pendingchans, ftdmchan);
+ }
ftdm_mutex_unlock(ftdmchan->span->mutex);
ftdmchan->last_state = ftdmchan->state;
@@ -1329,7 +1330,7 @@
return FTDM_FAIL;
}
- if (span->channel_request && !span->suggest_chan_id) {
+ if (span->channel_request && !ftdm_test_flag(span, FTDM_SPAN_SUGGEST_CHAN_ID)) {
ftdm_set_caller_data(span, caller_data);
return span->channel_request(span, 0, direction, caller_data, ftdmchan);
}
@@ -3266,6 +3267,9 @@
va_list ap;
va_start(ap, sig_cb);
status = mod->sig_configure(span, sig_cb, ap);
+ if (status == FTDM_SUCCESS && ftdm_test_flag(span, FTDM_SPAN_USE_CHAN_QUEUE)) {
+ status = ftdm_queue_create(&span->pendingchans, SPAN_PENDING_CHANS_QUEUE_SIZE);
+ }
va_end(ap);
} else {
ftdm_log(FTDM_LOG_ERROR, "can't find '%s'\n", type);
Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c (17214 => 17215)
--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c 2010-04-06 01:03:20 UTC (rev 17214)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c 2010-04-05 20:01:08 UTC (rev 17215)
@@ -2385,7 +2385,7 @@
if ((isdn_data->opts & FTDM_ISDN_OPT_SUGGEST_CHANNEL)) {
span->channel_request = isdn_channel_request;
- span->suggest_chan_id = 1;
+ ftdm_set_flag(span, FTDM_SPAN_SUGGEST_CHAN_ID);
}
span->state_map = &isdn_state_map;
Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c (17214 => 17215)
--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c 2010-04-06 01:03:20 UTC (rev 17214)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c 2010-04-05 20:01:08 UTC (rev 17215)
@@ -1331,7 +1331,7 @@
if ((isdn_data->opts & FTMOD_LIBPRI_OPT_SUGGEST_CHANNEL)) {
span->channel_request = isdn_channel_request;
- span->suggest_chan_id = 1;
+ ftdm_set_flag(span, FTDM_SPAN_SUGGEST_CHAN_ID);
}
span->state_map = &isdn_state_map;
Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c (17214 => 17215)
--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-06 01:03:20 UTC (rev 17214)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-05 20:01:08 UTC (rev 17215)
@@ -2239,7 +2239,8 @@
span->get_span_sig_status = sangoma_boost_get_span_sig_status;
span->set_span_sig_status = sangoma_boost_set_span_sig_status;
span->state_map = &boost_state_map;
- span->suggest_chan_id = 0;
+ ftdm_clear_flag(span, FTDM_SPAN_SUGGEST_CHAN_ID);
+ ftdm_set_flag(span, FTDM_SPAN_USE_CHAN_QUEUE);
if (sigmod_iface) {
/* the core will do the hunting */
span->channel_request = NULL;
Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h (17214 => 17215)
--- freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-06 01:03:20 UTC (rev 17214)
+++ freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-05 20:01:08 UTC (rev 17215)
@@ -654,7 +654,6 @@
char *type;
char *dtmf_hangup;
size_t dtmf_hangup_len;
- int suggest_chan_id;
ftdm_state_map_t *state_map;
ftdm_caller_data_t default_caller_data;
ftdm_queue_t *pendingchans;
Modified: freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h (17214 => 17215)
--- freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h 2010-04-06 01:03:20 UTC (rev 17214)
+++ freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h 2010-04-05 20:01:08 UTC (rev 17215)
@@ -325,7 +325,9 @@
FTDM_SPAN_STATE_CHANGE = (1 << 2),
FTDM_SPAN_SUSPENDED = (1 << 3),
FTDM_SPAN_IN_THREAD = (1 << 4),
- FTDM_SPAN_STOP_THREAD = (1 << 5)
+ FTDM_SPAN_STOP_THREAD = (1 << 5),
+ FTDM_SPAN_USE_CHAN_QUEUE = (1 << 6),
+ FTDM_SPAN_SUGGEST_CHAN_ID = (1 << 7),
} ftdm_span_flag_t;
typedef enum {