- sr-dev - kamailio.org

git:master:6cdd56bb: core: Improved URN parsing according to RFC8141
by Henning Westerholt 11 Jul '24

11 Jul '24

Module: kamailio Branch: master Commit: 6cdd56bb85e1a10ebbb29c2633fb47bf7b56585e URL: https://github.com/kamailio/kamailio/commit/6cdd56bb85e1a10ebbb29c2633fb47b… Author: anmartan <a.martin(a)zaleos.net> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-07-11T10:23:21+02:00 core: Improved URN parsing according to RFC8141 - Improved URN parsing to allow consuming URNs that contain 3 or more colons. Previosly URI parser treated some of the colons as separator between host and port causing the URN parsing to fail. --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/6cdd56bb85e1a10ebbb29c2633fb47b… Patch: https://github.com/kamailio/kamailio/commit/6cdd56bb85e1a10ebbb29c2633fb47b… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 9ccb62ee51e..4150c1598d6 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -237,28 +237,30 @@ int parse_uri(char *buf, int len, struct sip_uri *uri) } else \ goto error_bad_char -#define check_host_end \ - case ':': \ - /* found the host */ \ - uri->host.s = s; \ - uri->host.len = p - s; \ - state = URI_PORT; \ - s = p + 1; \ - break; \ - case ';': \ - uri->host.s = s; \ - uri->host.len = p - s; \ - state = URI_PARAM; \ - s = p + 1; \ - break; \ - case '?': \ - uri->host.s = s; \ - uri->host.len = p - s; \ - state = URI_HEADERS; \ - s = p + 1; \ - break; \ - case '&': \ - case '@': \ +#define check_host_end \ + case ':': \ + /* found the host */ \ + if(scheme != URN_SCH) { \ + uri->host.s = s; \ + uri->host.len = p - s; \ + state = URI_PORT; \ + s = p + 1; \ + } \ + break; \ + case ';': \ + uri->host.s = s; \ + uri->host.len = p - s; \ + state = URI_PARAM; \ + s = p + 1; \ + break; \ + case '?': \ + uri->host.s = s; \ + uri->host.len = p - s; \ + state = URI_HEADERS; \ + s = p + 1; \ + break; \ + case '&': \ + case '@': \ goto error_bad_char @@ -493,7 +495,7 @@ int parse_uri(char *buf, int len, struct sip_uri *uri) case '@': /* error no user part, or * be forgiving and accept it ? */ default: - state = URI_USER; + state = (scheme == URN_SCH) ? URI_HOST : URI_USER; } break; case URI_USER:

1 0

git:master:22880dbb: core: log message that #!endif requires EoL after it
by Daniel-Constantin Mierla 10 Jul '24

10 Jul '24

Module: kamailio Branch: master Commit: 22880dbb2171c2763b4df2731be49f208fde7e8c URL: https://github.com/kamailio/kamailio/commit/22880dbb2171c2763b4df2731be49f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-10T14:18:30+02:00 core: log message that #!endif requires EoL after it --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/22880dbb2171c2763b4df2731be49f2… Patch: https://github.com/kamailio/kamailio/commit/22880dbb2171c2763b4df2731be49f2… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index d77a237882b..407918aca72 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -281,6 +281,7 @@ void pp_ifdef_level_error(void) " %d more #!endif as #!if[n]def\n", (_pp_ifdef_level) * -1); } + LM_ERR("note: #!endif requires EoL after it, even before EoF\n"); } }

1 0

git:master:bd98aadf: corex: destroy nio_msg_avp avp after event_route[network:msg]
by Daniel-Constantin Mierla 10 Jul '24

10 Jul '24

