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_dahdi.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_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 1f9ee5a56..03279a01e 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -3762,7 +3762,7 @@ static void notify_message(char *mailbox_full, int thereornot) if (ast_strlen_zero(context)) context = "default"; - stasis_publish_mwi_state(mailbox, context, thereornot, thereornot); + ast_publish_mwi_state(mailbox, context, thereornot, thereornot); if (!ast_strlen_zero(mailbox) && !ast_strlen_zero(mwimonitornotify)) { snprintf(s, sizeof(s), "%s %s %d", mwimonitornotify, mailbox, thereornot); @@ -5427,10 +5427,10 @@ static int has_voicemail(struct dahdi_pvt *p) } ast_str_set(&uniqueid, 0, "%s@%s", mailbox, context); - mwi_message = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_type(), ast_str_buffer(uniqueid)); + mwi_message = stasis_cache_get(ast_mwi_topic_cached(), ast_mwi_state_type(), ast_str_buffer(uniqueid)); if (mwi_message) { - struct stasis_mwi_state *mwi_state = stasis_message_data(mwi_message); + struct ast_mwi_state *mwi_state = stasis_message_data(mwi_message); new_msgs = mwi_state->new_msgs; } else { new_msgs = ast_app_has_voicemail(p->mailbox, NULL); @@ -13235,7 +13235,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, ast_str_set(&uniqueid, 0, "%s@%s", mailbox, context); - mailbox_specific_topic = stasis_mwi_topic(ast_str_buffer(uniqueid)); + mailbox_specific_topic = ast_mwi_topic(ast_str_buffer(uniqueid)); if (mailbox_specific_topic) { tmp->mwi_event_sub = stasis_subscribe(mailbox_specific_topic, mwi_event_cb, NULL); } |