sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
389 discussions

[kamailio/kamailio] resolve an issue found by cppcheck (#1169)

by Ilya Shipitsin

[utils/db_berkeley/kambdb_recover.c:339] -> [utils/db_berkeley/kambdb_recover.c:341]: (warning) Either the condition '!tbc' is redundant or there is possible null pointer dereference: tbc. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1169 -- Commit Summary -- * resolve an issue found by cppcheck: -- File Changes -- M utils/db_berkeley/kambdb_recover.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1169.patch https://github.com/kamailio/kamailio/pull/1169.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/1169

7 years, 5 months

git:master:5e8f84e9: .github: added pull request template

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5e8f84e9c7d3ef792ea8b0520087ae3e933fda39 URL: https://github.com/kamailio/kamailio/commit/5e8f84e9c7d3ef792ea8b0520087ae3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-28T17:22:34+02:00 .github: added pull request template --- Added: .github/PULL_REQUEST_TEMPLATE.md --- Diff: https://github.com/kamailio/kamailio/commit/5e8f84e9c7d3ef792ea8b0520087ae3… Patch: https://github.com/kamailio/kamailio/commit/5e8f84e9c7d3ef792ea8b0520087ae3… --- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..2ce2261892 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,37 @@ + + + + +#### Pre-Submission Checklist + + + +- [ ] Commit message has the format required by CONTRIBUTING guide +- [ ] Commits are split per component (core, individual modules, libs, utils, ...) +- [ ] Each component has a single commit (if not, squash them into one commit) +- [ ] 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) +- [ ] 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 +

7 years, 5 months

git:master:bbe03709: utils/db_berkeley: access variable after null pointer check

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bbe0370939ff8a14e931595389b6678817ff1056 URL: https://github.com/kamailio/kamailio/commit/bbe0370939ff8a14e931595389b6678… Author: Ilya Shipitsin <chipitsine(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-28T16:45:54+02:00 utils/db_berkeley: access variable after null pointer check --- Modified: utils/db_berkeley/kambdb_recover.c --- Diff: https://github.com/kamailio/kamailio/commit/bbe0370939ff8a14e931595389b6678… Patch: https://github.com/kamailio/kamailio/commit/bbe0370939ff8a14e931595389b6678… --- diff --git a/utils/db_berkeley/kambdb_recover.c b/utils/db_berkeley/kambdb_recover.c index 891cf2cfdc..30733a01ff 100644 --- a/utils/db_berkeley/kambdb_recover.c +++ b/utils/db_berkeley/kambdb_recover.c @@ -336,14 +336,14 @@ int recover(char* jfn) return 2; } - tp = tbc->dtp; - - if(!tbc || !tp) + if(!tbc || !tbc->dtp) { fprintf(stderr, "[recover]: FAILED to get find metadata for : %s.\n", tn); fclose(fp); return 3; } + + tp = tbc->dtp; while ( fgets(line , MAX_ROW_SIZE, fp) != NULL ) {

7 years, 5 months

git:5.0:2ccf97c2: kazoo: add json.count transformation

by Luis Azedo

Module: kamailio Branch: 5.0 Commit: 2ccf97c2932dcd5242f7997c3230427dfe6b4417 URL: https://github.com/kamailio/kamailio/commit/2ccf97c2932dcd5242f7997c3230427… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-28T12:11:42+01:00 kazoo: add json.count transformation (cherry picked from commit 551413f0952429c3a360b5ccdeaeac48ea15ff8a) --- Modified: src/modules/kazoo/kz_json.c Modified: src/modules/kazoo/kz_json.h Modified: src/modules/kazoo/kz_trans.c Modified: src/modules/kazoo/kz_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/2ccf97c2932dcd5242f7997c3230427… Patch: https://github.com/kamailio/kamailio/commit/2ccf97c2932dcd5242f7997c3230427…

7 years, 5 months

git:5.0:d5d15e6c: kazoo: add $kzRK to accdess routing key of the payload

by Luis Azedo

Module: kamailio Branch: 5.0 Commit: d5d15e6c9f67e5a64bb5c3ec6926b39dc8e3b779 URL: https://github.com/kamailio/kamailio/commit/d5d15e6c9f67e5a64bb5c3ec6926b39… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-28T12:11:20+01:00 kazoo: add $kzRK to accdess routing key of the payload (cherry picked from commit d5c602454a9af6ebce852f44dc88c4efa4bf036f) --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/d5d15e6c9f67e5a64bb5c3ec6926b39… Patch: https://github.com/kamailio/kamailio/commit/d5d15e6c9f67e5a64bb5c3ec6926b39…

7 years, 5 months

git:5.0:3c6e9e02: kazoo: use hardcoded max size of routing key

by Luis Azedo

Module: kamailio Branch: 5.0 Commit: 3c6e9e02d124ceb1227c8481042ac221ff79bd8d URL: https://github.com/kamailio/kamailio/commit/3c6e9e02d124ceb1227c8481042ac22… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-28T12:10:52+01:00 kazoo: use hardcoded max size of routing key (cherry picked from commit f18da4c9d6cc8d1ab061d68cbd8e9d988ebf2be6) --- Modified: src/modules/kazoo/defs.h Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/3c6e9e02d124ceb1227c8481042ac22… Patch: https://github.com/kamailio/kamailio/commit/3c6e9e02d124ceb1227c8481042ac22…

7 years, 5 months

git:5.0:e3f69bf1: kazoo: max size of routing key

by Luis Azedo

Module: kamailio Branch: 5.0 Commit: e3f69bf10c09c9817d3839bc58e2f17f8dbeaded URL: https://github.com/kamailio/kamailio/commit/e3f69bf10c09c9817d3839bc58e2f17… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-28T12:10:33+01:00 kazoo: max size of routing key (cherry picked from commit 56e07cf2bb281d0aa78517e919055de640468020) --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/e3f69bf10c09c9817d3839bc58e2f17… Patch: https://github.com/kamailio/kamailio/commit/e3f69bf10c09c9817d3839bc58e2f17…

7 years, 5 months

[kamailio/kamailio] tls compiler warnings (#1075)

by juha-h

These warnings should be eliminated in order to make compilation readable: CC (gcc) [M tls.so] tls_locking.o tls_locking.c:98:13: warning: 'locking_f' defined but not used [-Wunused-function] static void locking_f(int mode, int n, const char* file, int line) ^~~~~~~~~ tls_locking.c:83:13: warning: 'dyn_destroy_f' defined but not used [-Wunused-function] static void dyn_destroy_f(struct CRYPTO_dynlock_value *l, ^~~~~~~~~~~~~ tls_locking.c:65:13: warning: 'dyn_lock_f' defined but not used [-Wunused-function] static void dyn_lock_f(int mode, struct CRYPTO_dynlock_value* l, ^~~~~~~~~~ tls_locking.c:42:37: warning: 'dyn_create_f' defined but not used [-Wunused-function] static struct CRYPTO_dynlock_value* dyn_create_f(const char* file, int line) ^~~~~~~~~~~~ CC (gcc) [M tls.so] tls_init.o tls_init.c: In function 'init_ssl_methods': tls_init.c:377:2: warning: 'TLSv1_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_cli - 1] = TLSv1_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1598:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_client_method(void)) /* TLSv1.0 */ ^ tls_init.c:378:2: warning: 'TLSv1_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1597:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_server_method(void)) /* TLSv1.0 */ ^ tls_init.c:379:2: warning: 'TLSv1_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1 - 1] = TLSv1_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1596:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_method(void)) /* TLSv1.0 */ ^ tls_init.c:382:2: warning: 'TLSv1_1_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1_cli - 1] = TLSv1_1_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1604:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_client_method(void)) /* TLSv1.1 */ ^ tls_init.c:383:2: warning: 'TLSv1_1_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1_srv - 1] = TLSv1_1_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1603:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_server_method(void)) /* TLSv1.1 */ ^ tls_init.c:384:2: warning: 'TLSv1_1_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1 - 1] = TLSv1_1_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1602:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_method(void)) /* TLSv1.1 */ ^ tls_init.c:388:2: warning: 'TLSv1_2_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2_cli - 1] = TLSv1_2_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1610:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_client_method(void)) /* TLSv1.2 */ ^ tls_init.c:389:2: warning: 'TLSv1_2_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2_srv - 1] = TLSv1_2_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1609:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_server_method(void)) /* TLSv1.2 */ ^ tls_init.c:390:2: warning: 'TLSv1_2_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2 - 1] = TLSv1_2_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1608:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_method(void)) /* TLSv1.2 */ ^ -- 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/1075