Module: kamailio Branch: master Commit: bd98aadf9803c0c0789680d5ca781e86499f55cd URL: https://github.com/kamailio/kamailio/commit/bd98aadf9803c0c0789680d5ca781e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-10T14:01:23+02:00 corex: destroy nio_msg_avp avp after event_route[network:msg] --- Modified: src/modules/corex/corex_nio.c --- Diff: https://github.com/kamailio/kamailio/commit/bd98aadf9803c0c0789680d5ca781e8… Patch: https://github.com/kamailio/kamailio/commit/bd98aadf9803c0c0789680d5ca781e8… --- diff --git a/src/modules/corex/corex_nio.c b/src/modules/corex/corex_nio.c index 03175926753..4069565b892 100644 --- a/src/modules/corex/corex_nio.c +++ b/src/modules/corex/corex_nio.c @@ -111,17 +111,24 @@ int nio_msg_received(sr_event_param_t *evp) avp = NULL; avp = search_first_avp( nio_msg_avp_type, nio_msg_avp_name, &avp_value, 0); - if(avp != NULL && is_avp_str_val(avp)) { - msg.buf = avp_value.s.s; - msg.len = avp_value.s.len; - nbuf = nio_msg_update(&msg, (unsigned int *)&obuf->len); - if(obuf->len >= BUF_SIZE) { - LM_ERR("new buffer overflow (%d)\n", obuf->len); - pkg_free(nbuf); - return -1; + if(avp != NULL) { + if(is_avp_str_val(avp)) { + msg.buf = avp_value.s.s; + msg.len = avp_value.s.len; + nbuf = nio_msg_update(&msg, (unsigned int *)&obuf->len); + if(obuf->len >= BUF_SIZE) { + LM_ERR("new buffer overflow (%d)\n", obuf->len); + pkg_free(nbuf); + return -1; + } + memcpy(obuf->s, nbuf, obuf->len); + obuf->s[obuf->len] = '\0'; + } else { + LM_WARN("invalid value tyoe for AVP %.*s, using unmodified " + "message\n", + nio_msg_avp_param.len, nio_msg_avp_param.s); } - memcpy(obuf->s, nbuf, obuf->len); - obuf->s[obuf->len] = '\0'; + destroy_avp(avp); } else { LM_WARN("no value set for AVP %.*s, using unmodified message\n", nio_msg_avp_param.len, nio_msg_avp_param.s); @@ -164,18 +171,25 @@ int nio_msg_sent(sr_event_param_t *evp) avp = NULL; avp = search_first_avp( nio_msg_avp_type, nio_msg_avp_name, &avp_value, 0); - if(avp != NULL && is_avp_str_val(avp)) { - msg.buf = avp_value.s.s; - msg.len = avp_value.s.len; - nbuf.s = nio_msg_update(&msg, (unsigned int *)&nbuf.len); - if(nbuf.s != NULL) { - LM_DBG("new outbound buffer generated\n"); - pkg_free(obuf->s); - obuf->s = nbuf.s; - obuf->len = nbuf.len; + if(avp != NULL) { + if(is_avp_str_val(avp)) { + msg.buf = avp_value.s.s; + msg.len = avp_value.s.len; + nbuf.s = nio_msg_update(&msg, (unsigned int *)&nbuf.len); + if(nbuf.s != NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } } else { - LM_ERR("failed to generate new outbound buffer\n"); + LM_WARN("invalid value type for AVP %.*s, using unmodified " + "message\n", + nio_msg_avp_param.len, nio_msg_avp_param.s); } + destroy_avp(avp); } else { LM_WARN("no value set for AVP %.*s, using unmodified message\n", nio_msg_avp_param.len, nio_msg_avp_param.s);

1 0

git:master:5697cb17: modules: readme files regenerated - ndb_redis ... [skip ci]
by Kamailio Dev 09 Jul '24

09 Jul '24

Module: kamailio Branch: master Commit: 5697cb17d4d3dcb346b49c66cd3de265681051de URL: https://github.com/kamailio/kamailio/commit/5697cb17d4d3dcb346b49c66cd3de26… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-07-09T13:46:10+02:00 modules: readme files regenerated - ndb_redis ... [skip ci] --- Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/5697cb17d4d3dcb346b49c66cd3de26… Patch: https://github.com/kamailio/kamailio/commit/5697cb17d4d3dcb346b49c66cd3de26… --- diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 90071f5e3f0..3f180a1168e 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -135,7 +135,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * hiredis - available at https://github.com/antirez/hiredis . + * hiredis - available at https://github.com/redis/hiredis. 3. Parameters

1 0

git:master:501b7da6: ndb_redis: dpcs - updated link to hiredis library
by Daniel-Constantin Mierla 09 Jul '24

09 Jul '24

Module: kamailio Branch: master Commit: 501b7da6daaff354b000837b54bdb591947ac80a URL: https://github.com/kamailio/kamailio/commit/501b7da6daaff354b000837b54bdb59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-09T13:41:57+02:00 ndb_redis: dpcs - updated link to hiredis library --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/501b7da6daaff354b000837b54bdb59… Patch: https://github.com/kamailio/kamailio/commit/501b7da6daaff354b000837b54bdb59… --- diff --git a/src/modules/ndb_redis/doc/ndb_redis_admin.xml b/src/modules/ndb_redis/doc/ndb_redis_admin.xml index 024b01315ac..85287118725 100644 --- a/src/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/src/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -50,7 +50,7 @@ <listitem> <para> <emphasis>hiredis</emphasis> - available at - https://github.com/antirez/hiredis . + <ulink url="https://github.com/redis/hiredis">https://github.com/redis/hiredis</ulink>. </para> </listitem> </itemizedlist>

1 0

