kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-02 02:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

bridge : Fix one-way direct-media when early bridging with native_rtp

Browse Source 
When two channels were early bridged in a native_rtp bridge, the RTP description
on one side was not updated when the other side answered.
This patch forbids non-answered channels to enter a native_rtp bridge, and
triggers a bridge reconfiguration when an ANSWER frame is received.

ASTERISK-27257

Change-Id: If1aaee1b4ed9658a1aa91ab715ee0a6413b878df
This commit is contained in:
Jean Aunis
2017-09-07 11:41:09 +02:00
committed by Richard Mudgett
parent 8830cc0541
commit 6b7d5671d1
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bridges/bridge_native_rtp.c
View File

@@ -598,7 +598,8 @@ static int native_rtp_framehook_consume(void *data, enum ast_frame_type type)
*/ */
static int native_rtp_bridge_capable(struct ast_channel *chan) static int native_rtp_bridge_capable(struct ast_channel *chan)
{ {
return !ast_channel_has_hook_requiring_audio(chan); return !ast_channel_has_hook_requiring_audio(chan)
&& ast_channel_state(chan) == AST_STATE_UP;
} }
/*! /*!

4
include/asterisk/bridge_technology.h
View File

@@ -108,11 +108,13 @@ struct ast_bridge_technology {
* *
* \note On entry, bridge is already locked. * \note On entry, bridge is already locked.
* *
* \note The bridge technology must tollerate a failed to join channel * \note The bridge technology must tolerate a failed to join channel
* until it can be kicked from the bridge. * until it can be kicked from the bridge.
* *
* \note A channel may be in a suspended state already when joining a bridge * \note A channel may be in a suspended state already when joining a bridge
* technology. The technology must handle this case. * technology. The technology must handle this case.
*
* \note A channel may not be answered when joining a bridge technology.
*/ */
int (*join)(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel); int (*join)(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel);
/*! /*!

4
main/bridge_channel.c
View File

@@ -2313,6 +2313,10 @@ static void bridge_channel_handle_control(struct ast_bridge_channel *bridge_chan
case AST_CONTROL_ANSWER: case AST_CONTROL_ANSWER:
if (ast_channel_state(chan) != AST_STATE_UP) { if (ast_channel_state(chan) != AST_STATE_UP) {
ast_answer(chan); ast_answer(chan);
ast_bridge_channel_lock_bridge(bridge_channel);
bridge_channel->bridge->reconfigured = 1;
bridge_reconfigured(bridge_channel->bridge, 0);
ast_bridge_unlock(bridge_channel->bridge);
} else { } else {
ast_indicate(chan, -1); ast_indicate(chan, -1);
} }