From: Terry Wilson <twilson@digium.com>
Date: Mon, 19 Sep 2011 22:07:58 +0000 (+0000)
Subject: Don't interfere with T.38 reinvites
X-Git-Tag: 1.8.8.0-rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0628cce19390c03d22ba49ea5d623c1b5f666e22;p=thirdparty%2Fasterisk.git

Don't interfere with T.38 reinvites

This is an update to the fix for ASTERISK-18340 and ASTERISK-17725


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 066bb19434..68a88754fe 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -19614,7 +19614,11 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
 						"Channel: %s\r\nChanneltype: %s\r\nUniqueid: %s\r\nSIPcallid: %s\r\nSIPfullcontact: %s\r\nPeername: %s\r\n",
 						p->owner->name, "SIP", p->owner->uniqueid, p->callid, p->fullcontact, p->peername);
 			} else {	/* RE-invite */
-				ast_queue_control(p->owner, AST_CONTROL_UPDATE_RTP_PEER);
+				if (p->t38.state == T38_DISABLED) {
+					ast_queue_control(p->owner, AST_CONTROL_UPDATE_RTP_PEER);
+				} else {
+					ast_queue_frame(p->owner, &ast_null_frame);
+				}
 			}
 		} else {
 			 /* It's possible we're getting an 200 OK after we've tried to disconnect