[kamailio/kamailio] WIP pkg: RPM packaging add kamailio-tls_wolfssl subpackage (PR #3592)
by space88man 09 Jul '24

09 Jul '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 Not for merging yet. Package tls_wolfssl as an alternative to OpenSSL 3.x. Depends on PR https://github.com/kamailio/kamailio/pull/3590 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3592 -- Commit Summary -- * pkg: RPM packaging add kamailio-tls_wolfssl subpackage -- File Changes -- M pkg/kamailio/obs/kamailio.spec (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3592.patch https://github.com/kamailio/kamailio/pull/3592.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3592 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3592(a)github.com>

5 27

git:master:dc2008b2: modules: readme files regenerated - ims_qos ... [skip ci]
by Kamailio Dev 09 Jul '24

09 Jul '24

Module: kamailio Branch: master Commit: dc2008b29395f5e45dffd270b6aa74f0c0a9a0d2 URL: https://github.com/kamailio/kamailio/commit/dc2008b29395f5e45dffd270b6aa74f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-07-09T09:31:10+02:00 modules: readme files regenerated - ims_qos ... [skip ci] --- Modified: src/modules/ims_qos/README Modified: src/modules/ims_registrar_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/dc2008b29395f5e45dffd270b6aa74f… Patch: https://github.com/kamailio/kamailio/commit/dc2008b29395f5e45dffd270b6aa74f…

1 0

[kamailio/kamailio] ims_registrar_pcscf,ims_qos: support for trusting bottom via (PR #3901)
by Dragos Vingarzan 09 Jul '24

09 Jul '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 - [x] Related to PR https://github.com/kamailio/kamailio/pull/3891 #### Description  Normally, the IMS P-CSCF should identify the clients (UEs) by the received IP address and ports on Rx. The current code is using a mix of that, plus using Contact and Via headers, with arguable potential security issues. This patch adds a new parameter to `ims_registrar_pcscf` and `ims_qos` modules, allowing for an optional outsource of the IPsec functionality to another element, which is also in charge of checking/enforcing correct UE Via header. The existing code is allowed to work as before, with the default value of the flag being towards that. List of functional changes: - `ims_qos` - added `trust_bottom_via` parameter - used it on `w_rx_aar_register()` - `ims_registrar_pcscf` - added `trust_bottom_via` parameter - used it on `update_contacts()`, `save_pending()`, `check_contact()`, `getContactP()`, `check_service_routes()`, `enforce_service_routes()` - made `ims_ipsec_pcscf` dependency optional, with checks when used - skipped checks of `port-uc` in `checkcontact()` if the `ims_ipsec_pcscf` module was not loaded - added `ignore_contact_rxproto_check` parameter - IMS devices open IPsec Security Associations just between IPs and ports, with both UDP and TCP protocols allowed. The default then was set here to always ignore protocol checks. Before, the `ignore_contact_rxport_check` was used to skip this and still make it work, but that seemed like a typo/mistake with hidden effects. List of indirect changes: - `core/ut.h`: added a `str2ushort()` macro, since code was using some dangerous casting and macros with a larger type - `ims_registrar_pcscf`: added `Route` headers in `SUBSCRIBE` to `reginfo`, with values from `Service-Route`s, as per 3GPP specs. - `ims_usrloc_pcscf`: small log fixes You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3901 -- Commit Summary -- * core: added str2ushort() to avoid some questionable casting in ims_qos * lib/ims: fixed a typo in a log message * ims_usrloc_pcscf: small log fixes * ims_qos: added trust_bottom_via parameter * ims_registrar_pcscf: added trust_bottom_via parameter, added ignore_contact_rxproto_check, fixes for logging, fixes for SUBSCRIBE to reginfo for including Service-Route, allow use without ims_ipsec_pcscf -- File Changes -- M src/core/ut.h (8) M src/lib/ims/ims_getters.c (2) M src/modules/ims_qos/doc/ims_qos.xml (6) M src/modules/ims_qos/doc/ims_qos_admin.xml (41) M src/modules/ims_qos/ims_qos_mod.c (27) M src/modules/ims_qos/rx_aar.h (4) M src/modules/ims_qos/rx_authdata.h (2) M src/modules/ims_qos/rx_avp.c (2) M src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf.xml (6) M src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml (73) M src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c (26) M src/modules/ims_registrar_pcscf/notify.c (2) M src/modules/ims_registrar_pcscf/save.c (80) M src/modules/ims_registrar_pcscf/service_routes.c (136) M src/modules/ims_registrar_pcscf/subscribe.c (74) M src/modules/ims_registrar_pcscf/subscribe.h (4) M src/modules/ims_usrloc_pcscf/udomain.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3901.patch https://github.com/kamailio/kamailio/pull/3901.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3901 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3901(a)github.com>

2 4

git:master:89830833: ims_registrar_pcscf: added trust_bottom_via parameter, added ignore_contact_rxproto_check, fixes for logging, fixes for SUBSCRIBE to reginfo for including Service-Route, allow use without ims_ipsec_pcscf
by Dragos Vingarzan 09 Jul '24

09 Jul '24

Module: kamailio Branch: master Commit: 898308334982b39d668410b51b90835b57b8a4c2 URL: https://github.com/kamailio/kamailio/commit/898308334982b39d668410b51b90835… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-09T09:22:36+02:00 ims_registrar_pcscf: added trust_bottom_via parameter, added ignore_contact_rxproto_check, fixes for logging, fixes for SUBSCRIBE to reginfo for including Service-Route, allow use without ims_ipsec_pcscf --- Modified: src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf.xml Modified: src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml Modified: src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c Modified: src/modules/ims_registrar_pcscf/notify.c Modified: src/modules/ims_registrar_pcscf/save.c Modified: src/modules/ims_registrar_pcscf/service_routes.c Modified: src/modules/ims_registrar_pcscf/subscribe.c Modified: src/modules/ims_registrar_pcscf/subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/898308334982b39d668410b51b90835… Patch: https://github.com/kamailio/kamailio/commit/898308334982b39d668410b51b90835…

1 0

git:master:d87d0328: ims_qos: added trust_bottom_via parameter
by Dragos Vingarzan 09 Jul '24

09 Jul '24

Module: kamailio Branch: master Commit: d87d03285c83cded13a873338ec9cc6c2c55be30 URL: https://github.com/kamailio/kamailio/commit/d87d03285c83cded13a873338ec9cc6… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-09T09:22:36+02:00 ims_qos: added trust_bottom_via parameter --- Modified: src/modules/ims_qos/doc/ims_qos.xml Modified: src/modules/ims_qos/doc/ims_qos_admin.xml Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.h Modified: src/modules/ims_qos/rx_authdata.h Modified: src/modules/ims_qos/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/d87d03285c83cded13a873338ec9cc6… Patch: https://github.com/kamailio/kamailio/commit/d87d03285c83cded13a873338ec9cc6…

1 0

git:master:9a87ec98: ims_usrloc_pcscf: small log fixes
by Dragos Vingarzan 09 Jul '24

09 Jul '24

Module: kamailio Branch: master Commit: 9a87ec98cf8aacc73b87846570202cbe69ebe837 URL: https://github.com/kamailio/kamailio/commit/9a87ec98cf8aacc73b87846570202cb… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-09T09:22:36+02:00 ims_usrloc_pcscf: small log fixes --- Modified: src/modules/ims_usrloc_pcscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/9a87ec98cf8aacc73b87846570202cb… Patch: https://github.com/kamailio/kamailio/commit/9a87ec98cf8aacc73b87846570202cb… --- diff --git a/src/modules/ims_usrloc_pcscf/udomain.c b/src/modules/ims_usrloc_pcscf/udomain.c index 5a4c5ba659e..248684cb00b 100644 --- a/src/modules/ims_usrloc_pcscf/udomain.c +++ b/src/modules/ims_usrloc_pcscf/udomain.c @@ -496,7 +496,7 @@ int get_pcontact_from_cache(udomain_t *_d, pcontact_info_t *contact_info, contact_info->aor.len, contact_info->aor.s); return 1; } - LM_DBG("checking for rinstance"); + LM_DBG("checking for rinstance\n"); /*check for alias - NAT */ params = needle_uri.sip_params.s; params_len = needle_uri.sip_params.len; @@ -548,7 +548,7 @@ int get_pcontact_from_cache(udomain_t *_d, pcontact_info_t *contact_info, int check2_passed = 0; ip_addr_t c_ip_addr; ip_addr_t ci_ip_addr; - LM_DBG("mached a record by aorhash: %u\n", aorhash); + LM_DBG("matched a record by aorhash: %u\n", aorhash); // convert 'contact->contact host' ip string to ip_addr_t if(str2ipxbuf(&c->contact_host, &c_ip_addr) < 0) {

1 0

git:master:f105bc50: lib/ims: fixed a typo in a log message
by Dragos Vingarzan 09 Jul '24

09 Jul '24

Module: kamailio Branch: master Commit: f105bc507a8e63fd7f6e493265a39ab4b2cdf9b4 URL: https://github.com/kamailio/kamailio/commit/f105bc507a8e63fd7f6e493265a39ab… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-09T09:22:36+02:00 lib/ims: fixed a typo in a log message --- Modified: src/lib/ims/ims_getters.c --- Diff: https://github.com/kamailio/kamailio/commit/f105bc507a8e63fd7f6e493265a39ab… Patch: https://github.com/kamailio/kamailio/commit/f105bc507a8e63fd7f6e493265a39ab… --- diff --git a/src/lib/ims/ims_getters.c b/src/lib/ims/ims_getters.c index c752f08eef1..cf2f618d0de 100644 --- a/src/lib/ims/ims_getters.c +++ b/src/lib/ims/ims_getters.c @@ -1638,7 +1638,7 @@ str *cscf_get_service_route(struct sip_msg *msg, int *size, int is_shm) } x = pkg_reallocxf(x, (*size + k) * sizeof(str)); if(!x) { - LM_ERR("Error our of pkg memory"); + LM_ERR("Error out of pkg memory"); return 0; } r2 = r;

1 0

git:master:cc376804: core: added str2ushort() to avoid some questionable casting in ims_qos
by Dragos Vingarzan 09 Jul '24

09 Jul '24

Module: kamailio Branch: master Commit: cc376804ef2bb5064bbff9e3c963a5d9222568b3 URL: https://github.com/kamailio/kamailio/commit/cc376804ef2bb5064bbff9e3c963a5d… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-09T09:22:36+02:00 core: added str2ushort() to avoid some questionable casting in ims_qos --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/cc376804ef2bb5064bbff9e3c963a5d… Patch: https://github.com/kamailio/kamailio/commit/cc376804ef2bb5064bbff9e3c963a5d… --- diff --git a/src/core/ut.h b/src/core/ut.h index 1efd7abd242..aa51108229b 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -700,6 +700,14 @@ static inline int str2int(str *_s, unsigned int *_r) str2unval(_s, _r, int, UINT_MAX); } +/* + * Convert a str to unsigned short + */ +static inline int str2ushort(str *_s, unsigned short *_r) +{ + str2unval(_s, _r, short, USHRT_MAX); +} + #define str2snval(_s, _r, _vtype, _vmin, _vmax) \ do { \

1 0

git:5.8:dbe51dc4: db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x
by S-P Chan 09 Jul '24

09 Jul '24

Module: kamailio Branch: 5.8 Commit: dbe51dc4ee53f6e4f00450745db709a9d741c481 URL: https://github.com/kamailio/kamailio/commit/dbe51dc4ee53f6e4f00450745db709a… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-07-09T13:40:05+08:00 db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x - MYSQL_OPT_SSL_CA is an enum not a macro - base check on MYSQL_VERSION_ID - 50568 used in CentOS 7 Addresses #3910 (cherry-picked from commit 92cfedaaffb034db536f3bcf68695b433db92706) --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/dbe51dc4ee53f6e4f00450745db709a… Patch: https://github.com/kamailio/kamailio/commit/dbe51dc4ee53f6e4f00450745db709a… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 240d3f59a76..37508ce24c0 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -179,14 +179,14 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) #endif /* MYSQL_VERSION_ID */ #endif /* MARIADB_BASE_VERSION */ -#ifdef MYSQL_OPT_SSL_CA +#if(MYSQL_VERSION_ID >= 50600) if(db_mysql_opt_ssl_ca) mysql_options( ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca); #else - LM_DBG("opt_ssl_ca option not supported by mysql version (value %s) - " + LM_DBG("opt_ssl_ca option not supported by mysql version (value %d) - " "ignoring\n", - db_mysql_opt_ssl_ca); + MYSQL_VERSION_ID); #endif /* MYSQL_OPT_SSL_CA */ #ifdef KSR_MYSQL_OPT_RECONNECT

1 0

git:master:92cfedaa: db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x
by S-P Chan 09 Jul '24

09 Jul '24

Module: kamailio Branch: master Commit: 92cfedaaffb034db536f3bcf68695b433db92706 URL: https://github.com/kamailio/kamailio/commit/92cfedaaffb034db536f3bcf68695b4… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-07-09T10:53:07+08:00 db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x - MYSQL_OPT_SSL_CA is an enum not a macro - base check on MYSQL_VERSION_ID - 50568 used in CentOS 7 Addresses #3910 --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/92cfedaaffb034db536f3bcf68695b4… Patch: https://github.com/kamailio/kamailio/commit/92cfedaaffb034db536f3bcf68695b4… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 240d3f59a76..37508ce24c0 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -179,14 +179,14 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) #endif /* MYSQL_VERSION_ID */ #endif /* MARIADB_BASE_VERSION */ -#ifdef MYSQL_OPT_SSL_CA +#if(MYSQL_VERSION_ID >= 50600) if(db_mysql_opt_ssl_ca) mysql_options( ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca); #else - LM_DBG("opt_ssl_ca option not supported by mysql version (value %s) - " + LM_DBG("opt_ssl_ca option not supported by mysql version (value %d) - " "ignoring\n", - db_mysql_opt_ssl_ca); + MYSQL_VERSION_ID); #endif /* MYSQL_OPT_SSL_CA */ #ifdef KSR_MYSQL_OPT_RECONNECT

1 0

git:master:0fc0c7b3: Revert "db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x"
by S-P Chan 09 Jul '24

09 Jul '24

Module: kamailio Branch: master Commit: 0fc0c7b3d3d6ded300c46f504406447670fee4e8 URL: https://github.com/kamailio/kamailio/commit/0fc0c7b3d3d6ded300c46f504406447… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-07-09T10:50:14+08:00 Revert "db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x" This reverts commit 5b2be5e2c716ad8f8502b3be3db5194eb8474d39. The commit should check >= not < --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/0fc0c7b3d3d6ded300c46f504406447… Patch: https://github.com/kamailio/kamailio/commit/0fc0c7b3d3d6ded300c46f504406447… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 21ac5023c81..240d3f59a76 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -179,15 +179,15 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) #endif /* MYSQL_VERSION_ID */ #endif /* MARIADB_BASE_VERSION */ -#if(MYSQL_VERSION_ID < 50600) +#ifdef MYSQL_OPT_SSL_CA if(db_mysql_opt_ssl_ca) mysql_options( ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca); #else - LM_DBG("opt_ssl_ca option not supported by mysql version (value %s:%d) - " + LM_DBG("opt_ssl_ca option not supported by mysql version (value %s) - " "ignoring\n", - MYSQL_SERVER_VERSION, MYSQL_VERSION_ID); -#endif /* MYSQL_VERSION_ID */ + db_mysql_opt_ssl_ca); +#endif /* MYSQL_OPT_SSL_CA */ #ifdef KSR_MYSQL_OPT_RECONNECT /* set reconnect flag if enabled */

1 0

[kamailio/kamailio] [db_mysql] MYSQL_OPT_SSL_CA is an enum not a macro (Issue #3910)
by space88man 09 Jul '24

09 Jul '24

### Description Recent commit ``` d53843c75da src/modules/db_mysql/km_my_con.c (Sergey Safarov 2024-05-11 17:45:08 +0300 182) #ifdef MYSQL_OPT_SSL_CA ``` breaks db_mysql on 5.8.2 ``` Jul 09 08:40:31 voip-ssl3.voip.test /usr/local/kamailio/sbin/kamailio[10982]: WARNING: db_mysql [km_my_con.c:187]: db_mysql_new_connection(): opt_ssl_ca option not supported by mysql version (value /etc/pki/tls/certs/ca-cert.pem) - ignoring Jul 09 08:40:31 voip-ssl3.voip.test /usr/local/kamailio/sbin/kamailio[10982]: ERROR: db_mysql [km_my_con.c:217]: db_mysql_new_connection(): driver error: SSL connection error: CA certificate is required if ssl-mode is VERIFY_CA or VERIFY_IDENTITY ``` Ping @sergey-safarov ### Troubleshooting #### Reproduction * use 5.8.2 * configure `db_mysql` to use TLS with verification #### Debugging Data #### Log Messages ``` Jul 09 08:40:31 voip-ssl3.voip.test /usr/local/kamailio/sbin/kamailio[10982]: WARNING: db_mysql [km_my_con.c:187]: db_mysql_new_connection(): opt_ssl_ca option not supported by mysql version (value /etc/pki/tls/certs/ca-cert.pem) - ignoring Jul 09 08:40:31 voip-ssl3.voip.test /usr/local/kamailio/sbin/kamailio[10982]: ERROR: db_mysql [km_my_con.c:217]: db_mysql_new_connection(): driver error: SSL connection error: CA certificate is required if ssl-mode is VERIFY_CA or VERIFY_IDENTITY ``` ### Additional Information * **Kamailio Version** - 5.8.2 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3910 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3910(a)github.com>

1 2

git:master:5b2be5e2: db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x
by S-P Chan 09 Jul '24

09 Jul '24

Module: kamailio Branch: master Commit: 5b2be5e2c716ad8f8502b3be3db5194eb8474d39 URL: https://github.com/kamailio/kamailio/commit/5b2be5e2c716ad8f8502b3be3db5194… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-07-09T10:38:44+08:00 db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x - MYSQL_OPT_SSL_CA is an enum not a macro - base check on MYSQL_VERSION_ID - 50568 used in CentOS 7 Addresses #3910 --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/5b2be5e2c716ad8f8502b3be3db5194… Patch: https://github.com/kamailio/kamailio/commit/5b2be5e2c716ad8f8502b3be3db5194… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 240d3f59a76..21ac5023c81 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -179,15 +179,15 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) #endif /* MYSQL_VERSION_ID */ #endif /* MARIADB_BASE_VERSION */ -#ifdef MYSQL_OPT_SSL_CA +#if(MYSQL_VERSION_ID < 50600) if(db_mysql_opt_ssl_ca) mysql_options( ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca); #else - LM_DBG("opt_ssl_ca option not supported by mysql version (value %s) - " + LM_DBG("opt_ssl_ca option not supported by mysql version (value %s:%d) - " "ignoring\n", - db_mysql_opt_ssl_ca); -#endif /* MYSQL_OPT_SSL_CA */ + MYSQL_SERVER_VERSION, MYSQL_VERSION_ID); +#endif /* MYSQL_VERSION_ID */ #ifdef KSR_MYSQL_OPT_RECONNECT /* set reconnect flag if enabled */

1 0

[kamailio/kamailio] ims_registrar_pcscf,ims_qos: added a parameter for trusting the bottom Via header on requests (PR #3891)
by Dragos Vingarzan 08 Jul '24

08 Jul '24

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - Not yet - first let's see if the work is valid, then I'll recompose the whole work to satisfy this. Otherwise... if I need to fix something, it's too hard to work like this... - [ ] Each component has a single commit (if not, squash them into one commit) - ditto - [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  Normally, the IMS P-CSCF should identify the clients (UEs) by the received IP address and ports on Rx. The current code is using a mix of that, plus using Contact and Via headers, with arguable potential security issues. This patch adds a new parameter to `ims_registrar_pcscf` and `ims_qos` modules, allowing for an optional outsource of the IPsec functionality to another element, which is also in charge of checking/enforcing correct UE Via header. The existing code is allowed to work as before, with the default value of the flag being towards that. List of functional changes: - `ims_qos` - added `trust_bottom_via` parameter - List of indirect changes: - default I-CSCF config example contained a questionable line which adds a `+` as a prefix in Request-URI. After way too much time wasted to figure out why the Diameter LIR has bogus SIP or TEL URI values in UserName AVP, I have discovered this. Seems like someone had just tel-URIs in their network, but otherwise the blind addition of this prefix makes no sense to me. - added a `str2ushort()` macro, since code was using some dangerous casting and macros with a larger type - List of non-functional fixes: - spelling in comments - comments at the end of line moved above the line they refer to; with just 80 columns code-formatting, commenting on the same line provides for some super weird and hard to read code, so IMHO should not be allowed (or ... much harder now... increase to 120 columns) - You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3891 -- Commit Summary -- * squashed work -- File Changes -- M misc/examples/ims/icscf/kamailio.cfg (4) M src/core/ut.h (36) M src/lib/ims/ims_getters.c (2) M src/modules/ims_icscf/location.c (10) M src/modules/ims_qos/ims_qos_mod.c (27) M src/modules/ims_qos/ims_qos_mod.h (1) M src/modules/ims_qos/rx_aar.h (4) M src/modules/ims_qos/rx_authdata.h (2) M src/modules/ims_qos/rx_avp.c (2) M src/modules/ims_qos/rx_avp.h (1) M src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml (39) M src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c (18) M src/modules/ims_registrar_pcscf/notify.c (2) M src/modules/ims_registrar_pcscf/save.c (78) M src/modules/ims_registrar_pcscf/service_routes.c (125) M src/modules/ims_registrar_pcscf/subscribe.c (75) M src/modules/ims_registrar_pcscf/subscribe.h (4) M src/modules/ims_usrloc_pcscf/udomain.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3891.patch https://github.com/kamailio/kamailio/pull/3891.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3891 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3891(a)github.com>

2 20

[kamailio/kamailio] Base58 not decoding correctly (Issue #3907)
by duarterocha91 08 Jul '24

08 Jul '24

### Description When doing base58 encoding and decoding there is some issue with the decoded string. Here is my code to ilustrate the issue : $var(Test) = "test_string"; $var(Test) = $(var(Test){s.encode.base58}); xerr("Test String encoded = STRING_BEGIN$var(Test)STRING_END"); $var(Test) = $(var(Test){s.decode.base58}); xerr("Test String decoded = STRING_BEGIN$var(Test)STRING_END"); It has the following output : ![image](https://github.com/kamailio/kamailio/assets/28625449/f9b10fd3-6e75-4368-9abd-005d44cc1235) I've inserted STRING_BEGIN and STRING_END in the log to be able to know when string ends. After this i've tried to user {s.trim} method with no success. I've noticed that despite not printing correctly, the string's length is calculated correctly, so i did a manual substring and was able to fix it. xerr("Test Base58"); $var(Test) = "test_string"; $var(Test) = $(var(Test){s.encode.base58}); xerr("Test String encoded = STRING_BEGIN$var(Test)STRING_END"); $var(Test) = $(var(Test){s.decode.base58}); xerr("Test String decoded = STRING_BEGIN$var(Test)STRING_END"); $var(Test) = $(var(Test){s.trim}); xerr("Test String decoded and trimmed = STRING_BEGIN$var(Test)STRING_END"); $var(substring_length) = $(var(Test){s.len}) - 1; $var(Test) = $(var(Test){s.substr,0,$var(substring_length)}); xerr("Test String decoded and fixed = STRING_BEGIN$var(Test)STRING_END"); Output : ![image](https://github.com/kamailio/kamailio/assets/28625449/9a100c45-4671-4381-9ddf-3a1c8c9404ee) All of this doesn't happen with method for base64 for example ### Additional Information version: kamailio 5.7.1 (x86_64/linux) 4238e4 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 4238e4 compiled on 12:39:30 Jun 29 2023 with gcc 4.8.5 * **Operating System**: CentOS 7 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3907 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3907(a)github.com>

2 2

git:master:9d923764: core: basex - compute lenght for base58 decode
by Daniel-Constantin Mierla 08 Jul '24

08 Jul '24

Module: kamailio Branch: master Commit: 9d923764747ff36152fc930da66e972201516b7b URL: https://github.com/kamailio/kamailio/commit/9d923764747ff36152fc930da66e972… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-08T12:08:13+02:00 core: basex - compute lenght for base58 decode - GH #3907 --- Modified: src/core/basex.c --- Diff: https://github.com/kamailio/kamailio/commit/9d923764747ff36152fc930da66e972… Patch: https://github.com/kamailio/kamailio/commit/9d923764747ff36152fc930da66e972… --- diff --git a/src/core/basex.c b/src/core/basex.c index a112ce77adb..2871afa22ee 100644 --- a/src/core/basex.c +++ b/src/core/basex.c @@ -412,7 +412,7 @@ char *b58_decode(char *outb, int *outbszp, char *b58, int b58sz) break; --*outbszp; } - *outbszp += zerocount; + *outbszp = strlen(outb + i); return outb + i; }

1 0

[kamailio/kamailio] kamailio 5.7.6 startup (Issue #3908)
by alekamailio 08 Jul '24

08 Jul '24

Hello, Upgraded the kamailio version from 5.7.5 to 5.7.6 and after restart the service got the follow WARNING, WARNING: db_mysql [km_my_con.c:179]: db_mysql_new_connection(): opt_ssl_ca option not supported by mysql version (value (null)) - ignoring, when downgrade to 5.7.5 dindt happend. Thanks -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3908 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3908(a)github.com>

2 2

git:5.7:184aaf99: db_mysql: switch warn to dbg for log messages for opt_ssl_ca option
by Daniel-Constantin Mierla 08 Jul '24

08 Jul '24

Module: kamailio Branch: 5.7 Commit: 184aaf991b6ad74b63a7f8724058cd4066f3bbd3 URL: https://github.com/kamailio/kamailio/commit/184aaf991b6ad74b63a7f8724058cd4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-07T09:35:36+02:00 db_mysql: switch warn to dbg for log messages for opt_ssl_ca option fixes #3884 (cherry picked from commit be5172a84b02a1ab4fc7e97e7dc0813056302bdd) (cherry picked from commit 4c75991aa662bddc1bbe65c83f7861cb72a65a61) --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/184aaf991b6ad74b63a7f8724058cd4… Patch: https://github.com/kamailio/kamailio/commit/184aaf991b6ad74b63a7f8724058cd4… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 8534ac0a156..d6c7a43bdac 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -174,8 +174,8 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) mysql_options( ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca); #else - LM_WARN("opt_ssl_ca option not supported by mysql version (value %s) - " - "ignoring\n", + LM_DBG("opt_ssl_ca option not supported by mysql version (value %s) - " + "ignoring\n", db_mysql_opt_ssl_ca); #endif /* MYSQL_OPT_SSL_CA */

1 0

git:5.7:64f0c3f3: db_mysql: switch warn to dbg for log messages for opt_ssl_mode
by Daniel-Constantin Mierla 08 Jul '24

08 Jul '24

Module: kamailio Branch: 5.7 Commit: 64f0c3f3979de7a40732067792d89c6d3b1c23d4 URL: https://github.com/kamailio/kamailio/commit/64f0c3f3979de7a40732067792d89c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-07T09:35:27+02:00 db_mysql: switch warn to dbg for log messages for opt_ssl_mode - GH #3884 (cherry picked from commit 8f98317e92da61160a1c416e0da45938a205d358) (cherry picked from commit 7360ab7fbe672259c7433b1a5199467d24183d79) --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/64f0c3f3979de7a40732067792d89c6… Patch: https://github.com/kamailio/kamailio/commit/64f0c3f3979de7a40732067792d89c6… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 04982292673..8534ac0a156 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -133,7 +133,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) #if MYSQL_VERSION_ID >= 100339 mysql_options(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&(int){1}); #else - LM_WARN("ssl mode not supported by %s\n", MARIADB_BASE_VERSION); + LM_DBG("ssl mode not supported by %s\n", MARIADB_BASE_VERSION); #endif break; case 5: /* SSL_MODE_VERIFY_IDENTITY */ @@ -141,7 +141,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) (void *)&(int){1}); break; default: - LM_WARN("opt_ssl_mode = %d not supported by MariaDB Connector/C\n", + LM_DBG("opt_ssl_mode = %d not supported by MariaDB Connector/C\n", db_mysql_opt_ssl_mode); break; }

1 0

[kamailio/kamailio] performance regression related to new TCP connection tracking feature with a high number of connections (Issue #3759)
by Henning Westerholt 05 Jul '24

05 Jul '24

### Description On systems with a high number of TCP sessions there can be a significant performance regression observed, probably related to the newly added TCP connection tracking feature. ### Troubleshooting #### Reproduction No special configuration is necessary, just install the latest 5.7.x release, e.g. 5.7.3 on a production system with a lot of clients connected over TCP or TLS. You need to have a large number of clients connected to be able to observe the regression. For a high number of connections (e.g. more then 20.000 up to 30.000 connections) the Kamailio servers uses about 30% to 50% more CPU as with the old version. #### Debugging Data Two graphs were attached to this issue. The first shows the CPU load before (less load) and after the upgrade (increased load). The second is a flamegraph that shows that over 80% of the CPU time is spent in the newly added function tcp_connection_limit_srcip(). <img width="372" alt="cpu-load-before-after" src="https://github.com/kamailio/kamailio/assets/6481937/ec92c41b-25e2-4847-a4bc…"> ![flamegraph](https://github.com/kamailio/kamailio/assets/6481937/5c2e3982-2d5b-4acd-a774-bad8fa64bd0a) Most of the CPU time is spend in the TCP main process, as expected. #### Log Messages No special log messages could be observed. #### SIP Traffic ### Possible Solutions The TCP limit feature should probably be optimized to not cause such a large performance regression. It should be also possible to deactivate it completly and therefore getting a comparable performance as before the feature addition. ### Additional Information Kamailio 5.7.3 and probably also git master version. * **Operating System**: Debian 11, Debian 12 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3759 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3759(a)github.com>

2 6

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev