sr-dev

sr-dev@lists.kamailio.org

15 participants
45320 discussions

git:master:3426b153: db_postgres: init libssl in a thread
by S-P Chan 29 Jan '24

29 Jan '24

Module: kamailio Branch: master Commit: 3426b153d02d9d8d3e909eff9d18cb14108072ca URL: https://github.com/kamailio/kamailio/commit/3426b153d02d9d8d3e909eff9d18cb1… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-30T06:53:10+08:00 db_postgres: init libssl in a thread --- Modified: src/modules/db_postgres/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/3426b153d02d9d8d3e909eff9d18cb1… Patch: https://github.com/kamailio/kamailio/commit/3426b153d02d9d8d3e909eff9d18cb1… --- diff --git a/src/modules/db_postgres/km_dbase.c b/src/modules/db_postgres/km_dbase.c index 02cb5c421d5..065b71f0709 100644 --- a/src/modules/db_postgres/km_dbase.c +++ b/src/modules/db_postgres/km_dbase.c @@ -34,6 +34,7 @@ #include <string.h> #include <stdio.h> #include <stdlib.h> +#include <pthread.h> #include "../../core/dprint.h" #include "../../core/mem/mem.h" #include "../../lib/srdb1/db.h" @@ -108,24 +109,57 @@ static void db_postgres_free_query(const db1_con_t *_con); * \param _url URL of the database that should be opened * \return database connection on success, NULL on error * \note this function must be called prior to any database functions + * + * Init libssl in a thread */ -db1_con_t *db_postgres_init(const str *_url) +static db1_con_t *db_postgres_init0(const str *_url) { return db_do_init(_url, (void *)db_postgres_new_connection); } +db1_con_t *db_postgres_init(const str *_url) +{ + pthread_t tid; + db1_con_t *ret; + + pthread_create( + &tid, NULL, (void *(*)(void *))db_postgres_init0, (void *)_url); + pthread_join(tid, (void **)&ret); + + return ret; +} /*! * \brief Initialize database for future queries, specify pooling * \param _url URL of the database that should be opened * \param pooling whether or not to use a pooled connection * \return database connection on success, NULL on error * \note this function must be called prior to any database functions + * + * Init libssl in thread */ -db1_con_t *db_postgres_init2(const str *_url, db_pooling_t pooling) +struct _thread_args +{ + const str *_url; + db_pooling_t pooling; +}; + +static db1_con_t *_db_postgres_init2(struct _thread_args *args) { - return db_do_init2(_url, (void *)db_postgres_new_connection, pooling); + return db_do_init2( + args->_url, (void *)db_postgres_new_connection, args->pooling); } +db1_con_t *db_postgres_init2(const str *_url, db_pooling_t pooling) +{ + pthread_t tid; + db1_con_t *ret; + + pthread_create(&tid, NULL, (void *(*)(void *))_db_postgres_init2, + (void *)&(struct _thread_args){_url, pooling}); + pthread_join(tid, (void **)&ret); + + return ret; +} /*! * \brief Close database when the database is no longer needed * \param _h closed connection, as returned from db_postgres_init

1 0

