Fix documentation replication issues
[asterisk/asterisk.git] / main / manager_channels.c
index 0cab365..23418e6 100644 (file)
@@ -37,51 +37,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/stasis_channels.h"
 
-static struct stasis_message_router *channel_state_router;
-
 /*** DOCUMENTATION
        <managerEvent language="en_US" name="Newchannel">
                <managerEventInstance class="EVENT_FLAG_CALL">
                        <synopsis>Raised when a new channel is created.</synopsis>
                        <syntax>
-                               <parameter name="Channel">
-                               </parameter>
-                               <parameter name="ChannelState">
-                                       <para>A numeric code for the channel's current state, related to ChannelStateDesc</para>
-                               </parameter>
-                               <parameter name="ChannelStateDesc">
-                                       <enumlist>
-                                               <enum name="Down"/>
-                                               <enum name="Rsrvd"/>
-                                               <enum name="OffHook"/>
-                                               <enum name="Dialing"/>
-                                               <enum name="Ring"/>
-                                               <enum name="Ringing"/>
-                                               <enum name="Up"/>
-                                               <enum name="Busy"/>
-                                               <enum name="Dialing Offhook"/>
-                                               <enum name="Pre-ring"/>
-                                               <enum name="Unknown"/>
-                                       </enumlist>
-                               </parameter>
-                               <parameter name="CallerIDNum">
-                               </parameter>
-                               <parameter name="CallerIDName">
-                               </parameter>
-                               <parameter name="ConnectedLineNum">
-                               </parameter>
-                               <parameter name="ConnectedLineName">
-                               </parameter>
-                               <parameter name="AccountCode">
-                               </parameter>
-                               <parameter name="Context">
-                               </parameter>
-                               <parameter name="Exten">
-                               </parameter>
-                               <parameter name="Priority">
-                               </parameter>
-                               <parameter name="Uniqueid">
-                               </parameter>
+                               <channel_snapshot/>
                        </syntax>
                </managerEventInstance>
        </managerEvent>
@@ -89,7 +50,7 @@ static struct stasis_message_router *channel_state_router;
                <managerEventInstance class="EVENT_FLAG_CALL">
                        <synopsis>Raised when a channel's state changes.</synopsis>
                        <syntax>
-                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
+                               <channel_snapshot/>
                        </syntax>
                </managerEventInstance>
        </managerEvent>
@@ -97,7 +58,7 @@ static struct stasis_message_router *channel_state_router;
                <managerEventInstance class="EVENT_FLAG_CALL">
                        <synopsis>Raised when a channel is hung up.</synopsis>
                        <syntax>
-                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
+                               <channel_snapshot/>
                                <parameter name="Cause">
                                        <para>A numeric cause code for why the channel was hung up.</para>
                                </parameter>
@@ -111,7 +72,7 @@ static struct stasis_message_router *channel_state_router;
                <managerEventInstance class="EVENT_FLAG_CALL">
                        <synopsis>Raised when a hangup is requested.</synopsis>
                        <syntax>
-                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
+                               <channel_snapshot/>
                                <xi:include xpointer="xpointer(/docs/managerEvent[@name='Hangup']/managerEventInstance/syntax/parameter[@name='Cause'])" />
                        </syntax>
                </managerEventInstance>
@@ -120,7 +81,7 @@ static struct stasis_message_router *channel_state_router;
                <managerEventInstance class="EVENT_FLAG_CALL">
                        <synopsis>Raised when a soft hangup is requested with a specific cause code.</synopsis>
                        <syntax>
-                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
+                               <channel_snapshot/>
                                <xi:include xpointer="xpointer(/docs/managerEvent[@name='Hangup']/managerEventInstance/syntax/parameter[@name='Cause'])" />
                        </syntax>
                </managerEventInstance>
@@ -129,7 +90,7 @@ static struct stasis_message_router *channel_state_router;
                <managerEventInstance class="EVENT_FLAG_DIALPLAN">
                        <synopsis>Raised when a channel enters a new context, extension, priority.</synopsis>
                        <syntax>
-                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
+                               <channel_snapshot/>
                                <parameter name="Extension">
                                        <para>Deprecated in 12, but kept for
                                        backward compatability. Please use
@@ -148,56 +109,30 @@ static struct stasis_message_router *channel_state_router;
                <managerEventInstance class="EVENT_FLAG_CALL">
                        <synopsis>Raised when a channel receives new Caller ID information.</synopsis>
                        <syntax>
-                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
+                               <channel_snapshot/>
                                <parameter name="CID-CallingPres">
                                        <para>A description of the Caller ID presentation.</para>
                                </parameter>
                        </syntax>
                </managerEventInstance>
        </managerEvent>
+       <managerEvent language="en_US" name="NewAccountCode">
+               <managerEventInstance class="EVENT_FLAG_CALL">
+                       <synopsis>Raised when a Channel's AccountCode is changed.</synopsis>
+                       <syntax>
+                               <channel_snapshot/>
+                               <parameter name="OldAccountCode">
+                                       <para>The channel's previous account code</para>
+                               </parameter>
+                       </syntax>
+               </managerEventInstance>
+       </managerEvent>
        <managerEvent language="en_US" name="DialBegin">
                <managerEventInstance class="EVENT_FLAG_CALL">
                        <synopsis>Raised when a dial action has started.</synopsis>
                        <syntax>
-                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
-                               <parameter name="ChannelDest">
-                               </parameter>
-                               <parameter name="ChannelStateDest">
-                                       <para>A numeric code for the channel's current state, related to ChannelStateDescDest</para>
-                               </parameter>
-                               <parameter name="ChannelStateDescDest">
-                                       <enumlist>
-                                               <enum name="Down"/>
-                                               <enum name="Rsrvd"/>
-                                               <enum name="OffHook"/>
-                                               <enum name="Dialing"/>
-                                               <enum name="Ring"/>
-                                               <enum name="Ringing"/>
-                                               <enum name="Up"/>
-                                               <enum name="Busy"/>
-                                               <enum name="Dialing Offhook"/>
-                                               <enum name="Pre-ring"/>
-                                               <enum name="Unknown"/>
-                                       </enumlist>
-                               </parameter>
-                               <parameter name="CallerIDNumDest">
-                               </parameter>
-                               <parameter name="CallerIDNameDest">
-                               </parameter>
-                               <parameter name="ConnectedLineNumDest">
-                               </parameter>
-                               <parameter name="ConnectedLineNameDest">
-                               </parameter>
-                               <parameter name="AccountCodeDest">
-                               </parameter>
-                               <parameter name="ContextDest">
-                               </parameter>
-                               <parameter name="ExtenDest">
-                               </parameter>
-                               <parameter name="PriorityDest">
-                               </parameter>
-                               <parameter name="UniqueidDest">
-                               </parameter>
+                               <channel_snapshot/>
+                               <channel_snapshot prefix="Dest"/>
                                <parameter name="DialString">
                                        <para>The non-technology specific device being dialed.</para>
                                </parameter>
@@ -211,8 +146,8 @@ static struct stasis_message_router *channel_state_router;
                <managerEventInstance class="EVENT_FLAG_CALL">
                        <synopsis>Raised when a dial action has completed.</synopsis>
                        <syntax>
-                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
-                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='DialBegin']/managerEventInstance/syntax/parameter[contains(@name, 'Dest')])" />
+                               <channel_snapshot/>
+                               <channel_snapshot prefix="Dest"/>
                                <parameter name="DialStatus">
                                        <para>The result of the dial operation.</para>
                                        <enumlist>
@@ -230,52 +165,265 @@ static struct stasis_message_router *channel_state_router;
                        </see-also>
                </managerEventInstance>
        </managerEvent>
- ***/
+       <managerEvent language="en_US" name="Hold">
+               <managerEventInstance class="EVENT_FLAG_CALL">
+                       <synopsis>Raised when a channel goes on hold.</synopsis>
+                       <syntax>
+                               <channel_snapshot/>
+                               <parameter name="MusicClass">
+                                       <para>The suggested MusicClass, if provided.</para>
+                               </parameter>
+                       </syntax>
+               </managerEventInstance>
+       </managerEvent>
+       <managerEvent language="en_US" name="Unhold">
+               <managerEventInstance class="EVENT_FLAG_CALL">
+                       <synopsis>Raised when a channel goes off hold.</synopsis>
+                       <syntax>
+                               <channel_snapshot/>
+                       </syntax>
+               </managerEventInstance>
+       </managerEvent>
+       <managerEvent language="en_US" name="ChanSpyStart">
+               <managerEventInstance class="EVENT_FLAG_CALL">
+                       <synopsis>Raised when one channel begins spying on another channel.</synopsis>
+                       <syntax>
+                               <channel_snapshot prefix="Spyer"/>
+                               <channel_snapshot prefix="Spyee"/>
+                       </syntax>
+                       <see-also>
+                               <ref type="application">ChanSpyStop</ref>
+                       </see-also>
+               </managerEventInstance>
+       </managerEvent>
+       <managerEvent language="en_US" name="ChanSpyStop">
+               <managerEventInstance class="EVENT_FLAG_CALL">
+                       <synopsis>Raised when a channel has stopped spying.</synopsis>
+                       <syntax>
+                               <channel_snapshot prefix="Spyer"/>
+                               <channel_snapshot prefix="Spyee"/>
+                       </syntax>
+                       <see-also>
+                               <ref type="application">ChanSpyStart</ref>
+                       </see-also>
+               </managerEventInstance>
+       </managerEvent>
+       <managerEvent language="en_US" name="HangupHandlerRun">
+               <managerEventInstance class="EVENT_FLAG_DIALPLAN">
+                       <synopsis>Raised when a hangup handler is about to be called.</synopsis>
+                       <syntax>
+                               <channel_snapshot/>
+                               <parameter name="Handler">
+                                       <para>Hangup handler parameter string passed to the Gosub application.</para>
+                               </parameter>
+                       </syntax>
+               </managerEventInstance>
+       </managerEvent>
+       <managerEvent language="en_US" name="HangupHandlerPop">
+               <managerEventInstance class="EVENT_FLAG_DIALPLAN">
+                       <synopsis>
+                               Raised when a hangup handler is removed from the handler stack
+                               by the CHANNEL() function.
+                       </synopsis>
+                       <syntax>
+                               <channel_snapshot/>
+                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='HangupHandlerRun']/managerEventInstance/syntax/parameter)" />
+                       </syntax>
+                       <see-also>
+                               <ref type="managerEvent">HangupHandlerPush</ref>
+                               <ref type="function">CHANNEL</ref>
+                       </see-also>
+               </managerEventInstance>
+       </managerEvent>
+       <managerEvent language="en_US" name="HangupHandlerPush">
+               <managerEventInstance class="EVENT_FLAG_DIALPLAN">
+                       <synopsis>
+                               Raised when a hangup handler is added to the handler stack by
+                               the CHANNEL() function.
+                       </synopsis>
+                       <syntax>
+                               <channel_snapshot/>
+                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='HangupHandlerRun']/managerEventInstance/syntax/parameter)" />
+                       </syntax>
+                       <see-also>
+                               <ref type="managerEvent">HangupHandlerPop</ref>
+                               <ref type="function">CHANNEL</ref>
+                       </see-also>
+               </managerEventInstance>
+       </managerEvent>
+       <managerEvent language="en_US" name="FAXStatus">
+               <managerEventInstance class="EVENT_FLAG_CALL">
+                       <synopsis>
+                               Raised periodically during a fax transmission.
+                       </synopsis>
+                       <syntax>
+                               <channel_snapshot/>
+                               <parameter name="Operation">
+                                       <enumlist>
+                                               <enum name="gateway"/>
+                                               <enum name="receive"/>
+                                               <enum name="send"/>
+                                       </enumlist>
+                               </parameter>
+                               <parameter name="Status">
+                                       <para>A text message describing the current status of the fax</para>
+                               </parameter>
+                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='ReceiveFAX']/managerEventInstance/syntax/parameter[@name='LocalStationID'])" />
+                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='ReceiveFAX']/managerEventInstance/syntax/parameter[@name='FileName'])" />
+                       </syntax>
+               </managerEventInstance>
+       </managerEvent>
+       <managerEvent language="en_US" name="ReceiveFAX">
+               <managerEventInstance class="EVENT_FLAG_CALL">
+                       <synopsis>
+                               Raised when a receive fax operation has completed.
+                       </synopsis>
+                       <syntax>
+                               <channel_snapshot/>
+                               <parameter name="LocalStationID">
+                                       <para>The value of the <variable>LOCALSTATIONID</variable> channel variable</para>
+                               </parameter>
+                               <parameter name="RemoteStationID">
+                                       <para>The value of the <variable>REMOTESTATIONID</variable> channel variable</para>
+                               </parameter>
+                               <parameter name="PagesTransferred">
+                                       <para>The number of pages that have been transferred</para>
+                               </parameter>
+                               <parameter name="Resolution">
+                                       <para>The negotiated resolution</para>
+                               </parameter>
+                               <parameter name="TransferRate">
+                                       <para>The negotiated transfer rate</para>
+                               </parameter>
+                               <parameter name="FileName" multiple="yes">
+                                       <para>The files being affected by the fax operation</para>
+                               </parameter>
+                       </syntax>
+               </managerEventInstance>
+       </managerEvent>
+       <managerEvent language="en_US" name="SendFAX">
+               <managerEventInstance class="EVENT_FLAG_CALL">
+                       <synopsis>
+                               Raised when a send fax operation has completed.
+                       </synopsis>
+                       <syntax>
+                               <channel_snapshot/>
+                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='ReceiveFAX']/managerEventInstance/syntax/parameter)" />
+                       </syntax>
+               </managerEventInstance>
+       </managerEvent>
+       <managerEvent language="en_US" name="MusicOnHoldStart">
+               <managerEventInstance class="EVENT_FLAG_CALL">
+                       <synopsis>Raised when music on hold has started on a channel.</synopsis>
+                       <syntax>
+                               <channel_snapshot/>
+                               <parameter name="Class">
+                                       <para>The class of music being played on the channel</para>
+                               </parameter>
+                       </syntax>
+                       <see-also>
+                               <ref type="managerEvent">MusicOnHoldStop</ref>
+                               <ref type="application">MusicOnHold</ref>
+                       </see-also>
+               </managerEventInstance>
+       </managerEvent>
+       <managerEvent language="en_US" name="MusicOnHoldStop">
+               <managerEventInstance class="EVENT_FLAG_CALL">
+                       <synopsis>Raised when music on hold has stopped on a channel.</synopsis>
+                       <syntax>
+                               <channel_snapshot/>
+                       </syntax>
+                       <see-also>
+                               <ref type="managerEvent">MusicOnHoldStart</ref>
+                               <ref type="application">StopMusicOnHold</ref>
+                       </see-also>
+               </managerEventInstance>
+       </managerEvent>
+       <managerEvent language="en_US" name="MonitorStart">
+               <managerEventInstance class="EVENT_FLAG_CALL">
+                       <synopsis>Raised when monitoring has started on a channel.</synopsis>
+                       <syntax>
+                               <channel_snapshot/>
+                       </syntax>
+                       <see-also>
+                               <ref type="managerEvent">MonitorStop</ref>
+                               <ref type="application">Monitor</ref>
+                               <ref type="manager">Monitor</ref>
+                       </see-also>
+               </managerEventInstance>
+       </managerEvent>
+       <managerEvent language="en_US" name="MonitorStop">
+               <managerEventInstance class="EVENT_FLAG_CALL">
+               <synopsis>Raised when monitoring has stopped on a channel.</synopsis>
+               <syntax>
+                       <channel_snapshot/>
+               </syntax>
+               <see-also>
+                       <ref type="managerEvent">MonitorStart</ref>
+                       <ref type="application">StopMonitor</ref>
+                       <ref type="manager">StopMonitor</ref>
+               </see-also>
+               </managerEventInstance>
+       </managerEvent>
+***/
+
+/*! \brief The \ref stasis subscription returned by the forwarding of the channel topic
+ * to the manager topic
+ */
+static struct stasis_subscription *topic_forwarder;
 
