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
author: Mark Michelson <mmichelson@digium.com> 2014-07-25 16:47:17 +0000
committer: Mark Michelson <mmichelson@digium.com> 2014-07-25 16:47:17 +0000
commit: dcf1ad14da48db3476dcaeeb3d3fb6b7d00a28ca (patch)
tree: bd9312d3192f4fbb97cb217093b85e75d1346cf6
parent: 355dc3d2ad98db624184a797206ccb88f4b8a526 (diff)
241 files changed, 386 insertions, 77 deletions
diff --git a/addons/app_mysql.c b/addons/app_mysql.c
index 2e1b4f4dc..298ed9d65 100644
--- a/addons/app_mysql.c
+++ b/addons/app_mysql.c
@@ -664,4 +664,5 @@ static int load_module(void)
 	return ast_register_application(app, MYSQL_exec, synopsis, descrip);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Simple Mysql Interface");
+AST_MODULE_INFO_STANDARD_DEPRECATED(ASTERISK_GPL_KEY, "Simple Mysql Interface");
+
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index b00a3f345..4fb3ce54f 100644
--- a/addons/cdr_mysql.c
+++ b/addons/cdr_mysql.c
@@ -698,6 +698,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MySQL CDR Backend",
+	.support_level = AST_MODULE_SUPPORT_DEPRECATED,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c
index 75db0fad8..aa537c96a 100644
--- a/addons/chan_mobile.c
+++ b/addons/chan_mobile.c
@@ -4754,6 +4754,7 @@ e_cleanup:
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Bluetooth Mobile Device Channel Driver",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index a873fa871..b0fa01ff3 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -5187,6 +5187,7 @@ void ast_ooh323c_exit()
 #endif
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Objective Systems H323 Channel",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 			.load = load_module,
 			.unload = unload_module,
 			.reload = reload_module,
diff --git a/addons/format_mp3.c b/addons/format_mp3.c
index 4c98789ab..e354148f0 100644
--- a/addons/format_mp3.c
+++ b/addons/format_mp3.c
@@ -326,4 +326,5 @@ static int unload_module(void)
 	return ast_format_def_unregister(name);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "MP3 format [Any rate but 8000hz mono is optimal]");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "MP3 format [Any rate but 8000hz mono is optimal]");
+
diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c
index e7bbfb07e..640e06ef8 100644
--- a/addons/res_config_mysql.c
+++ b/addons/res_config_mysql.c
@@ -1748,6 +1748,7 @@ static char *handle_cli_realtime_mysql_status(struct ast_cli_entry *e, int cmd,
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "MySQL RealTime Configuration Driver",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index ac803248f..8b60b630e 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -1612,6 +1612,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk ADSI Programming Application",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.nonoptreq = "res_adsi",
diff --git a/apps/app_agent_pool.c b/apps/app_agent_pool.c
index f531c1613..8e432d175 100644
--- a/apps/app_agent_pool.c
+++ b/apps/app_agent_pool.c
@@ -2670,6 +2670,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Call center agent pool applications",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index 4f9de364d..cc423e584 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -995,6 +995,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Alarm Receiver for Asterisk",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/apps/app_amd.c b/apps/app_amd.c
index 3dd8cc617..b8f4e9b28 100644
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -525,6 +525,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Answering Machine Detection Application",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/apps/app_celgenuserevent.c b/apps/app_celgenuserevent.c
index 871724679..3037ef60f 100644
--- a/apps/app_celgenuserevent.c
+++ b/apps/app_celgenuserevent.c
@@ -102,6 +102,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Generate an User-Defined CEL event",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 				.load = load_module,
 				.unload = unload_module,
 	);
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index afc763b23..47b631a76 100644
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -211,4 +211,5 @@ static int load_module(void)
 		AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Check channel availability");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Check channel availability");
+
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index 445b196d4..8e5436953 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -3368,6 +3368,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Conference Bridge Application",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c
index 6354ea71d..701904beb 100644
--- a/apps/app_dahdiras.c
+++ b/apps/app_dahdiras.c
@@ -233,5 +233,6 @@ static int load_module(void)
 	return ((ast_register_application_xml(app, dahdiras_exec)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "DAHDI ISDN Remote Access Server");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "DAHDI ISDN Remote Access Server");
+
 
diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 8f229f2a9..53718d1e5 100644
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -355,4 +355,5 @@ static int load_module(void)
 	return ast_register_application_xml(app, dictate_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Virtual Dictation Machine");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Virtual Dictation Machine");
+
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index 0212e09d0..5649c6998 100644
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -915,4 +915,5 @@ static int load_module(void)
 	return ast_register_application_xml(app, app_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "External IVR Interface Application");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "External IVR Interface Application");
+
diff --git a/apps/app_fax.c b/apps/app_fax.c
index ceff38fef..7822a34e8 100644
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -996,6 +996,7 @@ static int load_module(void)
 
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Simple FAX Application",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		);
diff --git a/apps/app_festival.c b/apps/app_festival.c
index 3626563c6..7df8caf8a 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -575,4 +575,5 @@ static int load_module(void)
 	return ast_register_application_xml(app, festival_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Simple Festival Interface");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Simple Festival Interface");
+
diff --git a/apps/app_followme.c b/apps/app_followme.c
index 1355361e2..8531b17b7 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -1569,6 +1569,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Find-Me/Follow-Me Application",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index 8192b7619..d0e62536d 100644
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -141,6 +141,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Get ADSI CPE ID",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.nonoptreq = "res_adsi",
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 3122273c7..d0fdf5cf1 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -215,4 +215,5 @@ static int load_module(void)
 	return ast_register_application_xml(app, ices_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Encode and Stream via icecast and ices");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Encode and Stream via icecast and ices");
+
diff --git a/apps/app_image.c b/apps/app_image.c
index 160a28569..4218917b2 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -106,4 +106,5 @@ static int load_module(void)
 	return ast_register_application_xml(app, sendimage_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Image Transmission Application");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Image Transmission Application");
+
diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index 099c67d48..de59fbd70 100644
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -126,4 +126,5 @@ static int load_module(void)
 	return ast_register_application_xml(app, skel_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "IVR Demo Application");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "IVR Demo Application");
+
diff --git a/apps/app_jack.c b/apps/app_jack.c
index 8adfbc4cb..8d404318b 100644
--- a/apps/app_jack.c
+++ b/apps/app_jack.c
@@ -1051,4 +1051,5 @@ static int load_module(void)
 	return AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "JACK Interface");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "JACK Interface");
+
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 0f1c1a804..824dab547 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -8263,6 +8263,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "MeetMe conference bridge",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index d05ead066..08f8b3abc 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -3561,6 +3561,7 @@ static int unload_module(void)
 
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Mini VoiceMail (A minimal Voicemail e-mail System)",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index 2d7c117d1..27e70f09c 100644
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.c
@@ -186,4 +186,5 @@ static int load_module(void)
 	return ast_register_application_xml(app_morsecode, morsecode_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Morse code");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Morse code");
+
diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 7e4e8e490..a22265d35 100644
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -260,4 +260,5 @@ static int load_module(void)
 	return ast_register_application_xml(app, mp3_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Silly MP3 Application");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Silly MP3 Application");
+
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 435af8a29..a347cf3c8 100644
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -222,4 +222,5 @@ static int load_module(void)
 	return ast_register_application_xml(app, NBScat_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Silly NBS Stream Application");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Silly NBS Stream Application");
+
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 5ab497f5e..a576c966f 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -3158,6 +3158,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Open Settlement Protocol Applications",
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/apps/app_playback.c b/apps/app_playback.c
index e7d414301..678757319 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -570,6 +570,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Sound File Playback Application",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 0b53ea619..b0c81df38 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -10761,6 +10761,7 @@ static struct member *find_member_by_queuename_and_interface(const char *queuena
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "True Call Queueing",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/apps/app_saycounted.c b/apps/app_saycounted.c
index 377a7c45c..4eddc08e5 100644
--- a/apps/app_saycounted.c
+++ b/apps/app_saycounted.c
@@ -205,4 +205,5 @@ static int unload_module(void)
 	return res;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Decline words according to channel language");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Decline words according to channel language");
