Ignore this ... playing with jira (AST-1)
[asterisk/asterisk.git] / main / app.c
index b00deb8..0eb8591 100644 (file)
@@ -49,9 +49,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' 
@@ -62,7 +64,7 @@ of 'maxlen' or 'size' minus the original strlen() of collect digits.
 */
 int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect, size_t size, int maxlen, int timeout) 
 {
-       struct tone_zone_sound *ts;
+       struct ind_tone_zone_sound *ts;
        int res=0, x=0;
 
        if (maxlen > size)
@@ -73,7 +75,7 @@ int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect,
        else if (!timeout)
                timeout = 5;
        
-       ts = ast_get_indication_tone(chan->zone,"dial");
+       ts = ast_get_indication_tone(chan->zone, "dial");
        if (ts && ts->data[0])
                res = ast_playtones_start(chan, 0, ts->data, 0);
        else 
@@ -85,14 +87,11 @@ int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect,
                        ast_playtones_stop(chan);
                if (res < 1)
                        break;
+               if (res == '#')
+                       break;
                collect[x++] = res;
-               if (!ast_matchmore_extension(chan, context, collect, 1, chan->cid.cid_num)) {
-                       if (collect[x-1] == '#') {
-                               /* Not a valid extension, ending in #, assume the # was to finish dialing */
-                               collect[x-1] = '\0';
-                       }
+               if (!ast_matchmore_extension(chan, context, collect, 1, chan->cid.cid_num))
                        break;
-               }
        }
        if (res >= 0)
                res = ast_exists_extension(chan, context, collect, 1, chan->cid.cid_num) ? 1 : 0;
