[svn-commits] twilson: trunk r336315 - in /trunk: ./ funcs/func_frame_trace.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Fri Sep 16 17:11:01 2011
New Revision: 336315

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

................
  r336313 | twilson | 2011-09-16 17:07:00 -0500 (Fri, 16 Sep 2011) | 12 lines
  
  Merged revisions 336312 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r336312 | twilson | 2011-09-16 17:04:25 -0500 (Fri, 16 Sep 2011) | 5 lines
    
    Add missing frame types to func_frame_trace
    
    Also casts control frames to the proper enum so that the compile will catch
    new additions.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/funcs/func_frame_trace.c

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

Modified: trunk/funcs/func_frame_trace.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_frame_trace.c?view=diff&rev=336315&r1=336314&r2=336315
==============================================================================
--- trunk/funcs/func_frame_trace.c (original)
+++ trunk/funcs/func_frame_trace.c Fri Sep 16 17:11:01 2011
@@ -227,7 +227,7 @@
 		break;
 	case AST_FRAME_CONTROL:
 		ast_verbose("FrameType: CONTROL\n");
-		switch (frame->subclass.integer) {
+		switch ((enum ast_control_frame_type) frame->subclass.integer) {
 		case AST_CONTROL_HANGUP:
 			ast_verbose("SubClass: HANGUP\n");
 			break;
@@ -318,7 +318,14 @@
 		case AST_CONTROL_INCOMPLETE:
 			ast_verbose("SubClass: INCOMPLETE\n");
 			break;
-		}
+		 case AST_CONTROL_END_OF_Q:
+			ast_verbose("SubClass: END_OF_Q\n");
+			break;
+		case AST_CONTROL_UPDATE_RTP_PEER:
+			ast_verbose("SubClass: UPDATE_RTP_PEER\n");
+			break;
+		}
+		
 		if (frame->subclass.integer == -1) {
 			ast_verbose("SubClass: %d\n", frame->subclass.integer);
 		}