diff options
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/app.h | 9 | ||||
| -rw-r--r-- | include/asterisk/channel.h | 9 | ||||
| -rw-r--r-- | include/asterisk/module.h | 53 | ||||
| -rw-r--r-- | include/asterisk/pbx.h | 55 |
4 files changed, 66 insertions, 60 deletions
diff --git a/include/asterisk/app.h b/include/asterisk/app.h index 0529f9258..656e8390f 100644 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -23,6 +23,8 @@ #ifndef _ASTERISK_APP_H #define _ASTERISK_APP_H +struct ast_flags64; + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif @@ -227,12 +229,7 @@ int ast_unlock_path(const char *path); /*! Read a file into asterisk*/ char *ast_read_textfile(const char *file); -struct ast_group_info { - struct ast_channel *chan; - char *category; - char *group; - AST_LIST_ENTRY(ast_group_info) list; -}; +struct ast_group_info; /*! Split a group string into group and category, returning a default category if none is provided. */ int ast_app_group_split_group(const char *data, char *group, int group_max, char *category, int category_max); diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index b79c0c29c..5e2213c3a 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1442,6 +1442,15 @@ struct ast_variable *ast_channeltype_list(void); */ const char *ast_channel_reason2str(int reason); +/*! \brief channel group info + */ +struct ast_group_info { + struct ast_channel *chan; + char *category; + char *group; + AST_LIST_ENTRY(ast_group_info) list; +}; + #if defined(__cplusplus) || defined(c_plusplus) } diff --git a/include/asterisk/module.h b/include/asterisk/module.h index 4091045f8..1b257ed15 100644 --- a/include/asterisk/module.h +++ b/include/asterisk/module.h @@ -370,6 +370,59 @@ static void __restore_globals(void) ) #endif +/*! + * \brief Register an application. + * + * \param app Short name of the application + * \param execute a function callback to execute the application. It should return + * non-zero if the channel needs to be hung up. + * \param synopsis a short description (one line synopsis) of the application + * \param description long description with all of the details about the use of + * the application + * + * This registers an application with Asterisk's internal application list. + * \note The individual applications themselves are responsible for registering and unregistering + * and unregistering their own CLI commands. + * + * \retval 0 success + * \retval -1 failure. + */ +#define ast_register_application(app, execute, synopsis, description) ast_register_application2(app, execute, synopsis, description, ast_module_info->self) + +/*! + * \brief Register an application. + * + * \param app Short name of the application + * \param execute a function callback to execute the application. It should return + * non-zero if the channel needs to be hung up. + * \param synopsis a short description (one line synopsis) of the application + * \param description long description with all of the details about the use of + * the application + * \param mod module this application belongs to + * + * This registers an application with Asterisk's internal application list. + * \note The individual applications themselves are responsible for registering and unregistering + * and unregistering their own CLI commands. + * + * \retval 0 success + * \retval -1 failure. + */ +int ast_register_application2(const char *app, int (*execute)(struct ast_channel *, void *), + const char *synopsis, const char *description, void *mod); + +/*! + * \brief Unregister an application + * + * \param app name of the application (does not have to be the same string as the one that was registered) + * + * This unregisters an application from Asterisk's internal application list. + * + * \retval 0 success + * \retval -1 failure + */ +int ast_unregister_application(const char *app); + + #if defined(__cplusplus) || defined(c_plusplus) } #endif diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index 3479d6f2b..61617f5a2 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -24,8 +24,7 @@ #define _ASTERISK_PBX_H #include "asterisk/sched.h" -#include "asterisk/channel.h" -#include "asterisk/linkedlists.h" +#include "asterisk/chanvars.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { @@ -301,58 +300,6 @@ int ast_add_extension2(struct ast_context *con, int replace, const char *extensi /*! - * \brief Register an application. - * - * \param app Short name of the application - * \param execute a function callback to execute the application. It should return - * non-zero if the channel needs to be hung up. - * \param synopsis a short description (one line synopsis) of the application - * \param description long description with all of the details about the use of - * the application - * - * This registers an application with Asterisk's internal application list. - * \note The individual applications themselves are responsible for registering and unregistering - * and unregistering their own CLI commands. - * - * \retval 0 success - * \retval -1 failure. - */ -#define ast_register_application(app, execute, synopsis, description) ast_register_application2(app, execute, synopsis, description, ast_module_info->self) - -/*! - * \brief Register an application. - * - * \param app Short name of the application - * \param execute a function callback to execute the application. It should return - * non-zero if the channel needs to be hung up. - * \param synopsis a short description (one line synopsis) of the application - * \param description long description with all of the details about the use of - * the application - * \param mod module this application belongs to - * - * This registers an application with Asterisk's internal application list. - * \note The individual applications themselves are responsible for registering and unregistering - * and unregistering their own CLI commands. - * - * \retval 0 success - * \retval -1 failure. - */ -int ast_register_application2(const char *app, int (*execute)(struct ast_channel *, void *), - const char *synopsis, const char *description, void *mod); - -/*! - * \brief Unregister an application - * - * \param app name of the application (does not have to be the same string as the one that was registered) - * - * This unregisters an application from Asterisk's internal application list. - * - * \retval 0 success - * \retval -1 failure - */ -int ast_unregister_application(const char *app); - -/*! * \brief Uses hint and devicestate callback to get the state of an extension * * \param c this is not important |