-struct ast_str *ast_manager_build_channel_state_string_suffix(
+struct ast_str *ast_manager_build_channel_state_string_prefix(
                const struct ast_channel_snapshot *snapshot,
-               const char *suffix)
+               const char *prefix)
 {
        struct ast_str *out = ast_str_create(1024);
        int res = 0;
+
        if (!out) {
                return NULL;
        }
+
+       if (snapshot->tech_properties & (AST_CHAN_TP_ANNOUNCER | AST_CHAN_TP_RECORDER)) {
+               ast_free(out);
+               return NULL;
+       }
+
        res = ast_str_set(&out, 0,
-               "Channel%s: %s\r\n"
-               "ChannelState%s: %d\r\n"
-               "ChannelStateDesc%s: %s\r\n"
-               "CallerIDNum%s: %s\r\n"
-               "CallerIDName%s: %s\r\n"
-               "ConnectedLineNum%s: %s\r\n"
-               "ConnectedLineName%s: %s\r\n"
-               "AccountCode%s: %s\r\n"
-               "Context%s: %s\r\n"
-               "Exten%s: %s\r\n"
-               "Priority%s: %d\r\n"
-               "Uniqueid%s: %s\r\n",
-               suffix, snapshot->name,
-               suffix, snapshot->state,
-               suffix, ast_state2str(snapshot->state),
-               suffix, S_OR(snapshot->caller_number, "<unknown>"),
-               suffix, S_OR(snapshot->caller_name, "<unknown>"),
-               suffix, S_OR(snapshot->connected_number, "<unknown>"),
-               suffix, S_OR(snapshot->connected_name, "<unknown>"),
-               suffix, snapshot->accountcode,
-               suffix, snapshot->context,
-               suffix, snapshot->exten,
-               suffix, snapshot->priority,
-               suffix, snapshot->uniqueid);
+               "%sChannel: %s\r\n"
+               "%sChannelState: %d\r\n"
+               "%sChannelStateDesc: %s\r\n"
+               "%sCallerIDNum: %s\r\n"
+               "%sCallerIDName: %s\r\n"
+               "%sConnectedLineNum: %s\r\n"
+               "%sConnectedLineName: %s\r\n"
+               "%sAccountCode: %s\r\n"
+               "%sContext: %s\r\n"
+               "%sExten: %s\r\n"
+               "%sPriority: %d\r\n"
+               "%sUniqueid: %s\r\n",
+               prefix, snapshot->name,
+               prefix, snapshot->state,
+               prefix, ast_state2str(snapshot->state),
+               prefix, S_OR(snapshot->caller_number, "<unknown>"),
+               prefix, S_OR(snapshot->caller_name, "<unknown>"),
+               prefix, S_OR(snapshot->connected_number, "<unknown>"),
+               prefix, S_OR(snapshot->connected_name, "<unknown>"),
+               prefix, snapshot->accountcode,
+               prefix, snapshot->context,
+               prefix, snapshot->exten,
+               prefix, snapshot->priority,
+               prefix, snapshot->uniqueid);
 
        if (!res) {
+               ast_free(out);
                return NULL;
        }
 
        if (snapshot->manager_vars) {
                struct ast_var_t *var;
                AST_LIST_TRAVERSE(snapshot->manager_vars, var, entries) {
-                       ast_str_append(&out, 0, "ChanVariable%s: %s=%s\r\n",
-                                      suffix,
+                       ast_str_append(&out, 0, "%sChanVariable: %s=%s\r\n",
+                                      prefix,
                                       var->name, var->value);
                }
        }
@@ -284,83 +432,18 @@ struct ast_str *ast_manager_build_channel_state_string_suffix(
 }
 
 struct ast_str *ast_manager_build_channel_state_string(
-       const struct ast_channel_snapshot *snapshot)
+               const struct ast_channel_snapshot *snapshot)
 {
-       return ast_manager_build_channel_state_string_suffix(snapshot, "");
+       return ast_manager_build_channel_state_string_prefix(snapshot, "");
 }
 
