file.c, channel.c: Don't emit warnings if progress received.

Silently ignore AST_CONTROL_PROGRESS where appropriate,
as most control frames already are.

Resolves: #696
(cherry picked from commit 051ddbe72955b95dd4e8c80fd091d1b305a736a3)

diff --git a/main/channel.c b/main/channel.c
index 122f6e55a3dec5cedfdb3f30fb015121010f3ea6..d8741b3a32426fefdfcf72898961d4e4f8cff545 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -3311,6 +3311,7 @@ int ast_waitfordigit_full(struct ast_channel *c, int timeout_ms, const char *bre
                                        ast_channel_clear_flag(c, AST_FLAG_END_DTMF_ONLY);
                                        return res;
                                case AST_CONTROL_PVT_CAUSE_CODE:
+                               case AST_CONTROL_PROGRESS:
                                case AST_CONTROL_RINGING:
                                case AST_CONTROL_ANSWER:
                                case AST_CONTROL_SRCUPDATE:

diff --git a/main/file.c b/main/file.c
index 959da3d945c06414528998462a52e524ec3557ad..e4eacfe1fd0bcf675d78566fa397ec30139a5642 100644 (file)
--- a/main/file.c
+++ b/main/file.c
@@ -1752,6 +1752,7 @@ static int waitstream_core(struct ast_channel *c,
                                        ast_frfree(fr);
                                        ast_channel_clear_flag(c, AST_FLAG_END_DTMF_ONLY);
                                        return -1;
+                               case AST_CONTROL_PROGRESS:
                                case AST_CONTROL_RINGING:
                                case AST_CONTROL_ANSWER:
                                case AST_CONTROL_VIDUPDATE: