kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-23 16:05:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert previous chan_local fix (r236981) and fix instead by destroying expired frames in the queue.

Browse Source 
(closes issue #16525)
 Reported by: kobaz
 Patches: 
       20100126__issue16525.diff.txt uploaded by tilghman (license 14)
       20100129__issue16525__1.6.0.diff.txt uploaded by tilghman (license 14)
 Tested by: kobaz, atis

(closes issue #16581)
 Reported by: ZX81

(closes issue #16681)
 Reported by: alexr1



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@244070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-02-01 17:46:31 +00:00
parent a5722e173c
commit 72af53a885
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_local.c
+1 -3
View File
@@ -212,9 +212,7 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
}
if (other) {
if (other->pbx || other->_bridge || !ast_strlen_zero(other->appl)) {
ast_queue_frame(other, f);
} /* else the frame won't go anywhere */
ast_queue_frame(other, f);
ast_channel_unlock(other);
}
main/channel.c
+15 -15
View File
@@ -941,22 +941,22 @@ static int __ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin, in
}
}
if ((queued_frames + new_frames) > 128) {
ast_log(LOG_WARNING, "Exceptionally long queue length queuing to %s\n", chan->name);
while ((f = AST_LIST_REMOVE_HEAD(&frames, frame_list))) {
ast_frfree(f);
if ((queued_frames + new_frames > 128 || queued_voice_frames + new_voice_frames > 96)) {
int count = 0;
ast_log(LOG_WARNING, "Exceptionally long %squeue length queuing to %s\n", queued_frames + new_frames > 128 ? "" : "voice ", chan->name);
AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->readq, cur, frame_list) {
/* Save the most recent frame */
if (!AST_LIST_NEXT(cur, frame_list)) {
break;
} else if (cur->frametype == AST_FRAME_VOICE || cur->frametype == AST_FRAME_VIDEO || cur->frametype == AST_FRAME_NULL) {
if (++count > 64) {
break;
}
AST_LIST_REMOVE_CURRENT(&chan->readq, frame_list);
ast_frfree(cur);
}
}
ast_channel_unlock(chan);
return 0;
}
if ((queued_voice_frames + new_voice_frames) > 96) {
ast_log(LOG_WARNING, "Exceptionally long voice queue length queuing to %s\n", chan->name);
while ((f = AST_LIST_REMOVE_HEAD(&frames, frame_list))) {
ast_frfree(f);
}
ast_channel_unlock(chan);
return 0;
AST_LIST_TRAVERSE_SAFE_END;
}
if (after) {