diff options
Diffstat (limited to 'channels/chan_agent.c')
| -rw-r--r-- | channels/chan_agent.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 4163072b6..036090166 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -2568,16 +2568,17 @@ static int agent_devicestate(void *data) return res; } +/*! + * \note This function expects the agent list to be locked + */ static struct agent_pvt *find_agent(char *agentid) { struct agent_pvt *cur; - AST_LIST_LOCK(&agents); AST_LIST_TRAVERSE(&agents, cur, list) { if (!strcmp(cur->agent, agentid)) break; } - AST_LIST_UNLOCK(&agents); return cur; } @@ -2605,7 +2606,10 @@ static int function_agent(struct ast_channel *chan, char *cmd, char *data, char if (!args.item) args.item = "status"; + AST_LIST_LOCK(&agents); + if (!(agent = find_agent(args.agentid))) { + AST_LIST_UNLOCK(&agents); ast_log(LOG_WARNING, "Agent '%s' not found!\n", args.agentid); return -1; } @@ -2631,6 +2635,8 @@ static int function_agent(struct ast_channel *chan, char *cmd, char *data, char } else if (!strcasecmp(args.item, "exten")) ast_copy_string(buf, agent->loginchan, len); + AST_LIST_UNLOCK(&agents); + return 0; } |