[svn-commits] mnicholson: branch 1.8 r318142 - /branches/1.8/main/channel.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Mon May  9 09:09:38 2011
New Revision: 318142

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=318142
Log:
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:
    branches/1.8/main/channel.c

Modified: branches/1.8/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/channel.c?view=diff&rev=318142&r1=318141&r2=318142
==============================================================================
--- branches/1.8/main/channel.c (original)
+++ branches/1.8/main/channel.c Mon May  9 09:09:38 2011
@@ -4268,7 +4268,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;
 		}