+
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 6fa3170f7..1bd093cff 100644
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -127,4 +127,5 @@ static int load_module(void)
 	return ast_register_application_xml(app2, setcallerid_pres_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Set CallerID Presentation Application");
+AST_MODULE_INFO_STANDARD_DEPRECATED(ASTERISK_GPL_KEY, "Set CallerID Presentation Application");
+
diff --git a/apps/app_skel.c b/apps/app_skel.c
index 249b1b675..337539efe 100644
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -758,6 +758,7 @@ error:
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Skeleton (sample) Application",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload_module,
diff --git a/apps/app_sms.c b/apps/app_sms.c
index 266f8abdc..e94a63d1e 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -2082,4 +2082,5 @@ static int load_module(void)
 	return ast_register_application_xml(app, sms_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "SMS/PSTN handler");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "SMS/PSTN handler");
+
diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index e52425d6a..4706d5350 100644
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -986,6 +986,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Dialplan Speech Applications",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.nonoptreq = "res_speech",
diff --git a/apps/app_stack.c b/apps/app_stack.c
index 2f89b3559..b05afb0e5 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -1301,6 +1301,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT | AST_MODFLAG_LOAD_ORDER, "Dialplan subroutines (Gosub, Return, etc)",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/apps/app_stasis.c b/apps/app_stasis.c
index ab6046b9b..f0389947a 100644
--- a/apps/app_stasis.c
+++ b/apps/app_stasis.c
@@ -107,6 +107,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis dialplan application",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis",
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index 5ccf2607e..a021252de 100644
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -256,4 +256,5 @@ static int load_module(void)
 	return ast_register_application_xml(app, background_detect_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Playback with Talk Detection");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Playback with Talk Detection");
+
diff --git a/apps/app_test.c b/apps/app_test.c
index 54139ba80..410d68606 100644
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -498,4 +498,5 @@ static int load_module(void)
 	return res;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Interface Test Application");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Interface Test Application");
+
diff --git a/apps/app_url.c b/apps/app_url.c
index 00ea72047..d5dd70176 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -179,4 +179,5 @@ static int load_module(void)
 	return ast_register_application_xml(app, sendurl_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Send URL Applications");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Send URL Applications");
+
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 4bcb50b5b..0f07bdb2a 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -16043,6 +16043,7 @@ play2_msg_cleanup:
  */
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc,
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index fc02de303..7ed906bfa 100644
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -140,4 +140,5 @@ static int load_module(void)
 	return ast_register_application_xml(app, waitforring_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Waits until first ring after time");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Waits until first ring after time");
+
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index f2111d720..07f2824da 100644
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -274,5 +274,6 @@ static int load_module(void)
 	return res;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Wait For Silence");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Wait For Silence");
+
 
diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index 00166978f..8e966e954 100644
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -137,4 +137,5 @@ static int load_module(void)
 	return ((ast_register_application_xml(app, zapateller_exec)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Block Telemarketers with Special Information Tone");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Block Telemarketers with Special Information Tone");
+
diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index 72c26198f..e53240afd 100644
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -809,6 +809,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Adaptive ODBC CDR backend",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 1cc1747c6..046713a86 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -353,6 +353,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Comma Separated Values CDR Backend",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index 51235db7f..df763639f 100644
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -226,6 +226,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable Comma Separated Values CDR Backend",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index 90c5dbd23..97e51e1fc 100644
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -242,6 +242,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk Manager Interface CDR Backend",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index 2e86a06c4..b8640f6bc 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -302,6 +302,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ODBC CDR Backend",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 815bb6a7d..e9e9fc3d8 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -801,6 +801,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PostgreSQL CDR Backend",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index 5f8f0fa4a..f590c766b 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -301,6 +301,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "RADIUS CDR Backend",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CDR_DRIVER,
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c
index 884837c16..88557b6ab 100644
--- a/cdr/cdr_sqlite.c
+++ b/cdr/cdr_sqlite.c
@@ -246,6 +246,7 @@ err:
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite CDR Backend",
+	.support_level = AST_MODULE_SUPPORT_DEPRECATED,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_CDR_DRIVER,
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index c33601e10..b5cb391c2 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -347,6 +347,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite3 Custom CDR Module",
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c
index de8cae4ec..458721aa8 100644
--- a/cdr/cdr_syslog.c
+++ b/cdr/cdr_syslog.c
@@ -286,6 +286,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable syslog CDR Backend",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index 5a1312ecc..7e44983a3 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -632,6 +632,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "FreeTDS CDR Backend",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/cel/cel_custom.c b/cel/cel_custom.c
index 03b64aa74..edb009686 100644
--- a/cel/cel_custom.c
+++ b/cel/cel_custom.c
@@ -217,6 +217,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable Comma Separated Values CEL Backend",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/cel/cel_manager.c b/cel/cel_manager.c
index 610b6e4e0..f0d081c8d 100644
--- a/cel/cel_manager.c
+++ b/cel/cel_manager.c
@@ -217,6 +217,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk Manager Interface CEL Backend",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/cel/cel_odbc.c b/cel/cel_odbc.c
index 035857b68..8b99da1ea 100644
--- a/cel/cel_odbc.c
+++ b/cel/cel_odbc.c
@@ -833,6 +833,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, ODBC_BACKEND_NAME,
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/cel/cel_pgsql.c b/cel/cel_pgsql.c
index f673ceb35..f9c098fed 100644
--- a/cel/cel_pgsql.c
+++ b/cel/cel_pgsql.c
@@ -636,6 +636,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PostgreSQL CEL Backend",
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/cel/cel_radius.c b/cel/cel_radius.c
index aafdfcb05..79caf22f5 100644
--- a/cel/cel_radius.c
+++ b/cel/cel_radius.c
@@ -273,6 +273,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "RADIUS CEL Backend",
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_CDR_DRIVER,
diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c
index 110c8dc1c..2ea78d086 100644
--- a/cel/cel_sqlite3_custom.c
+++ b/cel/cel_sqlite3_custom.c
@@ -348,6 +348,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite3 Custom CEL Module",
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/cel/cel_tds.c b/cel/cel_tds.c
index 0f8c8ad9a..fa3eade82 100644
--- a/cel/cel_tds.c
+++ b/cel/cel_tds.c
@@ -577,6 +577,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "FreeTDS CEL Backend",
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
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,
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index 03d2a4ab3..6b64f8693 100644
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -355,6 +355,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Adaptive Differential PCM Coder/Decoder",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 	       );
diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index 2ca577d7f..de9c4c4be 100644
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -139,6 +139,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "A-law Coder/Decoder",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 	       );
diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c
index 64f220eef..7a49b74ac 100644
--- a/codecs/codec_dahdi.c
+++ b/codecs/codec_dahdi.c
@@ -952,6 +952,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Generic DAHDI Transcoder Codec Translator",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c
index 1eba8067f..e262ebd71 100644
--- a/codecs/codec_g722.c
+++ b/codecs/codec_g722.c
@@ -250,6 +250,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ITU G.722-64kbps G722 Transcoder",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 	       );
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index a41039d53..1954c5134 100644
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -899,6 +899,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ITU G.726-32kbps G726 Transcoder",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 	       );
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index 49f672adb..8cb49430f 100644
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -237,6 +237,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "GSM Coder/Decoder",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 	       );
diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index 0ef8856ff..ca2eb8ef0 100644
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -266,6 +266,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "LPC10 2.4kbps Coder/Decoder",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 	       );
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index 84ce07a5d..c91070d9e 100644
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -625,6 +625,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Speex Coder/Decoder",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index 9d0aa3c14..58c0a895e 100644
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -190,6 +190,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "mu-Law Coder/Decoder",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 	       );
diff --git a/formats/format_g719.c b/formats/format_g719.c
index 8d508f0e3..f58286290 100644
--- a/formats/format_g719.c
+++ b/formats/format_g719.c
@@ -150,6 +150,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ITU G.719",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_g723.c b/formats/format_g723.c
index 51fe6b049..6d0b96337 100644
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -154,6 +154,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "G.723.1 Simple Timestamp File Format",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_g726.c b/formats/format_g726.c
index bde3e2d06..25daff908 100644
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -249,6 +249,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw G.726 (16/24/32/40kbps) data",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_g729.c b/formats/format_g729.c
index 7d562ede7..2c677b2e9 100644
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -150,6 +150,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw G.729 data",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index fe1e55c7a..4a688e22a 100644
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -195,6 +195,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw GSM data",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_h263.c b/formats/format_h263.c
index 6511cef04..731b746e0 100644
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -182,6 +182,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw H.263 data",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_h264.c b/formats/format_h264.c
index 56ec007c0..7c3d2d473 100644
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -175,6 +175,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw H.264 data",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index ce5135f7b..6b811e693 100644
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -147,6 +147,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw iLBC data",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c
index 1e91482f7..5b2c72d0d 100644
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -110,6 +110,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "jpeg (joint picture experts group) image format",
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index 6171491a8..ed616c5e7 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -435,6 +435,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "OGG/Vorbis audio",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index 2d864078e..beb001591 100644
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -533,6 +533,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw/Sun uLaw/ALaw 8KHz (PCM,PCMA,AU), G.722 16Khz",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_siren14.c b/formats/format_siren14.c
index b7e2de1ec..d0a16c4a2 100644
--- a/formats/format_siren14.c
+++ b/formats/format_siren14.c
@@ -151,6 +151,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ITU G.722.1 Annex C (Siren14, licensed from Polycom)",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_siren7.c b/formats/format_siren7.c
index 0b3c75d9c..acfde420c 100644
--- a/formats/format_siren7.c
+++ b/formats/format_siren7.c
@@ -151,6 +151,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ITU G.722.1 (Siren7, licensed from Polycom)",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_sln.c b/formats/format_sln.c
index a3230637c..143e4da2f 100644
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -274,6 +274,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw Signed Linear Audio support (SLN) 8khz-192khz",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_vox.c b/formats/format_vox.c
index 7beec5e6a..6724c54d7 100644
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -149,6 +149,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Dialogic VOX (ADPCM) File Format",
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_wav.c b/formats/format_wav.c
index fb810625f..27da015d8 100644
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -550,6 +550,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Microsoft WAV/WAV16 format (8kHz/16kHz Signed Linear)",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index bbb1977a9..594989c52 100644
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -578,6 +578,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Microsoft WAV format (Proprietary GSM)",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/funcs/func_aes.c b/funcs/func_aes.c
index 2e1959cd8..3338118f9 100644
--- a/funcs/func_aes.c
+++ b/funcs/func_aes.c
@@ -179,6 +179,7 @@ static int load_module(void)
 }
 
 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",
