From: James Zhang <jzhang@sangoma.com>
Date: Mon, 16 Apr 2012 17:48:35 +0000 (-0400)
Subject: freetdm: fix REL receiving leg always stay in TERMINATING stae in
X-Git-Tag: v1.2.3^2~71^2^2~201^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2f1b4ab27ae10990d0db0537f3ee3300c8e9bd5;p=thirdparty%2Ffreeswitch.git

freetdm: fix REL receiving leg always stay in TERMINATING stae in
         native bridge mode
         - This is supposed to be included in commit of
           b324f8679782957bc9db3bdfd6687aa42cba77dd. Somehow it's
           not included in that commit. Without this change, the
           REL receiving leg always stay in TERMINATING state when
           received an incoming REL message.
---

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index 513fc0c595..1c05797102 100644
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -2199,9 +2199,12 @@ static ftdm_status_t _ftdm_channel_call_hangup_nl(const char *file, const char *
 {
 	ftdm_status_t status = FTDM_SUCCESS;
 
-	if (ftdm_test_flag(chan, FTDM_CHANNEL_NATIVE_SIGBRIDGE)) {
+	/* In native sigbridge mode we ignore hangup requests from the user and hangup only when the signaling module decides it */
+	if (ftdm_test_flag(chan, FTDM_CHANNEL_NATIVE_SIGBRIDGE) && chan->state != FTDM_CHANNEL_STATE_TERMINATING) {
+
 		ftdm_log_chan_ex(chan, file, func, line, FTDM_LOG_LEVEL_DEBUG, 
 				"Ignoring hangup in channel in state %s (native bridge enabled)\n", ftdm_channel_state2str(chan->state));
+		ftdm_set_flag(chan, FTDM_CHANNEL_USER_HANGUP);
 		goto done;
 	}