[svn-commits] russell: branch group/newcdr r201984 - in /team/group/newcdr: configs/ main/

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Jun 19 13:50:52 2009
New Revision: 201984

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201984
Log:
The CEL sample configuration says CEL is off by default.  Make that reality.

Modified:
    team/group/newcdr/configs/cel.conf.sample
    team/group/newcdr/main/cel.c

Modified: team/group/newcdr/configs/cel.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/configs/cel.conf.sample?view=diff&rev=201984&r1=201983&r2=201984
==============================================================================
--- team/group/newcdr/configs/cel.conf.sample (original)
+++ team/group/newcdr/configs/cel.conf.sample Fri Jun 19 13:50:52 2009
@@ -4,8 +4,6 @@
 ; Channel Event Logging is a mechanism to provide fine-grained event information
 ; that can be used to generate billing information. Such event information can
 ; be recorded to databases and files via pluggable backend modules.
-; Useful for billing, fraud prevention, compliance with
-; Sarbanes-Oxley aka The Enron Act, QOS evaluations, and more.
 ;
 
 [general]
@@ -13,7 +11,7 @@
 ; Define whether or not to use CEL.  Default is "no". Setting to "yes"
 ; will turn on CEL.
 
-;enable=no
+;enable=yes
 
 ; Define the apps you would like to track.
 ;  You can use the keyword "all"-- If you do, please be aware that a tremendous amount of

Modified: team/group/newcdr/main/cel.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/main/cel.c?view=diff&rev=201984&r1=201983&r2=201984
==============================================================================
--- team/group/newcdr/main/cel.c (original)
+++ team/group/newcdr/main/cel.c Fri Jun 19 13:50:52 2009
@@ -35,10 +35,18 @@
 #include "asterisk/config.h"
 #include "asterisk/cli.h"
 
-static int cel_enabled;		/*! Is the CEL subsystem enabled ? */
-static long long eventset = 0; /*! which events we want to track; up to 64 events */
-static struct ast_hashtab *appset = 0;
-static char cel_dateformat[256] = "";
+/*! Is the CEL subsystem enabled ? */
+static unsigned int cel_enabled;
+
+/*! \brief CEL is off by default */
+static const unsigned int CEL_ENALBED_DEFAULT = 0;
+
+/*! which events we want to track; up to 64 events */
+static long long eventset;
+
+static struct ast_hashtab *appset;
+
+static char cel_dateformat[256];
 
 int ast_cel_check_enabled()
 {
@@ -155,7 +163,7 @@
 
 	ast_mutex_lock(&reload_lock);
 
-	cel_enabled = 1;
+	cel_enabled = CEL_ENALBED_DEFAULT;
 
 	if (appset) {
 		char *str;