diff options
author | Kinsey Moore <kmoore@digium.com> | 2014-08-06 12:55:28 +0000 |
---|---|---|
committer | Kinsey Moore <kmoore@digium.com> | 2014-08-06 12:55:28 +0000 |
commit | f1036f40dc22c4d4b30cc2ab36199cd749ead9c5 (patch) | |
tree | 4fd17b406cb14b5eee97cf0be44382b792ccbff9 /main/stasis_message.c | |
parent | ac5c75b45d9d7fe047ccd9d1d094cb9d30df8b51 (diff) |
Stasis: Allow message types to be blocked
This introduces stasis.conf and a mechanism to prevent certain message
types from being published. Internally, this works by preventing the
chosen message types from being created which ensures that those
message types can never be published. This patch also adjusts message
publishers such that message payloads are not created if the related
message type is not available.
ASTERISK-23943 #close
Review: https://reviewboard.asterisk.org/r/3823/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@420124 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/stasis_message.c')
-rw-r--r-- | main/stasis_message.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/main/stasis_message.c b/main/stasis_message.c index 70c408539..c797cdfa0 100644 --- a/main/stasis_message.c +++ b/main/stasis_message.c @@ -50,14 +50,20 @@ static void message_type_dtor(void *obj) type->name = NULL; } -struct stasis_message_type *stasis_message_type_create(const char *name, - struct stasis_message_vtable *vtable) +int stasis_message_type_create(const char *name, + struct stasis_message_vtable *vtable, + struct stasis_message_type **result) { struct stasis_message_type *type; + /* Check for declination */ + if (name && stasis_message_type_declined(name)) { + return STASIS_MESSAGE_TYPE_DECLINED; + } + type = ao2_t_alloc(sizeof(*type), message_type_dtor, name); if (!type) { - return NULL; + return STASIS_MESSAGE_TYPE_ERROR; } if (!vtable) { /* Null object pattern, FTW! */ @@ -67,11 +73,12 @@ struct stasis_message_type *stasis_message_type_create(const char *name, type->name = ast_strdup(name); if (!type->name) { ao2_cleanup(type); - return NULL; + return STASIS_MESSAGE_TYPE_ERROR; } type->vtable = vtable; + *result = type; - return type; + return STASIS_MESSAGE_TYPE_SUCCESS; } const char *stasis_message_type_name(const struct stasis_message_type *type) |