- sr-dev - kamailio.org

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

git:master:ccd4481d: http_client: clang-format new code
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: ccd4481dcd42093ccca6d39cd71afc8fd4db938d URL: https://github.com/kamailio/kamailio/commit/ccd4481dcd42093ccca6d39cd71afc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T09:42:33+01:00 http_client: clang-format new code --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/ccd4481dcd42093ccca6d39cd71afc8… Patch: https://github.com/kamailio/kamailio/commit/ccd4481dcd42093ccca6d39cd71afc8… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index a359ce5090d..df6b8233b51 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -272,10 +272,11 @@ static int curL_request_url(struct sip_msg *_m, const char *_met, * - 1 (default) : timeout value is in seconds. * - 2 : timeout value is in milliseconds. */ - if (timeout_mode == 1) { /* timeout is in seconds (default) */ + if(timeout_mode == 1) { /* timeout is in seconds (default) */ res |= curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)params->timeout); - } else if (timeout_mode == 2) { /* timeout is in milliseconds */ - res |= curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, (long)params->timeout); + } else if(timeout_mode == 2) { /* timeout is in milliseconds */ + res |= curl_easy_setopt( + curl, CURLOPT_TIMEOUT_MS, (long)params->timeout); } res |= curl_easy_setopt( @@ -734,7 +735,8 @@ int http_client_request_c(sip_msg_t *_m, char *_url, str *_dst, char *_body, int http_client_request(sip_msg_t *_m, char *_url, str *_dst, char *_body, char *_hdrs, char *_met, unsigned int _httpver) { - return http_client_request_c(_m, _url, _dst, _body, NULL, _hdrs, _met, _httpver); + return http_client_request_c( + _m, _url, _dst, _body, NULL, _hdrs, _met, _httpver); } /*! diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 64c3a7c65ab..9be9b88d835 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -1091,9 +1091,8 @@ static int w_http_query_post_hdr( /*! * helper for HTTP-Query function */ -static int ki_http_request_helper( - sip_msg_t *_m, str *met, str *url, str *body, str *hdrs, - unsigned int httpver, pv_spec_t *dst) +static int ki_http_request_helper(sip_msg_t *_m, str *met, str *url, str *body, + str *hdrs, unsigned int httpver, pv_spec_t *dst) { int ret = 0; str result = {NULL, 0}; @@ -1199,8 +1198,8 @@ static int ki_http_query_request_v2pk( return -1; } - return ki_http_request_helper(_m, met, url, body, hdrs, - CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE, dst); + return ki_http_request_helper( + _m, met, url, body, hdrs, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE, dst); } /*!

1 0

git:master:61d04f44: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 61d04f441488af1b943c4d5f8c35befc9cdd0437 URL: https://github.com/kamailio/kamailio/commit/61d04f441488af1b943c4d5f8c35bef… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-22T07:31:22+01:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/61d04f441488af1b943c4d5f8c35bef… Patch: https://github.com/kamailio/kamailio/commit/61d04f441488af1b943c4d5f8c35bef… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 43dddfef13e..0884d21c289 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -75,6 +75,7 @@ Hugh Waite 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) 4.6. http_client_request(met, url, body, hdrs, respv) + 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 5. Pseudovariables @@ -134,6 +135,7 @@ Hugh Waite 1.26. http_client_query() usage 1.27. http_client_get() usage 1.28. http_client_request() usage + 1.29. http_client_request_v2pk() usage Chapter 1. Admin Guide @@ -178,6 +180,7 @@ Chapter 1. Admin Guide 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) 4.6. http_client_request(met, url, body, hdrs, respv) + 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 5. Pseudovariables @@ -706,6 +709,7 @@ modparam("http_client", "netinterface", "eth0") 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) 4.6. http_client_request(met, url, body, hdrs, respv) + 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.1. http_connect(connection, url, [content_type, data,] result) @@ -894,6 +898,22 @@ switch ($rc) { } ... +4.7. http_client_request_v2pk(met, url, body, hdrs, respv) + + Similar to http_client_request(), but using HTTP/2 prior-knowledge that + the server does not need HTTP/1.1-Upgrade (direct HTTP/2 by seting + libcurl option CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE). + + Example 1.29. http_client_request_v2pk() usage +... +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.pa +ram})&f_uri=$(fu{s.escape.param})", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} +... + 5. Pseudovariables 5.1. $curlerror(error)

1 0

git:master:584b51fd: http_client: documentation section for http_client_request_v2pk(...)
by Elena-Ramona Modroiu 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 584b51fd00c87539eba44e86121fc0df2c465a27 URL: https://github.com/kamailio/kamailio/commit/584b51fd00c87539eba44e86121fc0d… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-22T07:16:53+01:00 http_client: documentation section for http_client_request_v2pk(...) --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/584b51fd00c87539eba44e86121fc0d… Patch: https://github.com/kamailio/kamailio/commit/584b51fd00c87539eba44e86121fc0d… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index dd647fcb9a1..2fb918d5997 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -984,6 +984,28 @@ http_client_request("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param}) switch ($rc) { ... } +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_client_request_v2pk"> + <title> + <function moreinfo="none">http_client_request_v2pk(met, url, body, hdrs, respv)</function> + </title> + <para> + Similar to http_client_request(), but using HTTP/2 prior-knowledge + that the server does not need HTTP/1.1-Upgrade (direct HTTP/2 by + seting libcurl option CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE). + </para> + <example> + <title><function>http_client_request_v2pk()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} ... </programlisting> </example>

1 0

git:master:09ad47cd: http_client: new function http_client_request_v2pk(...)
by Elena-Ramona Modroiu 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 09ad47cd64e698a9bad55d2d697e88166ff948cf URL: https://github.com/kamailio/kamailio/commit/09ad47cd64e698a9bad55d2d697e881… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-22T07:03:31+01:00 http_client: new function http_client_request_v2pk(...) - do HTTP/2 request with prior-knowledge --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/09ad47cd64e698a9bad55d2d697e881… Patch: https://github.com/kamailio/kamailio/commit/09ad47cd64e698a9bad55d2d697e881…

