kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 138028 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r138028 | russell | 2008-08-15 10:09:46 -0500 (Fri, 15 Aug 2008) | 17 lines

Merged revisions 138027 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138027 | russell | 2008-08-15 10:07:16 -0500 (Fri, 15 Aug 2008) | 9 lines

Ensure that when a hangup occurs in autoservice, that a hangup frame gets
properly deferred to be read from the channel owner when it gets taken out
of autoservice.

(closes issue #12874)
Reported by: dimas
Patches: 
      v1-12874.patch uploaded by dimas (license 88)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@138029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-08-15 15:12:08 +00:00
parent 2a1ba6191e
commit 43b54c74ec
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/autoservice.c
View File

@@ -152,14 +152,7 @@ static void *autoservice_run(void *ign)
}
}
if (!defer_frame) {
if (f) {
ast_frfree(f);
}
continue;
}
if (f) {
if (defer_frame) {
for (i = 0; i < x; i++) {
struct ast_frame *dup_f;
@@ -167,12 +160,15 @@ static void *autoservice_run(void *ign)
continue;
}
if ((dup_f = ast_frdup(f))) {
if ((dup_f = ast_frdup(defer_frame))) {
AST_LIST_INSERT_TAIL(&ents[i]->deferred_frames, dup_f, frame_list);
}
break;
}
}
if (f) {
ast_frfree(f);
}
}