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

Merged revisions 7823 via svnmerge from

Browse Source 
/branches/1.2


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7824 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2006-01-05 23:08:55 +00:00
parent 8adf708c1b
commit a0ba6e7084
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/res_features.c
View File

@@ -944,13 +944,15 @@ static int feature_exec_app(struct ast_channel *chan, struct ast_channel *peer,
app = pbx_findapp(feature->app);
if (app) {
struct ast_channel *work=chan;
if (ast_test_flag(feature,AST_FEATURE_FLAG_CALLEE)) work=peer;
struct ast_channel *work = chan;
if (ast_test_flag(feature, AST_FEATURE_FLAG_CALLEE))
work = peer;
res = pbx_exec(work, app, feature->app_args, 1);
if (res<0) return res;
if (res < 0)
return res;
} else {
ast_log(LOG_WARNING, "Could not find application (%s)\n", feature->app);
res = -2;
return -2;
}
return FEATURE_RETURN_SUCCESS;
@@ -1583,7 +1585,8 @@ static void *do_parking_thread(void *ignore)
/* See if they need servicing */
f = ast_read(pu->chan);
if (!f || ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_HANGUP))) {
if (f)
ast_frfree(f);
manager_event(EVENT_FLAG_CALL, "ParkedCallGiveUp",
"Exten: %d\r\n"
"Channel: %s\r\n"