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

Merge "app_confbridge: Bridge and announcers not removed if conference ends quickly"

Browse Source
This commit is contained in:
Jenkins2
2018-07-02 07:16:55 -05:00
committed by Gerrit Code Review
parent 454aa952fa 9d3f3a4b0a
commit efe2ba43ca
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/app_confbridge.c
View File

@@ -1457,25 +1457,19 @@ static int alloc_playback_chan(struct confbridge_conference *conference)
/*! /*!
* \brief Push the announcer channel into the bridge * \brief Push the announcer channel into the bridge
* *
* This runs in the playback queue taskprocessor. * \param conference Conference bridge to push the announcer to
*
* \param data A confbridge_conference
* \retval 0 Success * \retval 0 Success
* \retval -1 Failed to push the channel to the bridge * \retval -1 Failed to push the channel to the bridge
*/ */
static int push_announcer(void *data) static int push_announcer(struct confbridge_conference *conference)
{ {
struct confbridge_conference *conference = data;
if (conf_announce_channel_push(conference->playback_chan)) { if (conf_announce_channel_push(conference->playback_chan)) {
ast_hangup(conference->playback_chan); ast_hangup(conference->playback_chan);
conference->playback_chan = NULL; conference->playback_chan = NULL;
ao2_cleanup(conference);
return -1; return -1;
} }
ast_autoservice_start(conference->playback_chan); ast_autoservice_start(conference->playback_chan);
ao2_cleanup(conference);
return 0; return 0;
} }
@@ -1588,7 +1582,7 @@ static struct confbridge_conference *join_conference_bridge(const char *conferen
return NULL; return NULL;
} }
if (ast_taskprocessor_push(conference->playback_queue, push_announcer, ao2_bump(conference))) { if (push_announcer(conference)) {
ao2_unlink(conference_bridges, conference); ao2_unlink(conference_bridges, conference);
ao2_ref(conference, -1); ao2_ref(conference, -1);
ao2_unlock(conference_bridges); ao2_unlock(conference_bridges);