diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-31 19:17:05 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-31 19:17:05 +0000 |
| commit | 8be71b1a0bc293f6f058a9292a6dcf99b163bf73 (patch) | |
| tree | 84059f31ea7e62e0a594e7d9b0b7ca0b3ef8289e /channels | |
| parent | 3f6c8f3c15384124baebcf4459a451b26b0f3157 (diff) | |
Add more missing locking of the agents list ...
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@101433 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_agent.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 036090166..08a29a7d6 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -1571,6 +1571,7 @@ static int agent_logoff(const char *agent, int soft) long logintime; int ret = -1; /* Return -1 if no agent if found */ + AST_LIST_LOCK(&agents); AST_LIST_TRAVERSE(&agents, p, list) { if (!strcasecmp(p->agent, agent)) { ret = 0; @@ -1590,6 +1591,7 @@ static int agent_logoff(const char *agent, int soft) break; } } + AST_LIST_UNLOCK(&agents); return ret; } @@ -1644,20 +1646,26 @@ static int action_agent_logoff(struct mansession *s, const struct message *m) static char *complete_agent_logoff_cmd(const char *line, const char *word, int pos, int state) { + char *ret = NULL; + if (pos == 2) { struct agent_pvt *p; char name[AST_MAX_AGENT]; int which = 0, len = strlen(word); + AST_LIST_LOCK(&agents); AST_LIST_TRAVERSE(&agents, p, list) { snprintf(name, sizeof(name), "Agent/%s", p->agent); - if (!strncasecmp(word, name, len) && ++which > state) - return ast_strdup(name); + if (!strncasecmp(word, name, len) && ++which > state) { + ret = ast_strdup(name); + break; + } } + AST_LIST_UNLOCK(&agents); } else if (pos == 3 && state == 0) return ast_strdup("soft"); - return NULL; + return ret; } /*! |