- sr-dev - kamailio.org

git:5.6:a08562b2: tls: force thread-locals clean-up for libssl3
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.6 Commit: a08562b2e56c89900220b7ed15c9ccd12655d9a6 URL: https://github.com/kamailio/kamailio/commit/a08562b2e56c89900220b7ed15c9ccd… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:38:18+08:00 tls: force thread-locals clean-up for libssl3 - minimal thread-locals patch as 5.6.x is packaged for distros that use libssl3 GH#3791 - simplified version of tls rework in 5.8.x --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a08562b2e56c89900220b7ed15c9ccd… Patch: https://github.com/kamailio/kamailio/commit/a08562b2e56c89900220b7ed15c9ccd… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 499a9a77aea..3805accf70a 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -306,6 +306,17 @@ static tls_domains_cfg_t* tls_use_modparams(void) } #endif +/* unconditionally perform thread-local clean-up + * especially needed with libssl3 uses + * (bookworm/jammy/noble/el9) + */ +static void fork_child(void) +{ + for(int k = 0; k < 16; k++) { + if(pthread_getspecific(k) != 0) + pthread_setspecific(k, 0x0); + } +} static int mod_init(void) { @@ -407,6 +418,9 @@ static int mod_init(void) if(sr_tls_event_callback.s == NULL || sr_tls_event_callback.len <= 0) { tls_lookup_event_routes(); } + /* minimal fix for libssl 1.1.1/3.x uses + */ + pthread_atfork(NULL, NULL, &fork_child); return 0; error: tls_h_mod_destroy_f(); @@ -635,11 +649,6 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) register_tls_hooks(&tls_h); -#if OPENSSL_VERSION_NUMBER >= 0x10100000L - LM_DBG("setting cryptorand random engine\n"); - RAND_set_rand_method(RAND_ksr_cryptorand_method()); -#endif - sr_kemi_modules_add(sr_kemi_tls_exports); return 0;

2 1

git:5.7:d03d5fdf: tls: NULL safety check
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: d03d5fdf2b6a29e783738a6ea98c35725826d9ed URL: https://github.com/kamailio/kamailio/commit/d03d5fdf2b6a29e783738a6ea98c357… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:09:14+08:00 tls: NULL safety check (cherry picked from commit f6f9d90ada963b53b6552e1a172b8f2fd021c33b) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d03d5fdf2b6a29e783738a6ea98c357… Patch: https://github.com/kamailio/kamailio/commit/d03d5fdf2b6a29e783738a6ea98c357… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 51e88bed51f..c2a3c8de271 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -871,6 +871,8 @@ EVP_PKEY *tls_engine_private_key(const char *key_id) while(!(OSSL_STORE_eof(ctx))) { OSSL_STORE_INFO *info = OSSL_STORE_load(ctx); + if(info == NULL) + continue; int type; type = OSSL_STORE_INFO_get_type(info);

1 0

git:5.7:caa24125: etc/kamailio.cfg: document tls_threads_mode = 2 to use atfork handler
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: caa2412507586329b7b97685203fd8bd54cd2691 URL: https://github.com/kamailio/kamailio/commit/caa2412507586329b7b97685203fd8b… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:09:14+08:00 etc/kamailio.cfg: document tls_threads_mode = 2 to use atfork handler (cherry picked from commit 5b4926b04ba0fcd8f65f5709789abd83181a381a) --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/caa2412507586329b7b97685203fd8b… Patch: https://github.com/kamailio/kamailio/commit/caa2412507586329b7b97685203fd8b… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index a95a652b935..bf456f396fa 100755 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -224,8 +224,9 @@ tls_max_connections=2048 /* For OpenSSL 3 integration * functions calling libssl3 can be invoked in a transient thread * 0: disable threaded calls - * 1: use threads for process#0 only - * 2: use threads for all processes */ + * 1: use thread executors for process#0 only + * 2: no thread executors, but use atfork handler to reset thread-locals to NULL + * 3: use thread executors for all processes */ tls_threads_mode=1 #!endif

1 0

