func_frame_drop: Add debug messages for dropped frames.

Add debug messages in scenarios where frames that are usually processed
are dropped or skipped.

Resolves: #1371
(cherry picked from commit 00b6ab22a0175c1c4f39e67a40ccccd24d8d12ce)

diff --git a/funcs/func_frame_drop.c b/funcs/func_frame_drop.c
index 0d679ad9fca606945e1ea2adb08b5700522f578f..38c0d990d4a54f5abe7e3aee4fffa3597c777c73 100644 (file)
--- a/funcs/func_frame_drop.c
+++ b/funcs/func_frame_drop.c
@@ -173,6 +173,7 @@ static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_fram
 {
        int i;
        int drop_frame = 0;
+       char buf[64];
        struct frame_drop_data *framedata = data;
        if (!frame) {
                return frame;
@@ -188,6 +189,7 @@ static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_fram
                        if (frame->subclass.integer == controlframetype2str[i].type) {
                                if (framedata->controlvalues[i]) {
                                        drop_frame = 1;
+                                       ast_frame_subclass2str(frame, buf, sizeof(buf), NULL, 0);
                                }
                                break;
                        }
@@ -197,6 +199,7 @@ static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_fram
                        if (frame->frametype == frametype2str[i].type) {
                                if (framedata->values[i]) {
                                        drop_frame = 1;
+                                       ast_frame_type2str(frame->frametype, buf, sizeof(buf));
                                }
                                break;
                        }
@@ -206,6 +209,7 @@ static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_fram
        if (drop_frame) {
                ast_frfree(frame);
                frame = &ast_null_frame;
+               ast_debug(2, "Dropping %s frame\n", buf);
        }
        return frame;
 }

diff --git a/main/channel.c b/main/channel.c
index 89b2867960a587fb39d617f8662c5bced33d63a9..80a892a6a3f2772924fdf4ae1c00bb20d1b782bb 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -2652,8 +2652,9 @@ int ast_raw_answer_with_stream_topology(struct ast_channel *chan, struct ast_str
                ast_channel_unlock(chan);
                break;
        case AST_STATE_UP:
-               break;
+               /* Fall through */
        default:
+               ast_debug(2, "Skipping answer, since channel state on %s is %s\n", ast_channel_name(chan), ast_state2str(ast_channel_state(chan)));
                break;
        }