diff options
| author | Corey Farrell <git@cfware.com> | 2018-02-16 22:11:42 -0500 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2018-03-14 05:20:12 -0400 |
| commit | 572a508ef2ae7cd86e0ffd8ad6d1c5997e988c26 (patch) | |
| tree | a0dcfa18f8a4a9d3e87eac3b2a7df33ac2fbcad6 /funcs | |
| parent | fee929c8acd788a77982b537953bf4053242057e (diff) | |
loader: Convert reload_classes to built-in modules.
* acl (named_acl.c)
* cdr
* cel
* ccss
* dnsmgr
* dsp
* enum
* extconfig (config.c)
* features
* http
* indications
* logger
* manager
* plc
* sounds
* udptl
These modules are now loaded at appropriate time by the module loader.
Unlike loadable modules these use AST_MODULE_LOAD_FAILURE on error so
the module loader will abort startup on failure of these modules.
Some of these modules are still initialized or shutdown from outside the
module loader. logger.c is initialized very early and shutdown very
late, manager.c is initialized by the module loader but is shutdown by
the Asterisk core (too much uses it without holding references).
Change-Id: I371a9a45064f20026c492623ea8062d02a1ab97f
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_callcompletion.c | 7 | ||||
| -rw-r--r-- | funcs/func_cdr.c | 7 | ||||
| -rw-r--r-- | funcs/func_enum.c | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/funcs/func_callcompletion.c b/funcs/func_callcompletion.c index ed5238c1f..37ba38ce4 100644 --- a/funcs/func_callcompletion.c +++ b/funcs/func_callcompletion.c @@ -126,4 +126,9 @@ static int load_module(void) return ast_custom_function_register(&cc_function) == 0 ? AST_MODULE_LOAD_SUCCESS : AST_MODULE_LOAD_DECLINE; } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Call Control Configuration Function"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Call Control Configuration Function", + .support_level = AST_MODULE_SUPPORT_CORE, + .load = load_module, + .unload = unload_module, + .requires = "ccss", +); diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c index 2dd9f1578..d7bc21145 100644 --- a/funcs/func_cdr.c +++ b/funcs/func_cdr.c @@ -704,4 +704,9 @@ static int load_module(void) return AST_MODULE_LOAD_SUCCESS; } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Call Detail Record (CDR) dialplan functions"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Call Detail Record (CDR) dialplan functions", + .support_level = AST_MODULE_SUPPORT_CORE, + .load = load_module, + .unload = unload_module, + .requires = "cdr", +); diff --git a/funcs/func_enum.c b/funcs/func_enum.c index 6929e3ccd..f649e0f29 100644 --- a/funcs/func_enum.c +++ b/funcs/func_enum.c @@ -472,4 +472,9 @@ static int load_module(void) return res; } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ENUM related dialplan functions"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ENUM related dialplan functions", + .support_level = AST_MODULE_SUPPORT_CORE, + .load = load_module, + .unload = unload_module, + .requires = "enum", +); |