sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
242 discussions

git:master:e3e6fd75: core: tcp - skip checking when tcp_accept_iplimit is 0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e3e6fd75bdd688acebf0ec8a1b7efa6fcada1de6 URL: https://github.com/kamailio/kamailio/commit/e3e6fd75bdd688acebf0ec8a1b7efa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-19T22:24:21+01:00 core: tcp - skip checking when tcp_accept_iplimit is 0 --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/e3e6fd75bdd688acebf0ec8a1b7efa6… Patch: https://github.com/kamailio/kamailio/commit/e3e6fd75bdd688acebf0ec8a1b7efa6… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 35034d1baa8..757329a8543 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1169,6 +1169,10 @@ int tcp_connection_limit_srcip(union sockaddr_union *srcaddr, int limit) int n; int i; + if(limit <= 0) { + return 0; + } + n = 0; su2ip_addr(&src_ip, srcaddr); TCPCONN_LOCK;

9 months

git:master:dad7f3ff: file_out: small extensions to the module docs

by Henning Westerholt

Module: kamailio Branch: master Commit: dad7f3ff3af02d086c1cb3f915f1502bca127d58 URL: https://github.com/kamailio/kamailio/commit/dad7f3ff3af02d086c1cb3f915f1502… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-19T20:30:45Z file_out: small extensions to the module docs --- Modified: src/modules/file_out/doc/file_out_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dad7f3ff3af02d086c1cb3f915f1502… Patch: https://github.com/kamailio/kamailio/commit/dad7f3ff3af02d086c1cb3f915f1502… --- diff --git a/src/modules/file_out/doc/file_out_admin.xml b/src/modules/file_out/doc/file_out_admin.xml index a10ae1974d0..ce02069ae83 100644 --- a/src/modules/file_out/doc/file_out_admin.xml +++ b/src/modules/file_out/doc/file_out_admin.xml @@ -87,7 +87,7 @@ <title>Set <varname>base_folder</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("file_out", "base_folder", "/tmp/file_out") # Trailling slash will be added. +modparam("file_out", "base_folder", "/tmp/file_out") # trailing slash will be added. ... </programlisting> </example> @@ -102,7 +102,7 @@ modparam("file_out", "base_folder", "/tmp/file_out") # Trailling slash will be a <itemizedlist> <listitem> <para> - "name=accounting;extension=.out;interval=20;prefix=acc_" + "name=accounting;extension=.out;interval=20;prefix=accounting:" </para> </listitem> </itemizedlist>

9 months, 1 week

[kamailio/kamailio] file_out: Add prefix parameter and docs and fix leaks. (PR #3758)

by Xenofon Karamanos

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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 adds a new parameter `prefix` to the function and its docs. It allows the message to be fixed with a prefix string. Also fixes some leak issues. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3758 -- Commit Summary -- * file_out: Free allocated memory * file_out: Add a prefix paramater -- File Changes -- M src/modules/file_out/doc/file_out_admin.xml (13) M src/modules/file_out/file_out.c (32) M src/modules/file_out/types.c (9) M src/modules/file_out/types.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3758.patch https://github.com/kamailio/kamailio/pull/3758.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3758 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3758(a)github.com>

9 months, 1 week

git:master:a722d4cb: file_out: Add a prefix paramater

by Henning Westerholt

Module: kamailio Branch: master Commit: a722d4cba1ab18f481bfe8353cebc0c6fa1a7ebb URL: https://github.com/kamailio/kamailio/commit/a722d4cba1ab18f481bfe8353cebc0c… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-19T21:28:19+01:00 file_out: Add a prefix paramater --- Modified: src/modules/file_out/doc/file_out_admin.xml Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/a722d4cba1ab18f481bfe8353cebc0c… Patch: https://github.com/kamailio/kamailio/commit/a722d4cba1ab18f481bfe8353cebc0c… --- diff --git a/src/modules/file_out/doc/file_out_admin.xml b/src/modules/file_out/doc/file_out_admin.xml index 02c9d978e66..a10ae1974d0 100644 --- a/src/modules/file_out/doc/file_out_admin.xml +++ b/src/modules/file_out/doc/file_out_admin.xml @@ -102,7 +102,7 @@ modparam("file_out", "base_folder", "/tmp/file_out") # Trailling slash will be a <itemizedlist> <listitem> <para> - "name=accounting;extension=.out;interval=20" + "name=accounting;extension=.out;interval=20;prefix=acc_" </para> </listitem> </itemizedlist> @@ -145,6 +145,17 @@ modparam("file_out", "base_folder", "/tmp/file_out") # Trailling slash will be a </emphasis> </para> </listitem> + + <listitem> + <para> + prefix (Optional) - the prefix for log messages + </para> + <para> + <emphasis> + Default value is <quote>""</quote> (empty string). + </emphasis> + </para> + </listitem> </itemizedlist> <example> diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 5a7643d0e4f..443eb118d20 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -40,6 +40,7 @@ MODULE_VERSION #define FO_MAX_FILES 10 /* Maximum number of files */ #define FO_DEFAULT_INTERVAL 10 * 60 #define FO_DEFAULT_EXTENSION ".out" +#define FO_DEFAULT_PREFIX "" static int mod_init(void); static int child_init(int rank); @@ -64,6 +65,7 @@ static int fo_parse_filename_params(str input); char *fo_base_folder = "/var/log/kamailio/file_out"; char *fo_base_filename[FO_MAX_FILES] = {""}; char *fo_extension[FO_MAX_FILES] = {".out"}; +char *fo_prefix[FO_MAX_FILES] = {""}; int fo_interval_seconds[FO_MAX_FILES] = {10 * 60}; int fo_worker_usleep = 10000; @@ -211,6 +213,13 @@ static void fo_log_writer_process(int rank) return; } + /* Get prefix for the file */ + if(fo_prefix[log_message.dest_file] != NULL) { + if(fprintf(out, "%s", fo_prefix[log_message.dest_file]) < 0) { + LM_ERR("Failed to write prefix to file with err {%s}\n", + strerror(errno)); + } + } if(fprintf(out, "%.*s\n", log_message.message->len, log_message.message->s) < 0) { @@ -348,6 +357,7 @@ static int fo_parse_filename_params(str in) char *name = NULL; char *extension = NULL; char *interval = NULL; + char *prefix = NULL; char *token = NULL; char *saveptr = NULL; char *input = in.s; @@ -359,6 +369,11 @@ static int fo_parse_filename_params(str in) extension = token + 10; } else if(strstr(token, "interval=") != NULL) { interval = token + 9; + } else if(strstr(token, "prefix=") != NULL) { + prefix = token + 7; + } else { + LM_ERR("Unknown parameter %s\n", token); + return -1; } token = strtok_r(NULL, ";", &saveptr); } @@ -389,6 +404,13 @@ static int fo_parse_filename_params(str in) fo_interval_seconds[*fo_number_of_files] = FO_DEFAULT_INTERVAL; } + if(prefix != NULL) { + LM_DBG("prefix = %s\n", prefix); + fo_prefix[*fo_number_of_files] = prefix; + } else { + LM_DBG("no prefix= provided. Using default %s\n", FO_DEFAULT_PREFIX); + fo_prefix[*fo_number_of_files] = FO_DEFAULT_PREFIX; + } return 1; }

9 months, 1 week

git:master:22581f95: file_out: Free allocated memory

by Henning Westerholt

Module: kamailio Branch: master Commit: 22581f95690415681ea233c97923137e46fb55ae URL: https://github.com/kamailio/kamailio/commit/22581f95690415681ea233c97923137… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-19T21:28:19+01:00 file_out: Free allocated memory --- 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/22581f95690415681ea233c97923137… Patch: https://github.com/kamailio/kamailio/commit/22581f95690415681ea233c97923137… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index fde63db5a0b..5a7643d0e4f 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -183,6 +183,16 @@ static void destroy(void) ERR("Failed to close output file"); } } + + /* Free allocated mem */ + if(fo_number_of_files != NULL) { + shm_free(fo_number_of_files); + fo_number_of_files = NULL; + } + + if(fo_queue != NULL) { + fo_free_queue(fo_queue); + } } static void fo_log_writer_process(int rank) diff --git a/src/modules/file_out/types.c b/src/modules/file_out/types.c index d2815333dd0..f5c43a41695 100644 --- a/src/modules/file_out/types.c +++ b/src/modules/file_out/types.c @@ -113,3 +113,12 @@ int fo_queue_size(fo_queue_t *q) lock_release(&(q->lock)); return count; } + +void fo_free_queue(fo_queue_t *q) +{ + fo_log_message_t data; + while(fo_dequeue(q, &data) > 0) { + shm_free(data.message); + } + shm_free(q); +} diff --git a/src/modules/file_out/types.h b/src/modules/file_out/types.h index c6fb72b28ef..b9c3b411165 100644 --- a/src/modules/file_out/types.h +++ b/src/modules/file_out/types.h @@ -43,3 +43,4 @@ int fo_enqueue(fo_queue_t *q, fo_log_message_t data); int fo_dequeue(fo_queue_t *q, fo_log_message_t *data); int fo_is_queue_empty(fo_queue_t *q); int fo_queue_size(fo_queue_t *q); +void fo_free_queue(fo_queue_t *q);

9 months, 1 week

Latest point releases seem to break early dialog UPDATEs from B-side when using topos (again)

by George Diamantopoulos

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

9 months, 1 week

[kamailio/kamailio] file_out: Fix a bug on fixup function, update docs, logging information. (PR #3756)

by Xenofon Karamanos

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

9 months, 1 week

git:master:d2459f4a: file_out: Fix fixup functions to handle all string.

by Xenofon Karamanos

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;

9 months, 1 week

git:master:d3fbee58: file_out: Improve logging

by Xenofon Karamanos

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

9 months, 1 week

git:master:6ac4148d: file_out: Free message when done

by Xenofon Karamanos

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

9 months, 1 week

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2024