diff options
| author | Kinsey Moore <kmoore@digium.com> | 2013-07-20 13:25:05 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2013-07-20 13:25:05 +0000 |
| commit | c3b8939be8af2d297104e9afae7e81517d34c1d5 (patch) | |
| tree | 1569c9afe53dc79d89d37dc701ac3b87d7fa5d5a /main | |
| parent | 684c83b29b88d219aa406d0aa1673ee338c9159d (diff) | |
Add CEL local optimization record type
This adds a new CEL event type, AST_CEL_LOCAL_OPTIMIZE, to represent
local channel optimizations. Local channel optimizations were one of
several things conveyed by the now defunct BRIDGE_UPDATE event type.
This also adds a unit test to test generation of this new CEL event.
Review: https://reviewboard.asterisk.org/r/2676/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@394870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 4 | ||||
| -rw-r--r-- | main/cel.c | 25 |
2 files changed, 26 insertions, 3 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index c7c67e795..76555293e 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -4341,12 +4341,12 @@ int main(int argc, char *argv[]) exit(1); } - if (ast_cel_engine_init()) { + if (ast_local_init()) { printf("%s", term_quit()); exit(1); } - if (ast_local_init()) { + if (ast_cel_engine_init()) { printf("%s", term_quit()); exit(1); } diff --git a/main/cel.c b/main/cel.c index c212dcd7b..3d0e8e991 100644 --- a/main/cel.c +++ b/main/cel.c @@ -62,6 +62,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/bridging.h" #include "asterisk/parking.h" #include "asterisk/features.h" +#include "asterisk/core_local.h" /*** DOCUMENTATION <configInfo name="cel" language="en_US"> @@ -113,7 +114,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <enum name="3WAY_END"/> <enum name="HOOKFLASH"/> <enum name="LINKEDID_END"/> - + <enum name="LOCAL_OPTIMIZE"/> </enumlist> </description> </configOption> @@ -319,6 +320,7 @@ static const char * const cel_event_types[CEL_MAX_EVENT_IDS] = { [AST_CEL_3WAY_END] = "3WAY_END", [AST_CEL_HOOKFLASH] = "HOOKFLASH", [AST_CEL_LINKEDID_END] = "LINKEDID_END", + [AST_CEL_LOCAL_OPTIMIZE] = "LOCAL_OPTIMIZE", }; struct bridge_assoc { @@ -1473,6 +1475,22 @@ static void cel_pickup_cb( cel_report_event(target, AST_CEL_PICKUP, NULL, NULL, channel->name); } +static void cel_local_cb( + void *data, struct stasis_subscription *sub, + struct stasis_topic *topic, + struct stasis_message *message) +{ + struct ast_multi_channel_blob *obj = stasis_message_data(message); + struct ast_channel_snapshot *localone = ast_multi_channel_blob_get_channel(obj, "1"); + struct ast_channel_snapshot *localtwo = ast_multi_channel_blob_get_channel(obj, "2"); + + if (!localone || !localtwo) { + return; + } + + cel_report_event(localone, AST_CEL_LOCAL_OPTIMIZE, NULL, NULL, localtwo->name); +} + static void ast_cel_engine_term(void) { aco_info_destroy(&cel_cfg_info); @@ -1609,6 +1627,11 @@ int ast_cel_engine_init(void) cel_pickup_cb, NULL); + ret |= stasis_message_router_add(cel_state_router, + ast_local_optimization_end_type(), + cel_local_cb, + NULL); + /* If somehow we failed to add any routes, just shut down the whole * thing and fail it. */ |