[svn-commits] russell: branch 1.6.0 r233112 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Dec  4 11:20:56 2009
New Revision: 233112

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=233112
Log:
Merged revisions 233100 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r233100 | russell | 2009-12-04 11:18:22 -0600 (Fri, 04 Dec 2009) | 14 lines
  
  Merged revisions 233092 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r233092 | russell | 2009-12-04 11:12:47 -0600 (Fri, 04 Dec 2009) | 7 lines
    
    Only do frame payload check for HOLD frames.
    
    This code was added for helping to debug the source of invalid HOLD frames.
    However, a side effect of this is that it will incorrectly report errors for
    frames that have an integer payload.  Make the check for this block specific
    to the HOLD frame case.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/channel.c

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

Modified: branches/1.6.0/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=233112&r1=233111&r2=233112
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Fri Dec  4 11:20:56 2009
@@ -3018,14 +3018,14 @@
 		ast_frame_dump(chan->name, f, "<<");
 	chan->fin = FRAMECOUNT_INC(chan->fin);
 
-	if (f && f->datalen == 0 && f->data) {
+	if (f && f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_HOLD && f->datalen == 0 && f->data) {
 		/* fix invalid pointer */
 		f->data = NULL;
 #ifdef AST_DEVMODE
-		ast_log(LOG_ERROR, "Found frame with src '%s' on channel '%s' with datalen zero, but non-null data pointer!\n", f->src, chan->name);
+		ast_log(LOG_ERROR, "Found HOLD frame with src '%s' on channel '%s' with datalen zero, but non-null data pointer!\n", f->src, chan->name);
 		ast_frame_dump(chan->name, f, "<<");
 #else
-		ast_debug(3, "Found frame with src '%s' on channel '%s' with datalen zero, but non-null data pointer!\n", f->src, chan->name);
+		ast_debug(3, "Found HOLD frame with src '%s' on channel '%s' with datalen zero, but non-null data pointer!\n", f->src, chan->name);
 #endif
 	}