1 0

git:master:93503fdc: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 93503fdc337dc76a9a0d8222e1d03d77489ea834 URL: https://github.com/kamailio/kamailio/commit/93503fdc337dc76a9a0d8222e1d03d7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-21T16:46:12+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/93503fdc337dc76a9a0d8222e1d03d7… Patch: https://github.com/kamailio/kamailio/commit/93503fdc337dc76a9a0d8222e1d03d7… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 83ce7e9f4b0..472d6dd93e4 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -276,7 +276,7 @@ Joey Golan 1.87. set_rtpengine_set usage 1.88. rtpengine_offer usage 1.89. rtpengine_offer usage to force transcoding from opus to PCMU - 1.90. rtpengine_offer usage + 1.90. rtpengine_offer usage of via-branch parameter 1.91. rtpengine_answer usage 1.92. rtpengine_info usage 1.93. rtpengine_delete usage @@ -2540,14 +2540,14 @@ onreply_route[1] } ... - Example 1.90. rtpengine_offer usage + Example 1.90. rtpengine_offer usage of via-branch parameter route { ... if (is_method("INVITE")) { if (has_body("application/sdp")) { - if (rtpengine_offer("replace-origin replace-session-connection via-b -ranch=auto-next strict-source label=callee OSRTP-accept transport-protocol=RTP/A -VP address-family=IP4", "auto-next")) + if (rtpengine_offer("replace-origin replace-session-connection stric +t-source label=callee OSRTP-accept transport-protocol=RTP/AVP address-family=IP4 +", "auto-next")) t_on_reply("1"); } }

1 0

git:master:779654d3: rtpengine: fix doc typos
by Richard Fuchs 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 779654d3654586dc1b2ac64b9ea6e7ce1dae75c8 URL: https://github.com/kamailio/kamailio/commit/779654d3654586dc1b2ac64b9ea6e7c… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2024-03-21T11:40:39-04:00 rtpengine: fix doc typos Fix doc typos in `rtpengine_offer()` usage examples. --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/779654d3654586dc1b2ac64b9ea6e7c… Patch: https://github.com/kamailio/kamailio/commit/779654d3654586dc1b2ac64b9ea6e7c… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index b6145b3b6e2..6d79abfaeff 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2885,13 +2885,13 @@ onreply_route[1] <example> - <title><function>rtpengine_offer</function> usage</title> + <title><function>rtpengine_offer</function> usage of via-branch parameter</title> <programlisting format="linespecific"> route { ... if (is_method("INVITE")) { if (has_body("application/sdp")) { - if (rtpengine_offer("replace-origin replace-session-connection via-branch=auto-next strict-source label=callee OSRTP-accept transport-protocol=RTP/AVP address-family=IP4", "auto-next")) + if (rtpengine_offer("replace-origin replace-session-connection strict-source label=callee OSRTP-accept transport-protocol=RTP/AVP address-family=IP4", "auto-next")) t_on_reply("1"); } }

1 0

git:master:5b0e9e8c: rtpengine: format files in clang format
by Richard Fuchs 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 5b0e9e8cb818e1de0c88f9b505a5813147629499 URL: https://github.com/kamailio/kamailio/commit/5b0e9e8cb818e1de0c88f9b505a5813… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2024-03-21T11:40:39-04:00 rtpengine: format files in clang format Formatting in clang for files not complying with it. --- Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/5b0e9e8cb818e1de0c88f9b505a5813… Patch: https://github.com/kamailio/kamailio/commit/5b0e9e8cb818e1de0c88f9b505a5813…

1 0

git:master:7d95e672: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 7d95e67213f05c9ede6f0339246ae7e2fe93dea5 URL: https://github.com/kamailio/kamailio/commit/7d95e67213f05c9ede6f0339246ae7e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-21T16:16:24+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/7d95e67213f05c9ede6f0339246ae7e… Patch: https://github.com/kamailio/kamailio/commit/7d95e67213f05c9ede6f0339246ae7e…

1 0

[kamailio/kamailio] rtpengine: add flags processing on the daemon side (PR #3788)
by Donat Zenichev 21 Mar '24

21 Mar '24

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Introduce a versatile behavior of the rtpengine module in terms of ability to parse flags on rtpengine side, instead of module. Previous behavior is also kept (so backwards compatibility). General points: - rtpengine daemon supports rtpp flags processing from now on - module still provides in the bencode (when calling daemon): call-id, to/from tags, viabranch (so identification call data) - even though the module's interface is updated, a backwards compatibility is given, so no obligatory changes from kamailio script users required - each rtpengine module's function where it's reasonable to use rtpp flags as a parameter, now is able to get a third parameter `viabranch`, which is used to detect, which approach to use (older/newer): - without the viabranch - older one used - with the viabrnach - new one used, so rtpp flags parsing on rtpengine side The reason why the `via-branch` has been selected as a point of behavior differentiation is that currently it's only given via option flags list (raw string), meanwhile with a newer behavior option flags will not be parsed by the module. Since the module still has to provide all the basic identifiers, such as: call-id, From/To tags and via-branch, via-branch now is moved to a separate parameter, and gives to the module a clue a newer behavior is to be applied. The goal (for the future) is to deprecate processing of option flags on the module side and only parse them using rtpengine. This brings a list of benifits, such as: - no need to keep in sync rtpengine and module (for specific flags) - support of different rtpp flag string formats (raw), so that, for example, kamailio script users can use plain text or bencode dictionary like format, when providing flags from the kamailio script Current change is only applicable with rtpengine versions equal or later than mr12.3 Backwards compatibility provided, so users are not forced to change anything. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3788 -- Commit Summary -- * rtpengine: add flags processing on the daemon side * rtpengine: update documentation in regards of flags processing -- File Changes -- M src/modules/rtpengine/doc/rtpengine.xml (8) M src/modules/rtpengine/doc/rtpengine_admin.xml (45) M src/modules/rtpengine/rtpengine.c (847) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3788.patch https://github.com/kamailio/kamailio/pull/3788.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3788 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3788(a)github.com>

3 6

git:master:c6fff3a5: rtpengine: update documentation in regards of flags processing
by Richard Fuchs 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: c6fff3a531740e648615a6e6223088693ecdccb9 URL: https://github.com/kamailio/kamailio/commit/c6fff3a531740e648615a6e62230886… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2024-03-21T11:04:53-04:00 rtpengine: update documentation in regards of flags processing Due to a newer approach for parsing flags being added, update the documentation of module accordingly. --- Modified: src/modules/rtpengine/doc/rtpengine.xml Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c6fff3a531740e648615a6e62230886… Patch: https://github.com/kamailio/kamailio/commit/c6fff3a531740e648615a6e62230886…

1 0

git:master:5cd02f56: rtpengine: add flags processing on the daemon side
by Richard Fuchs 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 5cd02f5653e9b9f523a62a0dae78b801f962ce8e URL: https://github.com/kamailio/kamailio/commit/5cd02f5653e9b9f523a62a0dae78b80… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2024-03-21T11:04:53-04:00 rtpengine: add flags processing on the daemon side Introduce a versatile behavior of the rtpengine module in terms of ability to parse flags on rtpengine side, instead of module. Previous behavior is also kept. General points: - rtpengine daemon supports rtpp flags processing from now on - module still provides in the bencode (when calling daemon): call-id, to/from tags, viabranch (so identification call data) - even though the module's interface is updated, a backwards compatibility is given, so no obligatory changes from kamailio script users required - each rtpengine module's function which takes rtpp flags as a parameter, now is able to get a third parameter `viabranch`, which is used to detect, which approach to use (older/newer): - without the viabranch - older one used - with the viabrnach - new one used, so rtpp flags parsing on rtpengine side The goal (for the future) is to deprecate processing of option flags on the module side and only parse them using rtpengine. This brings a list of benifits, such as: - no need to keep in sync rtpengine and module (for specific flags) - support of different rtpp flag string formats (raw), so that, for example, kamailio script users can use plain text or bencode dictionary like format, when providing flags from the kamailio script --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/5cd02f5653e9b9f523a62a0dae78b80… Patch: https://github.com/kamailio/kamailio/commit/5cd02f5653e9b9f523a62a0dae78b80…

1 0

[kamailio/kamailio] TLS crash in Kamailio 5.6.3 (5.7.4) on Debian 12 (Issue #3791)
by Evgeniy G 21 Mar '24

21 Mar '24

**Description** I have installed kamailio 5.6.3(from debian repo) on Debian 12. Try testing with openvas and some case, I saw kamailio crashes. > Mar 19 12:55:45 hostname kamailio[1789359]: CRITICAL: <core> [core/mem/q_malloc.c:519]: qm_free(): BUG: freeing already freed pointer (0x7f0429907ea0), called from tls: tls_init.c: ser_free(323), first free tls: tls_init.c: ser_free(323) - ignoring > Mar 19 12:55:45 hostname kamailio[1789361]: CRITICAL: <core> [core/mem/q_malloc.c:123]: qm_debug_check_frag(): BUG: qm: fragm. 0x7f0429907ee8 (address 0x7f0429907f20) beginning overwritten (80)! Memory allocator was called from tls: tls_init.c:323. Fragment marked by tls: tls_init.c:293. Exec from core/mem/q_malloc.c:511. > Mar 19 12:55:45 hostname kamailio[1789367]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 620 > Mar 19 12:55:45 hostname kamailio[1788962]: ALERT: <core> [main.c:774]: handle_sigs(): child process 1789361 exited by a signal 6. Next step, I added option --atexit=no to args - result same. Next step, I tried to build kamailio 5.7.4 from source and re-run testing, the result was the same - kamailio was crash. After that, I tried use `tlsa` module instead of `tlsa`, but it not resolve problem. Backtrace: [kamailio_5.6.3_backtrace_full.txt](https://github.com/kamailio/kamailio/fil… [kamailio_5.6.3_backtrace.txt](https://github.com/kamailio/kamailio/files/14… **Additional Information** > openssl version OpenSSL 3.0.11 19 Sep 2023 (Library: OpenSSL 3.0.11 19 Sep 2023) **Kamailio**: > kamailio -v version: kamailio 5.6.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, 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: unknown compiled with gcc 12.2.0 > kamailio -v version: kamailio 5.7.4 (x86_64/linux) c717c0 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: c717c0 compiled on 13:23:19 Mar 20 2024 with gcc 12.2.0 **OS**: > lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 12 (bookworm) Release: 12 Codename: bookworm > uname -a Linux hostname 6.1.0-18-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.76-1 (2024-02-01) x86_64 GNU/Linux -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3791 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3791(a)github.com>

3 4

git:master:b59812ff: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: b59812ff025a4c7e531ce9ad29d435820908fa8a URL: https://github.com/kamailio/kamailio/commit/b59812ff025a4c7e531ce9ad29d4358… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-21T07:31:23+01:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/b59812ff025a4c7e531ce9ad29d4358… Patch: https://github.com/kamailio/kamailio/commit/b59812ff025a4c7e531ce9ad29d4358… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 0433f481cf3..9297251072a 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -346,8 +346,8 @@ request_route { ... request_route { ... - http_client_query("https://provider.com/stir-shaken/cert.pem", "$var(pubkey) -"); + secsipid_get_url("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)" +); if(secsipid_verify("$hdr(Identity)", "$var(pubkey)", "A")) { ... } ... } @@ -359,7 +359,8 @@ request_route { 4.5. secsipid_get_url(url, ovar) - Get the content of a URL and store the result in a variable. + Get the content of a URL and store the result in a variable. The result + is cached by libsecsipid, if caching is enabled. The url parameters can contain pseudo-variables and ovar has to be the name of a writable pseudo-variable.

1 0

git:master:01ec19f7: secsipid: note that get url function is doing caching
by Daniel-Constantin Mierla 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 01ec19f73a7257a83bd9abb9a02c12e2c3d225e0 URL: https://github.com/kamailio/kamailio/commit/01ec19f73a7257a83bd9abb9a02c12e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-21T07:21:27+01:00 secsipid: note that get url function is doing caching - use get url function in example for verify --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/01ec19f73a7257a83bd9abb9a02c12e… Patch: https://github.com/kamailio/kamailio/commit/01ec19f73a7257a83bd9abb9a02c12e… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index c43ccf3c637..f8f2e823a21 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -338,7 +338,7 @@ request_route { ... request_route { ... - http_client_query("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)"); + secsipid_get_url("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)"); if(secsipid_verify("$hdr(Identity)", "$var(pubkey)", "A")) { ... } ... } @@ -356,7 +356,8 @@ request_route { <function moreinfo="none">secsipid_get_url(url, ovar)</function> </title> <para> - Get the content of a URL and store the result in a variable. + Get the content of a URL and store the result in a variable. The result + is cached by libsecsipid, if caching is enabled. </para> <para> The url parameters can contain pseudo-variables and ovar has to be

1 0

[kamailio/kamailio] xhttp: fix execution of async functions (PR #3723)
by Vadim Saranov 21 Mar '24

21 Mar '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 - [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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3720 #### Description Fixing R-RURI and adding necessary headers when creating fake_msg in xhttp_mod.c for successful message validation and the ability to perform various kamailio functions from event_route[xhttp:request]. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3723 -- Commit Summary -- * xhttp: fix execution of async functions -- File Changes -- M src/modules/xhttp/xhttp_mod.c (39) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3723.patch https://github.com/kamailio/kamailio/pull/3723.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3723 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3723(a)github.com>

3 5

git:master:eca79b06: modules: readme files regenerated - pvtpl ... [skip ci]
by Kamailio Dev 20 Mar '24

20 Mar '24

Module: kamailio Branch: master Commit: eca79b066984d8bd219c19a8c0dccb4955503bfc URL: https://github.com/kamailio/kamailio/commit/eca79b066984d8bd219c19a8c0dccb4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-20T16:16:11+01:00 modules: readme files regenerated - pvtpl ... [skip ci] --- Modified: src/modules/pvtpl/README --- Diff: https://github.com/kamailio/kamailio/commit/eca79b066984d8bd219c19a8c0dccb4… Patch: https://github.com/kamailio/kamailio/commit/eca79b066984d8bd219c19a8c0dccb4… --- diff --git a/src/modules/pvtpl/README b/src/modules/pvtpl/README index 4ed20d00202..5bf5553aa97 100644 --- a/src/modules/pvtpl/README +++ b/src/modules/pvtpl/README @@ -30,12 +30,15 @@ Daniel-Constantin Mierla 4. Functions - 4.1. pvtpl_apply(tplname, res) + 4.1. pvtpl_render(tplname, res) + + 5. Template File List of Examples 1.1. Set tpl parameter - 1.2. gcrypt_aes_encrypt usage + 1.2. pvtpl_render usage + 1.3. Template file Chapter 1. Admin Guide @@ -53,7 +56,9 @@ Chapter 1. Admin Guide 4. Functions - 4.1. pvtpl_apply(tplname, res) + 4.1. pvtpl_render(tplname, res) + + 5. Template File 1. Overview @@ -101,18 +106,33 @@ modparam("pvtpl", "tpl", "name=tpl2;fpath=/etc/kamailio/tpl2.pvtpl;bsize=256;") 4. Functions - 4.1. pvtpl_apply(tplname, res) + 4.1. pvtpl_render(tplname, res) -4.1. pvtpl_apply(tplname, res) +4.1. pvtpl_render(tplname, res) - Encrypts the text with the key using AES256 ECB encryption algorithm. - The result is encoded in base64 format and stored in res. The parameter - res must be a read-write variables. The parameters text and key can be - static strings or strings with variables (dynamic strings). + Render the template 'tplname' using config variables, setting the + result in the variable specified by 'res'. This function can be used from ANY_ROUTE. - Example 1.2. gcrypt_aes_encrypt usage + Example 1.2. pvtpl_render usage +... +pvtpl_render("t1", "$var(out)"); +... + +5. Template File + + The template file can contain text and config variables that are + evaluate when running pvtpl_render() functions. + + The templates files are loaded at startup and prepared for runtime. It + is no option to reload the template files. + + Example 1.3. Template file ... -gcrypt_aes_encrypt("$rb", "my-secret-key", "$var(encrypted)"); +{ + "from": "$fu", + "to": "$tu", + "x" : $var(x) +} ...

1 0

git:master:d3900987: pvtpl: docs - section for template file
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: master Commit: d3900987ddd012a192c4a429b29ac8d4e24587c5 URL: https://github.com/kamailio/kamailio/commit/d3900987ddd012a192c4a429b29ac8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T16:15:27+01:00 pvtpl: docs - section for template file --- Modified: src/modules/pvtpl/doc/pvtpl_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d3900987ddd012a192c4a429b29ac8d… Patch: https://github.com/kamailio/kamailio/commit/d3900987ddd012a192c4a429b29ac8d… --- diff --git a/src/modules/pvtpl/doc/pvtpl_admin.xml b/src/modules/pvtpl/doc/pvtpl_admin.xml index 8ca0174d3c4..25459ac1139 100644 --- a/src/modules/pvtpl/doc/pvtpl_admin.xml +++ b/src/modules/pvtpl/doc/pvtpl_admin.xml @@ -120,11 +120,35 @@ modparam("pvtpl", "tpl", "name=tpl2;fpath=/etc/kamailio/tpl2.pvtpl;bsize=256;") <title><function>pvtpl_render</function> usage</title> <programlisting format="linespecific"> ... -pvtpl_render("t1", "$var(out)") +pvtpl_render("t1", "$var(out)"); ... </programlisting> </example> </section> </section> + <section> + <title>Template File</title> + <para> + The template file can contain text and config variables that are evaluate + when running pvtpl_render() functions. + </para> + <para> + The templates files are loaded at startup and prepared for runtime. It is + no option to reload the template files. + </para> + <example> + <title>Template file</title> + <programlisting format="linespecific"> +... +{ + "from": "$fu", + "to": "$tu", + "x" : $var(x) +} +... +</programlisting> + </example> + + </section> </chapter>

1 0

git:master:d75e10f9: pvtpl: renamed pvtpl_apply() to pvtpl_render()
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: master Commit: d75e10f983e7afaa7779e8fde6524d7eccdfd497 URL: https://github.com/kamailio/kamailio/commit/d75e10f983e7afaa7779e8fde6524d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T16:07:16+01:00 pvtpl: renamed pvtpl_apply() to pvtpl_render() --- Modified: src/modules/pvtpl/doc/pvtpl_admin.xml Modified: src/modules/pvtpl/pvtpl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d75e10f983e7afaa7779e8fde6524d7… Patch: https://github.com/kamailio/kamailio/commit/d75e10f983e7afaa7779e8fde6524d7… --- diff --git a/src/modules/pvtpl/doc/pvtpl_admin.xml b/src/modules/pvtpl/doc/pvtpl_admin.xml index 8ccfb8f9a23..8ca0174d3c4 100644 --- a/src/modules/pvtpl/doc/pvtpl_admin.xml +++ b/src/modules/pvtpl/doc/pvtpl_admin.xml @@ -105,24 +105,22 @@ modparam("pvtpl", "tpl", "name=tpl2;fpath=/etc/kamailio/tpl2.pvtpl;bsize=256;") <section> <title>Functions</title> - <section id="pvtpl.f.pvtpl_apply"> + <section id="pvtpl.f.pvtpl_render"> <title> - <function moreinfo="none">pvtpl_apply(tplname, res)</function> + <function moreinfo="none">pvtpl_render(tplname, res)</function> </title> <para> - Encrypts the text with the key using AES256 ECB encryption algorithm. - The result is encoded in base64 format and stored in res. The parameter - res must be a read-write variables. The parameters text and key can - be static strings or strings with variables (dynamic strings). + Render the template 'tplname' using config variables, setting the result + in the variable specified by 'res'. </para> <para> This function can be used from ANY_ROUTE. </para> <example> - <title><function>gcrypt_aes_encrypt</function> usage</title> + <title><function>pvtpl_render</function> usage</title> <programlisting format="linespecific"> ... -gcrypt_aes_encrypt("$rb", "my-secret-key", "$var(encrypted)"); +pvtpl_render("t1", "$var(out)") ... </programlisting> </example> diff --git a/src/modules/pvtpl/pvtpl_mod.c b/src/modules/pvtpl/pvtpl_mod.c index 15ee74b6838..9862a225236 100644 --- a/src/modules/pvtpl/pvtpl_mod.c +++ b/src/modules/pvtpl/pvtpl_mod.c @@ -42,7 +42,7 @@ static int mod_init(void); static int child_init(int); static void mod_destroy(void); -static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv); +static int w_pvtpl_render(sip_msg_t *msg, char *ptplname, char *popv); /* clang-format off */ typedef struct pvtpl_item { @@ -61,7 +61,7 @@ static pvtpl_item_t *_pvtpl_list = NULL; /* clang-format off */ static cmd_export_t cmds[]={ - {"pvtpl_apply", (cmd_function)w_pvtpl_apply, 2, fixup_spve_pvar, + {"pvtpl_render", (cmd_function)w_pvtpl_render, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -278,7 +278,7 @@ static int pvtpl_tpl_param(modparam_t type, void *val) /** * */ -static int pvtpl_apply(sip_msg_t *msg, str *tplname, pv_spec_t *dst) +static int pvtpl_render(sip_msg_t *msg, str *tplname, pv_spec_t *dst) { pvtpl_item_t *it; pv_value_t val; @@ -313,7 +313,7 @@ static int pvtpl_apply(sip_msg_t *msg, str *tplname, pv_spec_t *dst) /** * */ -static int ki_pvtpl_apply(sip_msg_t *msg, str *tplname, str *opv) +static int ki_pvtpl_render(sip_msg_t *msg, str *tplname, str *opv) { pv_spec_t *dst; @@ -324,13 +324,13 @@ static int ki_pvtpl_apply(sip_msg_t *msg, str *tplname, str *opv) return -1; } - return pvtpl_apply(msg, tplname, dst); + return pvtpl_render(msg, tplname, dst); } /** * */ -static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv) +static int w_pvtpl_render(sip_msg_t *msg, char *ptplname, char *popv) { str tplname; pv_spec_t *dst; @@ -341,7 +341,7 @@ static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv) } dst = (pv_spec_t *)popv; - return pvtpl_apply(msg, &tplname, dst); + return pvtpl_render(msg, &tplname, dst); } /** @@ -349,8 +349,8 @@ static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv) */ /* clang-format off */ static sr_kemi_t sr_kemi_pvtpl_exports[] = { - { str_init("pvtpl"), str_init("pvtpl_apply"), - SR_KEMIP_INT, ki_pvtpl_apply, + { str_init("pvtpl"), str_init("pvtpl_render"), + SR_KEMIP_INT, ki_pvtpl_render, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

[kamailio/kamailio] Not enough parameters for htable.seti (Issue #3774)
by Jon Bergli Heier 20 Mar '24

20 Mar '24

### Description Since 5.7.4, the `htable.seti` RPC command returns error 500. This seems to occur whenever an integer value is passed. If the integer is passed as a decimal (eg. `1.0` or `1.`) the error disappears. Also reproducible with latest master. ### Troubleshooting Bisecting shows the offending commit to be https://github.com/kamailio/kamailio/commit/dc59286c26e9799f86e698a9698c9da…. Reverting this commit fixes the 500 error but reintroduces the previous error referenced in the commit. #### Reproduction ``` $ kamcmd htable.seti rconfig foo 1 error: 500 - Not enough parameters (htable name, key name and value) ``` #### Log Messages No messages in the kamailio log when the error occurs. The RPC command responds with ``` error: 500 - Not enough parameters (htable name, key name and value) ``` ### Possible Solutions A workaround is to pass the value as a decimal value, eg. `1.0`. Any decimals are ignored since the value is treated as an integer. For XMLRPC this can be worked around by explicitly passing the value as an integer (passing the value as `i/1`). ### Additional Information ``` version: kamailio 5.9.0-dev0 (x86_64/linux) f6f9d9 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_SEND_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: f6f9d9 compiled on 11:57:50 Mar 5 2024 with gcc 13.2.1 ``` * **Operating System**: Reproduced on the following: ``` Linux jon 6.6.2-arch1-1 #1 SMP PREEMPT_DYNAMIC Mon, 20 Nov 2023 23:18:21 +0000 x86_64 GNU/Linux ``` ``` Linux ip-10-105-240-190 4.9.0-19-amd64 #1 SMP Debian 4.9.320-2 (2022-06-30) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3774 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3774(a)github.com>

2 4

git:5.7:29b6562d: ctl: handle int input for double storage
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.7 Commit: 29b6562d8ebe6277fda5524dda18b88cf2a4e1a9 URL: https://github.com/kamailio/kamailio/commit/29b6562d8ebe6277fda5524dda18b88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:42:36+01:00 ctl: handle int input for double storage (cherry picked from commit 1380a4a0d18159c7130b70c0216134a253ad83f7) (cherry picked from commit 90f8117f9669069b4dab7e9d747dfa06245ec8a0) --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/29b6562d8ebe6277fda5524dda18b88… Patch: https://github.com/kamailio/kamailio/commit/29b6562d8ebe6277fda5524dda18b88… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index fd247bc603a..7909bc930d4 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -719,10 +719,12 @@ inline static unsigned char *binrpc_read_record(struct binrpc_parse_ctx *ctx, *err = E_BINRPC_MORE_DATA; goto error; } - if((v->type != type) && (v->type != BINRPC_T_ALL)) { - goto error_type; + if(!(v->type == BINRPC_T_DOUBLE && type == BINRPC_T_INT)) { + if((v->type != type) && (v->type != BINRPC_T_ALL)) { + goto error_type; + } + v->type = type; } - v->type = type; switch(type) { case BINRPC_T_STRUCT: if(ctx->in_struct) { @@ -779,7 +781,12 @@ inline static unsigned char *binrpc_read_record(struct binrpc_parse_ctx *ctx, case BINRPC_T_INT: if(ctx->in_struct && smode == 0) goto error_record; - p = binrpc_read_int(&v->u.intval, len, p, end, err); + if(v->type == BINRPC_T_DOUBLE) { + p = binrpc_read_int(&tmp, len, p, end, err); + v->u.fval = tmp; + } else { + p = binrpc_read_int(&v->u.intval, len, p, end, err); + } break; case BINRPC_T_STR: if(ctx->in_struct && smode == 0)

1 0

git:master:68c69966: gcrypt: docs - module name used for section ids
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: master Commit: 68c69966c38b56775a3966d07c33ff94c2a8ba95 URL: https://github.com/kamailio/kamailio/commit/68c69966c38b56775a3966d07c33ff9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:40:28+01:00 gcrypt: docs - module name used for section ids --- Modified: src/modules/gcrypt/doc/gcrypt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/68c69966c38b56775a3966d07c33ff9… Patch: https://github.com/kamailio/kamailio/commit/68c69966c38b56775a3966d07c33ff9… --- diff --git a/src/modules/gcrypt/doc/gcrypt_admin.xml b/src/modules/gcrypt/doc/gcrypt_admin.xml index 533ec5c80f9..3fc03d3eabc 100644 --- a/src/modules/gcrypt/doc/gcrypt_admin.xml +++ b/src/modules/gcrypt/doc/gcrypt_admin.xml @@ -127,7 +127,7 @@ modparam("gcrypt", "register_callid", 1) <section> <title>Functions</title> - <section id="async.f.gcrypt_aes_encrypt"> + <section id="gcrypt.f.gcrypt_aes_encrypt"> <title> <function moreinfo="none">gcrypt_aes_encrypt(text, key, res)</function> </title> @@ -150,7 +150,7 @@ gcrypt_aes_encrypt("$rb", "my-secret-key", "$var(encrypted)"); </example> </section> - <section id="async.f.gcrypt_aes_decrypt"> + <section id="gcrypt.f.gcrypt_aes_decrypt"> <title> <function moreinfo="none">gcrypt_aes_decrypt(text, key, res)</function> </title>

1 0

git:5.8:7bcef8ef: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: 7bcef8ef487a713f5b6c6fadb7a3166ed41fb136 URL: https://github.com/kamailio/kamailio/commit/7bcef8ef487a713f5b6c6fadb7a3166… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-20T13:31:25+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/7bcef8ef487a713f5b6c6fadb7a3166… Patch: https://github.com/kamailio/kamailio/commit/7bcef8ef487a713f5b6c6fadb7a3166… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 79fc82ec175..209d77f4c87 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1489,9 +1489,16 @@ if(ds_list_exists("10")) { ignoring the protocol (value 2). If parameter is 0, all ip, port and proto are matched and active status is ignored. If bit one is set, then port is ignored. If bit two is set, then protocol is - ignored. If bit three is set, then state must be active. The - parameter can be an integer or a variable holding an integer value. - It must be provided if the uri parameter is provided. + ignored. If bit three is set, then state must be active. If bit + four is set, then socket/sockname be matched. If bit five is set, + then try to find the most closest target from all dispatcher + targets with the mandatory ip and combination of local socket, + protocol, port, the weighted search result is combined from bit + flags of matched components: ip - 1, port - 2, protocol - 4, local + socket - 8, the target with the maximum value of flags combination + will be selected. The parameter can be an integer or a variable + holding an integer value. It must be provided if the uri parameter + is provided. * uri (optional) - if parameter is empty or missing, the matching is done against source IP, port and protocol. Otherwise the value has to be a valid SIP URI, used to match against addresses in the

1 0

git:5.7:a7e9a265: ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server()
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.7 Commit: a7e9a26542010e1677fcb0e305e7d371e5467dba URL: https://github.com/kamailio/kamailio/commit/a7e9a26542010e1677fcb0e305e7d37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:27:15+01:00 ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server() (cherry picked from commit 951ab118bb7d9955f8e69b66bec1f0c107d474a2) (cherry picked from commit 60fd6c2622c9c5edbe82908c0e461d646225c8a6) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/a7e9a26542010e1677fcb0e305e7d37… Patch: https://github.com/kamailio/kamailio/commit/a7e9a26542010e1677fcb0e305e7d37… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index e85fdcec7aa..eed2e1bcc88 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -485,6 +485,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) for(i = 0; i < sentinels_count; i++) { char *sentinelAddr = sentinels[i]; char *pos; + int srvfound = 0; redisContext *redis; redisReply *res, *res2; @@ -507,6 +508,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) port = atoi(res->element[1]->str); LOG(ndb_redis_debug, "sentinel replied: %s:%d\n", addr, port); + srvfound = 1; } } else { res = redisCommand( @@ -530,9 +532,13 @@ int redisc_reconnect_server(redisc_server_t *rsrv) } LOG(ndb_redis_debug, "slave for %s: %s:%d\n", sentinel_group, addr, port); + srvfound = 1; } } } + if(srvfound == 1) { + break; + } } }

1 0

git:5.7:4cc28e45: ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server()
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.7 Commit: 4cc28e453d8e62b9f6e2725b9496600c662a8811 URL: https://github.com/kamailio/kamailio/commit/4cc28e453d8e62b9f6e2725b9496600… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:27:08+01:00 ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server() (cherry picked from commit c8f3b496a05ae5bf29341dc7e2630f951d4effc5) (cherry picked from commit 86df978bc9842687035d6673ee1b71e542dcbd71) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/4cc28e453d8e62b9f6e2725b9496600… Patch: https://github.com/kamailio/kamailio/commit/4cc28e453d8e62b9f6e2725b9496600… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index a0865dc6125..e85fdcec7aa 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -491,7 +491,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) port = 6379; if((pos = strchr(sentinelAddr, ':')) != NULL) { port = atoi(pos + 1); - pos[i] = '\0'; + pos[0] = '\0'; } redis = redisConnectWithTimeout(sentinelAddr, port, tv_conn);

1 0

git:5.7:f654b9c1: keepalive: small formatting updates and comments to the ka dest structure
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.7 Commit: f654b9c1943be6816827f9048627a7c8a7fe50f6 URL: https://github.com/kamailio/kamailio/commit/f654b9c1943be6816827f9048627a7c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:26:43+01:00 keepalive: small formatting updates and comments to the ka dest structure (cherry picked from commit cee82c92b06a026b88fea654944f6146eb5cb4d8) (cherry picked from commit a7d4ce95b383dc26c547ef9ee07b05d51abc50f9) --- Modified: src/modules/keepalive/keepalive.h --- Diff: https://github.com/kamailio/kamailio/commit/f654b9c1943be6816827f9048627a7c… Patch: https://github.com/kamailio/kamailio/commit/f654b9c1943be6816827f9048627a7c… --- diff --git a/src/modules/keepalive/keepalive.h b/src/modules/keepalive/keepalive.h index d5a8fcb2197..5ca1ce3561d 100644 --- a/src/modules/keepalive/keepalive.h +++ b/src/modules/keepalive/keepalive.h @@ -69,13 +69,15 @@ typedef struct _ka_initial_dest typedef struct _ka_dest { str uri; - str owner; // name of destination "owner" - // (module asking to monitor this destination - str uuid; // Universal id for this record + str owner; /*!< Name of destination "owner" */ + /*!< Module asking to monitor this destination */ + str uuid; /*!< Universal id for this record */ int flags; int state; - time_t last_checked, last_up, last_down; - int counter; // counts unreachable attempts + time_t last_checked; + time_t last_up; /*!< Time of last successful SIP reply */ + time_t last_down; /*!< Time of last failure SIP reply */ + int counter; /*!< Counts unreachable attempts */ ticks_t ping_interval; /*!< Actual interval between OPTIONS */ void *user_attr;

1 0

git:5.7:6a9caa09: keepalive: proper storing of last up/down timestamps
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.7 Commit: 6a9caa099352a31a2f14012d16c01d55c9250f02 URL: https://github.com/kamailio/kamailio/commit/6a9caa099352a31a2f14012d16c01d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:26:29+01:00 keepalive: proper storing of last up/down timestamps - GH #3790 (cherry picked from commit 9e2a0ee545646bd4491ecdbe58d7fea770764b54) (cherry picked from commit 0b3aa00775a5c0b4b1dc4990f4c26bc637fc6de5) --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/6a9caa099352a31a2f14012d16c01d5… Patch: https://github.com/kamailio/kamailio/commit/6a9caa099352a31a2f14012d16c01d5… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index 0aaafa8c8da..b1b3581cb34 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -131,11 +131,11 @@ static void ka_options_callback( // accepting 2XX return codes if(ps->code >= 200 && ps->code <= 299) { state = KA_STATE_UP; - ka_dest->last_down = time(NULL); + ka_dest->last_up = time(NULL); ka_dest->counter = 0; } else { state = KA_STATE_DOWN; - ka_dest->last_up = time(NULL); + ka_dest->last_down = time(NULL); ka_dest->counter++; }

1 0

git:5.8:60fd6c26: ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server()
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: 60fd6c2622c9c5edbe82908c0e461d646225c8a6 URL: https://github.com/kamailio/kamailio/commit/60fd6c2622c9c5edbe82908c0e461d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:16:29+01:00 ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server() (cherry picked from commit 951ab118bb7d9955f8e69b66bec1f0c107d474a2) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/60fd6c2622c9c5edbe82908c0e461d6… Patch: https://github.com/kamailio/kamailio/commit/60fd6c2622c9c5edbe82908c0e461d6… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index dbbaecbcebe..c9280991ff3 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -533,6 +533,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) for(i = 0; i < sentinels_count; i++) { char *sentinelAddr = sentinels[i]; char *pos; + int srvfound = 0; redisContext *redis; redisReply *res, *res2; @@ -555,6 +556,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) port = atoi(res->element[1]->str); LOG(ndb_redis_debug, "sentinel replied: %s:%d\n", addr, port); + srvfound = 1; } } else { res = redisCommand( @@ -578,9 +580,13 @@ int redisc_reconnect_server(redisc_server_t *rsrv) } LOG(ndb_redis_debug, "slave for %s: %s:%d\n", sentinel_group, addr, port); + srvfound = 1; } } } + if(srvfound == 1) { + break; + } } }

1 0

git:5.8:86df978b: ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server()
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: 86df978bc9842687035d6673ee1b71e542dcbd71 URL: https://github.com/kamailio/kamailio/commit/86df978bc9842687035d6673ee1b71e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:16:19+01:00 ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server() (cherry picked from commit c8f3b496a05ae5bf29341dc7e2630f951d4effc5) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/86df978bc9842687035d6673ee1b71e… Patch: https://github.com/kamailio/kamailio/commit/86df978bc9842687035d6673ee1b71e… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 9b755e42d6b..dbbaecbcebe 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -539,7 +539,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) port = 6379; if((pos = strchr(sentinelAddr, ':')) != NULL) { port = atoi(pos + 1); - pos[i] = '\0'; + pos[0] = '\0'; } redis = redisConnectWithTimeout(sentinelAddr, port, tv_conn);

1 0

git:5.8:a0dfa0ac: ndb_redis: clang-format for WITH_SSL code
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

Module: kamailio Branch: 5.8 Commit: a0dfa0ac81ed4aec33863fc20cf5cb3ee077a90c URL: https://github.com/kamailio/kamailio/commit/a0dfa0ac81ed4aec33863fc20cf5cb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T13:16:11+01:00 ndb_redis: clang-format for WITH_SSL code (cherry picked from commit e54051d698b059aa168229493dc2d6bf3cdd757c) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/a0dfa0ac81ed4aec33863fc20cf5cb3… Patch: https://github.com/kamailio/kamailio/commit/a0dfa0ac81ed4aec33863fc20cf5cb3… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index ab0edf28187..9b755e42d6b 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -233,15 +233,15 @@ int redisc_init(void) } #ifdef WITH_SSL - if(enable_ssl) { - /* Create SSL context*/ - redisInitOpenSSL(); - rsrv->sslCtxRedis = redisCreateSSLContext( + if(enable_ssl) { + /* Create SSL context*/ + redisInitOpenSSL(); + rsrv->sslCtxRedis = redisCreateSSLContext( NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); - if(rsrv->sslCtxRedis == NULL) { + if(rsrv->sslCtxRedis == NULL) { LM_ERR("Unable to create Redis TLS Context.\n"); - } - } + } + } #endif if(sock != 0) { @@ -260,10 +260,10 @@ int redisc_init(void) } #ifdef WITH_SSL - if(enable_ssl) { - /* Negotiate SSL/TLS handshake*/ - redisInitiateSSLWithContext(rsrv->ctxRedis, rsrv->sslCtxRedis); - } + if(enable_ssl) { + /* Negotiate SSL/TLS handshake*/ + redisInitiateSSLWithContext(rsrv->ctxRedis, rsrv->sslCtxRedis); + } #endif LOG(ndb_redis_debug, "rsrv->ctxRedis = %p\n", rsrv->ctxRedis); @@ -498,10 +498,10 @@ int redisc_reconnect_server(redisc_server_t *rsrv) pass, sizeof(pass) - 1, "%.*s", pit->body.len, pit->body.s); haspass = 1; #ifdef WITH_SSL - } else if(pit->name.len == 3 && strncmp(pit->name.s, "tls", 3) == 0) { + } else if(pit->name.len == 3 && strncmp(pit->name.s, "tls", 3) == 0) { snprintf( pass, sizeof(pass) - 1, "%.*s", pit->body.len, pit->body.s); - if(str2int(&pit->body, &enable_ssl) < 0) + if(str2int(&pit->body, &enable_ssl) < 0) enable_ssl = 0; #endif } else if(pit->name.len == 14

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev