Merged revisions 283230 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r283230 | russell | 2010-08-23 08:23:12 -0500 (Mon, 23 Aug 2010) | 7 lines

  Make the AST_CEL_AMA enum match up with the AST_CDR_ ama flag values.

  Really, having 2 enums for this is silly and error prone, demonstrated by
  the crash that I hit because there was an assumption in the code that the
  values in each matched up.  However, this is a quick fix to get them to
  match up so it will work.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283232 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/cel.h b/include/asterisk/cel.h
index 22a8bdd..226a6cf 100644 (file)
--- a/include/asterisk/cel.h
+++ b/include/asterisk/cel.h
@@ -35,8 +35,13 @@ extern "C" {
 
 #include "asterisk/event.h"
 
-/*! \brief AMA Flags */
+/*!
+ * \brief AMA Flags
+ *
+ * \note This must much up with the AST_CDR_* defines for AMA flags.
+ */
 enum ast_cel_ama_flag {
+       AST_CEL_AMA_FLAG_NONE,
        AST_CEL_AMA_FLAG_OMIT,
        AST_CEL_AMA_FLAG_BILLING,
        AST_CEL_AMA_FLAG_DOCUMENTATION,

diff --git a/main/cel.c b/main/cel.c
index 750a629..7f5c24f 100644 (file)
--- a/main/cel.c
+++ b/main/cel.c
@@ -122,6 +122,7 @@ static const char * const cel_event_types[CEL_MAX_EVENT_IDS] = {
  * \brief Map of ast_cel_ama_flags to strings
  */
 static const char * const cel_ama_flags[AST_CEL_AMA_FLAG_TOTAL] = {
+       [AST_CEL_AMA_FLAG_NONE]          = "NONE",
        [AST_CEL_AMA_FLAG_OMIT]          = "OMIT",
        [AST_CEL_AMA_FLAG_BILLING]       = "BILLING",
        [AST_CEL_AMA_FLAG_DOCUMENTATION] = "DOCUMENTATION",