sr-dev September 2019

sr-dev@lists.kamailio.org

24 participants
368 discussions

git:master:a0ca4cd4: tls: openssl_mutex_shared - add a date to the note about libssl workaround validity
by GitHub 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: a0ca4cd43f098d10aa5aadcc18453cbd0120dcef URL: https://github.com/kamailio/kamailio/commit/a0ca4cd43f098d10aa5aadcc18453cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-09-13T13:39:23+02:00 tls: openssl_mutex_shared - add a date to the note about libssl workaround validity --- Modified: src/modules/tls/utils/openssl_mutex_shared/README.md --- Diff: https://github.com/kamailio/kamailio/commit/a0ca4cd43f098d10aa5aadcc18453cb… Patch: https://github.com/kamailio/kamailio/commit/a0ca4cd43f098d10aa5aadcc18453cb… --- diff --git a/src/modules/tls/utils/openssl_mutex_shared/README.md b/src/modules/tls/utils/openssl_mutex_shared/README.md index 0be8aaac64..d5002b3335 100644 --- a/src/modules/tls/utils/openssl_mutex_shared/README.md +++ b/src/modules/tls/utils/openssl_mutex_shared/README.md @@ -1,9 +1,9 @@ # OpenSSL Shared Mutex # **IMPORTANT: the workaround of using this preloaded shared library is no longer -needed starting with Kamailio v5.3.0-pre1. The code of this shared library -has been included in the core of Kamailio and the same behaviour is now -achieved by default.** +needed starting with Kamailio v5.3.0-pre1 (git master branch after September 14, 2019). +The code of this shared library has been included in the core of Kamailio and the +same behaviour is now achieved by default.** This is a shared library required as a short term workaround for using Kamailio with OpenSSL (libssl) v1.1. It has to be pre-loaded before starting Kamailio.

1 0

git:master:321eb14d: tls: openssl_mutex_shared - note that its code was imported in the core
by Daniel-Constantin Mierla 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: 321eb14d23c42a1b22ff4d5a735247e4c53acde0 URL: https://github.com/kamailio/kamailio/commit/321eb14d23c42a1b22ff4d5a735247e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-13T13:11:09+02:00 tls: openssl_mutex_shared - note that its code was imported in the core --- Modified: src/modules/tls/utils/openssl_mutex_shared/README.md --- Diff: https://github.com/kamailio/kamailio/commit/321eb14d23c42a1b22ff4d5a735247e… Patch: https://github.com/kamailio/kamailio/commit/321eb14d23c42a1b22ff4d5a735247e… --- diff --git a/src/modules/tls/utils/openssl_mutex_shared/README.md b/src/modules/tls/utils/openssl_mutex_shared/README.md index 26f5de84b4..0be8aaac64 100644 --- a/src/modules/tls/utils/openssl_mutex_shared/README.md +++ b/src/modules/tls/utils/openssl_mutex_shared/README.md @@ -1,5 +1,10 @@ # OpenSSL Shared Mutex # +**IMPORTANT: the workaround of using this preloaded shared library is no longer +needed starting with Kamailio v5.3.0-pre1. The code of this shared library +has been included in the core of Kamailio and the same behaviour is now +achieved by default.** + This is a shared library required as a short term workaround for using Kamailio with OpenSSL (libssl) v1.1. It has to be pre-loaded before starting Kamailio.

1 0

git:master:1185b5f9: Makefile.defs: version set to 5.3.0-pre1
by Daniel-Constantin Mierla 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: 1185b5f90eb3d608b66247dbec284d94188452e2 URL: https://github.com/kamailio/kamailio/commit/1185b5f90eb3d608b66247dbec284d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-13T13:07:51+02:00 Makefile.defs: version set to 5.3.0-pre1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1185b5f90eb3d608b66247dbec284d9… Patch: https://github.com/kamailio/kamailio/commit/1185b5f90eb3d608b66247dbec284d9… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 2a8a80cb2b..fe0e4a90fb 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:a8c811e6: core: main - functions to set PTHREAD_PROCESS_SHARED for pthread mutex and rwlock
by Daniel-Constantin Mierla 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: a8c811e69e964821b73d0861a9547a301253d172 URL: https://github.com/kamailio/kamailio/commit/a8c811e69e964821b73d0861a9547a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-13T13:00:17+02:00 core: main - functions to set PTHREAD_PROCESS_SHARED for pthread mutex and rwlock - code relocated from src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c - simpler option to initialize kamailio with the workaround for libssl v1.1+ without using the preloaded library approach --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/a8c811e69e964821b73d0861a9547a3… Patch: https://github.com/kamailio/kamailio/commit/a8c811e69e964821b73d0861a9547a3… --- diff --git a/src/main.c b/src/main.c index 5af5284c55..03d39b46d4 100644 --- a/src/main.c +++ b/src/main.c @@ -30,6 +30,12 @@ * sip router core part. */ +#ifdef KSR_PTHREAD_MUTEX_SHARED +#define _GNU_SOURCE +#include <pthread.h> +#include <dlfcn.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -2814,3 +2820,72 @@ int main(int argc, char** argv) } return -1; } + + +#ifdef KSR_PTHREAD_MUTEX_SHARED + +/** + * code to set PTHREAD_PROCESS_SHARED attribute for phtread mutex to cope + * with libssl 1.1+ thread-only mutex initialization + */ + +#define SYMBOL_EXPORT __attribute__((visibility("default"))) + +int SYMBOL_EXPORT pthread_mutex_init (pthread_mutex_t *__mutex, + const pthread_mutexattr_t *__mutexattr) +{ + static int (*real_pthread_mutex_init)(pthread_mutex_t *__mutex, + const pthread_mutexattr_t *__mutexattr) = 0; + pthread_mutexattr_t attr; + int ret; + + if (!real_pthread_mutex_init) { + real_pthread_mutex_init = dlsym(RTLD_NEXT, "pthread_mutex_init"); + if (!real_pthread_mutex_init) { + return -1; + } + } + + if (__mutexattr) { + pthread_mutexattr_t attr = *__mutexattr; + pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + return real_pthread_mutex_init(__mutex, &attr); + } + + pthread_mutexattr_init(&attr); + pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + ret = real_pthread_mutex_init(__mutex, &attr); + pthread_mutexattr_destroy(&attr); + + return ret; +} + +int SYMBOL_EXPORT pthread_rwlock_init (pthread_rwlock_t *__restrict __rwlock, + const pthread_rwlockattr_t *__restrict __attr) +{ + static int (*real_pthread_rwlock_init)(pthread_rwlock_t *__restrict __rwlock, + const pthread_rwlockattr_t *__restrict __attr) = 0; + pthread_rwlockattr_t attr; + int ret; + + if (!real_pthread_rwlock_init) { + real_pthread_rwlock_init = dlsym(RTLD_NEXT, "pthread_rwlock_init"); + if (!real_pthread_rwlock_init) { + return -1; + } + } + + if (__attr) { + pthread_rwlockattr_t attr = *__attr; + pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + return real_pthread_rwlock_init(__rwlock, &attr); + } + + pthread_rwlockattr_init(&attr); + pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + ret = real_pthread_rwlock_init(__rwlock, &attr); + pthread_rwlockattr_destroy(&attr); + + return ret; +} +#endif

1 0

git:master:79619717: Makefile.defs: detect if libssl version is 1.1+
by Daniel-Constantin Mierla 13 Sep '19

13 Sep '19

Module: kamailio Branch: master Commit: 79619717aa67c219fc36dfaac8d06919b8f2018e URL: https://github.com/kamailio/kamailio/commit/79619717aa67c219fc36dfaac8d0691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-13T12:57:38+02:00 Makefile.defs: detect if libssl version is 1.1+ - link against pthread to be able to set PTHREAD_PROCESS_SHARED attribute for mutex and rwlock initialization --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/79619717aa67c219fc36dfaac8d0691… Patch: https://github.com/kamailio/kamailio/commit/79619717aa67c219fc36dfaac8d0691… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 69416e8003..2a8a80cb2b 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -178,6 +178,42 @@ CC_EXTRA_OPTS ?= # extra LD command line options LD_EXTRA_OPTS ?= + +# enable workaround for libssl 1.1+ to set shared mutex attribute +LIBSSL_SET_MUTEX_SHARED ?= +ifneq ($(LIBSSL_SET_MUTEX_SHARED), 1) + +ifeq ($(CROSS_COMPILE),) +LIBSSL_PKGCONFIG=$(shell \ + if pkg-config --exists libssl; then \ + echo 'pkg-config libssl'; \ + fi) +endif + +ifneq ($(LIBSSL_PKGCONFIG),) + +# numerical version (good for comparisons: A.B.C => A*1000000+B*1000+C) +LIBSSL_VERNUM:= $(shell $(LIBSSL_PKGCONFIG) --modversion | sed -e 's/^[^0-9]*//' \ + -e 's/^$[0-9][0-9]*\(\.[0-9][0-9]*$*\).*$$/\1/g' | \ + (IFS=. read A B C D; R=0; \ + [ -n "$$A" ] && R=`expr $$R \* 1000 + $$A` && \ + [ -n "$$B" ] && R=`expr $$R \* 1000 + $$B` && \ + [ -n "$$C" ] && R=`expr $$R \* 1000 + $$C`; echo $$R ) ) + +# libssl version greater or equal than 1.1 +ifeq ($(shell [ $(LIBSSL_VERNUM) -ge 1001000 ] && echo libssl11plus), libssl11plus) +LIBSSL_SET_MUTEX_SHARED := 1 +endif + +endif + +endif + +ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1) +CC_EXTRA_OPTS+= -pthread -DKSR_PTHREAD_MUTEX_SHARED +LD_EXTRA_OPTS+= -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions +endif + ifeq ($(OS), solaris) #use GNU versions INSTALL ?= ginstall

