<p>George Joseph has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/13455">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "chan_dahdi: set CHANNEL(hangupsource) when a PRI channel hangs up"<br><br>There are reports that this commit causes deadlocks when issuing<br>a "pri show" CLI command and a channel is in the process of being<br>hung up.  Further work is in progress to determine the cause of<br>the deadlock and provide a permanent fix.<br><br>ASTERISK~28605  #keeping open<br>Reported by: Dirk Wendland<br><br>This reverts commit c6b17b521231dde9da890d95ee705c93953bab8c.<br><br>Change-Id: Iddd900c1abdd5074ff39c17cdce855f2f436cef9<br>---<br>M channels/sig_pri.c<br>1 file changed, 3 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/55/13455/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/sig_pri.c b/channels/sig_pri.c</span><br><span>index 2cf0df2..f7a1845 100644</span><br><span>--- a/channels/sig_pri.c</span><br><span>+++ b/channels/sig_pri.c</span><br><span>@@ -1391,25 +1391,14 @@</span><br><span>  */</span><br><span> static void sig_pri_queue_hangup(struct sig_pri_span *pri, int chanpos)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   struct ast_channel *owner;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>   if (sig_pri_callbacks.queue_control) {</span><br><span>               sig_pri_callbacks.queue_control(pri->pvts[chanpos]->chan_pvt, AST_CONTROL_HANGUP);</span><br><span>     }</span><br><span> </span><br><span>        sig_pri_lock_owner(pri, chanpos);</span><br><span style="color: hsl(0, 100%, 40%);">-       owner = pri->pvts[chanpos]->owner;</span><br><span style="color: hsl(0, 100%, 40%);">-        if (owner) {</span><br><span style="color: hsl(0, 100%, 40%);">-            ao2_ref(owner, +1);</span><br><span style="color: hsl(0, 100%, 40%);">-             ast_queue_hangup(owner);</span><br><span style="color: hsl(0, 100%, 40%);">-                ast_channel_unlock(owner);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-              /* Tell the CDR this DAHDI channel hung up */</span><br><span style="color: hsl(0, 100%, 40%);">-           sig_pri_unlock_private(pri->pvts[chanpos]);</span><br><span style="color: hsl(0, 100%, 40%);">-          ast_set_hangupsource(owner, ast_channel_name(owner), 0);</span><br><span style="color: hsl(0, 100%, 40%);">-                sig_pri_lock_private(pri->pvts[chanpos]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-            ao2_ref(owner, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (pri->pvts[chanpos]->owner) {</span><br><span style="color: hsl(120, 100%, 40%);">+                ast_queue_hangup(pri->pvts[chanpos]->owner);</span><br><span style="color: hsl(120, 100%, 40%);">+            ast_channel_unlock(pri->pvts[chanpos]->owner);</span><br><span>         }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/13455">change 13455</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/13455"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16.7 </div>
<div style="display:none"> Gerrit-Change-Id: Iddd900c1abdd5074ff39c17cdce855f2f436cef9 </div>
<div style="display:none"> Gerrit-Change-Number: 13455 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>