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

bridge_simple.c: Fix stream topology handling.

Browse Source 
The handling of stream topologies was not protected by channel locks in
simple_bridge_request_stream_topology_change().

* Fixed topology handling to be protected by channel locks where needed in
simple_bridge_request_stream_topology_change().

ASTERISK-27692

Change-Id: Ica5d78a6c7ecf4f0b95fb16de28d3889b32c4776
This commit is contained in:
Richard Mudgett
2018-02-20 13:11:23 -06:00
parent 5458175744
commit 39f733406d
1 changed files with 49 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
bridges/bridge_simple.c
View File

@@ -113,15 +113,20 @@ static struct ast_bridge_technology simple_bridge = {
.stream_topology_changed = simple_bridge_stream_topology_changed, .stream_topology_changed = simple_bridge_stream_topology_changed,
}; };
static void simple_bridge_request_stream_topology_change(struct ast_channel *chan, static struct ast_stream_topology *simple_bridge_request_stream_topology_update(
struct ast_stream_topology *existing_topology,
struct ast_stream_topology *requested_topology) struct ast_stream_topology *requested_topology)
{ {
struct ast_stream_topology *existing_topology = ast_channel_get_stream_topology(chan);
struct ast_stream *stream; struct ast_stream *stream;
struct ast_format_cap *audio_formats = NULL; struct ast_format_cap *audio_formats = NULL;
struct ast_stream_topology *new_topology; struct ast_stream_topology *new_topology;
int i; int i;
new_topology = ast_stream_topology_clone(requested_topology);
if (!new_topology) {
return NULL;
}
/* We find an existing stream with negotiated audio formats that we can place into /* We find an existing stream with negotiated audio formats that we can place into
* any audio streams in the new topology to ensure that negotiation succeeds. Some * any audio streams in the new topology to ensure that negotiation succeeds. Some
* endpoints incorrectly terminate the call if SDP negotiation fails. * endpoints incorrectly terminate the call if SDP negotiation fails.
@@ -138,59 +143,67 @@ static void simple_bridge_request_stream_topology_change(struct ast_channel *cha
break; break;
} }
if (!audio_formats) { if (audio_formats) {
ast_channel_request_stream_topology_change(chan, requested_topology, &simple_bridge); for (i = 0; i < ast_stream_topology_get_count(new_topology); ++i) {
return; stream = ast_stream_topology_get_stream(new_topology, i);
}
new_topology = ast_stream_topology_clone(requested_topology); if (ast_stream_get_type(stream) != AST_MEDIA_TYPE_AUDIO ||
if (!new_topology) { ast_stream_get_state(stream) == AST_STREAM_STATE_REMOVED) {
ast_channel_request_stream_topology_change(chan, requested_topology, &simple_bridge); continue;
return; }
}
for (i = 0; i < ast_stream_topology_get_count(new_topology); ++i) { ast_format_cap_append_from_cap(ast_stream_get_formats(stream), audio_formats,
stream = ast_stream_topology_get_stream(new_topology, i); AST_MEDIA_TYPE_AUDIO);
if (ast_stream_get_type(stream) != AST_MEDIA_TYPE_AUDIO ||
ast_stream_get_state(stream) == AST_STREAM_STATE_REMOVED) {
continue;
} }
ast_format_cap_append_from_cap(ast_stream_get_formats(stream), audio_formats, AST_MEDIA_TYPE_AUDIO);
} }
ast_channel_request_stream_topology_change(chan, new_topology, &simple_bridge); return new_topology;
ast_stream_topology_free(new_topology);
} }
static void simple_bridge_stream_topology_changed(struct ast_bridge *bridge, static void simple_bridge_stream_topology_changed(struct ast_bridge *bridge,
struct ast_bridge_channel *bridge_channel) struct ast_bridge_channel *bridge_channel)
{ {
struct ast_channel *c0 = AST_LIST_FIRST(&bridge->channels)->chan; struct ast_channel *req_chan;
struct ast_channel *c1 = AST_LIST_LAST(&bridge->channels)->chan; struct ast_channel *existing_chan;
struct ast_stream_topology *t0 = ast_channel_get_stream_topology(c0); struct ast_stream_topology *req_top;
struct ast_stream_topology *t1 = ast_channel_get_stream_topology(c1); struct ast_stream_topology *existing_top;
struct ast_stream_topology *new_top;
if (bridge_channel) { if (bridge_channel) {
ast_bridge_channel_stream_map(bridge_channel); ast_bridge_channel_stream_map(bridge_channel);
if (ast_channel_get_stream_topology_change_source(bridge_channel->chan)
== &simple_bridge) {
return;
}
} }
/*
* The bridge_channel should only be NULL after both channels join req_chan = AST_LIST_FIRST(&bridge->channels)->chan;
* the bridge and their topologies are being aligned. existing_chan = AST_LIST_LAST(&bridge->channels)->chan;
*/ if (req_chan == existing_chan) {
if (bridge_channel && ast_channel_get_stream_topology_change_source( /* Wait until both channels are in the bridge to align topologies. */
bridge_channel->chan) == &simple_bridge) {
return; return;
} }
/* Align topologies according to size or first channel to join */ /* Align topologies according to size or first channel to join */
if (ast_stream_topology_get_count(t0) < ast_stream_topology_get_count(t1)) { ast_channel_lock_both(req_chan, existing_chan);
simple_bridge_request_stream_topology_change(c0, t1); req_top = ast_channel_get_stream_topology(req_chan);
} else { existing_top = ast_channel_get_stream_topology(existing_chan);
simple_bridge_request_stream_topology_change(c1, t0); if (ast_stream_topology_get_count(req_top) < ast_stream_topology_get_count(existing_top)) {
SWAP(req_top, existing_top);
SWAP(req_chan, existing_chan);
} }
new_top = simple_bridge_request_stream_topology_update(existing_top, req_top);
ast_channel_unlock(req_chan);
ast_channel_unlock(existing_chan);
if (!new_top) {
/* Failure. We'll just have to live with the current topology. */
return;
}
ast_channel_request_stream_topology_change(existing_chan, new_top, &simple_bridge);
ast_stream_topology_free(new_top);
} }
static int unload_module(void) static int unload_module(void)