kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-02 02:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

asterisk: Export additional manager functions

Browse Source 
Rename check_manager_enabled() and check_webmanager_enabled() to begin
with ast_ so that the symbols are automatically exported by the
linker.

ASTERISK~29184

Change-Id: I85762b9a5d14500c15f6bad6507138c8858644c9
This commit is contained in:
Sean Bright
2020-12-18 10:16:38 -05:00
committed by George Joseph
parent 3c8598ffef
commit 68d3d3af6f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asterisk/manager.h
View File

@@ -115,10 +115,10 @@ struct manager_custom_hook {
};
/*! \brief Check if AMI is enabled */
int check_manager_enabled(void);
int ast_manager_check_enabled(void);
/*! \brief Check if AMI/HTTP is enabled */
int check_webmanager_enabled(void);
int ast_webmanager_check_enabled(void);
/*! Add a custom hook to be called when an event is fired
\param hook struct manager_custom_hook object to add

4
main/asterisk.c
View File

@@ -537,8 +537,8 @@ static char *handle_show_settings(struct ast_cli_entry *e, int cmd, struct ast_c
ast_cli(a->fd, "\n* Subsystems\n");
ast_cli(a->fd, " -------------\n");
ast_cli(a->fd, " Manager (AMI): %s\n", check_manager_enabled() ? "Enabled" : "Disabled");
ast_cli(a->fd, " Web Manager (AMI/HTTP): %s\n", check_webmanager_enabled() ? "Enabled" : "Disabled");
ast_cli(a->fd, " Manager (AMI): %s\n", ast_manager_check_enabled() ? "Enabled" : "Disabled");
ast_cli(a->fd, " Web Manager (AMI/HTTP): %s\n", ast_webmanager_check_enabled() ? "Enabled" : "Disabled");
ast_cli(a->fd, " Call data records: %s\n", ast_cdr_is_enabled() ? "Enabled" : "Disabled");
ast_cli(a->fd, " Realtime Architecture (ARA): %s\n", ast_realtime_enabled() ? "Enabled" : "Disabled");

6
main/manager.c
View File

@@ -1946,12 +1946,12 @@ void ast_manager_unregister_hook(struct manager_custom_hook *hook)
AST_RWLIST_UNLOCK(&manager_hooks);
}
int check_manager_enabled(void)
int ast_manager_check_enabled(void)
{
return manager_enabled;
}
int check_webmanager_enabled(void)
int ast_webmanager_check_enabled(void)
{
return (webmanager_enabled && manager_enabled);
}
@@ -6309,7 +6309,7 @@ static int action_coresettings(struct mansession *s, const struct message *m)
ast_option_maxfiles,
AST_CLI_YESNO(ast_realtime_enabled()),
AST_CLI_YESNO(ast_cdr_is_enabled()),
AST_CLI_YESNO(check_webmanager_enabled())
AST_CLI_YESNO(ast_webmanager_check_enabled())
);
return 0;
}