sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
242 discussions

git:master:e4163d28: file_out: Switch to str type for string handling

by Xenofon Karamanos

Module: kamailio Branch: master Commit: e4163d287e1c8c617ef9f21452a88f09c040bd47 URL: https://github.com/kamailio/kamailio/commit/e4163d287e1c8c617ef9f21452a88f0… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-02-16T12:20:44+02:00 file_out: Switch to str type for string handling --- Modified: src/modules/file_out/file_out.c Modified: src/modules/file_out/types.c Modified: src/modules/file_out/types.h --- Diff: https://github.com/kamailio/kamailio/commit/e4163d287e1c8c617ef9f21452a88f0… Patch: https://github.com/kamailio/kamailio/commit/e4163d287e1c8c617ef9f21452a88f0… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index b52dad270d5..5815d61cb63 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -199,8 +199,14 @@ static void fo_log_writer_process(int rank) return; } - fprintf(out, "%s\n", log_message.message); - fflush(out); + if(fprintf(out, "%.*s\n", log_message.message->len, + log_message.message->s) + < 0) { + LM_ERR("Failed to write to file with err {%s}\n", strerror(errno)); + } + if(fflush(out) < 0) { + LM_ERR("Failed to flush file with err {%s}\n", strerror(errno)); + } } } @@ -463,7 +469,7 @@ static int fo_write_to_file(sip_msg_t *msg, char *index, char *log_message) return -1; } - str value; + str value = str_init(""); result = get_str_fparam(&value, msg, (fparam_t *)log_message); if(result < 0) { LM_ERR("Failed to string from param 1: %d\n", result); @@ -471,8 +477,8 @@ static int fo_write_to_file(sip_msg_t *msg, char *index, char *log_message) } /* Add the logging string to the global gueue */ - fo_log_message_t logMessage; - logMessage.message = value.s; + fo_log_message_t logMessage = {0, 0}; + logMessage.message = &value; logMessage.dest_file = file_index; fo_enqueue(fo_queue, logMessage); diff --git a/src/modules/file_out/types.c b/src/modules/file_out/types.c index a80566dfc8f..d2815333dd0 100644 --- a/src/modules/file_out/types.c +++ b/src/modules/file_out/types.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include "types.h" +#include "../../core/ut.h" static fo_node_t *fo_new_node(fo_log_message_t data) { @@ -37,8 +38,18 @@ int fo_enqueue(fo_queue_t *q, fo_log_message_t data) /* Copy the contents of data.message */ - char *message_copy = (char *)shm_malloc(strlen(data.message) + 1); - strcpy(message_copy, data.message); + str *message_copy = 0; + message_copy = (str *)shm_malloc(sizeof(str)); + if(message_copy == 0) { + SHM_MEM_ERROR; + return -1; + } + + if(shm_str_dup(message_copy, data.message) < 0) { + LM_ERR("Failed to duplicate message\n"); + return -1; + } + data.message = message_copy; fo_node_t *temp = fo_new_node(data); @@ -74,10 +85,6 @@ int fo_dequeue(fo_queue_t *q, fo_log_message_t *data) if(temp != NULL) { - if(temp->data.message != NULL) { - shm_free(temp->data.message); - temp->data.message = NULL; - } shm_free(temp); temp = NULL; } diff --git a/src/modules/file_out/types.h b/src/modules/file_out/types.h index 0c81cb20a7b..c6fb72b28ef 100644 --- a/src/modules/file_out/types.h +++ b/src/modules/file_out/types.h @@ -22,7 +22,7 @@ typedef struct log_message { - char *message; + str *message; int dest_file; } fo_log_message_t;

10 months, 1 week

git:master:e15a15cf: file_out: Add initial Readme and improve docs

by Xenofon Karamanos

