[svn-commits] file: branch 1.6.0 r184281 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Mar 25 14:23:59 2009
New Revision: 184281

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184281
Log:
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.
........

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

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=184281&r1=184280&r2=184281
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed Mar 25 14:23:59 2009
@@ -5385,7 +5385,7 @@
 					AST_SCHED_DEL(sched, p->t38id);
 					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);