From dcf1ad14da48db3476dcaeeb3d3fb6b7d00a28ca Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Fri, 25 Jul 2014 16:47:17 +0000 Subject: Add module support level to ast_module_info structure. Print it in CLI "module show" . ASTERISK-23919 #close Reported by Malcolm Davenport Review: https://reviewboard.asterisk.org/r/3802 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419592 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_alsa.c | 1 + channels/chan_bridge_media.c | 1 + channels/chan_console.c | 1 + channels/chan_dahdi.c | 1 + channels/chan_iax2.c | 1 + channels/chan_mgcp.c | 1 + channels/chan_misdn.c | 1 + channels/chan_motif.c | 1 + channels/chan_multicast_rtp.c | 1 + channels/chan_nbs.c | 3 ++- channels/chan_oss.c | 3 ++- channels/chan_phone.c | 3 ++- channels/chan_pjsip.c | 1 + channels/chan_sip.c | 1 + channels/chan_skinny.c | 1 + channels/chan_unistim.c | 1 + 16 files changed, 19 insertions(+), 3 deletions(-) (limited to 'channels') diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index f74e78fd6..74a61398a 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -1046,6 +1046,7 @@ static int unload_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ALSA Console Channel Driver", + .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, .load_pri = AST_MODPRI_CHANNEL_DRIVER, diff --git a/channels/chan_bridge_media.c b/channels/chan_bridge_media.c index 6502b5c77..d7eeebf26 100644 --- a/channels/chan_bridge_media.c +++ b/channels/chan_bridge_media.c @@ -215,6 +215,7 @@ static int load_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Bridge Media Channel Driver", + .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, ); diff --git a/channels/chan_console.c b/channels/chan_console.c index 3aeda931a..c34a6c45d 100644 --- a/channels/chan_console.c +++ b/channels/chan_console.c @@ -1562,6 +1562,7 @@ static int reload(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Console Channel Driver", + .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 7673a6436..9ccec641f 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -19735,6 +19735,7 @@ static int reload(void) */ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, tdesc, + .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 59f794454..831f2c266 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -15219,6 +15219,7 @@ static int load_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Inter Asterisk eXchange (Ver 2)", + .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 6021b6c1d..c72df663b 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -5018,6 +5018,7 @@ static int unload_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Media Gateway Control Protocol (MGCP)", + .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 0774e3c15..f3d540d42 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -12830,6 +12830,7 @@ static void chan_misdn_log(int level, int port, char *tmpl, ...) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Channel driver for mISDN Support (BRI/PRI)", + .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/channels/chan_motif.c b/channels/chan_motif.c index e29485206..374632ff9 100644 --- a/channels/chan_motif.c +++ b/channels/chan_motif.c @@ -2814,6 +2814,7 @@ static int unload_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Motif Jingle Channel Driver", + .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/channels/chan_multicast_rtp.c b/channels/chan_multicast_rtp.c index ae6022cb6..267baabf1 100644 --- a/channels/chan_multicast_rtp.c +++ b/channels/chan_multicast_rtp.c @@ -216,6 +216,7 @@ static int unload_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Multicast RTP Paging Channel", + .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, .load_pri = AST_MODPRI_CHANNEL_DRIVER, diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c index 1be9bffeb..36c3435bb 100644 --- a/channels/chan_nbs.c +++ b/channels/chan_nbs.c @@ -270,4 +270,5 @@ static int load_module(void) return AST_MODULE_LOAD_SUCCESS; } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Network Broadcast Sound Support"); +AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Network Broadcast Sound Support"); + diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 46b751d7c..51fce44c0 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -1522,4 +1522,5 @@ static int unload_module(void) return 0; } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "OSS Console Channel Driver"); +AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "OSS Console Channel Driver"); + diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 72f38291b..ced9b1390 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -1518,4 +1518,5 @@ static int load_module(void) return AST_MODULE_LOAD_SUCCESS; } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Linux Telephony API Support"); +AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Linux Telephony API Support"); + diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c index 8911b931a..92a96eb0e 100644 --- a/channels/chan_pjsip.c +++ b/channels/chan_pjsip.c @@ -2281,6 +2281,7 @@ static int unload_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Channel Driver", + .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 3686692ca..0eb2dc1df 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -34746,6 +34746,7 @@ static int unload_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Session Initiation Protocol (SIP)", + .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 18ce8808f..b970738a0 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -8789,6 +8789,7 @@ static int reload(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Skinny Client Control Protocol (Skinny)", + .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 3f6fd01c8..caa60ad69 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -7162,6 +7162,7 @@ int reload(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "UNISTIM Protocol (USTM)", + .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, .reload = reload, -- cgit v1.2.3