diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-25 18:52:50 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-25 18:52:50 +0000 |
commit | 46218b546b269f611f3ab9558586e9091e6cc473 (patch) | |
tree | efde09d37f3497fb38ebf4de92dc852dc5724c1e /app.c | |
parent | 16ed3051f748e190ab73a2e326c958af9ab3e9a6 (diff) |
Merge rewritten group counting support. No more storing data on the variable list of the channels. That was bad, mmmk? (issue #7497 reported by sabbathbh)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@61804 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'app.c')
-rw-r--r-- | app.c | 113 |
1 files changed, 78 insertions, 35 deletions
@@ -48,9 +48,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/lock.h" #include "asterisk/indications.h" +#include "asterisk/linkedlists.h" #define MAX_OTHER_FORMATS 10 +static AST_LIST_HEAD_STATIC(groups, ast_group_info); /* ! This function presents a dialtone and reads an extension into 'collect' @@ -1023,61 +1025,74 @@ int ast_app_group_split_group(char *data, char *group, int group_max, char *cate else res = -1; - if (cat) - snprintf(category, category_max, "%s_%s", GROUP_CATEGORY_PREFIX, cat); - else - ast_copy_string(category, GROUP_CATEGORY_PREFIX, category_max); + if (!ast_strlen_zero(cat)) + ast_copy_string(category, cat, category_max); return res; } int ast_app_group_set_channel(struct ast_channel *chan, char *data) { - int res=0; - char group[80] = ""; - char category[80] = ""; + int res = 0; + char group[80] = "", category[80] = ""; + struct ast_group_info *gi = NULL; + size_t len = 0; + + if (ast_app_group_split_group(data, group, sizeof(group), category, sizeof(category))) + return -1; + + /* Calculate memory we will need if this is new */ + len = sizeof(*gi) + strlen(group) + 1; + if (!ast_strlen_zero(category)) + len += strlen(category) + 1; + + AST_LIST_LOCK(&groups); + AST_LIST_TRAVERSE(&groups, gi, list) { + if (gi->chan == chan && !strcasecmp(gi->group, group) && (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) + break; + } - if (!ast_app_group_split_group(data, group, sizeof(group), category, sizeof(category))) { - pbx_builtin_setvar_helper(chan, category, group); - } else + if (!gi && (gi = calloc(1, len))) { + gi->chan = chan; + gi->group = (char *) gi + sizeof(*gi); + strcpy(gi->group, group); + if (!ast_strlen_zero(category)) { + gi->category = (char *) gi + sizeof(*gi) + strlen(group) + 1; + strcpy(gi->category, category); + } + AST_LIST_INSERT_TAIL(&groups, gi, list); + } else { res = -1; + } + + AST_LIST_UNLOCK(&groups); return res; } int ast_app_group_get_count(char *group, char *category) { - struct ast_channel *chan; + struct ast_group_info *gi = NULL; int count = 0; - char *test; - char cat[80]; - char *s; if (ast_strlen_zero(group)) return 0; - s = (!ast_strlen_zero(category)) ? category : GROUP_CATEGORY_PREFIX; - ast_copy_string(cat, s, sizeof(cat)); - - chan = NULL; - while ((chan = ast_channel_walk_locked(chan)) != NULL) { - test = pbx_builtin_getvar_helper(chan, cat); - if (test && !strcasecmp(test, group)) - count++; - ast_mutex_unlock(&chan->lock); + AST_LIST_LOCK(&groups); + AST_LIST_TRAVERSE(&groups, gi, list) { + if (!strcasecmp(gi->group, group) && (ast_strlen_zero(category) || !strcasecmp(gi->category, category))) + count++; } + AST_LIST_UNLOCK(&groups); return count; } int ast_app_group_match_get_count(char *groupmatch, char *category) { + struct ast_group_info *gi = NULL; regex_t regexbuf; - struct ast_channel *chan; int count = 0; - char *test; - char cat[80]; - char *s; if (ast_strlen_zero(groupmatch)) return 0; @@ -1086,22 +1101,50 @@ int ast_app_group_match_get_count(char *groupmatch, char *category) if (regcomp(®exbuf, groupmatch, REG_EXTENDED | REG_NOSUB)) return 0; - s = (!ast_strlen_zero(category)) ? category : GROUP_CATEGORY_PREFIX; - ast_copy_string(cat, s, sizeof(cat)); - - chan = NULL; - while ((chan = ast_channel_walk_locked(chan)) != NULL) { - test = pbx_builtin_getvar_helper(chan, cat); - if (test && !regexec(®exbuf, test, 0, NULL, 0)) + AST_LIST_LOCK(&groups); + AST_LIST_TRAVERSE(&groups, gi, list) { + if (!regexec(®exbuf, gi->group, 0, NULL, 0) && (ast_strlen_zero(category) || !strcasecmp(gi->category, category))) count++; - ast_mutex_unlock(&chan->lock); } + AST_LIST_UNLOCK(&groups); regfree(®exbuf); return count; } +int ast_app_group_discard(struct ast_channel *chan) +{ + struct ast_group_info *gi = NULL; + + AST_LIST_LOCK(&groups); + AST_LIST_TRAVERSE_SAFE_BEGIN(&groups, gi, list) { + if (gi->chan == chan) { + AST_LIST_REMOVE_CURRENT(&groups, list); + free(gi); + } + } + AST_LIST_TRAVERSE_SAFE_END + AST_LIST_UNLOCK(&groups); + + return 0; +} + +int ast_app_group_list_lock(void) +{ + return AST_LIST_LOCK(&groups); +} + +struct ast_group_info *ast_app_group_list_head(void) +{ + return AST_LIST_FIRST(&groups); +} + +int ast_app_group_list_unlock(void) +{ + return AST_LIST_UNLOCK(&groups); +} + unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arraylen) { int argc; |