Diff
Modified: freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c (17443 => 17444)
--- freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-28 22:17:51 UTC (rev 17443)
+++ freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-28 22:17:52 UTC (rev 17444)
@@ -2345,7 +2345,7 @@
}
}
- if (ftdm_configure_span("ss7", span, on_ss7_signal,
+ if (ftdm_configure_span(span, "ss7", on_ss7_signal,
"confnode", ss7confnode,
"parameters", spanparameters,
FTDM_TAG_END) != FTDM_SUCCESS) {
@@ -2450,7 +2450,7 @@
span_id = ftdm_span_get_id(span);
}
- if (ftdm_configure_span("analog", span, on_analog_signal,
+ if (ftdm_configure_span(span, "analog", on_analog_signal,
"tonemap", tonegroup,
"digit_timeout", &to,
"max_dialstr", &max,
@@ -2566,7 +2566,7 @@
}
- if (ftdm_configure_span("analog_em", span, on_analog_signal,
+ if (ftdm_configure_span(span, "analog_em", on_analog_signal,
"tonemap", tonegroup,
"digit_timeout", &to,
"max_dialstr", &max,
@@ -2683,7 +2683,7 @@
tonegroup = "us";
}
- if (ftdm_configure_span("isdn", span, on_clear_channel_signal,
+ if (ftdm_configure_span(span, "isdn", on_clear_channel_signal,
"mode", mode,
"dialect", dialect,
"digit_timeout", &to,
@@ -2778,7 +2778,7 @@
}
- if (ftdm_configure_span("libpri", span, on_clear_channel_signal,
+ if (ftdm_configure_span(span, "libpri", on_clear_channel_signal,
"node", o_node,
"switch", o_switch,
"dp", o_dp,
@@ -2866,7 +2866,7 @@
span_id = ftdm_span_get_id(span);
}
- if (ftdm_configure_span_signaling("sangoma_boost", span, on_clear_channel_signal, spanparameters) != FTDM_SUCCESS) {
+ if (ftdm_configure_span_signaling(span, "sangoma_boost", on_clear_channel_signal, spanparameters) != FTDM_SUCCESS) {
ftdm_log(FTDM_LOG_ERROR, "Error starting FreeTDM span %d error: %s\n", span_id, ftdm_span_get_last_error(span));
continue;
}
@@ -3001,7 +3001,7 @@
span_id = ftdm_span_get_id(span);
}
- if (ftdm_configure_span("r2", span, on_r2_signal,
+ if (ftdm_configure_span(span, "r2", on_r2_signal,
"variant", variant,
"max_ani", max_ani,
"max_dnis", max_dnis,
@@ -3420,14 +3420,14 @@
tmp_path=switch_mprintf("%s%s%s.pcap", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pcapfn);
if(!strcasecmp(argv[2], "on")) {
- if (ftdm_configure_span("isdn", span, on_clear_channel_signal, "q931topcap", 1, "pcapfilename", tmp_path, FTDM_TAG_END) != FTDM_SUCCESS) {
+ if (ftdm_configure_span(span, "isdn", on_clear_channel_signal, "q931topcap", 1, "pcapfilename", tmp_path, FTDM_TAG_END) != FTDM_SUCCESS) {
ftdm_log(FTDM_LOG_WARNING, "Error couldn't (re-)enable Q931-To-Pcap!\n");
goto end;
} else {
stream->write_function(stream, "+OK\n");
}
} else if(!strcasecmp(argv[2], "off")) {
- if (ftdm_configure_span("isdn", span, on_clear_channel_signal, "q931topcap", 0, FTDM_TAG_END) != FTDM_SUCCESS) {
+ if (ftdm_configure_span(span, "isdn", on_clear_channel_signal, "q931topcap", 0, FTDM_TAG_END) != FTDM_SUCCESS) {
ftdm_log(FTDM_LOG_ERROR, "Error couldn't enable Q931-To-Pcap!\n");
goto end;
} else {
Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c (17443 => 17444)
--- freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-28 22:17:51 UTC (rev 17443)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-28 22:17:52 UTC (rev 17444)
@@ -1369,7 +1369,6 @@
status = check->fio->open(check);
if (status == FTDM_SUCCESS) {
- ftdm_set_flag(check, FTDM_CHANNEL_INUSE);
ftdm_channel_open_chan(check);
*ftdmchan = check;
break;
@@ -1489,7 +1488,6 @@
status = check->fio->open(check);
if (status == FTDM_SUCCESS) {
- ftdm_set_flag(check, FTDM_CHANNEL_INUSE);
ftdm_channel_open_chan(check);
*ftdmchan = check;
break;
@@ -1639,7 +1637,7 @@
status = FTDM_FAIL;
if (ftdm_test_flag(check, FTDM_CHANNEL_READY) && (!ftdm_test_flag(check, FTDM_CHANNEL_INUSE) ||
- (check->type == FTDM_CHAN_TYPE_FXS && check->token_count == 1))) {
+ (check->type == FTDM_CHAN_TYPE_FXS && check->token_count == 1))) {
if (!ftdm_test_flag(check, FTDM_CHANNEL_OPEN)) {
status = check->fio->open(check);
if (status == FTDM_SUCCESS) {
@@ -3790,8 +3788,24 @@
return FTDM_SUCCESS;
}
-FT_DECLARE(ftdm_status_t) ftdm_configure_span(const char *type, ftdm_span_t *span, fio_signal_cb_t sig_cb, ...)
+static ftdm_status_t post_configure_span_channels(ftdm_span_t *span)
{
+ unsigned i = 0;
+ ftdm_signaling_status_t status = FTDM_SUCCESS;
+ for (i = 1; i <= span->chan_count; i++) {
+ ftdm_channel_get_sig_status(span->channels[i], &status);
+ if (status == FTDM_SIG_STATE_UP) {
+ ftdm_set_flag(span->channels[i], FTDM_CHANNEL_SIG_UP);
+ }
+ }
+ if (ftdm_test_flag(span, FTDM_SPAN_USE_CHAN_QUEUE)) {
+ status = ftdm_queue_create(&span->pendingchans, SPAN_PENDING_CHANS_QUEUE_SIZE);
+ }
+ return status;
+}
+
+FT_DECLARE(ftdm_status_t) ftdm_configure_span(ftdm_span_t *span, const char *type, fio_signal_cb_t sig_cb, ...)
+{
ftdm_module_t *mod = (ftdm_module_t *) hashtable_search(globals.module_hash, (void *)type);
ftdm_status_t status = FTDM_FAIL;
@@ -3812,8 +3826,8 @@
va_start(ap, sig_cb);
status = mod->sig_configure(span, sig_cb, ap);
va_end(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);
+ if (status == FTDM_SUCCESS) {
+ status = post_configure_span_channels(span);
}
} else {
ftdm_log(FTDM_LOG_ERROR, "can't find '%s'\n", type);
@@ -3823,7 +3837,7 @@
return status;
}
-FT_DECLARE(ftdm_status_t) ftdm_configure_span_signaling(const char *type, ftdm_span_t *span, fio_signal_cb_t sig_cb, ftdm_conf_parameter_t *parameters)
+FT_DECLARE(ftdm_status_t) ftdm_configure_span_signaling(ftdm_span_t *span, const char *type, fio_signal_cb_t sig_cb, ftdm_conf_parameter_t *parameters)
{
ftdm_module_t *mod = (ftdm_module_t *) hashtable_search(globals.module_hash, (void *)type);
ftdm_status_t status = FTDM_FAIL;
@@ -3852,8 +3866,8 @@
if (mod->configure_span_signaling) {
status = mod->configure_span_signaling(span, sig_cb, parameters);
- if (status == FTDM_SUCCESS && ftdm_test_flag(span, FTDM_SPAN_USE_CHAN_QUEUE)) {
- status = ftdm_queue_create(&span->pendingchans, SPAN_PENDING_CHANS_QUEUE_SIZE);
+ if (status == FTDM_SUCCESS) {
+ status = post_configure_span_channels(span);
}
} else {
ftdm_log(FTDM_LOG_ERROR, "Module %s did not implement the signaling configuration method\n", type);
Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h (17443 => 17444)
--- freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-28 22:17:51 UTC (rev 17443)
+++ freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-28 22:17:52 UTC (rev 17444)
@@ -1005,8 +1005,8 @@
*
* \note This function does the same as ftdm_configure_span_signaling
*
+ * \param span The span to configure
* \param type The signaling type ("boost", "isdn" and others, this depends on the available signaling modules)
- * \param span The span to configure
* \param sig_cb The callback that the signaling stack will use to notify about events
* \param ... variable argument list with "var", value sequence, the variable and values are signaling type dependant
* the last argument must be FTDM_TAG_END
@@ -1014,22 +1014,22 @@
* \retval FTDM_SUCCESS success
* \retval FTDM_FAIL failure
*/
-FT_DECLARE(ftdm_status_t) ftdm_configure_span(const char *type, ftdm_span_t *span, fio_signal_cb_t sig_cb, ...);
+FT_DECLARE(ftdm_status_t) ftdm_configure_span(ftdm_span_t *span, const char *type, fio_signal_cb_t sig_cb, ...);
#define FTDM_TAG_END NULL
/*!
* \brief Configure span with a signaling type
*
+ * \param span The span to configure
* \param type The signaling type ("boost", "isdn" and others, this depends on the available signaling modules)
- * \param span The span to configure
* \param sig_cb The callback that the signaling stack will use to notify about events
* \param ... variable argument list with "var", value sequence, the variable and values are signaling type dependant
*
* \retval FTDM_SUCCESS success
* \retval FTDM_FAIL failure
*/
-FT_DECLARE(ftdm_status_t) ftdm_configure_span_signaling(const char *type, ftdm_span_t *span, fio_signal_cb_t sig_cb, ftdm_conf_parameter_t *parameters);
+FT_DECLARE(ftdm_status_t) ftdm_configure_span_signaling(ftdm_span_t *span, const char *type, fio_signal_cb_t sig_cb, ftdm_conf_parameter_t *parameters);
/*!
* \brief Start the span signaling (must call ftdm_configure_span_signaling first)
Modified: freeswitch/trunk/libs/freetdm/src/testanalog.c (17443 => 17444)
--- freeswitch/trunk/libs/freetdm/src/testanalog.c 2010-04-28 22:17:51 UTC (rev 17443)
+++ freeswitch/trunk/libs/freetdm/src/testanalog.c 2010-04-28 22:17:52 UTC (rev 17444)
@@ -100,7 +100,7 @@
}
- if (ftdm_configure_span("analog", span, on_signal,
+ if (ftdm_configure_span(span, "analog", on_signal,
"tonemap", "us",
"digit_timeout", &digit_timeout,
"max_dialstr", &max_dialstr,
Modified: freeswitch/trunk/libs/freetdm/src/testboost.c (17443 => 17444)
--- freeswitch/trunk/libs/freetdm/src/testboost.c 2010-04-28 22:17:51 UTC (rev 17443)
+++ freeswitch/trunk/libs/freetdm/src/testboost.c 2010-04-28 22:17:52 UTC (rev 17444)
@@ -53,7 +53,7 @@
parameters[1].var = "signalling";
parameters[1].val = "pri_cpe";
parameters[2].var = NULL;
- if (ftdm_configure_span_signaling("sangoma_boost", span, on_signal, parameters) == FTDM_SUCCESS) {
+ if (ftdm_configure_span_signaling(span, "sangoma_boost", on_signal, parameters) == FTDM_SUCCESS) {
ftdm_span_start(span);
} else {
fprintf(stderr, "Error starting SS7_BOOST\n");
Modified: freeswitch/trunk/libs/freetdm/src/testpri.c (17443 => 17444)
--- freeswitch/trunk/libs/freetdm/src/testpri.c 2010-04-28 22:17:51 UTC (rev 17443)
+++ freeswitch/trunk/libs/freetdm/src/testpri.c 2010-04-28 22:17:52 UTC (rev 17444)
@@ -128,7 +128,7 @@
if (ftdm_configure_span(
- "libpri", span, on_signal,
+ span, "libpri", on_signal,
"node", "cpe",
"switch", "euroisdn",
"dp", "unknown",
Modified: freeswitch/trunk/libs/freetdm/src/testr2.c (17443 => 17444)
--- freeswitch/trunk/libs/freetdm/src/testr2.c 2010-04-28 22:17:51 UTC (rev 17443)
+++ freeswitch/trunk/libs/freetdm/src/testr2.c 2010-04-28 22:17:52 UTC (rev 17444)
@@ -46,7 +46,7 @@
- if (ftdm_configure_span("r2", span, on_r2_signal,
+ if (ftdm_configure_span(span, "r2", on_r2_signal,
"variant", "mx",
"max_ani", 10,
"max_dnis", 4,
Modified: freeswitch/trunk/libs/freetdm/src/testsangomaboost.c (17443 => 17444)
--- freeswitch/trunk/libs/freetdm/src/testsangomaboost.c 2010-04-28 22:17:51 UTC (rev 17443)
+++ freeswitch/trunk/libs/freetdm/src/testsangomaboost.c 2010-04-28 22:17:52 UTC (rev 17444)
@@ -339,7 +339,7 @@
parameters[3].var = NULL;
/* send the configuration values down to the stack */
- if (ftdm_configure_span_signaling("sangoma_boost", span, on_signaling_event, parameters) != FTDM_SUCCESS) {
+ if (ftdm_configure_span_signaling(span, "sangoma_boost", on_signaling_event, parameters) != FTDM_SUCCESS) {
fprintf(stderr, "Error configuring sangoma_boost signaling abstraction in span %s\n", ftdm_span_get_name(span));
goto done;
}