From: Moises Silva <moy@sangoma.com>
Date: Wed, 3 Jul 2013 06:07:05 +0000 (-0400)
Subject: freetdm: Fix longstanding minor bug in ftdm_span_send_signal causing dial-regex in... 
X-Git-Tag: v1.5.5~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d5f14a15dee6986ec100705181160cdc1c9a2bb;p=thirdparty%2Ffreeswitch.git

freetdm: Fix longstanding minor bug in ftdm_span_send_signal causing dial-regex in Analog modules to not work
         The return status of the signal callback was not being passed to the signaling module delivering the signal
---

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index 9ea22fbbfe..57d5af1b85 100644
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -6089,6 +6089,7 @@ static void execute_safety_hangup(void *data)
 FT_DECLARE(ftdm_status_t) ftdm_span_send_signal(ftdm_span_t *span, ftdm_sigmsg_t *sigmsg)
 {
 	ftdm_channel_t *fchan = NULL;
+	ftdm_status_t status = FTDM_SUCCESS;
 	if (sigmsg->channel) {
 		fchan = sigmsg->channel;
 		ftdm_channel_lock(fchan);
@@ -6193,7 +6194,7 @@ FT_DECLARE(ftdm_status_t) ftdm_span_send_signal(ftdm_span_t *span, ftdm_sigmsg_t
 	if (ftdm_test_flag(span, FTDM_SPAN_USE_SIGNALS_QUEUE)) {
 		ftdm_span_queue_signal(span, sigmsg);
 	} else {
-		ftdm_span_trigger_signal(span, sigmsg);
+		status = ftdm_span_trigger_signal(span, sigmsg);
 	}
 
 done:
@@ -6202,7 +6203,7 @@ done:
 		ftdm_channel_unlock(fchan);
 	}
 
-	return FTDM_SUCCESS;
+	return status;
 }
 
 static void *ftdm_cpu_monitor_run(ftdm_thread_t *me, void *obj)