mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Implement flags for AGI in the channel structure so taht "show channels" and
AMI commands can display that a channel is under control of an AGI. Work inspired by work at customer site, but paid for by Edvina AB git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128240 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -204,7 +204,7 @@ static struct agi_cmd *get_agi_cmd(struct ast_channel *chan)
|
||||
return cmd;
|
||||
}
|
||||
|
||||
/* channel is locked when calling this one either from the CLI or manager thread */
|
||||
/*! \brief channel is locked when calling this one either from the CLI or manager thread */
|
||||
static int add_agi_cmd(struct ast_channel *chan, const char *cmd_buff, const char *cmd_id)
|
||||
{
|
||||
struct ast_datastore *store;
|
||||
@@ -424,6 +424,8 @@ static enum agi_result launch_asyncagi(struct ast_channel *chan, char *argv[], i
|
||||
returnstatus = AGI_RESULT_FAILURE;
|
||||
goto quit;
|
||||
}
|
||||
ast_set_flag(chan, AST_FLAG_ASYNCAGI);
|
||||
|
||||
agi_buffer[res] = '\0';
|
||||
/* encode it and send it thru the manager so whoever is going to take
|
||||
care of AGI commands on this channel can decide which AGI commands
|
||||
@@ -606,8 +608,10 @@ static enum agi_result launch_script(struct ast_channel *chan, char *script, cha
|
||||
int pid, toast[2], fromast[2], audio[2], res;
|
||||
struct stat st;
|
||||
|
||||
if (!strncasecmp(script, "agi://", 6))
|
||||
if (!strncasecmp(script, "agi://", 6)) {
|
||||
ast_set_flag(chan, AST_FLAG_FASTAGI);
|
||||
return launch_netscript(script, argv, fds, efd, opid);
|
||||
}
|
||||
if (!strncasecmp(script, "agi:async", sizeof("agi:async")-1))
|
||||
return launch_asyncagi(chan, argv, efd);
|
||||
|
||||
@@ -711,6 +715,7 @@ static enum agi_result launch_script(struct ast_channel *chan, char *script, cha
|
||||
close(audio[0]);
|
||||
|
||||
*opid = pid;
|
||||
ast_set_flag(chan, AST_FLAG_AGI);
|
||||
return AGI_RESULT_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -2919,6 +2924,9 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int
|
||||
close(efd);
|
||||
}
|
||||
ast_safe_fork_cleanup();
|
||||
ast_clear_flag(chan, AST_FLAG_AGI);
|
||||
ast_clear_flag(chan, AST_FLAG_FASTAGI);
|
||||
ast_clear_flag(chan, AST_FLAG_ASYNCAGI);
|
||||
|
||||
switch (res) {
|
||||
case AGI_RESULT_SUCCESS:
|
||||
|
Reference in New Issue
Block a user