From 572a508ef2ae7cd86e0ffd8ad6d1c5997e988c26 Mon Sep 17 00:00:00 2001
From: Corey Farrell <git@cfware.com>
Date: Fri, 16 Feb 2018 22:11:42 -0500
Subject: loader: Convert reload_classes to built-in modules.

* acl (named_acl.c)
* cdr
* cel
* ccss
* dnsmgr
* dsp
* enum
* extconfig (config.c)
* features
* http
* indications
* logger
* manager
* plc
* sounds
* udptl

These modules are now loaded at appropriate time by the module loader.
Unlike loadable modules these use AST_MODULE_LOAD_FAILURE on error so
the module loader will abort startup on failure of these modules.

Some of these modules are still initialized or shutdown from outside the
module loader.  logger.c is initialized very early and shutdown very
late, manager.c is initialized by the module loader but is shutdown by
the Asterisk core (too much uses it without holding references).

Change-Id: I371a9a45064f20026c492623ea8062d02a1ab97f
---
 cel/cel_beanstalkd.c     | 1 +
 cel/cel_custom.c         | 1 +
 cel/cel_manager.c        | 1 +
 cel/cel_odbc.c           | 1 +
 cel/cel_pgsql.c          | 1 +
 cel/cel_radius.c         | 1 +
 cel/cel_sqlite3_custom.c | 1 +
 cel/cel_tds.c            | 1 +
 8 files changed, 8 insertions(+)

(limited to 'cel')

diff --git a/cel/cel_beanstalkd.c b/cel/cel_beanstalkd.c
index e6f23808c..fe4f430e9 100644
--- a/cel/cel_beanstalkd.c
+++ b/cel/cel_beanstalkd.c
@@ -272,4 +272,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Beanstalkd CEL Backen
 	.unload = unload_module,
 	.reload = reload,
 	.load_pri = AST_MODPRI_CDR_DRIVER,
+	.requires = "cel",
 );
diff --git a/cel/cel_custom.c b/cel/cel_custom.c
index 9c81ee1d4..73423a362 100644
--- a/cel/cel_custom.c
+++ b/cel/cel_custom.c
@@ -223,4 +223,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable Comma Se
 	.unload = unload_module,
 	.reload = reload,
 	.load_pri = AST_MODPRI_CDR_DRIVER,
+	.requires = "cel",
 );
diff --git a/cel/cel_manager.c b/cel/cel_manager.c
index 365bb70c2..e485aab49 100644
--- a/cel/cel_manager.c
+++ b/cel/cel_manager.c
@@ -380,4 +380,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk Manager Inte
 	.unload = unload_module,
 	.reload = reload,
 	.load_pri = AST_MODPRI_CDR_DRIVER,
+	.requires = "cel",
 );
diff --git a/cel/cel_odbc.c b/cel/cel_odbc.c
index b4967b647..04d37346d 100644
--- a/cel/cel_odbc.c
+++ b/cel/cel_odbc.c
@@ -856,4 +856,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ODBC CEL backend",
 	.unload = unload_module,
 	.reload = reload,
 	.load_pri = AST_MODPRI_CDR_DRIVER,
+	.requires = "cel,res_odbc",
 );
diff --git a/cel/cel_pgsql.c b/cel/cel_pgsql.c
index eb8f5d836..77dd46ae7 100644
--- a/cel/cel_pgsql.c
+++ b/cel/cel_pgsql.c
@@ -709,4 +709,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PostgreSQL CEL Backen
 	.unload = unload_module,
 	.reload = reload,
 	.load_pri = AST_MODPRI_CDR_DRIVER,
+	.requires = "cel",
 );
diff --git a/cel/cel_radius.c b/cel/cel_radius.c
index 250d6a778..4e87f86d5 100644
--- a/cel/cel_radius.c
+++ b/cel/cel_radius.c
@@ -259,4 +259,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "RADIUS CEL Backend",
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_CDR_DRIVER,
+	.requires = "cel",
 );
diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c
index 5675da6b3..db38eaf3e 100644
--- a/cel/cel_sqlite3_custom.c
+++ b/cel/cel_sqlite3_custom.c
@@ -360,4 +360,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite3 Custom CEL Mo
 	.unload = unload_module,
 	.reload = reload,
 	.load_pri = AST_MODPRI_CDR_DRIVER,
+	.requires = "cel",
 );
diff --git a/cel/cel_tds.c b/cel/cel_tds.c
index 0859fab7a..0aa73e522 100644
--- a/cel/cel_tds.c
+++ b/cel/cel_tds.c
@@ -580,4 +580,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "FreeTDS CEL Backend",
 	.unload = unload_module,
 	.reload = reload,
 	.load_pri = AST_MODPRI_CDR_DRIVER,
+	.requires = "cel",
 );
-- 
cgit v1.2.3