diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-21 16:14:05 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-21 16:14:05 +0000 |
| commit | eca1499f852f123aa44a48ecd9e36e1147ba4504 (patch) | |
| tree | 1d73cd44e82b94353f3eddaa10857343e9fc0e73 /cdr | |
| parent | dcd0c6d2b3a735b988f9168e0da7ba38c5d52ca7 (diff) | |
Merged revisions 202262 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r202262 | russell | 2009-06-21 11:11:48 -0500 (Sun, 21 Jun 2009) | 2 lines
Fix possibility of crashiness during reload in custom fields handling.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@202263 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
| -rw-r--r-- | cdr/cdr_manager.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c index babe2d965..77d9be064 100644 --- a/cdr/cdr_manager.c +++ b/cdr/cdr_manager.c @@ -46,7 +46,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static char *name = "cdr_manager"; static int enablecdr = 0; -struct ast_str *customfields; + +static struct ast_str *customfields; +AST_RWLOCK_DEFINE_STATIC(customfields_lock); static int manager_log(struct ast_cdr *cdr); @@ -63,11 +65,6 @@ static int load_config(int reload) return 0; } - if (reload && customfields) { - ast_free(customfields); - } - customfields = NULL; - if (!cfg) { /* Standard configuration */ ast_log(LOG_WARNING, "Failed to load configuration file. Module not activated.\n"); @@ -77,6 +74,15 @@ static int load_config(int reload) return -1; } + if (reload) { + ast_rwlock_wrlock(&customfields_lock); + } + + if (reload && customfields) { + ast_free(customfields); + customfields = NULL; + } + while ( (cat = ast_category_browse(cfg, cat)) ) { if (!strcasecmp(cat, "general")) { v = ast_variable_browse(cfg, cat); @@ -105,6 +111,10 @@ static int load_config(int reload) } } + if (reload) { + ast_rwlock_unlock(&customfields_lock); + } + ast_config_destroy(cfg); if (enablecdr && !newenablecdr) @@ -139,13 +149,14 @@ static int manager_log(struct ast_cdr *cdr) ast_localtime(&cdr->end, &timeresult, NULL); ast_strftime(strEndTime, sizeof(strEndTime), DATE_FORMAT, &timeresult); - buf[0] = 0; - /* Custom fields handling */ - if (customfields != NULL && customfields->used > 0) { + buf[0] = '\0'; + ast_rwlock_rdlock(&customfields_lock); + if (customfields && ast_str_strlen(customfields)) { memset(&dummy, 0, sizeof(dummy)); dummy.cdr = cdr; pbx_substitute_variables_helper(&dummy, customfields->str, buf, sizeof(buf) - 1); } + ast_rwlock_unlock(&customfields_lock); manager_event(EVENT_FLAG_CDR, "Cdr", "AccountCode: %s\r\n" |