Merged revisions 241227 via svnmerge from
authorJeff Peeler <jpeeler@digium.com>
Tue, 19 Jan 2010 18:46:11 +0000 (18:46 +0000)
committerJeff Peeler <jpeeler@digium.com>
Tue, 19 Jan 2010 18:46:11 +0000 (18:46 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r241227 | jpeeler | 2010-01-19 11:22:18 -0600 (Tue, 19 Jan 2010) | 13 lines

  Fix deadlock in agent_read by removing call to agent_logoff.

  One must always lock the agents list lock before the agent private. agent_read
  locks the private immediately, so locking the agents list lock is not an
  option (which is what agent_logoff requires). Because agent_read already
  has access to the agent private all that is necessary is to do the required
  hanging up that agent_logoff performed.

  (closes issue #16321)
  Reported by: valon24
  Patches:
        bug16321.patch uploaded by jpeeler (license 325)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@241314 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_agent.c

index 0bc35c0..b2624f0 100644 (file)
@@ -562,7 +562,25 @@ static struct ast_frame *agent_read(struct ast_channel *ast)
                        int howlong = cur_time - p->start;
                        if (p->autologoff && (howlong >= p->autologoff)) {
                                ast_log(LOG_NOTICE, "Agent '%s' didn't answer/confirm within %d seconds (waited %d)\n", p->name, p->autologoff, howlong);
-                               agent_logoff(p->agent, 0);
+                               if (p->owner || p->chan) {
+                                       while (p->owner && ast_channel_trylock(p->owner)) {
+                                               DEADLOCK_AVOIDANCE(&p->lock);
+                                       }
+                                       if (p->owner) {
+                                               ast_softhangup(p->owner, AST_SOFTHANGUP_EXPLICIT);
+                                               ast_channel_unlock(p->owner);
+                                       }
+
+                                       while (p->chan && ast_channel_trylock(p->chan)) {
+                                               DEADLOCK_AVOIDANCE(&p->lock);
+                                       }
+                                       if (p->chan) {
+                                               ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT);
+                                               ast_channel_unlock(p->chan);
+                                       }
+                               } else {
+                                       p->deferlogoff = 1;
+                               }
                        }
                }
                switch (f->frametype) {