sr-dev July 2024

sr-dev@lists.kamailio.org

16 participants
212 discussions

git:master:48730820: core: action - logical OR for log() parameter types check
by Daniel-Constantin Mierla 11 Jul '24

11 Jul '24

Module: kamailio Branch: master Commit: 487308204d2674368a16ea913137a368761dd0b2 URL: https://github.com/kamailio/kamailio/commit/487308204d2674368a16ea913137a36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-11T15:27:37+02:00 core: action - logical OR for log() parameter types check --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/487308204d2674368a16ea913137a36… Patch: https://github.com/kamailio/kamailio/commit/487308204d2674368a16ea913137a36… --- diff --git a/src/core/action.c b/src/core/action.c index bd75eacec33..62f2910d09b 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -511,8 +511,8 @@ int do_action(struct run_act_ctx *h, struct action *a, struct sip_msg *msg) } break; case LOG_T: - if((a->val[0].type != NUMBER_ST) | (a->val[1].type != STRING_ST)) { - LM_CRIT("bad log() types %d, %d\n", a->val[0].type, + if((a->val[0].type != NUMBER_ST) || (a->val[1].type != STRING_ST)) { + LM_CRIT("bad log() parameter types %d, %d\n", a->val[0].type, a->val[1].type); ret = E_BUG; goto error;

1 0

[kamailio/kamailio] core: Improved URN parsing according to RFC8141 (PR #3909)
by Nirv.Ana 11 Jul '24

11 Jul '24

4 4

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

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

← Newer
1
...
12
13
14
15
16
17
18
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2024