summaryrefslogtreecommitdiff
path: root/main/named_acl.c
diff options
context:
space:
mode:
authorDavid M. Lee <dlee@digium.com>2013-05-15 02:37:22 +0000
committerDavid M. Lee <dlee@digium.com>2013-05-15 02:37:22 +0000
commit9648e258c76a24c5a24e16c634fcda73829e5d30 (patch)
treea0dc5b31ee73a83a7799413929a40436a1526293 /main/named_acl.c
parente8f4ac6c610265b46014da9259062bb74d3892d1 (diff)
Refactored the rest of the message types to use the STASIS_MESSAGE_TYPE_*
macros. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@388751 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/named_acl.c')
-rw-r--r--main/named_acl.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/main/named_acl.c b/main/named_acl.c
index 7bc859769..afcd0692f 100644
--- a/main/named_acl.c
+++ b/main/named_acl.c
@@ -360,7 +360,14 @@ struct ast_ha *ast_named_acl_find(const char *name, int *is_realtime, int *is_un
static struct stasis_topic *acl_topic;
/*! \brief Message type for named ACL changes */
-static struct stasis_message_type *named_acl_change_type;
+STASIS_MESSAGE_TYPE_DEFN(ast_named_acl_change_type);
+
+static void acl_stasis_shutdown(void)
+{
+ ao2_cleanup(acl_topic);
+ acl_topic = NULL;
+ STASIS_MESSAGE_TYPE_CLEANUP(ast_named_acl_change_type);
+}
/*!
* \internal
@@ -368,8 +375,9 @@ static struct stasis_message_type *named_acl_change_type;
*/
static void ast_acl_stasis_init(void)
{
+ ast_register_atexit(acl_stasis_shutdown);
acl_topic = stasis_topic_create("ast_acl");
- named_acl_change_type = stasis_message_type_create("ast_named_acl_change");
+ STASIS_MESSAGE_TYPE_INIT(ast_named_acl_change_type);
}
struct stasis_topic *ast_acl_topic(void)
@@ -377,11 +385,6 @@ struct stasis_topic *ast_acl_topic(void)
return acl_topic;
}
-struct stasis_message_type *ast_named_acl_change_type(void)
-{
- return named_acl_change_type;
-}
-
/*!
* \internal
* \brief Sends a stasis message corresponding to a given named ACL that has changed or