diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-01-31 19:13:20 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-01-31 19:13:20 +0000 |
| commit | e3caa423110952bf00092c801512abfae0ceb59d (patch) | |
| tree | b928f8c56f1087c4af68bf13f0cefc07dec51454 | |
| parent | 7492c04a23ed767440b3193e0fdc9ddd85e4dfc2 (diff) | |
Merged revisions 101413-101414 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r101413 | russell | 2008-01-31 13:04:52 -0600 (Thu, 31 Jan 2008) | 2 lines
Add missing locking to the find_agent() function.
........
r101414 | russell | 2008-01-31 13:07:46 -0600 (Thu, 31 Jan 2008) | 3 lines
Move the locking from find_agent() into the agent dialplan function handler to
ensure that the agent doesn't disappear while we're looking at it.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101416 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_agent.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index f95ad8a8b..36066cb52 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -2242,6 +2242,9 @@ 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; @@ -2277,7 +2280,10 @@ static int function_agent(struct ast_channel *chan, const char *cmd, char *data, 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; } @@ -2303,6 +2309,8 @@ static int function_agent(struct ast_channel *chan, const char *cmd, char *data, } else if (!strcasecmp(args.item, "exten")) ast_copy_string(buf, agent->loginchan, len); + AST_LIST_UNLOCK(&agents); + return 0; } |