aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-18 13:53:39 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-18 13:53:39 +0000
commit6b367532897d3bb2c64e3da342cb8bc868a6d139 (patch)
treeb48d72977e29451eaa7760e2a3ebb9504a1fe548 /channels
parent9a20a61ebc80d56154e973a98f0d0dabe1f60eb8 (diff)
Fix a bug where the codecs of the called party leg were not properly sent back to the caller call leg when reinvited.
(closes issue #13569) Reported by: bkw918 git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@195095 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index b1358175a..3bc29bb75 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -18559,11 +18559,8 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struc
changed = 1;
}
if (codecs) {
- if ((p->redircodecs != codecs)) {
+ if (p->redircodecs != codecs && (p->jointcapability & codecs) != p->jointcapability) {
p->redircodecs = codecs;
- changed = 1;
- }
- if ((p->capability & codecs) != p->capability) {
p->jointcapability &= codecs;
p->capability &= codecs;
changed = 1;