[svn-commits] file: trunk r102726 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Feb  6 12:01:15 2008
New Revision: 102726

URL: http://svn.digium.com/view/asterisk?view=rev&rev=102726
Log:
Merged revisions 102725 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r102725 | file | 2008-02-06 13:59:23 -0400 (Wed, 06 Feb 2008) | 2 lines

Only consider a T.38-only INVITE compatible if we have both a joint capability between us and them and if they provided T.38.

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=102726&r1=102725&r2=102726
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Feb  6 12:01:15 2008
@@ -6653,7 +6653,7 @@
 	}
 	if (!newjointcapability) {
 		/* If T.38 was not negotiated either, totally bail out... */
-		if (!p->t38.jointcapability) {
+		if (!p->t38.jointcapability || !p->t38.peercapability) {
 			ast_log(LOG_NOTICE, "No compatible codecs, not accepting this offer!\n");
 			/* Do NOT Change current setting */
 			return -1;