1 0

[kamailio/kamailio] pkg/kamailio: added rpm version and release configuration (#2050)
by sergey-safarov 13 Sep '19

13 Sep '19

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Allow update version information in RPM spec file You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2050 -- Commit Summary -- * pkg/kamailio: added rpm version and release configuration -- File Changes -- M pkg/kamailio/Makefile (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2050.patch https://github.com/kamailio/kamailio/pull/2050.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/2050

2 6

git:master:9f514da4: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 12 Sep '19

12 Sep '19

Module: kamailio Branch: master Commit: 9f514da4f0e601d246ffdeee837ca4c5f0488084 URL: https://github.com/kamailio/kamailio/commit/9f514da4f0e601d246ffdeee837ca4c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-12T23:47:23+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/9f514da4f0e601d246ffdeee837ca4c… Patch: https://github.com/kamailio/kamailio/commit/9f514da4f0e601d246ffdeee837ca4c… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 022c65f341..bd73411bae 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -684,7 +684,8 @@ modparam("acc", "early_media", 1) 6.2. failed_transaction_flag (integer) Per transaction flag which says if the transaction should be accounted - also in case of failure (status>=300). + also in case of failure (SIP status code >= 300). This flag triggers + accouting when the whole transaction fails (on the server side). Default value is not-set (no flag). @@ -818,12 +819,12 @@ modparam("acc", "log_flag", 2) Request flag which needs to be set to account missed calls via syslog. This can be used to e.g. account failures during the call setup phase - from the callee side, for example if you do forking to several + from the callee (client) side, for example if you do forking to several destinations. - Keep in mind that this flag is reset after processing. Therefore it is - necessary to set it again e.g. in a failure_route if you do serial - forking and want to log all attempts. + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do + serial forking and want to log all attempts. Default value is not-set (no flag). @@ -882,8 +883,14 @@ modparam("acc", "db_flag", 2) 6.16. db_missed_flag (integer) - Request flag which needs to be set to account missed calls -- database - specific. + Request flag which needs to be set to account missed calls via + database. This can be used to e.g. account failures during the call + setup phase from the callee (client) side, for example if you do + forking to several destinations. + + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do + serial forking and want to log all attempts. Default value is not-set (no flag).

1 0

git:5.2:f7ad4bdc: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 12 Sep '19

12 Sep '19

Module: kamailio Branch: 5.2 Commit: f7ad4bdc2398d37d9226c7a07cdbe0fe604a9cba URL: https://github.com/kamailio/kamailio/commit/f7ad4bdc2398d37d9226c7a07cdbe0f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-12T23:47:08+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/f7ad4bdc2398d37d9226c7a07cdbe0f… Patch: https://github.com/kamailio/kamailio/commit/f7ad4bdc2398d37d9226c7a07cdbe0f… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 022c65f341..bd73411bae 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -684,7 +684,8 @@ modparam("acc", "early_media", 1) 6.2. failed_transaction_flag (integer) Per transaction flag which says if the transaction should be accounted - also in case of failure (status>=300). + also in case of failure (SIP status code >= 300). This flag triggers + accouting when the whole transaction fails (on the server side). Default value is not-set (no flag). @@ -818,12 +819,12 @@ modparam("acc", "log_flag", 2) Request flag which needs to be set to account missed calls via syslog. This can be used to e.g. account failures during the call setup phase - from the callee side, for example if you do forking to several + from the callee (client) side, for example if you do forking to several destinations. - Keep in mind that this flag is reset after processing. Therefore it is - necessary to set it again e.g. in a failure_route if you do serial - forking and want to log all attempts. + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do + serial forking and want to log all attempts. Default value is not-set (no flag). @@ -882,8 +883,14 @@ modparam("acc", "db_flag", 2) 6.16. db_missed_flag (integer) - Request flag which needs to be set to account missed calls -- database - specific. + Request flag which needs to be set to account missed calls via + database. This can be used to e.g. account failures during the call + setup phase from the callee (client) side, for example if you do + forking to several destinations. + + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do + serial forking and want to log all attempts. Default value is not-set (no flag).

1 0

git:5.1:24ef2099: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 12 Sep '19

12 Sep '19

Module: kamailio Branch: 5.1 Commit: 24ef2099dedbf6d562a9cec52b6b1537ca86d8b0 URL: https://github.com/kamailio/kamailio/commit/24ef2099dedbf6d562a9cec52b6b153… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-12T23:46:53+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/24ef2099dedbf6d562a9cec52b6b153… Patch: https://github.com/kamailio/kamailio/commit/24ef2099dedbf6d562a9cec52b6b153… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index c8dd133d59..e7d0cfbeba 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -680,7 +680,8 @@ modparam("acc", "early_media", 1) 6.2. failed_transaction_flag (integer) Per transaction flag which says if the transaction should be accounted - also in case of failure (status>=300). + also in case of failure (SIP status code >= 300). This flag triggers + accouting when the whole transaction fails (on the server side). Default value is not-set (no flag). @@ -814,12 +815,12 @@ modparam("acc", "log_flag", 2) Request flag which needs to be set to account missed calls via syslog. This can be used to e.g. account failures during the call setup phase - from the callee side, for example if you do forking to several + from the callee (client) side, for example if you do forking to several destinations. - Keep in mind that this flag is reset after processing. Therefore it is - necessary to set it again e.g. in a failure_route if you do serial - forking and want to log all attempts. + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do + serial forking and want to log all attempts. Default value is not-set (no flag). @@ -878,8 +879,14 @@ modparam("acc", "db_flag", 2) 6.16. db_missed_flag (integer) - Request flag which needs to be set to account missed calls -- database - specific. + Request flag which needs to be set to account missed calls via + database. This can be used to e.g. account failures during the call + setup phase from the callee (client) side, for example if you do + forking to several destinations. + + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do + serial forking and want to log all attempts. Default value is not-set (no flag).

1 0

git:5.2:daab9563: acc: extend documentation related to flag usage
by Henning Westerholt 12 Sep '19

12 Sep '19

Module: kamailio Branch: 5.2 Commit: daab9563d3edcdf59028ca5b4004bc1d6edecced URL: https://github.com/kamailio/kamailio/commit/daab9563d3edcdf59028ca5b4004bc1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-12T23:40:52+02:00 acc: extend documentation related to flag usage (cherry picked from commit 40905046baab49fb3baf0f2fdded1307b023d08a) --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/daab9563d3edcdf59028ca5b4004bc1… Patch: https://github.com/kamailio/kamailio/commit/daab9563d3edcdf59028ca5b4004bc1… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 61e27a196e..a0794ca562 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -489,7 +489,9 @@ modparam("acc", "early_media", 1) <title><varname>failed_transaction_flag</varname> (integer)</title> <para> Per transaction flag which says if the transaction should be - accounted also in case of failure (status>=300). + accounted also in case of failure (SIP status code >= 300). + This flag triggers accouting when the whole transaction fails + (on the server side). </para> <para> Default value is not-set (no flag). @@ -679,12 +681,12 @@ modparam("acc", "log_flag", 2) <para> Request flag which needs to be set to account missed calls via syslog. This can be used to e.g. account failures during the call setup phase - from the callee side, for example if you do forking to several + from the callee (client) side, for example if you do forking to several destinations. </para> <para> - Keep in mind that this flag is reset after processing. Therefore it is - necessary to set it again e.g. in a failure_route if you do serial + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do serial forking and want to log all attempts. </para> <para> @@ -775,8 +777,15 @@ modparam("acc", "db_flag", 2) <section id="acc.p.db_missed_flag"> <title><varname>db_missed_flag</varname> (integer)</title> <para> - Request flag which needs to be set to account missed - calls -- database specific. + Request flag which needs to be set to account missed calls via database. + This can be used to e.g. account failures during the call setup phase + from the callee (client) side, for example if you do forking to several + destinations. + </para> + <para> + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do serial + forking and want to log all attempts. </para> <para> Default value is not-set (no flag).

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2019