sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
310 discussions

git:master:38ae4433: drouting: remove unused trim function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 38ae44336e8478c10e1a558997669850c5d7b297 URL: https://github.com/kamailio/kamailio/commit/38ae44336e8478c10e1a55899766985… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:27:20+01:00 drouting: remove unused trim function --- Modified: src/modules/drouting/dr_time.c --- Diff: https://github.com/kamailio/kamailio/commit/38ae44336e8478c10e1a55899766985… Patch: https://github.com/kamailio/kamailio/commit/38ae44336e8478c10e1a55899766985… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 0988bccbb7..55d09a57ca 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -45,34 +45,6 @@ static inline int strz2int(char *_bp) } -static inline char *trim(char *_s) -{ - int len; - char *end; - - /* Null pointer, there is nothing to do */ - if(!_s) - return _s; - - /* Remove spaces and tabs from the beginning of string */ - while((*_s == ' ') || (*_s == '\t')) - _s++; - - len = strlen(_s); - - end = _s + len - 1; - - /* Remove trailing spaces and tabs */ - while((*end == ' ') || (*end == '\t')) - end--; - if(end != (_s + len - 1)) { - *(end + 1) = '\0'; - } - - return _s; -} - - /************************ imported from "ac_tm.c" ***************************/ /* #define USE_YWEEK_U // Sunday system

3 years, 1 month

[kamailio/kamailio] time: add support for time64 libc (PR #2894)

by micmac1

libcs are implementing changes to fix the year 2038 issue on 32 bit platforms (see [1]). musl libc already went ahead and implemented it, starting with musl-1.2.0 (see [2]). This commit adds a new definition to src/core/dprint.h: TIME_T_INT_FMT If __USE_TIME_BITS64 is defined (by a time64 libc, see [1]), it is set to the proper conversion for type int64_t, PRId64. If __USE_TIME_BITS64 is not defined, the status quo remains unchanged ("%ld" is used). Note: In some places kamailio uses "%li" instead of "%ld". But in the context of printf etc. there is no difference, so this commit replaces "%li" with "%ld". The new definition is used in the different parts of kamailio, where appropriate. These changes get rid of the new warnings that appeared with musl-1.2.0. Below an example warning: In file included from auth_identity.c:50: auth_identity.c: In function 'check_date': ../../core/dprint.h:316:73: warning: format '%ld' expects argument of type 'long int', but argument 11 has type 'time_t' {aka 'long long int'} [-Wformat=] 316 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../core/dprint.h:340:25: note: in expansion of macro 'LOG_FX' 340 | LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) | ^~~~~~ ../../core/dprint.h:346:25: note: in expansion of macro 'LOG_FL' 346 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:349:25: note: in expansion of macro 'LOG_FP' 349 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ auth_identity.c:594:17: note: in expansion of macro 'LOG' 594 | LOG(L_INFO, "AUTH_IDENTITY VERIFIER: Outdated date header value (%ld sec)\n", tnow - tmsg + glb_iauthval); | ^~~ [1] https://sourceware.org/glibc/wiki/Y2038ProofnessDesign [2] https://musl.libc.org/time64.html Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>   #### Pre-Submission Checklist    - [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) - [x] 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Hi all, This adds time64 libc support. Should be non-breaking, status quo remains. I hope you don't mind a made up a new patch category, "time". I did not run-test this (pretty busy right now). But the warnings go away. If absolutely run-testing is needed for this, let me know. Kind regards, Seb You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2894 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2894/commits/27175614787f6b05795f…">time: add support for time64 libc</a> -- File Changes -- M src/core/dprint.h (8) M src/modules/auth_identity/auth_identity.c (2) M src/modules/cdp/routing.c (4) M src/modules/db_redis/redis_dbase.c (2) M src/modules/ims_charging/ims_ro.c (2) M src/modules/ims_dialog/dlg_handlers.c (2) M src/modules/ims_icscf/scscf_list.c (4) M src/modules/ims_registrar_pcscf/notify.c (2) M src/modules/ims_registrar_pcscf/save.c (2) M src/modules/ims_registrar_scscf/registrar_notify.c (3) M src/modules/ims_registrar_scscf/save.c (2) M src/modules/ims_usrloc_scscf/impurecord.c (4) M src/modules/nat_traversal/nat_traversal.c (2) M src/modules/xhttp_pi/xhttp_pi_fnc.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2894.patch https://github.com/kamailio/kamailio/pull/2894.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2894

3 years, 1 month

