summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2018-02-16 22:11:42 -0500
committerCorey Farrell <git@cfware.com>2018-03-14 05:20:12 -0400
commit572a508ef2ae7cd86e0ffd8ad6d1c5997e988c26 (patch)
treea0dcfa18f8a4a9d3e87eac3b2a7df33ac2fbcad6 /include
parentfee929c8acd788a77982b537953bf4053242057e (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/_private.h19
-rw-r--r--include/asterisk/acl.h18
-rw-r--r--include/asterisk/ccss.h11
-rw-r--r--include/asterisk/cdr.h6
-rw-r--r--include/asterisk/config.h9
-rw-r--r--include/asterisk/dsp.h12
-rw-r--r--include/asterisk/enum.h3
-rw-r--r--include/asterisk/features_config.h6
-rw-r--r--include/asterisk/logger.h3
-rw-r--r--include/asterisk/manager.h6
-rw-r--r--include/asterisk/module.h15
-rw-r--r--include/asterisk/sounds_index.h8
-rw-r--r--include/asterisk/udptl.h7
13 files changed, 8 insertions, 115 deletions
diff --git a/include/asterisk/_private.h b/include/asterisk/_private.h
index b9f552dd1..431f96108 100644
--- a/include/asterisk/_private.h
+++ b/include/asterisk/_private.h
@@ -33,26 +33,17 @@ int astdb_init(void); /*!< Provided by db.c */
int ast_channels_init(void); /*!< Provided by channel.c */
void ast_builtins_init(void); /*!< Provided by cli.c */
int ast_cli_perms_init(int reload); /*!< Provided by cli.c */
-int dnsmgr_init(void); /*!< Provided by dnsmgr.c */
void dnsmgr_start_refresh(void); /*!< Provided by dnsmgr.c */
-int dnsmgr_reload(void); /*!< Provided by dnsmgr.c */
int ast_dns_system_resolver_init(void); /*!< Provided by dns_system_resolver.c */
void threadstorage_init(void); /*!< Provided by threadstorage.c */
int ast_device_state_engine_init(void); /*!< Provided by devicestate.c */
int astobj2_init(void); /*!< Provided by astobj2.c */
int ast_named_locks_init(void); /*!< Provided by named_locks.c */
int ast_file_init(void); /*!< Provided by file.c */
-int ast_features_init(void); /*!< Provided by features.c */
void ast_autoservice_init(void); /*!< Provided by autoservice.c */
-int ast_http_init(void); /*!< Provided by http.c */
-int ast_http_reload(void); /*!< Provided by http.c */
int ast_tps_init(void); /*!< Provided by taskprocessor.c */
int ast_timing_init(void); /*!< Provided by timing.c */
-int ast_indications_init(void); /*!< Provided by indications.c */
-int ast_indications_reload(void);/*!< Provided by indications.c */
void ast_stun_init(void); /*!< Provided by stun.c */
-int ast_cel_engine_init(void); /*!< Provided by cel.c */
-int ast_cel_engine_reload(void); /*!< Provided by cel.c */
int ast_ssl_init(void); /*!< Provided by ssl.c */
int ast_pj_init(void); /*!< Provided by libasteriskpj.c */
int ast_test_init(void); /*!< Provided by test.c */
@@ -97,13 +88,6 @@ void ast_process_pending_reloads(void);
*/
int ast_xmldoc_load_documentation(void);
-/*!
- * \brief Reload genericplc configuration value from codecs.conf
- *
- * Implementation is in main/channel.c
- */
-int ast_plc_reload(void);
-
/*! \brief initializes the rtp engine arrays */
int ast_rtp_engine_init(void);
@@ -113,9 +97,6 @@ int ast_rtp_engine_init(void);
*/
int ast_parking_stasis_init(void);
-/*! \brief initialize the sounds index */
-int ast_sounds_index_init(void);
-
/*!
* \brief Endpoint support initialization.
* \return 0 on success.
diff --git a/include/asterisk/acl.h b/include/asterisk/acl.h
index bda1c7606..09adc527d 100644
--- a/include/asterisk/acl.h
+++ b/include/asterisk/acl.h
@@ -382,24 +382,6 @@ const char *ast_tos2str(unsigned int tos);
struct ast_ha *ast_named_acl_find(const char *name, int *is_realtime, int *is_undefined);
/*!
- * \brief Initialize and configure the named ACL system.
- *
- * \details
- * This function will prepare the named ACL system for use.
- * For this reason, it needs to be called before other things that use ACLs are initialized.
- */
-int ast_named_acl_init(void);
-
-/*!
- * \brief reload/reconfigure the named ACL system.
- *
- * \details
- * This function is designed to trigger an event upon a successful reload that may update
- * ACL consumers.
- */
-int ast_named_acl_reload(void);
-
-/*!
* \brief a \ref stasis_message_type for changes against a named ACL or the set of all named ACLs
* \since 12
*
diff --git a/include/asterisk/ccss.h b/include/asterisk/ccss.h
index fb17500b6..c006c7639 100644
--- a/include/asterisk/ccss.h
+++ b/include/asterisk/ccss.h
@@ -1618,15 +1618,4 @@ typedef void (*ast_cc_callback_fn)(struct ast_channel *chan, struct ast_cc_confi
*/
int ast_cc_callback(struct ast_channel *inbound, const char * const tech, const char * const dest, ast_cc_callback_fn callback);
-/*!
- * \since 1.8
- * \brief Initialize CCSS
- *
- * Performs startup routines necessary for CC operation.
- *
- * \retval 0 Success
- * \retval nonzero Failure
- */
-int ast_cc_init(void);
-
#endif /* _ASTERISK_CCSS_H */
diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h
index e10da8223..c6b241315 100644
--- a/include/asterisk/cdr.h
+++ b/include/asterisk/cdr.h
@@ -581,12 +581,6 @@ const char *ast_cdr_disp2str(int disposition);
*/
void ast_cdr_setuserfield(const char *channel_name, const char *userfield);
-/*! \brief Reload the configuration file cdr.conf and start/stop CDR scheduling thread */
-int ast_cdr_engine_reload(void);
-
-/*! \brief Load the configuration file cdr.conf and possibly start the CDR scheduling thread */
-int ast_cdr_engine_init(void);
-
/*! Submit any remaining CDRs and prepare for shutdown */
void ast_cdr_engine_term(void);
diff --git a/include/asterisk/config.h b/include/asterisk/config.h
index fd9641e99..a7b144e27 100644
--- a/include/asterisk/config.h
+++ b/include/asterisk/config.h
@@ -784,15 +784,6 @@ int ast_realtime_append_mapping(const char *name, const char *driver, const char
*/
int register_config_cli(void);
-/*!
- * \brief Exposed re-initialization method for core process
- *
- * \details
- * This method is intended for use only with the core re-initialization and is
- * not designed to be called from any user applications.
- */
-int read_config_maps(void);
-
/*! \brief Create a new base configuration structure */
struct ast_config *ast_config_new(void);
diff --git a/include/asterisk/dsp.h b/include/asterisk/dsp.h
index d092e6b4c..769d3b981 100644
--- a/include/asterisk/dsp.h
+++ b/include/asterisk/dsp.h
@@ -193,16 +193,4 @@ int ast_dsp_get_tcount(struct ast_dsp *dsp);
*/
int ast_dsp_get_threshold_from_settings(enum threshold which);
-/*!
- * \brief Reloads dsp settings from dsp.conf
- * \since 1.6.1
- */
-int ast_dsp_reload(void);
-
-/*!
- * \brief Load dsp settings from dsp.conf
- * \since 1.6.1
- */
-int ast_dsp_init(void);
-
#endif /* _ASTERISK_DSP_H */
diff --git a/include/asterisk/enum.h b/include/asterisk/enum.h
index 877c0c3cf..2ce85ccb3 100644
--- a/include/asterisk/enum.h
+++ b/include/asterisk/enum.h
@@ -97,7 +97,4 @@ int ast_get_enum(struct ast_channel *chan, const char *number, char *location, i
*/
int ast_get_txt(struct ast_channel *chan, const char *number, char *txt, int maxtxt, char *suffix);
-int ast_enum_init(void);
-int ast_enum_reload(void);
-
#endif /* _ASTERISK_ENUM_H */
diff --git a/include/asterisk/features_config.h b/include/asterisk/features_config.h
index 1bce50bba..cd1bbbcea 100644
--- a/include/asterisk/features_config.h
+++ b/include/asterisk/features_config.h
@@ -265,10 +265,4 @@ struct ast_applicationmap_item {
*/
struct ao2_container *ast_get_chan_applicationmap(struct ast_channel *chan);
-void ast_features_config_shutdown(void);
-
-int ast_features_config_reload(void);
-
-int ast_features_config_init(void);
-
#endif /* _FEATURES_CONFIG_H */
diff --git a/include/asterisk/logger.h b/include/asterisk/logger.h
index 8b1e5fe01..df039313c 100644
--- a/include/asterisk/logger.h
+++ b/include/asterisk/logger.h
@@ -133,9 +133,6 @@ int ast_logger_remove_channel(const char *log_channel);
*/
void ast_log_backtrace(void);
-/*! \brief Reload logger without rotating log files */
-int logger_reload(void);
-
/*! \brief Reload logger while rotating log files */
int ast_logger_rotate(void);
diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index 35dc22763..97d4b9c29 100644
--- a/include/asterisk/manager.h
+++ b/include/asterisk/manager.h
@@ -356,12 +356,6 @@ void __attribute__((format(printf, 2, 3))) astman_append(struct mansession *s, c
/*! \brief Determinie if a manager session ident is authenticated */
int astman_is_authed(uint32_t ident);
-/*! \brief Called by Asterisk initialization */
-int init_manager(void);
-
-/*! \brief Called by Asterisk module functions and the CLI command */
-int reload_manager(void);
-
/*!
* \brief Add a datastore to a session
*
diff --git a/include/asterisk/module.h b/include/asterisk/module.h
index ebd41c06d..faa4f7f67 100644
--- a/include/asterisk/module.h
+++ b/include/asterisk/module.h
@@ -292,13 +292,14 @@ enum ast_module_load_priority {
AST_MODPRI_REALTIME_DEPEND = 10, /*!< Dependency for a realtime driver */
AST_MODPRI_REALTIME_DEPEND2 = 20, /*!< Second level dependency for a realtime driver (func_curl needs res_curl, but is needed by res_config_curl) */
AST_MODPRI_REALTIME_DRIVER = 30, /*!< A realtime driver, which provides configuration services for other modules */
- AST_MODPRI_TIMING = 40, /*!< Dependency for a channel (MOH needs timing interfaces to be fully loaded) */
- AST_MODPRI_CHANNEL_DEPEND = 50, /*!< Channel driver dependency (may depend upon realtime, e.g. MOH) */
- AST_MODPRI_CHANNEL_DRIVER = 60, /*!< Channel drivers (provide devicestate) */
- AST_MODPRI_APP_DEPEND = 70, /*!< Dependency for an application */
- AST_MODPRI_DEVSTATE_PROVIDER = 80, /*!< Applications and other modules that _provide_ devicestate (e.g. meetme) */
- AST_MODPRI_DEVSTATE_PLUGIN = 90, /*!< Plugin for a module that provides devstate (e.g. res_calendar_*) */
- AST_MODPRI_CDR_DRIVER = 100, /*!< CDR or CEL backend */
+ AST_MODPRI_CORE = 40, /*!< A core module originally meant to start between preload and load. */
+ AST_MODPRI_TIMING = 50, /*!< Dependency for a channel (MOH needs timing interfaces to be fully loaded) */
+ AST_MODPRI_CHANNEL_DEPEND = 60, /*!< Channel driver dependency (may depend upon realtime, e.g. MOH) */
+ AST_MODPRI_CHANNEL_DRIVER = 70, /*!< Channel drivers (provide devicestate) */
+ AST_MODPRI_APP_DEPEND = 80, /*!< Dependency for an application */
+ AST_MODPRI_DEVSTATE_PROVIDER = 90, /*!< Applications and other modules that _provide_ devicestate (e.g. meetme) */
+ AST_MODPRI_DEVSTATE_PLUGIN = 100, /*!< Plugin for a module that provides devstate (e.g. res_calendar_*) */
+ AST_MODPRI_CDR_DRIVER = 110, /*!< CDR or CEL backend */
AST_MODPRI_DEFAULT = 128, /*!< Modules not otherwise defined (such as most apps) will load here */
AST_MODPRI_DEVSTATE_CONSUMER = 150, /*!< Certain modules, which consume devstate, need to load after all others (e.g. app_queue) */
};
diff --git a/include/asterisk/sounds_index.h b/include/asterisk/sounds_index.h
index d7eb05332..bbd3965f4 100644
--- a/include/asterisk/sounds_index.h
+++ b/include/asterisk/sounds_index.h
@@ -33,14 +33,6 @@ extern "C" {
struct ast_media_index;
/*!
- * \brief Reload the sounds index
- *
- * \retval zero on success
- * \retval non-zero on failure
- */
-int ast_sounds_reindex(void);
-
-/*!
* \brief Get the sounds index
*
* \retval sounds index (must be ao2_cleanup()'ed)
diff --git a/include/asterisk/udptl.h b/include/asterisk/udptl.h
index 7137ff936..0d79d6f66 100644
--- a/include/asterisk/udptl.h
+++ b/include/asterisk/udptl.h
@@ -126,13 +126,6 @@ void ast_udptl_setnat(struct ast_udptl *udptl, int nat);
void ast_udptl_stop(struct ast_udptl *udptl);
-void ast_udptl_init(void);
-
-/*!
- * \version 1.6.1 return changed to int
- */
-int ast_udptl_reload(void);
-
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif