<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16432">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Kevin Harwell: Looks good to me, approved
  George Joseph: Looks good to me, but someone else must approve
  Friendly Automation: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">resource_channels.c: Fix wrong external media parameter parse<br><br>Fixed ARI external media handler to accept body parameters.<br><br>ASTERISK-29622<br><br>Change-Id: I49509c48a6cbc0fb4165bfa4f834b5e8b9ace20d<br>---<br>M res/ari/resource_channels.c<br>1 file changed, 12 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c</span><br><span>index 8b7cf96..4854dca 100644</span><br><span>--- a/res/ari/resource_channels.c</span><br><span>+++ b/res/ari/resource_channels.c</span><br><span>@@ -2134,6 +2134,18 @@</span><br><span> </span><br><span>         ast_assert(response != NULL);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+     /* Parse any query parameters out of the body parameter */</span><br><span style="color: hsl(120, 100%, 40%);">+    if (args->variables) {</span><br><span style="color: hsl(120, 100%, 40%);">+             struct ast_json *json_variables;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+            ast_ari_channels_external_media_parse_body(args->variables, args);</span><br><span style="color: hsl(120, 100%, 40%);">+         json_variables = ast_json_object_get(args->variables, "variables");</span><br><span style="color: hsl(120, 100%, 40%);">+              if (json_variables</span><br><span style="color: hsl(120, 100%, 40%);">+                    && json_to_ast_variables(response, json_variables, &variables)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 return;</span><br><span style="color: hsl(120, 100%, 40%);">+               }</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  if (ast_strlen_zero(args->app)) {</span><br><span>                 ast_ari_response_error(response, 400, "Bad Request", "app cannot be empty");</span><br><span>             return;</span><br><span>@@ -2168,17 +2180,6 @@</span><br><span>             args->direction = "both";</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (args->variables) {</span><br><span style="color: hsl(0, 100%, 40%);">-               struct ast_json *json_variables;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-                ast_ari_channels_external_media_parse_body(args->variables, args);</span><br><span style="color: hsl(0, 100%, 40%);">-           json_variables = ast_json_object_get(args->variables, "variables");</span><br><span style="color: hsl(0, 100%, 40%);">-                if (json_variables</span><br><span style="color: hsl(0, 100%, 40%);">-                      && json_to_ast_variables(response, json_variables, &variables)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                   return;</span><br><span style="color: hsl(0, 100%, 40%);">-         }</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>    if (strcasecmp(args->encapsulation, "rtp") == 0 && strcasecmp(args->transport, "udp") == 0) {</span><br><span>              external_media_rtp_udp(args, variables, response);</span><br><span>   } else {</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/+/16432">change 16432</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/+/16432"/><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: I49509c48a6cbc0fb4165bfa4f834b5e8b9ace20d </div>
<div style="display:none"> Gerrit-Change-Number: 16432 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Sungtae Kim <pchero21@gmail.com> </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: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>