[svn-commits] russell: branch russell/event_performance r184299 - in /team/russell/event_pe...

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Mar 25 15:21:12 2009
New Revision: 184299

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184299
Log:
sync with 1.6.1

Modified:
    team/russell/event_performance/   (props changed)
    team/russell/event_performance/channels/chan_sip.c

Propchange: team/russell/event_performance/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 25 15:21:12 2009
@@ -1,1 +1,1 @@
-/branches/1.6.1:1-184250
+/branches/1.6.1:1-184298

Propchange: team/russell/event_performance/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: team/russell/event_performance/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/event_performance/channels/chan_sip.c?view=diff&rev=184299&r1=184298&r2=184299
==============================================================================
--- team/russell/event_performance/channels/chan_sip.c (original)
+++ team/russell/event_performance/channels/chan_sip.c Wed Mar 25 15:21:12 2009
@@ -5657,7 +5657,7 @@
 					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);