diff --git a/funcs/func_audiohookinherit.c b/funcs/func_audiohookinherit.c
index 11d160617..737f04e18 100644
--- a/funcs/func_audiohookinherit.c
+++ b/funcs/func_audiohookinherit.c
@@ -86,4 +86,5 @@ static int load_module(void)
 		return AST_MODULE_LOAD_SUCCESS;
 	}
 }
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Audiohook inheritance placeholder function");
+AST_MODULE_INFO_STANDARD_DEPRECATED(ASTERISK_GPL_KEY, "Audiohook inheritance placeholder function");
+
diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index b8f8c1218..22ee5821c 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -790,6 +790,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Load external URL",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_REALTIME_DEPEND2,
diff --git a/funcs/func_devstate.c b/funcs/func_devstate.c
index 6472610c8..88a5c5c71 100644
--- a/funcs/func_devstate.c
+++ b/funcs/func_devstate.c
@@ -355,6 +355,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Gets or sets a device state in the dialplan",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
diff --git a/funcs/func_dialplan.c b/funcs/func_dialplan.c
index 02b4c7a9e..0f3c0f823 100644
--- a/funcs/func_dialplan.c
+++ b/funcs/func_dialplan.c
@@ -194,6 +194,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Dialplan Context/Extension/Priority Checking Functions",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/funcs/func_frame_trace.c b/funcs/func_frame_trace.c
index 681a96924..dea21c252 100644
--- a/funcs/func_frame_trace.c
+++ b/funcs/func_frame_trace.c
@@ -423,5 +423,6 @@ static int load_module(void)
 	return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Frame Trace for internal ast_frame debugging.");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Frame Trace for internal ast_frame debugging.");
+
 
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 779f68524..088cd5a0a 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -1580,6 +1580,7 @@ reload_out:
 /* XXX need to revise usecount - set if query_lock is set */
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ODBC lookups",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/funcs/func_periodic_hook.c b/funcs/func_periodic_hook.c
index 4ee98f3ff..ce5aac054 100644
--- a/funcs/func_periodic_hook.c
+++ b/funcs/func_periodic_hook.c
@@ -521,6 +521,7 @@ int AST_OPTIONAL_API_NAME(ast_beep_stop)(struct ast_channel *chan, const char *b
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Periodic dialplan hooks.",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		);
diff --git a/funcs/func_pitchshift.c b/funcs/func_pitchshift.c
index 0aaa2b602..bec5f71dd 100644
--- a/funcs/func_pitchshift.c
+++ b/funcs/func_pitchshift.c
@@ -509,4 +509,5 @@ static int load_module(void)
 	return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Audio Effects Dialplan Functions");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Audio Effects Dialplan Functions");
+
diff --git a/funcs/func_presencestate.c b/funcs/func_presencestate.c
index df8909f37..8f02b942d 100644
--- a/funcs/func_presencestate.c
+++ b/funcs/func_presencestate.c
@@ -877,6 +877,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Gets or sets a presence state in the dialplan",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
diff --git a/include/asterisk/module.h b/include/asterisk/module.h
index b0f19be46..7f9cecf2d 100644
--- a/include/asterisk/module.h
+++ b/include/asterisk/module.h
@@ -73,6 +73,13 @@ enum ast_module_load_result {
 	AST_MODULE_LOAD_FAILURE = -1,   /*!< Module could not be loaded properly */
 };
 
+enum ast_module_support_level {
+	AST_MODULE_SUPPORT_UNKNOWN,
+	AST_MODULE_SUPPORT_CORE,
+	AST_MODULE_SUPPORT_EXTENDED,
+	AST_MODULE_SUPPORT_DEPRECATED,
+};
+
 /*! 
  * \brief Load a module.
  * \param resource_name The name of the module to load.
@@ -120,8 +127,10 @@ void ast_update_use_count(void);
  *
  * \return the number of modules loaded
  */
-int ast_update_module_list(int (*modentry)(const char *module, const char *description, int usecnt, const char *status, const char *like),
-			   const char *like);
+int ast_update_module_list(int (*modentry)(const char *module, const char *description,
+                                           int usecnt, const char *status, const char *like,
+                                           enum ast_module_support_level support_level),
+                           const char *like);
 
 /*!
  * \brief Check if module with the name given is loaded
@@ -264,6 +273,8 @@ struct ast_module_info {
 	 * These are only required for loading, when the optional_api header file
 	 * detects that the compiler does not support the optional API featureset. */
 	const char *nonoptreq;
+	/*! The support level for the given module */
+	enum ast_module_support_level support_level;
 };
 
 void ast_module_register(const struct ast_module_info *);
@@ -281,38 +292,59 @@ struct ast_module *ast_module_ref(struct ast_module *);
 void ast_module_unref(struct ast_module *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
-#define AST_MODULE_INFO(keystr, flags_to_set, desc, load_func, unload_func, reload_func, load_pri)	\
+#define AST_MODULE_INFO(keystr, flags_to_set, desc, load_func, unload_func, reload_func, load_pri, support_level)	\
 	static struct ast_module_info __mod_info = {	\
-		NULL,					\
-		load_func,				\
-		reload_func,				\
-		unload_func,				\
-		NULL,					\
-		NULL,					\
-		AST_MODULE,				\
-		desc,					\
-		keystr,					\
-		flags_to_set,				\
-		AST_BUILDOPT_SUM,			\
-		load_pri,           \
-	};						\
-	static void  __attribute__((constructor)) __reg_module(void) \
-	{ \
-		ast_module_register(&__mod_info); \
-	} \
-	static void  __attribute__((destructor)) __unreg_module(void) \
-	{ \
-		ast_module_unregister(&__mod_info); \
-	} \
+		NULL,                                                          \
+		load_func,                                                     \
+		reload_func,                                                   \
+		unload_func,                                                   \
+		NULL,                                                          \
+		NULL,                                                          \
+		AST_MODULE,                                                    \
+		desc,                                                          \
+		keystr,                                                        \
+		flags_to_set,                                                  \
+		AST_BUILDOPT_SUM,                                              \
+		load_pri,                                                      \
+		NULL,                                                          \
+		support_level,                                                 \
+	};                                                                 \
+	static void  __attribute__((constructor)) __reg_module(void)       \
+	{                                                                  \
+		ast_module_register(&__mod_info);                              \
+	}                                                                  \
+	static void  __attribute__((destructor)) __unreg_module(void)      \
+	{                                                                  \
+		ast_module_unregister(&__mod_info);                            \
+	}                                                                  \
 	static const __attribute__((unused)) struct ast_module_info *ast_module_info = &__mod_info
 
