diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-02 20:49:36 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-02 20:49:36 +0000 |
| commit | e603ca3cd5fdf05d447df7db3f7bf1c23e401666 (patch) | |
| tree | 96647a097d2edf7af8c888b499f12de4426c9e02 | |
| parent | 50162ac4625da1e6951d331d97ea7caf537acc35 (diff) | |
Merged revisions 127562 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r127562 | mmichelson | 2008-07-02 15:49:08 -0500 (Wed, 02 Jul 2008) | 11 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@127563 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 f96fac5cf..eee9ae674 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -1845,6 +1845,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")); @@ -1866,6 +1867,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)) { @@ -1906,6 +1908,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) { @@ -1940,6 +1944,8 @@ static int login_exec(struct ast_channel *chan, void *data) tmpoptions=pbx_builtin_getvar_helper(chan, "AGENTWRAPUPTIME"); ast_verb(3, "Saw variable AGENTWRAPUPTIME=%s, setting wrapuptime to: %d for Agent '%s'.\n",tmpoptions,p->wrapuptime,p->agent); } + ast_channel_unlock(chan); + unlock_channel = 0; /* End Channel Specific Agent Overrides */ if (!p->chan) { long logintime; @@ -2082,6 +2088,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); |