Merge "chan_sip: Handle invalid SDP answer to T.38 re-invite" into 16

This commit is contained in:
Friendly Automation 2019-07-11 15:15:49 -05:00 committed by Gerrit Code Review
commit 0e3a3a5cb7
1 changed files with 7 additions and 1 deletions

View File

@ -10965,7 +10965,13 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
ast_rtp_lookup_mime_multiple2(s3, NULL, newnoncodeccapability, 0, 0));
}
if (portno != -1 || vportno != -1 || tportno != -1) {
/* When UDPTL is negotiated it is expected that there are no compatible codecs as audio or
* video is not being transported, thus we continue in this function further up if that is
* the case. If we receive an SDP answer containing both a UDPTL stream and another media
* stream however we need to check again to ensure that there is at least one joint codec
* instead of assuming there is one.
*/
if ((portno != -1 || vportno != -1 || tportno != -1) && ast_format_cap_count(newjointcapability)) {
/* We are now ready to change the sip session and RTP structures with the offered codecs, since
they are acceptable */
unsigned int framing;