From: Matthew Jordan <mjordan@digium.com>
Date: Wed, 14 Dec 2011 20:51:39 +0000 (+0000)
Subject: Improve error message in CONFBRIDGE_INFO
X-Git-Tag: 11.0.0-beta1~860
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25567299830015c0b87e25d7d2a86b2ab4e744c2;p=thirdparty%2Fasterisk.git

Improve error message in CONFBRIDGE_INFO

Provided a more descriptive error message when a value supplied for the parameter
type is not one of the acceptable values.

(closes issue ASTERISK-18717)
Reported by: Paul Belanger
Patches:
  __20111103-better-confbridge_info-error-msg.txt (License #4999)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@348160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index f0b80967d6..95a025f13d 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -2700,7 +2700,8 @@ static int func_confbridge_info(struct ast_channel *chan, const char *cmd, char
 	} else if (!strncasecmp(args.type, "locked", 6)) {
 		count = bridge->locked;
 	} else {
-		ast_log(LOG_ERROR, "Invalid keyword.\n");
+		ast_log(LOG_ERROR, "Invalid keyword '%s' passed to CONFBRIDGE_INFO.  Should be one of: "
+			"parties, admins, marked, or locked.\n", args.type);
 	}
 	snprintf(buf, len, "%d", count);
 	ao2_unlock(bridge);