sr-dev February 2025

sr-dev@lists.kamailio.org

9 participants
177 discussions

[kamailio/kamailio] secfilter: search by prefix is dependant on order of added items (PR #4143)
by Simon Darienko 08 Feb '25

08 Feb '25

#### 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 - [x] 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: - [x] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #4141 #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4143 -- Commit Summary -- * secfilter: secf_check_dst function is dependant on order of items added to the list -- File Changes -- M src/modules/secfilter/secfilter.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4143.patch https://github.com/kamailio/kamailio/pull/4143.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4143 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4143(a)github.com>

1 4

[kamailio/kamailio] Secfilter `secf_check_dst` function is dependant on order of items added to the list (Issue #4141)
by Ihor Olkhovskyi 07 Feb '25

07 Feb '25

If destinations is being added in `secfilter` starting with the lowest length, all other subsequent destinations with higher length are ignored. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4141 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4141(a)github.com>

2 2

[kamailio/kamailio] secfilter: fix secf_check_dst bug (PR #4142)
by Jose Luis Verdeguer 07 Feb '25

07 Feb '25

#### 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 - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #4141 (replace XXXX with an open issue number) #### Description  Fix problem with dst.len value You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4142 -- Commit Summary -- * secfilter: fix secf_check_dst bug -- File Changes -- M src/modules/secfilter/secfilter.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4142.patch https://github.com/kamailio/kamailio/pull/4142.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4142 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4142(a)github.com>

1 1

git:master:578c2abb: secfilter: fix secf_check_dst bug
by Jose Luis Verdeguer 07 Feb '25

07 Feb '25

Module: kamailio Branch: master Commit: 578c2abb36b9101bfc1dddc1505f7239e928b98e URL: https://github.com/kamailio/kamailio/commit/578c2abb36b9101bfc1dddc1505f723… Author: pepelux <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2025-02-07T19:23:39+01:00 secfilter: fix secf_check_dst bug --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/578c2abb36b9101bfc1dddc1505f723… Patch: https://github.com/kamailio/kamailio/commit/578c2abb36b9101bfc1dddc1505f723… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index ff95ec74762..2518a7d7487 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -341,6 +341,7 @@ static int ki_check_dst(struct sip_msg *msg, str *val) } } else { /* Any match */ + dst.len = val->len; if(dst.len > list->s.len) dst.len = list->s.len; if(cmpi_str(&list->s, &dst) == 0) {

1 0

git:master:68de38d5: dispatcher: switch to ksr_xrand() to be able to use custom rand function
by Daniel-Constantin Mierla 07 Feb '25

07 Feb '25

Module: kamailio Branch: master Commit: 68de38d51fb3773fbc5dbce0068bec1597783386 URL: https://github.com/kamailio/kamailio/commit/68de38d51fb3773fbc5dbce0068bec1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-07T07:52:19+01:00 dispatcher: switch to ksr_xrand() to be able to use custom rand function --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/68de38d51fb3773fbc5dbce0068bec1… Patch: https://github.com/kamailio/kamailio/commit/68de38d51fb3773fbc5dbce0068bec1… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index ca1636edbd2..9968eab5537 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -57,6 +57,7 @@ #include "../../core/script_cb.h" #include "../../core/kemi.h" #include "../../core/fmsg.h" +#include "../../core/rand/ksrxrand.h" #include "ds_ht.h" #include "api.h" @@ -790,7 +791,7 @@ void shuffle_uint100array(unsigned int *arr) if(arr == NULL) return; for(j = 0; j < 100; j++) { - k = j + (kam_rand() % (100 - j)); + k = j + (ksr_xrand() % (100 - j)); t = arr[j]; arr[j] = arr[k]; arr[k] = t; @@ -807,7 +808,7 @@ void shuffle_char100array(char *arr) if(arr == NULL) return; for(j = 0; j < 100; j++) { - k = j + (kam_rand() % (100 - j)); + k = j + (ksr_xrand() % (100 - j)); t = arr[j]; arr[j] = arr[k]; arr[k] = t; @@ -2614,7 +2615,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } break; case DS_ALG_RANDOM: /* 6 - random selection */ - hash = kam_rand(); + hash = ksr_xrand(); break; case DS_ALG_HASHPV: /* 7 - hash on PV value */ if(ds_hash_pvar(msg, &hash) != 0) { diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index b0d37bce288..c72b53bc7e2 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -35,7 +35,6 @@ #include "../../core/pvar.h" #include "../../core/xavp.h" #include "../../core/parser/msg_parser.h" -#include "../../core/rand/kam_rand.h" #include "../../modules/tm/tm_load.h"

1 0

git:master:c33f1f49: core: ksrxrand - framework to set custom rand/srand functions
by Daniel-Constantin Mierla 07 Feb '25

07 Feb '25

Module: kamailio Branch: master Commit: c33f1f494f1e7ff9deb887f58644fb21934f9b0e URL: https://github.com/kamailio/kamailio/commit/c33f1f494f1e7ff9deb887f58644fb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-07T07:44:45+01:00 core: ksrxrand - framework to set custom rand/srand functions --- Added: src/core/rand/ksrxrand.c Added: src/core/rand/ksrxrand.h --- Diff: https://github.com/kamailio/kamailio/commit/c33f1f494f1e7ff9deb887f58644fb2… Patch: https://github.com/kamailio/kamailio/commit/c33f1f494f1e7ff9deb887f58644fb2… --- diff --git a/src/core/rand/ksrxrand.c b/src/core/rand/ksrxrand.c new file mode 100644 index 00000000000..e0938cf47d5 --- /dev/null +++ b/src/core/rand/ksrxrand.c @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2025 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <string.h> + +#include "../dprint.h" + +#include "fastrand.h" +#include "ksrxrand.h" + +/** + * wrapper function for rand()/random() + */ +int ksr_wrand(void) +{ +#if RAND_MAX < INT_MAX + return (int)random(); +#else + return rand(); +#endif +} + +/** + * wrapper function for srand()/srandom() + */ +void ksr_wsrand(unsigned int seed) +{ +#if RAND_MAX < INT_MAX + return srandom(seed); +#else + return srand(seed); +#endif +} + +/** + * wrapper function for fastrand() + */ +int ksr_wfastrand(void) +{ + return (int)(fastrand() % ((unsigned)KSR_XRAND_MAX + 1)); +} + +/** + * global with internal RAND API + */ +ksr_xrand_t _ksr_xrand_api = {.xrand = ksr_wrand, .xsrand = ksr_wsrand}; + +/** + * + */ +int ksr_xrand_set(char *name) +{ + if(strcmp(name, "fast") == 0) { + _ksr_xrand_api.xrand = ksr_wfastrand; + _ksr_xrand_api.xsrand = fastrand_seed; + return 0; + } + if((strcmp(name, "rand") == 0) || (strcmp(name, "rand") == 0)) { + /* default - nothing to do */ + return 0; + } + LM_WARN("unknown rand engine: %s\n", name); + return -1; +} diff --git a/src/core/rand/ksrxrand.h b/src/core/rand/ksrxrand.h new file mode 100644 index 00000000000..51f026e9bc6 --- /dev/null +++ b/src/core/rand/ksrxrand.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2025 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef __KSRXRAND_H__ +#define __KSRXRAND_H__ + +#include <limits.h> +#include <stdlib.h> + +#if RAND_MAX < INT_MAX +#define KSR_XRAND_MAX ((int)(0x7FFFFFFF)) /* (1<<31) - 1 */ +#else +#define KSR_XRAND_MAX RAND_MAX +#endif + +typedef int (*ksr_xrand_f)(void); +typedef void (*ksr_xsrand_f)(unsigned int seed); + +typedef struct ksr_xrand +{ + ksr_xrand_f xrand; + ksr_xsrand_f xsrand; +} ksr_xrand_t; + +extern ksr_xrand_t _ksr_xrand_api; + +#define ksr_xrand() _ksr_xrand_api.xrand() +#define ksr_xsrand(s) _ksr_xrand_api.xsrand(s) + +int ksr_xrand_set(char *name); + +#endif

1 0

Problems Compiling 5.8.5
by Christian Berger 06 Feb '25

06 Feb '25

Hi, building 5.8.5 fails for us. In src/core/mem/f_malloc.c, there is a call to sr_event_exec using the define "SREV_PKG_UPDATE_STAT" which is only defined if "MALLOC_STATS" is defined. However in the use there is no check for the define, so it fails with the default debian bookworm build. This might be a bug. Regards Christian -- Christian Berger - berger(a)sipgate.de Telefon: +49 (0)211-63 55 55-0 Telefax: +49 (0)211-63 55 55-22 sipgate GmbH - Gladbacher Str. 74 - 40219 Düsseldorf HRB Düsseldorf 39841 - Geschäftsführer: Thilo Salmon, Tim Mois Steuernummer: 106/5724/7147, Umsatzsteuer-ID: DE219349391 www.sipgate.de - www.sipgate.co.uk

1 1

git:master:ad8f017b: nghttp2: check return for setsockopt TCP_NODELAY
by Daniel-Constantin Mierla 06 Feb '25

06 Feb '25

Module: kamailio Branch: master Commit: ad8f017b38e90746790ec9789f01abe6fab46e1b URL: https://github.com/kamailio/kamailio/commit/ad8f017b38e90746790ec9789f01abe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-06T08:26:22+01:00 nghttp2: check return for setsockopt TCP_NODELAY --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/ad8f017b38e90746790ec9789f01abe… Patch: https://github.com/kamailio/kamailio/commit/ad8f017b38e90746790ec9789f01abe… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 3b8816aca0c..79b81a20c01 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -202,7 +202,10 @@ static http2_session_data *create_http2_session_data( session_data = malloc(sizeof(http2_session_data)); memset(session_data, 0, sizeof(http2_session_data)); session_data->app_ctx = app_ctx; - setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val)); + if(setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val)) + < 0) { + LM_ERR("failed to set TCP_NODELAY socket option\n"); + } session_data->bev = bufferevent_openssl_socket_new(app_ctx->evbase, fd, ssl, BUFFEREVENT_SSL_ACCEPTING, BEV_OPT_CLOSE_ON_FREE | BEV_OPT_DEFER_CALLBACKS);

1 0

git:master:6e76452c: ims_auth: amf passed as parameter to resync local auth vector
by Daniel-Constantin Mierla 06 Feb '25

06 Feb '25

Module: kamailio Branch: master Commit: 6e76452c11189620663da84f879400575c673792 URL: https://github.com/kamailio/kamailio/commit/6e76452c11189620663da84f8794005… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-06T08:15:58+01:00 ims_auth: amf passed as parameter to resync local auth vector --- Modified: src/modules/ims_auth/auth_vector.c Modified: src/modules/ims_auth/auth_vector.h Modified: src/modules/ims_auth/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/6e76452c11189620663da84f8794005… Patch: https://github.com/kamailio/kamailio/commit/6e76452c11189620663da84f8794005… --- diff --git a/src/modules/ims_auth/auth_vector.c b/src/modules/ims_auth/auth_vector.c index c973d8acfb3..a681490f71a 100644 --- a/src/modules/ims_auth/auth_vector.c +++ b/src/modules/ims_auth/auth_vector.c @@ -80,12 +80,12 @@ auth_vector *auth_vector_make_local(uint8_t k[16], uint8_t op[16], int opIsOPc, int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, - uint8_t auts[14], uint8_t k[16], uint8_t op[16], int opIsOPc) + uint8_t auts[14], uint8_t k[16], uint8_t op[16], int opIsOPc, + uint8_t amf[2]) { uint8_t rand[16]; uint8_t op_c[16]; uint8_t ak[6]; - uint8_t amf[2]; uint8_t sqnMS[6]; uint8_t mac_s[8]; uint8_t xmac_s[8]; diff --git a/src/modules/ims_auth/auth_vector.h b/src/modules/ims_auth/auth_vector.h index 1b90cfe9f21..0b0457258b0 100644 --- a/src/modules/ims_auth/auth_vector.h +++ b/src/modules/ims_auth/auth_vector.h @@ -32,7 +32,8 @@ auth_vector *auth_vector_make_local(uint8_t k[16], uint8_t op[16], int opIsOPc, uint8_t amf[2], uint8_t sqn[6]); int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, - uint8_t auts[14], uint8_t k[16], uint8_t op[16], int opIsOPc); + uint8_t auts[14], uint8_t k[16], uint8_t op[16], int opIsOPc, + uint8_t amf[2]); void sqn_increment(uint8_t sqn[6]); #endif diff --git a/src/modules/ims_auth/authorize.c b/src/modules/ims_auth/authorize.c index 44bfbc4f91a..0d16e658893 100644 --- a/src/modules/ims_auth/authorize.c +++ b/src/modules/ims_auth/authorize.c @@ -708,10 +708,12 @@ int ims_resync_auth(struct sip_msg *msg, str *proute_name, str *prealm) int resync_result = 0; if(_ims_auth_data.flags & IMS_AUTH_FLAG_OPC_SET) { resync_result = auth_vector_resync_local(aud->sqn, av, - auts_bin, _ims_auth_data.k, _ims_auth_data.op_c, 1); + auts_bin, _ims_auth_data.k, _ims_auth_data.op_c, 1, + _ims_auth_data.amf); } else { resync_result = auth_vector_resync_local(aud->sqn, av, - auts_bin, _ims_auth_data.k, _ims_auth_data.op, 0); + auts_bin, _ims_auth_data.k, _ims_auth_data.op, 0, + _ims_auth_data.amf); } if(resync_result != 0) {

1 0

git:master:12ef4b4e: core: rand - switch to inline functions from macros
by Daniel-Constantin Mierla 06 Feb '25

06 Feb '25

Module: kamailio Branch: master Commit: 12ef4b4e64e596a3ce29775266cef571796f0850 URL: https://github.com/kamailio/kamailio/commit/12ef4b4e64e596a3ce29775266cef57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-06T08:09:20+01:00 core: rand - switch to inline functions from macros - rand/random has no parameter --- Modified: src/core/rand/kam_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/12ef4b4e64e596a3ce29775266cef57… Patch: https://github.com/kamailio/kamailio/commit/12ef4b4e64e596a3ce29775266cef57… --- diff --git a/src/core/rand/kam_rand.h b/src/core/rand/kam_rand.h index 271f61f220d..12b988a0852 100644 --- a/src/core/rand/kam_rand.h +++ b/src/core/rand/kam_rand.h @@ -24,12 +24,24 @@ #if RAND_MAX < INT_MAX #define KAM_RAND_MAX ((int)(0x7FFFFFFF)) /* (1<<31) - 1 */ -#define kam_rand(x) ((int)random(x)) -#define kam_srand(x) srandom(x) +static inline int kam_rand(void) +{ + return (int)random(); +} +static inline void kam_srand(unsigned int seed) +{ + return srandom(seed); +} #else #define KAM_RAND_MAX RAND_MAX -#define kam_rand(x) rand(x) -#define kam_srand(x) srand(x) +static inline int kam_rand(void) +{ + return rand(); +} +static inline void kam_srand(unsigned int seed) +{ + return srand(seed); +} #endif #endif

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 February 2025