git:5.7:cf764b49: tls: new option tls_threads_mode = 2
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: cf764b499fbc3f28f7ed080b488e0e8111687cf8 URL: https://github.com/kamailio/kamailio/commit/cf764b499fbc3f28f7ed080b488e0e8… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:09:14+08:00 tls: new option tls_threads_mode = 2 - use pthread_atfork to force all thread-locals to 0x0 after fork() (cherry picked from commit 464299c202f3ba963aed821b777075397e843856) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cf764b499fbc3f28f7ed080b488e0e8… Patch: https://github.com/kamailio/kamailio/commit/cf764b499fbc3f28f7ed080b488e0e8… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index c34c9933b1d..51e88bed51f 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -337,6 +337,20 @@ static tls_domains_cfg_t* tls_use_modparams(void) } #endif +/* global config tls_threads_mode = 2 + * - force all thread-locals to be 0x0 after fork() + * - with OpenSSL loaded the largest value observed + * is < 10 + * + */ +static void fork_child(void) +{ + for(int k = 0; k < 16; k++) { + if(pthread_getspecific(k) != 0) + pthread_setspecific(k, 0x0); + } +} + static int mod_init(void) { int method; @@ -446,6 +460,9 @@ static int mod_init(void) ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT); } #endif + if(ksr_tls_threads_mode == 2) { + pthread_atfork(NULL, NULL, &fork_child); + } return 0; error: tls_h_mod_destroy_f();

1 0

git:5.7:d20df6fb: core/rthreads.h: add new option tls_threads_mode = 2
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: d20df6fb372ab4da0dd5e6f277b08345059c2be5 URL: https://github.com/kamailio/kamailio/commit/d20df6fb372ab4da0dd5e6f277b0834… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:09:14+08:00 core/rthreads.h: add new option tls_threads_mode = 2 - add global handling of thread-locals with tls_threads_mode = 2 - this will run a pthread_atfork handler to reset all thread-locals to 0x0 - alternative solution to running functions in thread executors - requires tls.so to be loaded to be effective (cherry picked from commit e7f040f219b46592081a6053b4ed1ae0d0552b1a) --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/d20df6fb372ab4da0dd5e6f277b0834… Patch: https://github.com/kamailio/kamailio/commit/d20df6fb372ab4da0dd5e6f277b0834… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index 0f4f0cf8b8a..6fee4d0b407 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -40,7 +40,7 @@ static void *run_threadP(_thread_proto fn, void *arg) pthread_t tid; void *ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg); } @@ -77,7 +77,7 @@ static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) pthread_t tid; void *ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2); } @@ -113,7 +113,7 @@ static void run_threadV(_thread_protoV fn) #ifdef USE_TLS pthread_t tid; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { fn(); return; @@ -152,7 +152,7 @@ static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2) pthread_t tid; int ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2); } @@ -188,7 +188,7 @@ static void run_thread0P(_thread_proto0P fn, void *arg1) #ifdef USE_TLS pthread_t tid; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { fn(arg1); return; @@ -240,7 +240,7 @@ static int run_thread4P5I2P2(_thread_proto4P5I2P2 fn, void *arg1, void *arg2, pthread_t tid; int ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); } @@ -278,7 +278,7 @@ static int run_thread4L(_thread_proto4L fn, long arg1) pthread_t tid; int ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1); }

1 0

git:5.7:822960b0: tls: basic OpenSSL 3 support of provider keys (replaces ENGINE)
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: 822960b0e869b5fce093f708daf65b9f4b4c47f8 URL: https://github.com/kamailio/kamailio/commit/822960b0e869b5fce093f708daf65b9… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:09:14+08:00 tls: basic OpenSSL 3 support of provider keys (replaces ENGINE) - initial support for v3 provider keys (replaces ENGINE from v1.1.1) - can be disabled behind build flag -DOPENSSL_NO_PROVIDER - provider keys start with /uri: e.g private_key = /uri:pkcs11:token=NSS%20Certificate%20DB;type=private;object=Fork-Test-c67cc0e0 - global config: provider_quirks: 0 | 1 - 0 - default - 1 - create a new OSS_LIB_CTX* in the child This integration does not load any providers itself and depends on the usual export OPENSSL_CONF=my-openssl.cnf to configure providers. (cherry picked from commit 69883dd381368ca219cc52140e71d571775f95d5) --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/822960b0e869b5fce093f708daf65b9… Patch: https://github.com/kamailio/kamailio/commit/822960b0e869b5fce093f708daf65b9…

