From: Joshua Colp <jcolp@digium.com>
Date: Wed, 5 Sep 2018 11:39:40 +0000 (+0000)
Subject: core: Don't stop generators when writing RTCP frames.
X-Git-Tag: 15.7.0-rc1~56^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86e079fab97381e5397b480124a1ca86fe47b01f;p=thirdparty%2Fasterisk.git

core: Don't stop generators when writing RTCP frames.

Generators provide such functionality as tone generation or
silence generation. RTCP frames provide RTCP information and
should not stop generators from operating.

ASTERISK-28005

Change-Id: Ieadada07b068a7aa426e8763f1b73a18e1ac34a9
---

diff --git a/main/channel.c b/main/channel.c
index 140d8e90e3..8e552876a0 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -5051,7 +5051,7 @@ int ast_write_stream(struct ast_channel *chan, int stream_num, struct ast_frame
 		goto done;
 	}
 
-	if (ast_channel_generatordata(chan) && (!fr->src || strcasecmp(fr->src, "ast_prod"))) {
+	if (ast_channel_generatordata(chan) && (fr->frametype != AST_FRAME_RTCP) && (!fr->src || strcasecmp(fr->src, "ast_prod"))) {
 		if (ast_test_flag(ast_channel_flags(chan), AST_FLAG_WRITE_INT)) {
 				ast_deactivate_generator(chan);
 		} else {