@@ -115,14 +114,16 @@ int ast_app_getdata(struct ast_channel *c, const char *prompt, char *s, int maxl
        if (maxlen)
                s[0] = '\0';
 
-       if (ast_strlen_zero(prompt))
-               return -1;
+       if (!prompt)
+               prompt="";
 
        filename = ast_strdupa(prompt);
        while ((front = strsep(&filename, "&"))) {
-               res = ast_streamfile(c, front, c->language);
-               if (res)
-                       continue;
+               if (!ast_strlen_zero(front)) {
+                       res = ast_streamfile(c, front, c->language);
+                       if (res)
+                               continue;
+               }
                if (ast_strlen_zero(filename)) {
                        /* set timeouts for the last prompt */
                        fto = c->pbx ? c->pbx->rtimeout * 1000 : 6000;
@@ -541,7 +542,7 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
                if (!beep)
                        d = ast_play_and_wait(chan, playfile);
                if (d > -1)
-                       d = ast_stream_and_wait(chan, "beep", chan->language, "");
+                       d = ast_stream_and_wait(chan, "beep", "");
                if (d < 0)
                        return -1;
        }
@@ -569,7 +570,7 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
 
        end = start = time(NULL);  /* pre-initialize end to be same as start in case we never get into loop */
        for (x = 0; x < fmtcnt; x++) {
-               others[x] = ast_writefile(prepend ? prependfile : recordfile, sfmt[x], comment, O_TRUNC, 0, 0700);
+               others[x] = ast_writefile(prepend ? prependfile : recordfile, sfmt[x], comment, O_TRUNC, 0, AST_FILE_MODE);
                if (option_verbose > 2)
                        ast_verbose(VERBOSE_PREFIX_3 "x=%d, open writing:  %s format: %s, %p\n", x, prepend ? prependfile : recordfile, sfmt[x], others[x]);
 
@@ -757,7 +758,7 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
                ast_log(LOG_WARNING, "Unable to restore format %s to channel '%s'\n", ast_getformatname(rfmt), chan->name);
        }
        if (outmsg == 2) {
-               ast_stream_and_wait(chan, "auth-thankyou", chan->language, "");
+               ast_stream_and_wait(chan, "auth-thankyou", "");
        }
        if (sildet)
                ast_dsp_free(sildet);
@@ -805,61 +806,74 @@ int ast_app_group_split_group(const char *data, char *group, int group_max, char
        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, const char *data)
 {
-       int res=0;
-       char group[80] = "";
-       char category[80] = "";
-
-       if (!ast_app_group_split_group(data, group, sizeof(group), category, sizeof(category))) {
-               pbx_builtin_setvar_helper(chan, category, group);
-       } else
+       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 (!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(const char *group, const char *category)
 {
-       struct ast_channel *chan;
+       struct ast_group_info *gi = NULL;
        int count = 0;
-       const char *test;
-       char cat[80];
-       const char *s;
 
        if (ast_strlen_zero(group))
                return 0;
-
-       s = S_OR(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_channel_unlock(chan);
+       
+       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(const char *groupmatch, const char *category)
 {
+       struct ast_group_info *gi = NULL;
        regex_t regexbuf;
-       struct ast_channel *chan;
        int count = 0;
-       const char *test;
-       char cat[80];
-       const char *s;
 
        if (ast_strlen_zero(groupmatch))
                return 0;
@@ -868,22 +882,64 @@ int ast_app_group_match_get_count(const char *groupmatch, const char *category)
        if (regcomp(&regexbuf, groupmatch, REG_EXTENDED | REG_NOSUB))
                return 0;
 
-       s = S_OR(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(&regexbuf, test, 0, NULL, 0))
+       AST_LIST_LOCK(&groups);
+       AST_LIST_TRAVERSE(&groups, gi, list) {
+               if (!regexec(&regexbuf, gi->group, 0, NULL, 0) && (ast_strlen_zero(category) || !strcasecmp(gi->category, category)))
                        count++;
-               ast_channel_unlock(chan);
        }
+       AST_LIST_UNLOCK(&groups);
 
        regfree(&regexbuf);
 
        return count;
 }
 
+int ast_app_group_update(struct ast_channel *old, struct ast_channel *new)
+{
+       struct ast_group_info *gi = NULL;
+
+       AST_LIST_LOCK(&groups);
+       AST_LIST_TRAVERSE(&groups, gi, list) {
+               if (gi->chan == old)
+                       gi->chan = new;
+       }
+       AST_LIST_UNLOCK(&groups);
+
+       return 0;
+}
+
+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;
@@ -941,7 +997,7 @@ enum AST_LOCK_RESULT ast_lock_path(const char *path)
        }
 
        snprintf(fs, strlen(path) + 19, "%s/.lock-%08lx", path, ast_random());
-       fd = open(fs, O_WRONLY | O_CREAT | O_EXCL, 0600);
+       fd = open(fs, O_WRONLY | O_CREAT | O_EXCL, AST_FILE_MODE);
        if (fd < 0) {
                ast_log(LOG_ERROR, "Unable to create lock file '%s': %s\n", path, strerror(errno));
                return AST_LOCK_PATH_NOT_FOUND;
@@ -1015,14 +1071,14 @@ int ast_record_review(struct ast_channel *chan, const char *playfile, const char
                                cmd = '3';
                                break;
                        } else {
-                               ast_stream_and_wait(chan, "vm-msgsaved", chan->language, "");
+                               ast_stream_and_wait(chan, "vm-msgsaved", "");
                                cmd = 't';
                                return res;
                        }
                case '2':
                        /* Review */
                        ast_verbose(VERBOSE_PREFIX_3 "Reviewing the recording\n");
-                       cmd = ast_stream_and_wait(chan, recordfile, chan->language, AST_DIGIT_ANY);
+                       cmd = ast_stream_and_wait(chan, recordfile, AST_DIGIT_ANY);
                        break;
                case '3':
                        message_exists = 0;
@@ -1097,7 +1153,7 @@ static int ivr_dispatch(struct ast_channel *chan, struct ast_ivr_option *option,
        char *c;
        char *n;
        
-       switch(option->action) {
+       switch (option->action) {
        case AST_ACTION_UPONE:
                return RES_UPONE;
        case AST_ACTION_EXIT:
@@ -1109,14 +1165,14 @@ static int ivr_dispatch(struct ast_channel *chan, struct ast_ivr_option *option,
        case AST_ACTION_NOOP:
                return 0;
        case AST_ACTION_BACKGROUND:
-               res = ast_stream_and_wait(chan, (char *)option->adata, chan->language, AST_DIGIT_ANY);
+               res = ast_stream_and_wait(chan, (char *)option->adata, AST_DIGIT_ANY);
                if (res < 0) {
                        ast_log(LOG_NOTICE, "Unable to find file '%s'!\n", (char *)option->adata);
                        res = 0;
                }
                return res;
        case AST_ACTION_PLAYBACK:
-               res = ast_stream_and_wait(chan, (char *)option->adata, chan->language, "");
+               res = ast_stream_and_wait(chan, (char *)option->adata, "");
                if (res < 0) {
                        ast_log(LOG_NOTICE, "Unable to find file '%s'!\n", (char *)option->adata);
                        res = 0;
@@ -1145,7 +1201,7 @@ static int ivr_dispatch(struct ast_channel *chan, struct ast_ivr_option *option,
                res = 0;
                c = ast_strdupa(option->adata);
                while ((n = strsep(&c, ";"))) {
-                       if ((res = ast_stream_and_wait(chan, n, chan->language,
+                       if ((res = ast_stream_and_wait(chan, n,
                                        (option->action == AST_ACTION_BACKLIST) ? AST_DIGIT_ANY : "")))
                                break;
                }
@@ -1208,8 +1264,8 @@ static int ast_ivr_menu_run_internal(struct ast_channel *chan, struct ast_ivr_me
                        return -1;
                }
        }
-       while(!res) {
-               while(menu->options[pos].option) {
+       while (!res) {
+               while (menu->options[pos].option) {
                        if (!strcasecmp(menu->options[pos].option, exten)) {
                                res = ivr_dispatch(chan, menu->options + pos, exten, cbdata);
                                if (option_debug)