Module: kamailio Branch: master Commit: e15a15cf8ce0c09aa6b26200dd2bce0e3933b6cd URL: https://github.com/kamailio/kamailio/commit/e15a15cf8ce0c09aa6b26200dd2bce0… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-02-16T12:20:44+02:00 file_out: Add initial Readme and improve docs --- Added: src/modules/file_out/README Modified: src/modules/file_out/doc/file_out_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e15a15cf8ce0c09aa6b26200dd2bce0… Patch: https://github.com/kamailio/kamailio/commit/e15a15cf8ce0c09aa6b26200dd2bce0…

10 months, 1 week

git:master:107d8c9a: file_out: Change default base folder format

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 107d8c9ae4cb1191d9e0132a42acad8af4cc66c9 URL: https://github.com/kamailio/kamailio/commit/107d8c9ae4cb1191d9e0132a42acad8… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-02-16T12:20:44+02:00 file_out: Change default base folder format --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/107d8c9ae4cb1191d9e0132a42acad8… Patch: https://github.com/kamailio/kamailio/commit/107d8c9ae4cb1191d9e0132a42acad8… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index d64ffdec74e..b52dad270d5 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -60,7 +60,7 @@ static int fo_add_filename(modparam_t type, void *val); static int fo_parse_filename_params(str input); /* Default parameters */ -char *fo_base_folder = "/var/log/kamailio/file_out/"; +char *fo_base_folder = "/var/log/kamailio/file_out"; char *fo_base_filename[FO_MAX_FILES] = {""}; char *fo_extension[FO_MAX_FILES] = {".out"}; int fo_interval_seconds[FO_MAX_FILES] = {10 * 60};

10 months, 1 week

