diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2016-04-13 13:20:23 -0500 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2016-04-22 15:45:47 -0500 |
| commit | 71dfa355403e41850fd7c4cb4228626e5d9476b9 (patch) | |
| tree | dc681da696cd8141907768755e604010de0e7af8 /main/bridge.c | |
| parent | 57c908c7a59056f6ea66ebe1453f2454be837233 (diff) | |
bridge_softmix.c: Fix crash if channel fails to join mixing tech.
softmix_bridge_join() failed because of an allocation failure. To address
this, the softmix bridge technology now checks if the channel failed to
join softmix successfully. In addition, the bridge now begins the process
of kicking the channel out of the bridge so we don't have channels
partially in the bridge for very long.
* Fix the test_channel_feature_hooks.c unit tests. The test channel must
have a valid codec to join the simple_bridge technology. This patch makes
joining a bridge more strict by not allowing partially joined channels to
remain in the bridge.
Change-Id: I97e2ade6a2bcd1214f24fb839fda948825b61a2b
Diffstat (limited to 'main/bridge.c')
| -rw-r--r-- | main/bridge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/bridge.c b/main/bridge.c index b9a436e86..a56555bc9 100644 --- a/main/bridge.c +++ b/main/bridge.c @@ -420,10 +420,12 @@ static void bridge_channel_complete_join(struct ast_bridge *bridge, struct ast_b bridge->technology->name); if (bridge->technology->join && bridge->technology->join(bridge, bridge_channel)) { - ast_debug(1, "Bridge %s: %p(%s) failed to join %s technology\n", + /* We cannot leave the channel partially in the bridge so we must kick it out */ + ast_debug(1, "Bridge %s: %p(%s) failed to join %s technology (Kicking it out)\n", bridge->uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan), bridge->technology->name); bridge_channel->just_joined = 1; + ast_bridge_channel_leave_bridge(bridge_channel, BRIDGE_CHANNEL_STATE_END, 0); return; } |