Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Convert MWI state message type to the new stasis naming convention

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@384219 65c4cc65-6c06-0410-ace0-fbb531ad65f3
changes/78/78/1
Kinsey Moore 12 years ago
parent c67a06a2ff
commit 1a2a4578d2
11 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
channels/chan_dahdi.c
Unescape View File

@ -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);

2
channels/chan_iax2.c
Unescape View File

@ -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);

2
channels/chan_mgcp.c
Unescape View File

@ -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);

4
channels/chan_sip.c
Unescape View File

@ -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;
}

2
channels/chan_skinny.c
Unescape View File

@ -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;
}

2
channels/chan_unistim.c
Unescape View File

@ -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);

4
channels/sig_pri.c
Unescape View File

@ -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;

2
include/asterisk/app.h
Unescape View File

@ -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);
/*! @} */

18
main/app.c
Unescape View File

@ -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);

2
res/res_jabber.c
Unescape View File

@ -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;
}

2
res/res_xmpp.c
Unescape View File

@ -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;
}

Write Preview
Loading…
Cancel
Save