kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-19 03:07:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "endpoint/stasis: Eliminate duplicate events on endpoint status change"

Browse Source 
This reverts commit 6fca75bb62.

Change-Id: Ifee026cc63e22c5ac5717c37867a9f036373ae5a
This commit is contained in:
George Joseph
2015-05-29 14:52:41 -05:00
parent 6fca75bb62
commit 82716410a4
3 changed files with 21 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
main/stasis_cache_pattern.c
View File

@@ -138,11 +138,20 @@ struct stasis_cp_single *stasis_cp_single_create(struct stasis_cp_all *all,
{
RAII_VAR(struct stasis_cp_single *, one, NULL, ao2_cleanup);
one = stasis_cp_single_create_only(all, name);
one = ao2_t_alloc(sizeof(*one), one_dtor, name);
if (!one) {
return NULL;
}
one->topic = stasis_topic_create(name);
if (!one->topic) {
return NULL;
}
one->topic_cached = stasis_caching_topic_create(one->topic, all->cache);
if (!one->topic_cached) {
return NULL;
}
one->forward_topic_to_all = stasis_forward_all(one->topic, all->topic);
if (!one->forward_topic_to_all) {
return NULL;
@@ -157,46 +166,6 @@ struct stasis_cp_single *stasis_cp_single_create(struct stasis_cp_all *all,
return one;
}
struct stasis_cp_single *stasis_cp_single_create_only(struct stasis_cp_all *all,
const char *name)
{
RAII_VAR(struct stasis_cp_single *, one, NULL, ao2_cleanup);
one = ao2_t_alloc(sizeof(*one), one_dtor, name);
if (!one) {
return NULL;
}
one->topic = stasis_topic_create(name);
if (!one->topic) {
return NULL;
}
one->topic_cached = stasis_caching_topic_create(one->topic, all->cache);
if (!one->topic_cached) {
return NULL;
}
ao2_ref(one, +1);
return one;
}
int stasis_cp_single_forward(struct stasis_cp_single *from, struct stasis_cp_single *to)
{
from->forward_topic_to_all = stasis_forward_all(from->topic, to->topic);
if (!from->forward_topic_to_all) {
return -1;;
}
from->forward_cached_to_all = stasis_forward_all(
stasis_caching_get_topic(from->topic_cached),
stasis_caching_get_topic(to->topic_cached));
if (!from->forward_cached_to_all) {
return -1;
}
return 0;
}
void stasis_cp_single_unsubscribe(struct stasis_cp_single *one)
{
if (!one) {