git:master:a7bcf5bc: xhttp_pi: use TIME_T_FMT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a7bcf5bc2dafe797c0479d34df5e07d44d8dd438 URL: https://github.com/kamailio/kamailio/commit/a7bcf5bc2dafe797c0479d34df5e07d… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 xhttp_pi: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/xhttp_pi/xhttp_pi_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/a7bcf5bc2dafe797c0479d34df5e07d… Patch: https://github.com/kamailio/kamailio/commit/a7bcf5bc2dafe797c0479d34df5e07d… --- diff --git a/src/modules/xhttp_pi/xhttp_pi_fnc.c b/src/modules/xhttp_pi/xhttp_pi_fnc.c index 5610e319bb..a11b3f40a2 100644 --- a/src/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/src/modules/xhttp_pi/xhttp_pi_fnc.c @@ -3186,18 +3186,18 @@ int ph_run_pi_cmd(pi_ctx_t* ctx) val_str.len = max_page_len - ctx->reply.body.len; if(db_time2str(values[j].val.time_val, val_str.s, &val_str.len)!=0){ - LM_ERR("Unable to convert double [%ld]\n", - values[j].val.time_val); + LM_ERR("Unable to convert double [%" TIME_T_FMT "]\n", + TIME_T_CAST(values[j].val.time_val)); goto error; } p += val_str.len; ctx->reply.body.len += val_str.len; if(link_on) XHTTP_PI_COPY_2(p,XHTTP_PI_SQUOT_GT,val_str); LM_DBG(" got %.*s[%d]=>" - "[%ld][%.*s]\n", + "[%" TIME_T_FMT "][%.*s]\n", command->q_keys[j]->len, command->q_keys[j]->s, i, - values[j].val.time_val, + TIME_T_CAST(values[j].val.time_val), val_str.len, val_str.s); break; default:

3 years, 1 month

git:master:fe68c9ae: nat_traversal: use TIME_T_FMT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fe68c9aeb06f114afdc6c0b076b5163e34deeea5 URL: https://github.com/kamailio/kamailio/commit/fe68c9aeb06f114afdc6c0b076b5163… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 nat_traversal: use TIME_T_FMT The size of the time_t destination is unknown as it is depending on the platform. So we "read into a known-size integer (either int or long long) and then assign the value to a time_t as a second step" (quote from [1]). [1] https://stackoverflow.com/questions/4171478/how-to-read-data-into-a-time-t-… Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/fe68c9aeb06f114afdc6c0b076b5163… Patch: https://github.com/kamailio/kamailio/commit/fe68c9aeb06f114afdc6c0b076b5163… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index 4cfe8d4018..edaa6dfe3d 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1707,6 +1707,7 @@ static void restore_keepalive_state(void) unsigned h; str host; FILE *f; + long long ll_1, ll_2; if(!keepalive_state_file) return; @@ -1724,7 +1725,9 @@ static void restore_keepalive_state(void) res = fscanf(f, STATE_FILE_HEADER); // skip header while(true) { - res = fscanf(f, "%63s %63s %ld %ld", uri, socket, &rtime, &stime); + res = fscanf(f, "%63s %63s %" TIME_T_FMT " %" TIME_T_FMT, uri, socket, &ll_1, &ll_2); + rtime = ll_1; + stime = ll_2; if(res == EOF) { if(ferror(f)) LM_ERR("error while reading keepalive state file: %s\n",

3 years, 1 month

git:master:58b99201: ims_usrloc_scscf: use TIME_T_FMT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 58b992011044bb3547e3aea15eb6712947daae0f URL: https://github.com/kamailio/kamailio/commit/58b992011044bb3547e3aea15eb6712… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 ims_usrloc_scscf: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/58b992011044bb3547e3aea15eb6712… Patch: https://github.com/kamailio/kamailio/commit/58b992011044bb3547e3aea15eb6712… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index e0ad1f7ef9..a1cfd19833 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -244,7 +244,7 @@ void print_impurecord(FILE* _f, impurecord_t* _r) { header = 1; } fprintf(_f, "\t\twatcher uri: <%.*s> and presentity uri: <%.*s>\n", subscriber->watcher_uri.len, subscriber->watcher_uri.s, subscriber->presentity_uri.len, subscriber->presentity_uri.s); - fprintf(_f, "\t\tExpires: %ld\n", subscriber->expires); + fprintf(_f, "\t\tExpires: %" TIME_T_FMT "\n", TIME_T_CAST(subscriber->expires)); subscriber = subscriber->next; } @@ -405,8 +405,9 @@ static inline void process_impurecord(impurecord_t* _r) { hascontacts = 1; } } else { - LM_DBG("\t\tContact #%i - %.*s, Ref [%d] (expires in %ld seconds) (State: %d)\n", - k, ptr->c.len, ptr->c.s, ptr->ref_count, ptr->expires - act_time, ptr->state); + LM_DBG("\t\tContact #%i - %.*s, Ref [%d] (expires in %" TIME_T_FMT " seconds) (State: %d)\n", + k, ptr->c.len, ptr->c.s, ptr->ref_count, + TIME_T_CAST(ptr->expires - act_time), ptr->state); mustdeleteimpu = 0; hascontacts = 1; }

