From: Joshua Colp <jcolp@digium.com>
Date: Wed, 6 Feb 2008 18:01:15 +0000 (+0000)
Subject: Merged revisions 102725 via svnmerge from
X-Git-Tag: 1.6.0-beta3~2^2~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84fd4fcd476ff947c2d10f3fccb05affe78e4fd0;p=thirdparty%2Fasterisk.git

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.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@102726 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 322f4c1270..f0c593af42 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6653,7 +6653,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
 	}
 	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;