kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverting 329840 due to failing tests. Going to change this feature to be purely optional.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329856 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2011-07-27 21:22:12 +00:00
parent 3ee80d6a90
commit d170e5e829
4 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -70,7 +70,6 @@ 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
--------------------------

10
include/asterisk/cdr.h
View File

@@ -58,7 +58,6 @@ enum {
AST_CDR_FAILED = (1 << 1),
AST_CDR_BUSY = (1 << 2),
AST_CDR_ANSWERED = (1 << 3),
AST_CDR_CONGESTION = (1 << 4),
};
/*!
@@ -267,15 +266,6 @@ 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

25
main/cdr.c
View File

@@ -776,26 +776,6 @@ 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 */
@@ -812,9 +792,6 @@ 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:
@@ -984,8 +961,6 @@ char *ast_cdr_disp2str(int disposition)
return "BUSY";
case AST_CDR_ANSWERED:
return "ANSWERED";
case AST_CDR_CONGESTION:
return "CONGESTION";
}
return "UNKNOWN";
}

4
main/pbx.c
View File

@@ -9321,10 +9321,8 @@ 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;
}