diff options
| author | Kevin Harwell <kharwell@digium.com> | 2013-08-30 19:55:56 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2013-08-30 19:55:56 +0000 |
| commit | 9bad1dabcf52db0a75b3dfb7c0c27f613402a01b (patch) | |
| tree | 8a4b5f2a47df2dbe6fcc8ac29f64ca67affeb9e0 /include/asterisk | |
| parent | 16b8d0cb5a3b15eae8db19c99223170ebed79fef (diff) | |
Add a reloadable option for sorcery type objects
Some configuration objects currently won't place nice if reloaded.
Specifically, in this case the pjsip transport objects. Now when
registering an object in sorcery one may specify that the object is
allowed to be reloaded or not. If the object is set to not reload
then upon reloading of the configuration the objects of that type
will not be reloaded. The initially loaded objects of that type
however will remain.
While the transport objects will not longer be reloaded it is still
possible for a user to configure an endpoint to an invalid transport.
A couple of log messages were added to help diagnose this problem if
it occurs.
(closes issue ASTERISK-22382)
Reported by: Rusty Newton
(closes issue ASTERISK-22384)
Reported by: Rusty Newton
Review: https://reviewboard.asterisk.org/r/2807/
........
Merged revisions 398139 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@398140 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/sorcery.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/include/asterisk/sorcery.h b/include/asterisk/sorcery.h index 84a537937..dad0c439c 100644 --- a/include/asterisk/sorcery.h +++ b/include/asterisk/sorcery.h @@ -356,7 +356,7 @@ int __ast_sorcery_apply_default(struct ast_sorcery *sorcery, const char *type, c * \retval 0 success * \retval -1 failure */ -int __ast_sorcery_object_register(struct ast_sorcery *sorcery, const char *type, unsigned int hidden, aco_type_item_alloc alloc, sorcery_transform_handler transform, sorcery_apply_handler apply); +int __ast_sorcery_object_register(struct ast_sorcery *sorcery, const char *type, unsigned int hidden, unsigned int reloadable, aco_type_item_alloc alloc, sorcery_transform_handler transform, sorcery_apply_handler apply); /*! * \brief Register an object type @@ -371,7 +371,22 @@ int __ast_sorcery_object_register(struct ast_sorcery *sorcery, const char *type, * \retval -1 failure */ #define ast_sorcery_object_register(sorcery, type, alloc, transform, apply) \ - __ast_sorcery_object_register((sorcery), (type), 0, (alloc), (transform), (apply)) + __ast_sorcery_object_register((sorcery), (type), 0, 1, (alloc), (transform), (apply)) + +/*! + * \brief Register an object type that is not reloadable + * + * \param sorcery Pointer to a sorcery structure + * \param type Type of object + * \param alloc Required object allocation callback + * \param transform Optional transformation callback + * \param apply Optional object set apply callback + * + * \retval 0 success + * \retval -1 failure + */ +#define ast_sorcery_object_register_no_reload(sorcery, type, alloc, transform, apply) \ + __ast_sorcery_object_register((sorcery), (type), 0, 0, (alloc), (transform), (apply)) /*! * \brief Register an internal, hidden object type @@ -386,7 +401,7 @@ int __ast_sorcery_object_register(struct ast_sorcery *sorcery, const char *type, * \retval -1 failure */ #define ast_sorcery_internal_object_register(sorcery, type, alloc, transform, apply) \ - __ast_sorcery_object_register((sorcery), (type), 1, (alloc), (transform), (apply)) + __ast_sorcery_object_register((sorcery), (type), 1, 1, (alloc), (transform), (apply)) /*! * \brief Set the copy handler for an object type |