[asterisk-commits] twilson: branch 10 r336792 - in /branches/10: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Sep 19 17:13:34 2011
New Revision: 336792

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=336792
Log:
Merged revisions 336791 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r336791 | twilson | 2011-09-19 17:07:58 -0500 (Mon, 19 Sep 2011) | 2 lines
  
  Don't interfere with T.38 reinvites
........

Modified:
    branches/10/   (props changed)
    branches/10/channels/chan_sip.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_sip.c?view=diff&rev=336792&r1=336791&r2=336792
==============================================================================
--- branches/10/channels/chan_sip.c (original)
+++ branches/10/channels/chan_sip.c Mon Sep 19 17:13:34 2011
@@ -20115,7 +20115,11 @@
 						"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 || p->t38.state == T38_REJECTED) {
+					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