aboutsummaryrefslogtreecommitdiffstats
path: root/main/rtp.c
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-18 13:58:30 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-18 13:58:30 +0000
commitf387a4459d75369e26ac6e462b943d0bae68f4ff (patch)
tree95c50ca48176e8839a6fc854b4b88d6fc82bcf07 /main/rtp.c
parentd1cee4bd67f30cd983d334dd85414a1a466b6c02 (diff)
Merged revisions 195096 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r195096 | file | 2009-05-18 10:56:16 -0300 (Mon, 18 May 2009) | 12 lines Merged revisions 195095 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r195095 | file | 2009-05-18 10:53:39 -0300 (Mon, 18 May 2009) | 5 lines 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.6.1@195098 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/rtp.c')
-rw-r--r--main/rtp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/rtp.c b/main/rtp.c
index dbf2eaf0b..4946addaa 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -3929,7 +3929,8 @@ static enum ast_bridge_result bridge_native_loop(struct ast_channel *c0, struct
}
if ((inaddrcmp(&t0, &ac0)) ||
(vp0 && inaddrcmp(&vt0, &vac0)) ||
- (tp0 && inaddrcmp(&tt0, &tac0))) {
+ (tp0 && inaddrcmp(&tt0, &tac0)) ||
+ (codec0 != oldcodec0)) {
ast_debug(2, "Oooh, '%s' changed end address to %s:%d (format %d)\n",
c0->name, ast_inet_ntoa(t0.sin_addr), ntohs(t0.sin_port), codec0);
ast_debug(2, "Oooh, '%s' was %s:%d/(format %d)\n",