<p>Benjamin Keith Ford has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/13029">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">external_media: Add ARI support for AudioSocket.<br><br>WIP.<br><br>Change-Id: I51db231c492010bff0d3c164e0b719aab4149352<br>---<br>M res/ari/resource_channels.c<br>M rest-api/api-docs/channels.json<br>2 files changed, 66 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/29/13029/1</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 0fd2d69..4c860f3 100644</span><br><span>--- a/res/ari/resource_channels.c</span><br><span>+++ b/res/ari/resource_channels.c</span><br><span>@@ -2135,6 +2135,66 @@</span><br><span> ast_channel_unref(chan);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void external_media_audiosocket_tcp(struct ast_ari_channels_external_media_args *args,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_variable *variables,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_ari_response *response)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t endpoint_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *endpoint;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_channel *chan;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_json *json_chan;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct varshead *vars;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint_len = strlen("AudioSocket/") + strlen(args->external_host) + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint = ast_alloca(endpoint_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(endpoint, endpoint_len, "AudioSocket/%s", args->external_host);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ chan = ari_channels_handle_originate_with_id(</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint,</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ args->app,</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ variables,</span><br><span style="color: hsl(120, 100%, 40%);">+ args->channel_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ args->format,</span><br><span style="color: hsl(120, 100%, 40%);">+ response);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_variables_destroy(variables);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!chan) {</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%);">+ json_chan = response->message;</span><br><span style="color: hsl(120, 100%, 40%);">+ response->message = ast_json_object_create();</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!response->message) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_channel_unref(chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_json_unref(json_chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_ari_response_alloc_failed(response);</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%);">+ ast_json_object_set(response->message, "channel", json_chan);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_channel_lock(chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ vars = ast_channel_varshead(chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vars && !AST_LIST_EMPTY(vars)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_var_t *variables;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_json_object_set(json_chan, "channelvars", ast_json_channel_vars(vars));</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_LIST_TRAVERSE(vars, variables, entries) {</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%);">+ ast_channel_unlock(chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_channel_unref(chan);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include "asterisk/config.h"</span><br><span> #include "asterisk/netsock2.h"</span><br><span> </span><br><span>@@ -2195,6 +2255,8 @@</span><br><span> </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 style="color: hsl(120, 100%, 40%);">+ } else if (strcasecmp(args->encapsulation, "audiosocket") == 0 && strcasecmp(args->transport, "tcp") == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ external_media_audiosocket_tcp(args, variables, response);</span><br><span> } else {</span><br><span> ast_ari_response_error(</span><br><span> response, 501, "Not Implemented",</span><br><span>diff --git a/rest-api/api-docs/channels.json b/rest-api/api-docs/channels.json</span><br><span>index 53e6e9d..2352d22 100644</span><br><span>--- a/rest-api/api-docs/channels.json</span><br><span>+++ b/rest-api/api-docs/channels.json</span><br><span>@@ -1810,7 +1810,8 @@</span><br><span> "allowableValues": {</span><br><span> "valueType": "LIST",</span><br><span> "values": [</span><br><span style="color: hsl(0, 100%, 40%);">- "rtp"</span><br><span style="color: hsl(120, 100%, 40%);">+ "rtp",</span><br><span style="color: hsl(120, 100%, 40%);">+ "audiosocket"</span><br><span> ]</span><br><span> }</span><br><span> },</span><br><span>@@ -1825,7 +1826,8 @@</span><br><span> "allowableValues": {</span><br><span> "valueType": "LIST",</span><br><span> "values": [</span><br><span style="color: hsl(0, 100%, 40%);">- "udp"</span><br><span style="color: hsl(120, 100%, 40%);">+ "udp",</span><br><span style="color: hsl(120, 100%, 40%);">+ "tcp"</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/+/13029">change 13029</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/+/13029"/><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: I51db231c492010bff0d3c164e0b719aab4149352 </div>
<div style="display:none"> Gerrit-Change-Number: 13029 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>