sr-dev October 2019

sr-dev@lists.kamailio.org

22 participants
436 discussions

git:5.2:bc8bdcaa: kamctl: Update dbtextdb.py for Python3

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: bc8bdcaa726f375f6deea8228a1ab0cf97c67035 URL: https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c… Author: Anthony Messina <amessina(a)messinet.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:40:17+02:00 kamctl: Update dbtextdb.py for Python3 - reported by GH #1747 (cherry picked from commit a44ade38dc420d2699896930ededf54645837a22) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c… Patch: https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c…

4 years, 6 months

git:5.2:f14807f7: app_perl: log the number of reset cycles in debug message

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: f14807f722e85feb8c7d98b08454a432837fecf7 URL: https://github.com/kamailio/kamailio/commit/f14807f722e85feb8c7d98b08454a43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:39:42+02:00 app_perl: log the number of reset cycles in debug message (cherry picked from commit 1fdabbf5ce5fd218a47b7d147ebec5c6c45c1cce) --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f14807f722e85feb8c7d98b08454a43… Patch: https://github.com/kamailio/kamailio/commit/f14807f722e85feb8c7d98b08454a43… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index 181f70f859..785d4c39b0 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -201,7 +201,7 @@ PerlInterpreter *parser_init(void) { perl_construct(new_perl); argv[0] = ""; argc++; /* First param _needs_ to be empty */ - + /* Possible Include path extension by modparam */ if (modpath && (strlen(modpath) > 0)) { modpathset_start = argc; @@ -380,6 +380,7 @@ static void destroy(void) } +static int app_perl_reset_n = 0; /** * count executions and rest interpreter * @@ -400,8 +401,10 @@ int app_perl_reset_interpreter(void) if(_ap_exec_cycles<=*_ap_reset_cycles) return 0; - if(perl_destroy_func) + if(perl_destroy_func) { call_argv(perl_destroy_func, G_DISCARD | G_NOARGS | G_EVAL, args); + LM_DBG("perl destroy function executed\n"); + } gettimeofday(&t1, NULL); if (perl_reload()<0) { @@ -411,10 +414,11 @@ int app_perl_reset_interpreter(void) } gettimeofday(&t2, NULL); - LM_INFO("perl interpreter has been reset [%d/%d] (%d.%06d => %d.%06d)\n", + app_perl_reset_n++; + LM_INFO("perl interpreter has been reset [%d/%d] (%d.%06d => %d.%06d) (n: %d)\n", _ap_exec_cycles, *_ap_reset_cycles, (int)t1.tv_sec, (int)t1.tv_usec, - (int)t2.tv_sec, (int)t2.tv_usec); + (int)t2.tv_sec, (int)t2.tv_usec, app_perl_reset_n); _ap_exec_cycles = 0; return 0;

4 years, 6 months

git:5.2:7e7621a9: app_perl: set G_EVAL flag when executing perl_destroy_func

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 7e7621a93013174bf42ff0dd782a46d238c0943a URL: https://github.com/kamailio/kamailio/commit/7e7621a93013174bf42ff0dd782a46d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:38:37+02:00 app_perl: set G_EVAL flag when executing perl_destroy_func - trap use of die in the perl libs to avoid having an exit when reset_cycles is used (cherry picked from commit 9490ec06d3cf0cfd0b0cf2d0a5ef701ccdabcaba) --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7e7621a93013174bf42ff0dd782a46d… Patch: https://github.com/kamailio/kamailio/commit/7e7621a93013174bf42ff0dd782a46d… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index d8789f919d..181f70f859 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -401,7 +401,7 @@ int app_perl_reset_interpreter(void) return 0; if(perl_destroy_func) - call_argv(perl_destroy_func, G_DISCARD | G_NOARGS, args); + call_argv(perl_destroy_func, G_DISCARD | G_NOARGS | G_EVAL, args); gettimeofday(&t1, NULL); if (perl_reload()<0) {

4 years, 6 months

