sr-dev June 2023

sr-dev@lists.kamailio.org

10 participants
309 discussions

git:5.7:23a121e5: http_client: fix depecration of CURLOPT_PROTOCOLS and CURLINFO_SIZE_DOWNLOAD
by Victor Seva 21 Jun '23

21 Jun '23

Module: kamailio Branch: 5.7 Commit: 23a121e5d8ffa172f71433c2ef74f323a54e8315 URL: https://github.com/kamailio/kamailio/commit/23a121e5d8ffa172f71433c2ef74f32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-21T12:11:29+02:00 http_client: fix depecration of CURLOPT_PROTOCOLS and CURLINFO_SIZE_DOWNLOAD - GH #3484 (cherry picked from commit b7b3c67fc1205d114fadf360a594930ef69835a3) --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/23a121e5d8ffa172f71433c2ef74f32… Patch: https://github.com/kamailio/kamailio/commit/23a121e5d8ffa172f71433c2ef74f32… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 8a2b9938538..be0b2024b0d 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -155,8 +155,12 @@ static int curL_request_url(struct sip_msg *_m, const char *_met, res = curl_easy_setopt(curl, CURLOPT_URL, _url); /* Limit to HTTP and HTTPS protocols */ +#if defined(CURL_AT_LEAST_VERSION) && CURL_AT_LEAST_VERSION(7, 85, 0) + res = curl_easy_setopt(curl, CURLOPT_PROTOCOLS_STR, "http,https"); +#else res = curl_easy_setopt( curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); +#endif res = curl_easy_setopt( curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); @@ -383,8 +387,13 @@ static int curL_request_url(struct sip_msg *_m, const char *_met, if((stat >= 200) && (stat < 500)) { double datasize = 0; - +#if defined(CURL_AT_LEAST_VERSION) && CURL_AT_LEAST_VERSION(7, 55, 0) + curl_off_t dlsize; + curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD_T, &dlsize); + download_size = (double)dlsize; +#else curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &download_size); +#endif LM_DBG(" -- curl download size: %u \n", (unsigned int)download_size); datasize = download_size;

1 0

git:5.7:8cc9ec41: tls: disable tls_rand for openssl >= 3.0
by Victor Seva 21 Jun '23

21 Jun '23

Module: kamailio Branch: 5.7 Commit: 8cc9ec410ff359e3d93e994c210977a8baa578c4 URL: https://github.com/kamailio/kamailio/commit/8cc9ec410ff359e3d93e994c210977a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-21T12:10:59+02:00 tls: disable tls_rand for openssl >= 3.0 From https://www.openssl.org/docs/man3.0/man3/RAND_set_rand_method.html > All of the functions described on this page are deprecated. > Applications should instead use RAND_set_DRBG_type(3), EVP_RAND(3) and > EVP_RAND(7). (cherry picked from commit c4b04696a6bfe31fdd65fa56529b0d46f2774067) --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/8cc9ec410ff359e3d93e994c210977a… Patch: https://github.com/kamailio/kamailio/commit/8cc9ec410ff359e3d93e994c210977a… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index a0f90c11064..e57a98c052d 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -506,7 +506,8 @@ static void mod_destroy(void) int ksr_rand_engine_param(modparam_t type, void* val) { -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L str *reng; if(val==NULL) { @@ -674,7 +675,8 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) register_tls_hooks(&tls_h); -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L LM_DBG("setting cryptorand random engine\n"); RAND_set_rand_method(RAND_ksr_cryptorand_method()); #endif diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 2cdb2ec0efe..260cd7ddbb9 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -29,7 +29,8 @@ #include "tls_rand.h" -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L #include "../../core/dprint.h" #include "../../core/locking.h" diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index 34d6b2d1ff2..58ddc853acd 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -21,7 +21,8 @@ #define _TLS_RAND_H_ #include <openssl/ssl.h> -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L #include <openssl/rand.h>

1 0

git:5.7:d4b7333c: tls: disable engine for openssl >= 3.0
by Victor Seva 21 Jun '23

21 Jun '23

