kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-27 14:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix agent parsing of users.conf

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43382 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2006-09-20 22:09:45 +00:00
parent 9a147c678c
commit c58ae729cd
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
channels/chan_agent.c
View File

@@ -1006,9 +1006,13 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state)
static int read_agent_config(void) static int read_agent_config(void)
{ {
struct ast_config *cfg; struct ast_config *cfg;
struct ast_config *ucfg;
struct ast_variable *v; struct ast_variable *v;
struct agent_pvt *p; struct agent_pvt *p;
const char *general_val; const char *general_val;
const char *catname;
const char *hasagent;
int genhasagent;
group = 0; group = 0;
autologoff = 0; autologoff = 0;
@@ -1104,6 +1108,28 @@ static int read_agent_config(void)
} }
v = v->next; v = v->next;
} }
if ((ucfg = ast_config_load("users.conf"))) {
genhasagent = ast_true(ast_variable_retrieve(ucfg, "general", "hasagent"));
catname = ast_category_browse(ucfg, NULL);
while(catname) {
if (strcasecmp(catname, "general")) {
hasagent = ast_variable_retrieve(ucfg, catname, "hasagent");
if (ast_true(hasagent) || (!hasagent && genhasagent)) {
char tmp[256];
const char *fullname = ast_variable_retrieve(ucfg, catname, "fullname");
const char *secret = ast_variable_retrieve(ucfg, catname, "secret");
if (!fullname)
fullname = "";
if (!secret)
secret = "";
snprintf(tmp, sizeof(tmp), "%s,%s,%s", catname, secret,fullname);
add_agent(tmp, 0);
}
}
catname = ast_category_browse(ucfg, catname);
}
ast_config_destroy(ucfg);
}
AST_LIST_TRAVERSE_SAFE_BEGIN(&agents, p, list) { AST_LIST_TRAVERSE_SAFE_BEGIN(&agents, p, list) {
if (p->dead) { if (p->dead) {
AST_LIST_REMOVE_CURRENT(&agents, list); AST_LIST_REMOVE_CURRENT(&agents, list);