1 0

git:5.7:88429b9e: tls: remove unused ENGINE define
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: 88429b9e3546864845fb1a3c2ce5263620b51c58 URL: https://github.com/kamailio/kamailio/commit/88429b9e3546864845fb1a3c2ce5263… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:06:43+08:00 tls: remove unused ENGINE define --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/88429b9e3546864845fb1a3c2ce5263… Patch: https://github.com/kamailio/kamailio/commit/88429b9e3546864845fb1a3c2ce5263… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 3e22ec42712..3bfea131cf2 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -128,11 +128,6 @@ int tls_run_event_routes(struct tcp_connection *c); #endif /* __SUNPRO_c */ #endif /* TLS_RD_DEBUG */ -/* only OpenSSL <= 1.1.1 */ -#if !defined(OPENSSL_NO_ENGINE) && OPENSSL_VERSION_NUMBER < 0x030000000L -#define KSR_SSL_ENGINE -#endif - extern str sr_tls_xavp_cfg; static str _ksr_tls_connect_server_id = STR_NULL;

1 0

git:5.7:af524f5b: tlsa: removed the map files used in the past for tls engine
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: af524f5b2b2fa3de4aa4e198bf3a9f0feff04e17 URL: https://github.com/kamailio/kamailio/commit/af524f5b2b2fa3de4aa4e198bf3a9f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:06:43+08:00 tlsa: removed the map files used in the past for tls engine - sync with code of tls module --- Removed: src/modules/tlsa/tls_map.c Removed: src/modules/tlsa/tls_map.h --- Diff: https://github.com/kamailio/kamailio/commit/af524f5b2b2fa3de4aa4e198bf3a9f0… Patch: https://github.com/kamailio/kamailio/commit/af524f5b2b2fa3de4aa4e198bf3a9f0… --- diff --git a/src/modules/tlsa/tls_map.c b/src/modules/tlsa/tls_map.c deleted file mode 100644 index ad799b5cdff..00000000000 --- a/src/modules/tlsa/tls_map.c +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (C) 2021 Daniel-Constantin Mierla (asipto.com) - * - * This file is part of Kamailio, a free SIP server. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -/** - * THIS FILE IS GENERATED - DO NOT MODIFY IT - */ - -#include "../tls/tls_map.c" diff --git a/src/modules/tlsa/tls_map.h b/src/modules/tlsa/tls_map.h deleted file mode 100644 index 96705a7f7fa..00000000000 --- a/src/modules/tlsa/tls_map.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (C) 2021 Daniel-Constantin Mierla (asipto.com) - * - * This file is part of Kamailio, a free SIP server. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -/** - * THIS FILE IS GENERATED - DO NOT MODIFY IT - */ - -#include "../tls/tls_map.h"

1 0

git:5.7:957c8005: tls: clean-up of ENGINE
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: 957c8005d2a97207debf1d3e782c1df5de70d487 URL: https://github.com/kamailio/kamailio/commit/957c8005d2a97207debf1d3e782c1df… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:06:43+08:00 tls: clean-up of ENGINE - remove tls_map.* - not needed anymore - install an ENGINE in each worker SSL_CTX no need to replicate to all processes --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_server.c Removed: src/modules/tls/tls_map.c Removed: src/modules/tls/tls_map.h --- Diff: https://github.com/kamailio/kamailio/commit/957c8005d2a97207debf1d3e782c1df… Patch: https://github.com/kamailio/kamailio/commit/957c8005d2a97207debf1d3e782c1df…

1 0

git:5.7:4b206bcc: tls: make explicit ENGINE deprecation in OpenSSL 3
by S-P Chan 23 Mar '24

23 Mar '24

