kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "cdr/cdr_csv.c: Add a new option to enable columns added in Asterisk 1.8"

Browse Source
This commit is contained in:
Joshua Colp
2015-05-03 11:37:36 -05:00
committed by Gerrit Code Review
parent 25b67ed6ca 8886b724ae
commit ddf9dcaad7
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@@ -40,6 +40,12 @@ cdr_odbc
* Added a new configuration option, "newcdrcolumns", which enables use of the * Added a new configuration option, "newcdrcolumns", which enables use of the
post-1.8 CDR columns 'peeraccount', 'linkedid', and 'sequence'. post-1.8 CDR columns 'peeraccount', 'linkedid', and 'sequence'.
------------------
cdr_csv
------------------
* Added a new configuration option, "newcdrcolumns", which enables use of the
post-1.8 CDR columns 'peeraccount', 'linkedid', and 'sequence'.
Channel Drivers Channel Drivers
------------------ ------------------

10
cdr/cdr_csv.c
View File

@@ -58,6 +58,7 @@ static int accountlogs = 1;
static int loguniqueid = 0; static int loguniqueid = 0;
static int loguserfield = 0; static int loguserfield = 0;
static int loaded = 0; static int loaded = 0;
static int newcdrcolumns = 0;
static const char config[] = "cdr.conf"; static const char config[] = "cdr.conf";
/* #define CSV_LOGUNIQUEID 1 */ /* #define CSV_LOGUNIQUEID 1 */
@@ -113,6 +114,7 @@ static int load_config(int reload)
usegmtime = 0; usegmtime = 0;
loguniqueid = 0; loguniqueid = 0;
loguserfield = 0; loguserfield = 0;
newcdrcolumns = 0;
if (!(v = ast_variable_browse(cfg, "csv"))) { if (!(v = ast_variable_browse(cfg, "csv"))) {
ast_config_destroy(cfg); ast_config_destroy(cfg);
@@ -129,7 +131,10 @@ static int load_config(int reload)
loguniqueid = ast_true(v->value); loguniqueid = ast_true(v->value);
} else if (!strcasecmp(v->name, "loguserfield")) { } else if (!strcasecmp(v->name, "loguserfield")) {
loguserfield = ast_true(v->value); loguserfield = ast_true(v->value);
} else if (!strcasecmp(v->name, "newcdrcolumns")) {
newcdrcolumns = ast_true(v->value);
} }
} }
ast_config_destroy(cfg); ast_config_destroy(cfg);
return 1; return 1;
@@ -241,6 +246,11 @@ static int build_csv_record(char *buf, size_t bufsize, struct ast_cdr *cdr)
/* append the user field */ /* append the user field */
if(loguserfield) if(loguserfield)
append_string(buf, cdr->userfield, bufsize); 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 we hit the end of our buffer, log an error */
if (strlen(buf) < bufsize - 5) { if (strlen(buf) < bufsize - 5) {
/* Trim off trailing comma */ /* Trim off trailing comma */

2
configs/samples/cdr.conf.sample
View File

@@ -154,6 +154,8 @@ usegmtime=yes ; log date/time in GMT. Default is "no"
loguniqueid=yes ; log uniqueid. Default is "no" loguniqueid=yes ; log uniqueid. Default is "no"
loguserfield=yes ; log user field. Default is "no" loguserfield=yes ; log user field. Default is "no"
accountlogs=yes ; create separate log file for each account code. Default is "yes" 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] ;[radius]
;usegmtime=yes ; log date/time in GMT ;usegmtime=yes ; log date/time in GMT