diff options
author | Jonathan Rose <jrose@digium.com> | 2011-07-27 20:42:18 +0000 |
---|---|---|
committer | Jonathan Rose <jrose@digium.com> | 2011-07-27 20:42:18 +0000 |
commit | 3ee80d6a90c5ce59f20f9dfc89d7f3faaa4fd753 (patch) | |
tree | 6f0c57e23a37802b9b7309186c840e518f0f56d7 | |
parent | 1e332468dcef968070158b65ef532789ed6f1713 (diff) |
Adds cdr logging of calls resulting in CONGESTION
Applies a patch made a long time ago by alecdavis which adds a CDR feature for logging
calls that failed due to congestion.
(closes issue #15907)
Reported by: alecdavis
Patches:
cdr_congestion.diff.txt uploaded by alecdavis (license #5546)
Review: https://reviewboard.asterisk.org/r/454/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329835 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | CHANGES | 1 | ||||
-rw-r--r-- | include/asterisk/cdr.h | 10 | ||||
-rw-r--r-- | main/cdr.c | 25 | ||||
-rw-r--r-- | main/pbx.c | 4 |
4 files changed, 39 insertions, 1 deletions
@@ -70,6 +70,7 @@ CDR -------------------------- * The filter option in cdr_adaptive_odbc now supports negating the argument, thus allowing records which do NOT match the specified filter. + * Added ability to log CONGESTION calls to CDR CODECS -------------------------- diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h index 5442fdb0c..2134e0ffb 100644 --- a/include/asterisk/cdr.h +++ b/include/asterisk/cdr.h @@ -58,6 +58,7 @@ enum { AST_CDR_FAILED = (1 << 1), AST_CDR_BUSY = (1 << 2), AST_CDR_ANSWERED = (1 << 3), + AST_CDR_CONGESTION = (1 << 4), }; /*! @@ -267,6 +268,15 @@ void ast_cdr_answer(struct ast_cdr *cdr); extern void ast_cdr_noanswer(struct ast_cdr *cdr); /*! + * \brief A call was set to congestion + * \param cdr the cdr you wish to associate with the call + * Markst he channel disposition as "CONGESTION" + * Will skip CDR's in chain with ANS_LOCK bit set. (see + * forkCDR() application + */ +extern void ast_cdr_congestion(struct ast_cdr *cdr); + +/*! * \brief Busy a call * \param cdr the cdr you wish to associate with the call * Marks the channel disposition as "BUSY" diff --git a/main/cdr.c b/main/cdr.c index 85c513e16..5d77ea222 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -776,6 +776,26 @@ void ast_cdr_noanswer(struct ast_cdr *cdr) } } +void ast_cdr_congestion(struct ast_cdr *cdr) +{ + char *chan; + + while (cdr) { + if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) { + chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>"; + + if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED)) { + ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan); + } + + if (cdr->disposition < AST_CDR_CONGESTION) { + cdr->disposition = AST_CDR_CONGESTION; + } + } + cdr = cdr->next; + } +} + /* everywhere ast_cdr_disposition is called, it will call ast_cdr_failed() if ast_cdr_disposition returns a non-zero value */ @@ -792,6 +812,9 @@ int ast_cdr_disposition(struct ast_cdr *cdr, int cause) case AST_CAUSE_NO_ANSWER: ast_cdr_noanswer(cdr); break; + case AST_CAUSE_NORMAL_CIRCUIT_CONGESTION: + ast_cdr_congestion(cdr); + break; case AST_CAUSE_NORMAL: break; default: @@ -961,6 +984,8 @@ char *ast_cdr_disp2str(int disposition) return "BUSY"; case AST_CDR_ANSWERED: return "ANSWERED"; + case AST_CDR_CONGESTION: + return "CONGESTION"; } return "UNKNOWN"; } diff --git a/main/pbx.c b/main/pbx.c index a2054646d..7ac332635 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -9321,8 +9321,10 @@ static int pbx_builtin_congestion(struct ast_channel *chan, const char *data) ast_indicate(chan, AST_CONTROL_CONGESTION); /* Don't change state of an UP channel, just indicate congestion in audio */ - if (chan->_state != AST_STATE_UP) + if (chan->_state != AST_STATE_UP) { ast_setstate(chan, AST_STATE_BUSY); + ast_cdr_congestion(chan->cdr); + } wait_for_hangup(chan, data); return -1; } |