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 322f4c1..f0c593a 100644 (file)
--- 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;