diff options
| author | George Joseph <george.joseph@fairview5.com> | 2016-01-05 10:06:32 -0700 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2016-01-05 12:29:31 -0600 |
| commit | d228b62fd437e02c0638684c1f44c92e5f1e3948 (patch) | |
| tree | d1a4408b6242f0614e2c5fe6c7257e9648381cdf /main/stasis_cache_pattern.c | |
| parent | e13719bff1c4a723edf08252da17fef04b6f88cf (diff) | |
stasis_cache_pattern: Backport to 13
Somehow stasis_cache_pattern got out of sync between 13 and master
and it was causing duplicate channel message issues in 13 when
related to a specific endpoint. I.E. from statsd,
'endpoints.PJSIP.1174.channels 0|g' was being emitted twice.
Backporting stasis_cache_pattern from master to 13 solved
the issue and running the unit and testsuite tests confirmed
that no new ones were created.
ASTERISK-25317 #close
Change-Id: Ia8707462f62d15eed14541c37f332a7bbbceb548
Diffstat (limited to 'main/stasis_cache_pattern.c')
| -rw-r--r-- | main/stasis_cache_pattern.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/main/stasis_cache_pattern.c b/main/stasis_cache_pattern.c index ccc9ebf08..7ccf1c181 100644 --- a/main/stasis_cache_pattern.c +++ b/main/stasis_cache_pattern.c @@ -138,7 +138,7 @@ 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 = stasis_cp_sink_create(all, name); if (!one) { return NULL; } @@ -157,7 +157,7 @@ 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, +struct stasis_cp_single *stasis_cp_sink_create(struct stasis_cp_all *all, const char *name) { RAII_VAR(struct stasis_cp_single *, one, NULL, ao2_cleanup); @@ -180,23 +180,6 @@ struct stasis_cp_single *stasis_cp_single_create_only(struct stasis_cp_all *all, 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) { |