<p>Sébastien Duthil has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15325">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_mixmonitor: Add AMI events MixMonitorStart and MixMonitorStop.<br><br>Change-Id: I1862d58264c2c8b5d8983272cb29734b184d67c5<br>---<br>M apps/app_mixmonitor.c<br>M configs/samples/stasis.conf.sample<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>6 files changed, 67 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/25/15325/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 239901f..50b119a 100644</span><br><span>--- a/apps/app_mixmonitor.c</span><br><span>+++ b/apps/app_mixmonitor.c</span><br><span>@@ -51,6 +51,8 @@</span><br><span> #include "asterisk/channel.h"</span><br><span> #include "asterisk/autochan.h"</span><br><span> #include "asterisk/manager.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "asterisk/stasis.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "asterisk/stasis_channels.h"</span><br><span> #include "asterisk/callerid.h"</span><br><span> #include "asterisk/mod_format.h"</span><br><span> #include "asterisk/linkedlists.h"</span><br><span>@@ -1077,6 +1079,7 @@</span><br><span> struct ast_flags flags = { 0 };</span><br><span> char *recipients = NULL;</span><br><span> char *parse;</span><br><span style="color: hsl(120, 100%, 40%);">+ RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup);</span><br><span> AST_DECLARE_APP_ARGS(args,</span><br><span> AST_APP_ARG(filename);</span><br><span> AST_APP_ARG(options);</span><br><span>@@ -1197,6 +1200,13 @@</span><br><span> ast_module_unref(ast_module_info->self);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan),</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_channel_mixmonitor_start_type(),</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (message) {</span><br><span style="color: hsl(120, 100%, 40%);">+ stasis_publish(ast_channel_topic(chan), message);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -1206,6 +1216,7 @@</span><br><span> char *parse = "";</span><br><span> struct mixmonitor_ds *mixmonitor_ds;</span><br><span> const char *beep_id = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup);</span><br><span> </span><br><span> AST_DECLARE_APP_ARGS(args,</span><br><span> AST_APP_ARG(mixmonid);</span><br><span>@@ -1263,6 +1274,13 @@</span><br><span> ast_beep_stop(chan, beep_id);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan),</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_channel_mixmonitor_stop_type(),</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (message) {</span><br><span style="color: hsl(120, 100%, 40%);">+ stasis_publish(ast_channel_topic(chan), message);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/configs/samples/stasis.conf.sample b/configs/samples/stasis.conf.sample</span><br><span>index e591e76..46a240e 100644</span><br><span>--- a/configs/samples/stasis.conf.sample</span><br><span>+++ b/configs/samples/stasis.conf.sample</span><br><span>@@ -63,6 +63,8 @@</span><br><span> ; decline=ast_channel_moh_stop_type</span><br><span> ; decline=ast_channel_monitor_start_type</span><br><span> ; decline=ast_channel_monitor_stop_type</span><br><span style="color: hsl(120, 100%, 40%);">+; decline=ast_channel_mixmonitor_start_type</span><br><span style="color: hsl(120, 100%, 40%);">+; decline=ast_channel_mixmonitor_stop_type</span><br><span> ; decline=ast_channel_agent_login_type</span><br><span> ; decline=ast_channel_agent_logoff_type</span><br><span> ; decline=ast_channel_talking_start</span><br><span>diff --git a/include/asterisk/stasis_channels.h b/include/asterisk/stasis_channels.h</span><br><span>index 9c47984..152d545 100644</span><br><span>--- a/include/asterisk/stasis_channels.h</span><br><span>+++ b/include/asterisk/stasis_channels.h</span><br><span>@@ -590,7 +590,23 @@</span><br><span> struct stasis_message_type *ast_channel_monitor_stop_type(void);</span><br><span> </span><br><span> /*!</span><br><span style="color: hsl(0, 100%, 40%);">- * \since 12.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+ * \since 18</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Message type for starting 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_start_type(void);</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%);">+ * \since 18</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Message type for stopping 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_stop_type(void);</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%);">+ * \since 18.0.0</span><br><span> * \brief Message type for agent login on a channel</span><br><span> *</span><br><span> * \retval A stasis message type</span><br><span>diff --git a/main/manager_channels.c b/main/manager_channels.c</span><br><span>index 73b76c8..6dc32ee 100644</span><br><span>--- a/main/manager_channels.c</span><br><span>+++ b/main/manager_channels.c</span><br><span>@@ -1116,6 +1116,22 @@</span><br><span> publish_basic_channel_event("MonitorStop", EVENT_FLAG_CALL, payload->snapshot);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void channel_mixmonitor_start_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%);">+ struct ast_channel_blob *payload = stasis_message_data(message);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ publish_basic_channel_event("MixMonitorStart", EVENT_FLAG_CALL, payload->snapshot);</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%);">+static void channel_mixmonitor_stop_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%);">+ struct ast_channel_blob *payload = stasis_message_data(message);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ publish_basic_channel_event("MixMonitorStop", EVENT_FLAG_CALL, payload->snapshot);</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>@@ -1320,6 +1336,12 @@</span><br><span> ret |= stasis_message_router_add(message_router,</span><br><span> ast_channel_monitor_stop_type(), channel_monitor_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_start_type(), channel_mixmonitor_start_cb, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</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_stop_type(), channel_mixmonitor_stop_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 44d5973..b2172e9 100644</span><br><span>--- a/main/stasis.c</span><br><span>+++ b/main/stasis.c</span><br><span>@@ -130,6 +130,8 @@</span><br><span> <enum name="ast_channel_moh_stop_type" /></span><br><span> <enum name="ast_channel_monitor_start_type" /></span><br><span> <enum name="ast_channel_monitor_stop_type" /></span><br><span style="color: hsl(120, 100%, 40%);">+ <enum name="ast_channel_mixmonitor_start_type" /></span><br><span style="color: hsl(120, 100%, 40%);">+ <enum name="ast_channel_mixmonitor_stop_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 3d213c7..925f75c 100644</span><br><span>--- a/main/stasis_channels.c</span><br><span>+++ b/main/stasis_channels.c</span><br><span>@@ -1606,6 +1606,8 @@</span><br><span> STASIS_MESSAGE_TYPE_DEFN(ast_channel_moh_stop_type);</span><br><span> STASIS_MESSAGE_TYPE_DEFN(ast_channel_monitor_start_type);</span><br><span> STASIS_MESSAGE_TYPE_DEFN(ast_channel_monitor_stop_type);</span><br><span style="color: hsl(120, 100%, 40%);">+STASIS_MESSAGE_TYPE_DEFN(ast_channel_mixmonitor_start_type);</span><br><span style="color: hsl(120, 100%, 40%);">+STASIS_MESSAGE_TYPE_DEFN(ast_channel_mixmonitor_stop_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>@@ -1649,6 +1651,8 @@</span><br><span> STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_moh_stop_type);</span><br><span> STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_monitor_start_type);</span><br><span> STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_monitor_stop_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_mixmonitor_start_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_mixmonitor_stop_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>@@ -1699,6 +1703,8 @@</span><br><span> res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_moh_stop_type);</span><br><span> res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_monitor_start_type);</span><br><span> res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_monitor_stop_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_mixmonitor_start_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ res |= STASIS_MESSAGE_TYPE_INIT(ast_channel_mixmonitor_stop_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/+/15325">change 15325</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/+/15325"/><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: I1862d58264c2c8b5d8983272cb29734b184d67c5 </div>
<div style="display:none"> Gerrit-Change-Number: 15325 </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>