kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't re-register CDR module on reload.

Browse Source 
(closes issue #17304)
 Reported by: jnemeth
 Patches: 
       20100507__issue17304.diff.txt uploaded by tilghman (license 14)
 Tested by: jnemeth


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@279410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-07-25 18:21:27 +00:00
parent a3cb74fcd4
commit 927130f81f
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cdr/cdr_odbc.c
View File

@@ -54,6 +54,7 @@ enum {
CONFIG_USEGMTIME = 1 << 1,
CONFIG_DISPOSITIONSTRING = 1 << 2,
CONFIG_HRTIME = 1 << 3,
CONFIG_REGISTERED = 1 << 4,
};
static struct ast_flags config = { 0 };
@@ -242,14 +243,24 @@ static int odbc_load_module(int reload)
ast_verb(3, "cdr_odbc: dsn is %s\n", dsn);
ast_verb(3, "cdr_odbc: table is %s\n", table);
if (!ast_test_flag(&config, CONFIG_REGISTERED)) {
res = ast_cdr_register(name, ast_module_info->description, odbc_log);
if (res) {
ast_log(LOG_ERROR, "cdr_odbc: Unable to register ODBC CDR handling\n");
} else {
ast_set_flag(&config, CONFIG_REGISTERED);
}
}
} while (0);
if (cfg && cfg != CONFIG_STATUS_FILEUNCHANGED && cfg != CONFIG_STATUS_FILEINVALID)
if (ast_test_flag(&config, CONFIG_REGISTERED) && (!cfg || dsn == NULL || table == NULL)) {
ast_cdr_unregister(name);
ast_clear_flag(&config, CONFIG_REGISTERED);
}
if (cfg && cfg != CONFIG_STATUS_FILEUNCHANGED && cfg != CONFIG_STATUS_FILEINVALID) {
ast_config_destroy(cfg);
}
return res;
}