<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16347">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">apps/app_dial.c: HANGUPCAUSE reason code for CANCEL is set to AST_CAUSE_NORMAL_CLEARING<br><br>changed that when we recive a CANCEL that we set HANGUPCAUSE to AST_CAUSE_NORMAL_CLEARING<br><br>ASTERISK-28053<br>Reported by: roadkill<br><br>Change-Id: Ib653aec2282f55b59d87484391cc07c8e6612b89<br>---<br>M apps/app_dial.c<br>1 file changed, 16 insertions(+), 6 deletions(-)<br><br></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 38b1b08..c7ea34b 100644</span><br><span>--- a/apps/app_dial.c</span><br><span>+++ b/apps/app_dial.c</span><br><span>@@ -1146,6 +1146,7 @@</span><br><span> char privcid[256];</span><br><span> char privintro[1024];</span><br><span> char status[256];</span><br><span style="color: hsl(120, 100%, 40%);">+ int canceled;</span><br><span> };</span><br><span> </span><br><span> static void publish_dial_end_event(struct ast_channel *in, struct dial_head *out_chans, struct ast_channel *exception, const char *status)</span><br><span>@@ -1702,6 +1703,7 @@</span><br><span> /* Got hung up */</span><br><span> *to = -1;</span><br><span> strcpy(pa->status, "CANCEL");</span><br><span style="color: hsl(120, 100%, 40%);">+ pa->canceled = 1;</span><br><span> publish_dial_end_event(in, out_chans, NULL, pa->status);</span><br><span> if (f) {</span><br><span> if (f->data.uint32) {</span><br><span>@@ -1726,6 +1728,7 @@</span><br><span> *to = 0;</span><br><span> *result = f->subclass.integer;</span><br><span> strcpy(pa->status, "CANCEL");</span><br><span style="color: hsl(120, 100%, 40%);">+ pa->canceled = 1;</span><br><span> publish_dial_end_event(in, out_chans, NULL, pa->status);</span><br><span> ast_frfree(f);</span><br><span> ast_channel_unlock(in);</span><br><span>@@ -1742,6 +1745,7 @@</span><br><span> ast_verb(3, "User requested call disconnect.\n");</span><br><span> *to = 0;</span><br><span> strcpy(pa->status, "CANCEL");</span><br><span style="color: hsl(120, 100%, 40%);">+ pa->canceled = 1;</span><br><span> publish_dial_end_event(in, out_chans, NULL, pa->status);</span><br><span> ast_frfree(f);</span><br><span> if (is_cc_recall) {</span><br><span>@@ -2222,7 +2226,7 @@</span><br><span> struct ast_channel *peer;</span><br><span> int to; /* timeout */</span><br><span> struct cause_args num = { chan, 0, 0, 0 };</span><br><span style="color: hsl(0, 100%, 40%);">- int cause;</span><br><span style="color: hsl(120, 100%, 40%);">+ int cause, hanguptreecause = -1;</span><br><span> </span><br><span> struct ast_bridge_config config = { { 0, } };</span><br><span> struct timeval calldurationlimit = { 0, };</span><br><span>@@ -2231,6 +2235,7 @@</span><br><span> .sentringing = 0,</span><br><span> .privdb_val = 0,</span><br><span> .status = "INVALIDARGS",</span><br><span style="color: hsl(120, 100%, 40%);">+ .canceled = 0,</span><br><span> };</span><br><span> int sentringing = 0, moh = 0;</span><br><span> const char *outbound_group = NULL;</span><br><span>@@ -3329,11 +3334,16 @@</span><br><span> }</span><br><span> </span><br><span> ast_channel_early_bridge(chan, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- /* forward 'answered elsewhere' if we received it */</span><br><span style="color: hsl(0, 100%, 40%);">- hanguptree(&out_chans, NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- ast_channel_hangupcause(chan) == AST_CAUSE_ANSWERED_ELSEWHERE</span><br><span style="color: hsl(0, 100%, 40%);">- || ast_test_flag64(&opts, OPT_CANCEL_ELSEWHERE)</span><br><span style="color: hsl(0, 100%, 40%);">- ? AST_CAUSE_ANSWERED_ELSEWHERE : -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* forward 'answered elsewhere' if we received it */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_channel_hangupcause(chan) == AST_CAUSE_ANSWERED_ELSEWHERE || ast_test_flag64(&opts, OPT_CANCEL_ELSEWHERE)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ hanguptreecause = AST_CAUSE_ANSWERED_ELSEWHERE;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (pa.canceled) { /* Caller canceled */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_channel_hangupcause(chan))</span><br><span style="color: hsl(120, 100%, 40%);">+ hanguptreecause = ast_channel_hangupcause(chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ hanguptreecause = AST_CAUSE_NORMAL_CLEARING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ hanguptree(&out_chans, NULL, hanguptreecause);</span><br><span> pbx_builtin_setvar_helper(chan, "DIALSTATUS", pa.status);</span><br><span> ast_debug(1, "Exiting with DIALSTATUS=%s.\n", pa.status);</span><br><span> </span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16347">change 16347</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/+/16347"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: Ib653aec2282f55b59d87484391cc07c8e6612b89 </div>
<div style="display:none"> Gerrit-Change-Number: 16347 </div>
<div style="display:none"> Gerrit-PatchSet: 10 </div>
<div style="display:none"> Gerrit-Owner: Mark Petersen <bugs.digium.com@zombie.dk> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Mark Petersen <bugs.digium.com@zombie.dk> </div>
<div style="display:none"> Gerrit-CC: Sean Bright <sean@seanbright.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>