diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-03 19:12:14 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-03 19:12:14 +0000 |
| commit | 44455eaa6159ac321284b18d6967b03d7f3fb20d (patch) | |
| tree | 512aecfd45cc7b207c980ae75620c03149811043 /include | |
| parent | a7abb541e3c999e58a1e5c0b06642437fd20c024 (diff) | |
Merged revisions 127793 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r127793 | murf | 2008-07-03 11:16:44 -0600 (Thu, 03 Jul 2008) | 38 lines
Merged revisions 127663 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r127663 | murf | 2008-07-02 18:16:25 -0600 (Wed, 02 Jul 2008) | 30 lines
The CDRfix4/5/6 omnibus cdr fixes.
(closes issue #10927)
Reported by: murf
Tested by: murf, deeperror
(closes issue #12907)
Reported by: falves11
Tested by: murf, falves11
(closes issue #11849)
Reported by: greyvoip
As to 11849, I think these changes fix the core problems
brought up in that bug, but perhaps not the more global
problems created by the limitations of CDR's themselves
not being oriented around transfers.
Reopen if necc, but bug reports are not the best
medium for enhancement discussions. We need to start
a second-generation CDR standardization effort to cover
transfers.
(closes issue #11093)
Reported by: rossbeer
Tested by: greyvoip, murf
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@127830 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/cdr.h | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h index addef04ea..dc14f326e 100644 --- a/include/asterisk/cdr.h +++ b/include/asterisk/cdr.h @@ -24,16 +24,23 @@ #define _ASTERISK_CDR_H #include <sys/time.h> + +/*! \name CDR Flags */ +/*@{ */ #define AST_CDR_FLAG_KEEP_VARS (1 << 0) #define AST_CDR_FLAG_POSTED (1 << 1) #define AST_CDR_FLAG_LOCKED (1 << 2) #define AST_CDR_FLAG_CHILD (1 << 3) #define AST_CDR_FLAG_POST_DISABLED (1 << 4) -#define AST_CDR_FLAG_ANSLOCKED (1 << 5) -#define AST_CDR_FLAG_DONT_TOUCH (1 << 6) +#define AST_CDR_FLAG_BRIDGED (1 << 5) +#define AST_CDR_FLAG_MAIN (1 << 6) +#define AST_CDR_FLAG_ENABLE (1 << 7) +#define AST_CDR_FLAG_ANSLOCKED (1 << 8) +#define AST_CDR_FLAG_DONT_TOUCH (1 << 9) #define AST_CDR_FLAG_POST_ENABLE (1 << 5) +/*@} */ -/*! \name CDR Flags */ +/*! \name CDR Flags - Disposition */ /*@{ */ #define AST_CDR_NULL 0 #define AST_CDR_FAILED (1 << 0) @@ -299,8 +306,16 @@ char *ast_cdr_disp2str(int disposition); */ void ast_cdr_reset(struct ast_cdr *cdr, struct ast_flags *flags); -/*! - * \brief Flags to a string +/*! Reset the detail record times, flags */ +/*! + * \param cdr which cdr to act upon + * \param flags |AST_CDR_FLAG_POSTED whether or not to post the cdr first before resetting it + * |AST_CDR_FLAG_LOCKED whether or not to reset locked CDR's + */ +void ast_cdr_specialized_reset(struct ast_cdr *cdr, struct ast_flags *flags); + +/*! Flags to a string */ +/*! * \param flags binary flag * Converts binary flags to string flags * Returns string with flag name |