kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 332654 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r332654 | kmoore | 2011-08-19 14:59:34 -0500 (Fri, 19 Aug 2011) | 8 lines
  
  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/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2011-08-19 20:00:19 +00:00
parent 0f92716dbb
commit 3e89d62884
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/app_confbridge.c
View File

@@ -2623,14 +2623,14 @@ static int func_confbridge_info(struct ast_channel *chan, const char *cmd, char
return -1; return -1;
} }
if (!ao2_container_count(conference_bridges)) { if (!ao2_container_count(conference_bridges)) {
ast_log(LOG_ERROR, "No active conferences.\n"); snprintf(buf, len, "0");
return -1; return 0;
} }
ast_copy_string(tmp.name, args.confno, sizeof(tmp.name)); ast_copy_string(tmp.name, args.confno, sizeof(tmp.name));
bridge = ao2_find(conference_bridges, &tmp, OBJ_POINTER); bridge = ao2_find(conference_bridges, &tmp, OBJ_POINTER);
if (!bridge) { if (!bridge) {
ast_log(LOG_ERROR, "Conference '%s' not found.\n", args.confno); snprintf(buf, len, "0");
return -1; return 0;
} }
/* get the correct count for the type requested */ /* get the correct count for the type requested */
@@ -2654,9 +2654,7 @@ static int func_confbridge_info(struct ast_channel *chan, const char *cmd, char
} else if (!strncasecmp(args.type, "locked", 6)) { } else if (!strncasecmp(args.type, "locked", 6)) {
count = bridge->locked; count = bridge->locked;
} else { } else {
ao2_unlock(bridge); ast_log(LOG_ERROR, "Invalid keyword.\n");
ao2_ref(bridge, -1);
return -1;
} }
snprintf(buf, len, "%d", count); snprintf(buf, len, "%d", count);
ao2_unlock(bridge); ao2_unlock(bridge);