sr-dev

sr-dev@lists.kamailio.org

15 participants
44213 discussions

git:master:cc376804: core: added str2ushort() to avoid some questionable casting in ims_qos

by Dragos Vingarzan

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 { \

6 months, 1 week

git:master:f105bc50: lib/ims: fixed a typo in a log message

by Dragos Vingarzan

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;

6 months, 1 week

git:master:9a87ec98: ims_usrloc_pcscf: small log fixes

by Dragos Vingarzan

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) {

6 months, 1 week

git:5.8:dbe51dc4: db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x

by S-P Chan

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

6 months, 1 week

git:master:0fc0c7b3: Revert "db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x"

by S-P Chan

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 */

6 months, 1 week

git:master:92cfedaa: db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x

by S-P Chan

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

6 months, 1 week

[kamailio/kamailio] [db_mysql] MYSQL_OPT_SSL_CA is an enum not a macro (Issue #3910)

by space88man

### 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>

6 months, 1 week

git:master:5b2be5e2: db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x

by S-P Chan

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 */

6 months, 1 week

[kamailio/kamailio] ims_registrar_pcscf,ims_qos: added a parameter for trusting the bottom Via header on requests (PR #3891)

by Dragos Vingarzan

#### 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>

6 months, 1 week

[kamailio/kamailio] Base58 not decoding correctly (Issue #3907)

by duarterocha91

### 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>

6 months, 1 week

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev