kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-14 05:48:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate a large number of AMI events over to Stasis-Core

Browse Source 
This patch moves a number of AMI events over to the Stasis-Core message bus.
This includes:
 * ChanSpyStart/Stop
 * MonitorStart/Stop
 * MusicOnHoldStart/Stop
 * FullyBooted/Reload
 * All Voicemail/MWI related events

In addition, it adds some Stasis-Core and AMI support for generic AMI messages,
refactors the message router in AMI to use a single router with topic
forwarding for the topics that AMI cares about, and refactors MWI message
types and topics to be more name compliant.

Review: https://reviewboard.asterisk.org/r/2532

(closes issue ASTERISK-21462)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389733 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2013-05-24 20:44:07 +00:00
parent c1b51fd265
commit 06be8463b6
37 changed files with 2093 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/asterisk/json.h
View File

@@ -125,6 +125,8 @@ struct ast_json *ast_json_ref(struct ast_json *value);
/*!
* \brief Decrease refcount on \a value. If refcount reaches zero, \a value is freed.
* \since 12.0.0
*
* \note It is safe to pass \c NULL to this function.
*/
void ast_json_unref(struct ast_json *value);
@@ -601,6 +603,15 @@ struct ast_json_iter *ast_json_object_iter_next(struct ast_json *object, struct
*/
const char *ast_json_object_iter_key(struct ast_json_iter *iter);
/*!
* \brief Retrieve the iterator object for a particular key
* \since 12.0.0
*
* \param key Key of the field the \c ast_json_iter points to
* \return \ref ast_json_iter object that points to \a key
*/
struct ast_json_iter *ast_json_object_key_to_iter(const char *key);
/*!
* \brief Get the value from an iterator.
* \since 12.0.0
@@ -628,6 +639,23 @@ struct ast_json *ast_json_object_iter_value(struct ast_json_iter *iter);
*/
int ast_json_object_iter_set(struct ast_json *object, struct ast_json_iter *iter, struct ast_json *value);
/*!
* \brief Iterate over key/value pairs
*
* \note This is a reproduction of the jansson library's \ref json_object_foreach
* using the equivalent ast_* wrapper functions. This creates a for loop using the various
* iteration function calls.
*
* \param object The \ref ast_json object that contains key/value tuples to iterate over
* \param key A \c const char pointer key for the key/value tuple
* \param value A \ref ast_json object for the key/value tuple
*/
#define ast_json_object_foreach(object, key, value) \
for (key = ast_json_object_iter_key(ast_json_object_iter(object)); \
key && (value = ast_json_object_iter_value(ast_json_object_key_to_iter(key))); \
key = ast_json_object_iter_key(ast_json_object_iter_next(object, ast_json_object_key_to_iter(key))))
/*!@}*/
/*!@{*/