Merged revisions 44450 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44450 | file | 2006-10-04 22:40:40 -0400 (Wed, 04 Oct 2006) | 2 lines

Don't totally bail out if T.38 was negotiated

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44451 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-10-05 02:43:07 +00:00
parent cd0457d14e
commit 9924c3e2e9

View File

@@ -4942,9 +4942,16 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req)
ast_rtp_lookup_mime_multiple(s3, BUFSIZ, newnoncodeccapability, 0, 0));
}
if (!newjointcapability) {
ast_log(LOG_NOTICE, "No compatible codecs, not accepting this offer!\n");
/* Do NOT Change current setting */
return -1;
/* If T.38 was not negotiated either, totally bail out... */
if (!p->t38.jointcapability) {
ast_log(LOG_NOTICE, "No compatible codecs, not accepting this offer!\n");
/* Do NOT Change current setting */
return -1;
} else {
if (option_debug > 2)
ast_log(LOG_DEBUG, "Have T.38 but no audio codecs, accepting offer anyway\n");
return 0;
}
}
/* We are now ready to change the sip session and p->rtp and p->vrtp with the offered codecs, since