From a complaint by jmls, I realize that the message in cdr_disposition is unnecessary. To get failure disposition, just return -1; no use having more than one case do that.

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@80789 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 5 insertions, 9 deletions

diff --git a/main/cdr.c b/main/cdr.c
index b81be5711..24809c651 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -740,27 +740,23 @@ void ast_cdr_noanswer(struct ast_cdr *cdr)
 	}
 }
 
+/* everywhere ast_cdr_disposition is called, it will call ast_cdr_failed() 
+   if ast_cdr_disposition returns a non-zero value */
+
 int ast_cdr_disposition(struct ast_cdr *cdr, int cause)
 {
 	int res = 0;
 
 	for (; cdr; cdr = cdr->next) {
-		switch(cause) {
+		switch(cause) {  /* handle all the non failure, busy cases, return 0 not to set disposition,
+							return -1 to set disposition to FAILED */
 		case AST_CAUSE_BUSY:
 			ast_cdr_busy(cdr);
 			break;
-		case AST_CAUSE_FAILURE:
-		case AST_CAUSE_NORMAL_CIRCUIT_CONGESTION:
-			ast_cdr_failed(cdr);
-			break;
 		case AST_CAUSE_NORMAL:
 			break;
-		case AST_CAUSE_NOTDEFINED:
-			res = -1;
-			break;
 		default:
 			res = -1;
-			ast_log(LOG_WARNING, "Cause (%d) not handled\n", cause);
 		}
 	}
 	return res;