diff --git a/UPGRADE.txt b/UPGRADE.txt index b0e89ee403bbb23cf0ee9cf8a0e088b087b05813..cf8a1aa9ce8fb7aa5bf3637003d202b173335476 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -56,6 +56,10 @@ cdr_odbc: 'sequence'. Support for the new columns can be enabled via the newcdrcolumns option in cdr_odbc.conf. +cdr_csv: + - Added a new configuration option, "newcdrcolumns", which enables use of the + post-1.8 CDR columns 'peeraccount', 'linkedid', and 'sequence'. + from 11.16 to 11.17 chan_dahdi: - For users using the FXO port (FXS signaling) distinctive ring detection diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c index b629290ebe444d1fb83d6ddc3465800eb94a94df..df7a5fe9be64adafef6ad128bd1111b2fa602c79 100644 --- a/cdr/cdr_csv.c +++ b/cdr/cdr_csv.c @@ -54,6 +54,7 @@ static int accountlogs = 1; static int loguniqueid = 0; static int loguserfield = 0; static int loaded = 0; +static int newcdrcolumns = 0; static const char config[] = "cdr.conf"; /* #define CSV_LOGUNIQUEID 1 */ @@ -109,6 +110,7 @@ static int load_config(int reload) usegmtime = 0; loguniqueid = 0; loguserfield = 0; + newcdrcolumns = 0; if (!(v = ast_variable_browse(cfg, "csv"))) { ast_config_destroy(cfg); @@ -125,7 +127,10 @@ static int load_config(int reload) loguniqueid = ast_true(v->value); } else if (!strcasecmp(v->name, "loguserfield")) { loguserfield = ast_true(v->value); + } else if (!strcasecmp(v->name, "newcdrcolumns")) { + newcdrcolumns = ast_true(v->value); } + } ast_config_destroy(cfg); return 1; @@ -237,6 +242,11 @@ static int build_csv_record(char *buf, size_t bufsize, struct ast_cdr *cdr) /* append the user field */ if(loguserfield) append_string(buf, cdr->userfield,bufsize); + if (newcdrcolumns) { + append_string(buf, cdr->peeraccount, bufsize); + append_string(buf, cdr->linkedid, bufsize); + append_int(buf, cdr->sequence, bufsize); + } /* If we hit the end of our buffer, log an error */ if (strlen(buf) < bufsize - 5) { /* Trim off trailing comma */ diff --git a/configs/cdr.conf.sample b/configs/cdr.conf.sample index 458e19ab425a5ca85907387ea7512914d717b021..c1c00f73b19b27e9e25ebb7924bff34ed2f9f952 100644 --- a/configs/cdr.conf.sample +++ b/configs/cdr.conf.sample @@ -161,6 +161,8 @@ usegmtime=yes ; log date/time in GMT. Default is "no" loguniqueid=yes ; log uniqueid. Default is "no" loguserfield=yes ; log user field. Default is "no" accountlogs=yes ; create separate log file for each account code. Default is "yes" +;newcdrcolumns=yes ; Enable logging of post-1.8 CDR columns (peeraccount, linkedid, sequence). + ; Default is "no". ;[radius] ;usegmtime=yes ; log date/time in GMT