[svn-commits] mnicholson: trunk r318143 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Mon May  9 09:11:57 2011
New Revision: 318143

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=318143
Log:
Merged revisions 318142 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r318142 | mnicholson | 2011-05-09 09:09:38 -0500 (Mon, 09 May 2011) | 9 lines
  
  Make indicate/control frames WRITE events on framehooks.  Also, if a framehook
  returns a non-control frame, don't forward it to the channel.
  
  (closes issue #19251)
  Reported by: irroot
  Patches:
        (modified) framehook_indicate.patch2 uploaded by irroot (license 52)
  Tested by: irroot
........

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

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

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=318143&r1=318142&r2=318143
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon May  9 09:11:57 2011
@@ -4323,7 +4323,9 @@
 		awesome_frame = ast_frdup(&frame);
 
 		/* who knows what we will get back! the anticipation is killing me. */
-		if (!(awesome_frame = ast_framehook_list_read_event(chan->framehooks, awesome_frame))) {
+		if (!(awesome_frame = ast_framehook_list_write_event(chan->framehooks, awesome_frame))
+			|| awesome_frame->frametype != AST_FRAME_CONTROL) {
+
 			res = 0;
 			goto indicate_cleanup;
 		}