git:5.2:438df871: db_cassandra: docs - note about the state of the module

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 438df8714322ef9d100452a5f5f2c33304bb2957 URL: https://github.com/kamailio/kamailio/commit/438df8714322ef9d100452a5f5f2c33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:38:18+02:00 db_cassandra: docs - note about the state of the module (cherry picked from commit 39b7b4073465fd5343297683c59d75510c87d195) --- Modified: src/modules/db_cassandra/doc/db_cassandra_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/438df8714322ef9d100452a5f5f2c33… Patch: https://github.com/kamailio/kamailio/commit/438df8714322ef9d100452a5f5f2c33… --- diff --git a/src/modules/db_cassandra/doc/db_cassandra_admin.xml b/src/modules/db_cassandra/doc/db_cassandra_admin.xml index a9852c984f..0becd4af02 100644 --- a/src/modules/db_cassandra/doc/db_cassandra_admin.xml +++ b/src/modules/db_cassandra/doc/db_cassandra_admin.xml @@ -16,6 +16,13 @@ <section> <title>Overview</title> + <para> + Note: the module requires old version of external library, not compiling + with those available out of the stock in the Linux distributions. It is + going to be kept for a while in case someone wants to pick it up and + upgrade. Also, the module was never extensively tested, therefore take + the appropriate actions in case you plan to use it. + </para> <para> Db_cassandra is one of the &kamailio; database modules. It does not export any functions executable from the configuration scripts,

4 years, 6 months

git:master:8539b7cf: tls: add cryptorand support for TLS module, add some more comments to existing code

by Henning Westerholt

Module: kamailio Branch: master Commit: 8539b7cf6c5db86973f4f74f92762de9011b968b URL: https://github.com/kamailio/kamailio/commit/8539b7cf6c5db86973f4f74f92762de… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-07T10:38:55+02:00 tls: add cryptorand support for TLS module, add some more comments to existing code --- Modified: src/modules/tls/tls_rand.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/8539b7cf6c5db86973f4f74f92762de… Patch: https://github.com/kamailio/kamailio/commit/8539b7cf6c5db86973f4f74f92762de… --- diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index d5c29b845f..a149b07d33 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -16,7 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - +/* + * OpenSSL docs: + * https://www.openssl.org/docs/man1.1.1/man7/RAND.html + * https://www.openssl.org/docs/man1.1.1/man3/RAND_set_rand_method.html + */ #include <stdlib.h> #include <string.h> @@ -28,7 +32,12 @@ #include "../../core/dprint.h" #include "../../core/rand/kam_rand.h" #include "../../core/rand/fastrand.h" +#include "../../core/rand/fortuna/random.h" +/* + * Implementation for tests with system library PNRG, + * do not use this in production. + */ static int ksr_krand_bytes(unsigned char *outdata, int size) { int r; @@ -76,6 +85,11 @@ const RAND_METHOD *RAND_ksr_krand_method(void) return &_ksr_krand_method; } +/* + * Implementation for tests with fastrand implementation, + * better as system library but still not secure enough. + * Do not use this in production.y + */ static int ksr_fastrand_bytes(unsigned char *outdata, int size) { int r; @@ -123,4 +137,47 @@ const RAND_METHOD *RAND_ksr_fastrand_method(void) return &_ksr_fastrand_method; } +/* + * Implementation with Fortuna cryptographic PRNG. + * We are not strictly implementing the OpenSSL API here - we will + * not return an error if the PRNG has not been seeded with enough + * randomness to ensure an unpredictable byte sequence. + */ +static int ksr_cryptorand_bytes(unsigned char *outdata, int size) +{ + if (size < 0) { + return 0; + } else if (size == 0) { + return 1; + } + + sr_get_pseudo_random_bytes(outdata, size); + return 1; +} + +static int ksr_cryptorand_status(void) +{ + return 1; +} + +/* + * We don't have a dedicated function for pseudo-random + * bytes, just use the secure version as well for it. + */ +const RAND_METHOD _ksr_cryptorand_method = { + NULL, + ksr_cryptorand_bytes, + NULL, + NULL, + ksr_cryptorand_bytes, + ksr_cryptorand_status +}; + +const RAND_METHOD *RAND_ksr_cryptorand_method(void) +{ + return &_ksr_cryptorand_method; +} + + + #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index d1a3f0d37f..c73d36b8d9 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -27,6 +27,7 @@ const RAND_METHOD *RAND_ksr_krand_method(void); const RAND_METHOD *RAND_ksr_fastrand_method(void); +const RAND_METHOD *RAND_ksr_cryptorand_method(void); #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ #endif

4 years, 6 months

git:master:4e6c8fe6: presence: free allocated memory in case of error

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4e6c8fe6073d7d52bab66faa68abad2f685d2090 URL: https://github.com/kamailio/kamailio/commit/4e6c8fe6073d7d52bab66faa68abad2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-05T20:41:50+02:00 presence: free allocated memory in case of error --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/4e6c8fe6073d7d52bab66faa68abad2… Patch: https://github.com/kamailio/kamailio/commit/4e6c8fe6073d7d52bab66faa68abad2… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index f9ce4c403f..245c2b95c0 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -2018,6 +2018,7 @@ int add_waiting_watchers(watcher_t *watchers, str pres_uri, str event) w = (watcher_t *)pkg_malloc(sizeof(watcher_t)); if(w == NULL) { + pkg_free(wuri.s); ERR_MEM(PKG_MEM_STR); } memset(w, 0, sizeof(watcher_t));

