From: Naveen Albert <asterisk@phreaknet.org>
Date: Wed, 10 Apr 2024 00:01:36 +0000 (-0400)
Subject: file.c, channel.c: Don't emit warnings if progress received.
X-Git-Tag: 18.23.0-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6576f877e5ccc49ab0023f7fa3ab7c04f0eac457;p=thirdparty%2Fasterisk.git

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 76b2410143709fee7e939f5e0a77fbb0a3819298)
---

diff --git a/main/channel.c b/main/channel.c
index 6c69680017..57533c82fb 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3318,6 +3318,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 959da3d945..e4eacfe1fd 100644
--- 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: