From 9cfdb81e913a8dd363ca4570b4eb4137de3b5837 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Sun, 19 Nov 2017 17:30:49 -0500 Subject: loader: Add dependency fields to module structures. * Declare 'requires' and 'enhances' text fields on module info structure. * Rename 'nonoptreq' to 'optional_modules'. * Update doxygen comments. Still need to investigate dependencies among modules I cannot compile. Change-Id: I3ad9547a0a6442409ff4e352a6d897bef2cc04bf --- funcs/func_aes.c | 2 +- funcs/func_pjsip_aor.c | 7 ++++++- funcs/func_pjsip_contact.c | 7 ++++++- funcs/func_pjsip_endpoint.c | 7 ++++++- 4 files changed, 19 insertions(+), 4 deletions(-) (limited to 'funcs') diff --git a/funcs/func_aes.c b/funcs/func_aes.c index 7208cd4c8..af3f257e5 100644 --- a/funcs/func_aes.c +++ b/funcs/func_aes.c @@ -180,5 +180,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "AES dialplan functions", .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, - .nonoptreq = "res_crypto", + .requires = "res_crypto", ); diff --git a/funcs/func_pjsip_aor.c b/funcs/func_pjsip_aor.c index 799e9e4ed..589f667af 100644 --- a/funcs/func_pjsip_aor.c +++ b/funcs/func_pjsip_aor.c @@ -181,4 +181,9 @@ static int load_module(void) return ast_custom_function_register(&pjsip_aor_function); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Get information about a PJSIP AOR"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Get information about a PJSIP AOR", + .support_level = AST_MODULE_SUPPORT_CORE, + .load = load_module, + .unload = unload_module, + .requires = "res_pjsip", +); diff --git a/funcs/func_pjsip_contact.c b/funcs/func_pjsip_contact.c index c8403655a..fac4cb68c 100644 --- a/funcs/func_pjsip_contact.c +++ b/funcs/func_pjsip_contact.c @@ -198,4 +198,9 @@ static int load_module(void) return ast_custom_function_register(&pjsip_contact_function); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Get information about a PJSIP contact"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Get information about a PJSIP contact", + .support_level = AST_MODULE_SUPPORT_CORE, + .load = load_module, + .unload = unload_module, + .requires = "res_pjsip", +); diff --git a/funcs/func_pjsip_endpoint.c b/funcs/func_pjsip_endpoint.c index a64d93b1e..e4a6abab3 100644 --- a/funcs/func_pjsip_endpoint.c +++ b/funcs/func_pjsip_endpoint.c @@ -156,4 +156,9 @@ static int load_module(void) return ast_custom_function_register(&pjsip_endpoint_function); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Get information about a PJSIP endpoint"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Get information about a PJSIP endpoint", + .support_level = AST_MODULE_SUPPORT_CORE, + .load = load_module, + .unload = unload_module, + .requires = "res_pjsip", +); -- cgit v1.2.3