diff options
author | Kinsey Moore <kmoore@digium.com> | 2013-07-20 13:10:22 +0000 |
---|---|---|
committer | Kinsey Moore <kmoore@digium.com> | 2013-07-20 13:10:22 +0000 |
commit | 684c83b29b88d219aa406d0aa1673ee338c9159d (patch) | |
tree | fb558b8a1f3aad37ad816d371d805c76f9476431 /apps | |
parent | 4e15046cf6446e5f5acca0f4faccc9678e96836a (diff) |
Add transfer support to CEL
This adds CEL support for blind and attended transfers and call pickup.
During the course of adding this functionality I noticed that
CONF_ENTER, CONF_EXIT, and BRIDGE_TO_CONF events are particularly
useless without a bridge identifier, so I added that as well.
This adds tests for blind transfers, several types of attended
transfers, and call pickup.
The extra field in CEL records now consists of a JSON blob whose fields
are defined on a per-event basis.
Review: https://reviewboard.asterisk.org/r/2658/
(closes issue ASTERISK-21565)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@394858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_celgenuserevent.c | 4 | ||||
-rw-r--r-- | apps/app_dial.c | 1 | ||||
-rw-r--r-- | apps/app_directed_pickup.c | 1 | ||||
-rw-r--r-- | apps/app_queue.c | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/apps/app_celgenuserevent.c b/apps/app_celgenuserevent.c index d0331aebe..25065dccb 100644 --- a/apps/app_celgenuserevent.c +++ b/apps/app_celgenuserevent.c @@ -75,9 +75,9 @@ static int celgenuserevent_exec(struct ast_channel *chan, const char *data) parse = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, parse); - blob = ast_json_pack("{s: s, s: s}", + blob = ast_json_pack("{s: s, s: {s: s}}", "event", args.event, - "extra", args.extra); + "extra", "extra", args.extra); if (!blob) { return res; } diff --git a/apps/app_dial.c b/apps/app_dial.c index 806859011..0a43197b4 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -60,7 +60,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/stringfields.h" #include "asterisk/global_datastores.h" #include "asterisk/dsp.h" -#include "asterisk/cel.h" #include "asterisk/aoc.h" #include "asterisk/ccss.h" #include "asterisk/indications.h" diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index 6fcde0748..2a1137120 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -46,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/features.h" #include "asterisk/manager.h" #include "asterisk/callerid.h" -#include "asterisk/cel.h" #define PICKUPMARK "PICKUPMARK" diff --git a/apps/app_queue.c b/apps/app_queue.c index 668fe57eb..8c5291a0d 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -103,7 +103,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/taskprocessor.h" #include "asterisk/aoc.h" #include "asterisk/callerid.h" -#include "asterisk/cel.h" #include "asterisk/data.h" #include "asterisk/term.h" #include "asterisk/dial.h" |