diff options
author | George Joseph <george.joseph@fairview5.com> | 2015-05-29 14:52:23 -0500 |
---|---|---|
committer | George Joseph <george.joseph@fairview5.com> | 2015-05-29 14:52:23 -0500 |
commit | 1558a891293dd96ba71a3cedf0caa1968067ba5e (patch) | |
tree | 9eb0814bbf51f1fbf54d83b20efada205292211f /main/stasis_cache_pattern.c | |
parent | 35c699086ae2fd81b2473307ccb2ae79ad32375a (diff) |
Revert "endpoint/stasis: Eliminate duplicate events on endpoint status change"
This reverts commit 35c699086ae2fd81b2473307ccb2ae79ad32375a.
Change-Id: Ia98c2b4820cf579a5b9bb75e9e05d7a233205fb7
Diffstat (limited to 'main/stasis_cache_pattern.c')
-rw-r--r-- | main/stasis_cache_pattern.c | 49 |
1 files changed, 9 insertions, 40 deletions
diff --git a/main/stasis_cache_pattern.c b/main/stasis_cache_pattern.c index ccc9ebf08..9e3de367a 100644 --- a/main/stasis_cache_pattern.c +++ b/main/stasis_cache_pattern.c @@ -138,30 +138,6 @@ 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); - if (!one) { - return NULL; - } - - one->forward_topic_to_all = stasis_forward_all(one->topic, all->topic); - if (!one->forward_topic_to_all) { - return NULL; - } - one->forward_cached_to_all = stasis_forward_all( - stasis_caching_get_topic(one->topic_cached), all->topic_cached); - if (!one->forward_cached_to_all) { - return NULL; - } - - ao2_ref(one, +1); - 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; @@ -176,25 +152,18 @@ struct stasis_cp_single *stasis_cp_single_create_only(struct stasis_cp_all *all, 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;; + one->forward_topic_to_all = stasis_forward_all(one->topic, all->topic); + if (!one->forward_topic_to_all) { + return NULL; } - - 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; + one->forward_cached_to_all = stasis_forward_all( + stasis_caching_get_topic(one->topic_cached), all->topic_cached); + if (!one->forward_cached_to_all) { + return NULL; } - return 0; + ao2_ref(one, +1); + return one; } void stasis_cp_single_unsubscribe(struct stasis_cp_single *one) |