Merged revisions 231614 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r231614 | mnicholson | 2009-11-30 15:11:44 -0600 (Mon, 30 Nov 2009) | 8 lines Remove duplicate entries from voicemail format lists. This prevents app_voicemail from entering an infinite loop when the same format is specified twice in the format list. (closes issue #15625) Reported by: Shagg63 Tested by: mnicholson Review: https://reviewboard.asterisk.org/r/429/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@231688 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
mnicholson
parent
8531434222
commit
60d1d4196a
|
|
@ -10617,7 +10617,7 @@ static int load_config(int reload)
|
|||
char *cat;
|
||||
struct ast_variable *var;
|
||||
const char *val;
|
||||
char *q, *stringp;
|
||||
char *q, *stringp, *tmp;
|
||||
int x;
|
||||
int tmpadsi[4];
|
||||
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
|
||||
|
|
@ -10926,8 +10926,16 @@ static int load_config(int reload)
|
|||
}
|
||||
|
||||
val = ast_variable_retrieve(cfg, "general", "format");
|
||||
if (!val)
|
||||
if (!val) {
|
||||
val = "wav";
|
||||
} else {
|
||||
tmp = ast_strdupa(val);
|
||||
val = ast_format_str_reduce(tmp);
|
||||
if (!val) {
|
||||
ast_log(LOG_ERROR, "Error processing format string, defaulting to format 'wav'\n");
|
||||
val = "wav";
|
||||
}
|
||||
}
|
||||
ast_copy_string(vmfmts, val, sizeof(vmfmts));
|
||||
|
||||
skipms = 3000;
|
||||
|
|
|
|||
|
|
@ -40,6 +40,9 @@ extern "C" {
|
|||
struct ast_filestream;
|
||||
struct ast_format;
|
||||
|
||||
/*! 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"
|
||||
#define AST_DIGIT_ANYNUM "0123456789"
|
||||
|
|
@ -325,6 +328,14 @@ int ast_file_init(void);
|
|||
|
||||
#define AST_RESERVED_POINTERS 20
|
||||
|
||||
/*! 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);
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
12
main/app.c
12
main/app.c
|
|
@ -55,7 +55,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|||
AST_THREADSTORAGE_PUBLIC(ast_str_thread_global_buf);
|
||||
|
||||
|
||||
#define MAX_OTHER_FORMATS 10
|
||||
#define AST_MAX_FORMATS 10
|
||||
|
||||
static AST_RWLIST_HEAD_STATIC(groups, ast_group_info);
|
||||
|
||||
|
|
@ -693,8 +693,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 */
|
||||
|
|
@ -747,8 +747,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);
|
||||
|
|
@ -938,7 +938,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++) {
|
||||
|
|
|
|||
60
main/file.c
60
main/file.c
|
|
@ -1347,6 +1347,66 @@ int ast_stream_and_wait(struct ast_channel *chan, const char *file, const char *
|
|||
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_RWLIST_RDLOCK(&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_RWLIST_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_RWLIST_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 char *handle_cli_core_show_file_formats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
||||
{
|
||||
#define FORMAT "%-10s %-10s %-20s\n"
|
||||
|
|
|
|||
Reference in New Issue