[asterisk-commits] jrose: trunk r329856 - in /trunk: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: jrose
Date: Wed Jul 27 16:22:12 2011
New Revision: 329856

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329856
Log:
reverting 329840 due to failing tests.  Going to change this feature to be purely optional.

Modified:
    trunk/CHANGES
    trunk/include/asterisk/cdr.h
    trunk/main/cdr.c
    trunk/main/pbx.c

Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=329856&r1=329855&r2=329856
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Wed Jul 27 16:22:12 2011
@@ -70,7 +70,6 @@
 --------------------------
  * 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
 --------------------------

Modified: trunk/include/asterisk/cdr.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/cdr.h?view=diff&rev=329856&r1=329855&r2=329856
==============================================================================
--- trunk/include/asterisk/cdr.h (original)
+++ trunk/include/asterisk/cdr.h Wed Jul 27 16:22:12 2011
@@ -58,7 +58,6 @@
 	AST_CDR_FAILED   = (1 << 1),
 	AST_CDR_BUSY     = (1 << 2),
 	AST_CDR_ANSWERED = (1 << 3),
-	AST_CDR_CONGESTION = (1 << 4),
 };
 
 /*!
@@ -268,15 +267,6 @@
 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"

Modified: trunk/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cdr.c?view=diff&rev=329856&r1=329855&r2=329856
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Wed Jul 27 16:22:12 2011
@@ -776,26 +776,6 @@
 	}
 }
 
-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 */
 
@@ -811,9 +791,6 @@
 			break;
 		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;
@@ -984,8 +961,6 @@
 		return "BUSY";
 	case AST_CDR_ANSWERED:
 		return "ANSWERED";
-	case AST_CDR_CONGESTION:
-		return "CONGESTION";
 	}
 	return "UNKNOWN";
 }

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=329856&r1=329855&r2=329856
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Wed Jul 27 16:22:12 2011
@@ -9321,10 +9321,8 @@
 	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;
 }