sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
243 discussions

git:master:10b86323: influxdbc: convert string value to double
by Daniel-Constantin Mierla 05 Feb '24

05 Feb '24

Module: kamailio Branch: master Commit: 10b86323cc47f29b41c21fd601d5b309cca050e6 URL: https://github.com/kamailio/kamailio/commit/10b86323cc47f29b41c21fd601d5b30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-05T16:19:20+01:00 influxdbc: convert string value to double --- Modified: src/modules/influxdbc/influxdbc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/10b86323cc47f29b41c21fd601d5b30… Patch: https://github.com/kamailio/kamailio/commit/10b86323cc47f29b41c21fd601d5b30… --- diff --git a/src/modules/influxdbc/influxdbc_mod.c b/src/modules/influxdbc/influxdbc_mod.c index b1c79b4b494..2c2f8804bb4 100644 --- a/src/modules/influxdbc/influxdbc_mod.c +++ b/src/modules/influxdbc/influxdbc_mod.c @@ -242,6 +242,8 @@ static int w_influxdbc_double(sip_msg_t *msg, char *pname, char *pvalue) return -1; } + dval = strtod(sval.s, NULL); + ic_double(sname.s, dval); return 1;

1 0

git:master:ba2d0e17: influxdbc: docs for several parameters and functions
by Daniel-Constantin Mierla 05 Feb '24

05 Feb '24

Module: kamailio Branch: master Commit: ba2d0e171b0171ba98bc7219a420dcda7677d366 URL: https://github.com/kamailio/kamailio/commit/ba2d0e171b0171ba98bc7219a420dcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-05T16:19:20+01:00 influxdbc: docs for several parameters and functions --- Modified: src/modules/influxdbc/doc/influxdbc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ba2d0e171b0171ba98bc7219a420dcd… Patch: https://github.com/kamailio/kamailio/commit/ba2d0e171b0171ba98bc7219a420dcd… --- diff --git a/src/modules/influxdbc/doc/influxdbc_admin.xml b/src/modules/influxdbc/doc/influxdbc_admin.xml index c59fe92a126..a02af97e048 100644 --- a/src/modules/influxdbc/doc/influxdbc_admin.xml +++ b/src/modules/influxdbc/doc/influxdbc_admin.xml @@ -68,6 +68,44 @@ ... modparam("influxdbc", "server", "127.0.0.1") ... +</programlisting> + </example> + </section> + <section id="influxdbc.p.port"> + <title><varname>port</varname> (int)</title> + <para> + Address of InfluxDB server. + </para> + <para> + <emphasis> + Default value is 8086. + </emphasis> + </para> + <example> + <title>Set <varname>port</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("influxdbc", "port", 8808) +... +</programlisting> + </example> + </section> + <section id="influxdbc.p.database"> + <title><varname>database</varname> (int)</title> + <para> + Database of InfluxDB server. + </para> + <para> + <emphasis> + Default value is empty. + </emphasis> + </para> + <example> + <title>Set <varname>database</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("influxdbc", "database", "stats") +... </programlisting> </example> </section> @@ -86,7 +124,7 @@ modparam("influxdbc", "server", "127.0.0.1") This function can be used from ANY_ROUTE. </para> <example> - <title><function>async_route</function> usage</title> + <title><function>influxdbc_measure()</function> usage</title> <programlisting format="linespecific"> ... request_route { @@ -95,6 +133,53 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="influxdb.f.influxdbc_measureend"> + <title> + <function moreinfo="none">influxdbc_measureend()</function> + </title> + <para> + End the current measure group. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>influxdbc_measureend()</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + influxdbc_measureend(); + ... +} +... +</programlisting> + </example> + </section> + <section id="influxdb.f.influxdbc_lomg"> + <title> + <function moreinfo="none">influxdbc_long(name, value)</function> + </title> + <para> + Save the pair with provided name and value. Both parameters can + have variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>influxdbc_long()</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + influxdbc_long("active", "$shv(active)"); + ... +} +... </programlisting> </example> </section>

1 0

