kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 03:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use correct function for getting bridged peer when doing direct media checks.

Browse Source 
(closes issue ASTERISK-21947)
reported by Matt Jordan



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393897 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2013-07-09 20:07:21 +00:00
parent bb7def1b5b
commit 0e25d8036e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_gulp.c
View File

@@ -488,12 +488,14 @@ static int gulp_set_rtp_peer(struct ast_channel *chan,
struct gulp_pvt *pvt = ast_channel_tech_pvt(chan);
struct ast_sip_session *session = pvt->session;
int changed = 0;
struct ast_channel *bridge_peer;
/* BUGBUG - ast_bridged_channel will always return NULL, meaning direct media will never occur */
/* Don't try to do any direct media shenanigans on early bridges */
if ((rtp || vrtp || tpeer) && !ast_bridged_channel(chan)) {
bridge_peer = ast_channel_bridge_peer(chan);
if ((rtp || vrtp || tpeer) && !bridge_peer) {
return 0;
}
ast_channel_cleanup(bridge_peer);
if (nat_active && session->endpoint->disable_direct_media_on_nat) {
return 0;