Module: kamailio Branch: 5.7 Commit: 4b206bccc0ed46aac876921009d2884eb868075c URL: https://github.com/kamailio/kamailio/commit/4b206bccc0ed46aac876921009d2884… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-23T21:06:43+08:00 tls: make explicit ENGINE deprecation in OpenSSL 3 --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/4b206bccc0ed46aac876921009d2884… Patch: https://github.com/kamailio/kamailio/commit/4b206bccc0ed46aac876921009d2884…

1 0

git:master:8114b201: corex: fix conditions for dns_cache modparam srv attributes
by Elena-Ramona Modroiu 23 Mar '24

23 Mar '24

Module: kamailio Branch: master Commit: 8114b2016d032484edafe4edd04fb02d52cfd058 URL: https://github.com/kamailio/kamailio/commit/8114b2016d032484edafe4edd04fb02… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-23T09:58:46+01:00 corex: fix conditions for dns_cache modparam srv attributes --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8114b2016d032484edafe4edd04fb02… Patch: https://github.com/kamailio/kamailio/commit/8114b2016d032484edafe4edd04fb02… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index ed37b22c757..4152fbf5df4 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -454,7 +454,7 @@ static int corex_dns_cache_param_add(str *pval) } } else if(pit->name.len == 8 && strncasecmp(pit->name.s, "priority", 8) == 0) { - if(dns_flags == 0) { + if(dns_priority == 0) { if(str2sint(&pit->body, &dns_priority) < 0) { LM_ERR("invalid priority: %.*s\n", pit->body.len, pit->body.s); @@ -463,7 +463,7 @@ static int corex_dns_cache_param_add(str *pval) } } else if(pit->name.len == 6 && strncasecmp(pit->name.s, "weight", 6) == 0) { - if(dns_flags == 0) { + if(dns_weight == 0) { if(str2sint(&pit->body, &dns_weight) < 0) { LM_ERR("invalid weight: %.*s\n", pit->body.len, pit->body.s); @@ -472,7 +472,7 @@ static int corex_dns_cache_param_add(str *pval) } } else if(pit->name.len == 4 && strncasecmp(pit->name.s, "port", 4) == 0) { - if(dns_flags == 0) { + if(dns_port == 0) { if(str2sint(&pit->body, &dns_port) < 0) { LM_ERR("invalid port: %.*s\n", pit->body.len, pit->body.s); return -1;

1 0

git:master:f35cf890: core: resolve/create_srv_pref_list() - insert at correct position in list
by Elena-Ramona Modroiu 23 Mar '24

23 Mar '24

Module: kamailio Branch: master Commit: f35cf8904119dcf582ea2451648de5fef095466b URL: https://github.com/kamailio/kamailio/commit/f35cf8904119dcf582ea2451648de5f… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-23T09:51:47+01:00 core: resolve/create_srv_pref_list() - insert at correct position in list --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/f35cf8904119dcf582ea2451648de5f… Patch: https://github.com/kamailio/kamailio/commit/f35cf8904119dcf582ea2451648de5f… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index b6ee8592697..6d581f4915f 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1526,8 +1526,8 @@ size_t create_srv_pref_list(char *proto, struct dns_srv_proto *list) if(naptr_proto_supported(i) == 0) { continue; } else { - list[i - 1].proto_pref = tmp.proto_pref; - list[i - 1].proto = i; + list[list_len].proto_pref = tmp.proto_pref; + list[list_len].proto = i; list_len++; } };

1 0

git:master:0fb15fe7: http_client: CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE was added in libcurl 7.49.0
by Elena-Ramona Modroiu 23 Mar '24

23 Mar '24

Module: kamailio Branch: master Commit: 0fb15fe72ec72474c12ab2688bf83d8396886360 URL: https://github.com/kamailio/kamailio/commit/0fb15fe72ec72474c12ab2688bf83d8… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-23T09:45:51+01:00 http_client: CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE was added in libcurl 7.49.0 - if not supported, fallback to default http version --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/0fb15fe72ec72474c12ab2688bf83d8… Patch: https://github.com/kamailio/kamailio/commit/0fb15fe72ec72474c12ab2688bf83d8… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index c15e36c4957..5bfd219b008 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -1135,6 +1135,11 @@ static int w_http_get_script( return ki_http_request_helper(_m, &met, &url, &body, &hdrs, 0, dst); } +/* CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE added in libcurl 7.49.0 */ +#if LIBCURL_VERSION_NUM < 0x073100 +#define CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE 0 +#endif + /*! * KEMI function to perform request with headers and body */