[kamailio/kamailio] db_mysql: init libssl in a thread (PR #3729)
by space88man 29 Jan '24

29 Jan '24

#### 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 - [ ] Tested changes locally - [X] Related to issue #3727 #### Description `mod_init()` in configuration can initialise libssl in rank 0(thread#1). User report is with regard to using `db_unixodbc`; however the same errors can be reproduced with `db_mysql` replacing `db_unixodbc`. This PR inits libssl in a separate thread. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3729 -- Commit Summary -- * db_mysql: init libssl in a thread -- File Changes -- M src/modules/db_mysql/km_dbase.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3729.patch https://github.com/kamailio/kamailio/pull/3729.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3729 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3729(a)github.com>

1 3

git:master:5dffb934: db_mysql: init libssl in a thread
by S-P Chan 29 Jan '24

29 Jan '24

Module: kamailio Branch: master Commit: 5dffb934a2f7f986fdc09e433833991c54612646 URL: https://github.com/kamailio/kamailio/commit/5dffb934a2f7f986fdc09e433833991… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-30T06:51:36+08:00 db_mysql: init libssl in a thread --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/5dffb934a2f7f986fdc09e433833991… Patch: https://github.com/kamailio/kamailio/commit/5dffb934a2f7f986fdc09e433833991… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index 577f3dc798b..721ba8aa6cf 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -34,6 +34,7 @@ #include <stdio.h> #include <string.h> #include <mysql.h> +#include <pthread.h> #include <errmsg.h> #include "../../core/mem/mem.h" #include "../../core/dprint.h" @@ -197,8 +198,10 @@ static char *db_mysql_tquote = "`"; * No function should be called before this * \param _url URL used for initialization * \return zero on success, negative value on failure + * + * Init libssl in a thread */ -db1_con_t *db_mysql_init(const str *_url) +static db1_con_t *db_mysql_init0(const str *_url) { db1_con_t *c; c = db_do_init(_url, (void *)db_mysql_new_connection); @@ -208,6 +211,16 @@ db1_con_t *db_mysql_init(const str *_url) } +db1_con_t *db_mysql_init(const str *_url) +{ + pthread_t tid; + db1_con_t *ret; + + pthread_create(&tid, NULL, (void *(*)(void *))db_mysql_init0, (void *)_url); + pthread_join(tid, (void **)&ret); + + return ret; +} /** * Shut down the database module. * No function should be called after this

1 0

[kamailio/kamailio] db_unixodbc: init libssl in a thread (PR #3728)
by space88man 29 Jan '24

29 Jan '24

- [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 - [X ] Related to issue #3727 #### Description The bug report kamailio configuration is using dispatcher + unixodbc and the database driver (tested with MariaDB ODBC, user reports with MS SQL Server(not tested)) inits libssl in rank 0(thread 1). This PR will init in a thread. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3728 -- Commit Summary -- * db_unixodbc: init libssl in a thread -- File Changes -- M src/modules/db_unixodbc/dbase.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3728.patch https://github.com/kamailio/kamailio/pull/3728.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3728 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3728(a)github.com>

2 3

git:master:2611a467: db_unixodbc: init libssl in a thread
by S-P Chan 29 Jan '24

29 Jan '24

Module: kamailio Branch: master Commit: 2611a4670c65dd32fc1daf6b67e37852936ba69c URL: https://github.com/kamailio/kamailio/commit/2611a4670c65dd32fc1daf6b67e3785… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-30T06:49:21+08:00 db_unixodbc: init libssl in a thread --- Modified: src/modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/2611a4670c65dd32fc1daf6b67e3785… Patch: https://github.com/kamailio/kamailio/commit/2611a4670c65dd32fc1daf6b67e3785… --- diff --git a/src/modules/db_unixodbc/dbase.c b/src/modules/db_unixodbc/dbase.c index eb02b29de50..f3c01b81ee5 100644 --- a/src/modules/db_unixodbc/dbase.c +++ b/src/modules/db_unixodbc/dbase.c @@ -22,7 +22,7 @@ * */ - +#include <pthread.h> #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/async_task.h" @@ -227,8 +227,10 @@ extern char *db_unixodbc_tquote; /* * Initialize database module * No function should be called before this + * + * Init libssl in a thread */ -db1_con_t *db_unixodbc_init(const str *_url) +static db1_con_t *db_unixodbc_init0(const str *_url) { db1_con_t *c; c = db_do_init(_url, (void *)db_unixodbc_new_connection); @@ -237,6 +239,18 @@ db1_con_t *db_unixodbc_init(const str *_url) return c; } +db1_con_t *db_unixodbc_init(const str *_url) +{ + pthread_t tid; + db1_con_t *ret; + + pthread_create( + &tid, NULL, (void *(*)(void *))db_unixodbc_init0, (void *)_url); + pthread_join(tid, (void **)&ret); + + return ret; +} + /* * Shut down database module * No function should be called after this

1 0

git:master:9560e973: tls_wolfssl: fix possible uninitialised variable
by S-P Chan 29 Jan '24

29 Jan '24

Module: kamailio Branch: master Commit: 9560e973807bc454dab84bdfd5ac0e300c847864 URL: https://github.com/kamailio/kamailio/commit/9560e973807bc454dab84bdfd5ac0e3… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-29T20:36:43+08:00 tls_wolfssl: fix possible uninitialised variable --- Modified: src/modules/tls_wolfssl/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/9560e973807bc454dab84bdfd5ac0e3… Patch: https://github.com/kamailio/kamailio/commit/9560e973807bc454dab84bdfd5ac0e3… --- diff --git a/src/modules/tls_wolfssl/tls_server.c b/src/modules/tls_wolfssl/tls_server.c index 82145377335..f3c69839e28 100644 --- a/src/modules/tls_wolfssl/tls_server.c +++ b/src/modules/tls_wolfssl/tls_server.c @@ -669,8 +669,8 @@ void tls_h_tcpconn_close_f(struct tcp_connection *c, int fd) * Since this is a close, we don't want to queue the write * (if it can't write immediately, just fail silently) */ - wr_used = wolfSSL_BIO_pending(rwbio); /* use 2-pass read for wolfSSL ring buffer */ + wr_used = wolfSSL_BIO_pending(rwbio); if(wr_used) { for(nr = 0; nr < wr_used;) { npos = wolfSSL_BIO_read(rwbio, wr_buf + nr, wr_used - nr); @@ -728,7 +728,7 @@ int tls_h_encode_f(struct tcp_connection *c, const char **pbuf, WOLFSSL_BIO *rwbio; struct tls_extra_data *tls_c; static unsigned char wr_buf[TLS_WR_MBUF_SZ]; - size_t wr_used, nr, npos; + size_t wr_used = 0, nr, npos; int ssl_error; char *err_src; @@ -918,6 +918,7 @@ int tls_h_encode_f(struct tcp_connection *c, const char **pbuf, } end: /* use 2-pass read for wolfSSL ring buffer */ + wr_used = wolfSSL_BIO_pending(rwbio); for(nr = 0; nr < wr_used;) { npos = wolfSSL_BIO_read(rwbio, wr_buf + nr, wr_used - nr); if(npos <= 0) @@ -941,6 +942,7 @@ int tls_h_encode_f(struct tcp_connection *c, const char **pbuf, c->state = S_CONN_EOF; c->flags |= F_CONN_FORCE_EOF; /* use 2-pass read for wolfSSL ring buffer */ + wr_used = wolfSSL_BIO_pending(rwbio); for(nr = 0; nr < wr_used;) { npos = wolfSSL_BIO_read(rwbio, wr_buf + nr, wr_used - nr); if(npos <= 0) @@ -991,7 +993,7 @@ int tls_h_read_f(struct tcp_connection *c, rd_conn_flags_t *flags) WOLFSSL_BIO *rwbio; unsigned char rd_buf[TLS_RD_MBUF_SZ]; unsigned char wr_buf[TLS_WR_MBUF_SZ]; - size_t wr_used, rd_pending, rd_unused; + size_t wr_used, rd_unused; size_t nr, npos, nw; struct tls_extra_data *tls_c; int n, flush_flags; @@ -1040,18 +1042,18 @@ int tls_h_read_f(struct tcp_connection *c, rd_conn_flags_t *flags) if(unlikely(bytes_read < 0)) { goto error; } - rd_pending = bytes_read; + /* * use 2-pass write for wolfSSL ring buffer * fixed in 4f1d777090, post-v5.6.6-stable */ - for(nw = 0; nw < rd_pending;) { - npos = wolfSSL_BIO_write(rwbio, rd_buf + nw, rd_pending - nw); + for(nw = 0; nw < bytes_read;) { + npos = wolfSSL_BIO_write(rwbio, rd_buf + nw, bytes_read - nw); if(npos <= 0) break; nw += npos; } - assert(nw == rd_pending); + assert(nw == bytes_read); } continue_ssl_read: ssl_error = WOLFSSL_ERROR_NONE; @@ -1213,11 +1215,6 @@ int tls_h_read_f(struct tcp_connection *c, rd_conn_flags_t *flags) } /* quickly catch bugs: segfault if accessed and not set */ lock_release(&c->write_lock); - rd_unused = wolfSSL_BIO_wpending(rwbio); - if(rd_unused) { - LM_WARN("==== SSL unconsumed encrypted data rd_unused = %d\n", - (int)rd_unused); - } switch(ssl_error) { case WOLFSSL_ERROR_NONE: if(unlikely(n < 0)) { @@ -1233,12 +1230,11 @@ int tls_h_read_f(struct tcp_connection *c, rd_conn_flags_t *flags) TLS_RD_TRACE("(%p, %p) SSL_ERROR_WANT_READ *flags=%d\n", c, flags, *flags); /* needs to read more data */ - //if(unlikely(rd.pos != rd.used)) { - if(unlikely(wolfSSL_BIO_wpending(rwbio) > 0)) { + if(unlikely((rd_unused = wolfSSL_BIO_wpending(rwbio)))) { /* data still in the read buffer */ BUG("SSL_ERROR_WANT_READ but data still in" - " the rbio (%p, %d bytes at %d)\n", - rd_buf, (int)rd_unused, (int)(rd_pending - rd_unused)); + " the rbio (%d bytes)\n", + (int)rd_unused); goto bug; } if(unlikely((*flags & (RD_CONN_EOF | RD_CONN_SHORT_READ)) == 0)

1 0

Working with arrays in MongoDB documents
by Mario Pereira 29 Jan '24

29 Jan '24

Hi everybody, I normally use MongoDB as DB engine in my projects and I would like to get all MongoDB advantages when working with Kamailio. For this reason, I need to deal with arrays of information inside a document (for example, an array of contacts inside a document). And now the question: is it possible to insert, update and search info in a MongoDB document by using arrays via srdb1 lib? If yes, how? And if not, are you thinking about implementing it in the future? Thank you very much for your time. Regards, Mario

1 0

git:master:c2f14e0d: modules: readme files regenerated - sdpops ... [skip ci]
by Kamailio Dev 29 Jan '24

29 Jan '24

Module: kamailio Branch: master Commit: c2f14e0dccbabdd74dbddcbd569c32d0b429617e URL: https://github.com/kamailio/kamailio/commit/c2f14e0dccbabdd74dbddcbd569c32d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-01-29T10:02:14+01:00 modules: readme files regenerated - sdpops ... [skip ci] --- Modified: src/modules/sdpops/README --- Diff: https://github.com/kamailio/kamailio/commit/c2f14e0dccbabdd74dbddcbd569c32d… Patch: https://github.com/kamailio/kamailio/commit/c2f14e0dccbabdd74dbddcbd569c32d…

1 0

git:master:68331254: textopsx: proper define id for body line interator name size
by Daniel-Constantin Mierla 29 Jan '24

29 Jan '24

Module: kamailio Branch: master Commit: 68331254149a2ef3f2986bb92549cb63bb355989 URL: https://github.com/kamailio/kamailio/commit/68331254149a2ef3f2986bb92549cb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-29T09:49:49+01:00 textopsx: proper define id for body line interator name size --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/68331254149a2ef3f2986bb92549cb6… Patch: https://github.com/kamailio/kamailio/commit/68331254149a2ef3f2986bb92549cb6… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 9210d07445d..5710cfeb864 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -2441,7 +2441,7 @@ static int pv_get_hf_iterator_hbody( typedef struct bl_iterator { str name; - char bname[HF_ITERATOR_NAME_SIZE]; + char bname[BL_ITERATOR_NAME_SIZE]; str body; str it; int eob;

1 0

git:master:03d93a43: sdpops: docs for sdp line interator functions and variable
by Daniel-Constantin Mierla 29 Jan '24

29 Jan '24

Module: kamailio Branch: master Commit: 03d93a43a38f2af44640f42e3fd0f8f2a073b108 URL: https://github.com/kamailio/kamailio/commit/03d93a43a38f2af44640f42e3fd0f8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-29T09:49:49+01:00 sdpops: docs for sdp line interator functions and variable --- Modified: src/modules/sdpops/doc/sdpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/03d93a43a38f2af44640f42e3fd0f8f… Patch: https://github.com/kamailio/kamailio/commit/03d93a43a38f2af44640f42e3fd0f8f…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev