diff options
author | Joshua Colp <jcolp@digium.com> | 2006-09-01 22:51:46 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2006-09-01 22:51:46 +0000 |
commit | e43b830a9d84266f856252534a508617a91f7a2e (patch) | |
tree | 7a08e0f80b9a4d7cbfa08a9055b2ae7fbd0e0fd1 | |
parent | d9d3127ee3464cbc59e57656cf1a120a9d9c814b (diff) |
Merged revisions 41768 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r41768 | file | 2006-09-01 18:49:07 -0400 (Fri, 01 Sep 2006) | 2 lines
Only wipe the redirected audio & video IP/port if it's specified, and trigger a reinvite.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41769 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | channels/chan_sip.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 072b41f43..643cec319 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -16169,14 +16169,18 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struc return 0; } - if (rtp) + if (rtp) { changed |= ast_rtp_get_peer(rtp, &p->redirip); - else + } else if (p->redirip.sin_addr.s_addr || ntohs(p->redirip.sin_port) != 0) { memset(&p->redirip, 0, sizeof(p->redirip)); - if (vrtp) + changed = 1; + } + if (vrtp) { changed |= ast_rtp_get_peer(vrtp, &p->vredirip); - else + } else if (p->vredirip.sin_addr.s_addr || ntohs(p->vredirip.sin_port) != 0) { memset(&p->vredirip, 0, sizeof(p->vredirip)); + changed = 1; + } if (codecs && (p->redircodecs != codecs)) { p->redircodecs = codecs; changed = 1; |