1 0

git:master:a03dd2fd: dmq: improve debug logs related to locks
by Victor Seva 23 Mar '24

23 Mar '24

Module: kamailio Branch: master Commit: a03dd2fdb6ac30937f29fe63cabbe09902ad8300 URL: https://github.com/kamailio/kamailio/commit/a03dd2fdb6ac30937f29fe63cabbe09… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T01:13:39+01:00 dmq: improve debug logs related to locks * dmq_node_list->lock * dmq_worker->lock unreleased and some info inside worker_loop() --- Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/notification_peer.c Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/a03dd2fdb6ac30937f29fe63cabbe09… Patch: https://github.com/kamailio/kamailio/commit/a03dd2fdb6ac30937f29fe63cabbe09…

1 0

git:5.5:fa08fabe: dmq: fix inter-lock on error
by Victor Seva 22 Mar '24

22 Mar '24

Module: kamailio Branch: 5.5 Commit: fa08fabebb0640d4fe6907b06c78f5154321e5c5 URL: https://github.com/kamailio/kamailio/commit/fa08fabebb0640d4fe6907b06c78f51… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:12:51+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() (cherry picked from commit 0d240e4e0dc3184ef37d338ba6872d295d6b16f2) (cherry picked from commit 814f5bdc9ee5d4594ffb0fd72843bca7b5fa79ea) (cherry picked from commit 0a96c9f4fb3bf179d417b0188d619afd7d9096ef) (cherry picked from commit 3ad3a61a901192290344bd4fadd724f61b8a4444) --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/fa08fabebb0640d4fe6907b06c78f51… Patch: https://github.com/kamailio/kamailio/commit/fa08fabebb0640d4fe6907b06c78f51… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index d40fd2cac2e..b04d0fa6d30 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -402,8 +402,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) { LM_DBG("found new node %.*s\n", STR_FMT(&tmp_uri));

1 0

git:5.6:3ad3a61a: dmq: fix inter-lock on error
by Victor Seva 22 Mar '24

22 Mar '24

Module: kamailio Branch: 5.6 Commit: 3ad3a61a901192290344bd4fadd724f61b8a4444 URL: https://github.com/kamailio/kamailio/commit/3ad3a61a901192290344bd4fadd724f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:11:40+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() (cherry picked from commit 0d240e4e0dc3184ef37d338ba6872d295d6b16f2) (cherry picked from commit 814f5bdc9ee5d4594ffb0fd72843bca7b5fa79ea) (cherry picked from commit 0a96c9f4fb3bf179d417b0188d619afd7d9096ef) --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/3ad3a61a901192290344bd4fadd724f… Patch: https://github.com/kamailio/kamailio/commit/3ad3a61a901192290344bd4fadd724f… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index b2470d5ff86..c62eefb1855 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) { LM_DBG("found new node %.*s\n", STR_FMT(&tmp_uri));

1 0

git:5.7:0a96c9f4: dmq: fix inter-lock on error
by Victor Seva 22 Mar '24

22 Mar '24

Module: kamailio Branch: 5.7 Commit: 0a96c9f4fb3bf179d417b0188d619afd7d9096ef URL: https://github.com/kamailio/kamailio/commit/0a96c9f4fb3bf179d417b0188d619af… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:10:01+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() (cherry picked from commit 0d240e4e0dc3184ef37d338ba6872d295d6b16f2) (cherry picked from commit 814f5bdc9ee5d4594ffb0fd72843bca7b5fa79ea) --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/0a96c9f4fb3bf179d417b0188d619af… Patch: https://github.com/kamailio/kamailio/commit/0a96c9f4fb3bf179d417b0188d619af… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index b2470d5ff86..c62eefb1855 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) { LM_DBG("found new node %.*s\n", STR_FMT(&tmp_uri));

1 0

