From: Joshua Colp <jcolp@digium.com>
Date: Wed, 25 Mar 2009 19:26:04 +0000 (+0000)
Subject: Merged revisions 184280 via svnmerge from
X-Git-Tag: 1.6.1.0-rc4~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=520382d59bead647f6aa5b1b7da67bb8029f0821;p=thirdparty%2Fasterisk.git

Merged revisions 184280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r184280 | file | 2009-03-25 16:22:06 -0300 (Wed, 25 Mar 2009) | 5 lines

  Fix issue with a T38 reinvite being sent even if not configured to do so.

  If we receive a T38 request negotiate control frame we should only attempt to do so
  if the option is enabled on the dialog.
........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 45d91be8bd..c53bebb091 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -5657,7 +5657,7 @@ static int sip_indicate(struct ast_channel *ast, int condition, const void *data
 					AST_SCHED_DEL_UNREF(sched, p->t38id, dialog_unref(p, "when you delete the t38id sched, you should dec the refcount for the stored dialog ptr"));
 					change_t38_state(p, T38_ENABLED);
 					transmit_response_with_t38_sdp(p, "200 OK", &p->initreq, XMIT_CRITICAL);
-				} else if (p->t38.state != T38_ENABLED) {
+				} else if (ast_test_flag(&p->t38.t38support, SIP_PAGE2_T38SUPPORT) && p->t38.state != T38_ENABLED) {
 					change_t38_state(p, T38_LOCAL_REINVITE);
 					if (!p->pendinginvite) {
 						transmit_reinvite_with_sdp(p, TRUE, FALSE);