[asterisk-commits] mmichelson: trunk r91738 - in /trunk: ./ main/autoservice.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Dec  7 09:40:59 2007
New Revision: 91738

URL: http://svn.digium.com/view/asterisk?view=rev&rev=91738
Log:
Merged revisions 91737 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r91737 | mmichelson | 2007-12-07 09:39:58 -0600 (Fri, 07 Dec 2007) | 7 lines

Hangups that happen during autoservice were not processed appropriately. This is
because a hangup actually causes a NULL frame to be received, not a hangup frame.
Queueing a hangup if we receive a NULL frame during autoservice corrects this problem

(closes issue #11467, reported  by jmls, patched by me)


........

Modified:
    trunk/   (props changed)
    trunk/main/autoservice.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/autoservice.c
URL: http://svn.digium.com/view/asterisk/trunk/main/autoservice.c?view=diff&rev=91738&r1=91737&r2=91738
==============================================================================
--- trunk/main/autoservice.c (original)
+++ trunk/main/autoservice.c Fri Dec  7 09:40:59 2007
@@ -81,8 +81,11 @@
 		if ((chan = ast_waitfor_n(mons, x, &ms))) {
 			struct ast_frame *f = ast_read(chan);
 	
-			if (!f)
+			if (!f) {
+				/* NULL means we got a hangup*/
+				ast_queue_hangup(chan);
 				continue;
+			}
 			
 			/* Do not add a default entry in this switch statement.  Each new
 			 * frame type should be addressed directly as to whether it should