git:5.8:814f5bdc: dmq: fix inter-lock on error
by Victor Seva 22 Mar '24

22 Mar '24

Module: kamailio Branch: 5.8 Commit: 814f5bdc9ee5d4594ffb0fd72843bca7b5fa79ea URL: https://github.com/kamailio/kamailio/commit/814f5bdc9ee5d4594ffb0fd72843bca… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:09:22+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() (cherry picked from commit 0d240e4e0dc3184ef37d338ba6872d295d6b16f2) --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/814f5bdc9ee5d4594ffb0fd72843bca… Patch: https://github.com/kamailio/kamailio/commit/814f5bdc9ee5d4594ffb0fd72843bca… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index 6189acf5359..5e9452a51f3 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) {

1 0

git:master:0d240e4e: dmq: fix inter-lock on error
by Victor Seva 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 0d240e4e0dc3184ef37d338ba6872d295d6b16f2 URL: https://github.com/kamailio/kamailio/commit/0d240e4e0dc3184ef37d338ba6872d2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:00:44+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/0d240e4e0dc3184ef37d338ba6872d2… Patch: https://github.com/kamailio/kamailio/commit/0d240e4e0dc3184ef37d338ba6872d2… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index 6189acf5359..5e9452a51f3 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) {

1 0

[kamailio/kamailio] kamcmd keepalive.list the last up and down time reversed (Issue #3790)
by suiyuemanbu 22 Mar '24

22 Mar '24

kamailio 5.7.0 kamcmd keepalive.list { uri: sip:192.168.10.12:8877 owner: drouting last checked: Mon Mar 18 17:45:39 2024 last up: Mon Mar 18 17:45:59 2024 //err last down: Thu Jan 1 08:00:00 1970 //err state: 2 } { uri: sip:192.168.10.124:5080 owner: drouting last checked: Tue Mar 19 10:34:39 2024 last up: Thu Jan 1 08:00:00 1970 //err last down: Tue Mar 19 10:34:39 2024 //err state: 1 } -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3790 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3790(a)github.com>

2 4

git:master:4ada8180: file_out: Cast to correct type of str
by Xenofon Karamanos 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 4ada818099b5b7cb7deff1b1ce93b5aacaa1b84e URL: https://github.com/kamailio/kamailio/commit/4ada818099b5b7cb7deff1b1ce93b5a… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-22T10:30:30Z file_out: Cast to correct type of str --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/4ada818099b5b7cb7deff1b1ce93b5a… Patch: https://github.com/kamailio/kamailio/commit/4ada818099b5b7cb7deff1b1ce93b5a… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 7e035f13359..886f01f944f 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -344,7 +344,7 @@ static int fo_add_filename(modparam_t type, void *val) LM_ERR("modparam value is null\n"); return -1; } - if(strlen((char *)val) == 0) { + if(strlen(((str *)val)->s) == 0) { LM_ERR("modparam value is empty\n"); return -1; }

1 0

git:master:5f901c35: core: socket info - parse advertise ip part to get address family
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 5f901c3557f9f875545d82a7ab00f6d0c5c1fe52 URL: https://github.com/kamailio/kamailio/commit/5f901c3557f9f875545d82a7ab00f6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T10:25:48+01:00 core: socket info - parse advertise ip part to get address family --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/5f901c3557f9f875545d82a7ab00f6d… Patch: https://github.com/kamailio/kamailio/commit/5f901c3557f9f875545d82a7ab00f6d… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index e048e0e2c4b..ab59df73dd6 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -338,6 +338,11 @@ static inline struct socket_info *new_sock_info(char *name, p = si->useinfo.name.s + 1; si->useinfo.af = AF_INET6; } else { + ip_addr_t *ipv = NULL; + ipv = str2ipx(&si->useinfo.name); + if(ipv != NULL) { + si->useinfo.af = ipv->af; + } si->useinfo.address_str.len = si->useinfo.name.len; p = si->useinfo.name.s; }

1 0

git:master:919216d0: core: fixup helpers with option to check if variable is writable
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 919216d051b8d459eb97f7ab0968d6bf0bead188 URL: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T10:18:23+01:00 core: fixup helpers with option to check if variable is writable --- Modified: src/core/mod_fix.c --- Diff: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… Patch: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 520ed44708c..0947f788461 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -730,12 +730,21 @@ int fixup_free_spve_spve_igp(void **param, int param_no) /** * */ -int fixup_spve_n_pvar(void **param, int n, int param_no) +int fixup_spve_n_pvar(void **param, int n, int param_no, int pvmode) { + int ret = 0; if(param_no >= 1 && param_no <= n) return fixup_spve_null(param, 1); - if(param_no == n + 1) - return fixup_pvar_null(param, 1); + if(param_no == n + 1) { + ret = fixup_pvar_null(param, 1); + if((ret == 0) && (pvmode == 1)) { + if(((pv_spec_t *)(*param))->setf == NULL) { + LM_ERR("pvar is not writeble\n"); + return E_UNSPEC; + } + } + return ret; + } return E_UNSPEC; } @@ -756,7 +765,7 @@ int fixup_free_spve_n_pvar(void **param, int n, int param_no) */ int fixup_spve_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 1, param_no); + return fixup_spve_n_pvar(param, 1, param_no, 0); } /** @@ -772,7 +781,7 @@ int fixup_free_spve_pvar(void **param, int param_no) */ int fixup_spve2_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 2, param_no); + return fixup_spve_n_pvar(param, 2, param_no, 1); } /** @@ -788,7 +797,7 @@ int fixup_free_spve2_pvar(void **param, int param_no) */ int fixup_spve3_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 3, param_no); + return fixup_spve_n_pvar(param, 3, param_no, 1); } /** @@ -804,7 +813,7 @@ int fixup_free_spve3_pvar(void **param, int param_no) */ int fixup_spve4_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 4, param_no); + return fixup_spve_n_pvar(param, 4, param_no, 1); } /**

1 0

git:master:61e076f0: http_client: use core helpers for fixup of http request functions
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 61e076f0dbb302b88c5013503697afd9dfd81748 URL: https://github.com/kamailio/kamailio/commit/61e076f0dbb302b88c5013503697afd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T10:17:18+01:00 http_client: use core helpers for fixup of http request functions --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/61e076f0dbb302b88c5013503697afd… Patch: https://github.com/kamailio/kamailio/commit/61e076f0dbb302b88c5013503697afd… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 9be9b88d835..c15e36c4957 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -133,8 +133,6 @@ static int fixup_http_query_post(void **param, int param_no); static int fixup_free_http_query_post(void **param, int param_no); static int fixup_http_query_post_hdr(void **param, int param_no); static int fixup_free_http_query_post_hdr(void **param, int param_no); -static int fixup_http_query_request(void **param, int param_no); -static int fixup_free_http_query_request(void **param, int param_no); static int fixup_curl_connect(void **param, int param_no); static int fixup_free_curl_connect(void **param, int param_no); @@ -187,11 +185,11 @@ static cmd_export_t cmds[] = { {"http_client_get", (cmd_function)w_http_query_get_hdr, 4, fixup_http_query_post_hdr, fixup_free_http_query_post_hdr, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, - {"http_client_request", (cmd_function)w_http_query_request, 5, fixup_http_query_request, - fixup_free_http_query_request, + {"http_client_request", (cmd_function)w_http_query_request, 5, fixup_spve4_pvar, + fixup_free_spve4_pvar, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, - {"http_client_request_v2pk", (cmd_function)w_http_query_request_v2pk, 5, fixup_http_query_request, - fixup_free_http_query_request, + {"http_client_request_v2pk", (cmd_function)w_http_query_request_v2pk, 5, fixup_spve4_pvar, + fixup_free_spve4_pvar, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"http_connect", (cmd_function)w_curl_connect, 3, fixup_curl_connect, fixup_free_curl_connect, @@ -639,49 +637,6 @@ static int fixup_free_curl_connect(void **param, int param_no) return -1; } -/* - * Fix http_client_request params: met, url, hdrs, data (strings that may contain - * pvars) and result (writable pvar). - */ -static int fixup_http_query_request(void **param, int param_no) -{ - if(param_no <= 4) { - return fixup_spve_null(param, 1); - } - - if(param_no == 5) { - if(fixup_pvar_null(param, 1) != 0) { - LM_ERR("http_query: failed to fixup result pvar\n"); - return -1; - } - if(((pv_spec_t *)(*param))->setf == NULL) { - LM_ERR("http_query: result pvar is not writeble\n"); - return -1; - } - return 0; - } - - LM_ERR("invalid parameter number <%d>\n", param_no); - return -1; -} - -/* - * Free http_client_request params. - */ -static int fixup_free_http_query_request(void **param, int param_no) -{ - if(param_no <= 4) { - return fixup_free_spve_null(param, 1); - } - - if(param_no == 5) { - return fixup_free_pvar_null(param, 1); - } - - LM_ERR("http_query: invalid parameter number <%d>\n", param_no); - return -1; -} - /* * Wrapper for Curl_connect (GET) */

