- sr-dev - kamailio.org

Latest point releases seem to break early dialog UPDATEs from B-side when using topos (again)
by George Diamantopoulos 16 Feb '24

16 Feb '24

Hello all, I've noticed that there seems to be a regression with the topos module, more specifically the redis flavour, but I'm assuming the storage backend shouldn't make a difference. I have confirmed this affects both 5.6.5 and 5.7-nightly, so I'm assuming some backported commit is to blame. Kamailio 5.6.4 used previously, to the best of my memory, was not affected. Early dialog UPDATEs sent from the callee seem to be somehow malformed, since the 200 OK the UAS produces goes directly to the UAC despite having executed record_route() for the original INVITE. I can't imagine how this is possible, I thought responses always honour the Via header and record route shouldn't play a role in this case, right? Simply turning topos off restores the intended behaviour, however, so I can't help but think this is somehow related. Here's two call flows demonstrating the behaviour: * Topos on, 200 OK to UPDATE missing: https://pastebin.com/raw/J0zQeM5g * Topos off, 200 OK to UPDATE routed correctly: https://pastebin.com/raw/49yErezb I was wondering if anyone is aware of any commits that might be responsible for this. Additionally, is there an archive of debian packages with previous point releases so that I can confirm this regression with the latest versions? Thank you! Best regards, George

2 3

[kamailio/kamailio] file_out: Fix a bug on fixup function, update docs, logging information. (PR #3756)
by Xenofon Karamanos 16 Feb '24

16 Feb '24

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes small bugs, and improves docs. #### Main bug fix: - Fixup now should be able to handle the string from `.cfg` with multiple PVs, strings, and more. - Add fixup_free functions #### Smaller fixes: - `base_folder` should not contain a trailing slash. Trailing slash is allowed, but resulting paths can contain `//log_file.extenion`, which in more OS is fine and equal to `/`. - Add initial Readme and fix some docs. - Switch to `str` type in internal types for better string handling. - Free message when done You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3756 -- Commit Summary -- * file_out: Change default base folder format * file_out: Add initial Readme and improve docs * file_out: Switch to str type for string handling * file_out: Free message when done * file_out: Improve logging * file_out: Fix fixup functions to handle all string. -- File Changes -- A src/modules/file_out/README (171) M src/modules/file_out/doc/file_out_admin.xml (4) M src/modules/file_out/file_out.c (52) M src/modules/file_out/types.c (19) M src/modules/file_out/types.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3756.patch https://github.com/kamailio/kamailio/pull/3756.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3756 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3756(a)github.com>

1 1

git:master:d2459f4a: file_out: Fix fixup functions to handle all string.
by Xenofon Karamanos 16 Feb '24

16 Feb '24

Module: kamailio Branch: master Commit: d2459f4a9978e6b42ba99212b77dd856005df0d7 URL: https://github.com/kamailio/kamailio/commit/d2459f4a9978e6b42ba99212b77dd85… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-02-16T12:20:44+02:00 file_out: Fix fixup functions to handle all string. --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/d2459f4a9978e6b42ba99212b77dd85… Patch: https://github.com/kamailio/kamailio/commit/d2459f4a9978e6b42ba99212b77dd85… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index c985c04935a..fde63db5a0b 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -54,6 +54,7 @@ static int fo_close_file(const int index); static int fo_check_interval(int index); static int fo_fixup_int_pvar(void **param, int param_no); static int fo_fixup_str_index(void **param, int param_no); +static int fo_fixup_free_int_pvar(void **param, int param_no); static int fo_count_assigned_files(); static void fo_log_writer_process(int rank); static int fo_add_filename(modparam_t type, void *val); @@ -74,8 +75,9 @@ time_t fo_stored_timestamp[FO_MAX_FILES] = {0}; time_t fo_current_timestamp = 0; FILE *fo_file_output[FO_MAX_FILES]; -static cmd_export_t cmds[] = {{"file_out", (cmd_function)fo_write_to_file, 2, - fo_fixup_int_pvar, 0, ANY_ROUTE}, +static cmd_export_t cmds[] = { + {"file_out", (cmd_function)fo_write_to_file, 2, fo_fixup_int_pvar, + fo_fixup_free_int_pvar, ANY_ROUTE}, {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = { @@ -266,11 +268,22 @@ static int fo_fixup_int_pvar(void **param, int param_no) if(param_no == 1) { return fo_fixup_str_index(param, param_no); } else if(param_no == 2) { - return fixup_var_pve_str_12(param, param_no); + return fixup_spve_all(param, param_no); } return 0; } +static int fo_fixup_free_int_pvar(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_igp_null(param, param_no); + } else if(param_no == 2) { + return fixup_free_spve_all(param, param_no); + } + + return 0; +} + static int fo_add_filename(modparam_t type, void *val) { str in;

1 0

git:master:d3fbee58: file_out: Improve logging
by Xenofon Karamanos 16 Feb '24

16 Feb '24

Module: kamailio Branch: master Commit: d3fbee58cb5505130ea73cfa0143adfd470d2c27 URL: https://github.com/kamailio/kamailio/commit/d3fbee58cb5505130ea73cfa0143adf… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-02-16T12:20:44+02:00 file_out: Improve logging --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/d3fbee58cb5505130ea73cfa0143adf… Patch: https://github.com/kamailio/kamailio/commit/d3fbee58cb5505130ea73cfa0143adf… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index d6fdd51ce9d..c985c04935a 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -195,7 +195,7 @@ static void fo_log_writer_process(int rank) } FILE *out = fo_get_file_handle(log_message.dest_file); if(out == NULL) { - LM_ERR("out is NULL\n"); + LM_ERR("file handle is NULL\n"); return; } @@ -340,7 +340,7 @@ static int fo_parse_filename_params(str in) token = strtok_r(NULL, ";", &saveptr); } if(name != NULL) { - LM_ERR("name = %s\n", name); + LM_DBG("name = %s\n", name); fo_base_filename[*fo_number_of_files] = name; } else { LM_ERR("name is required. Make sure you provided name= in modparam " @@ -414,7 +414,6 @@ static int fo_check_interval(int index) // Calculate the difference between the current timestamp and the stored timestamp int difference = difftime(fo_current_timestamp, fo_stored_timestamp[index]); if(difference >= fo_interval_seconds[index]) { - LM_ERR("interval has passed\n"); return 1; } return 0; @@ -480,7 +479,7 @@ static int fo_write_to_file(sip_msg_t *msg, char *index, char *log_message) 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); + LM_ERR("Failed to get string from param 1: %d\n", result); return -1; }

1 0

git:master:6ac4148d: file_out: Free message when done
by Xenofon Karamanos 16 Feb '24

16 Feb '24

Module: kamailio Branch: master Commit: 6ac4148d3d7e6ea772438b7c5b42807175e5888a URL: https://github.com/kamailio/kamailio/commit/6ac4148d3d7e6ea772438b7c5b42807… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-02-16T12:20:44+02:00 file_out: Free message when done --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/6ac4148d3d7e6ea772438b7c5b42807… Patch: https://github.com/kamailio/kamailio/commit/6ac4148d3d7e6ea772438b7c5b42807… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 5815d61cb63..d6fdd51ce9d 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -207,6 +207,14 @@ static void fo_log_writer_process(int rank) if(fflush(out) < 0) { LM_ERR("Failed to flush file with err {%s}\n", strerror(errno)); } + + if(log_message.message != NULL) { + if(log_message.message->s != NULL) { + shm_free(log_message.message->s); + } + shm_free(log_message.message); + log_message.message = NULL; + } } }

1 0

git:master:e4163d28: file_out: Switch to str type for string handling
by Xenofon Karamanos 16 Feb '24

16 Feb '24

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;

1 0

git:master:e15a15cf: file_out: Add initial Readme and improve docs
by Xenofon Karamanos 16 Feb '24

16 Feb '24

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…

1 0

git:master:107d8c9a: file_out: Change default base folder format
by Xenofon Karamanos 16 Feb '24

16 Feb '24

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};

1 0

