Fix regression introduced by SDP fixups
If capability is adjusted when switching to UDPTL during fax transmission, fax teardown fails. Make sure capability is only touched if RTP is active. This regression was introduced in R344385. ........ Merged revisions 344769 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 344770 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@344771 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
e48cecc848
commit
a4365a8ae2
|
@ -9290,15 +9290,18 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
|
||||||
ast_rtp_lookup_mime_multiple2(s3, NULL, newnoncodeccapability, 0, 0));
|
ast_rtp_lookup_mime_multiple2(s3, NULL, newnoncodeccapability, 0, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We are now ready to change the sip session and p->rtp and p->vrtp with the offered codecs, since
|
if (portno != -1 || vportno != -1 || tportno != -1) {
|
||||||
they are acceptable */
|
/* We are now ready to change the sip session and p->rtp and p->vrtp with the offered codecs, since
|
||||||
ast_format_cap_copy(p->jointcaps, newjointcapability); /* Our joint codec profile for this call */
|
they are acceptable */
|
||||||
ast_format_cap_copy(p->peercaps, newpeercapability); /* The other sides capability in latest offer */
|
ast_format_cap_copy(p->jointcaps, newjointcapability); /* Our joint codec profile for this call */
|
||||||
p->jointnoncodeccapability = newnoncodeccapability; /* DTMF capabilities */
|
ast_format_cap_copy(p->peercaps, newpeercapability); /* The other sides capability in latest offer */
|
||||||
|
p->jointnoncodeccapability = newnoncodeccapability; /* DTMF capabilities */
|
||||||
|
|
||||||
if (ast_test_flag(&p->flags[1], SIP_PAGE2_PREFERRED_CODEC)) { /* respond with single most preferred joint codec, limiting the other side's choice */
|
/* respond with single most preferred joint codec, limiting the other side's choice */
|
||||||
ast_codec_choose(&p->prefs, p->jointcaps, 1, &tmp_fmt);
|
if (ast_test_flag(&p->flags[1], SIP_PAGE2_PREFERRED_CODEC)) {
|
||||||
ast_format_cap_set(p->jointcaps, &tmp_fmt);
|
ast_codec_choose(&p->prefs, p->jointcaps, 1, &tmp_fmt);
|
||||||
|
ast_format_cap_set(p->jointcaps, &tmp_fmt);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Setup audio address and port */
|
/* Setup audio address and port */
|
||||||
|
|
Loading…
Reference in New Issue