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 /res/res_sip_mwi.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 'res/res_sip_mwi.c')
| -rw-r--r-- | res/res_sip_mwi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/res_sip_mwi.c b/res/res_sip_mwi.c index 588662f33..f18e56469 100644 --- a/res/res_sip_mwi.c +++ b/res/res_sip_mwi.c @@ -133,7 +133,7 @@ static struct mwi_stasis_subscription *mwi_stasis_subscription_alloc(const char return NULL; } - topic = stasis_mwi_topic(mailbox); + topic = ast_mwi_topic(mailbox); /* Safe strcpy */ strcpy(mwi_stasis_sub->mailbox, mailbox); @@ -237,9 +237,9 @@ static int get_message_count(void *obj, void *arg, int flags) RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup); struct mwi_stasis_subscription *mwi_stasis = obj; struct message_accumulator *counter = arg; - struct stasis_mwi_state *mwi_state; + struct ast_mwi_state *mwi_state; - msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_type(), mwi_stasis->mailbox); + msg = stasis_cache_get(ast_mwi_topic_cached(), ast_mwi_state_type(), mwi_stasis->mailbox); if (!msg) { return 0; } @@ -604,7 +604,7 @@ static void mwi_stasis_cb(void *userdata, struct stasis_subscription *sub, return; } - if (stasis_mwi_state_type() == stasis_message_type(msg)) { + if (ast_mwi_state_type() == stasis_message_type(msg)) { struct ast_taskprocessor *serializer = mwi_sub->is_solicited ? ast_sip_subscription_get_serializer(mwi_sub->sip_sub) : NULL; ao2_ref(mwi_sub, +1); ast_sip_push_task(serializer, serialized_notify, mwi_sub); |