- sr-dev - kamailio.org

git:5.7:07afe1b5: tls_wolfssl: clang-format
by S-P Chan 30 Jan '24

30 Jan '24

Module: kamailio Branch: 5.7 Commit: 07afe1b520961de0e5271f0921742d1465fa55e9 URL: https://github.com/kamailio/kamailio/commit/07afe1b520961de0e5271f0921742d1… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-31T05:41:18+08:00 tls_wolfssl: clang-format (cherry-pick from 0f963a7a1e2aca28611c2238f4c29180a0acd320) --- Modified: src/modules/tls_wolfssl/tls_domain.c Modified: src/modules/tls_wolfssl/tls_rpc.c Modified: src/modules/tls_wolfssl/tls_select.c Modified: src/modules/tls_wolfssl/tls_server.c Modified: src/modules/tls_wolfssl/tls_util.h --- Diff: https://github.com/kamailio/kamailio/commit/07afe1b520961de0e5271f0921742d1… Patch: https://github.com/kamailio/kamailio/commit/07afe1b520961de0e5271f0921742d1…

1 0

[kamailio/kamailio] db_mysql: built with mariadb-connector-c does not use TLS (Issue #3735)
by space88man 30 Jan '24

30 Jan '24

### Description Applies to `db_mysql` built with mariadb-connector-c; TLS is not working Option 1: configure mariadb server to use TLS (optional) Option 2: configure mariadb server to use TLS (mandatory) ### Troubleshooting 1. wireshark inspect the pcap dump of traffic to :3306 and look for ClientHello 2. gdb main kamailio process and set breakpoint at `SSL_new` #### Reproduction 1. Option 1: server advertises SSL, but db_mysql will always choose plain 3. Option 2: server advertises SSL(and requires SSL), connection will fail ### Additional Information #### Kamailio version * master -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3735 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3735(a)github.com>

1 2

git:master:1e87f96a: tls_wolfssl: un-break jammy using libwolfssl32
by S-P Chan 30 Jan '24

30 Jan '24

Module: kamailio Branch: master Commit: 1e87f96ad3a85b35935f14db36626036469cb6b0 URL: https://github.com/kamailio/kamailio/commit/1e87f96ad3a85b35935f14db3662603… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-30T22:25:01+08:00 tls_wolfssl: un-break jammy using libwolfssl32 --- Modified: src/modules/tls_wolfssl/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/1e87f96ad3a85b35935f14db3662603… Patch: https://github.com/kamailio/kamailio/commit/1e87f96ad3a85b35935f14db3662603… --- diff --git a/src/modules/tls_wolfssl/tls_domain.c b/src/modules/tls_wolfssl/tls_domain.c index 5d573b46274..aae5c01c6cd 100644 --- a/src/modules/tls_wolfssl/tls_domain.c +++ b/src/modules/tls_wolfssl/tls_domain.c @@ -728,8 +728,8 @@ static int set_ssl_options(tls_domain_t *d) { long options; - options = WOLFSSL_OP_ALL; /* all the bug workarounds by default */ - options |= WOLFSSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION + options = SSL_OP_ALL; /* all the bug workarounds by default */ + options |= SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION | WOLFSSL_OP_CIPHER_SERVER_PREFERENCE; do {

1 0

git:master:dad7c857: modules: readme files regenerated - db_mysql ... [skip ci]
by Kamailio Dev 30 Jan '24

30 Jan '24

Module: kamailio Branch: master Commit: dad7c857eaab613deed27ab687ddd0b1fdf8001b URL: https://github.com/kamailio/kamailio/commit/dad7c857eaab613deed27ab687ddd0b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-01-30T14:32:10+01:00 modules: readme files regenerated - db_mysql ... [skip ci] --- Modified: src/modules/db_mysql/README --- Diff: https://github.com/kamailio/kamailio/commit/dad7c857eaab613deed27ab687ddd0b… Patch: https://github.com/kamailio/kamailio/commit/dad7c857eaab613deed27ab687ddd0b… --- diff --git a/src/modules/db_mysql/README b/src/modules/db_mysql/README index 8d9f526cbe1..8e135cdcbf2 100644 --- a/src/modules/db_mysql/README +++ b/src/modules/db_mysql/README @@ -94,7 +94,9 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: * mysql - the development libraries for the MySQL database. In some - Linux distributions named "libmysqlclient-dev". + Linux distributions named "libmysqlclient-dev". MariaDB - the + development libraries for the MariaDB database. In some Linux + distributions named "libmariadbclient-dev". 3. Parameters @@ -199,8 +201,9 @@ modparam("db_mysql", "update_affected_found", 1) SSL_MODE_DISABLED, any other value is passed to the mysql_options(), not checking if it is defined. - Note: this option is supported only by libmysqlclient, not by - libmariadbclient. + MariaDB client configuration uses the following values: 0, 1 use plain, + 2/3/4 for MYSQL_OPT_SSL_ENFORCE, 5 for MYSQL_OPT_SSL_VERIFY_SERVER_CERT + (see MariaDB Connector/C documentation) Other values are ignored. Default value is 0 (0 - off).

1 0

[kamailio/kamailio] db_mysql: enable TLS when building with mariadb-connector-c (PR #3734)
by space88man 30 Jan '24

30 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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 When db_mysql is built with mariadb-connector-c it does not use TLS and fails if the server requires TLS. It seems to be related to the fact that the MYSQL object needs to have a minimal non-NULL configuration (unlike MySQL Connector/C). This is a minimal setting to allow TLS. A more full-featured solution would be to enable db_mysql to read from an external configuration file. @linuxmaniac, kindly take a look You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3734 -- Commit Summary -- * db_mysql: enable TLS when building with mariadb-connector-c -- File Changes -- M src/modules/db_mysql/km_my_con.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3734.patch https://github.com/kamailio/kamailio/pull/3734.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3734 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3734(a)github.com>

2 6

git:master:2bcc32a1: db_mysql: update docs for MariaDB Connector/C builds
by Victor Seva 30 Jan '24

30 Jan '24

Module: kamailio Branch: master Commit: 2bcc32a14e63d895077071715b0321fbdcdb8a33 URL: https://github.com/kamailio/kamailio/commit/2bcc32a14e63d895077071715b0321f… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-30T14:28:26+01:00 db_mysql: update docs for MariaDB Connector/C builds --- Modified: src/modules/db_mysql/doc/db_mysql_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2bcc32a14e63d895077071715b0321f… Patch: https://github.com/kamailio/kamailio/commit/2bcc32a14e63d895077071715b0321f… --- diff --git a/src/modules/db_mysql/doc/db_mysql_admin.xml b/src/modules/db_mysql/doc/db_mysql_admin.xml index 51c9b5b728d..f1ff53df0ed 100644 --- a/src/modules/db_mysql/doc/db_mysql_admin.xml +++ b/src/modules/db_mysql/doc/db_mysql_admin.xml @@ -46,6 +46,7 @@ <listitem> <para> <emphasis>mysql</emphasis> - the development libraries for the MySQL database. In some Linux distributions named "libmysqlclient-dev". + <emphasis>MariaDB</emphasis> - the development libraries for the MariaDB database. In some Linux distributions named "libmariadbclient-dev". </para> </listitem> </itemizedlist> @@ -198,7 +199,10 @@ modparam("db_mysql", "update_affected_found", 1) defined. </para> <para> - Note: this option is supported only by libmysqlclient, not by libmariadbclient. + MariaDB client configuration uses the following values: 0, 1 use plain, 2/3/4 for MYSQL_OPT_SSL_ENFORCE, + 5 for MYSQL_OPT_SSL_VERIFY_SERVER_CERT (see MariaDB Connector/C documentation) + + Other values are ignored. </para> <para> <emphasis> @@ -298,4 +302,3 @@ default-character-set = utf8 </para> </section> </chapter> -

1 0

git:master:d772b4c2: db_mysql: enable TLS when building with mariadb-connector-c
by Victor Seva 30 Jan '24

30 Jan '24

Module: kamailio Branch: master Commit: d772b4c24a3a4995b93287ccf8eac9b80d1a5bac URL: https://github.com/kamailio/kamailio/commit/d772b4c24a3a4995b93287ccf8eac9b… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-30T14:28:26+01:00 db_mysql: enable TLS when building with mariadb-connector-c - mariadb-connector-c requires at least one non-NULL configuration value to use TLS - emulate MySQL SSL_MODE_XXXX options --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/d772b4c24a3a4995b93287ccf8eac9b… Patch: https://github.com/kamailio/kamailio/commit/d772b4c24a3a4995b93287ccf8eac9b… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index d3f57108886..b415ff87655 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -116,7 +116,32 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) (const void *)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void *)&db_mysql_timeout_interval); -#if MYSQL_VERSION_ID > 50710 && !defined(MARIADB_BASE_VERSION) + +#ifdef MARIADB_BASE_VERSION + /* + * emulate SSL_MODE_XXXX from MySQL + */ + + switch(db_mysql_opt_ssl_mode) { + case 0: /* opt_ssl_mode = 0(off) */ + case 1: /* SSL_MODE_DISABLED */ + break; + case 2: /* SSL_MODE_PREFERRED */ + case 3: /* SSL_MODE_REQUIRED */ + case 4: /* SSL_MODE_VERIFY_CA */ + mysql_optionsv(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&(int){1}); + break; + case 5: /* SSL_MODE_VERIFY_IDENTITY */ + mysql_optionsv(ptr->con, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, + (void *)&(int){1}); + break; + default: + LM_WARN("opt_ssl_mode = %d not supported by MariaDB Connector/C\n", + db_mysql_opt_ssl_mode); + break; + } +#else +#ifdef MYSQL_VERSION_ID> 50710 if(db_mysql_opt_ssl_mode != 0) { unsigned int optuint = 0; if(db_mysql_opt_ssl_mode == 1) { @@ -136,7 +161,8 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) "ignoring\n", (unsigned int)db_mysql_opt_ssl_mode); } -#endif +#endif /* MYSQL_VERSION_ID */ +#endif /* MARIADB_BASE_VERSION */ #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */

1 0

Format of settings sets in config.
by Вадим С 30 Jan '24

30 Jan '24

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 :)

4 4

git:master:e470f67c: github: [skip ci] enable dependabot for devcontainers
by Victor Seva 30 Jan '24

30 Jan '24

Module: kamailio Branch: master Commit: e470f67c9aaaeb2dc39f49a1b5abb3352b45ad13 URL: https://github.com/kamailio/kamailio/commit/e470f67c9aaaeb2dc39f49a1b5abb33… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-30T10:44:19+01:00 github: [skip ci] enable dependabot for devcontainers --- Modified: .github/dependabot.yml --- Diff: https://github.com/kamailio/kamailio/commit/e470f67c9aaaeb2dc39f49a1b5abb33… Patch: https://github.com/kamailio/kamailio/commit/e470f67c9aaaeb2dc39f49a1b5abb33… --- diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 775cd546581..06afaf16847 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,3 +7,9 @@ updates: interval: "weekly" commit-message: prefix: "github: [skip ci]" + - package-ecosystem: "devcontainers" + directory: "/" + schedule: + interval: weekly + commit-message: + prefix: "github: [skip ci]"

1 0

Re: [kamailio/kamailio] tls_wolfssl: clean-up; remove OpenSSL-isms (3d0e752)
by Victor Seva 30 Jan '24

30 Jan '24

This broke the build on jammy https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=… **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/3d0e7521c6de4023b6595685fc30612… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/3d0e7521c6de4023b6595685fc306129ef57b8ac/138041657(a)github.com>

1 0

[kamailio/kamailio] github: [skip ci]: bump wolletd/clang-format-checker from 1.10 to 1.11 (PR #3732)
by dependabot[bot] 30 Jan '24

30 Jan '24

Bumps [wolletd/clang-format-checker](https://github.com/wolletd/clang-format-check… from 1.10 to 1.11. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/wolletd/clang-format-checker/releases"&g… releases</a>.</em></p> <blockquote> <h2>Version 1.11</h2> <p>The action again works without <code>actions/checkout</code> before and checks out the repository itself if not present to use the <code>.clang-format</code> file of the project.</p> <p>Also add clang-format 16 and 17.</p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/WolleTD/clang-format-checker/commit/c4a732902… Merge pull request <a href="https://redirect.github.com/wolletd/clang-format-checker/issues/… from WolleTD/checkout</li> <li><a href="https://github.com/WolleTD/clang-format-checker/commit/2e3de0eab… checkout source when no repository is present</li> <li><a href="https://github.com/WolleTD/clang-format-checker/commit/95b84cca8… test: rename local branch</li> <li><a href="https://github.com/WolleTD/clang-format-checker/commit/d14c3190c… Merge pull request <a href="https://redirect.github.com/wolletd/clang-format-checker/issues/… from WolleTD/llvm17</li> <li><a href="https://github.com/WolleTD/clang-format-checker/commit/74192a346… Add clang-format 16 and 17</li> <li>See full diff in <a href="https://github.com/wolletd/clang-format-checker/compare/v1.10...… view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?d… 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) --- <details> <summary>Dependabot commands and options</summary> <br /> 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 show <dependency name> ignore 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) </details> 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: <kamailio/kamailio/pull/3732(a)github.com>

2 1

git:master:8e2a1a36: github: [skip ci]: bump wolletd/clang-format-checker from 1.10 to 1.11
by Victor Seva 30 Jan '24

30 Jan '24

Module: kamailio Branch: master Commit: 8e2a1a36f14a18834d1a98e8483b4595a533abff URL: https://github.com/kamailio/kamailio/commit/8e2a1a36f14a18834d1a98e8483b459… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> 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-check… 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… --- updated-dependencies: - dependency-name: wolletd/clang-format-checker dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/8e2a1a36f14a18834d1a98e8483b459… Patch: https://github.com/kamailio/kamailio/commit/8e2a1a36f14a18834d1a98e8483b459… --- 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(a)v1.10 + - uses: wolletd/clang-format-checker(a)v1.11 with: target-ref: master build:

1 0

git:master:520b9dce: github: [skip ci]: bump ammaraskar/gcc-problem-matcher
by Victor Seva 30 Jan '24

30 Jan '24

Module: kamailio Branch: master Commit: 520b9dce03d695cd1d95432e6bf52ed47d046cd4 URL: https://github.com/kamailio/kamailio/commit/520b9dce03d695cd1d95432e6bf52ed… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> 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-m… 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...… --- updated-dependencies: - dependency-name: ammaraskar/gcc-problem-matcher dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/main.yml Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/520b9dce03d695cd1d95432e6bf52ed… Patch: https://github.com/kamailio/kamailio/commit/520b9dce03d695cd1d95432e6bf52ed… --- 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(a)0.2.0 + - uses: ammaraskar/gcc-problem-matcher(a)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(a)0.2.0 + - uses: ammaraskar/gcc-problem-matcher(a)0.3.0 - name: build run: | cd /code

1 0

[kamailio/kamailio] github: [skip ci]: bump ammaraskar/gcc-problem-matcher from 0.2.0 to 0.3.0 (PR #3733)
by dependabot[bot] 30 Jan '24

30 Jan '24

Bumps [ammaraskar/gcc-problem-matcher](https://github.com/ammaraskar/gcc-problem-m… from 0.2.0 to 0.3.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/ammaraskar/gcc-problem-matcher/releases"… releases</a>.</em></p> <blockquote> <h2>Update for node16 deprecation</h2> <p>Github has deprecated node16 actions, this update fixes the deprecation warning emitted. See <a href="https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/">https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/ammaraskar/gcc-problem-matcher/commit/0f9c86f… Update to use node20, fixes <a href="https://redirect.github.com/ammaraskar/gcc-problem-matcher/issue… <li>See full diff in <a href="https://github.com/ammaraskar/gcc-problem-matcher/compare/0.2.0.… view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?d… 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) --- <details> <summary>Dependabot commands and options</summary> <br /> 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 show <dependency name> ignore 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) </details> 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: <kamailio/kamailio/pull/3733(a)github.com>

2 1

[kamailio/kamailio] TLS: Recent fixes for for OpenSSL 3.X are causing consistent startup failures when unixodbc is used (Issue #3727)
by kdanderso 29 Jan '24

29 Jan '24

### Description Kamailio fails to start after recent changes were made to improve support for OpenSSL 3.X. The failure occurs for both OpenSSL 3.X and OpenSSL 1.1.X, and are the same as failures I had been seeing on previous Kamailio versions when using OpenSSL 3.X. These errors were not occurring for OpenSSL 1.1.X prior to commits on Jan 4, 2024. My configuration is using the unixodbc module to communicate with a Microsoft SQL Server database. Furthermore, the dispatcher module is configured to use the database. With this configuration, Kamailio always fails at startup. It may log a "freeing already free pointer bug" or sometimes indicates pointer corruption. In either case, it fails to connect to the database. #### Reproduction Start Kamailio with configuration files similar to the following. For the log file shown below, Kamailio was started with "kamailio -dd -E --atexit=no" [kamailio.txt](https://github.com/kamailio/kamailio/files/14068346/kamailio.… [tls.txt](https://github.com/kamailio/kamailio/files/14068347/tls.txt) #### Log Messages [kamailio.log](https://github.com/kamailio/kamailio/files/14068278/kamailio.… #### SIP Traffic None. Problem occurs during initialization. ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.8.0-dev2 (x86_64/linux) 4db5d7-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 4db5d7 -dirty compiled on 17:44:29 Jan 26 2024 with gcc 9.4.0 * **Operating System**: Distributor ID: Ubuntu Description: Ubuntu 20.04.6 LTS Release: 20.04 Codename: focal Kernel: 5.4.0-170-generic (Similar behavior is seen on Ubuntu 22.04 using OpenSSL 3.X.) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3727 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3727(a)github.com>

2 5

[kamailio/kamailio] db_postgres: init libssl in a thread (PR #3730)
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 PostgreSQL may be configured to use SSL: init in a thread You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3730 -- Commit Summary -- * db_postgres: init libssl in a thread -- File Changes -- M src/modules/db_postgres/km_dbase.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3730.patch https://github.com/kamailio/kamailio/pull/3730.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3730 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3730(a)github.com>

1 5

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev