diff options
| author | Russell Bryant <russell@russellbryant.com> | 2009-06-26 15:28:53 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2009-06-26 15:28:53 +0000 |
| commit | 0264eef1156b8ef7369884dd5c663646f1b2b429 (patch) | |
| tree | a28e9113cf1daf97e45a8fc6d41a52c76ac69836 /channels/chan_console.c | |
| parent | e06c6f97c4c222b4c802ac2b85f76a331991dffb (diff) | |
Merge the new Channel Event Logging (CEL) subsystem.
CEL is the new system for logging channel events. This was inspired after
facing many problems trying to represent what is possible to happen to a call
in Asterisk using CDR records. For more information on CEL, see the built in
HTML or PDF documentation generated from the files in doc/tex/.
Many thanks to Steve Murphy (murf) and Brian Degenhardt (bmd) for their hard
work developing this code. Also, thanks to Matt Nicholson (mnicholson) and
Sean Bright (seanbright) for their assistance in the final push to get this
code ready for Asterisk trunk.
Review: https://reviewboard.asterisk.org/r/239/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203638 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_console.c')
| -rw-r--r-- | channels/chan_console.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/channels/chan_console.c b/channels/chan_console.c index 091fcf1b1..55be76895 100644 --- a/channels/chan_console.c +++ b/channels/chan_console.c @@ -189,8 +189,8 @@ static struct ast_jb_conf default_jbconf = { static struct ast_jb_conf global_jbconf; /*! Channel Technology Callbacks @{ */ -static struct ast_channel *console_request(const char *type, int format, - void *data, int *cause); +static struct ast_channel *console_request(const char *type, int format, + const struct ast_channel *requestor, void *data, int *cause); static int console_digit_begin(struct ast_channel *c, char digit); static int console_digit_end(struct ast_channel *c, char digit, unsigned int duration); static int console_text(struct ast_channel *c, const char *text); @@ -413,12 +413,12 @@ static int stop_stream(struct console_pvt *pvt) /*! * \note Called with the pvt struct locked */ -static struct ast_channel *console_new(struct console_pvt *pvt, const char *ext, const char *ctx, int state) +static struct ast_channel *console_new(struct console_pvt *pvt, const char *ext, const char *ctx, int state, const char *linkedid) { struct ast_channel *chan; if (!(chan = ast_channel_alloc(1, state, pvt->cid_num, pvt->cid_name, NULL, - ext, ctx, 0, "Console/%s", pvt->name))) { + ext, ctx, linkedid, 0, "Console/%s", pvt->name))) { return NULL; } @@ -447,7 +447,7 @@ static struct ast_channel *console_new(struct console_pvt *pvt, const char *ext, return chan; } -static struct ast_channel *console_request(const char *type, int format, void *data, int *cause) +static struct ast_channel *console_request(const char *type, int format, const struct ast_channel *requestor, void *data, int *cause) { int oldformat = format; struct ast_channel *chan = NULL; @@ -471,7 +471,7 @@ static struct ast_channel *console_request(const char *type, int format, void *d } console_pvt_lock(pvt); - chan = console_new(pvt, NULL, NULL, AST_STATE_DOWN); + chan = console_new(pvt, NULL, NULL, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL); console_pvt_unlock(pvt); if (!chan) @@ -833,7 +833,7 @@ static char *cli_console_dial(struct ast_cli_entry *e, int cmd, struct ast_cli_a if (ast_exists_extension(NULL, myc, mye, 1, NULL)) { console_pvt_lock(pvt); pvt->hookstate = 1; - console_new(pvt, mye, myc, AST_STATE_RINGING); + console_new(pvt, mye, myc, AST_STATE_RINGING, NULL); console_pvt_unlock(pvt); } else ast_cli(a->fd, "No such extension '%s' in context '%s'\n", mye, myc); |