sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
228 discussions

[kamailio/kamailio] p_usrloc: Add update/delete based on uniq (PR #3865)
by Stefan Mititelu 06 Jun '24

06 Jun '24

#### 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 a new update/delete function based on contact's uniq uniq. Some devices may use same uniq for multiple contacts, so I needed to restrain it further based on ruid value. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3865 -- Commit Summary -- * p_usrloc: Add update/delete based on uniq -- File Changes -- M src/modules/p_usrloc/doc/p_usrloc_admin.xml (5) M src/modules/p_usrloc/ucontact.c (307) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3865.patch https://github.com/kamailio/kamailio/pull/3865.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3865 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3865(a)github.com>

2 2

git:master:8b6b3881: p_usrloc: Add update/delete based on uniq
by Stefan Mititelu 06 Jun '24

06 Jun '24

Module: kamailio Branch: master Commit: 8b6b3881594b4f2ac1b50b9c83cd0e1dac3ec321 URL: https://github.com/kamailio/kamailio/commit/8b6b3881594b4f2ac1b50b9c83cd0e1… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2024-06-06T12:34:14+03:00 p_usrloc: Add update/delete based on uniq --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/8b6b3881594b4f2ac1b50b9c83cd0e1… Patch: https://github.com/kamailio/kamailio/commit/8b6b3881594b4f2ac1b50b9c83cd0e1…

1 0

[kamailio/kamailio] pdb: make 'timeout' runtime configurable (PR #3850)
by Stefan Mititelu 05 Jun '24

05 Jun '24

#### 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  Make timeout modparam runtime configurable. Also update timout execeded logs from NOTICE to ERR and add more info to them. Also update utils/pdbt.c query tool to allow 0 carrier id. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3850 -- Commit Summary -- * pdb: make 'timeout' runtime configurable -- File Changes -- A src/modules/pdb/config.c (42) A src/modules/pdb/config.h (37) M src/modules/pdb/pdb.c (40) M utils/pdbt/pdbt.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3850.patch https://github.com/kamailio/kamailio/pull/3850.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3850 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3850(a)github.com>

3 5

git:master:fc07aad0: pdbt: Allow to return carrier id 0
by Henning Westerholt 05 Jun '24

05 Jun '24

Module: kamailio Branch: master Commit: fc07aad0beaae9e133ca3252b088afd9eece0c53 URL: https://github.com/kamailio/kamailio/commit/fc07aad0beaae9e133ca3252b088afd… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-06-05T21:43:02+02:00 pdbt: Allow to return carrier id 0 --- Modified: utils/pdbt/pdbt.c --- Diff: https://github.com/kamailio/kamailio/commit/fc07aad0beaae9e133ca3252b088afd… Patch: https://github.com/kamailio/kamailio/commit/fc07aad0beaae9e133ca3252b088afd… --- diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index be670eeb7f8..d9fa0bca45d 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -628,15 +628,14 @@ int query_server(char *number, char *comment, void *data) { carrierid = query_udp(number, sdata->timeout, &(sdata->pfds), &(sdata->dstaddr), sdata->dstaddrlen); - if (carrierid<=0) { + if(carrierid < 0) { LINFO("%s: not_found: comment='%s', result=%d\n", number, comment, carrierid); if (carrierid < 0) { result = carrierid; } else { result = PDB_NOT_IN_PDB; } - } - else { + } else { LINFO("%s:%ld:%s\n", number, (long int)carrierid, carrierid2name(carrierid)); result = PDB_OK; }

1 0

git:master:f57be803: pdb: make 'timeout' runtime configurable
by Henning Westerholt 05 Jun '24

05 Jun '24

Module: kamailio Branch: master Commit: f57be8030834cdeb0bb509d0d25afc89f3cca6e8 URL: https://github.com/kamailio/kamailio/commit/f57be8030834cdeb0bb509d0d25afc8… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-06-05T21:43:02+02:00 pdb: make 'timeout' runtime configurable Also modify logs related to timeout from NOTICE to ERR and add a bit more info to them. --- Added: src/modules/pdb/config.c Added: src/modules/pdb/config.h Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/f57be8030834cdeb0bb509d0d25afc8… Patch: https://github.com/kamailio/kamailio/commit/f57be8030834cdeb0bb509d0d25afc8…

1 0

git:master:77cb0050: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 05 Jun '24

05 Jun '24

Module: kamailio Branch: master Commit: 77cb0050b0e60bf42b28b77f09e6bd00d57481dd URL: https://github.com/kamailio/kamailio/commit/77cb0050b0e60bf42b28b77f09e6bd0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-05T20:46:10+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/77cb0050b0e60bf42b28b77f09e6bd0… Patch: https://github.com/kamailio/kamailio/commit/77cb0050b0e60bf42b28b77f09e6bd0…

1 0

git:master:d1ec2972: siputils: docs for is_sip() function
by Daniel-Constantin Mierla 05 Jun '24

05 Jun '24

Module: kamailio Branch: master Commit: d1ec29726484026c27902832a3daa052d5d68c3d URL: https://github.com/kamailio/kamailio/commit/d1ec29726484026c27902832a3daa05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-05T20:30:20+02:00 siputils: docs for is_sip() function --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d1ec29726484026c27902832a3daa05… Patch: https://github.com/kamailio/kamailio/commit/d1ec29726484026c27902832a3daa05… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index ad30a1a9f6e..dbbba7a6db6 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1131,6 +1131,27 @@ if (is_reply()) { ... } ... +</programlisting> + </example> + </section> + <section id="siputils.f.is_sip"> + <title> + <function moreinfo="none">is_sip()</function> + </title> + <para> + Return true if it is a SIP message. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>is_sip</function> usage</title> + <programlisting format="linespecific"> +... +if (is_sip()) { + ... +} +... </programlisting> </example> </section>

1 0

git:master:d2ff3dd3: siputils: added function is_sip()
by Daniel-Constantin Mierla 05 Jun '24

05 Jun '24

Module: kamailio Branch: master Commit: d2ff3dd39766e4ee859c115f1fc5bf93d72abed9 URL: https://github.com/kamailio/kamailio/commit/d2ff3dd39766e4ee859c115f1fc5bf9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-05T20:25:20+02:00 siputils: added function is_sip() - return true if it is a SIP message --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/d2ff3dd39766e4ee859c115f1fc5bf9… Patch: https://github.com/kamailio/kamailio/commit/d2ff3dd39766e4ee859c115f1fc5bf9… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 2822e24b7c8..7caeb809b2f 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -101,6 +101,36 @@ int is_reply(struct sip_msg *msg) } +/** + * return 1 (true) if it is a SIP message + */ +int w_is_sip(sip_msg_t *msg, char *foo, char *bar) +{ + if(msg == NULL) + return -1; + + if(msg->first_line.flags & FLINE_FLAG_PROTO_SIP) { + return 1; + } + + return -1; +} + +/** + * return 1 (true) if it is a SIP message + */ +int is_sip(sip_msg_t *msg) +{ + if(msg == NULL) + return -1; + + if(msg->first_line.flags & FLINE_FLAG_PROTO_SIP) { + return 1; + } + + return -1; +} + /* * Checks if From includes a To-tag -- good to identify * if a request creates a new dialog diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index 5aa67295ba5..fa914ecc0da 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -116,6 +116,13 @@ int is_request(struct sip_msg *msg); int w_is_reply(struct sip_msg *msg, char *foo, char *bar); int is_reply(struct sip_msg *msg); +/* + * Return true (1) if it is a SIP message, otherwise false (-1) + */ +int w_is_sip(struct sip_msg *msg, char *foo, char *bar); +int is_sip(struct sip_msg *msg); + + /* * Find if Request URI has a given parameter with matching value */ diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index d31671db79f..0912c6b132b 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -174,6 +174,7 @@ static cmd_export_t cmds[] = { fixup_free_set_uri, ANY_ROUTE}, {"is_request", (cmd_function)w_is_request, 0, 0, 0, ANY_ROUTE}, {"is_reply", (cmd_function)w_is_reply, 0, 0, 0, ANY_ROUTE}, + {"is_sip", (cmd_function)w_is_sip, 0, 0, 0, ANY_ROUTE}, {"is_gruu", (cmd_function)w_is_gruu, 0, 0, 0, ANY_ROUTE}, {"is_gruu", (cmd_function)w_is_gruu, 1, fixup_spve_null, 0, ANY_ROUTE}, {"is_supported", (cmd_function)w_is_supported, 1, fixup_option, 0, @@ -623,6 +624,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("is_sip"), + SR_KEMIP_INT, is_sip, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("siputils"), str_init("is_first_hop"), SR_KEMIP_INT, is_first_hop, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

RFC: remove structures and resources clean up on module destroy
by Daniel-Constantin Mierla 05 Jun '24

05 Jun '24

Hello, based on many reports coming over along all the past years, there are crashes that happen on module destroy callbacks, many could be fixed, but some cannot be predicted, depending on the moment when the kill (shut down) is triggered. Furthermore, there are cases when the clean makes no much sense, like attempting to close the DB connection, because the destroy callback is executed by Kamailio's main process only, which does not handle SIP traffic and usually does not have DB connection,. So actually, all the other connections from the SIP works are clean up automatically by the OS on process shut down. Also, the pkg and shm blocks are cleaned up as a whole after all, therefore trying to free chunks inside them that were used by various internal structures is kind of waste of time. The main purpose to do it in the past it to be able to discover memory leaks by having status reports written in syslog, but these reports can be triggered by RPC during runtime and it is even better to get them in such way. I think that the best is to use module destroy callbacks only to save data to backend (e.g., database) that has to be reloaded on restart, and leave the memory/resources clean up to the OS. In this way we also deal nicer with the inter-modules dependencies, the structures of a module will be always available, even after its mod-destroy callback execution, so if another module depending on them still wants to access, it should be no problem. At the last Kamailio Devel meeting we had a brief discussion that we may want to change mod-destroy to be done in two steps, first for storing meeded data to backed and then do the cleanup, but I think it is better without the 2nd step. Any comments or other suggestions? Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

1 0

[kamailio/kamailio] Fix handling of pending reg contacts in P-CSCF (PR #3868)
by Supreeth Herle 05 Jun '24

05 Jun '24

#### 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) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3868 -- Commit Summary -- * Revert "ims_registrar_pcscf: update registered state to pending registration if contact exists" * ims_registrar_pcscf: fix typo in comments * ims_ipsec_pcscf: update security params of newly created ipsec tunnel in contact -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (12) M src/modules/ims_registrar_pcscf/save.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3868.patch https://github.com/kamailio/kamailio/pull/3868.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3868 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3868(a)github.com>

1 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2024