3 years, 1 month

git:master:eec965c1: ims_registrar_scscf: use TIME_T_FMT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: eec965c1eb561ab636fa385111f2f1a7885c438c URL: https://github.com/kamailio/kamailio/commit/eec965c1eb561ab636fa385111f2f1a… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 ims_registrar_scscf: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/eec965c1eb561ab636fa385111f2f1a… Patch: https://github.com/kamailio/kamailio/commit/eec965c1eb561ab636fa385111f2f1a… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index b2da75af19..761b014624 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -54,6 +54,7 @@ #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_content.h" #include "../../core/parser/parse_uri.h" +#include "../../core/dprint.h" /* TIME_T_FMT */ #include <libxml/parser.h> #include "../../lib/ims/useful_defs.h" @@ -1517,8 +1518,8 @@ void create_notifications(udomain_t* _t, impurecord_t* r_passed, ucontact_t* c_p subscription_state.len = 0; if (subscription_state.s) { - sprintf(subscription_state.s, "%.*s%ld", subs_active.len, - subs_active.s, s->expires - act_time); + sprintf(subscription_state.s, "%.*s%" TIME_T_FMT, subs_active.len, + subs_active.s, TIME_T_CAST(s->expires - act_time)); subscription_state.len = strlen(subscription_state.s); } diff --git a/src/modules/ims_registrar_scscf/save.c b/src/modules/ims_registrar_scscf/save.c index e625cb25e3..6c8127d289 100644 --- a/src/modules/ims_registrar_scscf/save.c +++ b/src/modules/ims_registrar_scscf/save.c @@ -547,7 +547,7 @@ static inline int update_contacts_helper(struct sip_msg* msg, impurecord_t* impu LM_DBG("Need to update contact: <%.*s>: " "q_value [%d]," "sos: [%d]," - "expires [%ld]\n", chi->uri.len, chi->uri.s, qvalue, sos, expires - time(NULL)); + "expires [%" TIME_T_FMT "]\n", chi->uri.len, chi->uri.s, qvalue, sos, TIME_T_CAST(expires - time(NULL))); LM_DBG("packing contact information\n"); if ((ci = pack_ci(msg, chi, expires, 0)) == 0) {

3 years, 1 month

git:master:5d17337a: ims_registrar_pcscf: use TIME_T_FMT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5d17337af532a03d3a36751c5d085dd542478e41 URL: https://github.com/kamailio/kamailio/commit/5d17337af532a03d3a36751c5d085dd… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 ims_registrar_pcscf: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ims_registrar_pcscf/notify.c Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/5d17337af532a03d3a36751c5d085dd… Patch: https://github.com/kamailio/kamailio/commit/5d17337af532a03d3a36751c5d085dd… --- diff --git a/src/modules/ims_registrar_pcscf/notify.c b/src/modules/ims_registrar_pcscf/notify.c index 83c7a5c377..d8830fd2d5 100644 --- a/src/modules/ims_registrar_pcscf/notify.c +++ b/src/modules/ims_registrar_pcscf/notify.c @@ -209,8 +209,8 @@ int process_contact(udomain_t * _d, int expires, str contact_uri, int contact_st /*TODO_LATEST - put this back */ } else {//state is active //update this contact - LM_DBG("This contact: <%.*s> is in state active and is in usrloc so just updating - old expires: %li, new expires: %i which is in %i seconds\n", contact_uri.len, contact_uri.s, - pcontact->expires, + LM_DBG("This contact: <%.*s> is in state active and is in usrloc so just updating - old expires: %" TIME_T_FMT ", new expires: %i which is in %i seconds\n", contact_uri.len, contact_uri.s, + TIME_T_CAST(pcontact->expires), expires, expires - local_time_now); if (ul.update_pcontact(_d, &ci, pcontact) != 0) { diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index 9432574005..b33a596cd2 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -223,8 +223,9 @@ static inline int update_contacts(struct sip_msg *req,struct sip_msg *rpl, udoma } //TODO_LATEST replace above } else { //update contact - LM_DBG("Updating contact: <%.*s>, old expires: %li, new expires: %i which is in %i seconds\n", c->uri.len, c->uri.s, - pcontact->expires-local_time_now, + LM_DBG("Updating contact: <%.*s>, old expires: %" TIME_T_FMT ", new expires: %i which is in %i seconds\n", + c->uri.len, c->uri.s, + TIME_T_CAST(pcontact->expires-local_time_now), expires, expires-local_time_now); ci.reg_state = PCONTACT_REGISTERED;

