diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-20 22:09:45 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-20 22:09:45 +0000 |
commit | 4f5e1963faefaca0be3cc09c9ec9ea322667e81a (patch) | |
tree | 03ea919e72259245de6f8b479ded85c9fc480f1e | |
parent | f0072e221bbfa334dcc0b314b00161def67d67f8 (diff) |
Fix agent parsing of users.conf
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43382 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_agent.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 148da4266..92027fb5e 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -1006,9 +1006,13 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state) static int read_agent_config(void) { struct ast_config *cfg; + struct ast_config *ucfg; struct ast_variable *v; struct agent_pvt *p; const char *general_val; + const char *catname; + const char *hasagent; + int genhasagent; group = 0; autologoff = 0; @@ -1104,6 +1108,28 @@ static int read_agent_config(void) } 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) { if (p->dead) { AST_LIST_REMOVE_CURRENT(&agents, list); |