From 6258bbe7bd1885ac5dec095ed0c4490c83a99f44 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Mon, 17 Jun 2013 03:00:38 +0000 Subject: Update Asterisk's CDRs for the new bridging framework This patch is the initial push to update Asterisk's CDR engine for the new bridging framework. This patch guts the existing CDR engine and builds the new on top of messages coming across Stasis. As changes in channel state and bridge state are detected, CDRs are built and dispatched accordingly. This fundamentally changes CDRs in a few ways. (1) CDRs are now *very* reflective of the actual state of channels and bridges. This means CDRs track well with what an actual channel is doing - which is useful in transfer scenarios (which were previously difficult to pin down). It does, however, mean that CDRs cannot be 'fooled'. Previous behavior in Asterisk allowed for CDR applications, channels, and other properties to be spoofed in parts of the code - this no longer works. (2) CDRs have defined behavior in multi-party scenarios. This behavior will not be what everyone wants, but it is a defined behavior and as such, it is predictable. (3) The CDR manipulation functions and applications have been overhauled. Major changes have been made to ResetCDR and ForkCDR in particular. Many of the options for these two applications no longer made any sense with the new framework and the (slightly) more immutable nature of CDRs. There are a plethora of other changes. For a full description of CDR behavior, see the CDR specification on the Asterisk wiki. (closes issue ASTERISK-21196) Review: https://reviewboard.asterisk.org/r/2486/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@391947 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- cdr/cdr_adaptive_odbc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cdr/cdr_adaptive_odbc.c') diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c index 4bf3602cb..a590fb32a 100644 --- a/cdr/cdr_adaptive_odbc.c +++ b/cdr/cdr_adaptive_odbc.c @@ -433,7 +433,7 @@ static int odbc_log(struct ast_cdr *cdr) ast_strftime(colbuf, sizeof(colbuf), "%Y-%m-%d %H:%M:%S", &tm); colptr = colbuf; } else { - ast_cdr_getvar(cdr, entry->cdrname, &colptr, colbuf, sizeof(colbuf), 0, datefield ? 0 : 1); + ast_cdr_format_var(cdr, entry->cdrname, &colptr, colbuf, sizeof(colbuf), datefield ? 0 : 1); } if (colptr) { @@ -472,9 +472,9 @@ static int odbc_log(struct ast_cdr *cdr) * form (but only when we're dealing with a character-based field). */ if (strcasecmp(entry->name, "disposition") == 0) { - ast_cdr_getvar(cdr, entry->name, &colptr, colbuf, sizeof(colbuf), 0, 0); + ast_cdr_format_var(cdr, entry->name, &colptr, colbuf, sizeof(colbuf), 0); } else if (strcasecmp(entry->name, "amaflags") == 0) { - ast_cdr_getvar(cdr, entry->name, &colptr, colbuf, sizeof(colbuf), 0, 0); + ast_cdr_format_var(cdr, entry->name, &colptr, colbuf, sizeof(colbuf), 0); } /* Truncate too-long fields */ -- cgit v1.2.3