git:master:faaad7e0: rtpengine: docs for ping_mode parameter
by Daniel-Constantin Mierla 05 Feb '24

05 Feb '24

Module: kamailio Branch: master Commit: faaad7e0e654359e744d0c18253cc0dc84cd906e URL: https://github.com/kamailio/kamailio/commit/faaad7e0e654359e744d0c18253cc0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-05T16:19:20+01:00 rtpengine: docs for ping_mode parameter --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/faaad7e0e654359e744d0c18253cc0d… Patch: https://github.com/kamailio/kamailio/commit/faaad7e0e654359e744d0c18253cc0d… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index fea67a665a2..adb3af92bdd 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2348,6 +2348,28 @@ modparam("rtpengine", "dtmf_events_sock", "127.0.0.1:2223") </example> </section> + <section id="rtpengine.p.ping_mode"> + <title><varname>ping_mode</varname> (integer)</title> + <para> + Specify if the RTPEngine instances have to be pinged at startup to + detect if they are active. Set it to 0 to disable pinging and to 1 + to activate pinging. + </para> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ping_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rtpengine", "ping_mode", 0) +... +</programlisting> + </example> + </section> + </section>

1 0

[kamailio/kamailio] RFE: RPM packaging of wolfSSL 5.6.6 for upcoming freeze/5.7 release (Issue #3713)
by space88man 04 Feb '24

04 Feb '24

### Description Request the RPM packaging of wolfSSL 5.6.6 for the upcoming freeze ### Expected behavior I intend to bump the internal submodule to 5.6.6 and it would be good if Kamailio RPM packages could be updated. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3713 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3713(a)github.com>

2 7

git:master:81605f92: pkg/kamailio: RPM packaged new modules
by Sergey Safarov 04 Feb '24

04 Feb '24

Module: kamailio Branch: master Commit: 81605f9289364a273a7b904d12972a6d01dc6207 URL: https://github.com/kamailio/kamailio/commit/81605f9289364a273a7b904d12972a6… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-02-04T17:53:48+02:00 pkg/kamailio: RPM packaged new modules --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/81605f9289364a273a7b904d12972a6… Patch: https://github.com/kamailio/kamailio/commit/81605f9289364a273a7b904d12972a6… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index a7758b98e61..13d6fb20ffd 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1538,6 +1538,7 @@ fi %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc +%doc %{_docdir}/kamailio/modules/README.influxdbc %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kemix %doc %{_docdir}/kamailio/modules/README.kex @@ -1697,9 +1698,11 @@ fi %{_libdir}/kamailio/modules/drouting.so %{_libdir}/kamailio/modules/enum.so %{_libdir}/kamailio/modules/exec.so +%{_libdir}/kamailio/modules/file_out.so %{_libdir}/kamailio/modules/group.so %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so +%{_libdir}/kamailio/modules/influxdbc.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kemix.so %{_libdir}/kamailio/modules/kex.so

1 0

[kamailio/kamailio] thread-local: database module fixes need to be back-ported to 5.7 (Issue #3738)
by space88man 04 Feb '24

04 Feb '24

### Description OpenSSL integration update was back-ported to 5.7 fixing tls and outbound. The commonly used modules db_mysql, db_unixodbc, db_postgres - fixed on master - did not receive thread-local fixes in time for 5.7.4. Kamailio configurations with tls +(database module) may see shm errors Some database modules are observed to initialise OpenSSL even if the actual db connections are in clear. ### Troubleshooting - run the main kamailio process under gdb. - set breakpoint on CRYPTO_THREAD_set_local (an OpenSSL internal thread-local function) - observe if any calls happen in Thread#1—this is the failure case ### Workaround When combining tls + database module switch to tls_wolfssl instead -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3738 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3738(a)github.com>

1 1

git:5.7:74636a9b: Revert "tls_wolfssl: enable building with external package"
by S-P Chan 04 Feb '24

04 Feb '24

Module: kamailio Branch: 5.7 Commit: 74636a9bf53524a6d60351c1569a033270677d6c URL: https://github.com/kamailio/kamailio/commit/74636a9bf53524a6d60351c1569a033… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-04T10:11:45+08:00 Revert "tls_wolfssl: enable building with external package" This reverts commit 53ce759091f78ffecc6b4047ff3e8885329d718f. < 5.8 does not have 16-byte memory alignment --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/74636a9bf53524a6d60351c1569a033… Patch: https://github.com/kamailio/kamailio/commit/74636a9bf53524a6d60351c1569a033… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 98239c43183..5ef95d697b6 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -8,13 +8,6 @@ include ../../Makefile.defs auto_gen= NAME=tls_wolfssl.so -# make WOLFSSL_INTERNAL=yes... for internal submodule -# make WOLFSSL_INTERNAL=no... for system package -# default: yes - -WOLFSSL_INTERNAL ?= yes - -ifeq ($(WOLFSSL_INTERNAL),yes) WOLFSSL_PREFIX = ../../../misc/external/wolfssl/build WOLFSSL_SRC = ../../../misc/external/wolfssl/wolfssl @@ -41,15 +34,6 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: $(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a -else -WOLFSSL_LIBS ?= $(shell pkg-config wolfssl --libs) -WOLFSSL_INCLUDES ?= $(shell pkg-config wolfssl --cflags) - -LIBS += $(WOLFSSL_LIBS) -INCLUDES += $(WOLFSSL_INCLUDES) -include ../../Makefile.modules -endif - clean-wolfssl: @rm -rf $(WOLFSSL_PREFIX)/{bin,include,share,lib}; \ (cd $(WOLFSSL_SRC); make distclean) || /bin/true

1 0

Re: [kamailio/kamailio] db_mysql: backport - no TLS with MariaDB Connector/C (ede2af9)
by space88man 04 Feb '24

04 Feb '24

@miconda @linuxmaniac - compilation fixes and handling of older versions(libmariadb-dev) squash-included here. Thank you. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/ede2af94386b99a87311351fcbdd152… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/ede2af94386b99a87311351fcbdd15280dc11034/138246612(a)github.com>

1 0

git:5.7:ede2af94: db_mysql: backport - no TLS with MariaDB Connector/C
by S-P Chan 04 Feb '24

04 Feb '24

Module: kamailio Branch: 5.7 Commit: ede2af94386b99a87311351fcbdd15280dc11034 URL: https://github.com/kamailio/kamailio/commit/ede2af94386b99a87311351fcbdd152… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-04T08:12:52+08:00 db_mysql: backport - no TLS with MariaDB Connector/C - GH #3735 - includes compilation and stretch fixes - emulate SSL_MODE_XXX from MySQL - opt_ssl_mode: - 0|1(off) - 2|3|4(MYSQL_OPT_SSL_ENFORCE) - 5(MYSQL_OPT_SSL_VERIFY_SERVER_CERT) --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/ede2af94386b99a87311351fcbdd152… Patch: https://github.com/kamailio/kamailio/commit/ede2af94386b99a87311351fcbdd152… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index d3f57108886..b4c4dca33b0 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -116,7 +116,36 @@ 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 */ +#if MYSQL_VERSION_ID >= 100339 + mysql_options(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&(int){1}); +#else + LM_WARN("ssl mode not supported by %s\n", MARIADB_BASE_VERSION); +#endif + break; + case 5: /* SSL_MODE_VERIFY_IDENTITY */ + mysql_options(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 +#if MYSQL_VERSION_ID > 50710 if(db_mysql_opt_ssl_mode != 0) { unsigned int optuint = 0; if(db_mysql_opt_ssl_mode == 1) { @@ -136,7 +165,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

Re: [kamailio/kamailio] outbound: init libssl in a thread (9a87d12)
by space88man 04 Feb '24

04 Feb '24

@linuxmaniac - I have included the Xenial fix from master here. Thanks! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/9a87d12d6e9e68cd8c0ff7ac5755e89… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/9a87d12d6e9e68cd8c0ff7ac5755e899cf81b703/138246585(a)github.com>

1 0

← Newer
1
...
17
18
19
20
21
22
23
24
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2024