Fix agent parsing of users.conf

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43382 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 148da42669ed3214e4488ead9f6ed89f35ec1cf3..92027fb5ecc3f631d5f3bea1f089e5cddf740a8f 100644 (file)
--- 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);