[asterisk-commits] pabelanger: branch 1.6.2 r270937 - in /branches/1.6.2: ./ CHANGES res/res_agi.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Wed Jun 16 13:50:11 2010
New Revision: 270937

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=270937
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/CHANGES
    branches/1.6.2/res/res_agi.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/CHANGES
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/CHANGES?view=diff&rev=270937&r1=270936&r2=270937
==============================================================================
--- branches/1.6.2/CHANGES (original)
+++ branches/1.6.2/CHANGES Wed Jun 16 13:50:11 2010
@@ -948,10 +948,11 @@
 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
 --------------

Modified: branches/1.6.2/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/res_agi.c?view=diff&rev=270937&r1=270936&r2=270937
==============================================================================
--- branches/1.6.2/res/res_agi.c (original)
+++ branches/1.6.2/res/res_agi.c Wed Jun 16 13:50:11 2010
@@ -340,8 +340,9 @@
 "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 @@
 				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 @@
 			}
 			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);