diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/bridge.c | 13 | ||||
| -rw-r--r-- | main/bridge_channel.c | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/main/bridge.c b/main/bridge.c index bb90de7e4..6a6744490 100644 --- a/main/bridge.c +++ b/main/bridge.c @@ -1420,7 +1420,7 @@ void ast_bridge_notify_masquerade(struct ast_channel *chan) * Need to update the features parameter doxygen when this * change is made to be like ast_bridge_impart(). */ -enum bridge_channel_state ast_bridge_join(struct ast_bridge *bridge, +int ast_bridge_join(struct ast_bridge *bridge, struct ast_channel *chan, struct ast_channel *swap, struct ast_bridge_features *features, @@ -1428,21 +1428,21 @@ enum bridge_channel_state ast_bridge_join(struct ast_bridge *bridge, int pass_reference) { struct ast_bridge_channel *bridge_channel; - enum bridge_channel_state state; + int res; bridge_channel = bridge_channel_internal_alloc(bridge); if (pass_reference) { ao2_ref(bridge, -1); } if (!bridge_channel) { - state = BRIDGE_CHANNEL_STATE_END_NO_DISSOLVE; + res = -1; goto join_exit; } /* BUGBUG features cannot be NULL when passed in. When it is changed to allocated we can do like ast_bridge_impart() and allocate one. */ ast_assert(features != NULL); if (!features) { ao2_ref(bridge_channel, -1); - state = BRIDGE_CHANNEL_STATE_END_NO_DISSOLVE; + res = -1; goto join_exit; } if (tech_args) { @@ -1458,8 +1458,7 @@ enum bridge_channel_state ast_bridge_join(struct ast_bridge *bridge, bridge_channel->swap = swap; bridge_channel->features = features; - bridge_channel_internal_join(bridge_channel); - state = bridge_channel->state; + res = bridge_channel_internal_join(bridge_channel); /* Cleanup all the data in the bridge channel after it leaves the bridge. */ ast_channel_lock(chan); @@ -1481,7 +1480,7 @@ join_exit:; ast_softhangup_nolock(chan, AST_SOFTHANGUP_ASYNCGOTO); ast_channel_unlock(chan); } - return state; + return res; } /*! \brief Thread responsible for imparted bridged channels to be departed */ diff --git a/main/bridge_channel.c b/main/bridge_channel.c index 1164e4f67..cec3d1ad1 100644 --- a/main/bridge_channel.c +++ b/main/bridge_channel.c @@ -1794,8 +1794,9 @@ static void bridge_channel_event_join_leave(struct ast_bridge_channel *bridge_ch } /*! \brief Join a channel to a bridge and handle anything the bridge may want us to do */ -void bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel) +int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel) { + int res = 0; ast_format_copy(&bridge_channel->read_format, ast_channel_readformat(bridge_channel->chan)); ast_format_copy(&bridge_channel->write_format, ast_channel_writeformat(bridge_channel->chan)); @@ -1826,6 +1827,7 @@ void bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel) if (bridge_channel_internal_push(bridge_channel)) { ast_bridge_channel_leave_bridge(bridge_channel, BRIDGE_CHANNEL_STATE_END_NO_DISSOLVE); + res = -1; } bridge_reconfigured(bridge_channel->bridge, 1); @@ -1881,6 +1883,8 @@ void bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel) ast_channel_unlock(bridge_channel->chan); ast_bridge_channel_restore_formats(bridge_channel); + + return res; } int bridge_channel_internal_queue_blind_transfer(struct ast_channel *transferee, |