diff options
| author | Jonathan Rose <jrose@digium.com> | 2011-09-16 21:20:02 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2011-09-16 21:20:02 +0000 |
| commit | beae2df26eaba06d91b99e1365596081bcd30ca0 (patch) | |
| tree | bf204c0d85e4acf695498ea3110bd43908f9304c /main/channel.c | |
| parent | 9112b5c75d1a608ff780b12dde74f9d04c7460ad (diff) | |
Merged revisions 336307 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r336307 | jrose | 2011-09-16 16:09:20 -0500 (Fri, 16 Sep 2011) | 20 lines
Merged revisions 336294 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r336294 | jrose | 2011-09-16 14:53:40 -0500 (Fri, 16 Sep 2011) | 13 lines
Fix bad RTP media bridges in directmedia calls on peers separated by multiple Asterisk nodes.
In a situation involving devices on separate Asterisk trunks, the remote RTP bridge would
break when starting a call with directmedia. This patch queues a new type of control frame
so that our RTP bridge loop can properly detect when these situations occur and check to see
if peers need to be updated in order to send their media to the proper location.
(Closes issue ASTERISK-18340)
Reported by: Thomas Arimont
(Closes issue ASTERISK-17725)
Reported by: kwk
Tested by: twilson, jrose
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c index 4015e80a1..2393b6a04 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4345,6 +4345,7 @@ static int attribute_const is_visible_indication(enum ast_control_frame_type con case AST_CONTROL_AOC: case AST_CONTROL_END_OF_Q: case AST_CONTROL_MCID: + case AST_CONTROL_UPDATE_RTP_PEER: break; case AST_CONTROL_INCOMPLETE: @@ -4533,6 +4534,7 @@ int ast_indicate_data(struct ast_channel *chan, int _condition, case AST_CONTROL_AOC: case AST_CONTROL_END_OF_Q: case AST_CONTROL_MCID: + case AST_CONTROL_UPDATE_RTP_PEER: /* Nothing left to do for these. */ res = 0; break; |