[kamailio/kamailio] Undocumented TCP connection limit introduced in 5.7.3 must be configurable (Issue #3755)

by Sebastian Damm

### Description Scenario: Kamailio servers running behind a loadbalancer (AWS network loadbalancer in this case). This causes all packets to come from the same IP address in Kamailio's POV. The change https://github.com/kamailio/kamailio/commit/a902e4a032a85a7755de32eeadac800… introduced a connection limit per source IP address. This obviously conflicts with the setup mentioned above. We need up to 10000 client connections, which would seem to all come from the same IP address. Apart from this limit being introduced without a changelog entry (at least I didn't find one), I would expect it to be configurable. But from the commit it looks like it is a compile time option only.  #### Log Messages ``` Feb 15 09:24:00 sipproxy /usr/sbin/kamailio[174]: CRITICAL: <core> [core/tcp_main.c:4447]: handle_new_connect(): hit the limit of connections per source IP (100.68.15.172:33334) - rejecting Feb 15 09:24:01 sipproxy /usr/sbin/kamailio[174]: CRITICAL: <core> [core/tcp_main.c:4447]: handle_new_connect(): hit the limit of connections per source IP (100.68.15.172:1153) - rejecting Feb 15 09:24:01 sipproxy /usr/sbin/kamailio[174]: CRITICAL: <core> [core/tcp_main.c:4447]: handle_new_connect(): hit the limit of connections per source IP (100.68.15.172:59946) - rejecting ``` ### Additional Information Using the packages from the official Kamailio repository. * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.4 (x86_64/linux) 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 11.4.0 ``` * **Operating System**:  ``` Ubuntu Jammy ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3755 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3755(a)github.com>

10 months, 1 week

Missing values in xhttp_prom output

by Christian Berger

Hi, we at sipgate would like to know if there is a reason why the xhttp_prom module doesn't export statistics like stats.fetch all. We are missing the tls.info as well as pkg.stats values. Is there a reason for this? Are there any pointers on how we could implement it ourselves and provide patches? Best regards Christian Berger -- Christian Berger - berger(a)sipgate.de Telefon: +49 (0)211-63 55 55-0 Telefax: +49 (0)211-63 55 55-22 sipgate GmbH - Gladbacher Str. 74 - 40219 Düsseldorf HRB Düsseldorf 39841 - Geschäftsführer: Thilo Salmon, Tim Mois Steuernummer: 106/5724/7147, Umsatzsteuer-ID: DE219349391 www.sipgate.de - www.sipgate.co.uk

10 months, 1 week

git:master:1e423644: db_mysql: libssl thread guard for db_mysql_query (and libmysqlclient)

by S-P Chan

Module: kamailio Branch: master Commit: 1e4236445167d837a89d54ce6bee5ef14aef568e URL: https://github.com/kamailio/kamailio/commit/1e4236445167d837a89d54ce6bee5ef… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-14T19:49:10+08:00 db_mysql: libssl thread guard for db_mysql_query (and libmysqlclient) This function is observed to call SSL_read() when compiled with libmysqlclient.so.21 (but not libmariadb.so.3). Apply a thread executor just in case. --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/1e4236445167d837a89d54ce6bee5ef… Patch: https://github.com/kamailio/kamailio/commit/1e4236445167d837a89d54ce6bee5ef… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index 7b65c0a012c..91ace58df5b 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -41,6 +41,7 @@ #define KSR_RTHREAD_NEED_4PP #define KSR_RTHREAD_NEED_0P +#define KSR_RTHREAD_NEED_4P5I2P2 #include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db_ut.h" @@ -348,12 +349,26 @@ int db_mysql_free_result(const db1_con_t *_h, db1_res_t *_r) * \param _r pointer to a structure representing the result * \return zero on success, negative value on failure */ + +/* + * this function observed to invoke SSL_read() under libmysqlclient.so.21 + * but not libmariadb.so.3; apply libssl guard + */ +static int db_mysql_query_impl(const db1_con_t *_h, const db_key_t *_k, + const db_op_t *_op, const db_val_t *_v, const db_key_t *_c, + const int _n, const int _nc, const db_key_t _o, db1_res_t **_r) +{ + return db_do_query(_h, _k, _op, _v, _c, _n, _nc, _o, _r, db_mysql_val2str, + db_mysql_submit_query, db_mysql_store_result); +} + int db_mysql_query(const db1_con_t *_h, const db_key_t *_k, const db_op_t *_op, const db_val_t *_v, const db_key_t *_c, const int _n, const int _nc, const db_key_t _o, db1_res_t **_r) { - return db_do_query(_h, _k, _op, _v, _c, _n, _nc, _o, _r, db_mysql_val2str, - db_mysql_submit_query, db_mysql_store_result); + return run_thread4P5I2P2((_thread_proto4P5I2P2)&db_mysql_query_impl, + (void *)_h, (void *)_k, (void *)_op, (void *)_v, (void *)_c, _n, + _nc, (void *)_o, (void *)_r); } /**

10 months, 1 week

git:master:87ef83d2: modules: readme files regenerated - db_mysql ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 87ef83d23f68a43fc5265a81330cbeed6205f922 URL: https://github.com/kamailio/kamailio/commit/87ef83d23f68a43fc5265a81330cbee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-02-14T08:31:13+01:00 modules: readme files regenerated - db_mysql ... [skip ci] --- Modified: src/modules/db_mysql/README --- Diff: https://github.com/kamailio/kamailio/commit/87ef83d23f68a43fc5265a81330cbee… Patch: https://github.com/kamailio/kamailio/commit/87ef83d23f68a43fc5265a81330cbee… --- diff --git a/src/modules/db_mysql/README b/src/modules/db_mysql/README index 17f8795581a..4264fa1c969 100644 --- a/src/modules/db_mysql/README +++ b/src/modules/db_mysql/README @@ -32,7 +32,7 @@ Daniel-Constantin Mierla 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) 3.7. opt_ssl_mode (integer) - 3.8. opt_ssl_ca (integer) + 3.8. opt_ssl_ca (string) 4. Functions 5. Installation @@ -71,7 +71,7 @@ Chapter 1. Admin Guide 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) 3.7. opt_ssl_mode (integer) - 3.8. opt_ssl_ca (integer) + 3.8. opt_ssl_ca (string) 4. Functions 5. Installation @@ -110,7 +110,7 @@ Chapter 1. Admin Guide 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) 3.7. opt_ssl_mode (integer) - 3.8. opt_ssl_ca (integer) + 3.8. opt_ssl_ca (string) 3.1. ping_interval (integer) @@ -216,7 +216,7 @@ modparam("db_mysql", "update_affected_found", 1) modparam("db_mysql", "opt_ssl_mode", 1) ... -3.8. opt_ssl_ca (integer) +3.8. opt_ssl_ca (string) Configures the CA certs used to verify the MySQL server cert when SSL is enabled.

10 months, 1 week

git:master:c89fe41b: db_mysql: fix typos

by S-P Chan

Module: kamailio Branch: master Commit: c89fe41b1583af74cdf7e20d2357d7c90990839f URL: https://github.com/kamailio/kamailio/commit/c89fe41b1583af74cdf7e20d2357d7c… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-14T15:20:35+08:00 db_mysql: fix typos The option opt_ssl_ca is a string not integer. The comment for ea81e6cb should show the code fix as mysql_options(ptr->con, MYSQL_OPT_SSL_CA, (void *)db_mysql_opt_ssl_ca) --- Modified: src/modules/db_mysql/doc/db_mysql_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c89fe41b1583af74cdf7e20d2357d7c… Patch: https://github.com/kamailio/kamailio/commit/c89fe41b1583af74cdf7e20d2357d7c… --- diff --git a/src/modules/db_mysql/doc/db_mysql_admin.xml b/src/modules/db_mysql/doc/db_mysql_admin.xml index 7297f2d1b15..18c703838ce 100644 --- a/src/modules/db_mysql/doc/db_mysql_admin.xml +++ b/src/modules/db_mysql/doc/db_mysql_admin.xml @@ -219,7 +219,7 @@ modparam("db_mysql", "opt_ssl_mode", 1) </example> </section> <section id="db_mysql.p.opt_ssl_ca"> - <title><varname>opt_ssl_ca</varname> (integer)</title> + <title><varname>opt_ssl_ca</varname> (string)</title> <para> Configures the CA certs used to verify the MySQL server cert when SSL is enabled.

10 months, 1 week

git:master:a61bfe9f: modules: readme files regenerated - db_mysql ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: a61bfe9fb8357cedf5cb22e2698ec5d817fcfe5a URL: https://github.com/kamailio/kamailio/commit/a61bfe9fb8357cedf5cb22e2698ec5d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-02-14T08:16:19+01:00 modules: readme files regenerated - db_mysql ... [skip ci] --- Modified: src/modules/db_mysql/README --- Diff: https://github.com/kamailio/kamailio/commit/a61bfe9fb8357cedf5cb22e2698ec5d… Patch: https://github.com/kamailio/kamailio/commit/a61bfe9fb8357cedf5cb22e2698ec5d… --- diff --git a/src/modules/db_mysql/README b/src/modules/db_mysql/README index 8e135cdcbf2..17f8795581a 100644 --- a/src/modules/db_mysql/README +++ b/src/modules/db_mysql/README @@ -32,6 +32,7 @@ Daniel-Constantin Mierla 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) 3.7. opt_ssl_mode (integer) + 3.8. opt_ssl_ca (integer) 4. Functions 5. Installation @@ -46,9 +47,10 @@ Daniel-Constantin Mierla 1.5. Set insert_delayed parameter 1.6. Set update_affected_found parameter 1.7. Set opt_ssl_mode parameter - 1.8. Set a my.cnf group in db_url parameter - 1.9. Adding a kamailio group to my.cnf - 1.10. Using [client] and specific group + 1.8. Set opt_ssl_ca parameter + 1.9. Set a my.cnf group in db_url parameter + 1.10. Adding a kamailio group to my.cnf + 1.11. Using [client] and specific group Chapter 1. Admin Guide @@ -69,6 +71,7 @@ Chapter 1. Admin Guide 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) 3.7. opt_ssl_mode (integer) + 3.8. opt_ssl_ca (integer) 4. Functions 5. Installation @@ -107,6 +110,7 @@ Chapter 1. Admin Guide 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) 3.7. opt_ssl_mode (integer) + 3.8. opt_ssl_ca (integer) 3.1. ping_interval (integer) @@ -212,6 +216,21 @@ modparam("db_mysql", "update_affected_found", 1) modparam("db_mysql", "opt_ssl_mode", 1) ... +3.8. opt_ssl_ca (integer) + + Configures the CA certs used to verify the MySQL server cert when SSL + is enabled. + + Required when opt_ssl_mode = 4 or 5 and db_mysql is built with + libmysqlclient. + + Default value is NULL (NULL - not configured). + + Example 1.8. Set opt_ssl_ca parameter +... +modparam("db_mysql", "opt_ssl_ca", "/etc/ssl/certs/mysql-ca.pem") +... + 4. Functions No function exported to be used from configuration file. @@ -238,12 +257,12 @@ modparam("db_mysql", "opt_ssl_mode", 1) * mysql://user:pass@[group]/db * mysql://[group]/db - Example 1.8. Set a my.cnf group in db_url parameter + Example 1.9. Set a my.cnf group in db_url parameter ... modparam("usrloc", "db_url", "mysql://[kamailio]/kamailio) ... - Example 1.9. Adding a kamailio group to my.cnf + Example 1.10. Adding a kamailio group to my.cnf ... [kamailio] socket = /path/to/mysql.sock @@ -257,7 +276,7 @@ default-character-set = utf8 both your specific group and the client group, then the value is taken from the last one. - Example 1.10. Using [client] and specific group + Example 1.11. Using [client] and specific group ... [client] socket = /run/mysql/mysqld.sock

10 months, 1 week

git:master:eafd93f0: db_mysql: update docs for opt_ssl_ca

by S-P Chan

Module: kamailio Branch: master Commit: eafd93f0576504ea03fe6b5e3898506072218cef URL: https://github.com/kamailio/kamailio/commit/eafd93f0576504ea03fe6b5e3898506… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-14T15:09:24+08:00 db_mysql: update docs for opt_ssl_ca --- Modified: src/modules/db_mysql/doc/db_mysql_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/eafd93f0576504ea03fe6b5e3898506… Patch: https://github.com/kamailio/kamailio/commit/eafd93f0576504ea03fe6b5e3898506… --- diff --git a/src/modules/db_mysql/doc/db_mysql_admin.xml b/src/modules/db_mysql/doc/db_mysql_admin.xml index f1ff53df0ed..7297f2d1b15 100644 --- a/src/modules/db_mysql/doc/db_mysql_admin.xml +++ b/src/modules/db_mysql/doc/db_mysql_admin.xml @@ -215,6 +215,30 @@ modparam("db_mysql", "update_affected_found", 1) ... modparam("db_mysql", "opt_ssl_mode", 1) ... +</programlisting> + </example> + </section> + <section id="db_mysql.p.opt_ssl_ca"> + <title><varname>opt_ssl_ca</varname> (integer)</title> + <para> + Configures the CA certs used to verify the MySQL server cert when + SSL is enabled. + </para> + <para> + Required when opt_ssl_mode = 4 or 5 and db_mysql is built + with libmysqlclient. + </para> + <para> + <emphasis> + Default value is NULL (NULL - not configured). + </emphasis> + </para> + <example> + <title>Set <varname>opt_ssl_ca</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_mysql", "opt_ssl_ca", "/etc/ssl/certs/mysql-ca.pem") +... </programlisting> </example> </section>

10 months, 1 week

← Newer
1
...
10
11
12
13
14
15
16
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2024