August 2020 - sr-dev - kamailio.org

[kamailio/kamailio] fix compilation without deprecated OpenSSL APIs (#2428)
by Rosen Penev 12 Aug '20

12 Aug '20

Signed-off-by: Rosen Penev <rosenp(a)gmail.com> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2428 -- Commit Summary -- * fix compilation without deprecated OpenSSL APIs -- File Changes -- M src/modules/tls/tls_domain.c (4) M src/modules/tls/tls_init.c (15) M src/modules/tls/tls_locking.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2428.patch https://github.com/kamailio/kamailio/pull/2428.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2428

2 6

git:master:234b0223: tls: support compilation without deprecated OpenSSL APIs
by Daniel-Constantin Mierla 12 Aug '20

12 Aug '20

Module: kamailio Branch: master Commit: 234b02236b3ad13cdaf5624d11c727ad7d804747 URL: https://github.com/kamailio/kamailio/commit/234b02236b3ad13cdaf5624d11c727a… Author: Rosen Penev <rosenp(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-12T16:37:13+02:00 tls: support compilation without deprecated OpenSSL APIs - GH #2428 --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/234b02236b3ad13cdaf5624d11c727a… Patch: https://github.com/kamailio/kamailio/commit/234b02236b3ad13cdaf5624d11c727a… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index a8859c4a31..fc84033e68 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -27,6 +27,8 @@ #include <stdlib.h> #include <openssl/ssl.h> #include <openssl/opensslv.h> +#include <openssl/bn.h> +#include <openssl/dh.h> #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> @@ -61,7 +63,7 @@ static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; - if (SSLeay() < 0x1000005fL) { + if (OpenSSL_version_num() < 0x1000005fL) { return; } diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index b9288cbd9a..351ed4187e 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -627,14 +627,13 @@ int tls_h_mod_pre_init_f(void) return 0; } 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); -#else +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) LM_DBG("preparing tls env for modules initialization (libssl <=1.0)\n"); SSL_library_init(); -#endif SSL_load_error_strings(); +#else + LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n"); +#endif tls_mod_preinitialized=1; return 0; } @@ -668,7 +667,7 @@ int tls_h_mod_init_f(void) #if OPENSSL_VERSION_NUMBER < 0x00907000L LM_WARN("You are using an old version of OpenSSL (< 0.9.7). Upgrade!\n"); #endif - ssl_version=SSLeay(); + ssl_version=OpenSSL_version_num(); /* check if version have the same major minor and fix level * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) * - values is represented as 0xMMNNFFPPS: major minor fix patch status @@ -680,7 +679,7 @@ int tls_h_mod_init_f(void) " compiled \"%s\" (0x%08lx).\n" " Please make sure a compatible version is used" " (tls_force_run in kamailio.cfg will override this check)\n", - SSLeay_version(SSLEAY_VERSION), ssl_version, + OpenSSL_version(OPENSSL_VERSION), ssl_version, OPENSSL_VERSION_TEXT, (long)OPENSSL_VERSION_NUMBER); if (cfg_get(tls, tls_cfg, force_run)) LM_WARN("tls_force_run turned on, ignoring " @@ -857,6 +856,7 @@ int tls_check_sockets(tls_domains_cfg_t* cfg) void tls_h_mod_destroy_f(void) { LM_DBG("tls module final tls destroy\n"); +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) if(tls_mod_preinitialized > 0) ERR_free_strings(); /* TODO: free all the ctx'es */ @@ -869,4 +869,5 @@ void tls_h_mod_destroy_f(void) LM_DBG("executing openssl v1.1+ cleanup\n"); OPENSSL_cleanup(); #endif +#endif } diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 4e5bbcc5e3..3eb6f033a5 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -140,6 +140,8 @@ unsigned long sr_ssl_id_f() /* returns -1 on error, 0 on success */ int tls_init_locks() { +/* OpenSSL is thread-safe since 1.1.0 */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* init "static" tls locks */ n_static_locks=CRYPTO_num_locks(); if (n_static_locks<0){ @@ -167,13 +169,10 @@ int tls_init_locks() CRYPTO_set_locking_callback(locking_f); } -/* OpenSSL is thread-safe since 1.1.0 */ -#if OPENSSL_VERSION_NUMBER < 0x10100000L /* set "dynamic" locks callbacks */ CRYPTO_set_dynlock_create_callback(dyn_create_f); CRYPTO_set_dynlock_lock_callback(dyn_lock_f); CRYPTO_set_dynlock_destroy_callback(dyn_destroy_f); -#endif /* starting with v1.0.0 openssl does not use anymore getpid(), but address * of errno which can point to same virtual address in a multi-process @@ -186,6 +185,7 @@ int tls_init_locks() * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f); */ +#endif return 0; error:

1 0

[kamailio/kamailio] siptrace: fix drop() usage in siptrace:msg event route (#2431)
by Nuno Ferreira 12 Aug '20

12 Aug '20

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  `ctx` was not getting initialized with the result of `run_top_route()` execution preventing `drop();` to work in the `siptrace:msg` event route You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2431 -- Commit Summary -- * siptrace: fix run_top_route() call to set ctx -- File Changes -- M src/modules/siptrace/siptrace.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2431.patch https://github.com/kamailio/kamailio/pull/2431.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2431

2 3

git:master:cff8e22d: Merge pull request #2431 from nferreyra/siptrace/fix_drop_in_event_route
by GitHub 12 Aug '20

12 Aug '20

Module: kamailio Branch: master Commit: cff8e22da160933b63b7cfa296386adb5155d0b1 URL: https://github.com/kamailio/kamailio/commit/cff8e22da160933b63b7cfa296386ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-08-12T16:31:42+02:00 Merge pull request #2431 from nferreyra/siptrace/fix_drop_in_event_route siptrace: fix drop() usage in siptrace:msg event route --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/cff8e22da160933b63b7cfa296386ad… Patch: https://github.com/kamailio/kamailio/commit/cff8e22da160933b63b7cfa296386ad… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 1b7b014d0e..2e8e690ac0 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2053,7 +2053,7 @@ static int siptrace_exec_evcb_msg(siptrace_data_t *sto) init_run_actions_ctx(&ctx); if(_siptrace_evrt_msg_idx>=0) { - run_top_route(event_rt.rlist[_siptrace_evrt_msg_idx], &msg, 0); + run_top_route(event_rt.rlist[_siptrace_evrt_msg_idx], &msg, &ctx); } else { keng = sr_kemi_eng_get(); if (keng!=NULL) {

1 0

git:master:ef992449: siptrace: fix run_top_route() call to set ctx
by Nuno Ferreira 12 Aug '20

12 Aug '20

Module: kamailio Branch: master Commit: ef9924495dd007a5a7b7ab36049200e78e7ab10d URL: https://github.com/kamailio/kamailio/commit/ef9924495dd007a5a7b7ab36049200e… Author: Nuno Ferreira <nferreira(a)fuze.com> Committer: Nuno Ferreira <nferreira(a)fuze.com> Date: 2020-08-07T19:20:00+01:00 siptrace: fix run_top_route() call to set ctx - fix drop() usage in siptrace:msg event route --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ef9924495dd007a5a7b7ab36049200e… Patch: https://github.com/kamailio/kamailio/commit/ef9924495dd007a5a7b7ab36049200e… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 1b7b014d0e..2e8e690ac0 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2053,7 +2053,7 @@ static int siptrace_exec_evcb_msg(siptrace_data_t *sto) init_run_actions_ctx(&ctx); if(_siptrace_evrt_msg_idx>=0) { - run_top_route(event_rt.rlist[_siptrace_evrt_msg_idx], &msg, 0); + run_top_route(event_rt.rlist[_siptrace_evrt_msg_idx], &msg, &ctx); } else { keng = sr_kemi_eng_get(); if (keng!=NULL) {

1 0

[kamailio/kamailio] xhttp_prom: add support for histogram metrics. (#2435)
by vhernando 11 Aug '20

11 Aug '20

#### 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  Histogram metric and minor issues. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2435 -- Commit Summary -- * xhttp_prom: add support for histogram metrics. -- File Changes -- M src/modules/xhttp_prom/doc/xhttp_prom_admin.xml (203) M src/modules/xhttp_prom/prom.c (102) M src/modules/xhttp_prom/prom.h (21) M src/modules/xhttp_prom/prom_metric.c (909) M src/modules/xhttp_prom/prom_metric.h (50) M src/modules/xhttp_prom/xhttp_prom.c (630) M src/modules/xhttp_prom/xhttp_prom.h (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2435.patch https://github.com/kamailio/kamailio/pull/2435.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2435

2 2

Re: [sr-dev] [kamailio/kamailio] core: keep a global flag in shm for shut down phase (6da946e)
by Daniel-Constantin Mierla 11 Aug '20

11 Aug '20

Indeed, thanks! Pushed a commit using NULL comparison to follow recommendations to highlight is about pointers. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/6da946e4a3d6d6949dd6babe9cf3919…

1 0

git:master:27b2ddf9: core: proper test when initializing _ksr_shutdown_phase shm pointer
by Daniel-Constantin Mierla 11 Aug '20

11 Aug '20

Module: kamailio Branch: master Commit: 27b2ddf926240b1dd269eb1d96767d73edf9c6e6 URL: https://github.com/kamailio/kamailio/commit/27b2ddf926240b1dd269eb1d96767d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-11T16:33:02+02:00 core: proper test when initializing _ksr_shutdown_phase shm pointer --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/27b2ddf926240b1dd269eb1d96767d7… Patch: https://github.com/kamailio/kamailio/commit/27b2ddf926240b1dd269eb1d96767d7… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 545845fdc5..56ba8bca59 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -110,11 +110,11 @@ unsigned int set_modinit_delay(unsigned int v) } /* shut down phase for instance - kept in shared memory */ -static int *_ksr_shutdown_phase = 0; +static int *_ksr_shutdown_phase = NULL; int ksr_shutdown_phase_init(void) { - if(_ksr_shutdown_phase) { + if(_ksr_shutdown_phase == NULL) { _ksr_shutdown_phase = (int*)shm_malloc(sizeof(int)); } return 0;

1 0

Re: [sr-dev] [kamailio/kamailio] core: keep a global flag in shm for shut down phase (6da946e)
by Andrey Deykunov 11 Aug '20

11 Aug '20

if(_ksr_shutdown_phase) { instance of _ksr_shutdown_phase cannot be initialized here. it supposed to be: if(!_ksr_shutdown_phase) { -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/6da946e4a3d6d6949dd6babe9cf3919…

1 0

[kamailio/kamailio] dual-stack bonding when used network interface name (#2404)
by sergey-safarov 11 Aug '20

11 Aug '20

### Description I prefer to use interface name for `listen` *example* ``` listen=udp:eth0:5060 ``` When `kamailo` started then bounded only to IPv4 address. Could be added feature dual-stack bounding when used interface name. tested latest master. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2404

2 10