[kamailio/kamailio] Undocumented TCP connection limit introduced in 5.7.3 must be configurable (Issue #3755)
by Sebastian Damm 15 Feb '24

15 Feb '24

### 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>

2 3

Missing values in xhttp_prom output
by Christian Berger 15 Feb '24

15 Feb '24

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

2 2

git:master:1e423644: db_mysql: libssl thread guard for db_mysql_query (and libmysqlclient)
by S-P Chan 14 Feb '24

14 Feb '24

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); } /**

1 0

git:master:87ef83d2: modules: readme files regenerated - db_mysql ... [skip ci]
by Kamailio Dev 14 Feb '24

14 Feb '24

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.

1 0

git:master:c89fe41b: db_mysql: fix typos
by S-P Chan 14 Feb '24

14 Feb '24

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.

1 0

git:master:a61bfe9f: modules: readme files regenerated - db_mysql ... [skip ci]
by Kamailio Dev 14 Feb '24

14 Feb '24

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

1 0

git:master:eafd93f0: db_mysql: update docs for opt_ssl_ca
by S-P Chan 14 Feb '24

14 Feb '24

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>

1 0

git:master:ea81e6cb: db_mysql: new module param opt_ssl_ca to configure CA certs
by S-P Chan 14 Feb '24

14 Feb '24

Module: kamailio Branch: master Commit: ea81e6cb8b2b2d896de7a07ce191876f9f182673 URL: https://github.com/kamailio/kamailio/commit/ea81e6cb8b2b2d896de7a07ce191876… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-14T15:08:56+08:00 db_mysql: new module param opt_ssl_ca to configure CA certs ERROR: db_mysql [km_my_con.c:200]: db_mysql_new_connection(): driver error: SSL connection error: CA certificate is required if ssl-mode is VERIFY_CA or VERIFY_IDENTITY When opt_ssl_mode = 4 | 5 libmysqclient requires that the trusted CAs be configured. Fixed with: mysql_options(ptr->con, MYSQL_OPT_SSL_CA, (void *)db_mysql_opt_ssl_mode) Note: libmariadb3 doesn't require this setting and uses the system trust store. --- Modified: src/modules/db_mysql/db_mysql.c Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/ea81e6cb8b2b2d896de7a07ce191876… Patch: https://github.com/kamailio/kamailio/commit/ea81e6cb8b2b2d896de7a07ce191876… --- diff --git a/src/modules/db_mysql/db_mysql.c b/src/modules/db_mysql/db_mysql.c index 1a698329bac..9a7aa8673b5 100644 --- a/src/modules/db_mysql/db_mysql.c +++ b/src/modules/db_mysql/db_mysql.c @@ -47,6 +47,7 @@ unsigned int my_server_timezone = unsigned long my_client_ver = 0; int db_mysql_unsigned_type = 0; int db_mysql_opt_ssl_mode = 0; +char *db_mysql_opt_ssl_ca = NULL; struct mysql_counters_h mysql_cnts_h; counter_def_t mysql_cnt_defs[] = { @@ -100,6 +101,7 @@ static param_export_t params[] = { {"insert_delayed", INT_PARAM, &db_mysql_insert_all_delayed}, {"update_affected_found", INT_PARAM, &db_mysql_update_affected_found}, {"unsigned_type", PARAM_INT, &db_mysql_unsigned_type}, + {"opt_ssl_ca", PARAM_STRING, &db_mysql_opt_ssl_ca}, {"opt_ssl_mode", PARAM_INT, &db_mysql_opt_ssl_mode}, {0, 0, 0}}; diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index b4c4dca33b0..226d724f1ae 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -41,6 +41,7 @@ #include "db_mysql.h" extern int db_mysql_opt_ssl_mode; +extern char *db_mysql_opt_ssl_ca; /*! \brief * Create a new connection structure, @@ -167,6 +168,9 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) } #endif /* MYSQL_VERSION_ID */ #endif /* MARIADB_BASE_VERSION */ + if(db_mysql_opt_ssl_ca) + mysql_options( + ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca); #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */

1 0

git:5.7:a0dfb8cb: tls: raise logging level of early messages in mod_register
by S-P Chan 13 Feb '24

13 Feb '24

Module: kamailio Branch: 5.7 Commit: a0dfb8cbdf4282040351e9dc014d9ef13e0e77fd URL: https://github.com/kamailio/kamailio/commit/a0dfb8cbdf4282040351e9dc014d9ef… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-13T19:11:20+08:00 tls: raise logging level of early messages in mod_register --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a0dfb8cbdf4282040351e9dc014d9ef… Patch: https://github.com/kamailio/kamailio/commit/a0dfb8cbdf4282040351e9dc014d9ef… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 905ca6f2411..0d8ea3df4c5 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -689,7 +689,7 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) #if OPENSSL_VERSION_NUMBER >= 0x10100000L \ && OPENSSL_VERSION_NUMBER < 0x030000000L if(ksr_tls_threads_mode == 0) { - LM_DBG("setting cryptorand random engine\n"); + LM_WARN("OpenSSL 1.1.1 setting cryptorand random engine\n"); RAND_set_rand_method(RAND_ksr_cryptorand_method()); } #endif

1 0

Fwd: Reject TCP SYN
by David Villasmil 13 Feb '24

13 Feb '24

Hello all, Following up on this, I made a patch (attached), could you please review and apply if it looks ok? The patch creates a new core cfg variable which, if set, will reject any incoming NEW tcp connection attempt, so we can use this to gracefully drain kamailio. Thanks & Regards, David Villasmil email: david.villasmil.work(a)gmail.com phone: +34669448337 Forwarded Conversation Subject: Reject TCP SYN ------------------------ From: David Villasmil <david.villasmil.work(a)gmail.com> Date: Thu, Feb 8, 2024 at 2:27 PM To: Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> Hello all, Is there any way of actually rejecting (RST) NEW tcp connection attempts, while allowing the ongoing ones to finish naturally? I’m thinking maybe we can add this feature? Regards, David Villasmil email: david.villasmil.work(a)gmail.com phone: +34669448337 ---------- From: Henning Westerholt <hw(a)gilawa.com> Date: Fri, Feb 9, 2024 at 2:08 PM To: Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> Cc: David Villasmil <david.villasmil.work(a)gmail.com> Hello, what about e.g. just using something like iptables, nftables etc..? iptables -A INPUT -p tcp --syn --destination-port <port> -j REJECT --reject-with icmp-host-prohibited Cheers, Henning ---------- From: David Villasmil <david.villasmil.work(a)gmail.com> Date: Fri, Feb 9, 2024 at 2:42 PM To: Henning Westerholt <hw(a)gilawa.com> Cc: Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> Hey, Henning, yeah I thought about that, but thought that maybe there was a better way to do it via Kamailio Thanks! Regards, David Villasmil email: david.villasmil.work(a)gmail.com phone: +34669448337

2 1

git:5.7:5d7d7ea5: tls: add logging
by S-P Chan 13 Feb '24

13 Feb '24

Module: kamailio Branch: 5.7 Commit: 5d7d7ea54c908cae333ed3cafd4a2cc93cacd4db URL: https://github.com/kamailio/kamailio/commit/5d7d7ea54c908cae333ed3cafd4a2cc… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-13T17:23:31+08:00 tls: add logging --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5d7d7ea54c908cae333ed3cafd4a2cc… Patch: https://github.com/kamailio/kamailio/commit/5d7d7ea54c908cae333ed3cafd4a2cc… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 5d3982b64d9..905ca6f2411 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -458,6 +458,9 @@ static int mod_child(int rank) #else if(rank == PROC_INIT) { #endif + LM_DBG("Loading SSL_CTX in process_no=%d rank=%d " + "ksr_tls_threads_mode=%d\n", + process_no, rank, ksr_tls_threads_mode); if(cfg_get(tls, tls_cfg, config_file).s) { if(tls_fix_domains_cfg( *tls_domains_cfg, &srv_defaults, &cli_defaults)

1 0

git:5.7:eb7aa576: tls: restore some function calls in non-threaded mode
by S-P Chan 13 Feb '24

13 Feb '24

Module: kamailio Branch: 5.7 Commit: eb7aa57676f48f16cc66a16c511ed45ac9c8f62e URL: https://github.com/kamailio/kamailio/commit/eb7aa57676f48f16cc66a16c511ed45… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-13T11:08:29+08:00 tls: restore some function calls in non-threaded mode In the case that tls_threads_mode = 0 we restore the earlier behaviour of 5.7.3. - OpenSSL 1.1.1: restore early call to RAND_set_rand_method - OpenSSL 3.x: restore enable locking on EVP_RAND_CTX --- Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/eb7aa57676f48f16cc66a16c511ed45… Patch: https://github.com/kamailio/kamailio/commit/eb7aa57676f48f16cc66a16c511ed45…

1 0

