BuildSystem: Remove unused variables.
[asterisk/asterisk.git] / main / manager.c
index 6b1eda0..3aa9105 100644 (file)
@@ -54,8 +54,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/paths.h"    /* use various ast_config_AST_* */
 #include <ctype.h>
 #include <sys/time.h>
@@ -100,6 +98,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/rtp_engine.h"
 #include "asterisk/format_cache.h"
 #include "asterisk/translate.h"
+#include "asterisk/taskprocessor.h"
 
 /*** DOCUMENTATION
        <manager name="Ping" language="en_US">
@@ -148,6 +147,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <description>
                        <para>Logoff the current manager session.</para>
                </description>
+               <see-also>
+                       <ref type="manager">Login</ref>
+               </see-also>
        </manager>
        <manager name="Login" language="en_US">
                <synopsis>
@@ -167,6 +169,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <description>
                        <para>Login Manager.</para>
                </description>
+               <see-also>
+                       <ref type="manager">Logoff</ref>
+               </see-also>
        </manager>
        <manager name="Challenge" language="en_US">
                <synopsis>
@@ -248,14 +253,16 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                <parameter name="DNID">
                                        <para>Dialed number identifier</para>
                                </parameter>
+                               <parameter name="EffectiveConnectedLineNum">
+                               </parameter>
+                               <parameter name="EffectiveConnectedLineName">
+                               </parameter>
                                <parameter name="TimeToHangup">
                                        <para>Absolute lifetime of the channel</para>
                                </parameter>
                                <parameter name="BridgeID">
                                        <para>Identifier of the bridge the channel is in, may be empty if not in one</para>
                                </parameter>
-                               <parameter name="Linkedid">
-                               </parameter>
                                <parameter name="Application">
                                        <para>Application currently executing on the channel</para>
                                </parameter>
@@ -328,6 +335,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                <para>If a channel name is not provided then the variable is considered global.</para>
                        </note>
                </description>
+               <see-also>
+                       <ref type="manager">Getvar</ref>
+               </see-also>
        </manager>
        <manager name="Getvar" language="en_US">
                <synopsis>
@@ -348,6 +358,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                <para>If a channel name is not provided then the variable is considered global.</para>
                        </note>
                </description>
+               <see-also>
+                       <ref type="manager">Setvar</ref>
+               </see-also>
        </manager>
        <manager name="GetConfig" language="en_US">
                <synopsis>
@@ -380,6 +393,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        In the case where a category name is non-unique, a filter may be specified
                        to match only categories with matching variable values.</para>
                </description>
+               <see-also>
+                       <ref type="manager">GetConfigJSON</ref>
+                       <ref type="manager">UpdateConfig</ref>
+                       <ref type="manager">CreateConfig</ref>
+                       <ref type="manager">ListCategories</ref>
+               </see-also>
        </manager>
        <manager name="GetConfigJSON" language="en_US">
                <synopsis>
@@ -404,6 +423,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        In the case where a category name is non-unique, a filter may be specified
                        to match only categories with matching variable values.</para>
                </description>
+               <see-also>
+                       <ref type="manager">GetConfig</ref>
+                       <ref type="manager">UpdateConfig</ref>
+                       <ref type="manager">CreateConfig</ref>
+                       <ref type="manager">ListCategories</ref>
+               </see-also>
        </manager>
        <manager name="UpdateConfig" language="en_US">
                <synopsis>
@@ -495,6 +520,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <para>This action will modify, create, or delete configuration elements
                        in Asterisk configuration files.</para>
                </description>
+               <see-also>
+                       <ref type="manager">GetConfig</ref>
+                       <ref type="manager">GetConfigJSON</ref>
+                       <ref type="manager">CreateConfig</ref>
+                       <ref type="manager">ListCategories</ref>
+               </see-also>
        </manager>
        <manager name="CreateConfig" language="en_US">
                <synopsis>
@@ -511,6 +542,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        directory. This action is intended to be used before an UpdateConfig
                        action.</para>
                </description>
+               <see-also>
+                       <ref type="manager">GetConfig</ref>
+                       <ref type="manager">GetConfigJSON</ref>
+                       <ref type="manager">UpdateConfig</ref>
+                       <ref type="manager">ListCategories</ref>
+               </see-also>
        </manager>
        <manager name="ListCategories" language="en_US">
                <synopsis>
@@ -525,6 +562,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <description>
                        <para>This action will dump the categories in a given file.</para>
                </description>
+               <see-also>
+                       <ref type="manager">GetConfig</ref>
+                       <ref type="manager">GetConfigJSON</ref>
+                       <ref type="manager">UpdateConfig</ref>
+                       <ref type="manager">CreateConfig</ref>
+               </see-also>
        </manager>
        <manager name="Redirect" language="en_US">
                <synopsis>
@@ -560,6 +603,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <description>
                        <para>Redirect (transfer) a call.</para>
                </description>
+               <see-also>
+                       <ref type="manager">BlindTransfer</ref>
+               </see-also>
        </manager>
        <manager name="Atxfer" language="en_US">
                <synopsis>
@@ -580,6 +626,28 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <description>
                        <para>Attended transfer.</para>
                </description>
+               <see-also>
+                       <ref type="managerEvent">AttendedTransfer</ref>
+               </see-also>
+       </manager>
+       <manager name="CancelAtxfer" language="en_US">
+               <synopsis>
+                       Cancel an attended transfer.
+               </synopsis>
+               <syntax>
+                       <xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+                       <parameter name="Channel" required="true">
+                               <para>The transferer channel.</para>
+                       </parameter>
+               </syntax>
+               <description>
+                       <para>Cancel an attended transfer. Note, this uses the configured cancel attended transfer
+                       feature option (atxferabort) to cancel the transfer. If not available this action will fail.
+                       </para>
+               </description>
+               <see-also>
+                       <ref type="managerEvent">AttendedTransfer</ref>
+               </see-also>
        </manager>
        <manager name="Originate" language="en_US">
                <synopsis>
@@ -659,6 +727,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                <parameter name="Channel"/>
                                <parameter name="Context"/>
                                <parameter name="Exten"/>
+                               <parameter name="Application"/>
+                               <parameter name="Data"/>
                                <parameter name="Reason"/>
                                <parameter name="Uniqueid"/>
                                <parameter name="CallerIDNum"/>
@@ -702,6 +772,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <para>Will return an <literal>Extension Status</literal> message. The response will include
                        the hint for the extension and the status.</para>
                </description>
+               <see-also>
+                       <ref type="managerEvent">ExtensionStatus</ref>
+               </see-also>
        </manager>
        <manager name="PresenceState" language="en_US">
                <synopsis>
@@ -718,6 +791,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <para>Will return a <literal>Presence State</literal> message. The response will include the
                        presence state and, if set, a presence subtype and custom message.</para>
                </description>
+               <see-also>
+                       <ref type="managerEvent">PresenceStatus</ref>
+               </see-also>
        </manager>
        <manager name="AbsoluteTimeout" language="en_US">
                <synopsis>
@@ -755,6 +831,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <para>Waiting: <literal>0</literal> if messages waiting, <literal>1</literal>
                        if no messages waiting.</para>
                </description>
+               <see-also>
+                       <ref type="manager">MailboxCount</ref>
+               </see-also>
        </manager>
        <manager name="MailboxCount" language="en_US">
                <synopsis>
@@ -775,6 +854,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <para>NewMessages: <replaceable>count</replaceable></para>
                        <para>OldMessages: <replaceable>count</replaceable></para>
                </description>
+               <see-also>
+                       <ref type="manager">MailboxStatus</ref>
+               </see-also>
        </manager>
        <manager name="ListCommands" language="en_US">
                <synopsis>
@@ -824,6 +906,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <description>
                        <para>Send an event to manager sessions.</para>
                </description>
+               <see-also>
+                       <ref type="managerEvent">UserEvent</ref>
+                       <ref type="application">UserEvent</ref>
+               </see-also>
        </manager>
        <manager name="WaitEvent" language="en_US">
                <synopsis>
@@ -876,6 +962,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <description>
                        <para>Send a reload event.</para>
                </description>
+               <see-also>
+                       <ref type="manager">ModuleLoad</ref>
+               </see-also>
        </manager>
        <managerEvent language="en_US" name="CoreShowChannel">
                <managerEventInstance class="EVENT_FLAG_CALL">
@@ -988,6 +1077,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <description>
                        <para>Loads, unloads or reloads an Asterisk module in a running system.</para>
                </description>
+               <see-also>
+                       <ref type="manager">Reload</ref>
+                       <ref type="manager">ModuleCheck</ref>
+               </see-also>
        </manager>
        <manager name="ModuleCheck" language="en_US">
                <synopsis>
@@ -1003,6 +1096,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <para>Checks if Asterisk module is loaded. Will return Success/Failure.
                        For success returns, the module revision number is included.</para>
                </description>
+               <see-also>
+                       <ref type="manager">ModuleLoad</ref>
+               </see-also>
        </manager>
        <manager name="AOCMessage" language="en_US">
                <synopsis>
@@ -1109,6 +1205,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <description>
                        <para>Generates an AOC-D or AOC-E message on a channel.</para>
                </description>
+               <see-also>
+                       <ref type="managerEvent">AOC-D</ref>
+                       <ref type="managerEvent">AOC-E</ref>
+               </see-also>
        </manager>
        <function name="AMI_CLIENT" language="en_US">
                <synopsis>
@@ -1168,6 +1268,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        this command can be used to create filters that may bypass
                        filters defined in manager.conf</para>
                </description>
+               <see-also>
+                       <ref type="manager">FilterList</ref>
+               </see-also>
        </manager>
        <manager name="FilterList" language="en_US">
                <synopsis>
@@ -1177,6 +1280,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <para>The filters displayed are for the current session.  Only those filters defined in
                         manager.conf will be present upon starting a new session.</para>
                </description>
+               <see-also>
+                       <ref type="manager">Filter</ref>
+               </see-also>
        </manager>
        <manager name="BlindTransfer" language="en_US">
                <synopsis>
@@ -1195,6 +1301,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                </description>
                <see-also>
                        <ref type="manager">Redirect</ref>
+                       <ref type="managerEvent">BlindTransfer</ref>
                </see-also>
        </manager>
        <managerEvent name="ExtensionStatus" language="en_US">
@@ -1272,6 +1379,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                        </enumlist>
                                </parameter>
                        </syntax>
+                       <see-also>
+                               <ref type="manager">ExtensionState</ref>
+                       </see-also>
                </managerEventInstance>
        </managerEvent>
        <managerEvent name="PresenceStatus" language="en_US">
@@ -1285,6 +1395,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                <parameter name="Subtype" />
                                <parameter name="Message" />
                        </syntax>
+                       <see-also>
+                               <ref type="manager">PresenceState</ref>
+                       </see-also>
                </managerEventInstance>
        </managerEvent>
  ***/
@@ -1457,8 +1570,7 @@ static void acl_change_stasis_unsubscribe(void)
 struct mansession_session {
                                /*! \todo XXX need to document which fields it is protecting */
        struct ast_sockaddr addr;       /*!< address we are connecting from */
-       FILE *f;                /*!< fdopen() on the underlying fd */
-       int fd;                 /*!< descriptor used for output. Either the socket (AMI) or a temporary file (HTTP) */
+       struct ast_iostream *stream;    /*!< AMI stream */
        int inuse;              /*!< number of HTTP sessions using this entry */
        int needdestroy;        /*!< Whether an HTTP session should be destroyed */
        pthread_t waiting_thread;       /*!< Sleeping thread using this descriptor */
@@ -1500,9 +1612,8 @@ enum mansession_message_parsing {
  */
 struct mansession {
        struct mansession_session *session;
+       struct ast_iostream *stream;
        struct ast_tcptls_session_instance *tcptls_session;
-       FILE *f;
-       int fd;
        enum mansession_message_parsing parsing;
        int write_error:1;
        struct manager_custom_hook *hook;
@@ -1544,9 +1655,22 @@ static AST_RWLIST_HEAD_STATIC(actions, manager_action);
 /*! \brief list of hooks registered */
 static AST_RWLIST_HEAD_STATIC(manager_hooks, manager_custom_hook);
 
+#ifdef AST_XML_DOCS
 /*! \brief A container of event documentation nodes */
 static AO2_GLOBAL_OBJ_STATIC(event_docs);
+#endif
 
+static int __attribute__((format(printf, 9, 0))) __manager_event_sessions(
+       struct ao2_container *sessions,
+       int category,
+       const char *event,
+       int chancount,
+       struct ast_channel **chans,
+       const char *file,
+       int line,
+       const char *func,
+       const char *fmt,
+       ...);
 static enum add_filter_result manager_add_filter(const char *filter_pattern, struct ao2_container *whitefilters, struct ao2_container *blackfilters);
 
 static int match_filter(struct mansession *s, char *eventdata);
@@ -1685,37 +1809,75 @@ struct ast_str *ast_manager_str_from_json_object(struct ast_json *blob, key_excl
        return res;
 }
 
+#define manager_event_sessions(sessions, category, event, contents , ...)      \
+       __manager_event_sessions(sessions, category, event, 0, NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, contents , ## __VA_ARGS__)
+
+#define any_manager_listeners(sessions)        \
+       ((sessions && ao2_container_count(sessions)) || !AST_RWLIST_EMPTY(&manager_hooks))
+
 static void manager_default_msg_cb(void *data, struct stasis_subscription *sub,
                                    struct stasis_message *message)
 {
-       RAII_VAR(struct ast_manager_event_blob *, ev, NULL, ao2_cleanup);
+       struct ao2_container *sessions;
+       struct ast_manager_event_blob *ev;
 
-       ev = stasis_message_to_ami(message);
+       if (!stasis_message_can_be_ami(message)) {
+               /* Not an AMI message; disregard */
+               return;
+       }
 
-       if (ev == NULL) {
-               /* Not and AMI message; disregard */
+       sessions = ao2_global_obj_ref(mgr_sessions);
+       if (!any_manager_listeners(sessions)) {
+               /* Nobody is listening */
+               ao2_cleanup(sessions);
+               return;
+       }
+
+       ev = stasis_message_to_ami(message);
+       if (!ev) {
+               /* Conversion failure */
+               ao2_cleanup(sessions);
                return;
        }
 
-       manager_event(ev->event_flags, ev->manager_event, "%s",
-               ev->extra_fields);
+       manager_event_sessions(sessions, ev->event_flags, ev->manager_event,
+               "%s", ev->extra_fields);
+       ao2_ref(ev, -1);
+       ao2_cleanup(sessions);
 }
 
 static void manager_generic_msg_cb(void *data, struct stasis_subscription *sub,
                                    struct stasis_message *message)
 {
-       struct ast_json_payload *payload = stasis_message_data(message);
-       int class_type = ast_json_integer_get(ast_json_object_get(payload->json, "class_type"));
-       const char *type = ast_json_string_get(ast_json_object_get(payload->json, "type"));
-       struct ast_json *event = ast_json_object_get(payload->json, "event");
-       RAII_VAR(struct ast_str *, event_buffer, NULL, ast_free);
+       struct ast_json_payload *payload;
+       int class_type;
+       const char *type;
+       struct ast_json *event;
+       struct ast_str *event_buffer;
+       struct ao2_container *sessions;
+
+       sessions = ao2_global_obj_ref(mgr_sessions);
+       if (!any_manager_listeners(sessions)) {
+               /* Nobody is listening */
+               ao2_cleanup(sessions);
+               return;
+       }
+
+       payload = stasis_message_data(message);
+       class_type = ast_json_integer_get(ast_json_object_get(payload->json, "class_type"));
+       type = ast_json_string_get(ast_json_object_get(payload->json, "type"));
+       event = ast_json_object_get(payload->json, "event");
 
        event_buffer = ast_manager_str_from_json_object(event, NULL);
        if (!event_buffer) {
                ast_log(AST_LOG_WARNING, "Error while creating payload for event %s\n", type);
+               ao2_cleanup(sessions);
                return;
        }
-       manager_event(class_type, type, "%s", ast_str_buffer(event_buffer));
+       manager_event_sessions(sessions, class_type, type,
+               "%s", ast_str_buffer(event_buffer));
+       ast_free(event_buffer);
+       ao2_cleanup(sessions);
 }
 
 void ast_manager_publish_event(const char *type, int class_type, struct ast_json *obj)
@@ -2025,10 +2187,6 @@ static void session_destructor(void *obj)
                ast_datastore_free(datastore);
        }
 
-       if (session->f != NULL) {
-               fflush(session->f);
-               fclose(session->f);
-       }
        if (eqe) {
                ast_atomic_fetchadd_int(&eqe->usecount, -1);
        }
@@ -2063,7 +2221,6 @@ static struct mansession_session *build_mansession(const struct ast_sockaddr *ad
                return NULL;
        }
 
-       newsession->fd = -1;
        newsession->waiting_thread = AST_PTHREADT_NULL;
        newsession->writetimeout = 100;
        newsession->send_events = -1;
@@ -2152,7 +2309,9 @@ static int manager_displayconnects(struct mansession_session *session)
        return ret;
 }
 
+#ifdef AST_XML_DOCS
 static void print_event_instance(struct ast_cli_args *a, struct ast_xml_doc_item *instance);
+#endif
 
 static char *handle_showmancmd(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
@@ -2186,11 +2345,12 @@ static char *handle_showmancmd(struct ast_cli_entry *e, int cmd, struct ast_cli_
                AST_RWLIST_UNLOCK(&actions);
                return ret;
        }
-       authority = ast_str_alloca(MAX_AUTH_PERM_STRING);
        if (a->argc < 4) {
                return CLI_SHOWUSAGE;
        }
 
+       authority = ast_str_alloca(MAX_AUTH_PERM_STRING);
+
 #ifdef AST_XML_DOCS
        /* setup the titles */
        term_color(synopsis_title, "[Synopsis]\n", COLOR_MAGENTA, 0, 40);
@@ -2218,6 +2378,22 @@ static char *handle_showmancmd(struct ast_cli_entry *e, int cmd, struct ast_cli_
                                        char *seealso = ast_xmldoc_printable(S_OR(cur->seealso, "Not available"), 1);
                                        char *privilege = ast_xmldoc_printable(S_OR(auth_str, "Not available"), 1);
                                        char *responses = ast_xmldoc_printable("None", 1);
+
+                                       if (!syntax || !synopsis || !description || !arguments
+                                                       || !seealso || !privilege || !responses) {
+                                               ast_free(syntax);
+                                               ast_free(synopsis);
+                                               ast_free(description);
+                                               ast_free(arguments);
+                                               ast_free(seealso);
+                                               ast_free(privilege);
+                                               ast_free(responses);
+                                               ast_cli(a->fd, "Allocation failure.\n");
+                                               AST_RWLIST_UNLOCK(&actions);
+
+                                               return CLI_FAILURE;
+                                       }
+
                                        ast_cli(a->fd, "%s%s\n\n%s%s\n\n%s%s\n\n%s%s\n\n%s%s\n\n%s%s\n\n%s",
                                                syntax_title, syntax,
                                                synopsis_title, synopsis,
@@ -2245,6 +2421,14 @@ static char *handle_showmancmd(struct ast_cli_entry *e, int cmd, struct ast_cli_
                                                ast_cli(a->fd, "Event: %s\n", cur->final_response->name);
                                                print_event_instance(a, cur->final_response);
                                        }
+
+                                       ast_free(syntax);
+                                       ast_free(synopsis);
+                                       ast_free(description);
+                                       ast_free(arguments);
+                                       ast_free(seealso);
+                                       ast_free(privilege);
+                                       ast_free(responses);
                                } else
 #endif
                                {
@@ -2340,7 +2524,7 @@ static char *handle_showmanager(struct ast_cli_entry *e, int cmd, struct ast_cli
                "        write perm: %s\n"
                "   displayconnects: %s\n"
                "allowmultiplelogin: %s\n",
-               (user->username ? user->username : "(N/A)"),
+               S_OR(user->username, "(N/A)"),
                (user->secret ? "<Set>" : "(N/A)"),
                ((user->acl && !ast_acl_list_is_empty(user->acl)) ? "yes" : "no"),
                user_authority_to_str(user->readperm, &rauthority),
@@ -2476,7 +2660,7 @@ static char *handle_showmanconn(struct ast_cli_entry *e, int cmd, struct ast_cli
                                ast_sockaddr_stringify_addr(&session->addr),
                                (int) (session->sessionstart),
                                (int) (now - session->sessionstart),
-                               session->fd,
+                               session->stream ? ast_iostream_get_fd(session->stream) : -1,
                                session->inuse,
                                session->readperm,
                                session->writeperm);
@@ -2739,49 +2923,53 @@ int ast_hook_send_action(struct manager_custom_hook *hook, const char *msg)
        }
 
        action = astman_get_header(&m, "Action");
-       if (strcasecmp(action, "login")) {
+
+       do {
+               if (!strcasecmp(action, "login")) {
+                       break;
+               }
+
                act_found = action_find(action);
-               if (act_found) {
-                       /*
-                        * we have to simulate a session for this action request
-                        * to be able to pass it down for processing
-                        * This is necessary to meet the previous design of manager.c
-                        */
-                       s.hook = hook;
-                       s.f = (void*)1; /* set this to something so our request will make it through all functions that test it*/
+               if (!act_found) {
+                       break;
+               }
 
-                       ao2_lock(act_found);
-                       if (act_found->registered && act_found->func) {
-                               if (act_found->module) {
-                                       ast_module_ref(act_found->module);
-                               }
-                               ao2_unlock(act_found);
+               /*
+                * we have to simulate a session for this action request
+                * to be able to pass it down for processing
+                * This is necessary to meet the previous design of manager.c
+                */
+               s.hook = hook;
+
+               ret = -1;
+               ao2_lock(act_found);
+               if (act_found->registered && act_found->func) {
+                       struct ast_module *mod_ref = ast_module_running_ref(act_found->module);
+
+                       ao2_unlock(act_found);
+                       /* If the action is in a module it must be running. */
+                       if (!act_found->module || mod_ref) {
                                ret = act_found->func(&s, &m);
-                               ao2_lock(act_found);
-                               if (act_found->module) {
-                                       ast_module_unref(act_found->module);
-                               }
-                       } else {
-                               ret = -1;
+                               ast_module_unref(mod_ref);
                        }
+               } else {
                        ao2_unlock(act_found);
-                       ao2_t_ref(act_found, -1, "done with found action object");
                }
-       }
+               ao2_t_ref(act_found, -1, "done with found action object");
+       } while (0);
+
        ast_free(dup_str);
        return ret;
 }
 
-
 /*!
  * helper function to send a string to the socket.
  * Return -1 on error (e.g. buffer full).
  */
 static int send_string(struct mansession *s, char *string)
 {
-       int res;
-       FILE *f = s->f ? s->f : s->session->f;
-       int fd = s->f ? s->fd : s->session->fd;
+       struct ast_iostream *stream;
+       int len, res;
 
        /* It's a result from one of the hook's action invocation */
        if (s->hook) {
@@ -2793,7 +2981,14 @@ static int send_string(struct mansession *s, char *string)
                return 0;
        }
 
-       if ((res = ast_careful_fwrite(f, fd, string, strlen(string), s->session->writetimeout))) {
+       stream = s->stream ? s->stream : s->session->stream;
+
+       len = strlen(string);
+       ast_iostream_set_timeout_inactivity(stream, s->session->writetimeout);
+       res = ast_iostream_write(stream, string, len);
+       ast_iostream_set_timeout_disable(stream);
+
+       if (res < len) {
                s->write_error = 1;
        }
 
@@ -2819,6 +3014,7 @@ AST_THREADSTORAGE(userevent_buf);
  */
 void astman_append(struct mansession *s, const char *fmt, ...)
 {
+       int res;
        va_list ap;
        struct ast_str *buf;
 
@@ -2827,13 +3023,16 @@ void astman_append(struct mansession *s, const char *fmt, ...)
        }
 
        va_start(ap, fmt);
-       ast_str_set_va(&buf, 0, fmt, ap);
+       res = ast_str_set_va(&buf, 0, fmt, ap);
        va_end(ap);
+       if (res == AST_DYNSTR_BUILD_FAILED) {
+               return;
+       }
 
-       if (s->f != NULL || s->session->f != NULL) {
+       if (s->hook || (s->tcptls_session != NULL && s->tcptls_session->stream != NULL)) {
                send_string(s, ast_str_buffer(buf));
        } else {
-               ast_verbose("fd == -1 in astman_append, should not happen\n");
+               ast_verbose("No connection stream in astman_append, should not happen\n");
        }
 }
 
@@ -2888,6 +3087,7 @@ void astman_send_error(struct mansession *s, const struct message *m, char *erro
 
 void astman_send_error_va(struct mansession *s, const struct message *m, const char *fmt, ...)
 {
+       int res;
        va_list ap;
        struct ast_str *buf;
        char *msg;
@@ -2897,8 +3097,11 @@ void astman_send_error_va(struct mansession *s, const struct message *m, const c
        }
 
        va_start(ap, fmt);
-       ast_str_set_va(&buf, 0, fmt, ap);
+       res = ast_str_set_va(&buf, 0, fmt, ap);
        va_end(ap);
+       if (res == AST_DYNSTR_BUILD_FAILED) {
+               return;
+       }
 
        /* astman_append will use the same underlying buffer, so copy the message out
         * before sending the response */
@@ -3477,18 +3680,18 @@ static int action_getconfigjson(struct mansession *s, const struct message *m)
                category_name = ast_category_get_name(cur_category);
                astman_append(s, "%s\"", comma1 ? "," : "");
                astman_append_json(s, category_name);
-               astman_append(s, "\":[");
+               astman_append(s, "\":{");
                comma1 = 1;
 
                if (ast_category_is_template(cur_category)) {
-                       astman_append(s, "istemplate:1");
+                       astman_append(s, "\"istemplate\":1");
                        comma2 = 1;
                }
 
                if ((templates = ast_category_get_templates(cur_category))
                        && ast_str_strlen(templates) > 0) {
                        astman_append(s, "%s", comma2 ? "," : "");
-                       astman_append(s, "templates:\"%s\"", ast_str_buffer(templates));
+                       astman_append(s, "\"templates\":\"%s\"", ast_str_buffer(templates));
                        ast_free(templates);
                        comma2 = 1;
                }
@@ -3502,7 +3705,7 @@ static int action_getconfigjson(struct mansession *s, const struct message *m)
                        comma2 = 1;
                }
 
-               astman_append(s, "]");
+               astman_append(s, "}");
        }
        astman_append(s, "}\r\n\r\n");
 
@@ -3970,7 +4173,7 @@ static int action_waitevent(struct mansession *s, const struct message *m)
                        break;
                }
                if (s->session->managerid == 0) {       /* AMI session */
-                       if (ast_wait_for_input(s->session->fd, 1000)) {
+                       if (ast_wait_for_input(ast_iostream_get_fd(s->session->stream), 1000)) {
                                break;
                        }
                } else {        /* HTTP session */
@@ -4098,10 +4301,26 @@ static int action_login(struct mansession *s, const struct message *m)
                && ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) {
                struct ast_str *auth = ast_str_alloca(MAX_AUTH_PERM_STRING);
                const char *cat_str = authority_to_str(EVENT_FLAG_SYSTEM, &auth);
+               long uptime = 0;
+               long lastreloaded = 0;
+               struct timeval tmp;
+               struct timeval curtime = ast_tvnow();
+
+               if (ast_startuptime.tv_sec) {
+                       tmp = ast_tvsub(curtime, ast_startuptime);
+                       uptime = tmp.tv_sec;
+               }
+
+               if (ast_lastreloadtime.tv_sec) {
+                       tmp = ast_tvsub(curtime, ast_lastreloadtime);
+                       lastreloaded = tmp.tv_sec;
+               }
 
                astman_append(s, "Event: FullyBooted\r\n"
                        "Privilege: %s\r\n"
-                       "Status: Fully Booted\r\n\r\n", cat_str);
+                       "Uptime: %ld\r\n"
+                       "LastReload: %ld\r\n"
+                       "Status: Fully Booted\r\n\r\n", cat_str, uptime, lastreloaded);
        }
        return 0;
 }
@@ -4335,7 +4554,7 @@ static void generate_status(struct mansession *s, struct ast_channel *chan, char
        RAII_VAR(struct ast_str *, variable_str, NULL, ast_free);
        struct ast_str *write_transpath = ast_str_alloca(256);
        struct ast_str *read_transpath = ast_str_alloca(256);
-       struct ast_str *codec_buf = ast_str_alloca(128);
+       struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
        struct ast_party_id effective_id;
        int i;
        RAII_VAR(struct ast_channel_snapshot *, snapshot,
@@ -4404,7 +4623,6 @@ static void generate_status(struct mansession *s, struct ast_channel *chan, char
                "EffectiveConnectedLineName: %s\r\n"
                "TimeToHangup: %ld\r\n"
                "BridgeID: %s\r\n"
-               "Linkedid: %s\r\n"
                "Application: %s\r\n"
                "Data: %s\r\n"
                "Nativeformats: %s\r\n"
@@ -4425,7 +4643,6 @@ static void generate_status(struct mansession *s, struct ast_channel *chan, char
                S_COR(effective_id.name.valid, effective_id.name.str, "<unknown>"),
                (long)ast_channel_whentohangup(chan)->tv_sec,
                bridge ? bridge->uniqueid : "",
-               ast_channel_linkedid(chan),
                ast_channel_appl(chan),
                ast_channel_data(chan),
                ast_format_cap_get_names(ast_channel_nativeformats(chan), &codec_buf),
@@ -4686,14 +4903,10 @@ static int action_redirect(struct mansession *s, const struct message *m)
 
        /* Release the bridge wait. */
        if (chan1_wait) {
-               ast_channel_lock(chan);
-               ast_clear_flag(ast_channel_flags(chan), AST_FLAG_BRIDGE_DUAL_REDIRECT_WAIT);
-               ast_channel_unlock(chan);
+               ast_channel_clear_flag(chan, AST_FLAG_BRIDGE_DUAL_REDIRECT_WAIT);
        }
        if (chan2_wait) {
-               ast_channel_lock(chan2);
-               ast_clear_flag(ast_channel_flags(chan2), AST_FLAG_BRIDGE_DUAL_REDIRECT_WAIT);
-               ast_channel_unlock(chan2);
+               ast_channel_clear_flag(chan2, AST_FLAG_BRIDGE_DUAL_REDIRECT_WAIT);
        }
 
        chan2 = ast_channel_unref(chan2);
@@ -4706,7 +4919,7 @@ static int action_blind_transfer(struct mansession *s, const struct message *m)
        const char *name = astman_get_header(m, "Channel");
        const char *exten = astman_get_header(m, "Exten");
        const char *context = astman_get_header(m, "Context");
-       RAII_VAR(struct ast_channel *, chan, NULL, ao2_cleanup);
+       struct ast_channel *chan;
 
        if (ast_strlen_zero(name)) {
                astman_send_error(s, m, "No channel specified");
@@ -4743,6 +4956,7 @@ static int action_blind_transfer(struct mansession *s, const struct message *m)
                break;
        }
 
+       ast_channel_unref(chan);
        return 0;
 }
 
@@ -4800,10 +5014,51 @@ static int action_atxfer(struct mansession *s, const struct message *m)
        return 0;
 }
 
+static int action_cancel_atxfer(struct mansession *s, const struct message *m)
+{
+       const char *name = astman_get_header(m, "Channel");
+       struct ast_channel *chan = NULL;
+       char *feature_code;
+       const char *digit;
+
+       if (ast_strlen_zero(name)) {
+               astman_send_error(s, m, "No channel specified");
+               return 0;
+       }
+
+       if (!(chan = ast_channel_get_by_name(name))) {
+               astman_send_error(s, m, "Channel specified does not exist");
+               return 0;
+       }
+
+       ast_channel_lock(chan);
+       feature_code = ast_get_chan_features_atxferabort(chan);
+       ast_channel_unlock(chan);
+
+       if (!feature_code) {
+               astman_send_error(s, m, "No disconnect feature code found");
+               ast_channel_unref(chan);
+               return 0;
+       }
+
+       for (digit = feature_code; *digit; ++digit) {
+               struct ast_frame f = { AST_FRAME_DTMF, .subclass.integer = *digit };
+               ast_queue_frame(chan, &f);
+       }
+       ast_free(feature_code);
+
+       chan = ast_channel_unref(chan);
+
+       astman_send_ack(s, m, "CancelAtxfer successfully queued");
+
+       return 0;
+}
+
+
 static int check_blacklist(const char *cmd)
 {
        char *cmd_copy, *cur_cmd;
-       char *cmd_words[MAX_BLACKLIST_CMD_LEN] = { NULL, };
+       char *cmd_words[AST_MAX_CMD_LEN] = { NULL, };
        int i;
 
        cmd_copy = ast_strdupa(cmd);
@@ -4839,11 +5094,10 @@ static int check_blacklist(const char *cmd)
 static int action_command(struct mansession *s, const struct message *m)
 {
        const char *cmd = astman_get_header(m, "Command");
-       const char *id = astman_get_header(m, "ActionID");
-       char *buf = NULL, *final_buf = NULL;
+       char *buf = NULL, *final_buf = NULL, *delim, *output;
        char template[] = "/tmp/ast-ami-XXXXXX";        /* template for temporary file */
-       int fd;
-       off_t l;
+       int fd, ret;
+       off_t len;
 
        if (ast_strlen_zero(cmd)) {
                astman_send_error(s, m, "No command provided");
@@ -4856,52 +5110,59 @@ static int action_command(struct mansession *s, const struct message *m)
        }
 
        if ((fd = mkstemp(template)) < 0) {
-               ast_log(AST_LOG_WARNING, "Failed to create temporary file for command: %s\n", strerror(errno));
-               astman_send_error(s, m, "Command response construction error");
+               astman_send_error_va(s, m, "Failed to create temporary file: %s", strerror(errno));
                return 0;
        }
 
-       astman_append(s, "Response: Follows\r\nPrivilege: Command\r\n");
-       if (!ast_strlen_zero(id)) {
-               astman_append(s, "ActionID: %s\r\n", id);
-       }
-       /* FIXME: Wedge a ActionID response in here, waiting for later changes */
-       ast_cli_command(fd, cmd);       /* XXX need to change this to use a FILE * */
+       ret = ast_cli_command(fd, cmd);
+       astman_send_response_full(s, m, ret == RESULT_SUCCESS ? "Success" : "Error", MSG_MOREDATA, NULL);
+
        /* Determine number of characters available */
-       if ((l = lseek(fd, 0, SEEK_END)) < 0) {
-               ast_log(LOG_WARNING, "Failed to determine number of characters for command: %s\n", strerror(errno));
+       if ((len = lseek(fd, 0, SEEK_END)) < 0) {
+               astman_append(s, "Message: Failed to determine number of characters: %s\r\n", strerror(errno));
                goto action_command_cleanup;
        }
 
        /* This has a potential to overflow the stack.  Hence, use the heap. */
-       buf = ast_malloc(l + 1);
-       final_buf = ast_malloc(l + 1);
+       buf = ast_malloc(len + 1);
+       final_buf = ast_malloc(len + 1);
 
        if (!buf || !final_buf) {
-               ast_log(LOG_WARNING, "Failed to allocate memory for temporary buffer\n");
+               astman_append(s, "Message: Memory allocation failure\r\n");
                goto action_command_cleanup;
        }
 
        if (lseek(fd, 0, SEEK_SET) < 0) {
-               ast_log(LOG_WARNING, "Failed to set position on temporary file for command: %s\n", strerror(errno));
+               astman_append(s, "Message: Failed to set position on temporary file: %s\r\n", strerror(errno));
                goto action_command_cleanup;
        }
 
-       if (read(fd, buf, l) < 0) {
-               ast_log(LOG_WARNING, "read() failed: %s\n", strerror(errno));
+       if (read(fd, buf, len) < 0) {
+               astman_append(s, "Message: Failed to read from temporary file: %s\r\n", strerror(errno));
                goto action_command_cleanup;
        }
 
-       buf[l] = '\0';
-       term_strip(final_buf, buf, l);
-       final_buf[l] = '\0';
-       astman_append(s, "%s", final_buf);
+       buf[len] = '\0';
+       term_strip(final_buf, buf, len);
+       final_buf[len] = '\0';
+
+       /* Trim trailing newline */
+       if (len && final_buf[len - 1] == '\n') {
+               final_buf[len - 1] = '\0';
+       }
+
+       astman_append(s, "Message: Command output follows\r\n");
+
+       delim = final_buf;
+       while ((output = strsep(&delim, "\n"))) {
+               astman_append(s, "Output: %s\r\n", output);
+       }
 
 action_command_cleanup:
+       astman_append(s, "\r\n");
 
        close(fd);
        unlink(template);
-       astman_append(s, "--END COMMAND--\r\n\r\n");
 
        ast_free(buf);
        ast_free(final_buf);
@@ -4962,13 +5223,15 @@ static void *fast_originate(void *data)
 
        if (!ast_strlen_zero(in->app)) {
                res = ast_pbx_outgoing_app(in->tech, in->cap, in->data,
-                       in->timeout, in->app, in->appdata, &reason, 1,
+                       in->timeout, in->app, in->appdata, &reason,
+                       AST_OUTGOING_WAIT,
                        S_OR(in->cid_num, NULL),
                        S_OR(in->cid_name, NULL),
                        in->vars, in->account, &chan, &assignedids);
        } else {
                res = ast_pbx_outgoing_exten(in->tech, in->cap, in->data,
-                       in->timeout, in->context, in->exten, in->priority, &reason, 1,
+                       in->timeout, in->context, in->exten, in->priority, &reason,
+                       AST_OUTGOING_WAIT,
                        S_OR(in->cid_num, NULL),
                        S_OR(in->cid_name, NULL),
                        in->vars, in->account, &chan, in->early_media, &assignedids);
@@ -4979,22 +5242,43 @@ static void *fast_originate(void *data)
        }
        /* Tell the manager what happened with the channel */
        chans[0] = chan;
-       ast_manager_event_multichan(EVENT_FLAG_CALL, "OriginateResponse", chan ? 1 : 0, chans,
-               "%s"
-               "Response: %s\r\n"
-               "Channel: %s\r\n"
-               "Context: %s\r\n"
-               "Exten: %s\r\n"
-               "Reason: %d\r\n"
-               "Uniqueid: %s\r\n"
-               "CallerIDNum: %s\r\n"
-               "CallerIDName: %s\r\n",
-               in->idtext, res ? "Failure" : "Success",
-               chan ? ast_channel_name(chan) : requested_channel, in->context, in->exten, reason,
-               chan ? ast_channel_uniqueid(chan) : "<null>",
-               S_OR(in->cid_num, "<unknown>"),
-               S_OR(in->cid_name, "<unknown>")
-               );
+       if (!ast_strlen_zero(in->app)) {
+               ast_manager_event_multichan(EVENT_FLAG_CALL, "OriginateResponse", chan ? 1 : 0, chans,
+                       "%s"
+                       "Response: %s\r\n"
+                       "Channel: %s\r\n"
+                       "Application: %s\r\n"
+                       "Data: %s\r\n"
+                       "Reason: %d\r\n"
+                       "Uniqueid: %s\r\n"
+                       "CallerIDNum: %s\r\n"
+                       "CallerIDName: %s\r\n",
+                       in->idtext, res ? "Failure" : "Success",
+                       chan ? ast_channel_name(chan) : requested_channel,
+                       in->app, in->appdata, reason,
+                       chan ? ast_channel_uniqueid(chan) : S_OR(in->channelid, "<unknown>"),
+                       S_OR(in->cid_num, "<unknown>"),
+                       S_OR(in->cid_name, "<unknown>")
+                       );
+       } else {
+               ast_manager_event_multichan(EVENT_FLAG_CALL, "OriginateResponse", chan ? 1 : 0, chans,
+                       "%s"
+                       "Response: %s\r\n"
+                       "Channel: %s\r\n"
+                       "Context: %s\r\n"
+                       "Exten: %s\r\n"
+                       "Reason: %d\r\n"
+                       "Uniqueid: %s\r\n"
+                       "CallerIDNum: %s\r\n"
+                       "CallerIDName: %s\r\n",
+                       in->idtext, res ? "Failure" : "Success",
+                       chan ? ast_channel_name(chan) : requested_channel,
+                       in->context, in->exten, reason,
+                       chan ? ast_channel_uniqueid(chan) : S_OR(in->channelid, "<unknown>"),
+                       S_OR(in->cid_num, "<unknown>"),
+                       S_OR(in->cid_name, "<unknown>")
+                       );
+       }
 
        /* Locked and ref'd by ast_pbx_outgoing_exten or ast_pbx_outgoing_app */
        if (chan) {
@@ -5418,11 +5702,16 @@ static int action_originate(struct mansession *s, const struct message *m)
                        }
                }
        } else if (!ast_strlen_zero(app)) {
-               res = ast_pbx_outgoing_app(tech, cap, data, to, app, appdata, &reason, 1, l, n, vars, account, NULL, assignedids.uniqueid ? &assignedids : NULL);
+               res = ast_pbx_outgoing_app(tech, cap, data, to, app, appdata, &reason,
+                               AST_OUTGOING_WAIT, l, n, vars, account, NULL,
+                               assignedids.uniqueid ? &assignedids : NULL);
                ast_variables_destroy(vars);
        } else {
                if (exten && context && pi) {
-                       res = ast_pbx_outgoing_exten(tech, cap, data, to, context, exten, pi, &reason, 1, l, n, vars, account, NULL, bridge_early, assignedids.uniqueid ? &assignedids : NULL);
+                       res = ast_pbx_outgoing_exten(tech, cap, data, to,
+                                       context, exten, pi, &reason, AST_OUTGOING_WAIT,
+                                       l, n, vars, account, NULL, bridge_early,
+                                       assignedids.uniqueid ? &assignedids : NULL);
                        ast_variables_destroy(vars);
                } else {
                        astman_send_error(s, m, "Originate with 'Exten' requires 'Context' and 'Priority'");
@@ -5484,8 +5773,9 @@ static int action_extensionstate(struct mansession *s, const struct message *m)
 {
        const char *exten = astman_get_header(m, "Exten");
        const char *context = astman_get_header(m, "Context");
-       char hint[256] = "";
+       char hint[256];
        int status;
+
        if (ast_strlen_zero(exten)) {
                astman_send_error(s, m, "Extension not specified");
                return 0;
@@ -5494,16 +5784,18 @@ static int action_extensionstate(struct mansession *s, const struct message *m)
                context = "default";
        }
        status = ast_extension_state(NULL, context, exten);
-       ast_get_hint(hint, sizeof(hint) - 1, NULL, 0, NULL, context, exten);
+       hint[0] = '\0';
+       ast_get_hint(hint, sizeof(hint), NULL, 0, NULL, context, exten);
        astman_start_ack(s, m);
-       astman_append(s,   "Message: Extension Status\r\n"
-                          "Exten: %s\r\n"
-                          "Context: %s\r\n"
-                          "Hint: %s\r\n"
-                          "Status: %d\r\n"
-                          "StatusText: %s\r\n\r\n",
-                     exten, context, hint, status,
-                     ast_extension_state2str(status));
+       astman_append(s, "Message: Extension Status\r\n"
+               "Exten: %s\r\n"
+               "Context: %s\r\n"
+               "Hint: %s\r\n"
+               "Status: %d\r\n"
+               "StatusText: %s\r\n"
+               "\r\n",
+               exten, context, hint, status,
+               ast_extension_state2str(status));
        return 0;
 }
 
@@ -5700,7 +5992,11 @@ static int match_filter(struct mansession *s, char *eventdata)
 {
        int result = 0;
 
-       ast_debug(3, "Examining AMI event:\n%s\n", eventdata);
+       if (manager_debug) {
+               ast_verbose("<-- Examining AMI event: -->\n%s\n", eventdata);
+       } else {
+               ast_debug(3, "Examining AMI event:\n%s\n", eventdata);
+       }
        if (!ao2_container_count(s->session->whitefilters) && !ao2_container_count(s->session->blackfilters)) {
                return 1; /* no filtering means match all */
        } else if (ao2_container_count(s->session->whitefilters) && !ao2_container_count(s->session->blackfilters)) {
@@ -5731,7 +6027,7 @@ static int process_events(struct mansession *s)
        int ret = 0;
 
        ao2_lock(s->session);
-       if (s->session->f != NULL) {
+       if (s->session->stream != NULL) {
                struct eventqent *eqe = s->session->last_ev;
 
                while ((eqe = advance_event(eqe))) {
@@ -5894,7 +6190,7 @@ static int action_coreshowchannels(struct mansession *s, const struct message *m
        const char *actionid = astman_get_header(m, "ActionID");
        char idText[256];
        int numchans = 0;
-       RAII_VAR(struct ao2_container *, channels, NULL, ao2_cleanup);
+       struct ao2_container *channels;
        struct ao2_iterator it_chans;
        struct stasis_message *msg;
 
@@ -5904,7 +6200,8 @@ static int action_coreshowchannels(struct mansession *s, const struct message *m
                idText[0] = '\0';
        }
 
-       if (!(channels = stasis_cache_dump(ast_channel_cache_by_name(), ast_channel_snapshot_type()))) {
+       channels = stasis_cache_dump(ast_channel_cache_by_name(), ast_channel_snapshot_type());
+       if (!channels) {
                astman_send_error(s, m, "Could not get cached channels");
                return 0;
        }
@@ -5915,7 +6212,7 @@ static int action_coreshowchannels(struct mansession *s, const struct message *m
        for (; (msg = ao2_iterator_next(&it_chans)); ao2_ref(msg, -1)) {
                struct ast_channel_snapshot *cs = stasis_message_data(msg);
                struct ast_str *built = ast_manager_build_channel_state_string_prefix(cs, "");
-               char durbuf[10] = "";
+               char durbuf[16] = "";
 
                if (!built) {
                        continue;
@@ -5956,6 +6253,7 @@ static int action_coreshowchannels(struct mansession *s, const struct message *m
        astman_send_list_complete_start(s, m, "CoreShowChannelsComplete", numchans);
        astman_send_list_complete_end(s);
 
+       ao2_ref(channels, -1);
        return 0;
 }
 
@@ -5979,9 +6277,6 @@ static int manager_modulecheck(struct mansession *s, const struct message *m)
        const char *module = astman_get_header(m, "Module");
        const char *id = astman_get_header(m, "ActionID");
        char idText[256];
-#if !defined(LOW_MEMORY)
-       const char *version;
-#endif
        char filename[PATH_MAX];
        char *cut;
 
@@ -5998,11 +6293,6 @@ static int manager_modulecheck(struct mansession *s, const struct message *m)
                astman_send_error(s, m, "Module not loaded");
                return 0;
        }
-       snprintf(cut, (sizeof(filename) - strlen(filename)) - 1, ".c");
-       ast_debug(1, "**** ModuleCheck .c file %s\n", filename);
-#if !defined(LOW_MEMORY)
-       version = ast_file_version_find(filename);
-#endif
 
        if (!ast_strlen_zero(id)) {
                snprintf(idText, sizeof(idText), "ActionID: %s\r\n", id);
@@ -6011,7 +6301,7 @@ static int manager_modulecheck(struct mansession *s, const struct message *m)
        }
        astman_append(s, "Response: Success\r\n%s", idText);
 #if !defined(LOW_MEMORY)
-       astman_append(s, "Version: %s\r\n\r\n", version ? version : "");
+       astman_append(s, "Version: %s\r\n\r\n", "");
 #endif
        return 0;
 }
@@ -6109,6 +6399,14 @@ static int process_message(struct mansession *s, const struct message *m)
                return 0;
        }
 
+       if (ast_shutting_down()) {
+               ast_log(LOG_ERROR, "Unable to process manager action '%s'. Asterisk is shutting down.\n", action);
+               mansession_lock(s);
+               astman_send_error(s, m, "Asterisk is shutting down");
+               mansession_unlock(s);
+               return 0;
+       }
+
        if (!s->session->authenticated
                && strcasecmp(action, "Login")
                && strcasecmp(action, "Logoff")
@@ -6151,21 +6449,21 @@ static int process_message(struct mansession *s, const struct message *m)
                if ((s->session->writeperm & act_found->authority)
                        || act_found->authority == 0) {
                        /* We have the authority to execute the action. */
+                       ret = -1;
                        ao2_lock(act_found);
                        if (act_found->registered && act_found->func) {
-                               ast_debug(1, "Running action '%s'\n", act_found->action);
-                               if (act_found->module) {
-                                       ast_module_ref(act_found->module);
-                               }
+                               struct ast_module *mod_ref = ast_module_running_ref(act_found->module);
+
                                ao2_unlock(act_found);
-                               ret = act_found->func(s, m);
-                               acted = 1;
-                               ao2_lock(act_found);
-                               if (act_found->module) {
-                                       ast_module_unref(act_found->module);
+                               if (mod_ref || !act_found->module) {
+                                       ast_debug(1, "Running action '%s'\n", act_found->action);
+                                       ret = act_found->func(s, m);
+                                       acted = 1;
+                                       ast_module_unref(mod_ref);
                                }
+                       } else {
+                               ao2_unlock(act_found);
                        }
-                       ao2_unlock(act_found);
                }
                if (!acted) {
                        /*
@@ -6239,9 +6537,11 @@ static int get_input(struct mansession *s, char *output)
                return 1;
        }
        if (s->session->inlen >= maxlen) {
-               /* no crlf found, and buffer full - sorry, too long for us */
+               /* no crlf found, and buffer full - sorry, too long for us
+                * keep the last character in case we are in the middle of a CRLF. */
                ast_log(LOG_WARNING, "Discarding message from %s. Line too long: %.25s...\n", ast_sockaddr_stringify_addr(&s->session->addr), src);
-               s->session->inlen = 0;
+               src[0] = src[s->session->inlen - 1];
+               s->session->inlen = 1;
                s->parsing = MESSAGE_LINE_TOO_LONG;
        }
        res = 0;
@@ -6269,7 +6569,7 @@ static int get_input(struct mansession *s, char *output)
                s->session->waiting_thread = pthread_self();
                ao2_unlock(s->session);
 
-               res = ast_wait_for_input(s->session->fd, timeout);
+               res = ast_wait_for_input(ast_iostream_get_fd(s->session->stream), timeout);
 
                ao2_lock(s->session);
                s->session->waiting_thread = AST_PTHREADT_NULL;
@@ -6287,7 +6587,7 @@ static int get_input(struct mansession *s, char *output)
        }
 
        ao2_lock(s->session);
-       res = fread(src + s->session->inlen, 1, maxlen - s->session->inlen, s->session->f);
+       res = ast_iostream_read(s->session->stream, src + s->session->inlen, maxlen - s->session->inlen);
        if (res < 1) {
                res = -1;       /* error return */
        } else {
@@ -6420,13 +6720,11 @@ static void *session_do(void *data)
        struct mansession s = {
                .tcptls_session = data,
        };
-       int flags;
        int res;
+       int arg = 1;
        struct ast_sockaddr ser_remote_address_tmp;
-       struct protoent *p;
 
        if (ast_atomic_fetchadd_int(&unauth_sessions, +1) >= authlimit) {
-               fclose(ser->f);
                ast_atomic_fetchadd_int(&unauth_sessions, -1);
                goto done;
        }
@@ -6435,7 +6733,6 @@ static void *session_do(void *data)
        session = build_mansession(&ser_remote_address_tmp);
 
        if (session == NULL) {
-               fclose(ser->f);
                ast_atomic_fetchadd_int(&unauth_sessions, -1);
                goto done;
        }
@@ -6443,20 +6740,10 @@ static void *session_do(void *data)
        /* here we set TCP_NODELAY on the socket to disable Nagle's algorithm.
         * This is necessary to prevent delays (caused by buffering) as we
         * write to the socket in bits and pieces. */
-       p = getprotobyname("tcp");
-       if (p) {
-               int arg = 1;
-               if( setsockopt(ser->fd, p->p_proto, TCP_NODELAY, (char *)&arg, sizeof(arg) ) < 0 ) {
-                       ast_log(LOG_WARNING, "Failed to set manager tcp connection to TCP_NODELAY mode: %s\nSome manager actions may be slow to respond.\n", strerror(errno));
-               }
-       } else {
-               ast_log(LOG_WARNING, "Failed to set manager tcp connection to TCP_NODELAY, getprotobyname(\"tcp\") failed\nSome manager actions may be slow to respond.\n");
+       if (setsockopt(ast_iostream_get_fd(ser->stream), IPPROTO_TCP, TCP_NODELAY, (char *) &arg, sizeof(arg)) < 0) {
+               ast_log(LOG_WARNING, "Failed to set TCP_NODELAY on manager connection: %s\n", strerror(errno));
        }
-
-       /* make sure socket is non-blocking */
-       flags = fcntl(ser->fd, F_GETFL);
-       flags |= O_NONBLOCK;
-       fcntl(ser->fd, F_SETFL, flags);
+       ast_iostream_nonblock(ser->stream);
 
        ao2_lock(session);
        /* Hook to the tail of the event queue */
@@ -6465,8 +6752,7 @@ static void *session_do(void *data)
        ast_mutex_init(&s.lock);
 
        /* these fields duplicate those in the 'ser' structure */
-       session->fd = s.fd = ser->fd;
-       session->f = s.f = ser->f;
+       session->stream = s.stream = ser->stream;
        ast_sockaddr_copy(&session->addr, &ser_remote_address_tmp);
        s.session = session;
 
@@ -6485,9 +6771,9 @@ static void *session_do(void *data)
         * We cannot let the stream exclusively wait for data to arrive.
         * We have to wake up the task to send async events.
         */
-       ast_tcptls_stream_set_exclusive_input(ser->stream_cookie, 0);
+       ast_iostream_set_exclusive_input(ser->stream, 0);
 
-       ast_tcptls_stream_set_timeout_sequence(ser->stream_cookie,
+       ast_iostream_set_timeout_sequence(ser->stream,
                ast_tvnow(), authtimeout * 1000);
 
        astman_append(&s, "Asterisk Call Manager/%s\r\n", AMI_VERSION); /* welcome prompt */
@@ -6496,7 +6782,7 @@ static void *session_do(void *data)
                        break;
                }
                if (session->authenticated) {
-                       ast_tcptls_stream_set_timeout_disable(ser->stream_cookie);
+                       ast_iostream_set_timeout_disable(ser->stream);
                }
        }
        /* session is over, explain why and terminate */
@@ -6584,11 +6870,10 @@ static int append_event(const char *str, int category)
 
 static void append_channel_vars(struct ast_str **pbuf, struct ast_channel *chan)
 {
-       RAII_VAR(struct varshead *, vars, NULL, ao2_cleanup);
+       struct varshead *vars;
        struct ast_var_t *var;
 
        vars = ast_channel_get_manager_vars(chan);
-
        if (!vars) {
                return;
        }
@@ -6596,62 +6881,67 @@ static void append_channel_vars(struct ast_str **pbuf, struct ast_channel *chan)
        AST_LIST_TRAVERSE(vars, var, entries) {
                ast_str_append(pbuf, 0, "ChanVariable(%s): %s=%s\r\n", ast_channel_name(chan), var->name, var->value);
        }
+       ao2_ref(vars, -1);
 }
 
 /* XXX see if can be moved inside the function */
 AST_THREADSTORAGE(manager_event_buf);
 #define MANAGER_EVENT_BUF_INITSIZE   256
 
-int __ast_manager_event_multichan(int category, const char *event, int chancount,
-       struct ast_channel **chans, const char *file, int line, const char *func,
-       const char *fmt, ...)
+static int __attribute__((format(printf, 9, 0))) __manager_event_sessions_va(
+       struct ao2_container *sessions,
+       int category,
+       const char *event,
+       int chancount,
+       struct ast_channel **chans,
+       const char *file,
+       int line,
+       const char *func,
+       const char *fmt,
+       va_list ap)
 {
-       RAII_VAR(struct ao2_container *, sessions, ao2_global_obj_ref(mgr_sessions), ao2_cleanup);
-       struct mansession_session *session;
-       struct manager_custom_hook *hook;
        struct ast_str *auth = ast_str_alloca(MAX_AUTH_PERM_STRING);
        const char *cat_str;
-       va_list ap;
        struct timeval now;
        struct ast_str *buf;
        int i;
 
-       if (!(sessions && ao2_container_count(sessions)) && AST_RWLIST_EMPTY(&manager_hooks)) {
-               return 0;
-       }
-
-       if (!(buf = ast_str_thread_get(&manager_event_buf, MANAGER_EVENT_BUF_INITSIZE))) {
+       buf = ast_str_thread_get(&manager_event_buf, MANAGER_EVENT_BUF_INITSIZE);
+       if (!buf) {
                return -1;
        }
 
        cat_str = authority_to_str(category, &auth);
        ast_str_set(&buf, 0,
-                       "Event: %s\r\nPrivilege: %s\r\n",
-                        event, cat_str);
+               "Event: %s\r\n"
+               "Privilege: %s\r\n",
+               event, cat_str);
 
        if (timestampevents) {
                now = ast_tvnow();
                ast_str_append(&buf, 0,
-                               "Timestamp: %ld.%06lu\r\n",
-                                (long)now.tv_sec, (unsigned long) now.tv_usec);
+                       "Timestamp: %ld.%06lu\r\n",
+                       (long)now.tv_sec, (unsigned long) now.tv_usec);
        }
        if (manager_debug) {
                static int seq;
+
                ast_str_append(&buf, 0,
-                               "SequenceNumber: %d\r\n",
-                                ast_atomic_fetchadd_int(&seq, 1));
+                       "SequenceNumber: %d\r\n",
+                       ast_atomic_fetchadd_int(&seq, 1));
                ast_str_append(&buf, 0,
-                               "File: %s\r\nLine: %d\r\nFunc: %s\r\n", file, line, func);
+                       "File: %s\r\n"
+                       "Line: %d\r\n"
+                       "Func: %s\r\n",
+                       file, line, func);
        }
        if (!ast_strlen_zero(ast_config_AST_SYSTEM_NAME)) {
                ast_str_append(&buf, 0,
-                               "SystemName: %s\r\n",
-                                ast_config_AST_SYSTEM_NAME);
+                       "SystemName: %s\r\n",
+                       ast_config_AST_SYSTEM_NAME);
        }
 
-       va_start(ap, fmt);
        ast_str_append_va(&buf, 0, fmt, ap);
-       va_end(ap);
        for (i = 0; i < chancount; i++) {
                append_channel_vars(&buf, chans[i]);
        }
@@ -6662,9 +6952,11 @@ int __ast_manager_event_multichan(int category, const char *event, int chancount
 
        /* Wake up any sleeping sessions */
        if (sessions) {
-               struct ao2_iterator i;
-               i = ao2_iterator_init(sessions, 0);
-               while ((session = ao2_iterator_next(&i))) {
+               struct ao2_iterator iter;
+               struct mansession_session *session;
+
+               iter = ao2_iterator_init(sessions, 0);
+               while ((session = ao2_iterator_next(&iter))) {
                        ao2_lock(session);
                        if (session->waiting_thread != AST_PTHREADT_NULL) {
                                pthread_kill(session->waiting_thread, SIGURG);
@@ -6679,10 +6971,12 @@ int __ast_manager_event_multichan(int category, const char *event, int chancount
                        ao2_unlock(session);
                        unref_mansession(session);
                }
-               ao2_iterator_destroy(&i);
+               ao2_iterator_destroy(&iter);
        }
 
        if (category != EVENT_FLAG_SHUTDOWN && !AST_RWLIST_EMPTY(&manager_hooks)) {
+               struct manager_custom_hook *hook;
+
                AST_RWLIST_RDLOCK(&manager_hooks);
                AST_RWLIST_TRAVERSE(&manager_hooks, hook, list) {
                        hook->helper(category, event, ast_str_buffer(buf));
@@ -6693,6 +6987,50 @@ int __ast_manager_event_multichan(int category, const char *event, int chancount
        return 0;
 }
 
+static int __attribute__((format(printf, 9, 0))) __manager_event_sessions(
+       struct ao2_container *sessions,
+       int category,
+       const char *event,
+       int chancount,
+       struct ast_channel **chans,
+       const char *file,
+       int line,
+       const char *func,
+       const char *fmt,
+       ...)
+{
+       va_list ap;
+       int res;
+
+       va_start(ap, fmt);
+       res = __manager_event_sessions_va(sessions, category, event, chancount, chans,
+               file, line, func, fmt, ap);
+       va_end(ap);
+       return res;
+}
+
+int __ast_manager_event_multichan(int category, const char *event, int chancount,
+       struct ast_channel **chans, const char *file, int line, const char *func,
+       const char *fmt, ...)
+{
+       struct ao2_container *sessions = ao2_global_obj_ref(mgr_sessions);
+       va_list ap;
+       int res;
+
+       if (!any_manager_listeners(sessions)) {
+               /* Nobody is listening */
+               ao2_cleanup(sessions);
+               return 0;
+       }
+
+       va_start(ap, fmt);
+       res = __manager_event_sessions_va(sessions, category, event, chancount, chans,
+               file, line, func, fmt, ap);
+       va_end(ap);
+       ao2_cleanup(sessions);
+       return res;
+}
+
 /*! \brief
  * support functions to register/unregister AMI action handlers,
  */
@@ -6726,11 +7064,12 @@ int ast_manager_unregister(const char *action)
        return 0;
 }
 
-static int manager_state_cb(char *context, char *exten, struct ast_state_cb_info *info, void *data)
+static int manager_state_cb(const char *context, const char *exten, struct ast_state_cb_info *info, void *data)
 {
        /* Notify managers of change */
        char hint[512];
 
+       hint[0] = '\0';
        ast_get_hint(hint, sizeof(hint), NULL, 0, NULL, context, exten);
 
        switch(info->reason) {
@@ -6781,9 +7120,9 @@ static int ast_manager_register_struct(struct manager_action *act)
                        return -1;
                }
                if (ret > 0) { /* Insert these alphabetically */
-                       prev = cur;
                        break;
                }
+               prev = cur;
        }
 
        ao2_t_ref(act, +1, "action object added to list");
@@ -7303,23 +7642,9 @@ static void xml_translate(struct ast_str **out, char *in, struct ast_variable *g
 
 static void close_mansession_file(struct mansession *s)
 {
-       if (s->f) {
-               if (fclose(s->f)) {
-                       ast_log(LOG_ERROR, "fclose() failed: %s\n", strerror(errno));
-               }
-               s->f = NULL;
-               s->fd = -1;
-       } else if (s->fd != -1) {
-               /*
-                * Issuing shutdown() is necessary here to avoid a race
-                * condition where the last data written may not appear
-                * in the TCP stream.  See ASTERISK-23548
-                */
-               shutdown(s->fd, SHUT_RDWR);
-               if (close(s->fd)) {
-                       ast_log(LOG_ERROR, "close() failed: %s\n", strerror(errno));
-               }
-               s->fd = -1;
+       if (s->stream) {
+               ast_iostream_close(s->stream);
+               s->stream = NULL;
        } else {
                ast_log(LOG_ERROR, "Attempted to close file/file descriptor on mansession without a valid file or file descriptor.\n");
        }
@@ -7328,17 +7653,20 @@ static void close_mansession_file(struct mansession *s)
 static void process_output(struct mansession *s, struct ast_str **out, struct ast_variable *params, enum output_format format)
 {
        char *buf;
-       size_t l;
+       off_t l;
+       int fd;
 
-       if (!s->f)
+       if (!s->stream)
                return;
 
        /* Ensure buffer is NULL-terminated */
-       fprintf(s->f, "%c", 0);
-       fflush(s->f);
+       ast_iostream_write(s->stream, "", 1);
 
-       if ((l = ftell(s->f)) > 0) {
-               if (MAP_FAILED == (buf = mmap(NULL, l, PROT_READ | PROT_WRITE, MAP_PRIVATE, s->fd, 0))) {
+       fd = ast_iostream_get_fd(s->stream);
+
+       l = lseek(fd, SEEK_CUR, 0);
+       if (l > 0) {
+               if (MAP_FAILED == (buf = mmap(NULL, l, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0))) {
                        ast_log(LOG_WARNING, "mmap failed.  Manager output was not processed\n");
                } else {
                        if (format == FORMAT_XML || format == FORMAT_HTML) {
@@ -7365,6 +7693,7 @@ static int generic_http_callback(struct ast_tcptls_session_instance *ser,
        struct mansession s = { .session = NULL, .tcptls_session = ser };
        struct mansession_session *session = NULL;
        uint32_t ident;
+       int fd;
        int blastaway = 0;
        struct ast_variable *v;
        struct ast_variable *params = get_params;
@@ -7420,17 +7749,17 @@ static int generic_http_callback(struct ast_tcptls_session_instance *ser,
        }
 
        s.session = session;
-       s.fd = mkstemp(template);       /* create a temporary file for command output */
+       fd = mkstemp(template); /* create a temporary file for command output */
        unlink(template);
-       if (s.fd <= -1) {
+       if (fd <= -1) {
                ast_http_error(ser, 500, "Server Error", "Internal Server Error (mkstemp failed)");
                goto generic_callback_out;
        }
-       s.f = fdopen(s.fd, "w+");
-       if (!s.f) {
+       s.stream = ast_iostream_from_fd(&fd);
+       if (!s.stream) {
                ast_log(LOG_WARNING, "HTTP Manager, fdopen failed: %s!\n", strerror(errno));
                ast_http_error(ser, 500, "Server Error", "Internal Server Error (fdopen failed)");
-               close(s.fd);
+               close(fd);
                goto generic_callback_out;
        }
 
@@ -7570,9 +7899,9 @@ generic_callback_out:
                if (blastaway) {
                        session_destroy(session);
                } else {
-                       if (session->f) {
-                               fclose(session->f);
-                               session->f = NULL;
+                       if (session->stream) {
+                               ast_iostream_close(session->stream);
+                               session->stream = NULL;
                        }
                        unref_mansession(session);
                }
@@ -7597,6 +7926,7 @@ static int auth_http_callback(struct ast_tcptls_session_instance *ser,
        struct message m = { 0 };
        unsigned int idx;
        size_t hdrlen;
+       int fd;
 
        time_t time_now = time(NULL);
        unsigned long nonce = 0, nc;
@@ -7775,17 +8105,17 @@ static int auth_http_callback(struct ast_tcptls_session_instance *ser,
 
        ast_mutex_init(&s.lock);
        s.session = session;
-       s.fd = mkstemp(template);       /* create a temporary file for command output */
+       fd = mkstemp(template); /* create a temporary file for command output */
        unlink(template);
-       if (s.fd <= -1) {
+       if (fd <= -1) {
                ast_http_error(ser, 500, "Server Error", "Internal Server Error (mkstemp failed)");
                goto auth_callback_out;
        }
-       s.f = fdopen(s.fd, "w+");
-       if (!s.f) {
+       s.stream = ast_iostream_from_fd(&fd);
+       if (!s.stream) {
                ast_log(LOG_WARNING, "HTTP Manager, fdopen failed: %s!\n", strerror(errno));
                ast_http_error(ser, 500, "Server Error", "Internal Server Error (fdopen failed)");
-               close(s.fd);
+               close(fd);
                goto auth_callback_out;
        }
 
@@ -7836,7 +8166,7 @@ static int auth_http_callback(struct ast_tcptls_session_instance *ser,
                m.headers[idx] = NULL;
        }
 
-       result_size = ftell(s.f); /* Calculate approx. size of result */
+       result_size = lseek(ast_iostream_get_fd(s.stream), SEEK_CUR, 0); /* Calculate approx. size of result */
 
        http_header = ast_str_create(80);
        out = ast_str_create(result_size * 2 + 512);
@@ -7888,11 +8218,10 @@ auth_callback_out:
        ast_free(out);
 
        ao2_lock(session);
-       if (session->f) {
-               fclose(session->f);
+       if (session->stream) {
+               ast_iostream_close(session->stream);
+               session->stream = NULL;
        }
-       session->f = NULL;
-       session->fd = -1;
        ao2_unlock(session);
 
        if (session->needdestroy) {
@@ -8446,6 +8775,7 @@ static void manager_shutdown(void)
        ast_manager_unregister("ListCategories");
        ast_manager_unregister("Redirect");
        ast_manager_unregister("Atxfer");
+       ast_manager_unregister("CancelAtxfer");
        ast_manager_unregister("Originate");
        ast_manager_unregister("Command");
        ast_manager_unregister("ExtensionState");
@@ -8500,6 +8830,10 @@ static void manager_shutdown(void)
        ami_tls_cfg.pvtfile = NULL;
        ast_free(ami_tls_cfg.cipher);
        ami_tls_cfg.cipher = NULL;
+       ast_free(ami_tls_cfg.cafile);
+       ami_tls_cfg.cafile = NULL;
+       ast_free(ami_tls_cfg.capath);
+       ami_tls_cfg.capath = NULL;
 
        ao2_global_obj_release(mgr_sessions);
 
@@ -8507,6 +8841,8 @@ static void manager_shutdown(void)
                manager_free_user(user);
        }
        acl_change_stasis_unsubscribe();
+
+       ast_free(manager_channelvars);
 }
 
 
@@ -8531,6 +8867,8 @@ static int manager_subscriptions_init(void)
        if (!stasis_router) {
                return -1;
        }
+       stasis_message_router_set_congestion_limits(stasis_router, -1,
+               6 * AST_TASKPROCESSOR_HIGH_WATER_LEVEL);
 
        res |= stasis_message_router_set_default(stasis_router,
                manager_default_msg_cb, NULL);
@@ -8596,6 +8934,10 @@ static void manager_set_defaults(void)
        ami_tls_cfg.pvtfile = ast_strdup("");
        ast_free(ami_tls_cfg.cipher);
        ami_tls_cfg.cipher = ast_strdup("");
+       ast_free(ami_tls_cfg.cafile);
+       ami_tls_cfg.cafile = ast_strdup("");
+       ast_free(ami_tls_cfg.capath);
+       ami_tls_cfg.capath = ast_strdup("");
 }
 
 static int __init_manager(int reload, int by_external_config)
@@ -8621,7 +8963,7 @@ static int __init_manager(int reload, int by_external_config)
 #endif
                int res;
 
-               ast_register_atexit(manager_shutdown);
+               ast_register_cleanup(manager_shutdown);
 
                res = STASIS_MESSAGE_TYPE_INIT(ast_manager_get_generic_type);
                if (res != 0) {
@@ -8649,6 +8991,7 @@ static int __init_manager(int reload, int by_external_config)
                ast_manager_register_xml_core("ListCategories", EVENT_FLAG_CONFIG, action_listcategories);
                ast_manager_register_xml_core("Redirect", EVENT_FLAG_CALL, action_redirect);
                ast_manager_register_xml_core("Atxfer", EVENT_FLAG_CALL, action_atxfer);
+               ast_manager_register_xml_core("CancelAtxfer", EVENT_FLAG_CALL, action_cancel_atxfer);
                ast_manager_register_xml_core("Originate", EVENT_FLAG_ORIGINATE, action_originate);
                ast_manager_register_xml_core("Command", EVENT_FLAG_COMMAND, action_command);
                ast_manager_register_xml_core("ExtensionState", EVENT_FLAG_CALL | EVENT_FLAG_REPORTING, action_extensionstate);
@@ -8977,7 +9320,14 @@ static int __init_manager(int reload, int by_external_config)
                        } else if (!strcasecmp(var->name, "deny") ||
                                       !strcasecmp(var->name, "permit") ||
                                       !strcasecmp(var->name, "acl")) {
-                               ast_append_acl(var->name, var->value, &user->acl, NULL, &acl_subscription_flag);
+                               int acl_error = 0;
+
+                               ast_append_acl(var->name, var->value, &user->acl, &acl_error, &acl_subscription_flag);
+                               if (acl_error) {
+                                       ast_log(LOG_ERROR, "Invalid ACL '%s' for manager user '%s' on line %d. Deleting user\n",
+                                               var->value, user->username, var->lineno);
+                                       user->keep = 0;
+                               }
                        }  else if (!strcasecmp(var->name, "read") ) {
                                user->readperm = get_perm(var->value);
                        }  else if (!strcasecmp(var->name, "write") ) {
@@ -9169,6 +9519,7 @@ int ast_str_append_event_header(struct ast_str **fields_string,
 static void manager_event_blob_dtor(void *obj)
 {
        struct ast_manager_event_blob *ev = obj;
+
        ast_string_field_free_memory(ev);
 }
 
@@ -9180,18 +9531,19 @@ ast_manager_event_blob_create(
        const char *extra_fields_fmt,
        ...)
 {
-       RAII_VAR(struct ast_manager_event_blob *, ev, NULL, ao2_cleanup);
+       struct ast_manager_event_blob *ev;
        va_list argp;
 
        ast_assert(extra_fields_fmt != NULL);
        ast_assert(manager_event != NULL);
 
-       ev = ao2_alloc(sizeof(*ev), manager_event_blob_dtor);
+       ev = ao2_alloc_options(sizeof(*ev), manager_event_blob_dtor, AO2_ALLOC_OPT_LOCK_NOLOCK);
        if (!ev) {
                return NULL;
        }
 
        if (ast_string_field_init(ev, 20)) {
+               ao2_ref(ev, -1);
                return NULL;
        }
 
@@ -9199,10 +9551,8 @@ ast_manager_event_blob_create(
        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);
+       ast_string_field_ptr_build_va(ev, &ev->extra_fields, extra_fields_fmt, argp);
        va_end(argp);
 
-       ao2_ref(ev, +1);
        return ev;
 }