<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][17444] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=17444">17444</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-04-28 17:17:52 -0500 (Wed, 28 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>freetdm: check protocol status after configuring the signaling</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmmod_freetdmmod_freetdmc">freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftdm_ioc">freeswitch/trunk/libs/freetdm/src/ftdm_io.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludefreetdmh">freeswitch/trunk/libs/freetdm/src/include/freetdm.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrctestanalogc">freeswitch/trunk/libs/freetdm/src/testanalog.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrctestboostc">freeswitch/trunk/libs/freetdm/src/testboost.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrctestpric">freeswitch/trunk/libs/freetdm/src/testpri.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrctestr2c">freeswitch/trunk/libs/freetdm/src/testr2.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrctestsangomaboostc">freeswitch/trunk/libs/freetdm/src/testsangomaboost.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmmod_freetdmmod_freetdmc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c (17443 => 17444)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2345,7 +2345,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (ftdm_configure_span("ss7", span, on_ss7_signal,
</del><ins>+ if (ftdm_configure_span(span, "ss7", on_ss7_signal,
</ins><span class="cx"> "confnode", ss7confnode,
</span><span class="cx"> "parameters", spanparameters,
</span><span class="cx"> FTDM_TAG_END) != FTDM_SUCCESS) {
</span><span class="lines">@@ -2450,7 +2450,7 @@
</span><span class="cx"> span_id = ftdm_span_get_id(span);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (ftdm_configure_span("analog", span, on_analog_signal,
</del><ins>+ if (ftdm_configure_span(span, "analog", on_analog_signal,
</ins><span class="cx"> "tonemap", tonegroup,
</span><span class="cx"> "digit_timeout", &to,
</span><span class="cx"> "max_dialstr", &max,
</span><span class="lines">@@ -2566,7 +2566,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- if (ftdm_configure_span("analog_em", span, on_analog_signal,
</del><ins>+ if (ftdm_configure_span(span, "analog_em", on_analog_signal,
</ins><span class="cx"> "tonemap", tonegroup,
</span><span class="cx"> "digit_timeout", &to,
</span><span class="cx"> "max_dialstr", &max,
</span><span class="lines">@@ -2683,7 +2683,7 @@
</span><span class="cx"> tonegroup = "us";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (ftdm_configure_span("isdn", span, on_clear_channel_signal,
</del><ins>+ if (ftdm_configure_span(span, "isdn", on_clear_channel_signal,
</ins><span class="cx"> "mode", mode,
</span><span class="cx"> "dialect", dialect,
</span><span class="cx"> "digit_timeout", &to,
</span><span class="lines">@@ -2778,7 +2778,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- if (ftdm_configure_span("libpri", span, on_clear_channel_signal,
</del><ins>+ if (ftdm_configure_span(span, "libpri", on_clear_channel_signal,
</ins><span class="cx"> "node", o_node,
</span><span class="cx"> "switch", o_switch,
</span><span class="cx"> "dp", o_dp,
</span><span class="lines">@@ -2866,7 +2866,7 @@
</span><span class="cx"> span_id = ftdm_span_get_id(span);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (ftdm_configure_span_signaling("sangoma_boost", span, on_clear_channel_signal, spanparameters) != FTDM_SUCCESS) {
</del><ins>+ if (ftdm_configure_span_signaling(span, "sangoma_boost", on_clear_channel_signal, spanparameters) != FTDM_SUCCESS) {
</ins><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "Error starting FreeTDM span %d error: %s\n", span_id, ftdm_span_get_last_error(span));
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -3001,7 +3001,7 @@
</span><span class="cx"> span_id = ftdm_span_get_id(span);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (ftdm_configure_span("r2", span, on_r2_signal,
</del><ins>+ if (ftdm_configure_span(span, "r2", on_r2_signal,
</ins><span class="cx"> "variant", variant,
</span><span class="cx"> "max_ani", max_ani,
</span><span class="cx"> "max_dnis", max_dnis,
</span><span class="lines">@@ -3420,14 +3420,14 @@
</span><span class="cx"> tmp_path=switch_mprintf("%s%s%s.pcap", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pcapfn);
</span><span class="cx">
</span><span class="cx"> if(!strcasecmp(argv[2], "on")) {
</span><del>- if (ftdm_configure_span("isdn", span, on_clear_channel_signal, "q931topcap", 1, "pcapfilename", tmp_path, FTDM_TAG_END) != FTDM_SUCCESS) {
</del><ins>+ if (ftdm_configure_span(span, "isdn", on_clear_channel_signal, "q931topcap", 1, "pcapfilename", tmp_path, FTDM_TAG_END) != FTDM_SUCCESS) {
</ins><span class="cx"> ftdm_log(FTDM_LOG_WARNING, "Error couldn't (re-)enable Q931-To-Pcap!\n");
</span><span class="cx"> goto end;
</span><span class="cx"> } else {
</span><span class="cx"> stream->write_function(stream, "+OK\n");
</span><span class="cx"> }
</span><span class="cx"> } else if(!strcasecmp(argv[2], "off")) {
</span><del>- if (ftdm_configure_span("isdn", span, on_clear_channel_signal, "q931topcap", 0, FTDM_TAG_END) != FTDM_SUCCESS) {
</del><ins>+ if (ftdm_configure_span(span, "isdn", on_clear_channel_signal, "q931topcap", 0, FTDM_TAG_END) != FTDM_SUCCESS) {
</ins><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "Error couldn't enable Q931-To-Pcap!\n");
</span><span class="cx"> goto end;
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftdm_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c (17443 => 17444)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1369,7 +1369,6 @@
</span><span class="cx"> status = check->fio->open(check);
</span><span class="cx">
</span><span class="cx"> if (status == FTDM_SUCCESS) {
</span><del>- ftdm_set_flag(check, FTDM_CHANNEL_INUSE);
</del><span class="cx"> ftdm_channel_open_chan(check);
</span><span class="cx"> *ftdmchan = check;
</span><span class="cx"> break;
</span><span class="lines">@@ -1489,7 +1488,6 @@
</span><span class="cx"> status = check->fio->open(check);
</span><span class="cx">
</span><span class="cx"> if (status == FTDM_SUCCESS) {
</span><del>- ftdm_set_flag(check, FTDM_CHANNEL_INUSE);
</del><span class="cx"> ftdm_channel_open_chan(check);
</span><span class="cx"> *ftdmchan = check;
</span><span class="cx"> break;
</span><span class="lines">@@ -1639,7 +1637,7 @@
</span><span class="cx"> status = FTDM_FAIL;
</span><span class="cx">
</span><span class="cx"> if (ftdm_test_flag(check, FTDM_CHANNEL_READY) && (!ftdm_test_flag(check, FTDM_CHANNEL_INUSE) ||
</span><del>- (check->type == FTDM_CHAN_TYPE_FXS && check->token_count == 1))) {
</del><ins>+ (check->type == FTDM_CHAN_TYPE_FXS && check->token_count == 1))) {
</ins><span class="cx"> if (!ftdm_test_flag(check, FTDM_CHANNEL_OPEN)) {
</span><span class="cx"> status = check->fio->open(check);
</span><span class="cx"> if (status == FTDM_SUCCESS) {
</span><span class="lines">@@ -3790,8 +3788,24 @@
</span><span class="cx"> return FTDM_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FT_DECLARE(ftdm_status_t) ftdm_configure_span(const char *type, ftdm_span_t *span, fio_signal_cb_t sig_cb, ...)
</del><ins>+static ftdm_status_t post_configure_span_channels(ftdm_span_t *span)
</ins><span class="cx"> {
</span><ins>+ 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, ...)
+{
</ins><span class="cx"> ftdm_module_t *mod = (ftdm_module_t *) hashtable_search(globals.module_hash, (void *)type);
</span><span class="cx"> ftdm_status_t status = FTDM_FAIL;
</span><span class="cx">
</span><span class="lines">@@ -3812,8 +3826,8 @@
</span><span class="cx"> va_start(ap, sig_cb);
</span><span class="cx"> status = mod->sig_configure(span, sig_cb, ap);
</span><span class="cx"> va_end(ap);
</span><del>- if (status == FTDM_SUCCESS && ftdm_test_flag(span, FTDM_SPAN_USE_CHAN_QUEUE)) {
- status = ftdm_queue_create(&span->pendingchans, SPAN_PENDING_CHANS_QUEUE_SIZE);
</del><ins>+ if (status == FTDM_SUCCESS) {
+ status = post_configure_span_channels(span);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "can't find '%s'\n", type);
</span><span class="lines">@@ -3823,7 +3837,7 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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)
</del><ins>+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)
</ins><span class="cx"> {
</span><span class="cx"> ftdm_module_t *mod = (ftdm_module_t *) hashtable_search(globals.module_hash, (void *)type);
</span><span class="cx"> ftdm_status_t status = FTDM_FAIL;
</span><span class="lines">@@ -3852,8 +3866,8 @@
</span><span class="cx">
</span><span class="cx"> if (mod->configure_span_signaling) {
</span><span class="cx"> status = mod->configure_span_signaling(span, sig_cb, parameters);
</span><del>- if (status == FTDM_SUCCESS && ftdm_test_flag(span, FTDM_SPAN_USE_CHAN_QUEUE)) {
- status = ftdm_queue_create(&span->pendingchans, SPAN_PENDING_CHANS_QUEUE_SIZE);
</del><ins>+ if (status == FTDM_SUCCESS) {
+ status = post_configure_span_channels(span);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "Module %s did not implement the signaling configuration method\n", type);
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludefreetdmh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h (17443 => 17444)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1005,8 +1005,8 @@
</span><span class="cx"> *
</span><span class="cx"> * \note This function does the same as ftdm_configure_span_signaling
</span><span class="cx"> *
</span><ins>+ * \param span The span to configure
</ins><span class="cx"> * \param type The signaling type ("boost", "isdn" and others, this depends on the available signaling modules)
</span><del>- * \param span The span to configure
</del><span class="cx"> * \param sig_cb The callback that the signaling stack will use to notify about events
</span><span class="cx"> * \param ... variable argument list with "var", value sequence, the variable and values are signaling type dependant
</span><span class="cx"> * the last argument must be FTDM_TAG_END
</span><span class="lines">@@ -1014,22 +1014,22 @@
</span><span class="cx"> * \retval FTDM_SUCCESS success
</span><span class="cx"> * \retval FTDM_FAIL failure
</span><span class="cx"> */
</span><del>-FT_DECLARE(ftdm_status_t) ftdm_configure_span(const char *type, ftdm_span_t *span, fio_signal_cb_t sig_cb, ...);
</del><ins>+FT_DECLARE(ftdm_status_t) ftdm_configure_span(ftdm_span_t *span, const char *type, fio_signal_cb_t sig_cb, ...);
</ins><span class="cx"> #define FTDM_TAG_END NULL
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> * \brief Configure span with a signaling type
</span><span class="cx"> *
</span><ins>+ * \param span The span to configure
</ins><span class="cx"> * \param type The signaling type ("boost", "isdn" and others, this depends on the available signaling modules)
</span><del>- * \param span The span to configure
</del><span class="cx"> * \param sig_cb The callback that the signaling stack will use to notify about events
</span><span class="cx"> * \param ... variable argument list with "var", value sequence, the variable and values are signaling type dependant
</span><span class="cx"> *
</span><span class="cx"> * \retval FTDM_SUCCESS success
</span><span class="cx"> * \retval FTDM_FAIL failure
</span><span class="cx"> */
</span><del>-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);
</del><ins>+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);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> * \brief Start the span signaling (must call ftdm_configure_span_signaling first)
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrctestanalogc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/testanalog.c (17443 => 17444)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- if (ftdm_configure_span("analog", span, on_signal,
</del><ins>+ if (ftdm_configure_span(span, "analog", on_signal,
</ins><span class="cx"> "tonemap", "us",
</span><span class="cx"> "digit_timeout", &digit_timeout,
</span><span class="cx"> "max_dialstr", &max_dialstr,
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrctestboostc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/testboost.c (17443 => 17444)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> parameters[1].var = "signalling";
</span><span class="cx"> parameters[1].val = "pri_cpe";
</span><span class="cx"> parameters[2].var = NULL;
</span><del>- if (ftdm_configure_span_signaling("sangoma_boost", span, on_signal, parameters) == FTDM_SUCCESS) {
</del><ins>+ if (ftdm_configure_span_signaling(span, "sangoma_boost", on_signal, parameters) == FTDM_SUCCESS) {
</ins><span class="cx"> ftdm_span_start(span);
</span><span class="cx"> } else {
</span><span class="cx"> fprintf(stderr, "Error starting SS7_BOOST\n");
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrctestpric"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/testpri.c (17443 => 17444)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (ftdm_configure_span(
</span><del>- "libpri", span, on_signal,
</del><ins>+ span, "libpri", on_signal,
</ins><span class="cx"> "node", "cpe",
</span><span class="cx"> "switch", "euroisdn",
</span><span class="cx"> "dp", "unknown",
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrctestr2c"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/testr2.c (17443 => 17444)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>- if (ftdm_configure_span("r2", span, on_r2_signal,
</del><ins>+ if (ftdm_configure_span(span, "r2", on_r2_signal,
</ins><span class="cx"> "variant", "mx",
</span><span class="cx"> "max_ani", 10,
</span><span class="cx"> "max_dnis", 4,
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrctestsangomaboostc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/testsangomaboost.c (17443 => 17444)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> parameters[3].var = NULL;
</span><span class="cx">
</span><span class="cx"> /* send the configuration values down to the stack */
</span><del>- if (ftdm_configure_span_signaling("sangoma_boost", span, on_signaling_event, parameters) != FTDM_SUCCESS) {
</del><ins>+ if (ftdm_configure_span_signaling(span, "sangoma_boost", on_signaling_event, parameters) != FTDM_SUCCESS) {
</ins><span class="cx"> fprintf(stderr, "Error configuring sangoma_boost signaling abstraction in span %s\n", ftdm_span_get_name(span));
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>