<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1358
#### Description <!-- Describe your changes in detail --> acc.time_mode modparam allows storing acc transactions time field using the output of gmtime() when it is set to 4.
This commit aims to reuse this modparam for cdr entries (start_time, end_time). This way, if time_mode is 4, both acc and cdr entries will be stored in gmtime. You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1368
-- Commit Summary --
* acc: use acc.time_mode to save cdrs in gmtime * doc: time_mode param used for cdrs too
-- File Changes --
M src/modules/acc/acc_cdr.c (18) M src/modules/acc/doc/acc_admin.xml (4)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1368.patch https://github.com/kamailio/kamailio/pull/1368.diff
miconda commented on this pull request.
VAL_NULL(db_cdr_vals+i)=0;
if(string2time(&cdr_value_array[i], &timeval_val) < 0) { LM_ERR("failed to convert string to timeval.\n"); goto error; } - VAL_TIME(db_cdr_vals+i) = timeval_val.tv_sec; + if (acc_time_mode==4) { + VAL_TYPE(db_cdr_vals+i)=DB1_STR; + t = gmtime(&timeval_val.tv_sec); + /* Convert time_t structure to format accepted by the database */ + if (strftime(cdr_time_format_buf[i], TIME_STR_BUFFER_SIZE, TIME_STRING_FORMAT, t) <= 0) { + cdr_time_format_buf[i][0] = '\0'; + } + + VAL_STR(db_cdr_vals+i) = (str){cdr_time_format_buf[i], TIME_STR_BUFFER_SIZE-1};
Is this cast compliant with strict C standard? Kamailio is used on some old/embedded systems with more strict compilers.
Otherwise, I think this should just be a DB1_STRING data type, because the buffer is zero-terminated.
cruzccl commented on this pull request.
VAL_NULL(db_cdr_vals+i)=0;
if(string2time(&cdr_value_array[i], &timeval_val) < 0) { LM_ERR("failed to convert string to timeval.\n"); goto error; } - VAL_TIME(db_cdr_vals+i) = timeval_val.tv_sec; + if (acc_time_mode==4) { + VAL_TYPE(db_cdr_vals+i)=DB1_STR; + t = gmtime(&timeval_val.tv_sec); + /* Convert time_t structure to format accepted by the database */ + if (strftime(cdr_time_format_buf[i], TIME_STR_BUFFER_SIZE, TIME_STRING_FORMAT, t) <= 0) { + cdr_time_format_buf[i][0] = '\0'; + } + + VAL_STR(db_cdr_vals+i) = (str){cdr_time_format_buf[i], TIME_STR_BUFFER_SIZE-1};
I am not sure if it's compliant, but I am sure that the way you propose is more legible and clean.
I have already changed it.
Thanks!
Merged #1368.
-
Carlos Cruz Luengo -
Daniel-Constantin Mierla