diff options
| author | Russell Bryant <russell@russellbryant.com> | 2010-08-23 13:23:37 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2010-08-23 13:23:37 +0000 |
| commit | 019fbd57cfb7008e7618e0cdc78bb3ca43abf73e (patch) | |
| tree | ad81172fb4b3cdb9285caebceb1170f87b4dfdad | |
| parent | 2cf6ac53ee3ccb7559023a1f68559d7fb9619866 (diff) | |
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
| -rw-r--r-- | include/asterisk/cel.h | 7 | ||||
| -rw-r--r-- | main/cel.c | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/asterisk/cel.h b/include/asterisk/cel.h index 22a8bddb3..226a6cf24 100644 --- 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 750a62966..7f5c24f40 100644 --- 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", |