7 years, 5 months

git:master:76efc9b7: tls: updated tls version selection for libssl 1.1.0 api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 76efc9b7a1489007f9ff431e730ce4e86b446a6c URL: https://github.com/kamailio/kamailio/commit/76efc9b7a1489007f9ff431e730ce4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-28T11:41:15+02:00 tls: updated tls version selection for libssl 1.1.0 api - fixes compile warnings for deprecated TLSXY_method() functions --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_domain.h Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_init.h --- Diff: https://github.com/kamailio/kamailio/commit/76efc9b7a1489007f9ff431e730ce4e… Patch: https://github.com/kamailio/kamailio/commit/76efc9b7a1489007f9ff431e730ce4e…

7 years, 5 months

git:master:e7c03ce6: tls: dynamic locks not needed for openssl v1.1.0+

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e7c03ce6ce61119fbf5cb9f41b7abcd4c7138d58 URL: https://github.com/kamailio/kamailio/commit/e7c03ce6ce61119fbf5cb9f41b7abcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-28T10:26:43+02:00 tls: dynamic locks not needed for openssl v1.1.0+ - openssl v1.1.0 is thread safe - fixes the compile warnings for libssl 1.1.0 --- Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/e7c03ce6ce61119fbf5cb9f41b7abcd… Patch: https://github.com/kamailio/kamailio/commit/e7c03ce6ce61119fbf5cb9f41b7abcd… --- diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 9d8e8acec5..38c028fd2f 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -32,6 +32,9 @@ static int n_static_locks=0; static gen_lock_set_t* static_locks=0; +/* OpenSSL is thread-safe since 1.1.0 */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L + /* "dynamic" locks */ struct CRYPTO_dynlock_value{ @@ -61,7 +64,6 @@ static struct CRYPTO_dynlock_value* dyn_create_f(const char* file, int line) } - static void dyn_lock_f(int mode, struct CRYPTO_dynlock_value* l, const char* file, int line) { @@ -116,6 +118,7 @@ static void locking_f(int mode, int n, const char* file, int line) } } +#endif /* openssl < 0x10100000L (1.1.0) */ void tls_destroy_locks() @@ -163,10 +166,14 @@ 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

7 years, 5 months

← Newer
1
...
7
8
9
10
11
12
13
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017