kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_odbc: Allow unload at shutdown.

Browse Source 
This makes it possible for REF_DEBUG to report no leaks when loading
res_odbc.

Change-Id: I1a3dea786bd6e7f4820a6dd5cbaa197fa783ce93
This commit is contained in:
Corey Farrell
2018-08-15 12:31:00 -04:00
parent 61b6d9efa4
commit eb34b881a4
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/res_odbc.c
View File

@@ -996,17 +996,25 @@ static int reload(void)
static int unload_module(void) static int unload_module(void)
{ {
/* Prohibit unloading */ ao2_cleanup(class_container);
return -1; ast_cli_unregister_multiple(cli_odbc, ARRAY_LEN(cli_odbc));
return 0;
} }
static int load_module(void) static int load_module(void)
{ {
if (!(class_container = ao2_container_alloc(1, null_hash_fn, ao2_match_by_addr))) if (!(class_container = ao2_container_alloc(1, null_hash_fn, ao2_match_by_addr))) {
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
if (load_odbc_config() == -1) }
if (load_odbc_config() == -1) {
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
}
ast_module_shutdown_ref(ast_module_info->self);
ast_cli_register_multiple(cli_odbc, ARRAY_LEN(cli_odbc)); ast_cli_register_multiple(cli_odbc, ARRAY_LEN(cli_odbc));
return AST_MODULE_LOAD_SUCCESS; return AST_MODULE_LOAD_SUCCESS;
} }