3 years, 1 month

git:master:e4b280ec: ims_icscf: use TIME_T_FMT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e4b280ec340135199e1c98e2e8b63042538c9aaa URL: https://github.com/kamailio/kamailio/commit/e4b280ec340135199e1c98e2e8b6304… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 ims_icscf: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ims_icscf/scscf_list.c --- Diff: https://github.com/kamailio/kamailio/commit/e4b280ec340135199e1c98e2e8b6304… Patch: https://github.com/kamailio/kamailio/commit/e4b280ec340135199e1c98e2e8b6304… --- diff --git a/src/modules/ims_icscf/scscf_list.c b/src/modules/ims_icscf/scscf_list.c index fae8dc3201..1bb7cb5f8c 100644 --- a/src/modules/ims_icscf/scscf_list.c +++ b/src/modules/ims_icscf/scscf_list.c @@ -586,15 +586,16 @@ void ims_icscf_timer_routine() { sl = l->list; while (sl) { - LM_DBG("INF: Score:[%4d] Start_time [%ld] S-CSCF: <%.*s> \n", + LM_DBG("INF: Score:[%4d] Start_time [%" TIME_T_FMT "] S-CSCF: <%.*s> \n", sl->score, - sl->start_time, + TIME_T_CAST(sl->start_time), sl->scscf_name.len, sl->scscf_name.s); time_t now = time(0); time_t time_elapsed = now - sl->start_time; if (time_elapsed > scscf_entry_expiry) { - LM_DBG("Scscf entry expired: Time now %ld Start time %ld - elapsed %ld\n", now, sl->start_time, time_elapsed); + LM_DBG("Scscf entry expired: Time now %" TIME_T_FMT " Start time %" TIME_T_FMT " - elapsed %" TIME_T_FMT "\n", + TIME_T_CAST(now), TIME_T_CAST(sl->start_time), TIME_T_CAST(time_elapsed)); delete_list = 1; //if any of the entries in this list have expired remove the whole list! }

3 years, 1 month

git:master:ee039a91: ims_dialog: use TIME_T_FMT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ee039a91dd41a5780105305f6b787e95297da1d0 URL: https://github.com/kamailio/kamailio/commit/ee039a91dd41a5780105305f6b787e9… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 ims_dialog: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ims_dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/ee039a91dd41a5780105305f6b787e9… Patch: https://github.com/kamailio/kamailio/commit/ee039a91dd41a5780105305f6b787e9… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index 3d8dee7ff3..55f523b9a2 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -1867,7 +1867,7 @@ void internal_print_all_dlg(struct dlg_cell *dlg) { LM_DBG("----------------------------"); LM_DBG("Dialog h_entry:h_id = [%u : %u]\n", dlg->h_entry, dlg->h_id); - LM_DBG("Dialog age: %ld\n", act_time - dlg->init_ts); + LM_DBG("Dialog age: %" TIME_T_FMT "\n", TIME_T_CAST(act_time - dlg->init_ts)); LM_DBG("Dialog call-id: %.*s\n", dlg->callid.len, dlg->callid.s); LM_DBG("Dialog state: %d\n", dlg->state); LM_DBG("Dialog ref counter: %d\n", dlg->ref);

3 years, 1 month

git:master:71d92b26: ims_charging: use TIME_T_FMT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 71d92b26105a4e88f4fba3986a0ba306e89adc4f URL: https://github.com/kamailio/kamailio/commit/71d92b26105a4e88f4fba3986a0ba30… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 ims_charging: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/71d92b26105a4e88f4fba3986a0ba30… Patch: https://github.com/kamailio/kamailio/commit/71d92b26105a4e88f4fba3986a0ba30… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 0a8c53f9d9..d93d565a65 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -858,7 +858,8 @@ void send_ccr_stop_with_param(struct ro_session *ro_session, unsigned int code, LM_DBG("Final used number of seconds for session is %ld\n", used); } - LM_DBG("Call started at %ld and ended at %ld and lasted %d seconds and so far we have billed for %ld seconds\n", ro_session->start_time, stop_time, + LM_DBG("Call started at %" TIME_T_FMT " and ended at %" TIME_T_FMT " and lasted %d seconds and so far we have billed for %ld seconds\n", + TIME_T_CAST(ro_session->start_time), TIME_T_CAST(stop_time), actual_time_seconds, ro_session->billed + used); if (ro_session->billed + used < actual_time_seconds) { LM_DBG("Making adjustment by adding %ld seconds\n", actual_time_seconds - (ro_session->billed + used));

3 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2021