diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-09 17:13:01 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-09 17:13:01 +0000 |
commit | 0f268810ccfbb69f8881dee3a8469b62c0587cfa (patch) | |
tree | 0006617ec7171ce43708d528a4666659858ca2b7 /channels/chan_sip.c | |
parent | 3168b0bb6555f97158fc2209d7092da55da3c25c (diff) |
Merged revisions 318233 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r318233 | dvossel | 2011-05-09 12:09:55 -0500 (Mon, 09 May 2011) | 14 lines
Merged revisions 318230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r318230 | dvossel | 2011-05-09 11:51:45 -0500 (Mon, 09 May 2011) | 7 lines
Fixes cases where sip_set_rtp_peer can return too early during media path reset.
(closes issue #19225)
Reported by: one47
Patches:
sip_set_rtp_peer.patch uploaded by one47 (license 23)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@318234 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_sip.c')
-rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 36866baa5..dc97c11aa 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -28286,8 +28286,10 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *i } /* Disable early RTP bridge */ - if (!ast_bridged_channel(chan) && !sip_cfg.directrtpsetup) { /* We are in early state */ - return 0; + if ((instance || vinstance || tinstance) && + !ast_bridged_channel(chan) && + !sip_cfg.directrtpsetup) { + return 0; } /* |