08af5bb312
when a file is invalid from when a file is missing. This is most important when we have two configuration files. Consider the following example: Old system: sip.conf users.conf Old result New result ======== ========== ========== ========== Missing Missing SIP doesn't load SIP doesn't load Missing OK SIP doesn't load SIP doesn't load Missing Invalid SIP doesn't load SIP doesn't load OK Missing SIP loads SIP loads OK OK SIP loads SIP loads OK Invalid SIP loads incompletely SIP doesn't load Invalid Missing SIP doesn't load SIP doesn't load Invalid OK SIP doesn't load SIP doesn't load Invalid Invalid SIP doesn't load SIP doesn't load So in the case when users.conf doesn't load because there's a typo that disrupts the syntax, we may only partially load users, instead of failing with an error, which may cause some calls not to get processed. Worse yet, the old system would do this with no indication that anything was even wrong. (closes issue #10690) Reported by: dtyoo Patches: 20080716__bug10690.diff.txt uploaded by Corydon76 (license 14) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
122 lines
2.8 KiB
C
122 lines
2.8 KiB
C
/*
|
|
* Copyright (C) 2006 Voop as
|
|
* Thorsten Lockert <tholo@voop.as>
|
|
*
|
|
* This program is free software, distributed under the terms of
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
* at the top of the source tree.
|
|
*/
|
|
|
|
/*! \file
|
|
*
|
|
* \brief SNMP Agent / SubAgent support for Asterisk
|
|
*
|
|
* \author Thorsten Lockert <tholo@voop.as>
|
|
*
|
|
* \extref Uses the Net-SNMP libraries available at
|
|
* http://net-snmp.sourceforge.net/
|
|
*/
|
|
|
|
/*** MODULEINFO
|
|
<depend>netsnmp</depend>
|
|
***/
|
|
|
|
#include "asterisk.h"
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|
|
|
#include "asterisk/channel.h"
|
|
#include "asterisk/module.h"
|
|
|
|
#include "snmp/agent.h"
|
|
|
|
#define MODULE_DESCRIPTION "SNMP [Sub]Agent for Asterisk"
|
|
|
|
int res_snmp_agentx_subagent;
|
|
int res_snmp_dont_stop;
|
|
int res_snmp_enabled;
|
|
|
|
static pthread_t thread = AST_PTHREADT_NULL;
|
|
|
|
/*!
|
|
* \brief Load res_snmp.conf config file
|
|
* \return 1 on load, 0 file does not exist
|
|
*/
|
|
static int load_config(void)
|
|
{
|
|
struct ast_variable *var;
|
|
struct ast_config *cfg;
|
|
struct ast_flags config_flags = { 0 };
|
|
char *cat;
|
|
|
|
res_snmp_enabled = 0;
|
|
res_snmp_agentx_subagent = 1;
|
|
cfg = ast_config_load("res_snmp.conf", config_flags);
|
|
if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEINVALID) {
|
|
ast_log(LOG_WARNING, "Could not load res_snmp.conf\n");
|
|
return 0;
|
|
}
|
|
cat = ast_category_browse(cfg, NULL);
|
|
while (cat) {
|
|
var = ast_variable_browse(cfg, cat);
|
|
|
|
if (strcasecmp(cat, "general") == 0) {
|
|
while (var) {
|
|
if (strcasecmp(var->name, "subagent") == 0) {
|
|
if (ast_true(var->value))
|
|
res_snmp_agentx_subagent = 1;
|
|
else if (ast_false(var->value))
|
|
res_snmp_agentx_subagent = 0;
|
|
else {
|
|
ast_log(LOG_ERROR, "Value '%s' does not evaluate to true or false.\n", var->value);
|
|
ast_config_destroy(cfg);
|
|
return 1;
|
|
}
|
|
} else if (strcasecmp(var->name, "enabled") == 0) {
|
|
res_snmp_enabled = ast_true(var->value);
|
|
} else {
|
|
ast_log(LOG_ERROR, "Unrecognized variable '%s' in category '%s'\n", var->name, cat);
|
|
ast_config_destroy(cfg);
|
|
return 1;
|
|
}
|
|
var = var->next;
|
|
}
|
|
} else {
|
|
ast_log(LOG_ERROR, "Unrecognized category '%s'\n", cat);
|
|
ast_config_destroy(cfg);
|
|
return 1;
|
|
}
|
|
|
|
cat = ast_category_browse(cfg, cat);
|
|
}
|
|
ast_config_destroy(cfg);
|
|
return 1;
|
|
}
|
|
|
|
static int load_module(void)
|
|
{
|
|
if(!load_config())
|
|
return AST_MODULE_LOAD_DECLINE;
|
|
|
|
ast_verb(1, "Loading [Sub]Agent Module\n");
|
|
|
|
res_snmp_dont_stop = 1;
|
|
if (res_snmp_enabled)
|
|
return ast_pthread_create_background(&thread, NULL, agent_thread, NULL);
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
static int unload_module(void)
|
|
{
|
|
ast_verb(1, "Unloading [Sub]Agent Module\n");
|
|
|
|
res_snmp_dont_stop = 0;
|
|
return ((thread != AST_PTHREADT_NULL) ? pthread_join(thread, NULL) : 0);
|
|
}
|
|
|
|
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "SNMP [Sub]Agent for Asterisk",
|
|
.load = load_module,
|
|
.unload = unload_module,
|
|
);
|