<p>Alexei Gradinari has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/10299">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">core: New variables CONNECTED_LINE_ORIGINAL_* for interception routine<br><br>This patch added new variables<br> CONNECTED_LINE_ORIGINAL_ID_NUM<br> CONNECTED_LINE_ORIGINAL_ID_NAME<br> CONNECTED_LINE_ORIGINAL_ANI_NUM<br> CONNECTED_LINE_ORIGINAL_ANI_NAME<br>to get the original values inside the interception routine<br>CONNECTED_LINE_SEND_SUB.<br><br>It can help to prevent Connected Line update by reverting to original values<br>or alter Connected Line information based on original values.<br><br>ASTERISK-28079 #close<br><br>Change-Id: Ie39f7a3402101333531884873cb353c73cd5334d<br>---<br>M main/channel.c<br>1 file changed, 26 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/99/10299/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/channel.c b/main/channel.c</span><br><span>index 5fc9cd8..8285297 100644</span><br><span>--- a/main/channel.c</span><br><span>+++ b/main/channel.c</span><br><span>@@ -10499,6 +10499,7 @@</span><br><span>      const char *sub;</span><br><span>     const char *sub_args;</span><br><span>        int retval;</span><br><span style="color: hsl(120, 100%, 40%);">+   struct ast_party_connected_line saved_connected;</span><br><span> </span><br><span>         ast_channel_lock(sub_chan);</span><br><span>  sub = pbx_builtin_getvar_helper(sub_chan, "CONNECTED_LINE_SEND_SUB");</span><br><span>@@ -10511,6 +10512,21 @@</span><br><span>           return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ast_party_connected_line_init(&saved_connected);</span><br><span style="color: hsl(120, 100%, 40%);">+  ast_party_connected_line_copy(&saved_connected, ast_channel_connected(sub_chan));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (saved_connected.id.number.valid && !ast_strlen_zero(saved_connected.id.number.str)) {</span><br><span style="color: hsl(120, 100%, 40%);">+             pbx_builtin_setvar_helper(sub_chan, "CONNECTED_LINE_ORIGINAL_ID_NUM", saved_connected.id.number.str);</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+     if (saved_connected.id.name.valid && !ast_strlen_zero(saved_connected.id.name.str)) {</span><br><span style="color: hsl(120, 100%, 40%);">+         pbx_builtin_setvar_helper(sub_chan, "CONNECTED_LINE_ORIGINAL_ID_NAME", saved_connected.id.name.str);</span><br><span style="color: hsl(120, 100%, 40%);">+        }</span><br><span style="color: hsl(120, 100%, 40%);">+     if (saved_connected.ani.number.valid && !ast_strlen_zero(saved_connected.ani.number.str)) {</span><br><span style="color: hsl(120, 100%, 40%);">+           pbx_builtin_setvar_helper(sub_chan, "CONNECTED_LINE_ORIGINAL_ANI_NUM", saved_connected.ani.number.str);</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+     if (saved_connected.ani.name.valid && !ast_strlen_zero(saved_connected.ani.name.str)) {</span><br><span style="color: hsl(120, 100%, 40%);">+               pbx_builtin_setvar_helper(sub_chan, "CONNECTED_LINE_ORIGINAL_ANI_NAME", saved_connected.ani.name.str);</span><br><span style="color: hsl(120, 100%, 40%);">+      }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  if (is_frame) {</span><br><span>              const struct ast_frame *frame = connected_info;</span><br><span> </span><br><span>@@ -10525,17 +10541,24 @@</span><br><span>      channel_set_intercept_mode(1);</span><br><span>       retval = ast_app_run_sub(autoservice_chan, sub_chan, sub, sub_args, 0);</span><br><span>      channel_set_intercept_mode(0);</span><br><span style="color: hsl(0, 100%, 40%);">-  if (!retval) {</span><br><span style="color: hsl(0, 100%, 40%);">-          struct ast_party_connected_line saved_connected;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+  ast_channel_lock(sub_chan);</span><br><span style="color: hsl(120, 100%, 40%);">+   pbx_builtin_setvar_helper(sub_chan, "CONNECTED_LINE_ORIGINAL_ID_NUM", NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+        pbx_builtin_setvar_helper(sub_chan, "CONNECTED_LINE_ORIGINAL_ID_NAME", NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+       pbx_builtin_setvar_helper(sub_chan, "CONNECTED_LINE_ORIGINAL_ANI_NUM", NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+       pbx_builtin_setvar_helper(sub_chan, "CONNECTED_LINE_ORIGINAL_ANI_NAME", NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+      ast_channel_unlock(sub_chan);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       if (!retval) {</span><br><span>               ast_party_connected_line_init(&saved_connected);</span><br><span>                 ast_channel_lock(sub_chan);</span><br><span>          ast_party_connected_line_copy(&saved_connected, ast_channel_connected(sub_chan));</span><br><span>                ast_channel_unlock(sub_chan);</span><br><span>                ast_channel_update_connected_line(sub_chan, &saved_connected, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-                ast_party_connected_line_free(&saved_connected);</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ast_party_connected_line_free(&saved_connected);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       return retval;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10299">change 10299</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/10299"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ie39f7a3402101333531884873cb353c73cd5334d </div>
<div style="display:none"> Gerrit-Change-Number: 10299 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexei Gradinari <alex2grad@gmail.com> </div>