diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-05-24 20:44:07 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-05-24 20:44:07 +0000 |
| commit | 06be8463b683333c79845402d55168ef1b582fa9 (patch) | |
| tree | 2fe0871cfec4d5edf3aae763541ff7efa32a444a /channels/chan_mgcp.c | |
| parent | c1b51fd2654736fd7c614d1571f904e236006651 (diff) | |
Migrate a large number of AMI events over to Stasis-Core
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
Diffstat (limited to 'channels/chan_mgcp.c')
| -rw-r--r-- | channels/chan_mgcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 1f0830762..c6b441049 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -507,10 +507,10 @@ static int has_voicemail(struct mgcp_endpoint *p) ast_str_set(&uniqueid, 0, "%s@%s", mbox, cntx); - msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_type(), ast_str_buffer(uniqueid)); + msg = stasis_cache_get(ast_mwi_topic_cached(), ast_mwi_state_type(), ast_str_buffer(uniqueid)); if (msg) { - struct stasis_mwi_state *mwi_state = stasis_message_data(msg); + struct ast_mwi_state *mwi_state = stasis_message_data(msg); new_msgs = mwi_state->new_msgs; } else { new_msgs = ast_app_has_voicemail(p->mailbox, NULL); @@ -4169,7 +4169,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v) ast_str_reset(uniqueid); ast_str_set(&uniqueid, 0, "%s@%s", mbox, cntx); - mailbox_specific_topic = stasis_mwi_topic(ast_str_buffer(uniqueid)); + mailbox_specific_topic = ast_mwi_topic(ast_str_buffer(uniqueid)); if (mailbox_specific_topic) { e->mwi_event_sub = stasis_subscribe(mailbox_specific_topic, mwi_event_cb, NULL); } |