sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revisions 69625 via svnmerge from 

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

........
r69625 | file | 2007-06-18 09:55:00 -0400 (Mon, 18 Jun 2007) | 2 lines

Fix issue where it would be possible for the negotiated codecs to get set back to nothing. (issue #9992 reported by yehavi)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69626 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp 2007-06-18 13:57:33 +00:00
parent 883b380744
commit 981a94f023
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
channels/chan_sip.c
View File

@ -17863,14 +17863,16 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struc
memset(&p->tredirip, 0, sizeof(p->tredirip));
changed = 1;
}
if (codecs && (p->redircodecs != codecs)) {
p->redircodecs = codecs;
changed = 1;
}
if ((p->capability & codecs) != p->capability) {
p->jointcapability &= codecs;
p->capability &= codecs;
changed = 1;
if (codecs) {
if ((p->redircodecs != codecs)) {
p->redircodecs = codecs;
changed = 1;
}
if ((p->capability & codecs) != p->capability) {
p->jointcapability &= codecs;
p->capability &= codecs;
changed = 1;
}
}
if (changed && !ast_test_flag(&p->flags[0], SIP_GOTREFER)) {
if (chan->_state != AST_STATE_UP) { /* We are in early state */