diff options
| author | David M. Lee <dlee@digium.com> | 2013-07-23 13:39:50 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-07-23 13:39:50 +0000 |
| commit | fec667646fb63fb0d55d26cf76ade739dc62bcfe (patch) | |
| tree | ddc5248bd5b7ed97a1939961592c9394621d81ff /main/cdr.c | |
| parent | 5f56004b1dbfb67dd9cbc58a110ddec8089b10af (diff) | |
Fix bridge/channel AMI event ordering issues
The stasis_cache_update messages are somewhat cumbersome to handle
with the stasis_message_router. Since all updates have the same
message type, they are normally handled with the same route.
Since caching itself is a first class component of stasis-core, it
makes sense for the router to handle the cache update messages itself.
This patch adds stasis_message_router_add_cache_update() and
stasis_message_router_remove_cache_update() to handle the routing of
stasis_cache_update messages.
This patch also corrects an issue with manager_{bridging,channels}.c,
where events might be reordered. The reordering occurs because the
components use different message routers, which they needed because
they both needed to route cache update messages. They now both use
manager's router, and add cache routes for just the cache updates they
are interested in.
(closes issue ASTERISK-22038)
Review: https://reviewboard.asterisk.org/r/2677/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395118 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/cdr.c')
| -rw-r--r-- | main/cdr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/main/cdr.c b/main/cdr.c index 2e6209551..633324206 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -1967,9 +1967,7 @@ static void handle_channel_cache_message(void *data, struct stasis_subscription struct cdr_object *it_cdr; ast_assert(update != NULL); - if (ast_channel_snapshot_type() != update->type) { - return; - } + ast_assert(ast_channel_snapshot_type() == update->type); old_snapshot = stasis_message_data(update->old_snapshot); new_snapshot = stasis_message_data(update->new_snapshot); @@ -4024,7 +4022,7 @@ int ast_cdr_engine_init(void) if (!stasis_router) { return -1; } - stasis_message_router_add(stasis_router, stasis_cache_update_type(), handle_channel_cache_message, NULL); + stasis_message_router_add_cache_update(stasis_router, ast_channel_snapshot_type(), handle_channel_cache_message, NULL); stasis_message_router_add(stasis_router, ast_channel_dial_type(), handle_dial_message, NULL); stasis_message_router_add(stasis_router, ast_channel_entered_bridge_type(), handle_bridge_enter_message, NULL); stasis_message_router_add(stasis_router, ast_channel_left_bridge_type(), handle_bridge_leave_message, NULL); |