-/*! \brief Struct containing info for an AMI channel event to send out. */
-struct snapshot_manager_event {
-       /*! event_flags manager_event() flags parameter. */
-       int event_flags;
-       /*!  manager_event manager_event() category. */
-       const char *manager_event;
-       AST_DECLARE_STRING_FIELDS(
-               /* extra fields to include in the event. */
-               AST_STRING_FIELD(extra_fields);
-               );
-};
-
-static void snapshot_manager_event_dtor(void *obj)
-{
-       struct snapshot_manager_event *ev = obj;
-       ast_string_field_free_memory(ev);
-}
-
-/*!
- * \brief Construct a \ref snapshot_manager_event.
- * \param event_flags manager_event() flags parameter.
- * \param manager_event manager_event() category.
- * \param extra_fields_fmt Format string for extra fields to include.
- *                         Or NO_EXTRA_FIELDS for no extra fields.
- * \return New \ref snapshot_manager_event object.
- * \return \c NULL on error.
- */
-static struct snapshot_manager_event *
-__attribute__((format(printf, 3, 4)))
-snapshot_manager_event_create(
-       int event_flags,
-       const char *manager_event,
-       const char *extra_fields_fmt,
-       ...)
-{
-       RAII_VAR(struct snapshot_manager_event *, ev, NULL, ao2_cleanup);
-       va_list argp;
-
-       ast_assert(extra_fields_fmt != NULL);
-       ast_assert(manager_event != NULL);
-
-       ev = ao2_alloc(sizeof(*ev), snapshot_manager_event_dtor);
-       if (!ev) {
-               return NULL;
-       }
-
-       if (ast_string_field_init(ev, 20)) {
-               return NULL;
-       }
-
-       ev->manager_event = manager_event;
-       ev->event_flags = event_flags;
-
-       va_start(argp, extra_fields_fmt);
-       ast_string_field_ptr_build_va(ev, &ev->extra_fields, extra_fields_fmt,
-                                     argp);
-       va_end(argp);
-
-       ao2_ref(ev, +1);
-       return ev;
-}
-
-/*! GCC warns about blank or NULL format strings. So, shenanigans! */
-#define NO_EXTRA_FIELDS "%s", ""
-
 /*! \brief Typedef for callbacks that get called on channel snapshot updates */
