diff options
author | Kinsey Moore <kmoore@digium.com> | 2013-06-07 12:56:56 +0000 |
---|---|---|
committer | Kinsey Moore <kmoore@digium.com> | 2013-06-07 12:56:56 +0000 |
commit | 759a7e4a30b5e69738670494e5c19b6982a34644 (patch) | |
tree | 56e190b02bf90267738a4da3f0c8bb87e55424eb /main/channel.c | |
parent | 611416623748504be81c58b455205a4bc7fff414 (diff) |
Rework stasis cache clear events
Stasis cache clear message payloads now consist of a stasis_message
representative of the message to be cleared from the cache. This allows
multiple parallel caches to coexist and be cleared properly by the same
cache clear message even when keyed on different fields.
This change fixes a bug where multiple cache clears could be posted for
channels. The cache clear is now produced in the destructor instead of
ast_hangup.
Additionally, dummy channels are no longer capable of producing channel
snapshots.
Review: https://reviewboard.asterisk.org/r/2596
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@390830 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
-rw-r--r-- | main/channel.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c index 4adff953c..f3aabd04a 100644 --- a/main/channel.c +++ b/main/channel.c @@ -817,11 +817,28 @@ int ast_str2cause(const char *name) return -1; } +static struct stasis_message *create_channel_snapshot_message(struct ast_channel *channel) +{ + RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup); + snapshot = ast_channel_snapshot_create(channel); + if (!snapshot) { + return NULL; + } + + return stasis_message_create(ast_channel_snapshot_type(), snapshot); +} + static void publish_cache_clear(struct ast_channel *chan) { RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup); + RAII_VAR(struct stasis_message *, clear_msg, NULL, ao2_cleanup); - message = stasis_cache_clear_create(ast_channel_snapshot_type(), ast_channel_uniqueid(chan)); + clear_msg = create_channel_snapshot_message(chan); + if (!clear_msg) { + return; + } + + message = stasis_cache_clear_create(clear_msg); stasis_publish(ast_channel_topic(chan), message); } @@ -1161,6 +1178,7 @@ __ast_channel_alloc_ap(int needqueue, int state, const char *cid_num, const char } ast_channel_internal_finalize(tmp); + ast_publish_channel_state(tmp); return tmp; } @@ -2369,6 +2387,8 @@ static void ast_channel_destructor(void *obj) char device_name[AST_CHANNEL_NAME]; struct ast_callid *callid; + publish_cache_clear(chan); + if (ast_channel_internal_is_finalized(chan)) { ast_cel_report_event(chan, AST_CEL_CHANNEL_END, NULL, NULL, NULL); ast_cel_check_retire_linkedid(chan); @@ -2884,7 +2904,6 @@ int ast_hangup(struct ast_channel *chan) ast_cc_offer(chan); ast_publish_channel_state(chan); - publish_cache_clear(chan); if (ast_channel_cdr(chan) && !ast_test_flag(ast_channel_cdr(chan), AST_CDR_FLAG_BRIDGED) && !ast_test_flag(ast_channel_cdr(chan), AST_CDR_FLAG_POST_DISABLED) && |