[kamailio/kamailio] registrar: Consider changing default setting for case matching of username (Issue #3719)
by Morten Tryfoss 12 Feb '24

12 Feb '24

### Description I've recently spent some time debugging a case with JsSIP and usernames in form of a generated string which can be both upper and lower case letters plus digits. On BYE from callee to JsSIP, it responded with a "404" and "Request-URI does not point to us" in the console while debugging. JsSIP is using the Contact returned in the 200 OK to REGISTER (which is transformed to all lower case) for new outgoing INVITE. It does not match this against the one used in BYE correctly, and return "404". I see there is a setting in the registrar about this: ``` 3.11. case_sensitive (integer) If set to 1 then AOR comparison and also storing will be case sensitive, if set to 0 then AOR comparison and storing will be case insensitive. This is recommended. This parameter can be modified via Kamailio config framework. Default value is 0. ``` Since the RFC states that username should be handle case-sensitive, maybe it would be smart to change this default? ``` Comparison of the userinfo of SIP and SIPS URIs is case- sensitive. This includes userinfo containing passwords or formatted as telephone-subscribers. ... The URIs within each of the following sets are not equivalent: SIP:ALICE@AtLanTa.CoM;Transport=udp (different usernames) sip:alice@AtLanTa.CoM;Transport=UDP ``` #### Reproduction Make a registration with a username containing both upper and lower case characters. It will be stored in all lower case. ### Possible Solutions Change default value. Regardless of the outcome on this case - at least now there is a note about it here too. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3719 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3719(a)github.com>

2 4

git:master:c4e4b266: modules: readme files regenerated - influxdbc ... [skip ci]
by Kamailio Dev 12 Feb '24

12 Feb '24

Module: kamailio Branch: master Commit: c4e4b266ad6852bacdb4513e9cc79166ac661f23 URL: https://github.com/kamailio/kamailio/commit/c4e4b266ad6852bacdb4513e9cc7916… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-02-12T10:17:15+01:00 modules: readme files regenerated - influxdbc ... [skip ci] --- Modified: src/modules/influxdbc/README --- Diff: https://github.com/kamailio/kamailio/commit/c4e4b266ad6852bacdb4513e9cc7916… Patch: https://github.com/kamailio/kamailio/commit/c4e4b266ad6852bacdb4513e9cc7916… --- diff --git a/src/modules/influxdbc/README b/src/modules/influxdbc/README index dfd18b57866..e5833a21d20 100644 --- a/src/modules/influxdbc/README +++ b/src/modules/influxdbc/README @@ -33,7 +33,10 @@ Daniel-Constantin Mierla 4.1. influxdbc_measure(name) 4.2. influxdbc_measureend() - 4.3. influxdbc_long(name, value) + 4.3. influxdbc_sub(name) + 4.4. influxdbc_subend() + 4.5. influxdbc_push() + 4.6. influxdbc_long(name, value) List of Examples @@ -42,7 +45,10 @@ Daniel-Constantin Mierla 1.3. Set database parameter 1.4. influxdbc_measure() usage 1.5. influxdbc_measureend() usage - 1.6. influxdbc_long() usage + 1.6. influxdbc_sub() usage + 1.7. influxdbc_subend() usage + 1.8. influxdbc_push() usage + 1.9. influxdbc_long() usage Chapter 1. Admin Guide @@ -64,7 +70,10 @@ Chapter 1. Admin Guide 4.1. influxdbc_measure(name) 4.2. influxdbc_measureend() - 4.3. influxdbc_long(name, value) + 4.3. influxdbc_sub(name) + 4.4. influxdbc_subend() + 4.5. influxdbc_push() + 4.6. influxdbc_long(name, value) 1. Overview @@ -129,7 +138,10 @@ modparam("influxdbc", "database", "stats") 4.1. influxdbc_measure(name) 4.2. influxdbc_measureend() - 4.3. influxdbc_long(name, value) + 4.3. influxdbc_sub(name) + 4.4. influxdbc_subend() + 4.5. influxdbc_push() + 4.6. influxdbc_long(name, value) 4.1. influxdbc_measure(name) @@ -161,14 +173,59 @@ request_route { } ... -4.3. influxdbc_long(name, value) +4.3. influxdbc_sub(name) + + Start a measure subgroup with the given name. + + This function can be used from ANY_ROUTE. + + Example 1.6. influxdbc_sub() usage +... +request_route { + ... + influxdbc_sub("grp1"); + ... +} +... + +4.4. influxdbc_subend() + + End the current measure subgroup. + + This function can be used from ANY_ROUTE. + + Example 1.7. influxdbc_subend() usage +... +request_route { + ... + influxdbc_subend(); + ... +} +... + +4.5. influxdbc_push() + + Push accumulated values to the server. + + This function can be used from ANY_ROUTE. + + Example 1.8. influxdbc_push() usage +... +request_route { + ... + influxdbc_push(); + ... +} +... + +4.6. influxdbc_long(name, value) Save the pair with provided name and value. Both parameters can have variables. This function can be used from ANY_ROUTE. - Example 1.6. influxdbc_long() usage + Example 1.9. influxdbc_long() usage ... request_route { ...

1 0

git:master:7e1f521f: influxdbc: docs for a couple of existing functions
by Daniel-Constantin Mierla 12 Feb '24

12 Feb '24

Module: kamailio Branch: master Commit: 7e1f521f2086b50b3ad73bc19ea98deb18686e82 URL: https://github.com/kamailio/kamailio/commit/7e1f521f2086b50b3ad73bc19ea98de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-12T08:17:50+01:00 influxdbc: docs for a couple of existing functions --- Modified: src/modules/influxdbc/doc/influxdbc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7e1f521f2086b50b3ad73bc19ea98de… Patch: https://github.com/kamailio/kamailio/commit/7e1f521f2086b50b3ad73bc19ea98de… --- diff --git a/src/modules/influxdbc/doc/influxdbc_admin.xml b/src/modules/influxdbc/doc/influxdbc_admin.xml index a02af97e048..e6560bc0d69 100644 --- a/src/modules/influxdbc/doc/influxdbc_admin.xml +++ b/src/modules/influxdbc/doc/influxdbc_admin.xml @@ -156,6 +156,75 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="influxdb.f.influxdbc_sub"> + <title> + <function moreinfo="none">influxdbc_sub(name)</function> + </title> + <para> + Start a measure subgroup with the given name. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>influxdbc_sub()</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + influxdbc_sub("grp1"); + ... +} +... +</programlisting> + </example> + </section> + <section id="influxdb.f.influxdbc_subend"> + <title> + <function moreinfo="none">influxdbc_subend()</function> + </title> + <para> + End the current measure subgroup. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>influxdbc_subend()</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + influxdbc_subend(); + ... +} +... +</programlisting> + </example> + </section> + <section id="influxdb.f.influxdbc_push"> + <title> + <function moreinfo="none">influxdbc_push()</function> + </title> + <para> + Push accumulated values to the server. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>influxdbc_push()</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + influxdbc_push(); + ... +} +... </programlisting> </example> </section>

1 0

git:5.7:253f13f1: tls: restore default to bypass thread guards
by Victor Seva 12 Feb '24

12 Feb '24

Module: kamailio Branch: 5.7 Commit: 253f13f18ec6853764d950d58f467c331d03425a URL: https://github.com/kamailio/kamailio/commit/253f13f18ec6853764d950d58f467c3… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-12T07:52:26+01:00 tls: restore default to bypass thread guards - restore <= 5.7.3 behaviour - require user to opt-in to libssl thread-guards with tls_threads_mode = 1|2 --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/253f13f18ec6853764d950d58f467c3… Patch: https://github.com/kamailio/kamailio/commit/253f13f18ec6853764d950d58f467c3… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index beaf1b7b70b..3359aaffdcc 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -451,9 +451,9 @@ static int mod_child(int rank) #if OPENSSL_VERSION_NUMBER >= 0x010101000L /* * OpenSSL 3.x/1.1.1: create shared SSL_CTX* in worker to avoid init of - * libssl in rank 0(thread#1) + * libssl in rank 0(thread#1). Requires tls_threads_mode = 1 config. */ - if(rank == PROC_SIPINIT) { + if((rank == PROC_SIPINIT && ksr_tls_threads_mode) || (rank == PROC_INIT && !ksr_tls_threads_mode)) { #else if(rank == PROC_INIT) { #endif

1 0

git:5.7:2f0cca81: Sample etc/kamailio.cfg: global var tls_threads_mode
by Victor Seva 12 Feb '24

12 Feb '24

Module: kamailio Branch: 5.7 Commit: 2f0cca81bfc47783098e4c869b038229cd3e4ed0 URL: https://github.com/kamailio/kamailio/commit/2f0cca81bfc47783098e4c869b03822… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-12T07:52:26+01:00 Sample etc/kamailio.cfg: global var tls_threads_mode - load tls first if used - global var tls_threads_mode --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/2f0cca81bfc47783098e4c869b03822… Patch: https://github.com/kamailio/kamailio/commit/2f0cca81bfc47783098e4c869b03822… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg old mode 100644 new mode 100755 index fe7b111a012..a95a652b935 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -220,6 +220,13 @@ enable_tls=yes /* upper limit for TLS connections */ tls_max_connections=2048 + +/* For OpenSSL 3 integration + * functions calling libssl3 can be invoked in a transient thread + * 0: disable threaded calls + * 1: use threads for process#0 only + * 2: use threads for all processes */ +tls_threads_mode=1 #!endif /* set it to yes to enable sctp and load sctp.so module */ @@ -257,6 +264,12 @@ voicemail.srv_port = "5060" desc "VoiceMail Port" /* set paths to location of modules */ # mpath="/usr/local/lib/kamailio/modules/" +# when using TLS with OpenSSL it is recommended to load this module +# first so that OpenSSL is initialized correctly +#!ifdef WITH_TLS +loadmodule "tls.so" +#!endif + #!ifdef WITH_MYSQL loadmodule "db_mysql.so" #!endif @@ -319,10 +332,6 @@ loadmodule "rtpproxy.so" #!endif #!endif -#!ifdef WITH_TLS -loadmodule "tls.so" -#!endif - #!ifdef WITH_HTABLE loadmodule "htable.so" #!endif

1 0

git:5.7:bf40176e: core/rthreads.h: use global ksr_tls_threads_mode to constrain thread
by Victor Seva 12 Feb '24

12 Feb '24

Module: kamailio Branch: 5.7 Commit: bf40176e34e869b567a0f36eab28739508797080 URL: https://github.com/kamailio/kamailio/commit/bf40176e34e869b567a0f36eab28739… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-12T07:52:26+01:00 core/rthreads.h: use global ksr_tls_threads_mode to constrain thread wrapping - 0: run wrapped function directly - 1: run wrapped function in thread for process#0 else run directly - 2: always run wrapped function in thread --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/bf40176e34e869b567a0f36eab28739… Patch: https://github.com/kamailio/kamailio/commit/bf40176e34e869b567a0f36eab28739… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index fa60ccef071..e96f45c9395 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -27,6 +27,7 @@ */ #include <pthread.h> +#include "./globals.h" /* * prototype: void *fn(void *arg) { ... } */ @@ -39,9 +40,11 @@ static void *run_threadP(_thread_proto fn, void *arg) pthread_t tid; void *ret; - if(likely(process_no)) { + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg); } + pthread_create(&tid, NULL, fn, arg); pthread_join(tid, &ret); @@ -73,7 +76,9 @@ static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) #ifdef USE_TLS pthread_t tid; void *ret; - if(likely(process_no)) { + + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2); } @@ -84,7 +89,7 @@ static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) return ret; #else return fn(arg1, arg2); -#endif /* USE_TLS */ +#endif } #endif @@ -107,18 +112,19 @@ static void run_threadV(_thread_protoV fn) { #ifdef USE_TLS pthread_t tid; - if(likely(process_no)) { + + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { fn(); return; } - pthread_create(&tid, NULL, (_thread_proto)run_thread_wrapV, &(struct _thread_argsV){fn}); pthread_join(tid, NULL); #else fn(); -#endif /* USE_TLS */ +#endif } #endif @@ -146,10 +152,10 @@ static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2) pthread_t tid; int ret; - if(likely(process_no)) { + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2); } - pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4PP, &(struct _thread_args4PP){fn, arg1, arg2, &ret}); pthread_join(tid, NULL); @@ -182,17 +188,17 @@ static void run_thread0P(_thread_proto0P fn, void *arg1) #ifdef USE_TLS pthread_t tid; - if(likely(process_no)) { + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { fn(arg1); return; } - pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap0P, &(struct _thread_args0P){fn, arg1}); pthread_join(tid, NULL); #else - fn(arg1); -#endif /* USE_TLS */ + fn(arg1) +#endif } #endif @@ -234,7 +240,8 @@ static int run_thread4P5I2P2(_thread_proto4P5I2P2 fn, void *arg1, void *arg2, pthread_t tid; int ret; - if(likely(process_no)) { + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); } pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4P5I2P2,

1 0

git:5.7:3697d763: core: added tls_threads_mode global parameter
by Victor Seva 12 Feb '24

12 Feb '24

Module: kamailio Branch: 5.7 Commit: 3697d763e340b7e88532a8b1920b0088c08fbc72 URL: https://github.com/kamailio/kamailio/commit/3697d763e340b7e88532a8b1920b008… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-12T07:52:26+01:00 core: added tls_threads_mode global parameter - control how to execute functions that may be using libssl3 behind --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/3697d763e340b7e88532a8b1920b008… Patch: https://github.com/kamailio/kamailio/commit/3697d763e340b7e88532a8b1920b008… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 82278d5447a..d342aa5143d 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -439,6 +439,7 @@ TCP_WAIT_DATA "tcp_wait_data" TCP_SCRIPT_MODE "tcp_script_mode" DISABLE_TLS "disable_tls"|"tls_disable" ENABLE_TLS "enable_tls"|"tls_enable" +TLS_THREADS_MODE "tls_threads_mode" TLSLOG "tlslog"|"tls_log" TLS_PORT_NO "tls_port_no" TLS_METHOD "tls_method" @@ -953,6 +954,7 @@ IMPORTFILE "import_file" <INITIAL>{TCP_SCRIPT_MODE} { count(); yylval.strval=yytext; return TCP_SCRIPT_MODE; } <INITIAL>{DISABLE_TLS} { count(); yylval.strval=yytext; return DISABLE_TLS; } <INITIAL>{ENABLE_TLS} { count(); yylval.strval=yytext; return ENABLE_TLS; } +<INITIAL>{TLS_THREADS_MODE} { count(); yylval.strval=yytext; return TLS_THREADS_MODE; } <INITIAL>{TLSLOG} { count(); yylval.strval=yytext; return TLS_PORT_NO; } <INITIAL>{TLS_PORT_NO} { count(); yylval.strval=yytext; return TLS_PORT_NO; } <INITIAL>{TLS_METHOD} { count(); yylval.strval=yytext; return TLS_METHOD; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 1f2ad7fb3fa..412fe5dece4 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -469,6 +469,7 @@ extern char *default_routename; %token TCP_SCRIPT_MODE %token DISABLE_TLS %token ENABLE_TLS +%token TLS_THREADS_MODE %token TLSLOG %token TLS_PORT_NO %token TLS_METHOD @@ -1440,6 +1441,14 @@ assign_stm: #endif } | ENABLE_TLS EQUAL error { yyerror("boolean value expected"); } + | TLS_THREADS_MODE EQUAL NUMBER { + #ifdef USE_TLS + ksr_tls_threads_mode = $3; + #else + warn("tls support not compiled in"); + #endif + } + | TLS_THREADS_MODE EQUAL error { yyerror("int value expected"); } | TLSLOG EQUAL NUMBER { #ifdef CORE_TLS tls_log=$3; diff --git a/src/core/globals.h b/src/core/globals.h index 207205c9957..0487a3114eb 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -108,6 +108,7 @@ extern int ksr_tcp_script_mode; #ifdef USE_TLS extern int tls_disable; extern unsigned short tls_port_no; +extern int ksr_tls_threads_mode; #endif #ifdef USE_SCTP extern int sctp_disable; diff --git a/src/main.c b/src/main.c index 8e34285fde2..f7cb643ea34 100644 --- a/src/main.c +++ b/src/main.c @@ -326,8 +326,9 @@ int tcp_disable = 0; /* 1 if tcp is disabled */ int tls_disable = 0; /* tls enabled by default */ #else int tls_disable = 1; /* tls disabled by default */ -#endif /* CORE_TLS */ -#endif /* USE_TLS */ +#endif /* CORE_TLS */ +int ksr_tls_threads_mode = 0; /* threads execution mode for tls with libssl */ +#endif /* USE_TLS */ #ifdef USE_SCTP int sctp_children_no = 0; int sctp_disable = 2; /* 1 if sctp is disabled, 2 if auto mode, 0 enabled */

1 0

[kamailio/kamailio] Restore libssl default behaviour on stable; opt-in to libssl thread-guards required (PR #3754)
by space88man 12 Feb '24

12 Feb '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:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This PR restores the default behaviour of stable branch and makes libssl thread-guard work opt-in. - user's config from 5.7.3 will run unchanged - backport tls_threads_mode = 0|1|2 from dev; user must explicitly opt-in to libssl changes Scenario 1: user does not change 5.7.3 configuration; then libssl thread-guards will be disabled and Kamailio will run as before Scenario 2: user must opt-in to libssl thread-guards; `tls_threads_mode` has been backported from dev and user must use `tls_threads_mode = 1` in the configuration. The default value is `tls_threads_mode = 0` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3754 -- Commit Summary -- * core: added tls_threads_mode global parameter * core/rthreads.h: use global ksr_tls_threads_mode to constrain thread * Sample etc/kamailio.cfg: global var tls_threads_mode * tls: restore default to bypass thread guards -- File Changes -- M etc/kamailio.cfg (17) M src/core/cfg.lex (2) M src/core/cfg.y (9) M src/core/globals.h (1) M src/core/rthreads.h (33) M src/main.c (5) M src/modules/tls/tls_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3754.patch https://github.com/kamailio/kamailio/pull/3754.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3754 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3754(a)github.com>

2 2

[kamailio/kamailio] new ims dialogue is not created (Issue #3676)
by deepak-git-account 11 Feb '24

11 Feb '24

### Description While doing a call, new dialogue is not created in PCSCF. RX feature is on. As per my understanding, ims_dialog has one call back function and it invokes dlg_onreq() function and a new dialgue can be created (function is dlg_new_dialog). And in the traces, that is not happening.  ### Troubleshooting I have added additional traces for troubleshooting, and I can see that in case of PCSCF, new dialog is not created. And later on Rx feature is not working as expected. #### Reproduction Everytime  Need to do Two UEs VoLTE registration and then a call from UE1 to UE2 #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ![image](https://github.com/kamailio/kamailio/assets/64190746/9e41f486-61ad-4974-bd1c-b57a1602c57f) ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` root@openims-node-focal:/usr/local/etc/kamailio# kamailio -v version: kamailio 5.7.2 (x86_64/linux) 02958e 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: 02958e compiled on 18:07:29 Oct 17 2023 with gcc 9.4.0 * **Operating System**: ubuntu uname -a Linux openims-node-focal 5.4.0-166-generic #183-Ubuntu SMP Mon Oct 2 11:28:33 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3676 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3676(a)github.com>

2 2

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,jammy #2597
by kamailio＠sipwise.com 11 Feb '24

11 Feb '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> Changes: ------------------------------------------ [...truncated 150.85 KB...] rm -f TAGS tags *.dbg .*.swp rm -f rtp_media_server.d rtp_media_server.d rtp_media_server.d *~ rm -f TAGS tags *.dbg .*.swp rm -f rtpengine.d rtpengine.d rtpengine.d *~ rm -f TAGS tags *.dbg .*.swp rm -f rtpproxy.d rtpproxy.d rtpproxy.d *~ rm -f TAGS tags *.dbg .*.swp rm -f ruxc.d ruxc.d ruxc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sanity.d sanity.d sanity.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sca.d sca.d sca.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sctp.d sctp.d sctp.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sdpops.d sdpops.d sdpops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f seas.d seas.d seas.d *~ rm -f TAGS tags *.dbg .*.swp rm -f secfilter.d secfilter.d secfilter.d *~ rm -f TAGS tags *.dbg .*.swp rm -f secsipid.d secsipid.d secsipid.d *~ rm -f TAGS tags *.dbg .*.swp rm -f secsipid_proc.d secsipid_proc.d secsipid_proc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipcapture.d sipcapture.d sipcapture.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipdump.d sipdump.d sipdump.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipjson.d sipjson.d sipjson.d *~ rm -f TAGS tags *.dbg .*.swp rm -f siprepo.d siprepo.d siprepo.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipt.d sipt.d sipt.d *~ rm -f TAGS tags *.dbg .*.swp rm -f siptrace.d siptrace.d siptrace.d *~ rm -f TAGS tags *.dbg .*.swp rm -f siputils.d siputils.d siputils.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sl.d sl.d sl.d *~ rm -f TAGS tags *.dbg .*.swp rm -f slack.d slack.d slack.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sms.d sms.d sms.d *~ rm -f TAGS tags *.dbg .*.swp rm -f smsops.d smsops.d smsops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f snmpstats.d snmpstats.d snmpstats.d *~ rm -f TAGS tags *.dbg .*.swp rm -f speeddial.d speeddial.d speeddial.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sqlops.d sqlops.d sqlops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f ss7ops.d ss7ops.d ss7ops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sst.d sst.d sst.d *~ rm -f TAGS tags *.dbg .*.swp rm -f statistics.d statistics.d statistics.d *~ rm -f TAGS tags *.dbg .*.swp rm -f statsc.d statsc.d statsc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f statsd.d statsd.d statsd.d *~ rm -f TAGS tags *.dbg .*.swp rm -f stirshaken.d stirshaken.d stirshaken.d *~ rm -f TAGS tags *.dbg .*.swp rm -f stun.d stun.d stun.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sworker.d sworker.d sworker.d *~ rm -f TAGS tags *.dbg .*.swp rm -f systemdops.d systemdops.d systemdops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tcpops.d tcpops.d tcpops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f textops.d textops.d textops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f textopsx.d textopsx.d textopsx.d *~ rm -f TAGS tags *.dbg .*.swp rm -f timer.d timer.d timer.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tls.d tls.d tls.d *~ Makefile:65: sources = tls_cfg.c tls_config.c tls_ct_wrq.c tls_domain.c tls_init.c tls_rpc.c tls_select.c tls_server.c tls_util.c tls_verify.c tls_wolfssl_mod.c , auto_gen = , objs = tls_cfg.o tls_config.o tls_ct_wrq.o tls_domain.o tls_init.o tls_rpc.o tls_select.o tls_server.o tls_util.o tls_verify.o tls_wolfssl_mod.o rm -f TAGS tags *.dbg .*.swp rm -f tls_wolfssl.d tls_wolfssl.d tls_wolfssl.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tlsa.d tlsa.d tlsa.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tm.d tm.d tm.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tmrec.d tmrec.d tmrec.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tmx.d tmx.d tmx.d *~ rm -f TAGS tags *.dbg .*.swp rm -f topoh.d topoh.d topoh.d *~ rm -f TAGS tags *.dbg .*.swp rm -f topos.d topos.d topos.d *~ rm -f TAGS tags *.dbg .*.swp rm -f topos_redis.d topos_redis.d topos_redis.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tsilo.d tsilo.d tsilo.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uac.d uac.d uac.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uac_redirect.d uac_redirect.d uac_redirect.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_auth_db.d uid_auth_db.d uid_auth_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_avp_db.d uid_avp_db.d uid_avp_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_domain.d uid_domain.d uid_domain.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_gflags.d uid_gflags.d uid_gflags.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_uri_db.d uid_uri_db.d uid_uri_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uri_db.d uri_db.d uri_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f userblocklist.d userblocklist.d userblocklist.d *~ rm -f TAGS tags *.dbg .*.swp rm -f usrloc.d usrloc.d usrloc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f utils.d utils.d utils.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uuid.d uuid.d uuid.d *~ rm -f TAGS tags *.dbg .*.swp rm -f websocket.d websocket.d websocket.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xcap_client.d xcap_client.d xcap_client.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xcap_server.d xcap_server.d xcap_server.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp.d xhttp.d xhttp.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp_pi.d xhttp_pi.d xhttp_pi.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp_prom.d xhttp_prom.d xhttp_prom.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp_rpc.d xhttp_rpc.d xhttp_rpc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xlog.d xlog.d xlog.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xmlops.d xmlops.d xmlops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xmlrpc.d xmlrpc.d xmlrpc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xmpp.d xmpp.d xmpp.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xprint.d xprint.d xprint.d *~ make[2]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu22.04.20240210005411.2620/src' make[1]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu22.04.20240210005411.2620' dh_clean dh_clean: warning: Compatibility levels before 10 are deprecated (level 9 in use) dpkg-source -b . dpkg-source: warning: Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu address dpkg-source: warning: Version number suggests Ubuntu changes, but there is no XSBC-Original-Maintainer field dpkg-source: info: using source format '3.0 (native)' dpkg-source: info: building kamailio in kamailio_5.8.0~pre0+ubuntu22.04.20240210005411.2620.tar.xz dpkg-source: info: building kamailio in kamailio_5.8.0~pre0+ubuntu22.04.20240210005411.2620.dsc debian/rules binary dh_testdir # Add here commands to configure the package. /usr/bin/make FLAVOUR=kamailio cfg prefix=/usr cfg_prefix=/build/kamailio-5.8.0~pre0+ubuntu22.04.20240210005411.2620/debian/kamailio \ cfg_target=/etc/kamailio/ \ BASEDIR=/build/kamailio-5.8.0~pre0+ubuntu22.04.20240210005411.2620/debian/kamailio \ skip_modules=" bdb dbtext oracle pa iptrtpproxy dnssec java python" \ CC_EXTRA_OPTS="-Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/build/kamailio-5.8.0~pre0+ubuntu22.04.20240210005411.2620=. -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE" \ LD_EXTRA_OPTS="-Wl,-Bsymbolic-functions -flto=auto -ffat-lto-objects -flto=auto -Wl,-z,relro" \ group_include="kstandard" quiet=verbose make[1]: Entering directory '/build/kamailio-5.8.0~pre0+ubuntu22.04.20240210005411.2620' /usr/bin/make -C src/ cfg make[2]: Entering directory '/build/kamailio-5.8.0~pre0+ubuntu22.04.20240210005411.2620/src' normal Makefile.defs exec target architecture <x86_64>, host architecture <x86_64> rm -f modules.lst /usr/bin/make --no-print-directory modules.lst config.mak loaded Makefile.defs defs skipped making config... /usr/bin/make --no-print-directory -wC . cfg-defs normal Makefile.defs exec target architecture <x86_64>, host architecture <x86_64> make[4]: Nothing to be done for 'cfg-defs'. config.mak loaded Makefile.defs defs skipped saving modules list... make[2]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu22.04.20240210005411.2620/src' make[1]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu22.04.20240210005411.2620' touch configure-stamp dh_testdir /usr/bin/make all quiet=verbose make[1]: Entering directory '/build/kamailio-5.8.0~pre0+ubuntu22.04.20240210005411.2620' /usr/bin/make -C src/ all make[2]: Entering directory '/build/kamailio-5.8.0~pre0+ubuntu22.04.20240210005411.2620/src' config.mak loaded Makefile:116: *** "bad config.mak, try re-running make cfg". Stop. make[2]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu22.04.20240210005411.2620/src' make[1]: *** [Makefile:34: all] Error 2 make[1]: Leaving directory '/build/kamailio-5.8.0~pre0+ubuntu22.04.20240210005411.2620' make: *** [debian/rules:130: test_build_all] Error 2 dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 I: copying local configuration E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.15216/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.15216/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_gBmep1 filesystem I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: Cleaning COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.15216 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /run/lock/jammy-amd64.building.14898 + '[' -r /run/lock/jammy-amd64.update.14898 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.Wb40hxfOG9 ']' + rm -rf /tmp/tmp.Wb40hxfOG9 + '[' -n /tmp/apt-jdg_gBmep1 ']' + sudo rm -rf /tmp/apt-jdg_gBmep1 + '[' -n 276 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=81 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Sat Feb 10 01:05:04 UTC 2024 [running 81 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Sat Feb 10 01:05:04 UTC 2024 [running 81 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

git:master:f2772bd0: influxdbc: function to add double value as divison of int numbers
by Daniel-Constantin Mierla 10 Feb '24

10 Feb '24

Module: kamailio Branch: master Commit: f2772bd0248a1e75a82f4cad55280fa2b4f98578 URL: https://github.com/kamailio/kamailio/commit/f2772bd0248a1e75a82f4cad55280fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-10T22:28:26+01:00 influxdbc: function to add double value as divison of int numbers --- Modified: src/modules/influxdbc/influxdbc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f2772bd0248a1e75a82f4cad55280fa… Patch: https://github.com/kamailio/kamailio/commit/f2772bd0248a1e75a82f4cad55280fa… --- diff --git a/src/modules/influxdbc/influxdbc_mod.c b/src/modules/influxdbc/influxdbc_mod.c index 90f6107ac68..5261b5ea5c4 100644 --- a/src/modules/influxdbc/influxdbc_mod.c +++ b/src/modules/influxdbc/influxdbc_mod.c @@ -53,6 +53,8 @@ static int w_influxdbc_push(sip_msg_t *msg, char *p1, char *p2); static int w_influxdbc_long(sip_msg_t *msg, char *pname, char *pvalue); static int w_influxdbc_string(sip_msg_t *msg, char *pname, char *pvalue); static int w_influxdbc_double(sip_msg_t *msg, char *pname, char *pvalue); +static int w_influxdbc_division( + sip_msg_t *msg, char *pname, char *pdividend, char *pdivisor); static int mod_init(void); static int child_init(int); @@ -76,6 +78,8 @@ static cmd_export_t cmds[] = { 2, fixup_spve_spve, 0, ANY_ROUTE}, {"influxdbc_double", (cmd_function)w_influxdbc_double, 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"influxdbc_division", (cmd_function)w_influxdbc_division, + 3, fixup_sii, fixup_free_sii, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -323,6 +327,38 @@ static int w_influxdbc_double(sip_msg_t *msg, char *pname, char *pvalue) } +/** + * + */ +static int w_influxdbc_division( + sip_msg_t *msg, char *pname, char *pdividend, char *pdivisor) +{ + str sname; + int idividend; + int idivisor; + + if(fixup_get_svalue(msg, (gparam_t *)pname, &sname) != 0) { + LM_ERR("unable to get name parameter\n"); + return -1; + } + if(fixup_get_ivalue(msg, (gparam_t *)pdividend, &idividend) != 0) { + LM_ERR("unable to get dividend parameter\n"); + return -1; + } + if(fixup_get_ivalue(msg, (gparam_t *)pdivisor, &idivisor) != 0) { + LM_ERR("unable to get divisor parameter\n"); + return -1; + } + if(idivisor == 0) { + ic_double(sname.s, 0.0); + return 1; + } + + ic_double(sname.s, (double)idividend / (double)idivisor); + + return 1; +} + /** * */

1 0

git:master:ce437384: core: helper fixup functions for (str, str, int) parameters
by Daniel-Constantin Mierla 10 Feb '24

10 Feb '24

Module: kamailio Branch: master Commit: ce437384ce13bb78b01d3d18f9ddfdd6b8e37fa5 URL: https://github.com/kamailio/kamailio/commit/ce437384ce13bb78b01d3d18f9ddfdd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-10T22:28:26+01:00 core: helper fixup functions for (str, str, int) parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/ce437384ce13bb78b01d3d18f9ddfdd… Patch: https://github.com/kamailio/kamailio/commit/ce437384ce13bb78b01d3d18f9ddfdd… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index ecd870c0ca5..10be560982f 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -843,6 +843,38 @@ int fixup_free_ssi(void **param, int param_no) } } +/** + * + */ +int fixup_sii(void **param, int param_no) +{ + switch(param_no) { + case 1: + return fixup_spve_null(param, 1); + case 2: + case 3: + return fixup_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_sii(void **param, int param_no) +{ + switch(param_no) { + case 1: + return fixup_free_spve_null(param, 1); + case 2: + case 3: + return fixup_free_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index a76d64f0ce7..3143f060426 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -168,6 +168,9 @@ int fixup_free_igp_regexp(void **param, int param_no); int fixup_ssi(void **param, int param_no); int fixup_free_ssi(void **param, int param_no); +int fixup_sii(void **param, int param_no); +int fixup_free_sii(void **param, int param_no); + int fixup_sssi(void **param, int param_no); int fixup_free_sssi(void **param, int param_no);

1 0

[kamailio/kamailio] [pua] reginfo_increase_version does nothing (Issue #3234)
by Matteo 09 Feb '24

09 Feb '24

### Description The reginfo notifications sent via pua_reginfo + presence_reginfo contains the version fixed to `0`. The pua docs report the param `reginfo_increase_version` which should increase the version if enabled, but currently does nothing. Looking into the code seems to confirm that, param is read from `pua` module but is not used anywhere. While the param `dlginfo_increase_version` seems to be used for the intended scope. #### Reproduction Setup pua + pua_reginfo to publish registration informations and observe that version param of reginfo is always 0, not respecting pua `reginfo_increase_version` setting. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.1 (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, 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 9.4.0 ``` * **Operating System**: ``` Linux Debian bullseye/sid ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3234 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3234(a)github.com>

4 10

[kamailio/kamailio] file_out: Add support for extensions and interval per file. (PR #3750)
by Xenofon Karamanos 09 Feb '24

09 Feb '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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR updates `file_out` module to support the definition of extension and interval on a per-file basis. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3750 -- Commit Summary -- * file_out: Add support for multiple files, extensions and interval * file_out: Update docs -- File Changes -- M src/modules/file_out/doc/file_out_admin.xml (117) M src/modules/file_out/file_out.c (164) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3750.patch https://github.com/kamailio/kamailio/pull/3750.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3750 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3750(a)github.com>

2 3

git:master:44fcca35: file_out: Update docs
by Xenofon Karamanos 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: 44fcca3596438841c0752d39dedfbe7de07a30c5 URL: https://github.com/kamailio/kamailio/commit/44fcca3596438841c0752d39dedfbe7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-02-09T16:20:08+02:00 file_out: Update docs --- Modified: src/modules/file_out/doc/file_out_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/44fcca3596438841c0752d39dedfbe7… Patch: https://github.com/kamailio/kamailio/commit/44fcca3596438841c0752d39dedfbe7…

1 0

git:master:62e3069f: file_out: Add support for multiple files, extensions and interval
by Xenofon Karamanos 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: 62e3069f484ea28745bce93dd5e1e7634c336f6b URL: https://github.com/kamailio/kamailio/commit/62e3069f484ea28745bce93dd5e1e76… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-02-09T16:20:08+02:00 file_out: Add support for multiple files, extensions and interval --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/62e3069f484ea28745bce93dd5e1e76… Patch: https://github.com/kamailio/kamailio/commit/62e3069f484ea28745bce93dd5e1e76…

1 0

git:master:ba921b21: core/rthread.h: add prototype for db queries
by S-P Chan 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: ba921b2112e87625fba5789d1b049161bb611073 URL: https://github.com/kamailio/kamailio/commit/ba921b2112e87625fba5789d1b04916… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-06T10:17:53+08:00 core/rthread.h: add prototype for db queries --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/ba921b2112e87625fba5789d1b04916… Patch: https://github.com/kamailio/kamailio/commit/ba921b2112e87625fba5789d1b04916… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index a5ad7670dae..a416ad2ca50 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -98,3 +98,60 @@ static void run_threadV(_thread_protoV fn) pthread_join(tid, NULL); } #endif + +/* + * prototype: int fn(void *, void *) { ... } + */ +#ifdef KSR_RTHREAD_NEED_4PP +typedef int (*_thread_proto4PP)(void *, void *); +struct _thread_args4PP +{ + _thread_proto4PP fn; + void *arg1; + void *arg2; + int *ret; +}; +static void *run_thread_wrap4PP(struct _thread_args4PP *args) +{ + *args->ret = (*args->fn)(args->arg1, args->arg2); + return NULL; +} + +static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2) +{ + pthread_t tid; + int ret; + + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4PP, + &(struct _thread_args4PP){fn, arg1, arg2, &ret}); + pthread_join(tid, NULL); + + return ret; +} +#endif + +/* + * prototype: void fn(void *) { ... } + */ +#ifdef KSR_RTHREAD_NEED_0P +typedef void (*_thread_proto0P)(void *); +struct _thread_args0P +{ + _thread_proto0P fn; + void *arg1; +}; +static void *run_thread_wrap0P(struct _thread_args0P *args) +{ + (*args->fn)(args->arg1); + return NULL; +} + +static void run_thread0P(_thread_proto0P fn, void *arg1) +{ + pthread_t tid; + + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap0P, + &(struct _thread_args0P){fn, arg1}); + pthread_join(tid, NULL); +} +#endif

4 6

[kamailio/kamailio] DRAFT: new global config var to constrain thread wrapping (PR #3745)
by space88man 09 Feb '24

09 Feb '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:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Add global config var ``` enable_tls_thread=1 #0 | 1 | 2 ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3745 -- Commit Summary -- * step-1 * step-2 * step-3 -- File Changes -- M src/core/cfg.lex (2) M src/core/cfg.y (5) M src/core/globals.h (1) M src/core/rthreads.h (19) M src/main.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3745.patch https://github.com/kamailio/kamailio/pull/3745.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3745 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3745(a)github.com>

3 6

[kamailio/kamailio] tools/kemi: update kemi_mock for python (PR #3751)
by tsearle 09 Feb '24

09 Feb '24

fixes code generation when python keywords are used fixes formating issues of generated code fixes crash from pv.setl reporting parameters as null instead of 'none' made example more complete   #### 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3751 -- Commit Summary -- * tools/kemi: update kemi_mock for python -- File Changes -- M misc/tools/kemi/python_mock/kemi_mock.py (51) M misc/tools/kemi/python_mock/test.py (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3751.patch https://github.com/kamailio/kamailio/pull/3751.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3751 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3751(a)github.com>

2 2

git:master:3e1a7bb5: tools/kemi: update kemi_mock for python (#3751)
by GitHub 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: 3e1a7bb5f6143383b1f486b8c67c3bf97cb32a3f URL: https://github.com/kamailio/kamailio/commit/3e1a7bb5f6143383b1f486b8c67c3bf… Author: tsearle <torrey.searle(a)wavecrest.com> Committer: GitHub <noreply(a)github.com> Date: 2024-02-09T10:17:58+01:00 tools/kemi: update kemi_mock for python (#3751) fixes code generation when python keywords are uses fixes formating issues of generated code fixes crash from pv.setl reporting parameters as null instead of 'none' --- Modified: misc/tools/kemi/python_mock/kemi_mock.py Modified: misc/tools/kemi/python_mock/test.py --- Diff: https://github.com/kamailio/kamailio/commit/3e1a7bb5f6143383b1f486b8c67c3bf… Patch: https://github.com/kamailio/kamailio/commit/3e1a7bb5f6143383b1f486b8c67c3bf…

1 0

git:master:6918c9e3: modules: readme files regenerated - ldap ... [skip ci]
by Kamailio Dev 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: 6918c9e34b826f8d8c7fb1746851055fa35f8ece URL: https://github.com/kamailio/kamailio/commit/6918c9e34b826f8d8c7fb1746851055… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-02-09T10:01:34+01:00 modules: readme files regenerated - ldap ... [skip ci] --- Modified: src/modules/ldap/README --- Diff: https://github.com/kamailio/kamailio/commit/6918c9e34b826f8d8c7fb1746851055… Patch: https://github.com/kamailio/kamailio/commit/6918c9e34b826f8d8c7fb1746851055… --- diff --git a/src/modules/ldap/README b/src/modules/ldap/README index 921f45822f1..d69005f864e 100644 --- a/src/modules/ldap/README +++ b/src/modules/ldap/README @@ -31,6 +31,7 @@ Christian Schlatter 4. Parameters 4.1. config_file (string) + 4.2. connect_mode (int) 5. Functions @@ -82,12 +83,13 @@ Christian Schlatter 1.6. ldap_client_bind_timeout example 1.7. Example LDAP Configuration File 1.8. config_file parameter usage - 1.9. Example Usage of ldap_url - 1.10. Example Usage + 1.9. Set connect_mode parameter + 1.10. Example Usage of ldap_url 1.11. Example Usage 1.12. Example Usage 1.13. Example Usage 1.14. Example Usage + 1.15. Example Usage 2.1. Example code fragment to load LDAP module API 2.2. Example LDAP module API function call @@ -114,6 +116,7 @@ Chapter 1. Admin Guide 4. Parameters 4.1. config_file (string) + 4.2. connect_mode (int) 5. Functions @@ -418,6 +421,7 @@ ldap_client_bind_timeout = 500 4. Parameters 4.1. config_file (string) + 4.2. connect_mode (int) 4.1. config_file (string) @@ -428,6 +432,17 @@ ldap_client_bind_timeout = 500 Example 1.8. config_file parameter usage modparam("ldap", "config_file", "/usr/local/etc/kamailio/ldap.ini") +4.2. connect_mode (int) + + Control if the module must stop loading when connecting to server fails + during start up. Values: 0 - stop loading; 1 - continue even if + connecting to database server fails.. + + Default value: 0 + + Example 1.9. Set connect_mode parameter +modparam("ldap", "connect_mode", 1) + 5. Functions 5.1. ldap_search(ldap_url) @@ -458,7 +473,7 @@ modparam("ldap", "config_file", "/usr/local/etc/kamailio/ldap.ini") Kamailio pseudo variables and AVPs included in ldap_url do get substituted with their value. - Example 1.9. Example Usage of ldap_url + Example 1.10. Example Usage of ldap_url Search with LDAP session named sipaccounts, base ou=sip,dc=example,dc=com, one level deep using search filter @@ -492,7 +507,7 @@ ldap://ldap_1/dc=example,dc=com? This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.10. Example Usage + Example 1.11. Example Usage ... # ldap search if (!ldap_search("ldap://sipaccounts/ou=sip,dc=example,dc=com??one?(cn=$rU)")) @@ -570,7 +585,7 @@ ldap_result("telephoneNumber/$avp(s:tel_number)"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.11. Example Usage + Example 1.12. Example Usage ... # ldap_search call @@ -639,7 +654,7 @@ ldap_result("SIPIdentitySIPURI/$avp(i:10)", "/^[^@]+@(.+)$/\1/"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.12. Example Usage + Example 1.13. Example Usage ... # ldap_search call ... @@ -688,7 +703,7 @@ if (!ldap_result_check("sn/$ru", "/^sip:([^@]).*$/\1/")) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.13. Example Usage + Example 1.14. Example Usage ... # ldap_search call ... @@ -745,7 +760,7 @@ if (ldap_result_next()) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.14. Example Usage + Example 1.15. Example Usage ... if (!ldap_filter_url_encode("cn=$avp(s:name)", "$avp(s:name_esc)")) {

1 0

[kamailio/kamailio] Ldap: option to start even when connecting to ldap server fails (PR #3747)
by Xenofon Karamanos 09 Feb '24

09 Feb '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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR aims to give the option for ldap to allow kamailio to start-up even if server is not reachable/available when starting. It follows similar logic to https://github.com/kamailio/kamailio/commit/2df43b992b1e6932974bd0c928c0465… for SQL. A new config parameter for `ldap` module is defined, `connect_mode`, that defaults to 0, preserving the old behavior. If it's set `1`, `kamailio` will not exit and allow `ldap` to try and reconnect when necessary. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3747 -- Commit Summary -- * ldap: option to start even when connecting to server fails * ldap/docs: Add connect_mode docs -- File Changes -- M src/modules/ldap/doc/ldap_admin.xml (18) M src/modules/ldap/ldap_mod.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3747.patch https://github.com/kamailio/kamailio/pull/3747.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3747 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3747(a)github.com>

3 4

git:master:e7397acb: ldap/docs: Add connect_mode docs
by Henning Westerholt 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: e7397acb86db5cf0a214fe7f2812e21130e7b2f6 URL: https://github.com/kamailio/kamailio/commit/e7397acb86db5cf0a214fe7f2812e21… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-09T09:46:25+01:00 ldap/docs: Add connect_mode docs --- Modified: src/modules/ldap/doc/ldap_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e7397acb86db5cf0a214fe7f2812e21… Patch: https://github.com/kamailio/kamailio/commit/e7397acb86db5cf0a214fe7f2812e21… --- diff --git a/src/modules/ldap/doc/ldap_admin.xml b/src/modules/ldap/doc/ldap_admin.xml index 3337dd2be0c..2bb2c3a5ef4 100644 --- a/src/modules/ldap/doc/ldap_admin.xml +++ b/src/modules/ldap/doc/ldap_admin.xml @@ -455,6 +455,23 @@ modparam("ldap", "config_file", "/usr/local/etc/&kamailiobinary;/ldap.ini") </programlisting> </example> </section> + + <section> + <title><varname>connect_mode</varname> (int)</title> + + <para>Control if the module must stop loading when connecting to server fails during start up. Values: 0 - stop loading; 1 - continue even if connecting to database server fails..</para> + <para>Default value: + <varname>0</varname></para> + + <example> + <title>Set <varname>connect_mode</varname> parameter</title> + + <programlisting format="linespecific"> +modparam("ldap", "connect_mode", 1) + </programlisting> + </example> + </section> + </section> <section> @@ -1079,4 +1096,3 @@ if (ldap_search( </section> </section> </chapter> -

1 0

git:master:3120d1df: ldap: option to start even when connecting to server fails
by Henning Westerholt 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: 3120d1dfcfa393b90272526e6fe2efb3aa32a19d URL: https://github.com/kamailio/kamailio/commit/3120d1dfcfa393b90272526e6fe2efb… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-09T09:46:25+01:00 ldap: option to start even when connecting to server fails --- Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3120d1dfcfa393b90272526e6fe2efb… Patch: https://github.com/kamailio/kamailio/commit/3120d1dfcfa393b90272526e6fe2efb… --- diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index fada29a3023..de0e25b1545 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -80,6 +80,7 @@ static int w_ldap_result_check_2( * Default module parameter values */ #define DEF_LDAP_CONFIG "/usr/local/etc/kamailio/ldap.cfg" +static int ldap_connect_mode = 0; /* * Module parameter variables @@ -125,6 +126,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"config_file", PARAM_STR, &ldap_config}, + {"connect_mode", PARAM_INT, &ldap_connect_mode}, {0, 0, 0} }; @@ -151,6 +153,7 @@ static int child_init(int rank) { int i = 0, ld_count = 0; char *ld_name; + int ret = 0; /* don't do anything for non-worker processes */ if(rank == PROC_INIT || rank == PROC_MAIN || rank == PROC_TCP_MAIN) @@ -168,9 +171,15 @@ static int child_init(int rank) } if(oldap_connect(ld_name) != 0) { - LM_ERR("[%s]: failed to connect to LDAP host(s)\n", ld_name); - ldap_disconnect(ld_name); - return -1; + if(ldap_connect_mode == 1) { + LM_INFO("[%s]: Failed to connect to LDAP host(s) but start " + "without connection enabled - proceed", + ld_name); + } else { + LM_ERR("[%s]: failed to connect to LDAP host(s)\n", ld_name); + ldap_disconnect(ld_name); + return -1; + } } }

1 0

[kamailio/kamailio] RTPengine call was not terminated on BYE (Issue #3749)
by sergey-safarov 09 Feb '24

09 Feb '24

### Description Via sngrep I can see call was terminated via BYE message but was not terminated on RTPengine hosts. The `rtpengine-ctl list sessions all` show calls that was terminated properly via BYE message. In the kamailio config used `rtpengine_manage` function. I do not have any idea how to troubleshoot this. Could you suggest next step and I will add more details for this issue ### Additional Information * **Kamailio Version** Used 5.6.4 with small customization. ``` version: kamailio 5.6.4 (aarch64/linux) 06ad45 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT-NOSMP, 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: 06ad45 compiled on 16:37:11 Aug 7 2023 with gcc 8.5.0 ``` * **Operating System**: CentOS 8 Stream, aarch64 ``` [root@sbc-a0 ~]# uname -a Linux sbc-a0.nga911.com 4.19.113-300.el8.aarch64 #1 SMP Fri May 12 11:47:07 UTC 2023 aarch64 aarch64 aarch64 GNU/Linux [root@sbc-a0 ~]# cat /etc/os-release NAME="CentOS Stream" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Stream 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux 8" REDHAT_SUPPORT_PRODUCT_VERSION="CentOS Stream" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3749 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3749(a)github.com>

2 2

[kamailio/kamailio] [DRAFT]: restrict thread execution to process_no = 0 (PR #3744)
by space88man 08 Feb '24

08 Feb '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:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description @henning @miconda this is a draft for the 5.7 stable branch which disables threading for process_no > 0. This restricts thread wrappers to the parent process. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3744 -- Commit Summary -- * [DRAFT]: restrict thread execution to process_no = 0 -- File Changes -- M src/core/rthreads.h (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3744.patch https://github.com/kamailio/kamailio/pull/3744.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3744 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3744(a)github.com>

4 9

git:5.7:f4edfd47: db_mysql: libssl thread guard for db_mysql_close
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: 5.7 Commit: f4edfd47aa18aecaf5650bb39a69c6e800c14f2d URL: https://github.com/kamailio/kamailio/commit/f4edfd47aa18aecaf5650bb39a69c6e… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-08T14:28:12+08:00 db_mysql: libssl thread guard for db_mysql_close --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/f4edfd47aa18aecaf5650bb39a69c6e… Patch: https://github.com/kamailio/kamailio/commit/f4edfd47aa18aecaf5650bb39a69c6e… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index e86e4a0391b..7b65c0a012c 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -40,6 +40,7 @@ #include "../../core/async_task.h" #define KSR_RTHREAD_NEED_4PP +#define KSR_RTHREAD_NEED_0P #include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "../../lib/srdb1/db_ut.h" @@ -228,11 +229,16 @@ db1_con_t *db_mysql_init(const str *_url) * \param _h handle to the closed connection * \return zero on success, negative value on failure */ -void db_mysql_close(db1_con_t *_h) +static void db_mysql_close_impl(db1_con_t *_h) { db_do_close(_h, db_mysql_free_connection); } +void db_mysql_close(db1_con_t *_h) +{ + run_thread0P((_thread_proto0P)db_mysql_close_impl, _h); +} + /** * Retrieve a result set

1 0

git:5.7:58082265: db_unixodbc: libssl thread guards for db_unixodbc_(close|free_result|query)
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: 5.7 Commit: 5808226593fcf11d4713b2161809466568c51682 URL: https://github.com/kamailio/kamailio/commit/5808226593fcf11d4713b2161809466… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-08T14:28:12+08:00 db_unixodbc: libssl thread guards for db_unixodbc_(close|free_result|query) --- Modified: src/modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/5808226593fcf11d4713b2161809466… Patch: https://github.com/kamailio/kamailio/commit/5808226593fcf11d4713b2161809466… --- diff --git a/src/modules/db_unixodbc/dbase.c b/src/modules/db_unixodbc/dbase.c index 7a5f2bdb09e..01aab5bb273 100644 --- a/src/modules/db_unixodbc/dbase.c +++ b/src/modules/db_unixodbc/dbase.c @@ -26,6 +26,8 @@ #include "../../core/dprint.h" #include "../../core/async_task.h" #define KSR_RTHREAD_NEED_4PP +#define KSR_RTHREAD_NEED_4P5I2P2 +#define KSR_RTHREAD_NEED_0P #include "../../core/rthreads.h" #include "../../lib/srdb1/db_query.h" #include "val.h" @@ -254,11 +256,16 @@ db1_con_t *db_unixodbc_init(const str *_url) * Shut down database module * No function should be called after this */ -void db_unixodbc_close(db1_con_t *_h) +static void db_unixodbc_close_impl(db1_con_t *_h) { return db_do_close(_h, db_unixodbc_free_connection); } +void db_unixodbc_close(db1_con_t *_h) +{ + run_thread0P((_thread_proto0P)db_unixodbc_close_impl, _h); +} + /* * Retrieve result set */ @@ -299,7 +306,7 @@ static int db_unixodbc_store_result(const db1_con_t *_h, db1_res_t **_r) /* * Release a result set from memory */ -int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) +static int db_unixodbc_free_result_impl(db1_con_t *_h, db1_res_t *_r) { if((!_h) || (!_r)) { LM_ERR("invalid parameter value\n"); @@ -315,6 +322,11 @@ int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) return 0; } +int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) +{ + return run_thread4PP((_thread_proto4PP)db_unixodbc_free_result_impl, _h, _r); +} + /* * Query table for specified rows * _h: structure representing database connection @@ -326,7 +338,7 @@ int db_unixodbc_free_result(db1_con_t *_h, db1_res_t *_r) * _nc: number of columns to return * _o: order by the specified column */ -int db_unixodbc_query(const db1_con_t *_h, const db_key_t *_k, +static int db_unixodbc_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) { @@ -335,6 +347,15 @@ int db_unixodbc_query(const db1_con_t *_h, const db_key_t *_k, db_unixodbc_store_result); } +int db_unixodbc_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 run_thread4P5I2P2((_thread_proto4P5I2P2)db_unixodbc_query_impl, + (void *)_h, (void *)_k, (void *)_op, (void *)_v, (void *)_c, _n, + _nc, (void *)_o, (void *)_r); +} + /*! * \brief Gets a partial result set, fetch rows from a result *

1 0

git:5.7:0936b6b7: db_postgres: libssl thread guard for db_postgres_close
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: 5.7 Commit: 0936b6b70efe2e9d05766ce925ca10e4ff4bf7be URL: https://github.com/kamailio/kamailio/commit/0936b6b70efe2e9d05766ce925ca10e… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-08T14:28:12+08:00 db_postgres: libssl thread guard for db_postgres_close --- Modified: src/modules/db_postgres/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/0936b6b70efe2e9d05766ce925ca10e… Patch: https://github.com/kamailio/kamailio/commit/0936b6b70efe2e9d05766ce925ca10e… --- diff --git a/src/modules/db_postgres/km_dbase.c b/src/modules/db_postgres/km_dbase.c index 7948ff0075f..e8dce6e09ea 100644 --- a/src/modules/db_postgres/km_dbase.c +++ b/src/modules/db_postgres/km_dbase.c @@ -45,6 +45,7 @@ #include "../../core/clist.h" #define KSR_RTHREAD_NEED_PI #define KSR_RTHREAD_NEED_4PP +#define KSR_RTHREAD_NEED_0P #include "../../core/rthreads.h" #include "km_dbase.h" #include "km_pg_con.h" @@ -147,11 +148,16 @@ db1_con_t *db_postgres_init2(const str *_url, db_pooling_t pooling) * \param _h closed connection, as returned from db_postgres_init * \note free all memory and resources */ -void db_postgres_close(db1_con_t *_h) +static void db_postgres_close_impl(db1_con_t *_h) { db_do_close(_h, db_postgres_free_connection); } +void db_postgres_close(db1_con_t *_h) +{ + run_thread0P((_thread_proto0P)db_postgres_close_impl, _h); +} + /*! * \brief Submit_query, run a query

1 0

git:5.7:0d0c9910: core/rthreads.h: thread wrapper for db_XXXX_query
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: 5.7 Commit: 0d0c9910095e3e87a4d27be5af30f02cd5f26020 URL: https://github.com/kamailio/kamailio/commit/0d0c9910095e3e87a4d27be5af30f02… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-08T14:28:12+08:00 core/rthreads.h: thread wrapper for db_XXXX_query --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/0d0c9910095e3e87a4d27be5af30f02… Patch: https://github.com/kamailio/kamailio/commit/0d0c9910095e3e87a4d27be5af30f02… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index add3426d4db..fa60ccef071 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -195,3 +195,55 @@ static void run_thread0P(_thread_proto0P fn, void *arg1) #endif /* USE_TLS */ } #endif + +/* + * prototype: + * db_unixodbc_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) + */ +#ifdef KSR_RTHREAD_NEED_4P5I2P2 +typedef int (*_thread_proto4P5I2P2)( + void *, void *, void *, void *, void *, int, int, void *, void *); +struct _thread_args4P5I2P2 +{ + _thread_proto4P5I2P2 fn; + void *arg1; + void *arg2; + void *arg3; + void *arg4; + void *arg5; + int arg6; + int arg7; + void *arg8; + void *arg9; + int *ret; +}; +static void *run_thread_wrap4P5I2P2(struct _thread_args4P5I2P2 *args) +{ + *args->ret = (*args->fn)(args->arg1, args->arg2, args->arg3, args->arg4, + args->arg5, args->arg6, args->arg7, args->arg8, args->arg9); + return NULL; +} + +static int run_thread4P5I2P2(_thread_proto4P5I2P2 fn, void *arg1, void *arg2, + void *arg3, void *arg4, void *arg5, int arg6, int arg7, void *arg8, + void *arg9) +{ +#ifdef USE_TLS + pthread_t tid; + int ret; + + if(likely(process_no)) { + return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); + } + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4P5I2P2, + &(struct _thread_args4P5I2P2){fn, arg1, arg2, arg3, arg4, arg5, + arg6, arg7, arg8, arg9, &ret}); + pthread_join(tid, NULL); + return ret; +#else + return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); +#endif +} +#endif

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev