diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-09-19 06:35:03 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-09-19 06:35:03 -0500 |
| commit | 05bb57c56fccc2b742efb6cb0ae2cacb7c13f5e8 (patch) | |
| tree | 70ad6b48ce94a2e88972e5b03c77a50c1011cb3e | |
| parent | 393d8137894a5ef3b1587372557ae3512ed4311b (diff) | |
| parent | 3e445c20d852bae136c1b745d45282990912a370 (diff) | |
Merge "cdr_mysql.c: Apply cdrzone to start and answer" into 14
| -rw-r--r-- | addons/cdr_mysql.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c index 26e8389a1..667e6a2bf 100644 --- a/addons/cdr_mysql.c +++ b/addons/cdr_mysql.c @@ -260,9 +260,7 @@ db_reconnect: /* Need the type and value to determine if we want the raw value or not */ if (entry->staticvalue) { value = ast_strdupa(entry->staticvalue); - } else if ((!strcmp(cdrname, "answer") || - !strcmp(cdrname, "end") || - !strcmp(cdrname, "disposition") || + } else if ((!strcmp(cdrname, "disposition") || !strcmp(cdrname, "amaflags")) && (strstr(entry->type, "int") || strstr(entry->type, "dec") || @@ -272,7 +270,8 @@ db_reconnect: strstr(entry->type, "numeric") || strstr(entry->type, "fixed"))) { ast_cdr_format_var(cdr, cdrname, &value, workspace, sizeof(workspace), 1); - } else if (!strcmp(cdrname, "start")) { + } else if (!strcmp(cdrname, "start") || !strcmp(cdrname, "answer") || + !strcmp(cdrname, "end")) { struct ast_tm tm; char timestr[128]; ast_localtime(&cdr->start, &tm, ast_str_strlen(cdrzone) ? ast_str_buffer(cdrzone) : NULL); @@ -366,7 +365,7 @@ static void free_strings(void) } static int my_unload_module(int reload) -{ +{ struct column *entry; ast_cli_unregister_multiple(cdr_mysql_status_cli, sizeof(cdr_mysql_status_cli) / sizeof(struct ast_cli_entry)); |