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/sig_analog.h | |
| 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/sig_analog.h')
| -rw-r--r-- | channels/sig_analog.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/sig_analog.h b/channels/sig_analog.h index 24c4d6c8f..661179881 100644 --- a/channels/sig_analog.h +++ b/channels/sig_analog.h @@ -163,7 +163,7 @@ struct analog_callback { /*! This function is for swapping of the owners with the underlying subs. Typically it means you need to change the fds * of the new owner to be the fds of the sub specified, for each of the two subs given */ void (* const swap_subs)(void *pvt, enum analog_sub a, struct ast_channel *new_a_owner, enum analog_sub b, struct ast_channel *new_b_owner); - struct ast_channel * (* const new_ast_channel)(void *pvt, int state, int startpbx, enum analog_sub sub); + struct ast_channel * (* const new_ast_channel)(void *pvt, int state, int startpbx, enum analog_sub sub, const struct ast_channel *requestor); /* Add the given sub to a conference */ int (* const conf_add)(void *pvt, enum analog_sub sub); @@ -300,7 +300,7 @@ int analog_answer(struct analog_pvt *p, struct ast_channel *ast); struct ast_frame *analog_exception(struct analog_pvt *p, struct ast_channel *ast); -struct ast_channel * analog_request(struct analog_pvt *p, int *callwait); +struct ast_channel * analog_request(struct analog_pvt *p, int *callwait, const struct ast_channel *requestor); int analog_available(struct analog_pvt *p, int channelmatch, ast_group_t groupmatch, int *busy, int *channelmatched, int *groupmatched); |