From: George Joseph <gjoseph@digium.com>
Date: Wed, 8 Sep 2021 12:52:43 +0000 (-0600)
Subject: bridge_softmix: Suppress error on topology change failure
X-Git-Tag: 18.7.0-rc1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de19836c24ed8f631db93650963fc8130d808151;p=thirdparty%2Fasterisk.git

bridge_softmix: Suppress error on topology change failure

There are conditions under which a failure to change topology
is expected so there's no need to print an ERROR message.

ASTERISK-29618
Reported by: Alexander

Change-Id: Idc168b8588e018bf3a23769f08c4ad646086d481
---

diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index d51a55f7d1..c7b1d6c8ba 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -666,7 +666,8 @@ static void sfu_topologies_on_join(struct ast_bridge *bridge,
 	ast_trace(-1, "%s: Requesting topology change.\n", ast_channel_name(joiner->chan));
 	res = ast_channel_request_stream_topology_change(joiner->chan, sc->topology, NULL);
 	if (res) {
-		SCOPE_EXIT_LOG_RTN(LOG_ERROR, "%s: Couldn't request topology change\n", ast_channel_name(joiner->chan));
+		/* There are conditions under which this is expected so no need to log an ERROR. */
+		SCOPE_EXIT_RTN("%s: Couldn't request topology change\n", ast_channel_name(joiner->chan));
 	}
 
 	AST_LIST_TRAVERSE(participants, participant, entry) {