Module: kamailio Branch: 5.7 Commit: d4b7333ca126ae7c77ec8f095f8728234d0dfe43 URL: https://github.com/kamailio/kamailio/commit/d4b7333ca126ae7c77ec8f095f87282… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-21T12:10:46+02:00 tls: disable engine for openssl >= 3.0 From https://www.openssl.org/docs/man3.0/man7/migration_guide.html > The refactoring to support Providers conflicts internally with the APIs > used to support engines, including the ENGINE API and any function that > creates or modifies custom "METHODS" From https://www.openssl.org/docs/man3.0/man3/ENGINE_init.html: > All of the functions described on this page are deprecated. Applications > should instead use the provider APIs. (cherry picked from commit a0a9373ccb3d3da3a1e9e1335d904fcf013d9ebd) --- 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/d4b7333ca126ae7c77ec8f095f87282… Patch: https://github.com/kamailio/kamailio/commit/d4b7333ca126ae7c77ec8f095f87282… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index d718c92893..ad6e08bffa 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -30,6 +30,10 @@ #include <openssl/bn.h> #include <openssl/dh.h> +#if OPENSSL_VERSION_NUMBER >= 0x030000000L +#define OPENSSL_NO_ENGINE +#endif + #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #include "tls_map.h" diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 22be7688d1..a0f90c1106 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -87,6 +87,9 @@ int ksr_rand_engine_param(modparam_t type, void* val); MODULE_VERSION +#if OPENSSL_VERSION_NUMBER >= 0x030000000L +#define OPENSSL_NO_ENGINE +#endif extern str sr_tls_event_callback; str sr_tls_xavp_cfg = {0, 0}; diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index afd16ab542..5c039c920b 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -128,6 +128,9 @@ int tls_run_event_routes(struct tcp_connection *c); #endif /* __SUNPRO_c */ #endif /* TLS_RD_DEBUG */ +#if OPENSSL_VERSION_NUMBER >= 0x030000000L +#define OPENSSL_NO_ENGINE +#endif extern str sr_tls_xavp_cfg;

1 0

git:5.7:6669c0be: tls: OPENSSL_fork_[prepare|parent|child] deprecated at openssl 3.0
by Victor Seva 21 Jun '23

21 Jun '23

Module: kamailio Branch: 5.7 Commit: 6669c0befcd69f5d5e196c53188bed58a6a9e1c2 URL: https://github.com/kamailio/kamailio/commit/6669c0befcd69f5d5e196c53188bed5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-21T12:10:28+02:00 tls: OPENSSL_fork_[prepare|parent|child] deprecated at openssl 3.0 From https://www.openssl.org/docs/man3.0/man3/OPENSSL_fork_prepare.html: > OPENSSL_fork_prepare, OPENSSL_fork_parent, OPENSSL_fork_child have been > deprecated since OpenSSL 3.0. > > These methods are currently unused, and as such, no replacement methods > are required or planned. > > OpenSSL has state that should be reset when a process forks. For > example, the entropy pool used to generate random numbers (and therefore > encryption keys) should not be shared across multiple programs. The > OPENSSL_fork_prepare(), OPENSSL_fork_parent(), and OPENSSL_fork_child() > functions are used to reset this internal state. > > OPENSSL_init_crypto(3) will register these functions with the > appropriate handler, when the OPENSSL_INIT_ATFORK flag is used (cherry picked from commit 9d6bfb96528c49e6aaa39aa47be877ca528c3537) --- Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6669c0befcd69f5d5e196c53188bed5… Patch: https://github.com/kamailio/kamailio/commit/6669c0befcd69f5d5e196c53188bed5… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 8f40fab0212..8071ec3ad74 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -740,7 +740,7 @@ int tls_h_mod_pre_init_f(void) LM_DBG("preparing tls env for modules initialization\n"); #if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n"); - OPENSSL_init_ssl(0, NULL); + OPENSSL_init_ssl(OPENSSL_INIT_ATFORK, NULL); #else LM_DBG("preparing tls env for modules initialization (libssl <=1.0)\n"); SSL_library_init(); diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 466e2fcdbbe..22be7688d16 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -450,7 +450,8 @@ static int mod_child(int rank) &mod_params, &mod_params) < 0) return -1; } -#if OPENSSL_VERSION_NUMBER >= 0x010101000L +#if OPENSSL_VERSION_NUMBER >= 0x010101000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L if(ksr_tls_init_mode&TLS_MODE_FORK_PREPARE) { OPENSSL_fork_prepare(); } @@ -458,7 +459,8 @@ static int mod_child(int rank) return 0; } -#if OPENSSL_VERSION_NUMBER >= 0x010101000L +#if OPENSSL_VERSION_NUMBER >= 0x010101000L \ + && OPENSSL_VERSION_NUMBER < 0x030000000L if(ksr_tls_init_mode&TLS_MODE_FORK_PREPARE) { if(rank==PROC_POSTCHILDINIT) { /*

1 0

git:master:b7b3c67f: http_client: fix depecration of CURLOPT_PROTOCOLS and CURLINFO_SIZE_DOWNLOAD
by Daniel-Constantin Mierla 21 Jun '23

21 Jun '23

