From 8aaa93e624b9fc30ff78c6fb6db1227eb86f8cba Mon Sep 17 00:00:00 2001
From: Steve Murphy <murf@digium.com>
Date: Thu, 21 Jun 2007 20:28:04 +0000
Subject: [PATCH] Merged revisions 70841 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r70841 | murf | 2007-06-21 14:19:36 -0600 (Thu, 21 Jun 2007) | 9 lines
Merged revisions 70804 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r70804 | murf | 2007-06-21 13:13:17 -0600 (Thu, 21 Jun 2007) | 1 line
it was pointed out that the cdr_custom config load could get a lock, and under certain circumstances, would never release it. I also noted that the situation where more than one mapping spec was warned about, but did not ignore further mappings as it had promised. I think I have fixed both situations.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70857 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
cdr/cdr_custom.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index 995531761b..80cd47ecf0 100644
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -72,21 +72,22 @@ static int load_config(int reload)
strcpy(format, "");
strcpy(master, "");
+ ast_mutex_lock(&lock);
if((cfg = ast_config_load("cdr_custom.conf"))) {
var = ast_variable_browse(cfg, "mappings");
while(var) {
- ast_mutex_lock(&lock);
if (!ast_strlen_zero(var->name) && !ast_strlen_zero(var->value)) {
if (strlen(var->value) > (sizeof(format) - 1))
ast_log(LOG_WARNING, "Format string too long, will be truncated, at line %d\n", var->lineno);
ast_copy_string(format, var->value, sizeof(format) - 1);
strcat(format,"\n");
snprintf(master, sizeof(master),"%s/%s/%s", ast_config_AST_LOG_DIR, name, var->name);
- ast_mutex_unlock(&lock);
+ if (var->next) {
+ ast_log(LOG_NOTICE, "Sorry, only one mapping is supported at this time, mapping '%s' will be ignored at line %d.\n", var->next->name, var->next->lineno);
+ break;
+ }
} else
ast_log(LOG_NOTICE, "Mapping must have both filename and format at line %d\n", var->lineno);
- if (var->next)
- ast_log(LOG_NOTICE, "Sorry, only one mapping is supported at this time, mapping '%s' will be ignored at line %d.\n", var->next->name, var->next->lineno);
var = var->next;
}
ast_config_destroy(cfg);
@@ -97,6 +98,7 @@ static int load_config(int reload)
else
ast_log(LOG_WARNING, "Failed to load configuration file. Module not activated.\n");
}
+ ast_mutex_unlock(&lock);
return res;
}
--
GitLab