-#define AST_MODULE_INFO_STANDARD(keystr, desc)		\
-	AST_MODULE_INFO(keystr, AST_MODFLAG_LOAD_ORDER, desc,	\
-			load_module,			\
-			unload_module,		\
-			NULL,			\
-			AST_MODPRI_DEFAULT \
+#define AST_MODULE_INFO_STANDARD(keystr, desc)              \
+	AST_MODULE_INFO(keystr, AST_MODFLAG_LOAD_ORDER, desc,   \
+			load_module,                                    \
+			unload_module,                                  \
+			NULL,                                           \
+			AST_MODPRI_DEFAULT,                             \
+			AST_MODULE_SUPPORT_CORE                         \
 		       )
+
+#define AST_MODULE_INFO_STANDARD_EXTENDED(keystr, desc)     \
+	AST_MODULE_INFO(keystr, AST_MODFLAG_LOAD_ORDER, desc,   \
+			load_module,                                    \
+			unload_module,                                  \
+			NULL,                                           \
+			AST_MODPRI_DEFAULT,                             \
+			AST_MODULE_SUPPORT_EXTENDED                     \
+		       )
+#define AST_MODULE_INFO_STANDARD_DEPRECATED(keystr, desc)   \
+	AST_MODULE_INFO(keystr, AST_MODFLAG_LOAD_ORDER, desc,   \
+			load_module,                                    \
+			unload_module,                                  \
+			NULL,                                           \
+			AST_MODPRI_DEFAULT,                             \
+			AST_MODULE_SUPPORT_DEPRECATED                   \
+		       )
+
 #else /* plain C */
 
 /* forward declare this pointer in modules, so that macro/function
@@ -401,12 +433,30 @@ static void __restore_globals(void)
 	} \
 	static const struct ast_module_info *ast_module_info = &__mod_info
 
-#define AST_MODULE_INFO_STANDARD(keystr, desc)		\
-	AST_MODULE_INFO(keystr, AST_MODFLAG_LOAD_ORDER, desc,	\
-			.load = load_module,			\
-			.unload = unload_module,		\
-			.load_pri = AST_MODPRI_DEFAULT, \
+#define AST_MODULE_INFO_STANDARD(keystr, desc)              \
+	AST_MODULE_INFO(keystr, AST_MODFLAG_LOAD_ORDER, desc,   \
+			.load = load_module,                            \
+			.unload = unload_module,                        \
+			.load_pri = AST_MODPRI_DEFAULT,                 \
+			.support_level = AST_MODULE_SUPPORT_CORE,       \
+		       )
+
+#define AST_MODULE_INFO_STANDARD_EXTENDED(keystr, desc)     \
+	AST_MODULE_INFO(keystr, AST_MODFLAG_LOAD_ORDER, desc,   \
+			.load = load_module,                            \
+			.unload = unload_module,                        \
+			.load_pri = AST_MODPRI_DEFAULT,                 \
+			.support_level = AST_MODULE_SUPPORT_EXTENDED,   \
+		       )
+
+#define AST_MODULE_INFO_STANDARD_DEPRECATED(keystr, desc)   \
+	AST_MODULE_INFO(keystr, AST_MODFLAG_LOAD_ORDER, desc,   \
+			.load = load_module,                            \
+			.unload = unload_module,                        \
+			.load_pri = AST_MODPRI_DEFAULT,                 \
+			.support_level = AST_MODULE_SUPPORT_DEPRECATED, \
 		       )
+
 #endif	/* plain C */
 
 /*! 
@@ -478,6 +528,8 @@ int ast_register_application2(const char *app, int (*execute)(struct ast_channel
  */
 int ast_unregister_application(const char *app);
 
+const char *ast_module_support_level_to_string(enum ast_module_support_level support_level);
+
 /*! Macro to safely ref and unref the self module for the current scope */
 #define SCOPED_MODULE_USE(module) \
 	RAII_VAR(struct ast_module *, __self__ ## __LINE__, ast_module_ref(module), ast_module_unref)
diff --git a/main/cli.c b/main/cli.c
index bb8e33e44..b7e5c1586 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -772,17 +772,20 @@ static char *handle_unload(struct ast_cli_entry *e, int cmd, struct ast_cli_args
 	return CLI_SUCCESS;
 }
 
-#define MODLIST_FORMAT  "%-30s %-40.40s %-10d %s\n"
-#define MODLIST_FORMAT2 "%-30s %-40.40s %-10s %s\n"
+#define MODLIST_FORMAT  "%-30s %-40.40s %-10d %-11s %13s\n"
+#define MODLIST_FORMAT2 "%-30s %-40.40s %-10s %-11s %13s\n"
 
 AST_MUTEX_DEFINE_STATIC(climodentrylock);
 static int climodentryfd = -1;
 
-static int modlist_modentry(const char *module, const char *description, int usecnt, const char *status, const char *like)
+static int modlist_modentry(const char *module, const char *description,
+		int usecnt, const char *status, const char *like,
+		enum ast_module_support_level support_level)
 {
 	/* Comparing the like with the module */
 	if (strcasestr(module, like) ) {
-		ast_cli(climodentryfd, MODLIST_FORMAT, module, description, usecnt, status);
+		ast_cli(climodentryfd, MODLIST_FORMAT, module, description, usecnt,
+				status, ast_module_support_level_to_string(support_level));
 		return 1;
 	}
 	return 0;
@@ -909,7 +912,7 @@ static char *handle_modlist(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
 
 	ast_mutex_lock(&climodentrylock);
 	climodentryfd = a->fd; /* global, protected by climodentrylock */
-	ast_cli(a->fd, MODLIST_FORMAT2, "Module", "Description", "Use Count", "Status");
+	ast_cli(a->fd, MODLIST_FORMAT2, "Module", "Description", "Use Count", "Status", "Support Level");
 	ast_cli(a->fd,"%d modules loaded\n", ast_update_module_list(modlist_modentry, like));
 	climodentryfd = -1;
 	ast_mutex_unlock(&climodentrylock);
diff --git a/main/loader.c b/main/loader.c
index b44a1a489..343863a03 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -1350,8 +1350,10 @@ void ast_update_use_count(void)
 	AST_LIST_UNLOCK(&updaters);
 }
 
-int ast_update_module_list(int (*modentry)(const char *module, const char *description, int usecnt, const char *status, const char *like),
-			   const char *like)
+int ast_update_module_list(int (*modentry)(const char *module, const char *description,
+                                           int usecnt, const char *status, const char *like,
+										   enum ast_module_support_level support_level),
+                           const char *like)
 {
 	struct ast_module *cur;
 	int unlock = -1;
@@ -1368,7 +1370,7 @@ int ast_update_module_list(int (*modentry)(const char *module, const char *descr
 
 	AST_LIST_TRAVERSE(&alpha_module_list, cur, list_entry) {
 		total_mod_loaded += modentry(cur->resource, cur->info->description, cur->usecount,
-						cur->flags.running ? "Running" : "Not Running", like);
+						cur->flags.running ? "Running" : "Not Running", like, cur->info->support_level);
 	}
 
 	if (unlock) {
@@ -1445,3 +1447,15 @@ void ast_module_unref(struct ast_module *mod)
 	ast_atomic_fetchadd_int(&mod->usecount, -1);
 	ast_update_use_count();
 }
+
+const char *support_level_map [] = {
+	[AST_MODULE_SUPPORT_UNKNOWN] = "unknown",
+	[AST_MODULE_SUPPORT_CORE] = "core",
+	[AST_MODULE_SUPPORT_EXTENDED] = "extended",
+	[AST_MODULE_SUPPORT_DEPRECATED] = "deprecated",
+};
+
+const char *ast_module_support_level_to_string(enum ast_module_support_level support_level)
+{
+	return support_level_map[support_level];
+}
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index a76bfa03e..5cc07cfa2 100644
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -297,6 +297,7 @@ int ael_external_load_module(void)
 #endif
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Extension Language Compiler",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 8301f25da..01550c0b1 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -2088,6 +2088,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Text Extension Configuration",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index d3e81a8d1..fc9e182b2 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -5052,6 +5052,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Distributed Universal Number Discovery (DUNDi)",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index ddbafd950..ece898411 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -1673,6 +1673,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Lua PBX Switch",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c
index 1143fb45a..641e30d95 100644
--- a/pbx/pbx_realtime.c
+++ b/pbx/pbx_realtime.c
@@ -403,4 +403,5 @@ static int load_module(void)
 	return AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Realtime Switch");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Realtime Switch");
+
diff --git a/res/res_adsi.c b/res/res_adsi.c
index e11432e29..e4d3404b2 100644
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -1210,6 +1210,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ADSI Resource",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/res/res_ael_share.c b/res/res_ael_share.c
index f1ae9f33f..bbe870b10 100644
--- a/res/res_ael_share.c
+++ b/res/res_ael_share.c
@@ -53,6 +53,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "share-able code for AEL",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 				.load = load_module,
 				.unload = unload_module
 	);
diff --git a/res/res_agi.c b/res/res_agi.c
index b612f7d72..affb731eb 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -4313,6 +4313,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Asterisk Gateway Interface (AGI)",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_ari.c b/res/res_ari.c
index 2b6cb231b..28f9be18b 100644
--- a/res/res_ari.c
+++ b/res/res_ari.c
@@ -1100,6 +1100,7 @@ static int reload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Asterisk RESTful Interface",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload_module,
diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c
index 9195d4c83..0b09213d9 100644
--- a/res/res_ari_applications.c
+++ b/res/res_ari_applications.c
@@ -541,6 +541,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Stasis application resources",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c
index 346c2c2f3..c90437905 100644
--- a/res/res_ari_asterisk.c
+++ b/res/res_ari_asterisk.c
@@ -442,6 +442,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Asterisk resources",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c
index 1dbd9d32b..1a91af95b 100644
--- a/res/res_ari_bridges.c
+++ b/res/res_ari_bridges.c
@@ -1412,6 +1412,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Bridge resources",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c
index ac159bfec..08edc64dc 100644
--- a/res/res_ari_channels.c
+++ b/res/res_ari_channels.c
@@ -2590,6 +2590,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Channel resources",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c
index 5576a1859..24ea55431 100644
--- a/res/res_ari_device_states.c
+++ b/res/res_ari_device_states.c
@@ -357,6 +357,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Device state resources",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c
index f7995ef4d..f973c7a53 100644
--- a/res/res_ari_endpoints.c
+++ b/res/res_ari_endpoints.c
@@ -270,6 +270,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Endpoint resources",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index 4e56789e0..2a596d0a8 100644
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -371,6 +371,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - WebSocket resource",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
diff --git a/res/res_ari_mailboxes.c b/res/res_ari_mailboxes.c
index 40e132e3e..c1c7e4818 100644
--- a/res/res_ari_mailboxes.c
+++ b/res/res_ari_mailboxes.c
@@ -363,6 +363,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Mailboxes resources",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
diff --git a/res/res_ari_model.c b/res/res_ari_model.c
index 3c8dd4f2b..96cab8096 100644
--- a/res/res_ari_model.c
+++ b/res/res_ari_model.c
@@ -204,6 +204,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER | AST_MODFLAG_GLOBAL_SYMBOLS, "ARI Model validators",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c
index fee22c38b..8155b2a5a 100644
--- a/res/res_ari_playbacks.c
+++ b/res/res_ari_playbacks.c
@@ -314,6 +314,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Playback control resources",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c
index 3f4ef2951..0657fa311 100644
--- a/res/res_ari_recordings.c
+++ b/res/res_ari_recordings.c
@@ -838,6 +838,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Recording resources",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c
index 69c7d163e..107f47cdf 100644
--- a/res/res_ari_sounds.c
+++ b/res/res_ari_sounds.c
@@ -243,6 +243,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sound resources",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_ari,res_stasis",
diff --git a/res/res_calendar.c b/res/res_calendar.c
index 34c94f64a..c04a950c1 100644
--- a/res/res_calendar.c
+++ b/res/res_calendar.c
@@ -1913,6 +1913,7 @@ static int load_module(void)
 	return AST_MODULE_LOAD_SUCCESS;
 }
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Asterisk Calendar integration",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c
index d9dde31c2..a8eac7c20 100644
--- a/res/res_calendar_caldav.c
+++ b/res/res_calendar_caldav.c
@@ -725,6 +725,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk CalDAV Calendar Integration",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_DEVSTATE_PLUGIN,
diff --git a/res/res_calendar_ews.c b/res/res_calendar_ews.c
index fe8c8a7bb..51086823d 100644
--- a/res/res_calendar_ews.c
+++ b/res/res_calendar_ews.c
@@ -929,6 +929,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk MS Exchange Web Service Calendar Integration",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEVSTATE_PLUGIN,
diff --git a/res/res_calendar_exchange.c b/res/res_calendar_exchange.c
index 3f902a3dc..e8c80cd5a 100644
--- a/res/res_calendar_exchange.c
+++ b/res/res_calendar_exchange.c
@@ -741,6 +741,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk MS Exchange Calendar Integration",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_DEVSTATE_PLUGIN,
diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c
index ef2d9173d..8ac905174 100644
--- a/res/res_calendar_icalendar.c
+++ b/res/res_calendar_icalendar.c
@@ -504,6 +504,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk iCalendar .ics file integration",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_DEVSTATE_PLUGIN,
diff --git a/res/res_chan_stats.c b/res/res_chan_stats.c
index 9d1e8c02e..df3471865 100644
--- a/res/res_chan_stats.c
+++ b/res/res_chan_stats.c
@@ -180,6 +180,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Example of how to use Stasis",
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_statsd"
diff --git a/res/res_clialiases.c b/res/res_clialiases.c
index 8550b48a5..633ed89f4 100644
--- a/res/res_clialiases.c
+++ b/res/res_clialiases.c
@@ -300,6 +300,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "CLI Aliases",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload_module,
diff --git a/res/res_config_curl.c b/res/res_config_curl.c
index 660916a34..a51802928 100644
--- a/res/res_config_curl.c
+++ b/res/res_config_curl.c
@@ -658,6 +658,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Realtime Curl configuration",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload_module,
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index 79dc987eb..fd21aab80 100644
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -1887,6 +1887,7 @@ static char *realtime_ldap_status(struct ast_cli_entry *e, int cmd, struct ast_c
  *
  */
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "LDAP realtime interface",
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index dc46a983e..1a47ba594 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -1221,6 +1221,7 @@ static int reload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Realtime ODBC configuration",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload_module,
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 3ee5e4e78..23b6a466f 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -1655,6 +1655,7 @@ static char *handle_cli_realtime_pgsql_status(struct ast_cli_entry *e, int cmd,
 
 /* needs usecount semantics defined */
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PostgreSQL RealTime Configuration Driver",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index 143f4ea50..fe2fb3cdb 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -1768,6 +1768,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Realtime SQLite configuration",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_REALTIME_DRIVER,
diff --git a/res/res_config_sqlite3.c b/res/res_config_sqlite3.c
index 6fa60386d..04b8e374c 100644
--- a/res/res_config_sqlite3.c
+++ b/res/res_config_sqlite3.c
@@ -1203,6 +1203,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite 3 realtime config engine",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/res/res_corosync.c b/res/res_corosync.c
index f73341319..1df9ed841 100644
--- a/res/res_corosync.c
+++ b/res/res_corosync.c
@@ -934,4 +934,5 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Corosync");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Corosync");
+
diff --git a/res/res_crypto.c b/res/res_crypto.c
index 22b82dc34..12bedc49a 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -663,6 +663,7 @@ static int unload_module(void)
 
 /* needs usecount semantics defined */
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Cryptographic Digital Signatures",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/res/res_curl.c b/res/res_curl.c
index 26dc22978..4906dde77 100644
--- a/res/res_curl.c
+++ b/res/res_curl.c
@@ -97,6 +97,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "cURL Resource Module",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_REALTIME_DEPEND,
diff --git a/res/res_fax.c b/res/res_fax.c
index 68d2972cb..e703e16cf 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -4648,6 +4648,7 @@ static int reload_module(void)
 
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Generic FAX Applications",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload_module,
diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c
index 63be1b3cb..698530a13 100644
--- a/res/res_fax_spandsp.c
+++ b/res/res_fax_spandsp.c
@@ -1240,6 +1240,7 @@ static int load_module(void)
 
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Spandsp G.711 and T.38 FAX Technologies",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 	       );
diff --git a/res/res_format_attr_celt.c b/res/res_format_attr_celt.c
index 7d7c0f844..7d7d140a5 100644
--- a/res/res_format_attr_celt.c
+++ b/res/res_format_attr_celt.c
@@ -199,6 +199,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "CELT Format Attribute Module",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_format_attr_h263.c b/res/res_format_attr_h263.c
index 121beb1bc..22f1936e4 100644
--- a/res/res_format_attr_h263.c
+++ b/res/res_format_attr_h263.c
@@ -270,6 +270,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "H.263 Format Attribute Module",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEFAULT,
diff --git a/res/res_format_attr_h264.c b/res/res_format_attr_h264.c
index 81784bb48..f41630211 100644
--- a/res/res_format_attr_h264.c
+++ b/res/res_format_attr_h264.c
@@ -335,6 +335,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "H.264 Format Attribute Module",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEFAULT,
diff --git a/res/res_format_attr_opus.c b/res/res_format_attr_opus.c
index 9e84982fb..3de1af386 100644
--- a/res/res_format_attr_opus.c
+++ b/res/res_format_attr_opus.c
@@ -253,6 +253,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Opus Format Attribute Module",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_format_attr_silk.c b/res/res_format_attr_silk.c
index a46c62099..365cacc42 100644
--- a/res/res_format_attr_silk.c
+++ b/res/res_format_attr_silk.c
@@ -225,6 +225,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SILK Format Attribute Module",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_hep.c b/res/res_hep.c
index 474e15d6a..c558bc252 100644
--- a/res/res_hep.c
+++ b/res/res_hep.c
@@ -619,6 +619,7 @@ error:
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "HEPv3 API",
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload_module,
diff --git a/res/res_hep_pjsip.c b/res/res_hep_pjsip.c
index 54c212111..b73b033fd 100644
--- a/res/res_hep_pjsip.c
+++ b/res/res_hep_pjsip.c
@@ -167,6 +167,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP HEPv3 Logger",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_DEFAULT,
diff --git a/res/res_http_post.c b/res/res_http_post.c
index 03d407f25..2ee792af9 100644
--- a/res/res_http_post.c
+++ b/res/res_http_post.c
@@ -496,6 +496,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "HTTP POST support",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c
index e722980b0..f0d4e258e 100644
--- a/res/res_http_websocket.c
+++ b/res/res_http_websocket.c
@@ -1289,6 +1289,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "HTTP WebSocket Support",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_manager_devicestate.c b/res/res_manager_devicestate.c
index 803536dc0..bbb453742 100644
--- a/res/res_manager_devicestate.c
+++ b/res/res_manager_devicestate.c
@@ -48,6 +48,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Manager Device State Topic Forwarder",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
diff --git a/res/res_manager_presencestate.c b/res/res_manager_presencestate.c
index 4096346e2..ef2230751 100644
--- a/res/res_manager_presencestate.c
+++ b/res/res_manager_presencestate.c
@@ -48,6 +48,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Manager Presence State Topic Forwarder",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
diff --git a/res/res_monitor.c b/res/res_monitor.c
index b94a7b5ee..7f1fa4116 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -999,6 +999,7 @@ static int unload_module(void)
 
 /* usecount semantics need to be defined */
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Call Monitoring Resource",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 093c846ee..bc20a3de8 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -2003,6 +2003,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Music On Hold Resource",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
diff --git a/res/res_mwi_external.c b/res/res_mwi_external.c
index 875f32773..e5d8a3d32 100644
--- a/res/res_mwi_external.c
+++ b/res/res_mwi_external.c
@@ -952,6 +952,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Core external MWI resource",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_CHANNEL_DEPEND - 5,
diff --git a/res/res_mwi_external_ami.c b/res/res_mwi_external_ami.c
index 1a4ee342c..b1360e9e3 100644
--- a/res/res_mwi_external_ami.c
+++ b/res/res_mwi_external_ami.c
@@ -373,6 +373,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "AMI support for external MWI",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 );
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 9cdcac35d..d029c88c0 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -1910,6 +1910,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "ODBC resource",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/res/res_parking.c b/res/res_parking.c
index c60fdd61a..3edbd4663 100644
--- a/res/res_parking.c
+++ b/res/res_parking.c
@@ -1264,6 +1264,7 @@ static int reload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Call Parking Resource",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload_module,
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c
index 5fda0a945..e9a6b8fb4 100644
--- a/res/res_phoneprov.c
+++ b/res/res_phoneprov.c
@@ -1357,6 +1357,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "HTTP Phone Provisioning",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index 2c15a798d..dfcef9b6f 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -2508,6 +2508,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Basic SIP resource",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload_module,
diff --git a/res/res_pjsip_acl.c b/res/res_pjsip_acl.c
index acb073d4b..7cb56e78c 100644
--- a/res/res_pjsip_acl.c
+++ b/res/res_pjsip_acl.c
@@ -296,6 +296,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP ACL Resource",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_authenticator_digest.c b/res/res_pjsip_authenticator_digest.c
index 3485a69af..d0ce36afb 100644
--- a/res/res_pjsip_authenticator_digest.c
+++ b/res/res_pjsip_authenticator_digest.c
@@ -483,6 +483,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP authentication resource",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload_module,
diff --git a/res/res_pjsip_caller_id.c b/res/res_pjsip_caller_id.c
index 5996f13f3..7ab5b8c04 100644
--- a/res/res_pjsip_caller_id.c
+++ b/res/res_pjsip_caller_id.c
@@ -709,6 +709,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Caller ID Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_dialog_info_body_generator.c b/res/res_pjsip_dialog_info_body_generator.c
index c6d53dc7b..d4ad2160a 100644
--- a/res/res_pjsip_dialog_info_body_generator.c
+++ b/res/res_pjsip_dialog_info_body_generator.c
@@ -209,6 +209,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Extension State Dialog Info+XML Provider",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_pjsip_diversion.c b/res/res_pjsip_diversion.c
index 0b4e2106c..a27b07571 100644
--- a/res/res_pjsip_diversion.c
+++ b/res/res_pjsip_diversion.c
@@ -340,6 +340,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Add Diversion Header Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_dtmf_info.c b/res/res_pjsip_dtmf_info.c
index 6a1ce20ff..e78f7b7a3 100644
--- a/res/res_pjsip_dtmf_info.c
+++ b/res/res_pjsip_dtmf_info.c
@@ -161,6 +161,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP DTMF INFO Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_endpoint_identifier_anonymous.c b/res/res_pjsip_endpoint_identifier_anonymous.c
index 902dc0276..f0ea6dd50 100644
--- a/res/res_pjsip_endpoint_identifier_anonymous.c
+++ b/res/res_pjsip_endpoint_identifier_anonymous.c
@@ -119,6 +119,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Anonymous endpoint identifier",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_DEFAULT,
diff --git a/res/res_pjsip_endpoint_identifier_ip.c b/res/res_pjsip_endpoint_identifier_ip.c
index f52b4447d..294c4455d 100644
--- a/res/res_pjsip_endpoint_identifier_ip.c
+++ b/res/res_pjsip_endpoint_identifier_ip.c
@@ -432,6 +432,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP IP endpoint identifier",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.reload = reload_module,
 		.unload = unload_module,
diff --git a/res/res_pjsip_endpoint_identifier_user.c b/res/res_pjsip_endpoint_identifier_user.c
index 4b10bd388..dba3541ca 100644
--- a/res/res_pjsip_endpoint_identifier_user.c
+++ b/res/res_pjsip_endpoint_identifier_user.c
@@ -125,6 +125,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP username endpoint identifier",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_exten_state.c b/res/res_pjsip_exten_state.c
index 55bd90ee0..fb6f72b27 100644
--- a/res/res_pjsip_exten_state.c
+++ b/res/res_pjsip_exten_state.c
@@ -470,6 +470,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Extension State Notifications",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_pjsip_header_funcs.c b/res/res_pjsip_header_funcs.c
index dc9d6aad4..d3a482202 100644
--- a/res/res_pjsip_header_funcs.c
+++ b/res/res_pjsip_header_funcs.c
@@ -617,5 +617,8 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Header Functions",.load =
-				load_module,.unload = unload_module,.load_pri = AST_MODPRI_APP_DEPEND,);
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Header Functions",
+		.support_level = AST_MODULE_SUPPORT_CORE,
+		.load = load_module,
+		.unload = unload_module,
+		.load_pri = AST_MODPRI_APP_DEPEND,);
diff --git a/res/res_pjsip_log_forwarder.c b/res/res_pjsip_log_forwarder.c
index 4b27498ed..7b095bb1f 100644
--- a/res/res_pjsip_log_forwarder.c
+++ b/res/res_pjsip_log_forwarder.c
@@ -118,6 +118,7 @@ static int unload_module(void)
 /* While we don't really export global symbols, we want to load before other
  * modules that do */
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "PJSIP Log Forwarder",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_CHANNEL_DEPEND - 6,
diff --git a/res/res_pjsip_logger.c b/res/res_pjsip_logger.c
index a69ca429c..e1c404489 100644
--- a/res/res_pjsip_logger.c
+++ b/res/res_pjsip_logger.c
@@ -254,6 +254,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Packet Logger",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_messaging.c b/res/res_pjsip_messaging.c
index 86fc42788..f80261417 100644
--- a/res/res_pjsip_messaging.c
+++ b/res/res_pjsip_messaging.c
@@ -768,6 +768,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Messaging Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_multihomed.c b/res/res_pjsip_multihomed.c
index ffa3795a9..30d0fd95a 100644
--- a/res/res_pjsip_multihomed.c
+++ b/res/res_pjsip_multihomed.c
@@ -218,6 +218,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Multihomed Routing Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_mwi.c b/res/res_pjsip_mwi.c
index a8e2d1429..55ef300e8 100644
--- a/res/res_pjsip_mwi.c
+++ b/res/res_pjsip_mwi.c
@@ -909,6 +909,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP MWI resource",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/res/res_pjsip_mwi_body_generator.c b/res/res_pjsip_mwi_body_generator.c
index 9a721dbf4..14c3d6216 100644
--- a/res/res_pjsip_mwi_body_generator.c
+++ b/res/res_pjsip_mwi_body_generator.c
@@ -106,6 +106,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP MWI resource",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_pjsip_nat.c b/res/res_pjsip_nat.c
index 30dae2b29..38d0ddd3c 100644
--- a/res/res_pjsip_nat.c
+++ b/res/res_pjsip_nat.c
@@ -291,6 +291,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP NAT Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_notify.c b/res/res_pjsip_notify.c
index ab5c930bd..bebfe8abe 100644
--- a/res/res_pjsip_notify.c
+++ b/res/res_pjsip_notify.c
@@ -783,6 +783,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "CLI/AMI PJSIP NOTIFY Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.reload = reload_module,
 		.unload = unload_module,
