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

Update documentation as to the behavior of AGI in 1.6.0 and higher. Also, add

Browse Source 
an OOB message that answers the question of, if AGI no longer shuts down the
connection on hangup, how will FastAGI know when to stop processing the call?


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136859 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-08-09 01:15:38 +00:00
parent 54d9ba7671
commit c5a119d86d
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
res/res_agi.c
View File

@@ -73,19 +73,20 @@ static char *deadsynopsis = "Executes AGI on a hungup channel";
static char *descrip = static char *descrip =
" [E|Dead]AGI(command,args): Executes an Asterisk Gateway Interface compliant\n" " [E|Dead]AGI(command,args): Executes an Asterisk Gateway Interface compliant\n"
"program on a channel. AGI allows Asterisk to launch external programs\n" "program on a channel. AGI allows Asterisk to launch external programs written\n"
"written in any language to control a telephony channel, play audio,\n" "in any language to control a telephony channel, play audio, read DTMF digits,\n"
"read DTMF digits, etc. by communicating with the AGI protocol on stdin\n" "etc. by communicating with the AGI protocol on stdin and stdout.\n"
"and stdout.\n" " As of 1.6.0, this channel will not stop dialplan execution on hangup inside\n"
" This channel will stop dialplan execution on hangup inside of this\n" "of this application. Dialplan execution will continue normally, even upon\n"
"application, except when using DeadAGI. Otherwise, dialplan execution\n" "hangup until the AGI application signals a desire to stop (either by exiting\n"
"will continue normally.\n" "or, in the case of a net script, by closing the connection).\n"
" A locally executed AGI script will receive SIGHUP on hangup from the channel\n" " A locally executed AGI script will receive SIGHUP on hangup from the channel\n"
"except when using DeadAGI. This can be disabled by setting the AGISIGHUP channel\n" "except when using DeadAGI. A fast AGI server will correspondingly receive a\n"
"variable to \"no\" before executing the AGI application.\n" "HANGUP in OOB data. Both of these signals may be disabled by setting the\n"
"AGISIGHUP channel variable to \"no\" before executing the AGI application.\n"
" Using 'EAGI' provides enhanced AGI, with incoming audio available out of band\n" " Using 'EAGI' provides enhanced AGI, with incoming audio available out of band\n"
"on file descriptor 3\n\n" "on file descriptor 3.\n\n"
" Use the CLI command 'agi show' to list available agi commands\n" " Use the CLI command 'agi show' to list available agi commands.\n"
" This application sets the following channel variable upon completion:\n" " This application sets the following channel variable upon completion:\n"
" AGISTATUS The status of the attempt to the run the AGI script\n" " AGISTATUS The status of the attempt to the run the AGI script\n"
" text string, one of SUCCESS | FAILURE | NOTFOUND | HANGUP\n"; " text string, one of SUCCESS | FAILURE | NOTFOUND | HANGUP\n";
@@ -2601,6 +2602,7 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi
/* how many times we'll retry if ast_waitfor_nandfs will return without either /* how many times we'll retry if ast_waitfor_nandfs will return without either
channel or file descriptor in case select is interrupted by a system call (EINTR) */ channel or file descriptor in case select is interrupted by a system call (EINTR) */
int retry = AGI_NANDFS_RETRY; int retry = AGI_NANDFS_RETRY;
const char *sighup;
if (!(readf = fdopen(agi->ctrl, "r"))) { if (!(readf = fdopen(agi->ctrl, "r"))) {
ast_log(LOG_WARNING, "Unable to fdopen file descriptor\n"); ast_log(LOG_WARNING, "Unable to fdopen file descriptor\n");
@@ -2615,8 +2617,11 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi
if (needhup) { if (needhup) {
needhup = 0; needhup = 0;
dead = 1; dead = 1;
if (pid > -1) if (pid > -1) {
kill(pid, SIGHUP); kill(pid, SIGHUP);
} else if (agi->fast) {
send(agi->ctrl, "HANGUP\n", 7, MSG_OOB);
}
} }
ms = -1; ms = -1;
c = ast_waitfor_nandfds(&chan, dead ? 0 : 1, &agi->ctrl, 1, NULL, &outfd, &ms); c = ast_waitfor_nandfds(&chan, dead ? 0 : 1, &agi->ctrl, 1, NULL, &outfd, &ms);
@@ -2698,16 +2703,18 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi
} }
} }
/* Notify process */ /* Notify process */
if (pid > -1) { sighup = pbx_builtin_getvar_helper(chan, "AGISIGHUP");
const char *sighup = pbx_builtin_getvar_helper(chan, "AGISIGHUP"); if (ast_strlen_zero(sighup) || !ast_false(sighup)) {
if (ast_strlen_zero(sighup) || !ast_false(sighup)) { if (pid > -1) {
if (kill(pid, SIGHUP)) { if (kill(pid, SIGHUP)) {
ast_log(LOG_WARNING, "unable to send SIGHUP to AGI process %d: %s\n", pid, strerror(errno)); ast_log(LOG_WARNING, "unable to send SIGHUP to AGI process %d: %s\n", pid, strerror(errno));
} else { /* Give the process a chance to die */ } else { /* Give the process a chance to die */
usleep(1); usleep(1);
} }
waitpid(pid, status, WNOHANG);
} else if (agi->fast) {
send(agi->ctrl, "HANGUP\n", 7, MSG_OOB);
} }
waitpid(pid, status, WNOHANG);
} }
fclose(readf); fclose(readf);
return returnstatus; return returnstatus;