diff options
author | Corey Farrell <git@cfware.com> | 2016-01-09 14:28:31 -0500 |
---|---|---|
committer | Corey Farrell <git@cfware.com> | 2016-01-09 13:39:00 -0600 |
commit | a5406b1f9e5fdad87a91c82d6ee39249472bd0dc (patch) | |
tree | 7054976004b95392d3cfc8d8daa8bb51eb2a90b4 | |
parent | 573b37c6581b54cfe80dfd9a956c29c33f11f4bd (diff) |
res_crypto: Perform cleanup at shutdown.
This change causes res_crypto to unregister CLI at shutdown while still
preventing the module from being unloaded.
ASTERISK-25673 #close
Change-Id: Ie5d57338dc2752abfc0dd05d0eec86413f2304fc
-rw-r--r-- | res/res_crypto.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/res/res_crypto.c b/res/res_crypto.c index 78b8df209..168342791 100644 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -652,13 +652,17 @@ static int load_module(void) } else { crypto_load(-1, -1); } + + /* This prevents dlclose from ever running, but allows CLI cleanup at shutdown. */ + ast_module_shutdown_ref(ast_module_info->self); return AST_MODULE_LOAD_SUCCESS; } static int unload_module(void) { - /* Can't unload this once we're loaded */ - return -1; + ast_cli_unregister_multiple(cli_crypto, ARRAY_LEN(cli_crypto)); + + return 0; } /* needs usecount semantics defined */ |