(closes issue #11096)
Patches:
pbx_config.c.patch uploaded by moy (license 222)
pbx_dundi.c.patch uploaded by moy (license 222)
pbx_gtkconsole.c.patch uploaded by moy (license 222)
pbx_loopback.c.patch uploaded by moy (license 222)
pbx_realtime.c.patch uploaded by moy (license 222)
pbx_spool.c.patch uploaded by moy (license 222)
app_adsiprog.c.patch uploaded by moy (license 222)
app_alarmreceiver.c.patch uploaded by moy (license 222)
app_amd.c.patch uploaded by moy (license 222)
app_authenticate.c.patch uploaded by moy (license 222)
app_cdr.c.patch uploaded by moy (license 222)
app_zapateller.c.patch uploaded by moy (license 222)
app_zapbarge.c.patch uploaded by moy (license 222)
app_zapras.c.patch uploaded by moy (license 222)
app_zapscan.c.patch uploaded by moy (license 222)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94806
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
static int load_module(void)
{
- return ast_register_application(app, adsi_exec, synopsis, descrip);
+ if (ast_register_application(app, adsi_exec, synopsis, descrip))
+ return AST_MODULE_LOAD_FAILURE;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Asterisk ADSI Programming Application");
static int load_module(void)
{
- if(load_config())
- return ast_register_application(app, alarmreceiver_exec, synopsis, descrip);
+ if(load_config()) {
+ if (ast_register_application(app, alarmreceiver_exec, synopsis, descrip))
+ return AST_MODULE_LOAD_FAILURE;
+ return AST_MODULE_LOAD_SUCCESS;
+ }
else
return AST_MODULE_LOAD_DECLINE;
}
return 0;
}
-static void load_config(int reload)
+static int load_config(int reload)
{
struct ast_config *cfg = NULL;
char *cat = NULL;
if (!(cfg = ast_config_load("amd.conf", config_flags))) {
ast_log(LOG_ERROR, "Configuration file amd.conf missing.\n");
- return;
+ return -1;
} else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
- return;
+ return 0;
cat = ast_category_browse(cfg, NULL);
dfltInitialSilence, dfltGreeting, dfltAfterGreetingSilence, dfltTotalAnalysisTime,
dfltMinimumWordLength, dfltBetweenWordsSilence, dfltMaximumNumberOfWords, dfltSilenceThreshold );
- return;
+ return 0;
}
static int unload_module(void)
static int load_module(void)
{
- load_config(0);
- return ast_register_application(app, amd_exec, synopsis, descrip);
+ if (load_config(0))
+ return AST_MODULE_LOAD_DECLINE;
+ if (ast_register_application(app, amd_exec, synopsis, descrip))
+ return AST_MODULE_LOAD_FAILURE;
+ return AST_MODULE_LOAD_SUCCESS;
}
static int reload(void)
{
- load_config(1);
- return 0;
+ if (load_config(1))
+ return AST_MODULE_LOAD_DECLINE;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Answering Machine Detection Application",
static int load_module(void)
{
- return ast_register_application(app, auth_exec, synopsis, descrip);
+ if (ast_register_application(app, auth_exec, synopsis, descrip))
+ return AST_MODULE_LOAD_FAILURE;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Authentication Application");
static int load_module(void)
{
- return ast_register_application(nocdr_app, nocdr_exec, nocdr_synopsis, nocdr_descrip);
+ if (ast_register_application(nocdr_app, nocdr_exec, nocdr_synopsis, nocdr_descrip))
+ return AST_MODULE_LOAD_FAILURE;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Tell Asterisk to not maintain a CDR for the current call");
static int load_module(void)
{
- return ast_register_application(app, zapateller_exec, synopsis, descrip);
+ return ((ast_register_application(app, zapateller_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Block Telemarketers with Special Information Tone");
static int load_module(void)
{
- return ast_register_application(app, conf_exec, synopsis, descrip);
+ return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Barge in on Zap channel application");
static int load_module(void)
{
- return ast_register_application(app, zapras_exec, synopsis, descrip);
+ return ((ast_register_application(app, zapras_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Zaptel ISDN Remote Access Server");
static int load_module(void)
{
- return ast_register_application(app, conf_exec, synopsis, descrip);
+ return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Scan Zap channels application");
pbx_set_autofallthrough(autofallthrough_config);
pbx_set_extenpatternmatchnew(extenpatternmatchnew_config);
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
static int load_module(void)
ast_cli_register(&cli_dialplan_save);
ast_cli_register_multiple(cli_pbx_config, sizeof(cli_pbx_config) / sizeof(struct ast_cli_entry));
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
static int reload(void)
{
if (clearglobalvars_config)
pbx_builtin_clear_globals();
- pbx_load_module();
- return 0;
+ return pbx_load_module();
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Text Extension Configuration",
struct sockaddr_in sin;
if (set_config("dundi.conf", &sin, 1))
- return -1;
+ return AST_MODULE_LOAD_FAILURE;
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
static int load_module(void)
}
}
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
static void file_ok_sel(GtkWidget *w, GtkFileSelection *fs)
{
if (pipe(clipipe)) {
ast_log(LOG_WARNING, "Unable to create CLI pipe\n");
- return -1;
+ return AST_MODULE_LOAD_FAILURE;
}
g_thread_init(NULL);
if (gtk_init_check(NULL, NULL)) {
else
ast_verb(2, "GTK is not available -- skipping monitor\n");
}
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
static const char *description(void)
static int load_module(void)
{
- ast_register_switch(&loopback_switch);
- return 0;
+ if (ast_register_switch(&loopback_switch))
+ return AST_MODULE_LOAD_FAILURE;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Loopback Switch");
static int load_module(void)
{
- ast_register_switch(&realtime_switch);
- return 0;
+ if (ast_register_switch(&realtime_switch))
+ return AST_MODULE_LOAD_FAILURE;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Realtime Switch");
snprintf(qdir, sizeof(qdir), "%s/%s", ast_config_AST_SPOOL_DIR, "outgoing");
if (ast_mkdir(qdir, 0777)) {
ast_log(LOG_WARNING, "Unable to create queue directory %s -- outgoing spool disabled\n", qdir);
- return 0;
+ return AST_MODULE_LOAD_DECLINE;
}
snprintf(qdonedir, sizeof(qdir), "%s/%s", ast_config_AST_SPOOL_DIR, "outgoing_done");
if ((ret = ast_pthread_create_detached_background(&thread, NULL, scan_thread, NULL))) {
ast_log(LOG_WARNING, "Unable to create thread :( (returned error: %d)\n", ret);
- return -1;
+ return AST_MODULE_LOAD_FAILURE;
}
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Outgoing Spool Support");