<p>Sébastien Duthil has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15326">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_mixmonitor: Add AMI event MixMonitorMute.<br><br>Change-Id: I878e5843984c7c477e87f3672850b4cb10e6e8d4<br>---<br>M apps/app_mixmonitor.c<br>M include/asterisk/stasis_channels.h<br>M main/manager_channels.c<br>M main/stasis.c<br>M main/stasis_channels.c<br>5 files changed, 59 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/26/15326/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c</span><br><span>index 50b119a..5195b7b 100644</span><br><span>--- a/apps/app_mixmonitor.c</span><br><span>+++ b/apps/app_mixmonitor.c</span><br><span>@@ -1368,6 +1368,8 @@</span><br><span> const char *direction = astman_get_header(m,"Direction");</span><br><span> int clearmute = 1;</span><br><span> enum ast_audiohook_flags flag;</span><br><span style="color: hsl(120, 100%, 40%);">+ RAII_VAR(struct stasis_message *, stasis_message, NULL, ao2_cleanup);</span><br><span style="color: hsl(120, 100%, 40%);">+ RAII_VAR(struct ast_json *, stasis_message_blob, NULL, ast_json_unref);</span><br><span> </span><br><span> if (ast_strlen_zero(direction)) {</span><br><span> astman_send_error(s, m, "No direction specified. Must be read, write or both");</span><br><span>@@ -1409,6 +1411,17 @@</span><br><span> return AMI_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ stasis_message_blob = ast_json_pack("{s: s, s: b}",</span><br><span style="color: hsl(120, 100%, 40%);">+ "direction", direction,</span><br><span style="color: hsl(120, 100%, 40%);">+ "state", ast_true(state));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ stasis_message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(c),</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_channel_mixmonitor_mute_type(), stasis_message_blob);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (stasis_message) {</span><br><span style="color: hsl(120, 100%, 40%);">+ stasis_publish(ast_channel_topic(c), stasis_message);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> astman_append(s, "Response: Success\r\n");</span><br><span> </span><br><span> if (!ast_strlen_zero(id)) {</span><br><span>diff --git a/include/asterisk/stasis_channels.h b/include/asterisk/stasis_channels.h</span><br><span>index 152d545..02654e9 100644</span><br><span>--- a/include/asterisk/stasis_channels.h</span><br><span>+++ b/include/asterisk/stasis_channels.h</span><br><span>@@ -606,6 +606,14 @@</span><br><span> struct stasis_message_type *ast_channel_mixmonitor_stop_type(void);</span><br><span> </span><br><span> /*!</span><br><span style="color: hsl(120, 100%, 40%);">+ * \since 18</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Message type for muting or unmuting mixmonitor on a channel</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval A stasis message type</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+struct stasis_message_type *ast_channel_mixmonitor_mute_type(void);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span> * \since 18.0.0</span><br><span> * \brief Message type for agent login on a channel</span><br><span> *</span><br><span>diff --git a/main/manager_channels.c b/main/manager_channels.c</span><br><span>index 6dc32ee..22f3c52 100644</span><br><span>--- a/main/manager_channels.c</span><br><span>+++ b/main/manager_channels.c</span><br><span>@@ -1132,6 +1132,37 @@</span><br><span> publish_basic_channel_event("MixMonitorStop", EVENT_FLAG_CALL, payload->snapshot);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void channel_mixmonitor_mute_cb(void *data, struct stasis_subscription *sub,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct stasis_message *message)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ RAII_VAR(struct ast_str *, channel_event_string, NULL, ast_free);</span><br><span style="color: hsl(120, 100%, 40%);">+ RAII_VAR(struct ast_str *, event_buffer, ast_str_create(64), ast_free);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_channel_blob *payload = stasis_message_data(message);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_json *direction = ast_json_object_get(payload->blob, "direction");</span><br><span style="color: hsl(120, 100%, 40%);">+ const int state = ast_json_is_true(ast_json_object_get(payload->blob, "state"));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!event_buffer) {</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%);">+ channel_event_string = ast_manager_build_channel_state_string(payload->snapshot);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!channel_event_string) {</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%);">+ if (direction) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&event_buffer, 0, "Direction: %s\r\n", ast_json_string_get(direction));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_append(&event_buffer, 0, "State: %s\r\n", state ? "1" : "0");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ manager_event(EVENT_FLAG_CALL, "MixMonitorMute",</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s"</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_buffer(channel_event_string),</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_buffer(event_buffer));</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> static int dial_status_end(const char *dialstatus)</span><br><span> {</span><br><span> return (strcmp(dialstatus, "RINGING") &&</span><br><span>@@ -1342,6 +1373,9 @@</span><br><span> ret |= stasis_message_router_add(message_router,</span><br><span> ast_channel_mixmonitor_stop_type(), channel_mixmonitor_stop_cb, NULL);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ret |= stasis_message_router_add(message_router,</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_channel_mixmonitor_mute_type(), channel_mixmonitor_mute_cb, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* If somehow we failed to add any routes, just shut down the whole</span><br><span> * thing and fail it.</span><br><span> */</span><br><span>diff --git a/main/stasis.c b/main/stasis.c</span><br><span>index b2172e9..4ae6d6a 100644</span><br><span>--- a/main/stasis.c</span><br><span>+++ b/main/stasis.c</span><br><span>@@ -132,6 +132,7 @@</span><br><span> <enum name="ast_channel_monitor_stop_type" /></span><br><span> <enum name="ast_channel_mixmonitor_start_type" /></span><br><span> <enum name="ast_channel_mixmonitor_stop_type" /></span><br><span style="color: hsl(120, 100%, 40%);">+ <enum name="ast_channel_mixmonitor_mute_type" /></span><br><span> <enum name="ast_channel_agent_login_type" /></span><br><span> <enum name="ast_channel_agent_logoff_type" /></span><br><span> <enum name="ast_channel_talking_start" /></span><br><span>diff --git a/main/stasis_channels.c b/main/stasis_channels.c</span><br><span>index 925f75c..3f3312b 100644</span><br><span>--- a/main/stasis_channels.c</span><br><span>+++ b/main/stasis_channels.c</span><br><span>@@ -1608,6 +1608,7 @@</span><br><span> STASIS_MESSAGE_TYPE_DEFN(ast_channel_monitor_stop_type);</span><br><span> STASIS_MESSAGE_TYPE_DEFN(ast_channel_mixmonitor_start_type);</span><br><span> STASIS_MESSAGE_TYPE_DEFN(ast_channel_mixmonitor_stop_type);</span><br><span style="color: hsl(120, 100%, 40%);">+STASIS_MESSAGE_TYPE_DEFN(ast_channel_mixmonitor_mute_type);</span><br><span> STASIS_MESSAGE_TYPE_DEFN(ast_channel_agent_login_type,</span><br><span> .to_ami = agent_login_to_ami,</span><br><span> );</span><br><span>@@ -1653,6 +1654,7 @@</span><br><span> STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_monitor_stop_type);</span><br><span> STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_mixmonitor_start_type);</span><br><span> STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_mixmonitor_stop_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_mixmonitor_mute_type);</span><br><span> STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_agent_login_type);</span><br><span> STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_agent_logoff_type);</span><br><span> STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_talking_start);</span><br><span>@@ -1705,6 +1707,7 @@</span><br><span> res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_monitor_stop_type);</span><br><span> res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_mixmonitor_start_type);</span><br><span> res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_mixmonitor_stop_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_mixmonitor_mute_type);</span><br><span> res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_talking_start);</span><br><span> res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_talking_stop);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15326">change 15326</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/+/15326"/><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: I878e5843984c7c477e87f3672850b4cb10e6e8d4 </div>
<div style="display:none"> Gerrit-Change-Number: 15326 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sébastien Duthil <sduthil@wazo.community> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>