diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index e73795aaeb596b475ec62812b4149a0b86bd1f85..6ca02a70778c9417a846023253541400be8445c1 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -1615,5 +1615,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk ADSI Programmin .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, - .nonoptreq = "res_adsi", ); diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c index 87a9701c3a204ab1619272d55fa6591558142e77..eff9d08254fc596f7fa1fbd5e5b2ad9bfd29b350 100644 --- a/apps/app_getcpeid.c +++ b/apps/app_getcpeid.c @@ -142,5 +142,4 @@ 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_queue.c b/apps/app_queue.c index 6bc2e67161bdbe8690778ed87c2f931128a64a4f..2c7ed2a6fa42278b3a0113e9abafc1b158ac92a9 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -11086,5 +11086,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "True Call Queueing", .unload = unload_module, .reload = reload, .load_pri = AST_MODPRI_DEVSTATE_CONSUMER, - .nonoptreq = "res_monitor", ); diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c index 49b5b304bfe04d06fa5eb2b6b7ca9c13e39e9598..0beccc6ceba3014d863afcf2560488ffc145ce8a 100644 --- a/apps/app_speech_utils.c +++ b/apps/app_speech_utils.c @@ -1005,5 +1005,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Dialplan Speech Applicat .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 4cade64d26f92fcb800e3565003985dc3b534852..cc5c487622f155cb939e7710c6449a7e828ba2bc 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -1322,5 +1322,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT | AST_MODFLAG_LOAD_ORDER, .load = load_module, .unload = unload_module, .load_pri = AST_MODPRI_APP_DEPEND, - .nonoptreq = "res_agi", ); diff --git a/apps/app_stasis.c b/apps/app_stasis.c index 1e5b5673c04e84eae2fab6b0ba2e3f7b668cb980..e0beee2eab8e5ee434560213d8ca87a41a6bebf7 100644 --- a/apps/app_stasis.c +++ b/apps/app_stasis.c @@ -146,5 +146,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis dialplan applicat .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, - .nonoptreq = "res_stasis", ); diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 94af147dec10f7ec72128ac134ad1fac731c4630..96699e6e5b15f3ab0d1eee7729db3c1cad2e43a0 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -16494,5 +16494,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc, .load = load_module, .unload = unload_module, .reload = reload, - .nonoptreq = "res_adsi,res_smdi", ); diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 2f5daae76833104f5a5688226566dacf56a0d6b8..3b05d721709679e454e14901b9159952f0543aa9 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -19857,5 +19857,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, tdesc, .unload = unload_module, .reload = reload, .load_pri = AST_MODPRI_CHANNEL_DRIVER, - .nonoptreq = "res_smdi", ); diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 4e3816e72a54c1b7e9e1d2c45ff8ba535d27db46..7a369e1a749dd19ef157700c14d43a2ca60bbadb 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -15245,5 +15245,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Inter Asterisk eXchan .unload = unload_module, .reload = reload, .load_pri = AST_MODPRI_CHANNEL_DRIVER, - .nonoptreq = "res_crypto", - ); + ); diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index e8c2293cf5db42ec62661f232a2302f9e3d3627a..c9ed1e2f5981bcaa58303e484a817ba172ea9185 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -5016,5 +5016,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Media Gateway Control .unload = unload_module, .reload = reload, .load_pri = AST_MODPRI_CHANNEL_DRIVER, - .nonoptreq = "res_pktccops", ); diff --git a/channels/chan_sip.c b/channels/chan_sip.c index af4f06db7c4280b5a8c0522daef6fd51841fd11a..ebfcfeb18bd9c9fd703dc3d68e7e7d9e614e08c8 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -35740,5 +35740,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Session Initiation Pr .unload = unload_module, .reload = reload, .load_pri = AST_MODPRI_CHANNEL_DRIVER, - .nonoptreq = "res_crypto,res_http_websocket", ); diff --git a/funcs/func_aes.c b/funcs/func_aes.c index c51fe0a6c38b89fa4eeec4555239561401ed7e29..2592dc323513981f2e3cd90e7ee629a3a0366fe3 100644 --- a/funcs/func_aes.c +++ b/funcs/func_aes.c @@ -183,5 +183,4 @@ 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/include/asterisk/module.h b/include/asterisk/module.h index 0b8fbad84f2eb8c50d0e27dcf36f98609d85c3e6..384cf4c168ca1334a76b041cd1ae608c40c74afa 100644 --- a/include/asterisk/module.h +++ b/include/asterisk/module.h @@ -341,9 +341,8 @@ struct ast_module_info { * on load. */ unsigned char load_pri; - /*! Modules which should be loaded first, in comma-separated string format. - * These are only required for loading, when the optional_api header file - * detects that the compiler does not support the optional API featureset. */ + /*! Obsolete! This is not used since the optional_api portability rework. + * This field does nothing and will be removed in future version of Asterisk. */ const char *nonoptreq; /*! The support level for the given module */ enum ast_module_support_level support_level; diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index bbcae06315076a3643a248fba7075cddf9ac340e..d2c9877f9ef83170b4a709f732ad07eb6956b0d1 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -5103,5 +5103,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Distributed Universal Nu .load = load_module, .unload = unload_module, .reload = reload, - .nonoptreq = "res_crypto", ); diff --git a/res/res_ari.c b/res/res_ari.c index 75af26b27615c3d68ac613dbf6b3c3bb2d111904..0554587e1a40c6792201c5b9f38bd6e30bc786a6 100644 --- a/res/res_ari.c +++ b/res/res_ari.c @@ -1194,6 +1194,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ .load = load_module, .unload = unload_module, .reload = reload_module, - .nonoptreq = "res_http_websocket", .load_pri = AST_MODPRI_APP_DEPEND, ); diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c index 290719d36035409cf909a0ab219b57ece0dcdafe..c70b926799b98d60e75e0a2082248874466d24bf 100644 --- a/res/res_ari_applications.c +++ b/res/res_ari_applications.c @@ -520,5 +520,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sta .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 73e4d0ce3a5d9b2f4fdd4fd7a2c8c35fda39dc44..7480ac885028eed11afd135c941f2085adaa3b8e 100644 --- a/res/res_ari_asterisk.c +++ b/res/res_ari_asterisk.c @@ -1241,5 +1241,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Ast .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 b923330956c58f679751efdec38beb87655e1485..0e1bf1c4e343986b9e8b66f5f60c2a1101409104 100644 --- a/res/res_ari_bridges.c +++ b/res/res_ari_bridges.c @@ -1433,5 +1433,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Bri .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 621767980fb2e674d04dc7dd4b4f41c6534045b9..dafca15962f67c076a2299c579c497a428f4bbdd 100644 --- a/res/res_ari_channels.c +++ b/res/res_ari_channels.c @@ -2497,5 +2497,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Cha .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 fe1817d5da66fd590532ba0e5b36f025c21a0b97..f1125b88a4d1e57c8fa46cc79a1d0df44b173ede 100644 --- a/res/res_ari_device_states.c +++ b/res/res_ari_device_states.c @@ -351,5 +351,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Dev .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 a46b0dc610e72b454bf4efb70e66698343314a30..11ce4c394c77c7ba4d8bf74e4be36b8e674c8211 100644 --- a/res/res_ari_endpoints.c +++ b/res/res_ari_endpoints.c @@ -475,5 +475,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - End .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 b6a44d9b93a7546b6ac04aa9dddd9849d85718eb..04c1c7946f26d37d02eedb7fb44745a2e2c78073 100644 --- a/res/res_ari_events.c +++ b/res/res_ari_events.c @@ -467,5 +467,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Web .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 600ecfd48b163db9e7dd22d5b6729ef1579adcc7..22b0ca27345d38fa9625e4cbc24651d8067aa154 100644 --- a/res/res_ari_mailboxes.c +++ b/res/res_ari_mailboxes.c @@ -357,5 +357,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Mai .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, - .nonoptreq = "res_ari,res_stasis", ); diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c index 106463b5b535a4ffd2d5a129cc2ec46a55a496bb..fca079b4f787a8eed98be24bd2b1d6ac4da7af71 100644 --- a/res/res_ari_playbacks.c +++ b/res/res_ari_playbacks.c @@ -309,5 +309,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Pla .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 c43148d836faf6b5caae8bbd3bd3668a922a7c01..033a480f0636ebc310f1167f81fc80aee929fe4a 100644 --- a/res/res_ari_recordings.c +++ b/res/res_ari_recordings.c @@ -825,5 +825,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Rec .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 e58ecd1cf6375ed0e4f5bf9af8f7b9f07bdc1c49..6473985a3dc2a6b8cd42d9c7a890669e9724368d 100644 --- a/res/res_ari_sounds.c +++ b/res/res_ari_sounds.c @@ -239,5 +239,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sou .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, - .nonoptreq = "res_ari,res_stasis", ); diff --git a/res/res_chan_stats.c b/res/res_chan_stats.c index 9104e0e0495eace04797d1e2b1b11ebdfe5829c1..2648d606213f02f40600fa433abf413b613b4530 100644 --- a/res/res_chan_stats.c +++ b/res/res_chan_stats.c @@ -184,5 +184,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Example of how to use St .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, - .nonoptreq = "res_statsd" ); diff --git a/res/res_endpoint_stats.c b/res/res_endpoint_stats.c index e2b4ffa2e7d74b93a0bf07a25e7c5f5ece21f811..85d75e46953f8f2b5c751a642b16a77d8b525d5f 100644 --- a/res/res_endpoint_stats.c +++ b/res/res_endpoint_stats.c @@ -153,5 +153,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Endpoint statistics", .support_level = AST_MODULE_SUPPORT_EXTENDED, .load = load_module, .unload = unload_module, - .nonoptreq = "res_statsd" ); diff --git a/res/res_stasis_answer.c b/res/res_stasis_answer.c index 05d5302fdffec75cbe32d9c1a67381b9f6caef39..5d2e67c459a889c64a137c809ef243b84f4c81be 100644 --- a/res/res_stasis_answer.c +++ b/res/res_stasis_answer.c @@ -75,4 +75,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio .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 9924dd89c45426bb37fb8f9922553c7054a72ee7..34c77d9f095401d451527e21abb07f33a98198f0 100644 --- a/res/res_stasis_device_state.c +++ b/res/res_stasis_device_state.c @@ -484,4 +484,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio .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 6e5e5ffa628bfa66cc83a684c7f56cbf37be9d33..1c6918de09847c53700d55ab9c4c31012e9de0eb 100644 --- a/res/res_stasis_mailbox.c +++ b/res/res_stasis_mailbox.c @@ -163,5 +163,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio .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 57d1fd25838321e1c6103740edbb84628a912884..6a0e6c3cad44808468ae78cbcd124eb92ed26ba7 100644 --- a/res/res_stasis_playback.c +++ b/res/res_stasis_playback.c @@ -688,4 +688,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio .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 5508be8884db62fae86768fccee0f809d3a255c1..93c32c97c47ec0cc90d796fb4daee18d7726d45d 100644 --- a/res/res_stasis_recording.c +++ b/res/res_stasis_recording.c @@ -657,5 +657,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, - .nonoptreq = "res_stasis", - .load_pri = AST_MODPRI_APP_DEPEND); + .load_pri = AST_MODPRI_APP_DEPEND, + ); diff --git a/res/res_stasis_snoop.c b/res/res_stasis_snoop.c index da66894f6d699cef60f1c5400d6af4bbea4f7242..785bbe21e630e33947221b3fc80e4d8b257fba3b 100644 --- a/res/res_stasis_snoop.c +++ b/res/res_stasis_snoop.c @@ -447,4 +447,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio .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 fe015ec73bfe8ecc0c1f8e6dbdc72ff3eb4358f2..fbf4202e072d71bdc93b6e5a7aeef010a53ed515 100644 --- a/res/res_stasis_test.c +++ b/res/res_stasis_test.c @@ -104,8 +104,7 @@ struct stasis_message_sink *stasis_message_sink_create(void) * it has to do with how we load modules. * * Modules have their own metadata compiled into them in the module info block - * at the end of the file. This includes dependency information in the - * \c nonoptreq field. + * at the end of the file. * * Asterisk loads the module, inspects the field, then loads any needed * dependencies. This works because Asterisk passes \c RTLD_LAZY to the initial diff --git a/rest-api-templates/res_ari_resource.c.mustache b/rest-api-templates/res_ari_resource.c.mustache index 0e8635d97e56025b2a6821b77e2a051582d5fd31..40e18556f7e397dbfd769d72116c0be0cb9fa0ad 100644 --- a/rest-api-templates/res_ari_resource.c.mustache +++ b/rest-api-templates/res_ari_resource.c.mustache @@ -305,6 +305,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - {{{ .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, .unload = unload_module, - .nonoptreq = "res_ari,res_stasis", ); {{/api_declaration}} diff --git a/tests/test_ari.c b/tests/test_ari.c index e2c36fb3841ed39d543a723ca48599ab7ec2aebc..6043adf5978a23b9475cb13f2cc603031dd1e6bd 100644 --- a/tests/test_ari.c +++ b/tests/test_ari.c @@ -574,5 +574,4 @@ static int load_module(void) AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ARI testing", .load = load_module, .unload = unload_module, - .nonoptreq = "res_ari", ); diff --git a/tests/test_res_stasis.c b/tests/test_res_stasis.c index 805634f265121c9a942e26560a7a17f4ce72e2de..7b1c8cac2bf49430f18699c7b2e72b37ecc1826f 100644 --- a/tests/test_res_stasis.c +++ b/tests/test_res_stasis.c @@ -196,5 +196,4 @@ static int load_module(void) AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis Core testing", .load = load_module, .unload = unload_module, - .nonoptreq = "res_stasis", ); diff --git a/tests/test_stasis_endpoints.c b/tests/test_stasis_endpoints.c index 17e2d05f08513344312428c57aa7d07960b3c1af..c7645fdf09a4929c54c46b865975e8af5d10c07d 100644 --- a/tests/test_stasis_endpoints.c +++ b/tests/test_stasis_endpoints.c @@ -307,5 +307,4 @@ static int load_module(void) AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Endpoint stasis-related testing", .load = load_module, .unload = unload_module, - .nonoptreq = "res_stasis_test", );