diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-05 23:45:32 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-05 23:45:32 +0000 |
commit | e44c06e6c5fd14be3f78dbcceb45eb61cc5379e1 (patch) | |
tree | 5cc17919fb6c8c46a38008cb1b2beafc9b98ccfe /include | |
parent | 008db88c6569e1c8049ac0d53edc06e4089bcd47 (diff) |
Merged revisions 135799 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r135799 | murf | 2008-08-05 17:13:20 -0600 (Tue, 05 Aug 2008) | 34 lines
(closes issue #12982)
Reported by: bcnit
Tested by: murf
I discovered that also, in the previous bug fixes and changes,
the cdr.conf 'unanswered' option is not being obeyed, so
I fixed this.
And, yes, there are two 'answer' times involved in this
scenario, and I would agree with you, that the first
answer time is the time that should appear in the CDR.
(the second 'answer' time is the time that the bridge
was begun).
I made the necessary adjustments, recording the first
answer time into the peer cdr, and then using that to
override the bridge cdr's value.
To get the 'unanswered' CDRs to appear, I purposely
output them, using the dial cmd to mark them as
DIALED (with a new flag), and outputting them if
they bear that flag, and you are in the right mode.
I also corrected one small mention of the Zap device
to equally consider the dahdi device.
I heavily tested 10-sec-wait macros in dial, and
without the macro call; I tested hangups while the
macro was running vs. letting the macro complete
and the bridge form. Looks OK. Removed all the
instrumentation and debug.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@135821 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/cdr.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h index dc14f326e..7ece62379 100644 --- a/include/asterisk/cdr.h +++ b/include/asterisk/cdr.h @@ -37,7 +37,8 @@ #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) +#define AST_CDR_FLAG_POST_ENABLE (1 << 10) +#define AST_CDR_FLAG_DIALED (1 << 11) /*@} */ /*! \name CDR Flags - Disposition */ @@ -111,6 +112,7 @@ struct ast_cdr { struct ast_cdr *next; }; +int ast_cdr_isset_unanswered(void); void ast_cdr_getvar(struct ast_cdr *cdr, const char *name, char **ret, char *workspace, int workspacelen, int recur, int raw); int ast_cdr_setvar(struct ast_cdr *cdr, const char *name, const char *value, int recur); int ast_cdr_serialize_variables(struct ast_cdr *cdr, struct ast_str **buf, char delim, char sep, int recur); |