diff --git a/res/res_pjsip_one_touch_record_info.c b/res/res_pjsip_one_touch_record_info.c
index f0ecbbfbf..4d744e358 100644
--- a/res/res_pjsip_one_touch_record_info.c
+++ b/res/res_pjsip_one_touch_record_info.c
@@ -122,6 +122,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP INFO One Touch Recording Support",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_outbound_authenticator_digest.c b/res/res_pjsip_outbound_authenticator_digest.c
index 1e411f1c5..fbd916884 100644
--- a/res/res_pjsip_outbound_authenticator_digest.c
+++ b/res/res_pjsip_outbound_authenticator_digest.c
@@ -159,6 +159,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP authentication resource",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c
index bf03094f7..c4e8e8564 100644
--- a/res/res_pjsip_outbound_registration.c
+++ b/res/res_pjsip_outbound_registration.c
@@ -1300,6 +1300,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Outbound Registration Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.reload = reload_module,
 		.unload = unload_module,
diff --git a/res/res_pjsip_path.c b/res/res_pjsip_path.c
index 28d8b589f..a7ad3f4ce 100644
--- a/res/res_pjsip_path.c
+++ b/res/res_pjsip_path.c
@@ -244,6 +244,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Path Header Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_pidf_body_generator.c b/res/res_pjsip_pidf_body_generator.c
index 690051e13..5d931e94b 100644
--- a/res/res_pjsip_pidf_body_generator.c
+++ b/res/res_pjsip_pidf_body_generator.c
@@ -129,6 +129,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Extension State PIDF Provider",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_pjsip_pidf_digium_body_supplement.c b/res/res_pjsip_pidf_digium_body_supplement.c
index 22cd01be7..eff16a85c 100644
--- a/res/res_pjsip_pidf_digium_body_supplement.c
+++ b/res/res_pjsip_pidf_digium_body_supplement.c
@@ -108,6 +108,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP PIDF Digium presence supplement",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_pjsip_pidf_eyebeam_body_supplement.c b/res/res_pjsip_pidf_eyebeam_body_supplement.c
index 042cbf5e8..a8be55c5a 100644
--- a/res/res_pjsip_pidf_eyebeam_body_supplement.c
+++ b/res/res_pjsip_pidf_eyebeam_body_supplement.c
@@ -107,6 +107,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP PIDF Eyebeam supplement",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c
index 2b283079a..89dd14086 100644
--- a/res/res_pjsip_pubsub.c
+++ b/res/res_pjsip_pubsub.c
@@ -2130,6 +2130,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "PJSIP event resource",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_pjsip_refer.c b/res/res_pjsip_refer.c
index b88396f7a..ff8ceac9e 100644
--- a/res/res_pjsip_refer.c
+++ b/res/res_pjsip_refer.c
@@ -1004,6 +1004,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Blind and Attended Transfer Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_registrar.c b/res/res_pjsip_registrar.c
index f7d082c18..b5cb124ce 100644
--- a/res/res_pjsip_registrar.c
+++ b/res/res_pjsip_registrar.c
@@ -823,6 +823,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Registrar Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_registrar_expire.c b/res/res_pjsip_registrar_expire.c
index 53f34c614..ee168bd8f 100644
--- a/res/res_pjsip_registrar_expire.c
+++ b/res/res_pjsip_registrar_expire.c
@@ -221,6 +221,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Contact Auto-Expiration",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_rfc3326.c b/res/res_pjsip_rfc3326.c
index 66594fef5..e0b193953 100644
--- a/res/res_pjsip_rfc3326.c
+++ b/res/res_pjsip_rfc3326.c
@@ -141,6 +141,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP RFC3326 Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
index 90a2cec46..ca018c86b 100644
--- a/res/res_pjsip_sdp_rtp.c
+++ b/res/res_pjsip_sdp_rtp.c
@@ -1239,6 +1239,7 @@ end:
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP SDP RTP/AVP stream handler",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
diff --git a/res/res_pjsip_send_to_voicemail.c b/res/res_pjsip_send_to_voicemail.c
index c8392de05..3bb5da87a 100644
--- a/res/res_pjsip_send_to_voicemail.c
+++ b/res/res_pjsip_send_to_voicemail.c
@@ -222,6 +222,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP REFER Send to Voicemail Support",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index 96faa64bb..a53be19dd 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -2285,6 +2285,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "PJSIP Session resource",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_t38.c b/res/res_pjsip_t38.c
index 1f83da3bc..c5d0412c4 100644
--- a/res/res_pjsip_t38.c
+++ b/res/res_pjsip_t38.c
@@ -858,6 +858,7 @@ end:
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP T.38 UDPTL Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
diff --git a/res/res_pjsip_transport_websocket.c b/res/res_pjsip_transport_websocket.c
index bae120a19..38b1071e2 100644
--- a/res/res_pjsip_transport_websocket.c
+++ b/res/res_pjsip_transport_websocket.c
@@ -354,6 +354,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP WebSocket Transport Support",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_pjsip_xpidf_body_generator.c b/res/res_pjsip_xpidf_body_generator.c
index aeb313f12..98461a7b4 100644
--- a/res/res_pjsip_xpidf_body_generator.c
+++ b/res/res_pjsip_xpidf_body_generator.c
@@ -170,6 +170,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Extension State PIDF Provider",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_pktccops.c b/res/res_pktccops.c
index 747281952..87727d8ce 100644
--- a/res/res_pktccops.c
+++ b/res/res_pktccops.c
@@ -1511,6 +1511,7 @@ static int reload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "PktcCOPS manager for MGCP",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload_module,
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index bd930295b..55abf6154 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -5040,6 +5040,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk RTP Stack",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload_module,
diff --git a/res/res_rtp_multicast.c b/res/res_rtp_multicast.c
index 7e8b24214..8327cf20a 100644
--- a/res/res_rtp_multicast.c
+++ b/res/res_rtp_multicast.c
@@ -315,6 +315,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Multicast RTP Engine",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_smdi.c b/res/res_smdi.c
index c398d22d7..c7e0ab29a 100644
--- a/res/res_smdi.c
+++ b/res/res_smdi.c
@@ -1433,6 +1433,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Simplified Message Desk Interface (SMDI) Resource",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/res/res_snmp.c b/res/res_snmp.c
index 1bed3ee6f..c7cfa3174 100644
--- a/res/res_snmp.c
+++ b/res/res_snmp.c
@@ -136,6 +136,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "SNMP [Sub]Agent for Asterisk",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		);
diff --git a/res/res_sorcery_astdb.c b/res/res_sorcery_astdb.c
index d04153ea2..e282d8b68 100644
--- a/res/res_sorcery_astdb.c
+++ b/res/res_sorcery_astdb.c
@@ -385,6 +385,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Sorcery Astdb Object Wizard",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_REALTIME_DRIVER,
diff --git a/res/res_sorcery_config.c b/res/res_sorcery_config.c
index 426782d13..d43a4958a 100644
--- a/res/res_sorcery_config.c
+++ b/res/res_sorcery_config.c
@@ -378,6 +378,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Sorcery Configuration File Object Wizard",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_REALTIME_DRIVER,
diff --git a/res/res_sorcery_memory.c b/res/res_sorcery_memory.c
index 6d1d8e5b2..7d398c2eb 100644
--- a/res/res_sorcery_memory.c
+++ b/res/res_sorcery_memory.c
@@ -235,6 +235,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Sorcery In-Memory Object Wizard",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_REALTIME_DRIVER,
diff --git a/res/res_sorcery_realtime.c b/res/res_sorcery_realtime.c
index 656ee0df9..47cd73676 100644
--- a/res/res_sorcery_realtime.c
+++ b/res/res_sorcery_realtime.c
@@ -283,6 +283,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Sorcery Realtime Object Wizard",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_REALTIME_DRIVER,
diff --git a/res/res_speech.c b/res/res_speech.c
index 0e4352da4..7d75985ca 100644
--- a/res/res_speech.c
+++ b/res/res_speech.c
@@ -362,6 +362,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Generic Speech Recognition API",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_srtp.c b/res/res_srtp.c
index 48c69a3e5..62115afab 100644
--- a/res/res_srtp.c
+++ b/res/res_srtp.c
@@ -591,6 +591,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Secure RTP (SRTP)",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_stasis.c b/res/res_stasis.c
index cda0d80eb..a64feee48 100644
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -1503,6 +1503,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application support",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	);
diff --git a/res/res_stasis_answer.c b/res/res_stasis_answer.c
index 031aba7ce..4a4670dce 100644
--- a/res/res_stasis_answer.c
+++ b/res/res_stasis_answer.c
@@ -72,6 +72,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application answer support",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis");
diff --git a/res/res_stasis_device_state.c b/res/res_stasis_device_state.c
index 0130909dd..40219c007 100644
--- a/res/res_stasis_device_state.c
+++ b/res/res_stasis_device_state.c
@@ -411,6 +411,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application device state support",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis");
diff --git a/res/res_stasis_mailbox.c b/res/res_stasis_mailbox.c
index 62f19f555..d061d70ec 100644
--- a/res/res_stasis_mailbox.c
+++ b/res/res_stasis_mailbox.c
@@ -159,6 +159,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application mailbox support",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis,res_mwi_external"
diff --git a/res/res_stasis_playback.c b/res/res_stasis_playback.c
index 67d4efc63..832d6fc1b 100644
--- a/res/res_stasis_playback.c
+++ b/res/res_stasis_playback.c
@@ -682,6 +682,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application playback support",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis,res_stasis_recording");
diff --git a/res/res_stasis_recording.c b/res/res_stasis_recording.c
index f74974349..d9e9599cd 100644
--- a/res/res_stasis_recording.c
+++ b/res/res_stasis_recording.c
@@ -651,6 +651,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis application recording support",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis",
diff --git a/res/res_stasis_snoop.c b/res/res_stasis_snoop.c
index c39c8fae2..af31046fc 100644
--- a/res/res_stasis_snoop.c
+++ b/res/res_stasis_snoop.c
@@ -407,6 +407,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application snoop support",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis");
diff --git a/res/res_stasis_test.c b/res/res_stasis_test.c
index 099e1af78..cec8e20c6 100644
--- a/res/res_stasis_test.c
+++ b/res/res_stasis_test.c
@@ -276,6 +276,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis test utilities",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_statsd.c b/res/res_statsd.c
index 65ca78636..2cbd7f09c 100644
--- a/res/res_statsd.c
+++ b/res/res_statsd.c
@@ -317,6 +317,7 @@ static int reload_module(void)
  * be used by any other sort of module.
  */
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Statsd client support",
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload_module,
diff --git a/res/res_stun_monitor.c b/res/res_stun_monitor.c
index c621c014d..1bda4b9ff 100644
--- a/res/res_stun_monitor.c
+++ b/res/res_stun_monitor.c
@@ -471,6 +471,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "STUN Network Monitor",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/res/res_timing_dahdi.c b/res/res_timing_dahdi.c
index 63c80b6fc..1ef5117c7 100644
--- a/res/res_timing_dahdi.c
+++ b/res/res_timing_dahdi.c
@@ -235,6 +235,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "DAHDI Timing Interface",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_TIMING,
diff --git a/res/res_timing_kqueue.c b/res/res_timing_kqueue.c
index 3c0bfcc73..3e2417779 100644
--- a/res/res_timing_kqueue.c
+++ b/res/res_timing_kqueue.c
@@ -334,6 +334,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "KQueue Timing Interface",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
diff --git a/res/res_timing_pthread.c b/res/res_timing_pthread.c
index 9ef8c5d6b..81efbf8e7 100644
--- a/res/res_timing_pthread.c
+++ b/res/res_timing_pthread.c
@@ -476,6 +476,7 @@ static int unload_module(void)
 	return res;
 }
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "pthread Timing Interface",
+		.support_level = AST_MODULE_SUPPORT_EXTENDED,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_TIMING,
diff --git a/res/res_timing_timerfd.c b/res/res_timing_timerfd.c
index 07292a6b2..6d5400bc3 100644
--- a/res/res_timing_timerfd.c
+++ b/res/res_timing_timerfd.c
@@ -272,6 +272,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Timerfd Timing Interface",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.load_pri = AST_MODPRI_TIMING,
diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index 758a5f09a..f5734ce04 100644
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -4638,6 +4638,7 @@ static int reload(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Asterisk XMPP Interface",
+		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
diff --git a/res/snmp/agent.c b/res/snmp/agent.c
index 886363429..abaf37224 100644
--- a/res/snmp/agent.c
+++ b/res/snmp/agent.c
@@ -761,7 +761,8 @@ static u_char *ast_var_indications_table(struct variable *vp, oid *name, size_t
 	return NULL;
 }
 
-static int countmodule(const char *mod, const char *desc, int use, const char *status, const char *like)
+static int countmodule(const char *mod, const char *desc, int use, const char *status,
+		const char *like, enum ast_module_support_level support_level)
 {
 	return 1;
 }
author	Mark Michelson <mmichelson@digium.com>	2014-07-25 16:47:17 +0000
committer	Mark Michelson <mmichelson@digium.com>	2014-07-25 16:47:17 +0000
commit	dcf1ad14da48db3476dcaeeb3d3fb6b7d00a28ca (patch)
tree	bd9312d3192f4fbb97cb217093b85e75d1346cf6
parent	355dc3d2ad98db624184a797206ccb88f4b8a526 (diff)