sr-dev

sr-dev@lists.kamailio.org

4 participants
45456 discussions

git:master:3379d66b: uac: added ftag and ttag fields for $uac_req(...)
by Daniel-Constantin Mierla 08 Jun '25

08 Jun '25

Module: kamailio Branch: master Commit: 3379d66b082ed866235d354c96171b964fd2d708 URL: https://github.com/kamailio/kamailio/commit/3379d66b082ed866235d354c96171b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-08T12:10:30+02:00 uac: added ftag and ttag fields for $uac_req(...) --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/3379d66b082ed866235d354c96171b9… Patch: https://github.com/kamailio/kamailio/commit/3379d66b082ed866235d354c96171b9… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index ea3595ca755..2513a6989d0 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -63,8 +63,12 @@ typedef struct _uac_send_info str s_ruri; char b_turi[MAX_URI_SIZE]; str s_turi; + char b_ttag[128]; + str s_ttag; char b_furi[MAX_URI_SIZE]; str s_furi; + char b_ftag[128]; + str s_ftag; char b_callid[128]; str s_callid; char b_hdrs[MAX_UACH_SIZE]; @@ -99,7 +103,9 @@ void uac_send_info_copy(uac_send_info_t *src, uac_send_info_t *dst) dst->s_method.s = dst->b_method; dst->s_ruri.s = dst->b_ruri; dst->s_turi.s = dst->b_turi; + dst->s_ttag.s = dst->b_ttag; dst->s_furi.s = dst->b_furi; + dst->s_ftag.s = dst->b_ftag; dst->s_hdrs.s = dst->b_hdrs; dst->s_body.s = dst->b_body; dst->s_ouri.s = dst->b_ouri; @@ -193,6 +199,15 @@ int pv_get_uac_req(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_uintval(msg, param, res, _uac_req.fr_timeout); case 20: return pv_get_uintval(msg, param, res, _uac_req.fr_inv_timeout); + case 21: + if(_uac_req.s_ftag.len <= 0) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &_uac_req.s_ftag); + case 22: + if(_uac_req.s_ttag.len <= 0) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &_uac_req.s_ttag); + default: return pv_get_uintval(msg, param, res, _uac_req.flags); } @@ -217,7 +232,9 @@ int pv_set_uac_req( _uac_req.flags = 0; _uac_req.s_ruri.len = 0; _uac_req.s_furi.len = 0; + _uac_req.s_ftag.len = 0; _uac_req.s_turi.len = 0; + _uac_req.s_ttag.len = 0; _uac_req.s_ouri.len = 0; _uac_req.s_hdrs.len = 0; _uac_req.s_body.len = 0; @@ -228,6 +245,8 @@ int pv_set_uac_req( _uac_req.evtype = 0; _uac_req.evcode = 0; _uac_req.cseqno = 0; + _uac_req.fr_timeout = 0; + _uac_req.fr_inv_timeout = 0; _uac_req.s_evparam.len = 0; } break; @@ -512,6 +531,40 @@ int pv_set_uac_req( } _uac_req.fr_inv_timeout = tval->ri; break; + case 21: + if(tval == NULL) { + _uac_req.s_ftag.len = 0; + return 0; + } + if(!(tval->flags & PV_VAL_STR)) { + LM_ERR("Invalid value type\n"); + return -1; + } + if(tval->rs.len >= 128) { + LM_ERR("Value size too big\n"); + return -1; + } + memcpy(_uac_req.s_ftag.s, tval->rs.s, tval->rs.len); + _uac_req.s_ftag.s[tval->rs.len] = '\0'; + _uac_req.s_ftag.len = tval->rs.len; + break; + case 22: + if(tval == NULL) { + _uac_req.s_ttag.len = 0; + return 0; + } + if(!(tval->flags & PV_VAL_STR)) { + LM_ERR("Invalid value type\n"); + return -1; + } + if(tval->rs.len >= 128) { + LM_ERR("Value size too big\n"); + return -1; + } + memcpy(_uac_req.s_ttag.s, tval->rs.s, tval->rs.len); + _uac_req.s_ttag.s[tval->rs.len] = '\0'; + _uac_req.s_ttag.len = tval->rs.len; + break; } return 0; } @@ -533,8 +586,12 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 1; else if(strncmp(in->s, "turi", 4) == 0) sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "ttag", 4) == 0) + sp->pvp.pvn.u.isname.name.n = 22; else if(strncmp(in->s, "furi", 4) == 0) sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "ftag", 4) == 0) + sp->pvp.pvn.u.isname.name.n = 21; else if(strncmp(in->s, "hdrs", 4) == 0) sp->pvp.pvn.u.isname.name.n = 4; else if(strncmp(in->s, "body", 4) == 0) @@ -612,7 +669,9 @@ void uac_req_init(void) memset(&_uac_req, 0, sizeof(struct _uac_send_info)); _uac_req.s_ruri.s = _uac_req.b_ruri; _uac_req.s_furi.s = _uac_req.b_furi; + _uac_req.s_ftag.s = _uac_req.b_ftag; _uac_req.s_turi.s = _uac_req.b_turi; + _uac_req.s_ttag.s = _uac_req.b_ttag; _uac_req.s_ouri.s = _uac_req.b_ouri; _uac_req.s_hdrs.s = _uac_req.b_hdrs; _uac_req.s_body.s = _uac_req.b_body;

