dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@101416 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2008-01-31 19:13:20 +00:00
parent 2272efb190
commit e85aee6f8e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_agent.c
View File

@ -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;
}