[asterisk-commits] file: branch 1.6.0 r114105 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Apr 14 09:54:17 2008
New Revision: 114105

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114105
Log:
Merged revisions 114104 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114104 | file | 2008-04-14 11:53:33 -0300 (Mon, 14 Apr 2008) | 12 lines

Merged revisions 114103 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114103 | file | 2008-04-14 11:52:46 -0300 (Mon, 14 Apr 2008) | 4 lines

It is possible for the remote side to say they want T38 but not give any capabilities.
(closes issue #12414)
Reported by: MVF

........

................

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/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=114105&r1=114104&r2=114105
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Mon Apr 14 09:54:17 2008
@@ -6848,7 +6848,7 @@
 	}
 	if (!newjointcapability) {
 		/* If T.38 was not negotiated either, totally bail out... */
-		if (!p->t38.jointcapability || !p->t38.peercapability) {
+		if (!p->t38.jointcapability || !udptlportno) {
 			ast_log(LOG_NOTICE, "No compatible codecs, not accepting this offer!\n");
 			/* Do NOT Change current setting */
 			return -1;