1 0

[kamailio/kamailio] core: tcp_send_timeout applied for outbound connections (PR #4234)
by sergey-safarov 06 Jun '25

06 Jun '25

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #4187 #### Description core: tcp_send_timeout applied for outbound connections You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4234 -- Commit Summary -- * core: tcp_send_timeout applied for outbound connections -- File Changes -- M src/core/tcp_main.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4234.patch https://github.com/kamailio/kamailio/pull/4234.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4234 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4234(a)github.com>

3 8

git:master:91053984: core: tcp_send_timeout applied for outbound connections
by Daniel-Constantin Mierla 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: 9105398413b4f9fab410482d9ebf5d82b6c3fb0a URL: https://github.com/kamailio/kamailio/commit/9105398413b4f9fab410482d9ebf5d8… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-06-06T16:08:44+02:00 core: tcp_send_timeout applied for outbound connections --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/9105398413b4f9fab410482d9ebf5d8… Patch: https://github.com/kamailio/kamailio/commit/9105398413b4f9fab410482d9ebf5d8… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 604102dcef6..369bfb1f159 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -352,6 +352,17 @@ static int init_sock_opt(int s, int af) } } #endif +#ifdef HAVE_TCP_USER_TIMEOUT + if((optval = TICKS_TO_S(cfg_get(tcp, tcp_cfg, send_timeout)))) { + optval *= 1000; + if(setsockopt(s, IPPROTO_TCP, TCP_USER_TIMEOUT, &optval, sizeof(optval)) + < 0) { + LM_WARN("failed to set TCP_USER_TIMEOUT: %s\n", strerror(errno)); + } else { + LM_DBG("Set TCP_USER_TIMEOUT=%d ms\n", optval); + } + } +#endif #ifdef HAVE_TCP_QUICKACK if(cfg_get(tcp, tcp_cfg, delayed_ack)) { optval = 0; /* reset quick ack => delayed ack */

1 0

git:master:128ccdc6: modules: readme files regenerated - file_out ... [skip ci]
by Kamailio Dev 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: 128ccdc6330232fd810bd0a35b325e44d5bdf98d URL: https://github.com/kamailio/kamailio/commit/128ccdc6330232fd810bd0a35b325e4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-06-06T15:46:10+02:00 modules: readme files regenerated - file_out ... [skip ci] --- Modified: src/modules/file_out/README --- Diff: https://github.com/kamailio/kamailio/commit/128ccdc6330232fd810bd0a35b325e4… Patch: https://github.com/kamailio/kamailio/commit/128ccdc6330232fd810bd0a35b325e4… --- diff --git a/src/modules/file_out/README b/src/modules/file_out/README index 89ca58147c1..0fcbf640251 100644 --- a/src/modules/file_out/README +++ b/src/modules/file_out/README @@ -23,6 +23,7 @@ Xenofon Karamanos 3.1. base_folder (string) 3.2. file (string) 3.3. worker_usleep (int) + 3.4. timer_interval (int) 4. Functions @@ -35,7 +36,8 @@ Xenofon Karamanos 1.1. Set base_folder parameter 1.2. Set file parameter 1.3. Set worker_usleep parameter - 1.4. file_out usage + 1.4. Set timer_interval parameter + 1.5. file_out usage Chapter 1. Admin Guide @@ -52,6 +54,7 @@ Chapter 1. Admin Guide 3.1. base_folder (string) 3.2. file (string) 3.3. worker_usleep (int) + 3.4. timer_interval (int) 4. Functions @@ -98,6 +101,7 @@ Chapter 1. Admin Guide 3.1. base_folder (string) 3.2. file (string) 3.3. worker_usleep (int) + 3.4. timer_interval (int) 3.1. base_folder (string) @@ -146,6 +150,18 @@ modparam("file_out", "file", "name=accounting;extension=.txt") modparam("file_out", "worker_usleep", "1000") ... +3.4. timer_interval (int) + + The time in seconds which timer will trigger for rotating the files. + Make sure that this value is lower than the interval of the files. + + Default value is “10” (10 s). + + Example 1.4. Set timer_interval parameter +... +modparam("file_out", "timer_interval", "60") +... + 4. Functions 4.1. file_out(filename, string) @@ -157,7 +173,7 @@ modparam("file_out", "worker_usleep", "1000") string to be written to the file. Filename is the name of the file defined in the configuration file as name=filename. - Example 1.4. file_out usage + Example 1.5. file_out usage ... modparam("file_out", "file", "name=accounting;interval=200") modparam("file_out", "file", "name=missed_calls;extension=.json;interval=300")

1 0

[kamailio/kamailio] file_out: Add rotation timer (PR #4263)
by Xenofon Karamanos 06 Jun '25

06 Jun '25

#### 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 introduces a new modparam `timer_interval` to denote the frequency where files are checked for rotation. Also some improvements regarding memory managments and defaults options. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4263 -- Commit Summary -- * file_out: Consistent check * file_out: Memory allocation and copy when used. * file_out: Add debug function * file_out: Add file properties init function * file_out: Rotate files based on timer * file_out: Add require_rotation for better file handling * file_out: Fix missing evaluated PVs * file_out/docs: Add timer_interval doc -- File Changes -- M src/modules/file_out/doc/file_out_admin.xml (23) M src/modules/file_out/file_out.c (193) M src/modules/file_out/types.c (79) M src/modules/file_out/types.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4263.patch https://github.com/kamailio/kamailio/pull/4263.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4263 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4263(a)github.com>

3 3

git:master:92484d73: file_out: docs: Add timer_interval doc
by Henning Westerholt 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: 92484d73b136a95a46e118af6b46b566f5df1875 URL: https://github.com/kamailio/kamailio/commit/92484d73b136a95a46e118af6b46b56… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-06-06T15:43:16+02:00 file_out: docs: Add timer_interval doc --- Modified: src/modules/file_out/doc/file_out_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/92484d73b136a95a46e118af6b46b56… Patch: https://github.com/kamailio/kamailio/commit/92484d73b136a95a46e118af6b46b56… --- diff --git a/src/modules/file_out/doc/file_out_admin.xml b/src/modules/file_out/doc/file_out_admin.xml index ce02069ae83..83b84b6abc6 100644 --- a/src/modules/file_out/doc/file_out_admin.xml +++ b/src/modules/file_out/doc/file_out_admin.xml @@ -190,6 +190,29 @@ modparam("file_out", "worker_usleep", "1000") </example> </section> + <section> + <title> + <varname>timer_interval</varname> (int)</title> + <para> + The time in seconds which timer will trigger for rotating the files. + <emphasis> + Make sure that this value is lower than the interval of the files. + </emphasis> + </para> + <para> + <emphasis> + Default value is <quote>10</quote> (10 s). + </emphasis> + </para> + <example> + <title>Set <varname>timer_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("file_out", "timer_interval", "60") +... + </programlisting> + </example> + </section> </section> <section>

1 0

git:master:9b5ad5d1: file_out: Fix missing evaluated PVs
by Henning Westerholt 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: 9b5ad5d1d814bc9ba4c41dc02bac4362268ec37f URL: https://github.com/kamailio/kamailio/commit/9b5ad5d1d814bc9ba4c41dc02bac436… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-06-06T15:43:16+02:00 file_out: Fix missing evaluated PVs --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/9b5ad5d1d814bc9ba4c41dc02bac436… Patch: https://github.com/kamailio/kamailio/commit/9b5ad5d1d814bc9ba4c41dc02bac436… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index ce43c1f3a32..6ec2a950119 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -548,6 +548,7 @@ static int fo_init_file(const int index) LM_ERR("Couldn't open file %s\n", strerror(errno)); return -1; } + return 1; } @@ -643,12 +644,8 @@ static int fo_write_to_file(sip_msg_t *msg, char *index, char *log_message) return -1; } - fo_prefix_str.s = fo_prefix_buf; - fo_prefix_str.len = buf_size; - if(pv_printf(msg, fo_files[file_index].fo_prefix_pvs, fo_prefix_str.s, - &fo_prefix_str.len) - == 0 - && fo_prefix_str.len > 0) { + if(pv_printf_s(msg, fo_files[file_index].fo_prefix_pvs, &fo_prefix_str) + == 0) { fo_prefix_val.s = fo_prefix_str.s; fo_prefix_val.len = fo_prefix_str.len; }

1 0

git:master:59a23249: file_out: Add require_rotation for better file handling
by Henning Westerholt 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: 59a23249c9ddf64119d6129123b3c610de66d6f3 URL: https://github.com/kamailio/kamailio/commit/59a23249c9ddf64119d6129123b3c61… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-06-06T15:43:16+02:00 file_out: Add require_rotation for better file 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/59a23249c9ddf64119d6129123b3c61… Patch: https://github.com/kamailio/kamailio/commit/59a23249c9ddf64119d6129123b3c61…

1 0

git:master:a841fd25: file_out: Rotate files based on timer
by Henning Westerholt 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: a841fd2539ed8c13184face4fdf6215a917162cc URL: https://github.com/kamailio/kamailio/commit/a841fd2539ed8c13184face4fdf6215… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-06-06T15:43:16+02:00 file_out: Rotate files based on timer --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/a841fd2539ed8c13184face4fdf6215… Patch: https://github.com/kamailio/kamailio/commit/a841fd2539ed8c13184face4fdf6215…

1 0

git:master:ca72b648: file_out: Add file properties init function
by Henning Westerholt 06 Jun '25

06 Jun '25

Module: kamailio Branch: master Commit: ca72b6487fbed30be4ca83f7864c2ac1a29c647e URL: https://github.com/kamailio/kamailio/commit/ca72b6487fbed30be4ca83f7864c2ac… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-06-06T15:43:16+02:00 file_out: Add file properties init function --- Modified: src/modules/file_out/types.c Modified: src/modules/file_out/types.h --- Diff: https://github.com/kamailio/kamailio/commit/ca72b6487fbed30be4ca83f7864c2ac… Patch: https://github.com/kamailio/kamailio/commit/ca72b6487fbed30be4ca83f7864c2ac… --- diff --git a/src/modules/file_out/types.c b/src/modules/file_out/types.c index 1b5ffc4c6cb..9c2056ef59e 100644 --- a/src/modules/file_out/types.c +++ b/src/modules/file_out/types.c @@ -121,6 +121,41 @@ void fo_free_queue(fo_queue_t *q) shm_free(q); } +int fo_file_properties_init(fo_file_properties_t *fp) +{ + if(fp == NULL) { + return -1; + } + + /* Malloc member for each element required */ + fp->fo_base_filename.s = (char *)shm_malloc(FO_MAX_PATH_LEN * sizeof(char)); + if(fp->fo_base_filename.s == NULL) { + LM_ERR("Failed to allocate memory for base filename\n"); + return -1; + } + fp->fo_extension.s = (char *)shm_malloc(10 * sizeof(char)); + if(fp->fo_extension.s == NULL) { + LM_ERR("Failed to allocate memory for extension\n"); + return -1; + } + + fp->fo_prefix.s = (char *)shm_malloc(4096 * sizeof(char)); + if(fp->fo_prefix.s == NULL) { + LM_ERR("Failed to allocate memory for prefix\n"); + return -1; + } + fp->fo_stored_timestamp = time(NULL); + fp->fo_interval_seconds = 0; + + fp->fo_prefix_pvs = (pv_elem_t *)shm_malloc(sizeof(pv_elem_t)); + if(fp->fo_prefix_pvs == NULL) { + LM_ERR("Failed to allocate memory for prefix pvs\n"); + return -1; + } + + return 1; +} + int fo_file_properties_destroy(fo_file_properties_t *fp) { if(fp == NULL) { diff --git a/src/modules/file_out/types.h b/src/modules/file_out/types.h index 940c6f7476b..27d3884ffc9 100644 --- a/src/modules/file_out/types.h +++ b/src/modules/file_out/types.h @@ -27,6 +27,7 @@ #include "../../core/pvar.h" #define FO_MAX_FILES 10 /* Maximum number of files */ +#define FO_MAX_PATH_LEN 2048 typedef struct log_message { @@ -65,6 +66,7 @@ typedef struct fo_file_properties FILE *fo_file_output; } fo_file_properties_t; +int fo_file_properties_init(fo_file_properties_t *fp); int fo_file_properties_destroy(fo_file_properties_t *fp); int fo_file_properties_print(const fo_file_properties_t file_prop);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev