[sr-dev] Re: [kamailio/kamailio] tls_wolfssl: clean-up; remove OpenSSL-isms (3d0e752)
This broke the build on jammy https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=amd64,distribution=jammy/2586/display/redirect **libwolfssl32_5.2.0-2_amd64.deb** ``` gcc -fPIC -DPIC -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/build/kamailio-5.8.0~dev2+ubuntu22.04.20240130005413.2609=. -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.8.0-dev2"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 11.4.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5008000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -DMOD_NAME='"tls_wolfssl"' -DMOD_NAMEID='tls_wolfssl' -c tls_domain.c -o tls_domain.o -MMD -MP tls_domain.c: In function 'set_ssl_options': tls_domain.c:731:19: error: 'WOLFSSL_OP_ALL' undeclared (first use in this function); did you mean 'SSL_OP_ALL'? 731 | options = WOLFSSL_OP_ALL; /* all the bug workarounds by default */ | ^~ | SSL_OP_ALL tls_domain.c:731:19: note: each undeclared identifier is reported only once for each function it appears in tls_domain.c:732:20: error: 'WOLFSSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION' undeclared (first use in this function); did you mean 'SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION'? 732 | options |= WOLFSSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION |^ |SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION make[3]: *** [../../Makefile.rules:100: tls_domain.o] Error 1 make[2]: *** [Makefile:508: modules] Error 1 make[2]: Leaving directory '/build/kamailio-5.8.0~dev2+ubuntu22.04.20240130005413.2609/src' make[1]: *** [Makefile:34: every-module] Error 2 make[1]: Leaving directory '/build/kamailio-5.8.0~dev2+ubuntu22.04.20240130005413.2609' make: *** [debian/rules:133: build_tls_wolfssl] Error 2 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/3d0e7521c6de4023b6595685fc306129ef57b8ac#r138041657 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Freezing development for 5.8.x series
Hello, I propose to aim freezing the development for 5.8.x series at the end of the 1st of February 2024 (Thursday). New features that one wants to get in this release series have to be pushed to git repository or pull requests made for them. Afterwards usually follows a 4-6 weeks of testing till the first release 5.8.0. Unfreezing will happen earlier, after the first weeks of testing when the 5.8 branch will be created. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio Advanced Training, February 20-22, 2024 -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] github: [skip ci]: bump ammaraskar/gcc-problem-matcher from 0.2.0 to 0.3.0 (PR #3733)
Merged #3733 into master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3733#event-11637088182 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] github: [skip ci]: bump wolletd/clang-format-checker from 1.10 to 1.11 (PR #3732)
Merged #3732 into master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3732#event-11637092136 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:520b9dce: github: [skip ci]: bump ammaraskar/gcc-problem-matcher
Module: kamailio Branch: master Commit: 520b9dce03d695cd1d95432e6bf52ed47d046cd4 URL: https://github.com/kamailio/kamailio/commit/520b9dce03d695cd1d95432e6bf52ed47d046cd4 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Committer: Victor Seva Date: 2024-01-30T07:40:57+01:00 github: [skip ci]: bump ammaraskar/gcc-problem-matcher Bumps [ammaraskar/gcc-problem-matcher](https://github.com/ammaraskar/gcc-problem-matcher) from 0.2.0 to 0.3.0. - [Release notes](https://github.com/ammaraskar/gcc-problem-matcher/releases) - [Commits](https://github.com/ammaraskar/gcc-problem-matcher/compare/0.2.0...0.3.0) --- updated-dependencies: - dependency-name: ammaraskar/gcc-problem-matcher dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Modified: .github/workflows/main.yml Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/520b9dce03d695cd1d95432e6bf52ed47d046cd4.diff Patch: https://github.com/kamailio/kamailio/commit/520b9dce03d695cd1d95432e6bf52ed47d046cd4.patch --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 86b05df1822..8b7ae03a271 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,7 @@ jobs: compilier: clang steps: - uses: actions/checkout@v4 - - uses: ammaraskar/gcc-problem-matcher@0.2.0 + - uses: ammaraskar/gcc-problem-matcher@0.3.0 - name: build run: | cd /code diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index cda04d04389..e17814b8481 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -39,7 +39,7 @@ jobs: compilier: clang steps: - uses: actions/checkout@v4 - - uses: ammaraskar/gcc-problem-matcher@0.2.0 + - uses: ammaraskar/gcc-problem-matcher@0.3.0 - name: build run: | cd /code ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:8e2a1a36: github: [skip ci]: bump wolletd/clang-format-checker from 1.10 to 1.11
Module: kamailio Branch: master Commit: 8e2a1a36f14a18834d1a98e8483b4595a533abff URL: https://github.com/kamailio/kamailio/commit/8e2a1a36f14a18834d1a98e8483b4595a533abff Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Committer: Victor Seva Date: 2024-01-30T07:41:30+01:00 github: [skip ci]: bump wolletd/clang-format-checker from 1.10 to 1.11 Bumps [wolletd/clang-format-checker](https://github.com/wolletd/clang-format-checker) from 1.10 to 1.11. - [Release notes](https://github.com/wolletd/clang-format-checker/releases) - [Commits](https://github.com/wolletd/clang-format-checker/compare/v1.10...v1.11) --- updated-dependencies: - dependency-name: wolletd/clang-format-checker dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/8e2a1a36f14a18834d1a98e8483b4595a533abff.diff Patch: https://github.com/kamailio/kamailio/commit/8e2a1a36f14a18834d1a98e8483b4595a533abff.patch --- diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e17814b8481..543f7c05238 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -13,7 +13,7 @@ jobs: contents: read # to fetch code (actions/checkout) steps: - uses: actions/checkout@v4 - - uses: wolletd/clang-format-checker@v1.10 + - uses: wolletd/clang-format-checker@v1.11 with: target-ref: master build: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] TLS: Recent fixes for for OpenSSL 3.X are causing consistent startup failures when unixodbc is used (Issue #3727)
Commited fixes for unixodbc, mysql, postgresql to master. Closing. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3727#issuecomment-1915719404 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] db_postgres: init libssl in a thread (PR #3730)
Merged #3730 into master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3730#event-11634198237 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:3426b153: db_postgres: init libssl in a thread
Module: kamailio
Branch: master
Commit: 3426b153d02d9d8d3e909eff9d18cb14108072ca
URL:
https://github.com/kamailio/kamailio/commit/3426b153d02d9d8d3e909eff9d18cb14108072ca
Author: S-P Chan
Committer: S-P Chan
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/3426b153d02d9d8d3e909eff9d18cb14108072ca.diff
Patch:
https://github.com/kamailio/kamailio/commit/3426b153d02d9d8d3e909eff9d18cb14108072ca.patch
---
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
#include
#include
+#include
#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
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] db_postgres: init libssl in a thread (PR #3730)
@space88man pushed 1 commit. 3426b153d02d9d8d3e909eff9d18cb14108072ca db_postgres: init libssl in a thread -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3730/files/ebdd65d882284e3bb93674b168c306fa3b2ce1eb..3426b153d02d9d8d3e909eff9d18cb14108072ca You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] db_mysql: init libssl in a thread (PR #3729)
Merged #3729 into master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3729#event-11634180160 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:5dffb934: db_mysql: init libssl in a thread
Module: kamailio
Branch: master
Commit: 5dffb934a2f7f986fdc09e433833991c54612646
URL:
https://github.com/kamailio/kamailio/commit/5dffb934a2f7f986fdc09e433833991c54612646
Author: S-P Chan
Committer: S-P Chan
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/5dffb934a2f7f986fdc09e433833991c54612646.diff
Patch:
https://github.com/kamailio/kamailio/commit/5dffb934a2f7f986fdc09e433833991c54612646.patch
---
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
#include
#include
+#include
#include
#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
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] db_mysql: init libssl in a thread (PR #3729)
@space88man pushed 1 commit. 5dffb934a2f7f986fdc09e433833991c54612646 db_mysql: init libssl in a thread -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3729/files/1c363148f4caf22b9d3ca0bebb550028f80a7448..5dffb934a2f7f986fdc09e433833991c54612646 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] db_unixodbc: init libssl in a thread (PR #3728)
Merged #3728 into master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3728#event-11634165926 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:2611a467: db_unixodbc: init libssl in a thread
Module: kamailio
Branch: master
Commit: 2611a4670c65dd32fc1daf6b67e37852936ba69c
URL:
https://github.com/kamailio/kamailio/commit/2611a4670c65dd32fc1daf6b67e37852936ba69c
Author: S-P Chan
Committer: S-P Chan
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/2611a4670c65dd32fc1daf6b67e37852936ba69c.diff
Patch:
https://github.com/kamailio/kamailio/commit/2611a4670c65dd32fc1daf6b67e37852936ba69c.patch
---
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
#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
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] TLS: Recent fixes for for OpenSSL 3.X are causing consistent startup failures when unixodbc is used (Issue #3727)
Closed #3727 as completed. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3727#event-11634153226 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] Dispatcher: added two new flags to mode parameter of ds_is_from_list function for more strictly matching (PR #3699)
Your last comment does not clarify if a destination record matching (ip, socket) has to be selected over one that matches (ip, port, proto). Can you present the order of selection based on matching the values for ip, port, proto or socket? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3699#issuecomment-1915627589 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] core: Fix check to also work for KEMI framework (PR #3718)
Thanks, I will try to review a bit deeper soon to try to see if there are side effects, not to impact the native scripting. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3718#issuecomment-1915621895 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] db_unixodbc: init libssl in a thread (PR #3728)
I'm fine to merge it if it fixes the related reported issue. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3728#issuecomment-1915618660 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] extented haproxy protocol support (PR #3731)
@miconda commented on this pull request.
> @@ -204,6 +204,10 @@ static inline int msg_send_buffer(
goto error;
}
+ if(!dst->id) {
+ dst->id = con->id;
+ }
+
Any more details about why this is needed? I cannot easy relate it to the
commit message.
> @@ -828,7 +829,22 @@ static inline int lumps_len(
send_proto_id = send_sock->proto;
}
/* init recv_address_str, recv_port_str & recv_port_no */
- if(msg->rcv.bind_address) {
+ if (ksr_tcp_accept_haproxy && msg->rcv.proto_reserved2) {
+ if (msg->rcv.bind_address->proto == PROTO_TLS &&
msg->rcv.bind_address != NULL && msg->rcv.bind_address->useinfo.address_str.len
> 0) {
+ recv_address_str =
&msg->rcv.bind_address->useinfo.address_str;
It should be formatted with clang-format in order to match the coding style.
> @@ -2845,6 +2876,47 @@ int branch_builder(unsigned int hash_index,
return size;
}
+static int is_haproxy(struct dest_info *send_info, struct receive_info
*haproxy_rcv) {
Can you add some comment to describe the purpose of the function? The name is
rather generic, from C code point of view it looks like it tries to figure out
if the target via via haproxy...
> @@ -396,6 +396,7 @@ typedef struct sip_msg
char *unparsed; /*!< here we stopped parsing*/
struct receive_info rcv; /*!< source & dest ip, ports, proto a.s.o*/
+ struct receive_info haproxy_rcv; /*!< source & dest ip, ports, proto
a.s.o for the message from haproxy*/
Traffic via haproxy is not very common, does it make sense to add a full
value-structure for every message instead of a pointer that is allocated only
when it is the case. Practically the size of message increases for common
traffic over direct UDP/TCP/TLS/SCTP/WebSocket. On the other hand, cloning in
shm has to be done if allocated. This is just to ponder on what would be
better...
> @@ -1843,13 +1843,17 @@ inline static int handle_io(struct fd_map *fm, short
> events, int idx)
* handle_io might decide to del. the new connection =>
* must be in the list */
tcpconn_listadd(tcp_conn_lst, con, c_next, c_prev);
- t = get_ticks_raw();
- con->timeout = t + S_TO_TICKS(TCP_CHILD_TIMEOUT);
- /* re-activate the timer */
- con->timer.f = tcpconn_read_timeout;
- local_timer_reinit(&con->timer);
- local_timer_add(&tcp_reader_ltimer, &con->timer,
- S_TO_TICKS(TCP_CHILD_TIMEOUT), t);
+ if(con->rcv.proto_reserved2 && con->type == PROTO_WSS) {
+ //not setting up timers for haproxy WSS
connections
The patch is quite consistent to important parts of the core. It has to be
reviewed properly, so far I did a quick walk through, other developers are
welcome to jump in.
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3731#pullrequestreview-1849803321
You are receiving this because you are subscribed to this thread.
Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] [kamailio/kamailio] github: [skip ci]: bump ammaraskar/gcc-problem-matcher from 0.2.0 to 0.3.0 (PR #3733)
Bumps [ammaraskar/gcc-problem-matcher](https://github.com/ammaraskar/gcc-problem-matcher) from 0.2.0 to 0.3.0.Release notes
Sourced from ammaraskar/gcc-problem-matcher's releases.
Update for node16 deprecation
Github has deprecated node16 actions, this update fixes the deprecation warning emitted. See https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/
;Commits
- ;
0f9c86f; Update to use node20, fixes #7- See full diff in compare view
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3733 -- Commit Summary -- * github: [skip ci]: bump ammaraskar/gcc-problem-matcher -- File Changes -- M .github/workflows/main.yml (2) M .github/workflows/pull_request.yml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3733.patch https://github.com/kamailio/kamailio/pull/3733.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3733 You are receiving this because you are subscribed to this thread. Message ID:Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot showignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] [kamailio/kamailio] github: [skip ci]: bump wolletd/clang-format-checker from 1.10 to 1.11 (PR #3732)
Bumps [wolletd/clang-format-checker](https://github.com/wolletd/clang-format-checker) from 1.10 to 1.11.Release notes
Sourced from wolletd/clang-format-checker's releases.
Version 1.11
The action again works without
actions/checkoutbefore and checks out the repository itself if not present to use the.clang-formatfile of the project.Also add clang-format 16 and 17.
Commits
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3732 -- Commit Summary -- * github: [skip ci]: bump wolletd/clang-format-checker from 1.10 to 1.11 -- File Changes -- M .github/workflows/pull_request.yml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3732.patch https://github.com/kamailio/kamailio/pull/3732.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3732 You are receiving this because you are subscribed to this thread. Message ID:Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot showignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] TLS: Recent fixes for for OpenSSL 3.X are causing consistent startup failures when unixodbc is used (Issue #3727)
This seems to take care of the problem. I am now able to load and run my configuration successfully. Thank you. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3727#issuecomment-1915527734 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Format of settings sets in config.
Hello dear developers!
I'm developing a module that can have several sets of similar connections.
I see that some modules allow specifying a sequence of settings in one
parameter through the symbol ";", as sample:
modparam("htable", "htable",
"customer=>size=8;dbtable=customer;cols='dids,description';coldelim=';'")
or my example:
modparam("module", "module",
"connection=>alice;id=aliceid;password=alicepwd;timeout=60;param=123")
modparam("module", "module",
"connection=>bob;id=bobid;password=bobpwd;timeout=90;param=456")
I don't find it user friendly.
Can I offer users blocks with settings that should start with some
parameter, for example "connection", as in the example:
modparam("module", "connection", "alice") # first block of settings
modparam("module", "id", "aliceid")
modparam("module", "password", "alicepwd")
modparam("module", "timeout", 60)
modparam("module", "param", 123)
modparam("module", "connection", "bob") # second block of settings
modparam("module", "id", "bobid")
modparam("module", "password", "bobpwd")
modparam("module", "timeout", 90)
modparam("module", "param", 456)
modparam("module", "connection", "john") # third block of settings
...
If you think that this is not compatible with the kamailio configuration
ideology, I will give up my idea :)
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:9560e973: tls_wolfssl: fix possible uninitialised variable
Module: kamailio
Branch: master
Commit: 9560e973807bc454dab84bdfd5ac0e300c847864
URL:
https://github.com/kamailio/kamailio/commit/9560e973807bc454dab84bdfd5ac0e300c847864
Author: S-P Chan
Committer: S-P Chan
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/9560e973807bc454dab84bdfd5ac0e300c847864.diff
Patch:
https://github.com/kamailio/kamailio/commit/9560e973807bc454dab84bdfd5ac0e300c847864.patch
---
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 b
[sr-dev] Re: [kamailio/kamailio] db_unixodbc: init libssl in a thread (PR #3728)
@space88man pushed 1 commit. d66a581ecf4dca08129750e1db1c834a8800b741 db_unixodbc: init libssl in a thread -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3728/files/c249fe6e1c14f513a06e65e0233189e0c78b02b3..d66a581ecf4dca08129750e1db1c834a8800b741 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] db_postgres: init libssl in a thread (PR #3730)
@space88man pushed 1 commit. ebdd65d882284e3bb93674b168c306fa3b2ce1eb db_postgres: init libssl in a thread -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3730/files/b1f72ade900ca0119e856b67aacfdb835bc4ee5b..ebdd65d882284e3bb93674b168c306fa3b2ce1eb You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Working with arrays in MongoDB documents
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 ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:c2f14e0d: modules: readme files regenerated - sdpops ... [skip ci]
Module: kamailio Branch: master Commit: c2f14e0dccbabdd74dbddcbd569c32d0b429617e URL: https://github.com/kamailio/kamailio/commit/c2f14e0dccbabdd74dbddcbd569c32d0b429617e Author: Kamailio Dev Committer: Kamailio Dev 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/c2f14e0dccbabdd74dbddcbd569c32d0b429617e.diff Patch: https://github.com/kamailio/kamailio/commit/c2f14e0dccbabdd74dbddcbd569c32d0b429617e.patch ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:7b676473: textopsx: reformat module exported structures
Module: kamailio Branch: master Commit: 7b676473d2193b34ba59600eb3ce9c5acd19da1b URL: https://github.com/kamailio/kamailio/commit/7b676473d2193b34ba59600eb3ce9c5acd19da1b Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla Date: 2024-01-29T09:49:49+01:00 textopsx: reformat module exported structures --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/7b676473d2193b34ba59600eb3ce9c5acd19da1b.diff Patch: https://github.com/kamailio/kamailio/commit/7b676473d2193b34ba59600eb3ce9c5acd19da1b.patch ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:ff54f183: sdpops: added sdp line interator functions and variables
Module: kamailio Branch: master Commit: ff54f183cdedded4ef9d24d055c755b770b07651 URL: https://github.com/kamailio/kamailio/commit/ff54f183cdedded4ef9d24d055c755b770b07651 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla Date: 2024-01-29T09:49:49+01:00 sdpops: added sdp line interator functions and variables - walk sdb lines in the message body (also for multipart body) - append/insert/remove line of the current iterator - variable to get the value of the curent iterator --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ff54f183cdedded4ef9d24d055c755b770b07651.diff Patch: https://github.com/kamailio/kamailio/commit/ff54f183cdedded4ef9d24d055c755b770b07651.patch ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:03d93a43: sdpops: docs for sdp line interator functions and variable
Module: kamailio Branch: master Commit: 03d93a43a38f2af44640f42e3fd0f8f2a073b108 URL: https://github.com/kamailio/kamailio/commit/03d93a43a38f2af44640f42e3fd0f8f2a073b108 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla 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/03d93a43a38f2af44640f42e3fd0f8f2a073b108.diff Patch: https://github.com/kamailio/kamailio/commit/03d93a43a38f2af44640f42e3fd0f8f2a073b108.patch ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:68331254: textopsx: proper define id for body line interator name size
Module: kamailio
Branch: master
Commit: 68331254149a2ef3f2986bb92549cb63bb355989
URL:
https://github.com/kamailio/kamailio/commit/68331254149a2ef3f2986bb92549cb63bb355989
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
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/68331254149a2ef3f2986bb92549cb63bb355989.diff
Patch:
https://github.com/kamailio/kamailio/commit/68331254149a2ef3f2986bb92549cb63bb355989.patch
---
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;
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
