kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 11:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

bridge_native_rtp: Take the bridge type choice of both channels into account.

Browse Source 
The bridge_native_rtp module currently uses the bridge result of the first
channel that joins a bridge as the ultimate result. This means that if the
first channel has direct media enabled but the second does not a direct
media bridge will still occur.

This change makes it so that both sides are taken into account. If either
side forbids the bridge or responds with a local bridge result then
either a generic or local bridge occurs.

ASTERISK-23541 #close
Reported by: Justin E

Review: https://reviewboard.asterisk.org/r/3577/
........

Merged revisions 414975 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@414976 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2014-06-01 15:32:34 +00:00
parent 00077c46db
commit 962b78bca1
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bridges/bridge_native_rtp.c
View File

@@ -103,13 +103,17 @@ static enum ast_rtp_glue_result native_rtp_bridge_get(struct ast_channel *c0, st
audio_glue1_res = AST_RTP_GLUE_RESULT_FORBID; audio_glue1_res = AST_RTP_GLUE_RESULT_FORBID;
} }
/* If any sort of bridge is forbidden just completely bail out and go back to generic bridging */ /* The order of preference is: forbid, local, and remote. */
if (audio_glue0_res == AST_RTP_GLUE_RESULT_FORBID if (audio_glue0_res == AST_RTP_GLUE_RESULT_FORBID ||
|| audio_glue1_res == AST_RTP_GLUE_RESULT_FORBID) { audio_glue1_res == AST_RTP_GLUE_RESULT_FORBID) {
/* If any sort of bridge is forbidden just completely bail out and go back to generic bridging */
return AST_RTP_GLUE_RESULT_FORBID; return AST_RTP_GLUE_RESULT_FORBID;
} else if (audio_glue0_res == AST_RTP_GLUE_RESULT_LOCAL ||
audio_glue1_res == AST_RTP_GLUE_RESULT_LOCAL) {
return AST_RTP_GLUE_RESULT_LOCAL;
} else {
return AST_RTP_GLUE_RESULT_REMOTE;
} }
return audio_glue0_res;
} }
/*! /*!