[svn-commits] mnicholson: branch 1.6.0 r231691 - in /branches/1.6.0: ./ apps/ include/aster...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Nov 30 15:37:26 CST 2009
Author: mnicholson
Date: Mon Nov 30 15:37:21 2009
New Revision: 231691
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=231691
Log:
Merged revisions 231688 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r231688 | mnicholson | 2009-11-30 15:31:55 -0600 (Mon, 30 Nov 2009) | 15 lines
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/
........
................
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/apps/app_voicemail.c
branches/1.6.0/include/asterisk/file.h
branches/1.6.0/main/app.c
branches/1.6.0/main/file.c
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_voicemail.c?view=diff&rev=231691&r1=231690&r2=231691
==============================================================================
--- branches/1.6.0/apps/app_voicemail.c (original)
+++ branches/1.6.0/apps/app_voicemail.c Mon Nov 30 15:37:21 2009
@@ -9198,7 +9198,7 @@
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 };
@@ -9482,8 +9482,16 @@
}
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;
Modified: branches/1.6.0/include/asterisk/file.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/include/asterisk/file.h?view=diff&rev=231691&r1=231690&r2=231691
==============================================================================
--- branches/1.6.0/include/asterisk/file.h (original)
+++ branches/1.6.0/include/asterisk/file.h Mon Nov 30 15:37:21 2009
@@ -39,6 +39,9 @@
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"
@@ -315,6 +318,14 @@
*/
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);
+
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif
Modified: branches/1.6.0/main/app.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/app.c?view=diff&rev=231691&r1=231690&r2=231691
==============================================================================
--- branches/1.6.0/main/app.c (original)
+++ branches/1.6.0/main/app.c Mon Nov 30 15:37:21 2009
@@ -45,7 +45,7 @@
#include "asterisk/linkedlists.h"
#include "asterisk/strings.h"
-#define MAX_OTHER_FORMATS 10
+#define AST_MAX_FORMATS 10
static AST_RWLIST_HEAD_STATIC(groups, ast_group_info);
@@ -575,8 +575,8 @@
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 */
@@ -622,8 +622,8 @@
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);
@@ -805,7 +805,7 @@
}
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++) {
Modified: branches/1.6.0/main/file.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/file.c?view=diff&rev=231691&r1=231690&r2=231691
==============================================================================
--- branches/1.6.0/main/file.c (original)
+++ branches/1.6.0/main/file.c Mon Nov 30 15:37:21 2009
@@ -1335,6 +1335,66 @@
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"
More information about the svn-commits
mailing list