- sr-dev - kamailio.org

[kamailio/kamailio] ims_usrloc_pcscf: new callbacks and some fixes (#2882)
by Erhan Onur Sendag 05 Nov '21

05 Nov '21

### Description  Other modules use ims_usrloc_pcscf's callback calls for following operations: #define PCSCF_CONTACT_INSERT (1<<0) #define PCSCF_CONTACT_UPDATE (1<<1) #define PCSCF_CONTACT_DELETE (1<<2) #define PCSCF_CONTACT_EXPIRE (1<<3) ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/issues/2882 [View Less]

2 2

[kamailio/kamailio] Topos not working correctly with loos_route() on a leg (Issue #2905)
by Anis Bedhiafi 05 Nov '21

05 Nov '21

### Description I noticed an issue regarding loose_route() when using Topos module. My architecture is the following: ``` Client (behind NAT or not) ------> Kamailio (Access SBC) -----------> Kamailio (Interconnect SBC) -----------> Carrier ``` Kamailio Access SBC is listening on 2 interfaces: ``` Public interface : udp:A.A.A.A:5060 Core interface : udp:B.B.B.B:5060 ``` Kamailio Interconnect SBC is listening on 2 interfaces: ``` Core interface : udp:C.C.C.C:5060 … [View More]Carrier-side interface : udp:D.D.D.D:5060 ``` TOPOS is configured only on second kamailio box (Interconnect SBC). Record routing is used on both kamailios. TOPOS module is configured as follows: ``` modparam("ndb_redis", "server", "name=srv1;addr=127.0.0.1;port=6379") modparam("topos_redis", "serverid", "srv1") modparam("topos", "storage", "redis") modparam("topos", "contact_mode", 1) modparam("topos", "cparam_name", "id") modparam("topos", "rr_update", 1) ``` RR module is configured as follows: ``` modparam("rr", "enable_full_lr", 1) modparam("rr", "append_fromtag", 1) modparam("rr", "enable_double_rr", 1) ``` For an incomoing INVITE (direction: client to carrier) all is fine and topos can strip headers on bleg and insert the cookie on bleg contact as a param. When Callee sends a BYE or re-INVITE, topos inserts route headers in aleg as shown in the next trace: (BYE as received from the carrier on the carrier-side interface D.D.D.D) ``` BYE sip:D.D.D.D:5060 SIP/2.0 Via: SIP/2.0/UDP x.x.x.x:5060;branch=z9hG4bKrdhsvc001omkvssqvfk0sd0185mt1.1 From: <sip:+33123456789@my-carrier-domain;transport=UDP;user=phone>;tag=SD69ao497-1472568650-1635329820043 To: <sip:+33987654321@my-own-domain;transport=UDP;user=phone>;tag=3ab10616 Call-ID: NjZjMDgyMGMxNzdkN2FhYmJlYzQyYjA5YWIzZThmZmI. CSeq: 547381883 BYE Max-Forwards: 64 Content-Length: 0 Route: <sip:D.D.D.D;r2=on;lr=on;ftag=3ab10616>,<sip:C.C.C.C;r2=on;lr=on;ftag=3ab10616> Route: <sip:B.B.B.B;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2>,<sip:A.A.A.A;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2> P-SR-XUID: atpsh-617925e5-82a5-1 ``` Topos on the kamailio interconnect handles the BYE/re-INVITE and forward it to the second interface C.C.C.C as shown in the following trace: ``` BYE sip:A.A.A.A;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2 SIP/2.0 Via: SIP/2.0/UDP 185.164.213.110;branch=z9hG4bKbd7.ab692eeb60369aa3a5e07f6b63cc9dd7.0 From: <sip:+33123456789@my-carrier-domain;transport=UDP;user=phone>;tag=SD69ao497-1472568650-1635329820043 To: <sip:+33987654321@my-own-domain;transport=UDP;user=phone>;tag=3ab10616 Call-ID: NjZjMDgyMGMxNzdkN2FhYmJlYzQyYjA5YWIzZThmZmI. CSeq: 547381883 BYE Max-Forwards: 63 Content-Length: 0 Route: <sip:C.C.C.C;r2=on;lr=on;ftag=3ab10616> Route: <sip:B.B.B.B;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2> Contact: <sip:+33123456789@10.3.60.45;id=atpsh-617925e5-82a5-1> ``` When the BYE/re-INVITE request reaches the C.C.C.C interface, it is then forwarded directly to the ruri sip:A.A.A.A. Or what I expect to receive in C.C.C.C interface is the following : ``` BYE <HERE SHOULD BE THE CALLER CONTACT URI> SIP/2.0 Via: SIP/2.0/UDP 80.10.231.173:5060;branch=z9hG4bKrdhsvc001omkvssqvfk0sd0185mt1.1 From: <sip:+33123456789@my-carrier-domain;transport=UDP;user=phone>;tag=SD69ao497-1472568650-1635329820043 To: <sip:+33987654321@my-own-domain;transport=UDP;user=phone>;tag=3ab10616 Call-ID: NjZjMDgyMGMxNzdkN2FhYmJlYzQyYjA5YWIzZThmZmI. CSeq: 547381883 BYE Max-Forwards: 64 Content-Length: 0 Route: <sip:D.D.D.D;r2=on;lr=on;ftag=3ab10616> Route: <sip:C.C.C.C;r2=on;lr=on;ftag=3ab10616> Route: <sip:B.B.B.B;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2> Route: <sip:A.A.A.A;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2> Contact: <sip:+33123456789@10.3.60.45;id=atpsh-617925e5-82a5-1> ``` I could work around this issue by doing the following : 1. When receiving the BYE/re-INVITE on interface D.D.D.D, I explode the Route headers, delete old route headers and create new ones in order from the result of explode 2. I update the ru with the contact uri which I stored in a htable when the initial INVITE was received ``` # Manage outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); # TOPOS FIX if (is_method("INVITE")) { $sht(tpsindlg=>$ci) = $ci; $sht(tpsindlg=>$ci:ft) = $ft; $sht(tpsindlg=>$ci:ct) = $ct; } } route[WITHINDLG] { if (!has_totag()) return; # Fix bad Route Headers caused by TOPOS module if ($Ri == "D.D.D.D") { $var(rh0) = $(hdr(Route)[0]{s.select,0,,}); $var(rh1) = $(hdr(Route)[0]{s.select,1,,}); $var(rh2) = $(hdr(Route)[1]{s.select,0,,}); $var(rh3) = $(hdr(Route)[1]{s.select,1,,}); remove_hf_re("^Route$"); append_hf("Route: $var(rh0)\r\n"); append_hf("Route: $var(rh1)\r\n"); append_hf("Route: $var(rh2)\r\n"); append_hf("Route: $var(rh3)\r\n"); } # sequential request within a dialog should # take the path determined by record-routing if (loose_route()) { # Fix R-URI caused by TOPOS module if ($Ri == "D.D.D.D") { if ($ci == $sht(tpsindlg=>$ci) && $tt == $sht(tpsindlg=>$ci:ft)) { $ru = $(sht(tpsindlg=>$ci:ct){s.strip,1}{s.striptail,1}); if (is_method("BYE")) { $sht(tpsindlg=>$ci) = $null; $sht(tpsindlg=>$ci:ft) = $null; $sht(tpsindlg=>$ci:ct) = $null; } } } route(RELAY); exit; } if (is_method("ACK")) { if ( t_check_trans() ) { # no loose-route, but stateful ACK; # must be an ACK after a 487 # or e.g. 404 from upstream server route(RELAY); exit; } else { # ACK without matching transaction ... ignore and discard exit; } } sl_send_reply("404","Not here"); exit; } ``` Could you please tell if this is a normal behavior by TOPOS module or is it a bug? Thank you. -- 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/issues/2905 [View Less]

2 2

[kamailio/kamailio] runtime error: null pointer passed as argument 2, which is declared to never be null (Issue #2913)
by sergey-safarov 05 Nov '21

05 Nov '21

### Description I have compiled Kamailio with google ASAN module and faced issue where the string PV with NULL value cannot be copied. Using GDB I found this function call triggers error when Google ASAN is used, `value->s.s = NULL`, `value->s.len = 0` ``` memcpy(var->v.value.s.s, value->s.s, value->s.len); ``` [Link](https://github.com/kamailio/kamailio/blob/caccb13e29ee12166c8101efa0d… This happens only when ASAN is used. Without ASAN same function call with the same values … [View More]

2 6

git:master:6857234c: core: reorder fields of struct _cfg_group for better alignment
by Daniel-Constantin Mierla 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: 6857234c321faf33573e1a034ab666dc158eb549 URL: https://github.com/kamailio/kamailio/commit/6857234c321faf33573e1a034ab666d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-04T17:15:49+01:00 core: reorder fields of struct _cfg_group for better alignment --- Modified: src/core/cfg/cfg_struct.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] mqueue: add two new module parameters (#2825)
by Stefan Mititelu 04 Nov '21

04 Nov '21

Add mqueue_name and mqueue_size to define queues. Updated doc.   #### 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 - [ ] 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:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add 2 new mqueue module parameters to simplify config queue definition. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2825 -- Commit Summary -- * mqueue: add two new module parameters -- File Changes -- M src/modules/mqueue/doc/mqueue_admin.xml (58) M src/modules/mqueue/mqueue_mod.c (38) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2825.patch https://github.com/kamailio/kamailio/pull/2825.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/2825 [View Less]

3 5

Re: [sr-dev] [kamailio/kamailio] nats: Add publish function (e736af9)
by Olle E. Johansson 04 Nov '21

04 Nov '21

Nice! Missing docs update. :-) Thank you - will try this out. -- 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/commit/e736af98038663cbbb2abf0a3c16c42…

1 0

git:master:2c68066d: pkg/kamailio/deb: version set 5.6.0~dev2
by Victor Seva 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: 2c68066dc8aa5f75de79cad1f4bea973db18bed7 URL: https://github.com/kamailio/kamailio/commit/2c68066dc8aa5f75de79cad1f4bea97… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-04T11:31:41+01:00 pkg/kamailio/deb: version set 5.6.0~dev2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/… [View More]

1 0

git:master:a48e1a9b: pua_dialoginfo: fix memory corruption
by Victor Seva 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: a48e1a9baf16752c49f7de68700659b947e9f3d8 URL: https://github.com/kamailio/kamailio/commit/a48e1a9baf16752c49f7de68700659b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-04T11:07:49+01:00 pua_dialoginfo: fix memory corruption * don't use SRUID_SIZE, just reserve the proper generated size * call sruid_init() at child_init too --- Modified: src/modules/… [View More]pua_dialoginfo/dialog_publish.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/a48e1a9baf16752c49f7de68700659b… Patch: https://github.com/kamailio/kamailio/commit/a48e1a9baf16752c49f7de68700659b… --- diff --git a/src/modules/pua_dialoginfo/dialog_publish.c b/src/modules/pua_dialoginfo/dialog_publish.c index 7f2751ffca..137823c21b 100644 --- a/src/modules/pua_dialoginfo/dialog_publish.c +++ b/src/modules/pua_dialoginfo/dialog_publish.c @@ -363,7 +363,7 @@ void dialog_publish(char *state, str* ruri, str *entity, str *peer, str *callid, } publ->id.s= (char*)publ+ size; memcpy(publ->id.s, "DIALOG_PUBLISH.", 15); - memcpy(publ->id.s+15, uuid->s, callid->len); + memcpy(publ->id.s+15, uuid->s, uuid->len); publ->id.len= 15+ uuid->len; size+= publ->id.len; diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 9af25b4b1d..0385ed90dd 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -108,7 +108,7 @@ send_publish_t pua_send_publish; /** module functions */ static int mod_init(void); - +static int child_init(int rank); static cmd_export_t cmds[]={ {0, 0, 0, 0, 0, 0} @@ -146,7 +146,7 @@ struct module_exports exports= { 0, /* exported pseudo-variables */ 0, /* response handling function */ mod_init, /* module initialization function */ - 0, /* per-child init function */ + child_init, /* per-child init function */ 0 /* module destroy function */ }; @@ -490,6 +490,13 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable int len; str* s=NULL; + // generate new random uuid + if(sruid_next_safe(&_puadi_sruid) < 0) { + return NULL; + } + LM_DBG("uuid generated: '%.*s'\n", + _puadi_sruid.uid.len, _puadi_sruid.uid.s); + /* create dlginfo structure to store important data inside the module*/ len = sizeof(struct dlginfo_cell) + dlg->from_uri.len @@ -498,7 +505,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable + dlg->tag[0].len + dlg->req_uri.len + dlg->contact[0].len - + SRUID_SIZE; + + _puadi_sruid.uid.len; dlginfo = (struct dlginfo_cell*)shm_malloc( len ); if (dlginfo==0) { @@ -524,7 +531,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable dlginfo->from_contact.s = dlginfo->req_uri.s + dlginfo->req_uri.len; dlginfo->from_contact.len = dlg->contact[0].len; dlginfo->uuid.s = dlginfo->from_contact.s + dlginfo->from_contact.len; - dlginfo->uuid.len = SRUID_SIZE; + dlginfo->uuid.len = _puadi_sruid.uid.len; memcpy(dlginfo->from_uri.s, dlg->from_uri.s, dlg->from_uri.len); memcpy(dlginfo->to_uri.s, dlg->to_uri.s, dlg->to_uri.len); @@ -532,13 +539,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable memcpy(dlginfo->from_tag.s, dlg->tag[0].s, dlg->tag[0].len); memcpy(dlginfo->req_uri.s, dlg->req_uri.s, dlg->req_uri.len); memcpy(dlginfo->from_contact.s, dlg->contact[0].s, dlg->contact[0].len); - - // generate new random uuid - sruid_next_safe(&_puadi_sruid); - strcpy(dlginfo->uuid.s, _puadi_sruid.uid.s); - dlginfo->uuid.len = _puadi_sruid.uid.len; - LM_DBG("uuid generated: '%.*s'\n", - dlginfo->uuid.len, dlginfo->uuid.s); + memcpy(dlginfo->uuid.s, _puadi_sruid.uid.s, _puadi_sruid.uid.len); if (use_pubruri_avps) { if(type==DLGCB_CREATED) { @@ -858,6 +859,22 @@ static int mod_init(void) return 0; } +/** + * @brief Initialize module children + */ +static int child_init(int rank) +{ + if(sruid_init(&_puadi_sruid, (char)'-', "padi", SRUID_INC)<0) { + return -1; + } + + if(rank != PROC_MAIN) { + return 0; + } + + return 0; +} + void free_dlginfo_cell(void *param) { struct dlginfo_cell *cell = NULL; [View Less]

1 0

git:master:6eb67eaa: pv: handle case when var value ha flag str but null pointer
by Daniel-Constantin Mierla 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: 6eb67eaa4fc27d1eb7da7b2b674ffe8e7f86ecbc URL: https://github.com/kamailio/kamailio/commit/6eb67eaa4fc27d1eb7da7b2b674ffe8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-04T08:24:06+01:00 pv: handle case when var value ha flag str but null pointer --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:fc3010cc: Makefile.defs: version set to 5.6.0-dev2
by Daniel-Constantin Mierla 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: fc3010cc2643d5398db12d92707d849cdc1d7d78 URL: https://github.com/kamailio/kamailio/commit/fc3010cc2643d5398db12d92707d849… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-04T08:06:31+01:00 Makefile.defs: version set to 5.6.0-dev2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/fc3010cc2643d5398db12d92707d849… Patch: … [View More]

1 0

git:master:b1e0d418: Merge pull request #2891 from smititelu/increase_defines
by GitHub 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: b1e0d41875f224da5bd5c511cbafd0f5e395d0b6 URL: https://github.com/kamailio/kamailio/commit/b1e0d41875f224da5bd5c511cbafd0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-03T12:59:34+01:00 Merge pull request #2891 from smititelu/increase_defines acc: increase extra and cdr variables --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc.h Modified: src/modules/acc/… [View More]

2 1

git:master:38ae4433: drouting: remove unused trim function
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

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… … [View More]

1 0

[kamailio/kamailio] time: add support for time64 libc (PR #2894)
by micmac1 03 Nov '21

03 Nov '21

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 … [View More]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 [View Less]

3 9

git:master:a7bcf5bc: xhttp_pi: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

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/… [View More]

1 0

git:master:fe68c9ae: nat_traversal: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

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 … [View More]

1 0

git:master:eec965c1: ims_registrar_scscf: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

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/… [View More]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) { [View Less]

1 0

git:master:58b99201: ims_usrloc_scscf: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

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.… [View More]

1 0

git:master:e4b280ec: ims_icscf: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

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/… [View More]

1 0

git:master:5d17337a: ims_registrar_pcscf: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

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/… [View More]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; [View Less]

1 0

git:master:71d92b26: ims_charging: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

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/… [View More]

1 0

git:master:ee039a91: ims_dialog: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

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/… [View More]

1 0

git:master:db16bd05: cdp: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: db16bd057342cb043b07913f89918fa09ff8632a URL: https://github.com/kamailio/kamailio/commit/db16bd057342cb043b07913f89918fa… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 cdp: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/cdp/routing.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:e006a5b9: db_redis: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: e006a5b9ad0f47bfbc280de3b381d5b2dce6a4ce URL: https://github.com/kamailio/kamailio/commit/e006a5b9ad0f47bfbc280de3b381d5b… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 db_redis: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/… [View More]

1 0

git:master:bfe95c90: core: add support for time64 libcs
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: bfe95c90e91a0bc33a769967a5841a4ab43a6553 URL: https://github.com/kamailio/kamailio/commit/bfe95c90e91a0bc33a769967a5841a4… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 core: add support for time64 libcs 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 … [View More]with musl-1.2.0 (see [2]). This commit adds the groundwork for always using the "lld" format when dealing with time_t and casting the values to be formatted to (long long). The aim is to be future proof and portable. Example warning when not using TIME_T_FMT while compiling for a 32 bit target using a time64 libc: 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> --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/bfe95c90e91a0bc33a769967a5841a4… Patch: https://github.com/kamailio/kamailio/commit/bfe95c90e91a0bc33a769967a5841a4… --- diff --git a/src/core/dprint.h b/src/core/dprint.h index 65fcc6fc3c..fbdd349acb 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -35,6 +35,8 @@ #include "compiler_opt.h" #include "cfg_core.h" +#define TIME_T_FMT "lld" +#define TIME_T_CAST(x) ((long long)(x)) /** dicover the function name */ /* C >= 99 has __func__, older gcc versions have __FUNCTION__ */ [View Less]

1 0

git:master:e7571418: auth_identity: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: e75714181c907758d1793abb85258020337249d4 URL: https://github.com/kamailio/kamailio/commit/e75714181c907758d1793abb8525802… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 auth_identity: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/auth_identity/auth_identity.c --- Diff: https://github.… [View More]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev