[asterisk-commits] "confbridge show profile bridge" does not output "sfu" when ... (asterisk[master])

[SVN commits to the Asterisk project]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/8814 )

Change subject: "confbridge show profile bridge" does not output "sfu" when video_mode is sfu
......................................................................

"confbridge show profile bridge" does not output "sfu" when video_mode is sfu

Fixes a bug on the "confbridge show profile bridge" cli command
that showed "video_mode=no video" when video_mode was set
to "sfu"

ASTERISK-27418  #close

Change-Id: I481e3172c7f872664c7ac7809879d541c9f031e9
---
M apps/confbridge/conf_config_parser.c
1 file changed, 13 insertions(+), 8 deletions(-)

Approvals:
  Matthew Fredrickson: Looks good to me, but someone else must approve
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  Richard Mudgett: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c
index c143e39..8738319 100644
--- a/apps/confbridge/conf_config_parser.c
+++ b/apps/confbridge/conf_config_parser.c
@@ -1673,8 +1673,10 @@
 	ast_cli(a->fd,"Registration context: %s\n", b_profile.regcontext);
 
 	switch (b_profile.flags
-		& (BRIDGE_OPT_VIDEO_SRC_LAST_MARKED | BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED
-			| BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER)) {
+		& (BRIDGE_OPT_VIDEO_SRC_LAST_MARKED |
+			BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED |
+			BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER |
+			BRIDGE_OPT_VIDEO_SRC_SFU)) {
 	case BRIDGE_OPT_VIDEO_SRC_LAST_MARKED:
 		ast_cli(a->fd, "Video Mode:           last_marked\n");
 		break;
@@ -1683,6 +1685,9 @@
 		break;
 	case BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER:
 		ast_cli(a->fd, "Video Mode:           follow_talker\n");
+		break;
+	case BRIDGE_OPT_VIDEO_SRC_SFU:
+		ast_cli(a->fd, "Video Mode:           sfu\n");
 		break;
 	case 0:
 		ast_cli(a->fd, "Video Mode:           no video\n");
@@ -2030,12 +2035,6 @@
 				| BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER
 				| BRIDGE_OPT_VIDEO_SRC_SFU,
 			BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER);
-	} else if (!strcasecmp(var->value, "none")) {
-		ast_clear_flag(b_profile,
-			BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED
-				| BRIDGE_OPT_VIDEO_SRC_LAST_MARKED
-				| BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER
-				| BRIDGE_OPT_VIDEO_SRC_SFU);
 	} else if (!strcasecmp(var->value, "sfu")) {
 		ast_set_flags_to(b_profile,
 			BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED
@@ -2043,6 +2042,12 @@
 				| BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER
 				| BRIDGE_OPT_VIDEO_SRC_SFU,
 			BRIDGE_OPT_VIDEO_SRC_SFU);
+	} else if (!strcasecmp(var->value, "none")) {
+		ast_clear_flag(b_profile,
+			BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED
+				| BRIDGE_OPT_VIDEO_SRC_LAST_MARKED
+				| BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER
+				| BRIDGE_OPT_VIDEO_SRC_SFU);
 	} else {
 		return -1;
 	}

-- 
To view, visit https://gerrit.asterisk.org/8814
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I481e3172c7f872664c7ac7809879d541c9f031e9
Gerrit-Change-Number: 8814
Gerrit-PatchSet: 2
Gerrit-Owner: Chris Savinovich <csavinovich at digium.com>
Gerrit-Reviewer: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Matthew Fredrickson <creslin at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-commits/attachments/20180419/05dde014/attachment.html>