Module: kamailio Branch: master Commit: b7b3c67fc1205d114fadf360a594930ef69835a3 URL: https://github.com/kamailio/kamailio/commit/b7b3c67fc1205d114fadf360a594930… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-21T09:27:28+02:00 http_client: fix depecration of CURLOPT_PROTOCOLS and CURLINFO_SIZE_DOWNLOAD - GH #3484 --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/b7b3c67fc1205d114fadf360a594930… Patch: https://github.com/kamailio/kamailio/commit/b7b3c67fc1205d114fadf360a594930… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index e85d87d6938..a5316972d45 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -155,8 +155,12 @@ static int curL_request_url(struct sip_msg *_m, const char *_met, res = curl_easy_setopt(curl, CURLOPT_URL, _url); /* Limit to HTTP and HTTPS protocols */ +#if defined(CURL_AT_LEAST_VERSION) && CURL_AT_LEAST_VERSION(7, 85, 0) + res = curl_easy_setopt(curl, CURLOPT_PROTOCOLS_STR, "http,https"); +#else res = curl_easy_setopt( curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); +#endif res = curl_easy_setopt( curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); @@ -383,8 +387,13 @@ static int curL_request_url(struct sip_msg *_m, const char *_met, if((stat >= 200) && (stat < 500)) { double datasize = 0; - +#if defined(CURL_AT_LEAST_VERSION) && CURL_AT_LEAST_VERSION(7, 55, 0) + curl_off_t dlsize; + curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD_T, &dlsize); + download_size = (double)dlsize; +#else curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &download_size); +#endif LM_DBG(" -- curl download size: %u \n", (unsigned int)download_size); datasize = download_size;

1 0

git:master:4985bc9c: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 21 Jun '23

21 Jun '23

Module: kamailio Branch: master Commit: 4985bc9cc764699297235d4220ec9a07a9286988 URL: https://github.com/kamailio/kamailio/commit/4985bc9cc764699297235d4220ec9a0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-21T08:16:22+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/4985bc9cc764699297235d4220ec9a0… Patch: https://github.com/kamailio/kamailio/commit/4985bc9cc764699297235d4220ec9a0…

1 0

git:master:4d51c674: rtpengine: release json document object
by Daniel-Constantin Mierla 21 Jun '23

21 Jun '23

Module: kamailio Branch: master Commit: 4d51c674c5b9635b7f7d9ab39582752b856373d4 URL: https://github.com/kamailio/kamailio/commit/4d51c674c5b9635b7f7d9ab39582752… Author: Joey Golan <joey(a)synchapp.io> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-21T08:07:05+02:00 rtpengine: release json document object --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/4d51c674c5b9635b7f7d9ab39582752… Patch: https://github.com/kamailio/kamailio/commit/4d51c674c5b9635b7f7d9ab39582752… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 3de7b87599c..02fa3e5b66f 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1452,6 +1452,8 @@ static int rtpengine_raise_dtmf_event(char *buffer, int len) { goto error; } + srjson_DestroyDoc(&jdoc); + return 0; error: @@ -2394,7 +2396,8 @@ static int child_init(int rank) /* fork worker process */ mypid = fork_process(PROC_RPC, "RTPENGINE DTMF WORKER", 1); if(mypid < 0) { - LM_ERR("failed to fork RTPENGINE DTMF WORKER process %d\n", mypid); + LM_ERR("failed to fork RTPENGINE DTMF WORKER process %d\n", + mypid); return -1; } else if(mypid == 0) { if(cfg_child_init()) @@ -2455,7 +2458,7 @@ static void mod_destroy(void) rtpp_no_lock = NULL; } - if (!rtpp_set_list) { + if(!rtpp_set_list) { return; }

1 0

git:master:75b41baa: rtpengine: fix build failed on specific distribution
by Daniel-Constantin Mierla 21 Jun '23

21 Jun '23

Module: kamailio Branch: master Commit: 75b41baad06bbd7f57fa8e1f71c608852df7494b URL: https://github.com/kamailio/kamailio/commit/75b41baad06bbd7f57fa8e1f71c6088… Author: Joey Golan <joey(a)synchapp.io> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-21T08:07:05+02:00 rtpengine: fix build failed on specific distribution Fix clang-format-checker errors --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/75b41baad06bbd7f57fa8e1f71c6088… Patch: https://github.com/kamailio/kamailio/commit/75b41baad06bbd7f57fa8e1f71c6088…

1 0

git:master:17da2e83: rtpengine: Fix rfuchs's PR comments
by Daniel-Constantin Mierla 21 Jun '23

21 Jun '23

Module: kamailio Branch: master Commit: 17da2e8344fc5f010ae08277a89b4b122dd8c56b URL: https://github.com/kamailio/kamailio/commit/17da2e8344fc5f010ae08277a89b4b1… Author: Joey Golan <joey(a)synchapp.io> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-21T08:07:05+02:00 rtpengine: Fix rfuchs's PR comments --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/17da2e8344fc5f010ae08277a89b4b1… Patch: https://github.com/kamailio/kamailio/commit/17da2e8344fc5f010ae08277a89b4b1…

1 0

git:master:26f6e57c: Register a new worker process for dtmf event listener
by Daniel-Constantin Mierla 21 Jun '23

21 Jun '23

Module: kamailio Branch: master Commit: 26f6e57c8ffdf06e6837bb54396cd955bad8402a URL: https://github.com/kamailio/kamailio/commit/26f6e57c8ffdf06e6837bb54396cd95… Author: Joey Golan <joey(a)synchapp.io> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-21T08:07:05+02:00 Register a new worker process for dtmf event listener --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/26f6e57c8ffdf06e6837bb54396cd95… Patch: https://github.com/kamailio/kamailio/commit/26f6e57c8ffdf06e6837bb54396cd95…

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2023