diff options
| author | Mark Michelson <mmichelson@digium.com> | 2008-07-02 20:49:08 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2008-07-02 20:49:08 +0000 |
| commit | 1d6573e8ef133747a146e92d4d0318bbdabd9172 (patch) | |
| tree | 59fb1c05081531dc7a898429bd1dad8d2dc5657a /channels | |
| parent | 953947b70be9f809e54b4fceb27eb3cf13bc6236 (diff) | |
Merged revisions 127560 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r127560 | mmichelson | 2008-07-02 15:47:38 -0500 (Wed, 02 Jul 2008) | 3 lines
Fix thread-safety of some of the pbx_builtin_getvar_helper calls
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127562 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_agent.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 7ad929ca1..277ebda09 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -1859,6 +1859,7 @@ static int login_exec(struct ast_channel *chan, void *data) ast_copy_string(agent_goodbye, agentgoodbye, sizeof(agent_goodbye)); + ast_channel_lock(chan); /* Set Channel Specific Login Overrides */ if (!ast_strlen_zero(pbx_builtin_getvar_helper(chan, "AGENTLMAXLOGINTRIES"))) { max_login_tries = atoi(pbx_builtin_getvar_helper(chan, "AGENTMAXLOGINTRIES")); @@ -1880,6 +1881,7 @@ static int login_exec(struct ast_channel *chan, void *data) tmpoptions=pbx_builtin_getvar_helper(chan, "AGENTGOODBYE"); ast_verb(3, "Saw variable AGENTGOODBYE=%s, setting agent_goodbye to: %s on Channel '%s'.\n",tmpoptions,agent_goodbye,chan->name); } + ast_channel_unlock(chan); /* End Channel Specific Login Overrides */ if (!ast_strlen_zero(args.options)) { @@ -1920,6 +1922,8 @@ static int login_exec(struct ast_channel *chan, void *data) /* Check again for accuracy */ AST_LIST_LOCK(&agents); AST_LIST_TRAVERSE(&agents, p, list) { + int unlock_channel = 1; + ast_channel_lock(chan); ast_mutex_lock(&p->lock); if (!strcmp(p->agent, user) && !strcmp(p->password, pass) && !p->pending) { @@ -1964,6 +1968,8 @@ static int login_exec(struct ast_channel *chan, void *data) p->enddtmf = *tmpoptions; ast_verb(3, "Saw variable AGENTENDDTMF=%s, setting enddtmf to: %c for Agent '%s'.\n", tmpoptions, p->enddtmf, p->agent); } + ast_channel_unlock(chan); + unlock_channel = 0; /* End Channel Specific Agent Overrides */ if (!p->chan) { long logintime; @@ -2106,6 +2112,9 @@ static int login_exec(struct ast_channel *chan, void *data) break; } ast_mutex_unlock(&p->lock); + if (unlock_channel) { + ast_channel_unlock(chan); + } } if (!p) AST_LIST_UNLOCK(&agents); |