<p>N A has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15985">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_dial: Prevent call from hanging<br><br>Addresses the scenario where DTMF is<br>sent upon a Progress event but the called<br>channel hangs up abruptly while this is<br>ongoing, in which case the call is abandoned<br>rather than held in an infinite loop.<br><br>ASTERISK-29428<br><br>Change-Id: I6f2ee3f77b892015bc05513d868f071f279a3c80<br>---<br>M apps/app_dial.c<br>1 file changed, 9 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/85/15985/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_dial.c b/apps/app_dial.c</span><br><span>index d611083..c3055b5 100644</span><br><span>--- a/apps/app_dial.c</span><br><span>+++ b/apps/app_dial.c</span><br><span>@@ -1223,6 +1223,7 @@</span><br><span>     int num_ringing = 0;</span><br><span>         int sent_ring = 0;</span><br><span>   int sent_progress = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+        int failed_frame_forwards = 0;</span><br><span>       struct timeval start = ast_tvnow();</span><br><span>  SCOPE_ENTER(3, "%s\n", ast_channel_name(in));</span><br><span> </span><br><span>@@ -1797,6 +1798,13 @@</span><br><span>                                         if (ast_write(o->chan, f)) {</span><br><span>                                              ast_log(LOG_WARNING, "Unable to forward frametype: %u\n",</span><br><span>                                                  f->frametype);</span><br><span style="color: hsl(120, 100%, 40%);">+                                             /* If we're trying to send DTMF and the call has hung up</span><br><span style="color: hsl(120, 100%, 40%);">+                                          before we could finish, we're stuck in a loop. Abandon call. */</span><br><span style="color: hsl(120, 100%, 40%);">+                                           if (sent_progress == 1 && ++failed_frame_forwards > 100) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                                 ast_log(LOG_WARNING, "Failed to send Progress DTMF. Abandoning call.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                                                   ast_frfree(f);</span><br><span style="color: hsl(120, 100%, 40%);">+                                                        goto wait_over;</span><br><span style="color: hsl(120, 100%, 40%);">+                                               }</span><br><span>                                    }</span><br><span>                                    break;</span><br><span>                               case AST_FRAME_CONTROL:</span><br><span>@@ -1858,7 +1866,7 @@</span><br><span>                      ast_frfree(f);</span><br><span>               }</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+wait_over:;</span><br><span>       if (!*to || ast_check_hangup(in)) {</span><br><span>          ast_verb(3, "Nobody picked up in %d ms\n", orig);</span><br><span>          publish_dial_end_event(in, out_chans, NULL, "NOANSWER");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15985">change 15985</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/+/15985"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I6f2ee3f77b892015bc05513d868f071f279a3c80 </div>
<div style="display:none"> Gerrit-Change-Number: 15985 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: N A <mail@interlinked.x10host.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>