Merged revisions 270936 via svnmerge from

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

........
  r270936 | pabelanger | 2010-06-16 14:43:22 -0400 (Wed, 16 Jun 2010) | 8 lines

  MSG_OOB flag on HANGUP packet removed.

  Per Tilghman's request on IRC (#asterisk-bugs).

  (closes issue #17506)
  Reported by: brycebaril
  Tested by: pabelanger, tilghman
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@270937 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index b77c7fff9889f33c2a952fd1ebef027b1ab5237c..f200a60c1f8c2cfad00704fc8278b0c28b4cf13e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -948,10 +948,11 @@ Language Support Changes
 AGI Changes
 -----------
   * Added SPEECH commands for speech recognition. A complete listing can be found
-     using agi show.
+    using agi show.
   * If app_stack is loaded, GOSUB is a native AGI command that may be used to
     invoke subroutines in the dialplan.  Note that calling EXEC with Gosub
     does not behave as expected; the native command needs to be used, instead.
+  * No longer support MSG_OOB flag on HANGUP.
 
 Logger changes
 --------------

diff --git a/res/res_agi.c b/res/res_agi.c
index 93fa1f6cc653fe3a39bee526baf13509df06d121..1f9cb80b37bbf9fedcea0d505453e018a2eff1ea 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -340,8 +340,9 @@ static char *descrip =
 "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"
 "except when using DeadAGI. A fast AGI server will correspondingly receive a\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"
+"HANGUP inline with the command dialog. Both of these signals may be disabled\n"
+"by setting the AGISIGHUP channel variable to \"no\" before executing the AGI\n"
+"application.\n"
 "  Using 'EAGI' provides enhanced AGI, with incoming audio available out of band\n"
 "on file descriptor 3.\n\n"
 "  Use the CLI command 'agi show commands' to list available agi commands.\n"
@@ -2888,7 +2889,7 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi
                                if (pid > -1) {
                                        kill(pid, SIGHUP);
                                } else if (agi->fast) {
-                                       send(agi->ctrl, "HANGUP\n", 7, MSG_OOB);
+                                       send(agi->ctrl, "HANGUP\n", 7, 0);
                                }
                        }
                }
@@ -2986,7 +2987,7 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi
                        }
                        waitpid(pid, status, WNOHANG);
                } else if (agi->fast) {
-                       send(agi->ctrl, "HANGUP\n", 7, MSG_OOB);
+                       send(agi->ctrl, "HANGUP\n", 7, 0);
                }
        }
        fclose(readf);