[svn-commits] kmoore: branch 10 r332654 - /branches/10/apps/app_confbridge.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Fri Aug 19 14:59:34 2011
New Revision: 332654

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=332654
Log:
Make CONFBRIDGE_INFO behave more nicely

CONFBRIDGE_INFO doesn't behave as well in edge cases as MEETME_INFO.  With this
patch, CONFBRIDGE_INFO should behave in a much more reasonable manner when
presented with invalid conferences and keywords.

Review: https://reviewboard.asterisk.org/r/1359/

Modified:
    branches/10/apps/app_confbridge.c

Modified: branches/10/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/apps/app_confbridge.c?view=diff&rev=332654&r1=332653&r2=332654
==============================================================================
--- branches/10/apps/app_confbridge.c (original)
+++ branches/10/apps/app_confbridge.c Fri Aug 19 14:59:34 2011
@@ -2623,14 +2623,14 @@
 		return -1;
 	}
 	if (!ao2_container_count(conference_bridges)) {
-		ast_log(LOG_ERROR, "No active conferences.\n");
-		return -1;
+		snprintf(buf, len, "0");
+		return 0;
 	}
 	ast_copy_string(tmp.name, args.confno, sizeof(tmp.name));
 	bridge = ao2_find(conference_bridges, &tmp, OBJ_POINTER);
 	if (!bridge) {
-		ast_log(LOG_ERROR, "Conference '%s' not found.\n", args.confno);
-		return -1;
+		snprintf(buf, len, "0");
+		return 0;
 	}
 
 	/* get the correct count for the type requested */
@@ -2654,9 +2654,7 @@
 	} else if (!strncasecmp(args.type, "locked", 6)) {
 		count = bridge->locked;
 	} else {
-		ao2_unlock(bridge);
-		ao2_ref(bridge, -1);
-		return -1;
+		ast_log(LOG_ERROR, "Invalid keyword.\n");
 	}
 	snprintf(buf, len, "%d", count);
 	ao2_unlock(bridge);