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 /res | |
| 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 'res')
| -rw-r--r-- | res/ais/evt.c | 2 | ||||
| -rw-r--r-- | res/res_agi.c | 2 | ||||
| -rw-r--r-- | res/res_calendar.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/res/ais/evt.c b/res/ais/evt.c index f551321e0..54a87935b 100644 --- a/res/ais/evt.c +++ b/res/ais/evt.c @@ -325,7 +325,7 @@ static void add_publish_event(struct event_channel *event_channel, const char *e publish_event->type = type; ast_log(LOG_DEBUG, "Subscribing to event type %d\n", type); - publish_event->sub = ast_event_subscribe(type, ast_event_cb, event_channel, + publish_event->sub = ast_event_subscribe(type, ast_event_cb, "AIS", event_channel, AST_EVENT_IE_END); ast_event_dump_cache(publish_event->sub); diff --git a/res/res_agi.c b/res/res_agi.c index dff477e09..164c5ec62 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -2256,6 +2256,7 @@ static int handle_hangup(struct ast_channel *chan, AGI *agi, int argc, const cha if (argc == 1) { /* no argument: hangup the current channel */ + ast_set_hangupsource(chan, "dialplan/agi", 0); ast_softhangup(chan,AST_SOFTHANGUP_EXPLICIT); ast_agi_send(agi->fd, chan, "200 result=1\n"); return RESULT_SUCCESS; @@ -2263,6 +2264,7 @@ static int handle_hangup(struct ast_channel *chan, AGI *agi, int argc, const cha /* one argument: look for info on the specified channel */ if ((c = ast_channel_get_by_name(argv[1]))) { /* we have a matching channel */ + ast_set_hangupsource(c, "dialplan/agi", 0); ast_softhangup(c, AST_SOFTHANGUP_EXPLICIT); c = ast_channel_unref(c); ast_agi_send(agi->fd, chan, "200 result=1\n"); diff --git a/res/res_calendar.c b/res/res_calendar.c index 8e8156d13..a8bb8019e 100644 --- a/res/res_calendar.c +++ b/res/res_calendar.c @@ -631,7 +631,7 @@ static int calendar_event_notify(const void *data) ast_dial_set_global_timeout(dial, event->owner->notify_waittime); generate_random_string(buf, sizeof(buf)); - if (!(chan = ast_channel_alloc(1, AST_STATE_DOWN, 0, 0, 0, 0, 0, 0, "Calendar/%s-%s", event->owner->name, buf))) { + if (!(chan = ast_channel_alloc(1, AST_STATE_DOWN, 0, 0, 0, 0, 0, 0, 0, "Calendar/%s-%s", event->owner->name, buf))) { ast_log(LOG_ERROR, "Could not allocate notification channel\n"); goto notify_cleanup; } |