Merged revisions 336313 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Fri, 16 Sep 2011 22:11:01 +0000 (22:11 +0000)
committerTerry Wilson <twilson@digium.com>
Fri, 16 Sep 2011 22:11:01 +0000 (22:11 +0000)
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.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336315 65c4cc65-6c06-0410-ace0-fbb531ad65f3

funcs/func_frame_trace.c

index 61582a6..1cfc8ea 100644 (file)
@@ -227,7 +227,7 @@ static void print_frame(struct ast_frame *frame)
                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 @@ static void print_frame(struct ast_frame *frame)
                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);
                }