-typedef struct snapshot_manager_event *(*snapshot_monitor)(
+typedef struct ast_manager_event_blob *(*channel_snapshot_monitor)(
        struct ast_channel_snapshot *old_snapshot,
        struct ast_channel_snapshot *new_snapshot);
 
 /*! \brief Handle channel state changes */
-static struct snapshot_manager_event *channel_state_change(
+static struct ast_manager_event_blob *channel_state_change(
        struct ast_channel_snapshot *old_snapshot,
        struct ast_channel_snapshot *new_snapshot)
 {
@@ -377,15 +460,15 @@ static struct snapshot_manager_event *channel_state_change(
         */
 
        if (!old_snapshot) {
-               return snapshot_manager_event_create(
+               return ast_manager_event_blob_create(
                        EVENT_FLAG_CALL, "Newchannel", NO_EXTRA_FIELDS);
        }
 
-       was_hungup = ast_test_flag(&old_snapshot->flags, AST_FLAG_ZOMBIE) ? 1 : 0;
-       is_hungup = ast_test_flag(&new_snapshot->flags, AST_FLAG_ZOMBIE) ? 1 : 0;
+       was_hungup = ast_test_flag(&old_snapshot->flags, AST_FLAG_DEAD) ? 1 : 0;
+       is_hungup = ast_test_flag(&new_snapshot->flags, AST_FLAG_DEAD) ? 1 : 0;
 
        if (!was_hungup && is_hungup) {
-               return snapshot_manager_event_create(
+               return ast_manager_event_blob_create(
                        EVENT_FLAG_CALL, "Hangup",
                        "Cause: %d\r\n"
                        "Cause-txt: %s\r\n",
@@ -394,7 +477,7 @@ static struct snapshot_manager_event *channel_state_change(
        }
 
        if (old_snapshot->state != new_snapshot->state) {
-               return snapshot_manager_event_create(
+               return ast_manager_event_blob_create(
                        EVENT_FLAG_CALL, "Newstate", NO_EXTRA_FIELDS);
        }
 
@@ -402,7 +485,7 @@ static struct snapshot_manager_event *channel_state_change(
        return NULL;
 }
 
-static struct snapshot_manager_event *channel_newexten(
+static struct ast_manager_event_blob *channel_newexten(
        struct ast_channel_snapshot *old_snapshot,
        struct ast_channel_snapshot *new_snapshot)
 {
@@ -416,12 +499,18 @@ static struct snapshot_manager_event *channel_newexten(
                return NULL;
        }
 
-       if (old_snapshot && ast_channel_snapshot_cep_equal(old_snapshot, new_snapshot)) {
+       /* Ignore any updates if we're hungup */
+       if (ast_test_flag(&new_snapshot->flags, AST_FLAG_DEAD)) {
+               return NULL;
+       }
+
+       if (old_snapshot && ast_channel_snapshot_cep_equal(old_snapshot, new_snapshot)
+               && !strcmp(old_snapshot->appl, new_snapshot->appl)) {
                return NULL;
        }
 
        /* DEPRECATED: Extension field deprecated in 12; remove in 14 */
-       return snapshot_manager_event_create(
+       return ast_manager_event_blob_create(
                EVENT_FLAG_CALL, "Newexten",
                "Extension: %s\r\n"
                "Application: %s\r\n"
@@ -431,7 +520,7 @@ static struct snapshot_manager_event *channel_newexten(
                new_snapshot->data);
 }
 
-static struct snapshot_manager_event *channel_new_callerid(
+static struct ast_manager_event_blob *channel_new_callerid(
        struct ast_channel_snapshot *old_snapshot,
        struct ast_channel_snapshot *new_snapshot)
 {
@@ -444,17 +533,35 @@ static struct snapshot_manager_event *channel_new_callerid(
                return NULL;
        }
 
-       return snapshot_manager_event_create(
+       return ast_manager_event_blob_create(
                EVENT_FLAG_CALL, "NewCallerid",
                "CID-CallingPres: %d (%s)\r\n",
                new_snapshot->caller_pres,
                ast_describe_caller_presentation(new_snapshot->caller_pres));
 }
 
-snapshot_monitor monitors[] = {
+static struct ast_manager_event_blob *channel_new_accountcode(
+       struct ast_channel_snapshot *old_snapshot,
+       struct ast_channel_snapshot *new_snapshot)
+{
+       if (!old_snapshot || !new_snapshot) {
+               return NULL;
+       }
+
+       if (!strcmp(old_snapshot->accountcode, new_snapshot->accountcode)) {
+               return NULL;
+       }
+
+       return ast_manager_event_blob_create(
+               EVENT_FLAG_CALL, "NewAccountCode",
+               "OldAccountCode: %s\r\n", old_snapshot->accountcode);
+}
+
+channel_snapshot_monitor channel_monitors[] = {
        channel_state_change,
        channel_newexten,
-       channel_new_callerid
+       channel_new_callerid,
+       channel_new_accountcode
 };
 
 static void channel_snapshot_update(void *data, struct stasis_subscription *sub,
@@ -469,16 +576,14 @@ static void channel_snapshot_update(void *data, struct stasis_subscription *sub,
 
        update = stasis_message_data(message);
 
-       if (ast_channel_snapshot_type() != update->type) {
-               return;
-       }
+       ast_assert(ast_channel_snapshot_type() == update->type);
 
        old_snapshot = stasis_message_data(update->old_snapshot);
        new_snapshot = stasis_message_data(update->new_snapshot);
 
-       for (i = 0; i < ARRAY_LEN(monitors); ++i) {
-               RAII_VAR(struct snapshot_manager_event *, ev, NULL, ao2_cleanup);
-               ev = monitors[i](old_snapshot, new_snapshot);
+       for (i = 0; i < ARRAY_LEN(channel_monitors); ++i) {
+               RAII_VAR(struct ast_manager_event_blob *, ev, NULL, ao2_cleanup);
+               ev = channel_monitors[i](old_snapshot, new_snapshot);
 
                if (!ev) {
                        continue;
@@ -499,81 +604,6 @@ static void channel_snapshot_update(void *data, struct stasis_subscription *sub,
        }
 }
 
-static void channel_varset_cb(void *data, struct stasis_subscription *sub,
-       struct stasis_topic *topic, struct stasis_message *message)
-{
-       struct ast_channel_blob *obj = stasis_message_data(message);
-       RAII_VAR(struct ast_str *, channel_event_string, NULL, ast_free);
-       const char *variable = ast_json_string_get(ast_json_object_get(obj->blob, "variable"));
-       const char *value = ast_json_string_get(ast_json_object_get(obj->blob, "value"));
-
-       if (obj->snapshot) {
-               channel_event_string = ast_manager_build_channel_state_string(obj->snapshot);
-       } else {
-               channel_event_string = ast_str_create(35);
-               ast_str_set(&channel_event_string, 0,
-                           "Channel: none\r\n"
-                           "Uniqueid: none\r\n");
-       }
-
-       if (!channel_event_string) {
-               return;
-       }
-
-       /*** DOCUMENTATION
-               <managerEventInstance>
-                       <synopsis>Raised when a variable is set to a particular value.</synopsis>
-                       <syntax>
-                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
-                               <parameter name="Variable">
-                                       <para>The variable being set.</para>
-                               </parameter>
-                               <parameter name="Value">
-                                       <para>The new value of the variable.</para>
-                               </parameter>
-                       </syntax>
-               </managerEventInstance>
-       ***/
-       manager_event(EVENT_FLAG_DIALPLAN, "VarSet",
-                     "%s"
-                     "Variable: %s\r\n"
-                     "Value: %s\r\n",
-                     ast_str_buffer(channel_event_string),
-                     variable, value);
-}
-
-/*!
- * \brief Callback used to determine whether a key should be skipped when converting a JSON object to a manager blob
- * \param key Key from JSON blob to be evaluated
- * \retval non-zero if the key should be excluded
- * \retval zero if the key should not be excluded
- */
-typedef int (*key_exclusion_cb)(const char *key);
-
-static struct ast_str *manager_str_from_json_object(struct ast_json *blob, key_exclusion_cb exclusion_cb)
-{
-       struct ast_str *output_str = ast_str_create(32);
-       struct ast_json_iter *blob_iter = ast_json_object_iter(blob);
-       if (!output_str || !blob_iter) {
-               return NULL;
-       }
-
-       do {
-               const char *key = ast_json_object_iter_key(blob_iter);
-               const char *value = ast_json_string_get(ast_json_object_iter_value(blob_iter));
-               if (exclusion_cb && exclusion_cb(key)) {
-                       continue;
-               }
-
-               ast_str_append(&output_str, 0, "%s: %s\r\n", key, value);
-               if (!output_str) {
-                       return NULL;
-               }
-       } while ((blob_iter = ast_json_object_iter_next(blob, blob_iter)));
-
-       return output_str;
-}
-
 static int userevent_exclusion_cb(const char *key)
 {
        if (!strcmp("type", key)) {
@@ -594,7 +624,7 @@ static void channel_user_event_cb(void *data, struct stasis_subscription *sub,
        const char *eventname;
 
        eventname = ast_json_string_get(ast_json_object_get(obj->blob, "eventname"));
-       body = manager_str_from_json_object(obj->blob, userevent_exclusion_cb);
+       body = ast_manager_str_from_json_object(obj->blob, userevent_exclusion_cb);
        channel_event_string = ast_manager_build_channel_state_string(obj->snapshot);
 
        if (!channel_event_string || !body) {
@@ -605,7 +635,7 @@ static void channel_user_event_cb(void *data, struct stasis_subscription *sub,
                <managerEventInstance>
                        <synopsis>A user defined event raised from the dialplan.</synopsis>
                        <syntax>
-                               <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
+                               <channel_snapshot/>
                                <parameter name="UserEvent">
                                        <para>The event name, as specified in the dialplan.</para>
                                </parameter>
@@ -622,6 +652,20 @@ static void channel_user_event_cb(void *data, struct stasis_subscription *sub,
                      ast_str_buffer(channel_event_string), eventname, ast_str_buffer(body));
 }
 
+static void publish_basic_channel_event(const char *event, int class, struct ast_channel_snapshot *snapshot)
+{
+       RAII_VAR(struct ast_str *, channel_event_string, NULL, ast_free);
+
+       channel_event_string = ast_manager_build_channel_state_string(snapshot);
+       if (!channel_event_string) {
+               return;
+       }
+
+       manager_event(class, event,
+               "%s",
+               ast_str_buffer(channel_event_string));
+}
+
 static void channel_hangup_request_cb(void *data,
        struct stasis_subscription *sub, struct stasis_topic *topic,
        struct stasis_message *message)
@@ -662,6 +706,64 @@ static void channel_hangup_request_cb(void *data,
                      ast_str_buffer(extra));
 }
 
+static void channel_chanspy_stop_cb(void *data, struct stasis_subscription *sub,
+               struct stasis_topic *topic, struct stasis_message *message)
+{
+       RAII_VAR(struct ast_str *, spyer_channel_string, NULL, ast_free);
+       struct ast_channel_snapshot *spyer;
+       struct ast_multi_channel_blob *payload = stasis_message_data(message);
+
+       spyer = ast_multi_channel_blob_get_channel(payload, "spyer_channel");
+       if (!spyer) {
+               ast_log(AST_LOG_WARNING, "Received ChanSpy Start event with no spyer channel!\n");
+               return;
+       }
+
+       spyer_channel_string = ast_manager_build_channel_state_string_prefix(spyer, "Spyer");
+       if (!spyer_channel_string) {
+               return;
+       }
+
+       manager_event(EVENT_FLAG_CALL, "ChanSpyStop",
+                     "%s",
+                     ast_str_buffer(spyer_channel_string));
+}
+
+static void channel_chanspy_start_cb(void *data, struct stasis_subscription *sub,
+               struct stasis_topic *topic, struct stasis_message *message)
+{
+       RAII_VAR(struct ast_str *, spyer_channel_string, NULL, ast_free);
+       RAII_VAR(struct ast_str *, spyee_channel_string, NULL, ast_free);
+       struct ast_channel_snapshot *spyer;
+       struct ast_channel_snapshot *spyee;
+       struct ast_multi_channel_blob *payload = stasis_message_data(message);
+
+       spyer = ast_multi_channel_blob_get_channel(payload, "spyer_channel");
+       if (!spyer) {
+               ast_log(AST_LOG_WARNING, "Received ChanSpy Start event with no spyer channel!\n");
+               return;
+       }
+       spyee = ast_multi_channel_blob_get_channel(payload, "spyee_channel");
+       if (!spyee) {
+               ast_log(AST_LOG_WARNING, "Received ChanSpy Start event with no spyee channel!\n");
+               return;
+       }
+
+       spyer_channel_string = ast_manager_build_channel_state_string_prefix(spyer, "Spyer");
+       if (!spyer_channel_string) {
+               return;
+       }
+       spyee_channel_string = ast_manager_build_channel_state_string_prefix(spyee, "Spyee");
+       if (!spyee_channel_string) {
+               return;
+       }
+
+       manager_event(EVENT_FLAG_CALL, "ChanSpyStart",
+                     "%s%s",
+                     ast_str_buffer(spyer_channel_string),
+                     ast_str_buffer(spyee_channel_string));
+}
+
 static void channel_dtmf_begin_cb(void *data, struct stasis_subscription *sub,
        struct stasis_topic *topic, struct stasis_message *message)
 {
@@ -682,7 +784,7 @@ static void channel_dtmf_begin_cb(void *data, struct stasis_subscription *sub,
                <managerEventInstance>
                        <synopsis>Raised when a DTMF digit has started on a channel.</synopsis>
                                <syntax>
-                                       <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
+                                       <channel_snapshot/>
                                        <parameter name="Digit">
                                                <para>DTMF digit received or transmitted (0-9, A-E, # or *</para>
                                        </parameter>
@@ -725,7 +827,7 @@ static void channel_dtmf_end_cb(void *data, struct stasis_subscription *sub,
                <managerEventInstance>
                        <synopsis>Raised when a DTMF digit has ended on a channel.</synopsis>
                                <syntax>
-                                       <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
+                                       <channel_snapshot/>
                                        <parameter name="Digit">
                                                <para>DTMF digit received or transmitted (0-9, A-E, # or *</para>
                                        </parameter>
@@ -750,6 +852,154 @@ static void channel_dtmf_end_cb(void *data, struct stasis_subscription *sub,
                digit, duration_ms, direction);
 }
 
+static void channel_hangup_handler_cb(void *data, struct stasis_subscription *sub,
+               struct stasis_topic *topic, struct stasis_message *message)
+{
+       RAII_VAR(struct ast_str *, channel_event_string, NULL, ast_free);
+       struct ast_channel_blob *payload = stasis_message_data(message);
+       const char *action = ast_json_string_get(ast_json_object_get(payload->blob, "type"));
+       const char *handler = ast_json_string_get(ast_json_object_get(payload->blob, "handler"));
+       const char *event;
+
+       channel_event_string = ast_manager_build_channel_state_string(payload->snapshot);
+
+       if (!channel_event_string) {
+               return;
+       }
+
+       if (!strcmp(action, "type")) {
+               event = "HangupHandlerRun";
+       } else if (!strcmp(action, "type")) {
+               event = "HangupHandlerPop";
+       } else if (!strcmp(action, "type")) {
+               event = "HangupHandlerPush";
+       } else {
+               return;
+       }
+       manager_event(EVENT_FLAG_DIALPLAN, event,
+               "%s"
+               "Handler: %s\r\n",
+               ast_str_buffer(channel_event_string),
+               handler);
+}
+
+static void channel_fax_cb(void *data, struct stasis_subscription *sub,
+               struct stasis_topic *topic, struct stasis_message *message)
+{
+       RAII_VAR(struct ast_str *, channel_event_string, NULL, ast_free);
+       RAII_VAR(struct ast_str *, event_buffer, ast_str_create(256), ast_free);
+       struct ast_channel_blob *payload = stasis_message_data(message);
+       const char *type = ast_json_string_get(ast_json_object_get(payload->blob, "type"));
+       struct ast_json *operation = ast_json_object_get(payload->blob, "operation");
+       struct ast_json *status = ast_json_object_get(payload->blob, "status");
+       struct ast_json *local_station_id = ast_json_object_get(payload->blob, "local_station_id");
+       struct ast_json *remote_station_id = ast_json_object_get(payload->blob, "remote_station_id");
+       struct ast_json *fax_pages = ast_json_object_get(payload->blob, "fax_pages");
+       struct ast_json *fax_resolution = ast_json_object_get(payload->blob, "fax_resolution");
+       struct ast_json *fax_bitrate = ast_json_object_get(payload->blob, "fax_bitrate");
+       struct ast_json *filenames = ast_json_object_get(payload->blob, "filenames");
+       const char *event;
+       size_t array_len;
+       size_t i;
+
+       if (!event_buffer) {
+               return;
+       }
+
+       channel_event_string = ast_manager_build_channel_state_string(payload->snapshot);
+       if (!channel_event_string) {
+               return;
+       }
+
+       if (!strcmp(type, "status")) {
+               event = "FAXStatus";
+       } else if (!strcmp(type, "receive")) {
+               event = "ReceiveFAX";
+       } else if (!strcmp(type, "send")) {
+               event = "SendFAX";
+       } else {
+               return;
+       }
+
+       if (operation) {
+               ast_str_append(&event_buffer, 0, "Operation: %s\r\n", ast_json_string_get(operation));
+       }
+       if (status) {
+               ast_str_append(&event_buffer, 0, "Status: %s\r\n", ast_json_string_get(status));
+       }
+       if (local_station_id) {
+               ast_str_append(&event_buffer, 0, "LocalStationID: %s\r\n", ast_json_string_get(local_station_id));
+       }
+       if (remote_station_id) {
+               ast_str_append(&event_buffer, 0, "RemoteStationID: %s\r\n", ast_json_string_get(remote_station_id));
+       }
+       if (fax_pages) {
+               ast_str_append(&event_buffer, 0, "PagesTransferred: %s\r\n", ast_json_string_get(fax_pages));
+       }
+       if (fax_resolution) {
+               ast_str_append(&event_buffer, 0, "Resolution: %s\r\n", ast_json_string_get(fax_resolution));
+       }
+       if (fax_bitrate) {
+               ast_str_append(&event_buffer, 0, "TransferRate: %s\r\n", ast_json_string_get(fax_bitrate));
+       }
+       if (filenames) {
+               array_len = ast_json_array_size(filenames);
+               for (i = 0; i < array_len; i++) {
+                       ast_str_append(&event_buffer, 0, "FileName: %s\r\n", ast_json_string_get(ast_json_array_get(filenames, i)));
+               }
+       }
+
+       manager_event(EVENT_FLAG_CALL, event,
+               "%s"
+               "%s",
+               ast_str_buffer(channel_event_string),
+               ast_str_buffer(event_buffer));
+}
+
+static void channel_moh_start_cb(void *data, struct stasis_subscription *sub,
+               struct stasis_topic *topic, struct stasis_message *message)
+{
+       struct ast_channel_blob *payload = stasis_message_data(message);
+       struct ast_json *blob = payload->blob;
+       RAII_VAR(struct ast_str *, channel_event_string, NULL, ast_free);
+
+       channel_event_string = ast_manager_build_channel_state_string(payload->snapshot);
+       if (!channel_event_string) {
+               return;
+       }
+
+       manager_event(EVENT_FLAG_CALL, "MusicOnHoldStart",
+               "%s"
+               "Class: %s\r\n",
+               ast_str_buffer(channel_event_string),
+               ast_json_string_get(ast_json_object_get(blob, "class")));
+
+}
+
+static void channel_moh_stop_cb(void *data, struct stasis_subscription *sub,
+               struct stasis_topic *topic, struct stasis_message *message)
+{
+       struct ast_channel_blob *payload = stasis_message_data(message);
+
+       publish_basic_channel_event("MusicOnHoldStop", EVENT_FLAG_CALL, payload->snapshot);
+}
+
+static void channel_monitor_start_cb(void *data, struct stasis_subscription *sub,
+               struct stasis_topic *topic, struct stasis_message *message)
+{
+       struct ast_channel_blob *payload = stasis_message_data(message);
+
+       publish_basic_channel_event("MonitorStart", EVENT_FLAG_CALL, payload->snapshot);
+}
+
+static void channel_monitor_stop_cb(void *data, struct stasis_subscription *sub,
+               struct stasis_topic *topic, struct stasis_message *message)
+{
+       struct ast_channel_blob *payload = stasis_message_data(message);
+
+       publish_basic_channel_event("MonitorStop", EVENT_FLAG_CALL, payload->snapshot);
+}
+
 /*!
  * \brief Callback processing messages for channel dialing
  */
@@ -769,7 +1019,7 @@ static void channel_dial_cb(void *data, struct stasis_subscription *sub,
 
        /* Peer is required - otherwise, who are we dialing? */
        ast_assert(peer != NULL);
-       peer_event_string = ast_manager_build_channel_state_string_suffix(peer, "Dest");
+       peer_event_string = ast_manager_build_channel_state_string_prefix(peer, "Dest");
        if (!peer_event_string) {
                return;
        }
@@ -800,64 +1050,138 @@ static void channel_dial_cb(void *data, struct stasis_subscription *sub,
 
 }
 
+static void channel_hold_cb(void *data, struct stasis_subscription *sub,
+       struct stasis_topic *topic, struct stasis_message *message)
+{
+       struct ast_channel_blob *obj = stasis_message_data(message);
+       const char *musicclass;
+       RAII_VAR(struct ast_str *, musicclass_string, NULL, ast_free);
+       RAII_VAR(struct ast_str *, channel_event_string, NULL, ast_free);
+
+       if (!(musicclass_string = ast_str_create(32))) {
+               return;
+       }
+
+       channel_event_string = ast_manager_build_channel_state_string(obj->snapshot);
+       if (!channel_event_string) {
+               return;
+       }
+
+       if (obj->blob) {
+               musicclass = ast_json_string_get(ast_json_object_get(obj->blob, "musicclass"));
+
+               if (!ast_strlen_zero(musicclass)) {
+                       ast_str_set(&musicclass_string, 0, "MusicClass: %s\r\n", musicclass);
+               }
+       }
+
+       manager_event(EVENT_FLAG_CALL, "Hold",
+               "%s"
+               "%s",
+               ast_str_buffer(channel_event_string),
+               ast_str_buffer(musicclass_string));
+}
+
+static void channel_unhold_cb(void *data, struct stasis_subscription *sub,
+       struct stasis_topic *topic, struct stasis_message *message)
+{
+       struct ast_channel_blob *obj = stasis_message_data(message);
+       RAII_VAR(struct ast_str *, channel_event_string, NULL, ast_free);
+
+       channel_event_string = ast_manager_build_channel_state_string(obj->snapshot);
+       if (!channel_event_string) {
+               return;
+       }
+
+       manager_event(EVENT_FLAG_CALL, "Unhold",
+               "%s",
+               ast_str_buffer(channel_event_string));
+}
+
 static void manager_channels_shutdown(void)
 {
-       stasis_message_router_unsubscribe_and_join(channel_state_router);
-       channel_state_router = NULL;
+       stasis_unsubscribe(topic_forwarder);
+       topic_forwarder = NULL;
 }
 
 int manager_channels_init(void)
 {
        int ret = 0;
+       struct stasis_topic *manager_topic;
+       struct stasis_topic *channel_topic;
+       struct stasis_message_router *message_router;
 
-       if (channel_state_router) {
-               /* Already initialized */
-               return 0;
+       manager_topic = ast_manager_get_topic();
+       if (!manager_topic) {
+               return -1;
+       }
+       message_router = ast_manager_get_message_router();
+       if (!message_router) {
+               return -1;
+       }
+       channel_topic = ast_channel_topic_all_cached();
+       if (!channel_topic) {
+               return -1;
+       }
+
+       topic_forwarder = stasis_forward_all(channel_topic, manager_topic);
+       if (!topic_forwarder) {
+               return -1;
        }
 
        ast_register_atexit(manager_channels_shutdown);
 
-       channel_state_router = stasis_message_router_create(
-               stasis_caching_get_topic(ast_channel_topic_all_cached()));
+       ret |= stasis_message_router_add_cache_update(message_router,
+               ast_channel_snapshot_type(), channel_snapshot_update, NULL);
 
-       if (!channel_state_router) {
-               return -1;
-       }
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_user_event_type(), channel_user_event_cb, NULL);
+
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_dtmf_begin_type(), channel_dtmf_begin_cb, NULL);
+
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_dtmf_end_type(), channel_dtmf_end_cb, NULL);
+
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_hangup_request_type(), channel_hangup_request_cb,
+               NULL);
+
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_dial_type(), channel_dial_cb, NULL);
+
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_hold_type(), channel_hold_cb, NULL);
+
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_unhold_type(), channel_unhold_cb, NULL);
+
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_fax_type(), channel_fax_cb, NULL);
+
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_chanspy_start_type(), channel_chanspy_start_cb,
+               NULL);
+
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_chanspy_stop_type(), channel_chanspy_stop_cb, NULL);
+
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_hangup_handler_type(), channel_hangup_handler_cb,
+               NULL);
+
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_moh_start_type(), channel_moh_start_cb, NULL);
+
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_moh_stop_type(), channel_moh_stop_cb, NULL);
+
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_monitor_start_type(), channel_monitor_start_cb,
+               NULL);
 
-       ret |= stasis_message_router_add(channel_state_router,
-                                        stasis_cache_update_type(),
-                                        channel_snapshot_update,
-                                        NULL);
-
-       ret |= stasis_message_router_add(channel_state_router,
-                                        ast_channel_varset_type(),
-                                        channel_varset_cb,
-                                        NULL);
-
-       ret |= stasis_message_router_add(channel_state_router,
-                                        ast_channel_user_event_type(),
-                                        channel_user_event_cb,
-                                        NULL);
-
-       ret |= stasis_message_router_add(channel_state_router,
-                                        ast_channel_dtmf_begin_type(),
-                                        channel_dtmf_begin_cb,
-                                        NULL);
-
-       ret |= stasis_message_router_add(channel_state_router,
-                                        ast_channel_dtmf_end_type(),
-                                        channel_dtmf_end_cb,
-                                        NULL);
-
-       ret |= stasis_message_router_add(channel_state_router,
-                                        ast_channel_hangup_request_type(),
-                                        channel_hangup_request_cb,
-                                        NULL);
-
-       ret |= stasis_message_router_add(channel_state_router,
-                                        ast_channel_dial_type(),
-                                        channel_dial_cb,
-                                        NULL);
+       ret |= stasis_message_router_add(message_router,
+               ast_channel_monitor_stop_type(), channel_monitor_stop_cb, NULL);
 
        /* If somehow we failed to add any routes, just shut down the whole
         * thing and fail it.