Remove duplicate entries from voicemail format lists. This prevents app_voicemail...

(closes issue #15625)
Reported by: Shagg63
Tested by: mnicholson

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

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index ff577180e0bcc42d8bd9f5eb9a8fa8b3434330f6..d674e9633440475a16bfa37e224c18dac9203980 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -8333,7 +8333,7 @@ static int load_config(void)
        const char *astforcename;
        const char *astforcegreet;
        const char *s;
-       char *q,*stringp;
+       char *q,*stringp, *tmp;
        const char *dialoutcxt = NULL;
        const char *callbackcxt = NULL; 
        const char *exitcxt = NULL;     
@@ -8542,8 +8542,17 @@ static int load_config(void)
                        }
                }
                fmt = ast_variable_retrieve(cfg, "general", "format");
-               if (!fmt)
+               if (!fmt) {
                        fmt = "wav";    
+               } else {
+                       tmp = ast_strdupa(fmt);
+                       fmt = ast_format_str_reduce(tmp);
+                       if (!fmt) {
+                               ast_log(LOG_ERROR, "Error processing format string, defaulting to format 'wav'\n");
+                               fmt = "wav";
+                       }
+               }
+
                ast_copy_string(vmfmts, fmt, sizeof(vmfmts));
 
                skipms = 3000;

diff --git a/include/asterisk/file.h b/include/asterisk/file.h
index 636309bc4ef94540b66369f2a06bbbf7f99b43b1..4b8c8fad95e62b87f6602b536e517eaedbcdf627 100644 (file)
--- a/include/asterisk/file.h
+++ b/include/asterisk/file.h
@@ -35,6 +35,8 @@
 extern "C" {
 #endif
 
+/*! The maximum number of formats we expect to see in a format string */
+#define AST_MAX_FORMATS 10
 
 /*! Convenient for waiting */
 #define AST_DIGIT_ANY "0123456789#*ABCD"
@@ -402,6 +404,14 @@ off_t ast_tellstream(struct ast_filestream *fs);
  */ 
 struct ast_frame *ast_readframe(struct ast_filestream *s);
 
+/*! Remove duplicate formats from a format string. */
+/*!
+ * \param fmts a format string, this string will be modified
+ * \retval NULL error
+ * \return a pointer to the reduced format string, this is a pointer to fmts
+ */
+char *ast_format_str_reduce(char *fmts);
+
 /*! Initialize file stuff */
 /*!
  * Initializes all the various file stuff.  Basically just registers the cli stuff

diff --git a/main/app.c b/main/app.c
index 2c448d549265e2239d11d173d5b88af5ffd54180..2beee00a36b2c6b461d0b24e56cbb322a26efa92 100644 (file)
--- a/main/app.c
+++ b/main/app.c
@@ -51,7 +51,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/indications.h"
 #include "asterisk/linkedlists.h"
 
-#define MAX_OTHER_FORMATS 10
+#define AST_MAX_FORMATS 10
 
 static AST_LIST_HEAD_STATIC(groups, ast_group_info);
 
@@ -507,8 +507,8 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
        char *fmts;
        char comment[256];
        int x, fmtcnt = 1, res = -1, outmsg = 0;
-       struct ast_filestream *others[MAX_OTHER_FORMATS];
-       char *sfmt[MAX_OTHER_FORMATS];
+       struct ast_filestream *others[AST_MAX_FORMATS];
+       char *sfmt[AST_MAX_FORMATS];
        char *stringp = NULL;
        time_t start, end;
        struct ast_dsp *sildet = NULL;   /* silence detector dsp */
@@ -556,8 +556,8 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
        sfmt[0] = ast_strdupa(fmts);
 
        while ((fmt = strsep(&stringp, "|"))) {
-               if (fmtcnt > MAX_OTHER_FORMATS - 1) {
-                       ast_log(LOG_WARNING, "Please increase MAX_OTHER_FORMATS in app.c\n");
+               if (fmtcnt > AST_MAX_FORMATS - 1) {
+                       ast_log(LOG_WARNING, "Please increase AST_MAX_FORMATS in file.h\n");
                        break;
                }
                sfmt[fmtcnt++] = ast_strdupa(fmt);
@@ -747,7 +747,7 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
        }
 
        if (prepend && outmsg) {
-               struct ast_filestream *realfiles[MAX_OTHER_FORMATS];
+               struct ast_filestream *realfiles[AST_MAX_FORMATS];
                struct ast_frame *fr;
 
                for (x = 0; x < fmtcnt; x++) {

diff --git a/main/file.c b/main/file.c
index 57282c3169672065930fe25a13ddae68aea6f020..6631112c4f6f2d85b3acd12b7e539a07cf4c76ec 100644 (file)
--- a/main/file.c
+++ b/main/file.c
@@ -1358,6 +1358,66 @@ int ast_stream_and_wait(struct ast_channel *chan, const char *file,
         return res;
 } 
 
+char *ast_format_str_reduce(char *fmts)
+{
+       struct ast_format *f;
+       struct ast_format *fmts_ptr[AST_MAX_FORMATS];
+       char *fmts_str[AST_MAX_FORMATS];
+       char *stringp, *type;
+       char *orig = fmts;
+       int i, j, x, found;
+       int len = strlen(fmts) + 1;
+
+       if (AST_LIST_LOCK(&formats)) {
+               ast_log(LOG_WARNING, "Unable to lock format list\n");
+               return NULL;
+       }
+
+       stringp = ast_strdupa(fmts);
+
+       for (x = 0; (type = strsep(&stringp, "|")) && x < AST_MAX_FORMATS; x++) {
+               AST_LIST_TRAVERSE(&formats, f, list) {
+                       if (exts_compare(f->exts, type)) {
+                               found = 1;
+                               break;
+                       }
+               }
+
+               fmts_str[x] = type;
+               if (found) {
+                       fmts_ptr[x] = f;
+               } else {
+                       fmts_ptr[x] = NULL;
+               }
+       }
+       AST_LIST_UNLOCK(&formats);
+
+       for (i = 0; i < x; i++) {
+               /* special handling for the first entry */
+               if (i == 0) {
+                       fmts += snprintf(fmts, len, "%s", fmts_str[i]);
+                       len -= (fmts - orig);
+                       continue;
+               }
+
+               found = 0;
+               for (j = 0; j < i; j++) {
+                       /* this is a duplicate */
+                       if (fmts_ptr[j] == fmts_ptr[i]) {
+                               found = 1;
+                               break;
+                       }
+               }
+
+               if (!found) {
+                       fmts += snprintf(fmts, len, "|%s", fmts_str[i]);
+                       len -= (fmts - orig);
+               }
+       }
+
+       return orig;
+}
+
 static int show_file_formats(int fd, int argc, char *argv[])
 {
 #define FORMAT "%-10s %-10s %-20s\n"