1 0

git:master:19e91e09: core: fixup helpers for functions with strings and output variable params
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 19e91e097a851cc8c169c9c3144e2ab7669a5b71 URL: https://github.com/kamailio/kamailio/commit/19e91e097a851cc8c169c9c3144e2ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T09:43:25+01:00 core: fixup helpers for functions with strings and output variable params --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/19e91e097a851cc8c169c9c3144e2ab… Patch: https://github.com/kamailio/kamailio/commit/19e91e097a851cc8c169c9c3144e2ab… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 10be560982f..520ed44708c 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -730,11 +730,11 @@ int fixup_free_spve_spve_igp(void **param, int param_no) /** * */ -int fixup_spve_pvar(void **param, int param_no) +int fixup_spve_n_pvar(void **param, int n, int param_no) { - if(param_no == 1) + if(param_no >= 1 && param_no <= n) return fixup_spve_null(param, 1); - if(param_no == 2) + if(param_no == n + 1) return fixup_pvar_null(param, 1); return E_UNSPEC; } @@ -742,15 +742,79 @@ int fixup_spve_pvar(void **param, int param_no) /** * */ -int fixup_free_spve_pvar(void **param, int param_no) +int fixup_free_spve_n_pvar(void **param, int n, int param_no) { - if(param_no == 1) + if(param_no >= 1 && param_no <= n) return fixup_free_spve_null(param, 1); - if(param_no == 2) + if(param_no == n + 1) return fixup_free_pvar_null(param, 1); return E_UNSPEC; } +/** + * + */ +int fixup_spve_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 1, param_no); +} + +/** + * + */ +int fixup_free_spve_pvar(void **param, int param_no) +{ + return fixup_free_spve_n_pvar(param, 1, param_no); +} + +/** + * + */ +int fixup_spve2_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 2, param_no); +} + +/** + * + */ +int fixup_free_spve2_pvar(void **param, int param_no) +{ + return fixup_free_spve_n_pvar(param, 2, param_no); +} + +/** + * + */ +int fixup_spve3_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 3, param_no); +} + +/** + * + */ +int fixup_free_spve3_pvar(void **param, int param_no) +{ + return fixup_free_spve_n_pvar(param, 3, param_no); +} + +/** + * + */ +int fixup_spve4_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 4, param_no); +} + +/** + * + */ +int fixup_free_spve4_pvar(void **param, int param_no) +{ + return fixup_free_spve_n_pvar(param, 4, param_no); +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 3143f060426..a202c4ade2b 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -148,6 +148,12 @@ int fixup_spve_igp(void **param, int param_no); int fixup_free_spve_igp(void **param, int param_no); int fixup_spve_pvar(void **param, int param_no); int fixup_free_spve_pvar(void **param, int param_no); +int fixup_spve2_pvar(void **param, int param_no); +int fixup_free_spve2_pvar(void **param, int param_no); +int fixup_spve3_pvar(void **param, int param_no); +int fixup_free_spve3_pvar(void **param, int param_no); +int fixup_spve4_pvar(void **param, int param_no); +int fixup_free_spve4_pvar(void **param, int param_no); int fixup_spve_spve_igp(void **param, int param_no); int fixup_free_spve_spve_igp(void **param, int param_no);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev