From 1a2a4578d2ab7e1d1f1518a3f8bcc41f3fd13702 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Wed, 27 Mar 2013 22:42:06 +0000 Subject: [PATCH] Convert MWI state message type to the new stasis naming convention git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@384219 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_dahdi.c | 2 +- channels/chan_iax2.c | 2 +- channels/chan_mgcp.c | 2 +- channels/chan_sip.c | 4 ++-- channels/chan_skinny.c | 2 +- channels/chan_unistim.c | 2 +- channels/sig_pri.c | 4 ++-- include/asterisk/app.h | 2 +- main/app.c | 18 +++++++++--------- res/res_jabber.c | 2 +- res/res_xmpp.c | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 15075ebf2b..277cdaa457 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -5414,7 +5414,7 @@ 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_message(), ast_str_buffer(uniqueid)); + mwi_message = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_type(), ast_str_buffer(uniqueid)); if (mwi_message) { struct stasis_mwi_state *mwi_state = stasis_message_data(mwi_message); diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 7280c480e6..46b1486f2b 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -8755,7 +8755,7 @@ static int update_registry(struct sockaddr_in *sin, int callno, char *devtype, i } ast_str_set(&uniqueid, 0, "%s@%s", mailbox, context); - msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_message(), ast_str_buffer(uniqueid)); + msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_type(), ast_str_buffer(uniqueid)); if (msg) { struct stasis_mwi_state *mwi_state = stasis_message_data(msg); diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index c230feae63..43ffd95a15 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -507,7 +507,7 @@ 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_message(), ast_str_buffer(uniqueid)); + msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_type(), ast_str_buffer(uniqueid)); if (msg) { struct stasis_mwi_state *mwi_state = stasis_message_data(msg); diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 200d25c6c2..9b6b97ff7d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -16668,7 +16668,7 @@ static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct ao2_cleanup(peer); return; } - if (stasis_mwi_state_message() == stasis_message_type(msg)) { + if (stasis_mwi_state_type() == stasis_message_type(msg)) { sip_send_mwi_to_peer(peer, 0); } } @@ -28849,7 +28849,7 @@ static int get_cached_mwi(struct sip_peer *peer, int *new, int *old) ast_str_reset(uniqueid); ast_str_set(&uniqueid, 0, "%s@%s", mailbox->mailbox, S_OR(mailbox->context, "default")); - msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_message(), ast_str_buffer(uniqueid)); + msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_type(), ast_str_buffer(uniqueid)); if (!msg) { continue; } diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 17790f61b0..cc483d165e 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -3518,7 +3518,7 @@ static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct return; } - if (msg && stasis_mwi_state_message() == stasis_message_type(msg)) { + if (msg && stasis_mwi_state_type() == stasis_message_type(msg)) { struct stasis_mwi_state *mwi_state = stasis_message_data(msg); l->newmsgs = mwi_state->new_msgs; } diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 130549c017..c26ac73a92 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -5513,7 +5513,7 @@ static int unistim_send_mwi_to_peer(struct unistim_line *peer, unsigned int tick ast_str_set(&uniqueid, 0, "%s@%s", mailbox, context); - msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_message(), ast_str_buffer(uniqueid)); + msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_type(), ast_str_buffer(uniqueid)); if (msg) { struct stasis_mwi_state *mwi_state = stasis_message_data(msg); diff --git a/channels/sig_pri.c b/channels/sig_pri.c index f91a0a43fc..dba005214e 100644 --- a/channels/sig_pri.c +++ b/channels/sig_pri.c @@ -8768,7 +8768,7 @@ static void sig_pri_mwi_event_cb(void *userdata, struct stasis_subscription *sub int idx; struct stasis_mwi_state *mwi_state; - if (stasis_mwi_state_message() != stasis_message_type(msg)) { + if (stasis_mwi_state_type() != stasis_message_type(msg)) { return; } @@ -8826,7 +8826,7 @@ static void sig_pri_mwi_cache_update(struct sig_pri_span *pri) ast_str_reset(uniqueid); ast_str_set(&uniqueid, 0, "%s@%s", pri->mbox[idx].number, pri->mbox[idx].context); - msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_message(), ast_str_buffer(uniqueid)); + msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_type(), ast_str_buffer(uniqueid)); if (!msg) { /* No cached event for this mailbox. */ continue; diff --git a/include/asterisk/app.h b/include/asterisk/app.h index d6ae5fe8b1..75d1fbb7ec 100644 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -1170,7 +1170,7 @@ struct stasis_caching_topic *stasis_mwi_topic_cached(void); * \retval NULL if it has not been allocated * \since 12 */ -struct stasis_message_type *stasis_mwi_state_message(void); +struct stasis_message_type *stasis_mwi_state_type(void); /*! @} */ diff --git a/main/app.c b/main/app.c index dca74849fd..307a9d65fb 100644 --- a/main/app.c +++ b/main/app.c @@ -84,7 +84,7 @@ static AST_LIST_HEAD_STATIC(zombies, zombie); static struct stasis_topic *mwi_topic_all; static struct stasis_caching_topic *mwi_topic_cached; -static struct stasis_message_type *mwi_message_type; +static struct stasis_message_type *mwi_state_type; static struct stasis_topic_pool *mwi_topic_pool; static void *shaun_of_the_dead(void *data) @@ -2659,9 +2659,9 @@ struct stasis_caching_topic *stasis_mwi_topic_cached(void) return mwi_topic_cached; } -struct stasis_message_type *stasis_mwi_state_message(void) +struct stasis_message_type *stasis_mwi_state_type(void) { - return mwi_message_type; + return mwi_state_type; } struct stasis_topic *stasis_mwi_topic(const char *uniqueid) @@ -2702,7 +2702,7 @@ int stasis_publish_mwi_state_full( ast_set_default_eid(&mwi_state->eid); } - message = stasis_message_create(stasis_mwi_state_message(), mwi_state); + message = stasis_message_create(stasis_mwi_state_type(), mwi_state); mailbox_specific_topic = stasis_mwi_topic(ast_str_buffer(uniqueid)); if (!mailbox_specific_topic) { @@ -2716,7 +2716,7 @@ int stasis_publish_mwi_state_full( static const char *mwi_state_get_id(struct stasis_message *message) { - if (stasis_mwi_state_message() == stasis_message_type(message)) { + if (stasis_mwi_state_type() == stasis_message_type(message)) { struct stasis_mwi_state *mwi_state = stasis_message_data(message); return mwi_state->uniqueid; } else if (stasis_subscription_change() == stasis_message_type(message)) { @@ -2732,8 +2732,8 @@ static void app_exit(void) ao2_cleanup(mwi_topic_all); mwi_topic_all = NULL; mwi_topic_cached = stasis_caching_unsubscribe(mwi_topic_cached); - ao2_cleanup(mwi_message_type); - mwi_message_type = NULL; + ao2_cleanup(mwi_state_type); + mwi_state_type = NULL; ao2_cleanup(mwi_topic_pool); mwi_topic_pool = NULL; } @@ -2748,8 +2748,8 @@ int app_init(void) if (!mwi_topic_cached) { return -1; } - mwi_message_type = stasis_message_type_create("stasis_mwi_state"); - if (!mwi_message_type) { + mwi_state_type = stasis_message_type_create("stasis_mwi_state"); + if (!mwi_state_type) { return -1; } mwi_topic_pool = stasis_topic_pool_create(mwi_topic_all); diff --git a/res/res_jabber.c b/res/res_jabber.c index e29fae4df1..0ee64f9697 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -3249,7 +3249,7 @@ static void aji_mwi_cb(void *data, struct stasis_subscription *sub, struct stasi struct aji_client *client = data; struct stasis_mwi_state *mwi_state; - if (!stasis_subscription_is_subscribed(sub) || stasis_mwi_state_message() != stasis_message_type(msg)) { + if (!stasis_subscription_is_subscribed(sub) || stasis_mwi_state_type() != stasis_message_type(msg)) { return; } diff --git a/res/res_xmpp.c b/res/res_xmpp.c index 1901aa25b5..a53a8fd91b 100644 --- a/res/res_xmpp.c +++ b/res/res_xmpp.c @@ -1326,7 +1326,7 @@ static void xmpp_pubsub_mwi_cb(void *data, struct stasis_subscription *sub, stru char oldmsgs[10], newmsgs[10]; struct stasis_mwi_state *mwi_state; - if (!stasis_subscription_is_subscribed(sub) || stasis_mwi_state_message() != stasis_message_type(msg)) { + if (!stasis_subscription_is_subscribed(sub) || stasis_mwi_state_type() != stasis_message_type(msg)) { return; }