app_meetme: Fix channels lingering when hung up under certain conditions

Channels would get stuck and MeetMe would repeatedly display an Unable
to write frame to channel error in the conf_run function if hung up
during certain sound prompts such as during user count announcements.
This patch fixes that by reintroducing a hangup check in the meetme's
main loop (also in conf_run).

(closes issue ASTERISK-20486)
Reported by: Michael Cargile
Review: https://reviewboard.asterisk.org/r/2187/
Patches:
    meetme_hangup_patch_ASTERISK-20486_v3.diff uploaded by Jonathan Rose (license 6182)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@376307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
changes/98/198/1
Jonathan Rose 13 years ago
parent fe1ea0d38e
commit aaa5514742

@ -3209,6 +3209,11 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
break;
}
/* Perform a hangup check here since ast_waitfor_nandfds will not always be able to get a channel after a hangup has occurred */
if (ast_check_hangup(chan)) {
break;
}
c = ast_waitfor_nandfds(&chan, 1, &fd, nfds, NULL, &outfd, &ms);
if (c) {
@ -3293,12 +3298,12 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
}
if (musiconhold) {
ast_moh_stop(chan);
ast_moh_stop(chan);
}
if (menu8_active) {
/* *8 Submenu */
dtmf = f->subclass.integer;
if (dtmf) {
if (dtmf > 0) {
int keepplaying;
int playednamerec;
struct ao2_iterator user_iter;
@ -3457,7 +3462,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
} else {
dtmf = f->subclass.integer;
}
if (dtmf) {
if (dtmf > 0) {
switch(dtmf) {
case '1': /* Un/Mute */
menu_active = 0;
@ -3564,7 +3569,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
} else {
dtmf = f->subclass.integer;
}
if (dtmf) {
if (dtmf > 0) {
switch (dtmf) {
case '1': /* Un/Mute */
menu_active = 0;

Loading…
Cancel
Save