sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
224 discussions

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

PR 3828 Request For Comments
by tyler moore 04 Jun '24

04 Jun '24

Hey Team, I submitted a PR a while back that has not had much discussion: https://github.com/kamailio/kamailio/pull/3828 The intention was to allow loading in unsigned integer IDs from DB into PVs. Currently converting unsigned integers from DB to PVs will error by default unless the module specifically handles the ease use case. When the following parameter is enabled the srdb interface will allow the conversion to an integer PV value (possibly overflowing): |modparam("db_mysql", "unsigned_type", 1) | This PR allows the srdb APIs to convert the unsigned integer to an unsigned integer PV value. This can be quite useful in modules such as |auth_db| / |permissions| that can load an arbitrary column into a PV (|load_credentials|, |tag_col|/|peer_tag_avp|, etc..). Since most ID columns are auto incrementing unsigned integers this just makes sense for referring to customer data. Elevator pitch over.. What I need help with is reviewing the srdb changes, since I am unsure what side effects that would have on other modules. Comments are welcome here, on the PR, or find me on the matrix channel (@devopsec). Happy Coding.. Regards, Tyler Moore Full Stack Software Engineer dOpenSource

1 0

git:master:e9481214: dmq_usrloc: reformat exported structures
by Daniel-Constantin Mierla 04 Jun '24

04 Jun '24

Module: kamailio Branch: master Commit: e94812149c6f2867a5b23f1218a9af139590bf51 URL: https://github.com/kamailio/kamailio/commit/e94812149c6f2867a5b23f1218a9af1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-04T16:29:50+02:00 dmq_usrloc: reformat exported structures --- Modified: src/modules/dmq_usrloc/dmq_usrloc.c --- Diff: https://github.com/kamailio/kamailio/commit/e94812149c6f2867a5b23f1218a9af1… Patch: https://github.com/kamailio/kamailio/commit/e94812149c6f2867a5b23f1218a9af1… --- diff --git a/src/modules/dmq_usrloc/dmq_usrloc.c b/src/modules/dmq_usrloc/dmq_usrloc.c index d7715ff10e4..61b6286a392 100644 --- a/src/modules/dmq_usrloc/dmq_usrloc.c +++ b/src/modules/dmq_usrloc/dmq_usrloc.c @@ -48,29 +48,33 @@ usrloc_api_t dmq_ul; MODULE_VERSION -static param_export_t params[] = {{"enable", INT_PARAM, &dmq_usrloc_enable}, - {"sync", INT_PARAM, &_dmq_usrloc_sync}, - {"replicate_socket_info", INT_PARAM, - &_dmq_usrloc_replicate_socket_info}, - {"batch_msg_contacts", INT_PARAM, &_dmq_usrloc_batch_msg_contacts}, - {"batch_msg_size", INT_PARAM, &_dmq_usrloc_batch_msg_size}, - {"batch_size", INT_PARAM, &_dmq_usrloc_batch_size}, - {"batch_usleep", INT_PARAM, &_dmq_usrloc_batch_usleep}, - {"usrloc_domain", PARAM_STR, &_dmq_usrloc_domain}, - {"usrloc_delete", INT_PARAM, &_dmq_usrloc_delete}, {0, 0, 0}}; +/* clang-format off */ +static param_export_t params[] = { + {"enable", INT_PARAM, &dmq_usrloc_enable}, + {"sync", INT_PARAM, &_dmq_usrloc_sync}, + {"replicate_socket_info", INT_PARAM, &_dmq_usrloc_replicate_socket_info}, + {"batch_msg_contacts", INT_PARAM, &_dmq_usrloc_batch_msg_contacts}, + {"batch_msg_size", INT_PARAM, &_dmq_usrloc_batch_msg_size}, + {"batch_size", INT_PARAM, &_dmq_usrloc_batch_size}, + {"batch_usleep", INT_PARAM, &_dmq_usrloc_batch_usleep}, + {"usrloc_domain", PARAM_STR, &_dmq_usrloc_domain}, + {"usrloc_delete", INT_PARAM, &_dmq_usrloc_delete}, + {0, 0, 0} +}; struct module_exports exports = { - "dmq_usrloc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - child_init, /* per-child init function */ - 0 /* module destroy function */ + "dmq_usrloc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ static int mod_init(void)

1 0

[kamailio/kamailio] fixed handle_ruri_alias_mode(1) cannot proper handle multi alias (PR #3863)
by Lv Xiaobu 04 Jun '24

04 Jun '24

when receive BYE sip:xxx@xxxx;alias=ip1;alias=ip2 SIP/2.0, handle_ruri_alias_mode(1) doesn't work as documented You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3863 -- Commit Summary -- * fixed handle_ruri_alias_mode(1) cannot proper handle multi alias -- File Changes -- M src/modules/nathelper/nathelper.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3863.patch https://github.com/kamailio/kamailio/pull/3863.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3863 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3863(a)github.com>

3 7

git:master:3d187336: nathelper: remove magic constant
by Xenofon Karamanos 04 Jun '24

04 Jun '24

Module: kamailio Branch: master Commit: 3d187336f22e30800acefd28e4d0f98e0f677a49 URL: https://github.com/kamailio/kamailio/commit/3d187336f22e30800acefd28e4d0f98… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-06-04T13:38:17+03:00 nathelper: remove magic constant --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/3d187336f22e30800acefd28e4d0f98… Patch: https://github.com/kamailio/kamailio/commit/3d187336f22e30800acefd28e4d0f98… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 467c88a6a25..6e6d44ad7ed 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1153,7 +1153,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) } start = NULL; /* locate last alias parameter */ - while(rest_len > _ksr_contact_alias.len + 4) { + while(rest_len > _ksr_contact_alias.len) { if(strncmp(rest, _ksr_contact_alias.s, _ksr_contact_alias.len) == 0) { start = rest; if(mode == 0) {

1 0

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