4 years, 6 months

git:master:954f25c2: etc/kamailio.cfg: updated comment to reflect 5.4 series

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 954f25c21576052c176f96c0509f0414ea74d69c URL: https://github.com/kamailio/kamailio/commit/954f25c21576052c176f96c0509f041… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-04T18:16:12+02:00 etc/kamailio.cfg: updated comment to reflect 5.4 series --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/954f25c21576052c176f96c0509f041… Patch: https://github.com/kamailio/kamailio/commit/954f25c21576052c176f96c0509f041… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index c41b933e5c..24b9ac434e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,6 +1,6 @@ #!KAMAILIO # -# Kamailio (OpenSER) SIP Server v5.3 - default configuration script +# Kamailio (OpenSER) SIP Server v5.4 - default configuration script # - web: https://www.kamailio.org # - git: https://github.com/kamailio/kamailio #

4 years, 6 months

git:master:36a4b161: xmlrpc: clean allocated buffer for reply when no more memory for reason value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 36a4b16117d79f1a30a9f929350f75ab8bfd5d2a URL: https://github.com/kamailio/kamailio/commit/36a4b16117d79f1a30a9f929350f75a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-04T18:12:15+02:00 xmlrpc: clean allocated buffer for reply when no more memory for reason value --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/36a4b16117d79f1a30a9f929350f75a… Patch: https://github.com/kamailio/kamailio/commit/36a4b16117d79f1a30a9f929350f75a… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 9521af2386..7552b4d7f1 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -2509,7 +2509,7 @@ static int ki_xmlrpc_reply(sip_msg_t* msg, int rcode, str* reason) reply.reason = as_asciiz(reason); if (reply.reason == NULL) { ERR("No memory left\n"); - return -1; + goto error; } if (reply.code >= 300) {

4 years, 6 months

git:5.3:26d8e3cf: tls: add local copy of fortuna and depenencies from git master

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: 26d8e3cf82a49ad4e58ced507f7a1787b74656b0 URL: https://github.com/kamailio/kamailio/commit/26d8e3cf82a49ad4e58ced507f7a178… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-04T16:26:20+02:00 tls: add local copy of fortuna and depenencies from git master - add local copy of fortuna and depenencies from git master - not active yet, needs additions in tls_rand.* and probably also Makefile --- Added: src/modules/tls/fortuna/Makefile Added: src/modules/tls/fortuna/fortuna.c Added: src/modules/tls/fortuna/fortuna.h Added: src/modules/tls/fortuna/random.c Added: src/modules/tls/fortuna/random.h Added: src/modules/tls/fortuna/rijndael.c Added: src/modules/tls/fortuna/rijndael.h Added: src/modules/tls/fortuna/rijndael.tbl Added: src/modules/tls/fortuna/sha256.c Added: src/modules/tls/fortuna/sha256.h Modified: src/modules/tls/Makefile Modified: src/modules/tls/tls_rand.c --- Diff: https://github.com/kamailio/kamailio/commit/26d8e3cf82a49ad4e58ced507f7a178… Patch: https://github.com/kamailio/kamailio/commit/26d8e3cf82a49ad4e58ced507f7a178…

4 years, 6 months

git:master:f877069e: tls: use fastrand() for the corresponding rand_engine

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f877069e141749796ec02a78ce16342f9e120ef7 URL: https://github.com/kamailio/kamailio/commit/f877069e141749796ec02a78ce16342… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-04T11:15:04+02:00 tls: use fastrand() for the corresponding rand_engine --- Modified: src/modules/tls/tls_rand.c --- Diff: https://github.com/kamailio/kamailio/commit/f877069e141749796ec02a78ce16342… Patch: https://github.com/kamailio/kamailio/commit/f877069e141749796ec02a78ce16342… --- diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 3f78cb93e9..d5c29b845f 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -87,13 +87,13 @@ static int ksr_fastrand_bytes(unsigned char *outdata, int size) } while(size >= sizeof(int)) { - r = kam_rand(); + r = fastrand(); memcpy(outdata, &r, sizeof(int)); size -= sizeof(int); outdata += sizeof(int); } if(size>0) { - r = kam_rand(); + r = fastrand(); memcpy(outdata, &r, size); } return 1;

4 years, 6 months

← Newer
1
...
36
37
38
39
40
41
42
43
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2019