From: Joshua Colp <jcolp@digium.com>
Date: Mon, 18 Jun 2007 19:02:45 +0000 (+0000)
Subject: Merged revisions 69794 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2346
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ed0563f1781451e61871ff2062be27f9ac3e1fc;p=thirdparty%2Fasterisk.git

Merged revisions 69794 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r69794 | file | 2007-06-18 15:00:50 -0400 (Mon, 18 Jun 2007) | 2 lines

Don't count RTP timeout when involved in a T38 fax session. (issue #9222 reported by ivoc)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69795 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9d4472c987..6b4834d906 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -15850,6 +15850,10 @@ static void check_rtp_timeout(struct sip_pvt *dialog, time_t t)
 	if (dialog->owner->_state != AST_STATE_UP || dialog->redirip.sin_addr.s_addr)
 		return;
 
+	/* If the call is involved in a T38 fax session do not check RTP timeout */
+	if (dialog->t38.state == T38_ENABLED)
+		return;
+
 	/* If we have no timers set, return now */
 	if (ast_rtp_get_rtpkeepalive(dialog->rtp) == 0 || (ast_rtp_get_rtptimeout(dialog->rtp) == 0 && ast_rtp_get_rtpholdtimeout(dialog->rtp) == 0))
 		return;