- sr-dev - kamailio.org

[kamailio/kamailio] ims_registrar_pcscf: changes for ul db_mode DB_ONLY (PR #3317)
by petermarianF 20 Mar '23

20 Mar '23

Enable registration of pcscf contact callback during download from db location table and inserting pcontact (normally this callback is registered during handling of REGISTER). Refuse REGISTER when pcontact is expired since [0 to 20] seconds. Within this time window a NOTIFY is expected from scscf and in order to avoid race time conditions between scscf and pcscf REGISTER will be refused. Refuse REGISTER when pcontact is expired longer than 20 seconds - send PUBLISH (contact expired) to scscf to trigger NOTIFY. In both REGISTER refused scenarios routing script should reply 500 - Deregister in progress.   #### 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  In case a pcontact found in location db has to be inserted into pcscf cache depending on contact state also callbacks have to be registered for this pcontact. Registering of callback_pcscf_contact_cb is enabled in this module. Handling of contact expiry is usually triggered in the scscf (mem_timer_udomain which runs every 10 secs). Sending of NOTIFY to pcscf may take up to 20 seconds from start of expiry due to timing conditions. To avoid race time conditions between a REREGISTER and the expiry handler state machine in the scscf an approach is chosen to refuse a REREGISTER in time window of 20 seconds after pcontact expiry on the pcscf (thus allowing expiry handling to finish). REREGISTER is refused in this scenario with new return_code -2. In case a REREGISTER arrives at pcscf and the respective pcontact is expired longer than time window of 20 seconds registration also is refused with rc -2 and additionaly PUBLISH is sent to scscf with expiry = 0. The rc -2 shall be handled in register.cfg script as follows: pcscf_save_pending("location"); switch ($retcode) { case -1: # Missing/wrong Information in REGISTER. send_reply("400", "Information wrong - See log."); exit; break; case -2: # De-Register in Progress, or PUBLISH ongoing due to registration expiry, # or new REGISTER blocked because registration just expired (up to 20sec). append_to_reply("Retry-After: 30\r\n"); send_reply("500", "Deregister in progress - Please try again"); exit; break; } You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3317 -- Commit Summary -- * ims_registrar_pcscf: changes for ul db_mode DB_ONLY -- File Changes -- M src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c (21) M src/modules/ims_registrar_pcscf/notify.c (4) M src/modules/ims_registrar_pcscf/save.c (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3317.patch https://github.com/kamailio/kamailio/pull/3317.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3317 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3317(a)github.com>

2 11

Dialog-Module and CSeq tracking
by Carsten Bock 17 Mar '23

17 Mar '23

Hi, Quick question: Looking at the Dialog module and CSeq tracking functionality, I've noticed the following: - on the one hand, we are storing the current CSeq for each direction in the Dialog structure - on the other hand, we are storing a "Delta" of the received vs. updated CSeq as a Dialog Variable Does replacing the Delta with the CSeq already stored with the Dialog structure make sense? I am asking because of my latest changes, where there may be more sources for an updated CSeq (e.g., when sending a Request from script within the Dialog) and more use cases for an updated CSeq (Up and Downstream). I've updated the dialog module for my use already accordingly https://github.com/kamailio/kamailio/compare/master...carstenbock/dialog_cs… I wanted to hear other opinions and possible pitfalls as well... Thanks, Carsten -- Carsten Bock I CTO & Founder ng-voice GmbH Trostbrücke 1 I 20457 Hamburg I Germany T +49 179 2021244 I www.ng-voice.com Registry Office at Local Court Hamburg, HRB 120189 Managing Directors: Dr. David Bachmann, Carsten Bock

3 3

git:master:e8520177: auth_identity: add missing error handling for allocation errors, convert to memory log macros
by Henning Westerholt 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: e8520177f6fd70676251cfd2307c0ab40701a701 URL: https://github.com/kamailio/kamailio/commit/e8520177f6fd70676251cfd2307c0ab… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-14T21:14:20Z auth_identity: add missing error handling for allocation errors, convert to memory log macros --- Modified: src/modules/auth_identity/auth_dynstr.c Modified: src/modules/auth_identity/auth_hdrs.c Modified: src/modules/auth_identity/auth_http.c Modified: src/modules/auth_identity/auth_identity.c Modified: src/modules/auth_identity/auth_tables.c --- Diff: https://github.com/kamailio/kamailio/commit/e8520177f6fd70676251cfd2307c0ab… Patch: https://github.com/kamailio/kamailio/commit/e8520177f6fd70676251cfd2307c0ab…

1 0

git:master:7e617ab8: dmq: add missing memory allocation checks, convert to memory log macros
by Henning Westerholt 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: 7e617ab89f5275f1b269382ae2c1fee508854cf1 URL: https://github.com/kamailio/kamailio/commit/7e617ab89f5275f1b269382ae2c1fee… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-14T21:10:04Z dmq: add missing memory allocation checks, convert to memory log macros --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/message.c Modified: src/modules/dmq/notification_peer.c Modified: src/modules/dmq/peer.c Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/7e617ab89f5275f1b269382ae2c1fee… Patch: https://github.com/kamailio/kamailio/commit/7e617ab89f5275f1b269382ae2c1fee…

1 0

git:master:aa4d015a: dispatcher: small formatting adaption related to 6aee3bd7c
by Henning Westerholt 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: aa4d015a58bb24ba5bda6e6133b0e9f314e2318e URL: https://github.com/kamailio/kamailio/commit/aa4d015a58bb24ba5bda6e6133b0e9f… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-14T17:20:14Z dispatcher: small formatting adaption related to 6aee3bd7c --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/aa4d015a58bb24ba5bda6e6133b0e9f… Patch: https://github.com/kamailio/kamailio/commit/aa4d015a58bb24ba5bda6e6133b0e9f… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 50ad98dc0f..d79fb7a6d3 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -4039,8 +4039,7 @@ ds_set_t *ds_avl_insert(ds_set_t **root, int id, int *setn) } if(!node) { node = shm_malloc(sizeof(ds_set_t)); - if(!(node)) - { + if(!(node)) { SHM_MEM_ERROR; return NULL; } diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 8ccc86fedc..5cb3d7aba2 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -360,15 +360,13 @@ static int mod_init(void) /* Initialize the counter */ ds_ping_reply_codes = (int **)shm_malloc(sizeof(unsigned int *)); - if(!(ds_ping_reply_codes)) - { + if(!(ds_ping_reply_codes)) { SHM_MEM_ERROR; return -1; } *ds_ping_reply_codes = 0; ds_ping_reply_codes_cnt = (int *)shm_malloc(sizeof(int)); - if(!(ds_ping_reply_codes_cnt)) - { + if(!(ds_ping_reply_codes_cnt)) { shm_free(ds_ping_reply_codes); SHM_MEM_ERROR; return -1;

1 0

git:master:6aee3bd7: dispatcher: add missing memory allocation checks, convert to memory log macros
by Henning Westerholt 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: 6aee3bd7c86a1874cc140a7874b740981f14f5f5 URL: https://github.com/kamailio/kamailio/commit/6aee3bd7c86a1874cc140a7874b7409… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-14T17:17:28Z dispatcher: add missing memory allocation checks, convert to memory log macros --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/ds_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/6aee3bd7c86a1874cc140a7874b7409… Patch: https://github.com/kamailio/kamailio/commit/6aee3bd7c86a1874cc140a7874b7409…

1 0

Re: [kamailio/kamailio] nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c (6e03201)
by Victor Seva 14 Mar '23

14 Mar '23

@rfuchs Thanks! Pushed the PRIu64 macro versions -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/6e032019d992625abc2a3739423df9ea1c964356/104410654(a)github.com>

1 0

git:master:ef0427ea: nat_traversal:
by Victor Seva 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: ef0427ead03bfb738b6214b91c1763913e70a52d URL: https://github.com/kamailio/kamailio/commit/ef0427ead03bfb738b6214b91c17639… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T17:08:46+01:00 nat_traversal: --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/ef0427ead03bfb738b6214b91c17639… Patch: https://github.com/kamailio/kamailio/commit/ef0427ead03bfb738b6214b91c17639… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index d21a8b7e01..28456c77d4 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -43,6 +43,7 @@ #include <ctype.h> #include <errno.h> #include <time.h> +#include <inttypes.h> #include <sys/types.h> #include <arpa/inet.h> @@ -923,7 +924,7 @@ static time_t get_register_expire( } } - LM_DBG("maximum expire for all contacts: %lu\n", (uint64_t)expire); + LM_DBG("maximum expire for all contacts: %" PRIu64 "\n", (uint64_t)expire); return (expire ? expire + now : 0); }

1 0

git:master:88412576: core: use PRIu64 macro to find out what format is needed for uint64_t
by Victor Seva 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: 8841257671b6c5f3c4cfee3f1b7bb46d54faaf65 URL: https://github.com/kamailio/kamailio/commit/8841257671b6c5f3c4cfee3f1b7bb46… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T17:03:45+01:00 core: use PRIu64 macro to find out what format is needed for uint64_t since it depends on architecture --- Modified: src/core/utils/tmrec.c --- Diff: https://github.com/kamailio/kamailio/commit/8841257671b6c5f3c4cfee3f1b7bb46… Patch: https://github.com/kamailio/kamailio/commit/8841257671b6c5f3c4cfee3f1b7bb46… --- diff --git a/src/core/utils/tmrec.c b/src/core/utils/tmrec.c index 205866163f..14e9243914 100644 --- a/src/core/utils/tmrec.c +++ b/src/core/utils/tmrec.c @@ -32,6 +32,7 @@ #include <string.h> #include <time.h> #include <stdint.h> +#include <inttypes.h> #include "../../core/mem/mem.h" #include "tmrec.h" @@ -272,7 +273,7 @@ int ac_print(ac_tm_t *_atp) return -1; } - printf("\nSys time: %lu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, + printf("\nSys time: %" PRIu64 "\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, _atp->t.tm_hour, _atp->t.tm_min, _atp->t.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_atp->t.tm_wday], _atp->t.tm_year+1900, _atp->t.tm_mon+1, _atp->t.tm_mday); @@ -512,15 +513,15 @@ int tr_print(tmrec_t *_trp) return -1; } printf("Recurrence definition\n-- start time ---\n"); - printf("Sys time: %lu\n", (uint64_t)_trp->dtstart); + printf("Sys time: %" PRIu64 "\n", (uint64_t)_trp->dtstart); printf("Time: %02d:%02d:%02d\n", _trp->ts.tm_hour, _trp->ts.tm_min, _trp->ts.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_trp->ts.tm_wday], _trp->ts.tm_year+1900, _trp->ts.tm_mon+1, _trp->ts.tm_mday); printf("---\n"); - printf("End time: %lu\n", (uint64_t)_trp->dtend); - printf("Duration: %lu\n", (uint64_t)_trp->duration); - printf("Until: %lu\n", (uint64_t)_trp->until); + printf("End time: %" PRIu64 "\n", (uint64_t)_trp->dtend); + printf("Duration: %" PRIu64 "\n", (uint64_t)_trp->duration); + printf("Until: %" PRIu64 "\n", (uint64_t)_trp->until); printf("Freq: %d\n", (int)_trp->freq); printf("Interval: %d\n", (int)_trp->interval); if(_trp->byday)

1 0

Re: [kamailio/kamailio] nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c (6e03201)
by Richard Fuchs 14 Mar '23

14 Mar '23

Eh, these are arch dependent. "long int" on 32-bit platforms is only 32 bits. Either use %llu and cast to "long long" or use the PRIu64 macro. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/6e032019d992625abc2a3739423df9ea1c964356/104404760(a)github.com>

1 0

[kamailio/kamailio] Statistic counters for LCR module (Issue #3372)
by Alessio Garzi 14 Mar '23

14 Mar '23

### Description I am in need to get some statistic counters related to each lcr gw currently loaded in Kamailio. Kamailio already provides the counters I need inside the KEX module with the following command: ``` kamcmd> stats.get_statistics core: core:bad_URIs_rcvd = 69 core:bad_msg_hdr = 2 core:drop_replies = 0 core:drop_requests = 8499 core:err_replies = 0 core:err_requests = 0 core:fwd_replies = 4 core:fwd_requests = 65 core:rcv_replies = 502088 ... ``` Here kamailio doing exactly what i want, it's exposing the counter data via xmlrpc which is great for attaching an external tool to build statistics. Unfortunately Kamailio KEX module is counting every single request/reply hitting the proxy server, the idea is to have the above stats related to the gateways currently loaded by the lcr module. In this way, for example I can tell how many request/replies I got from gw id X or gw id Y and produce gw based stats. Unfortunately the KEX module has no "concept" of "GW" and "LCR", so the idea is to implement the same counting logic inside LCR module. The counting should not be persistent (counters must go to zero every time kamailio restarts). When adding or deleting a new gateway, the counting in memory must reflect the status of the internal state or lcr gatewas, so, for example, after adding a new gateway and reloading lcr tables, the new counters must be immediately available through xmlrpc without a new kamailio restart. The same concept applies when the gateway is removed from the list. ### Expected behavior A possible implementation should give the user to query counters in a way similar to this: ``` # kamcmd lcr.stats { gw: { { gw_id: <id of lcr mysql table here> gw_name: <description of lcr mysql table here> requests: 0 requests_invite: 0 requests_cancel: 0 ... } { gw_id: <id of lcr mysql table here> gw_name: <description of lcr mysql table here> requests: 0 requests_invite: 0 requests_cancel: 0 ... } } } ``` Additionally, it would be helpful to set a gw id as argument in order to filter, for example: ``` # kamcmd lcr.stats 95 { gw: { { gw_id: 95 gw_name: <description of gw id 95> requests: 222 requests_invite: 1 requests_cancel: 1 requests_ack: 1 ... } } } ``` #### Actual observed behavior To my knowledge, nothing related to this issue has been implemented in Kamailio so far -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3372 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3372(a)github.com>

3 6

[kamailio/kamailio] lcr: add counters per gateway (PR #3391)
by Alessio Garzi 14 Mar '23

14 Mar '23

#### 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 - [x] Related to issue #3372 #### Description Implementing the suggesting lcr counters per gateway You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3391 -- Commit Summary -- * lcr: add counters per gateway -- File Changes -- M src/modules/lcr/lcr_mod.c (306) M src/modules/lcr/lcr_mod.h (52) M src/modules/lcr/lcr_rpc.c (460) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3391.patch https://github.com/kamailio/kamailio/pull/3391.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3391 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3391(a)github.com>

3 10

git:master:6e032019: nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c
by Victor Seva 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: 6e032019d992625abc2a3739423df9ea1c964356 URL: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T12:01:32+01:00 nat_transversal: fix warning introduced at f301ca9cdcc044dd05e9d82139e1db368be6dc5c > nat_traversal.c: In function 'get_register_expire': > ../../core/parser/../dprint.h:321:73: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 11 has type 'long unsigned int' [-Wformat=] > 321 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ > | ^~~~~~~~~~~~~~~~~~~~~~~~ --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… Patch: https://github.com/kamailio/kamailio/commit/6e032019d992625abc2a3739423df9e… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index d659aced45..d21a8b7e01 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -923,7 +923,7 @@ static time_t get_register_expire( } } - LM_DBG("maximum expire for all contacts: %llu\n", (uint64_t)expire); + LM_DBG("maximum expire for all contacts: %lu\n", (uint64_t)expire); return (expire ? expire + now : 0); }

1 0

git:master:ebfacdb7: core: tmrec fix build warning introduced at dd6339f817822cd0590aec2a9a467330bde499dd
by Victor Seva 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: ebfacdb7d7c3dfceb68e9550eec72b89d695fd4b URL: https://github.com/kamailio/kamailio/commit/ebfacdb7d7c3dfceb68e9550eec72b8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T12:07:27+01:00 core: tmrec fix build warning introduced at dd6339f817822cd0590aec2a9a467330bde499dd > core/utils/tmrec.c: In function 'ac_print': > core/utils/tmrec.c:275:32: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int' [-Wformat=] > 275 | printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, > | ~~~^ ~~~~~~~~~~~~~~~~~~~~ > | | | > | long long unsigned int long unsigned int > | %lu --- Modified: src/core/utils/tmrec.c --- Diff: https://github.com/kamailio/kamailio/commit/ebfacdb7d7c3dfceb68e9550eec72b8… Patch: https://github.com/kamailio/kamailio/commit/ebfacdb7d7c3dfceb68e9550eec72b8… --- diff --git a/src/core/utils/tmrec.c b/src/core/utils/tmrec.c index adae68edbf..205866163f 100644 --- a/src/core/utils/tmrec.c +++ b/src/core/utils/tmrec.c @@ -272,7 +272,7 @@ int ac_print(ac_tm_t *_atp) return -1; } - printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, + printf("\nSys time: %lu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, _atp->t.tm_hour, _atp->t.tm_min, _atp->t.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_atp->t.tm_wday], _atp->t.tm_year+1900, _atp->t.tm_mon+1, _atp->t.tm_mday); @@ -512,15 +512,15 @@ int tr_print(tmrec_t *_trp) return -1; } printf("Recurrence definition\n-- start time ---\n"); - printf("Sys time: %llu\n", (uint64_t)_trp->dtstart); + printf("Sys time: %lu\n", (uint64_t)_trp->dtstart); printf("Time: %02d:%02d:%02d\n", _trp->ts.tm_hour, _trp->ts.tm_min, _trp->ts.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_trp->ts.tm_wday], _trp->ts.tm_year+1900, _trp->ts.tm_mon+1, _trp->ts.tm_mday); printf("---\n"); - printf("End time: %llu\n", (uint64_t)_trp->dtend); - printf("Duration: %llu\n", (uint64_t)_trp->duration); - printf("Until: %llu\n", (uint64_t)_trp->until); + printf("End time: %lu\n", (uint64_t)_trp->dtend); + printf("Duration: %lu\n", (uint64_t)_trp->duration); + printf("Until: %lu\n", (uint64_t)_trp->until); printf("Freq: %d\n", (int)_trp->freq); printf("Interval: %d\n", (int)_trp->interval); if(_trp->byday)

1 0

git:master:781ee072: lcr: fix building warnings initializating values
by Victor Seva 14 Mar '23

14 Mar '23

Module: kamailio Branch: master Commit: 781ee072593f16a100ef00b5ef71fcfd6f8ded2b URL: https://github.com/kamailio/kamailio/commit/781ee072593f16a100ef00b5ef71fcf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-14T11:55:34+01:00 lcr: fix building warnings initializating values > https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=… > [...] > lcr_mod.c:2630:9: warning: 'tmp_tag.len' may be used uninitialized [-Wmaybe-uninitialized] --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/781ee072593f16a100ef00b5ef71fcf… Patch: https://github.com/kamailio/kamailio/commit/781ee072593f16a100ef00b5ef71fcf… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index b668160cb33..80b62f5d4c7 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2526,10 +2526,21 @@ static int generate_uris(struct sip_msg *_m, char *r_uri, str *r_uri_user, { int_str gw_uri_val; struct usr_avp *gu_avp; - str scheme, prefix, hostname, port, params, transport, addr_str, tmp_tag; + str scheme = STR_NULL; + str prefix = STR_NULL; + str hostname = STR_NULL; + str port = STR_NULL; + str params = STR_NULL; + str transport = STR_NULL; + str addr_str = STR_NULL; + str tmp_tag = STR_NULL; char *at; - unsigned int strip; + unsigned int strip = 0; + if(!tag) { + LM_ERR("tag parameter is empty\n"); + return -1; + } gu_avp = search_first_avp(gw_uri_avp_type, gw_uri_avp, &gw_uri_val, 0); if(!gu_avp)

1 0

Re: [kamailio/kamailio] nat_traversal: cast to uint64_t when using time_t value (f301ca9)
by Victor Seva 14 Mar '23

14 Mar '23

From https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=… ``` nat_traversal.c: In function 'get_register_expire': ../../core/parser/../dprint.h:321:73: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 11 has type 'long unsigned int' [-Wformat=] 321 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../core/parser/../dprint.h:345:25: note: in expansion of macro 'LOG_FX' 345 | LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) | ^~~~~~ ../../core/parser/../dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/parser/../dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ ../../core/parser/../dprint.h:401:45: note: in expansion of macro 'LOG' 401 | # define DBG(fmt, args...) LOG(L_DBG, fmt , ## args) | ^~~ ../../core/parser/../dprint.h:405:36: note: in expansion of macro 'DBG' 405 | # define DEBUG(fmt, args...) DBG(fmt , ## args) | ^~~ ../../core/parser/../dprint.h:422:16: note: in expansion of macro 'DEBUG' 422 | #define LM_DBG DEBUG | ^~~~~ nat_traversal.c:926:9: note: in expansion of macro 'LM_DBG' 926 | LM_DBG("maximum expire for all contacts: %llu\n", (uint64_t)expire); | ^~~~~~ ``` @miconda same here -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f301ca9cdcc044dd05e9d82139e1db3… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f301ca9cdcc044dd05e9d82139e1db368be6dc5c/104360216(a)github.com>

1 0

Re: [kamailio/kamailio] core: sruid - cast to uint64_t when using time_t value (33b3193)
by Victor Seva 14 Mar '23

14 Mar '23

From https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=… ``` core/utils/tmrec.c: In function 'ac_print': core/utils/tmrec.c:275:32: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int' [-Wformat=] 275 | printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, | ~~~^ ~~~~~~~~~~~~~~~~~~~~ | | | | long long unsigned int long unsigned int | %lu core/utils/tmrec.c: In function 'tr_print': core/utils/tmrec.c:515:30: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int' [-Wformat=] 515 | printf("Sys time: %llu\n", (uint64_t)_trp->dtstart); | ~~~^ ~~~~~~~~~~~~~~~~~~~~~~~ | | | | | long unsigned int | long long unsigned int | %lu core/utils/tmrec.c:521:30: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int' [-Wformat=] 521 | printf("End time: %llu\n", (uint64_t)_trp->dtend); | ~~~^ ~~~~~~~~~~~~~~~~~~~~~ | | | | | long unsigned int | long long unsigned int | %lu core/utils/tmrec.c:522:30: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int' [-Wformat=] 522 | printf("Duration: %llu\n", (uint64_t)_trp->duration); | ~~~^ ~~~~~~~~~~~~~~~~~~~~~~~~ | | | | | long unsigned int | long long unsigned int | %lu core/utils/tmrec.c:523:27: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 2 has type 'long unsigned int' [-Wformat=] 523 | printf("Until: %llu\n", (uint64_t)_trp->until); | ~~~^ ~~~~~~~~~~~~~~~~~~~~~ | | | | | long unsigned int | long long unsigned int | %lu ``` @miconda it seems we need just ``%lu`` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/33b319353a097ba8fd80e45dc4f008c… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/33b319353a097ba8fd80e45dc4f008c2e9dfe813/104359936(a)github.com>

1 0

Re: [kamailio/kamailio] Fix for incorrect Flow-description in AAR Media (1a1c2cf)
by Guille0007 12 Mar '23

12 Mar '23

Thanks Herle for your answer, And indeed I made it work using your scripts. Where you only rewrite SDP Offer on Orig Invite and SDP Answer on Terminating183 Session Progress. And where it does not work anymore when you try to rewrite SDP offer at both Orig and Term Invite and SDP Answer on both Orig and term 183 Session Progress. Which is what would happen when *IMS *core uses a separate VRF from access. But anyway, thanks for your answer and thank you for the dockerized environment you made available to test VoLTE with Kamailio. Regards Le dim. 12 mars 2023 à 13:01, Supreeth Herle ***(a)***.***> a écrit : > Hey @Guille0007 <https://github.com/Guille0007> > > I cant recollect completely about the AAR fix I did. But, AAR works in the > docker_open5gs repo for a call. > > — > Reply to this email directly, view it on GitHub > <https://github.com/kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab…>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/A6NCYHDHEGSLIASOJ4C5FPLW3…> > . > You are receiving this because you were mentioned.Message ID: > <kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab7b89b386a/104093331 > @github.com> > -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab7b89b386a/104131881(a)github.com>

1 0

Re: [kamailio/kamailio] Fix for incorrect Flow-description in AAR Media (1a1c2cf)
by Supreeth Herle 12 Mar '23

12 Mar '23

Hey @Guille0007 I cant recollect completely about the AAR fix I did. But, AAR works in the docker_open5gs repo for a call. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab7b89b386a/104093331(a)github.com>

1 0

[kamailio/kamailio] Modified ruri-user and dispatcher failover (Issue #3388)
by mtryfoss 11 Mar '23

11 Mar '23

### Description We've got a situation where we use t_send_reply() to generate early 100 Trying, before an operation that might have a small delay. The result of this operation might lead to a change which adds parameters to ruri-user. This works as expected for normal operations, but when calling ds_next_dst()/ds_next_domain() the change to $rU is lost. ### Troubleshooting I then noticed that this is because t_send_reply() indirectly does a t_newtran() before change to $rU. If it's done in the opposite order, everything works as expected. A workaround is to use for example sl_send_reply() and t_set_auto_inv_100(0), which works for me. However, I'm unsure if this revert of user is expected behaviour? #### Reproduction $rU = $rU + ";npdi"; .. ds_select_dst(..); then trigger a condition which executes failure_route and then use ds_next_dst() to fork serially. $rU is then reverted to the original value in outgoing INVITE. ### Additional Information Reproduced in master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3388 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3388(a)github.com>

2 3

Re: [kamailio/kamailio] Fix for incorrect Flow-description in AAR Media (1a1c2cf)
by Guille0007 10 Mar '23

10 Mar '23

Hello Herlesupreth, I am struggling with pcscf Rx. At termination, PCSCF seems to request QoS for a flow between the IP/port of the SDP offer it receives and the IP/Port of the SDP Answer it receives. While it should request QoS for a flow between the IP/Port of the SDP offer it generates (after rewriting SDP) and the IP/Port of the SDP answer it receives from B. Is it why in the rtp.cfg from https://github.com/herlesupreeth/docker_open5gs you do not invoke rtpmanage on invite at termination? Does the fix you posted there solve that? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/1a1c2cf5dcea517a49438e8c29ecaab7b89b386a/103929108(a)github.com>

1 0

KEMI python 'KSR' has no attribute 'sanity'
by agural5＠gmail.com 10 Mar '23

10 Mar '23

Hello, I am trying to use KEMI KSR.sanity in python but got error: AttributeError: module 'KSR' has no attribute 'sanity' appreciate your help for solve this. Thanks!

3 2

[kamailio/kamailio] auth_ephemeral: fix authentication with secrets added at runtime (PR #3390)
by Dennis 10 Mar '23

10 Mar '23

- proper way to work with shm pointer to secret list   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description In case of adding secrets at runtime with autheph.add_secret rpc, authentication with new secrets not work, this is because rpc process modify local pointer to secret list, instead shm. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3390 -- Commit Summary -- * auth_ephemeral: fix authentication with secrets added at runtime -- File Changes -- M src/modules/auth_ephemeral/auth_ephemeral_mod.c (48) M src/modules/auth_ephemeral/auth_ephemeral_mod.h (1) M src/modules/auth_ephemeral/authorize.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3390.patch https://github.com/kamailio/kamailio/pull/3390.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3390 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3390(a)github.com>

3 6

git:master:6fa5a8fa: auth_ephemeral: fix authentication with secrets added at runtime (#3390)
by GitHub 10 Mar '23

10 Mar '23

Module: kamailio Branch: master Commit: 6fa5a8fa8ddfe09bdab2fb445bee94e51d86b7fc URL: https://github.com/kamailio/kamailio/commit/6fa5a8fa8ddfe09bdab2fb445bee94e… Author: Dennis <dennis_y(a)mail.ru> Committer: GitHub <noreply(a)github.com> Date: 2023-03-10T15:46:21+01:00 auth_ephemeral: fix authentication with secrets added at runtime (#3390) * auth_ephemeral: fix authentication with secrets added at runtime - proper way to work with shm pointer to secret list * fix: free secret_struct shm Free shm secret_struct in case the allocation error of secret_list pointer. --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.c Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.h Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/6fa5a8fa8ddfe09bdab2fb445bee94e… Patch: https://github.com/kamailio/kamailio/commit/6fa5a8fa8ddfe09bdab2fb445bee94e…

1 0

git:master:e3b8b76d: utils/kamctl: allow the definition of a specific startup file at start process
by Daniel-Constantin Mierla 10 Mar '23

10 Mar '23

Module: kamailio Branch: master Commit: e3b8b76d7a8773af4e10ce011682931429cd4a87 URL: https://github.com/kamailio/kamailio/commit/e3b8b76d7a8773af4e10ce011682931… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-10T15:38:33+01:00 utils/kamctl: allow the definition of a specific startup file at start process - Added the possibility to specify an alternative file different from the default: kamailio.cfg, when starting kamailio, using the kamctl tool. This makes it possible to start kamailio by passing a startup file located in a specific folder (via ETCDIR env variable) and with a specific name, instead of using the default name: kamailio.cfg. --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctlrc --- Diff: https://github.com/kamailio/kamailio/commit/e3b8b76d7a8773af4e10ce011682931… Patch: https://github.com/kamailio/kamailio/commit/e3b8b76d7a8773af4e10ce011682931… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index fbb237eb00..214cd21e5a 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -73,6 +73,10 @@ if [ -z "$MYLIBDIR" ] ; then fi fi +if [ -z "$STARTUP_CONFIG_FILE" ]; then + STARTUP_CONFIG_FILE="kamailio.cfg" +fi + ##### ------------------------------------------------ ##### ### load base functions # @@ -2007,9 +2011,9 @@ kamailio_start() { exit 1 fi if [ $SYSLOG = 1 ] ; then - $KAMBIN -P $PID_FILE -f $ETCDIR/kamailio.cfg $STARTOPTIONS 1>/dev/null 2>/dev/null + $KAMBIN -P $PID_FILE -f $ETCDIR/$STARTUP_CONFIG_FILE $STARTOPTIONS 1>/dev/null 2>/dev/null else - $KAMBIN -P $PID_FILE -E -f $ETCDIR/kamailio.cfg $STARTOPTIONS + $KAMBIN -P $PID_FILE -E -f $ETCDIR/$STARTUP_CONFIG_FILE $STARTOPTIONS fi sleep 3 if [ ! -s $PID_FILE ] ; then diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index fe9cc1fc48..ce0bd9d93b 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -159,6 +159,10 @@ ## PID file path - default is: /run/kamailio/kamailio.pid # PID_FILE=/run/kamailio/kamailio.pid +## Kamailio Startup Configuration File +## Default is: kamailio.cfg +# STARTUP_CONFIG_FILE=kamailio.cfg + ## Extra start options - default is: not set ## example: start Kamailio with 64MB shared memory: STARTOPTIONS="-m 64" # STARTOPTIONS=

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev