sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
245 discussions

git:master:49bc5b26: rtpengine: new modparam to disable pinging rtpengines at startup
by Daniel-Constantin Mierla 01 Feb '24

01 Feb '24

Module: kamailio Branch: master Commit: 49bc5b266dad33e418e8895e9ed7ead46e254016 URL: https://github.com/kamailio/kamailio/commit/49bc5b266dad33e418e8895e9ed7ead… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-01T21:38:25+01:00 rtpengine: new modparam to disable pinging rtpengines at startup --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/49bc5b266dad33e418e8895e9ed7ead… Patch: https://github.com/kamailio/kamailio/commit/49bc5b266dad33e418e8895e9ed7ead… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 74983124964..c0727ed4e19 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -347,6 +347,7 @@ static enum hash_algo_t hash_algo = RTP_HASH_CALLID; static str rtpengine_dtmf_event_sock; static int rtpengine_dtmf_event_fd; int dtmf_event_rt = -1; /* default disabled */ +static int rtpengine_ping_mode = 1; /* clang-format off */ typedef struct rtpp_set_link { @@ -465,6 +466,7 @@ static param_export_t params[] = { &default_rtpengine_cfg.rtpengine_tout_ms}, {"rtpengine_allow_op", INT_PARAM, &rtpengine_allow_op}, {"control_cmd_tos", INT_PARAM, &control_cmd_tos}, + {"ping_mode", PARAM_INT, &rtpengine_ping_mode}, {"db_url", PARAM_STR, &rtpp_db_url}, {"table_name", PARAM_STR, &rtpp_table_name}, {"setid_col", PARAM_STR, &rtpp_setid_col}, @@ -2519,7 +2521,7 @@ static int child_init(int rank) /* Iterate known RTPEngine instances - create sockets */ if(rank == PROC_SIPINIT) { /* probe rtpengines only in first worker */ - if(build_rtpp_socks(0, 1)) + if(build_rtpp_socks(0, rtpengine_ping_mode)) return -1; else { if(build_rtpp_socks(0, 0))

1 0

git:master:40b73521: rtpengine: optional ping parameter for rpc reload command
by Daniel-Constantin Mierla 01 Feb '24

01 Feb '24

Module: kamailio Branch: master Commit: 40b735216c610cae2da5b0758af31b1d3ade4731 URL: https://github.com/kamailio/kamailio/commit/40b735216c610cae2da5b0758af31b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-01T21:38:25+01:00 rtpengine: optional ping parameter for rpc reload command - specify if ping should be done to rtpengines at reload time --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/40b735216c610cae2da5b0758af31b1… Patch: https://github.com/kamailio/kamailio/commit/40b735216c610cae2da5b0758af31b1… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index e3e4c6e1d50..74983124964 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1609,6 +1609,8 @@ static int rtpp_test_ping(struct rtpp_node *node) static void rtpengine_rpc_reload(rpc_t *rpc, void *ctx) { time_t tnow; + int rping = 1; + int n = 0; if(rtpp_db_url.s == NULL) { // no database @@ -1621,6 +1623,13 @@ static void rtpengine_rpc_reload(rpc_t *rpc, void *ctx) return; } + n = rpc->scan(ctx, "*d", &rping); + if(n != 1) { + rping = 1; + } else if(rping != 0) { + rping = 1; + } + tnow = time(NULL); if(tnow - _rtpe_list_version->vertime < RTPE_LIST_VERSION_DELAY) { rpc->fault(ctx, 500, "Too short reload interval - try later"); @@ -1634,7 +1643,7 @@ static void rtpengine_rpc_reload(rpc_t *rpc, void *ctx) return; } - if(build_rtpp_socks(1, 1)) { + if(build_rtpp_socks(1, rping)) { rpc->fault(ctx, 500, "Failed to build rtpengine sockets"); return; }

1 0

[kamailio/kamailio] New module/file_out: Module to log custom strings to file (PR #3741)
by Xenofon Karamanos 01 Feb '24

01 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 pull request is intended to introduce a new, straightforward module that can efficiently stream output to files while also handling changes based on a specific interval. The module contains only one function that streams a chunk of text to the current output file handle associated with the given file index. It's not 100% completed but the basic features are there. Any reviews and of course naming of the module, much appreciated. --- How the module works: - Set parameter `base_folder` to define where you want your logs to be saved. - Set `base_filename` (up to 10) to define the names of your files. Each is associated with an index according to the order you defined it. First `base_filename`'s index is 0, second's index is 1 and so on. This is appended with a new timestamp when `interval_seconds` are passed. - Set `interval_seconds` to define how much time before the file is closed and a new one is opened. Right now shared for all files. - Set `extension` to define what should be the extension of files. Right now shared for all files. Use the provided function `file_out` to write any text (including pvs) to a specific file you want. --- **Example:** Define parameters such as: ``` # kamailio.cfg ... loadmodule "file_out.so" modparam("file_out", "base_folder", "/tmp/kamailio/file_out/") modparam("file_out", "base_filename", "accounting") modparam("file_out", "base_filename", "missed_calls") modparam("file_out","interval_seconds", 600) modparam("file_out","extension", ".txt") ... request_route { ... file_out("0", "Writing to accounting.txt file $rm from $fu (IP:$si:$sp)"); file_out("1", "Writing to missed_calls.txt file $rm from $fu (IP:$si:$sp)"); ... } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3741 -- Commit Summary -- * file_out: Add new module * file_out: Add docs -- File Changes -- A src/modules/file_out/Makefile (8) A src/modules/file_out/doc/Makefile (4) A src/modules/file_out/doc/file_out.xml (39) A src/modules/file_out/doc/file_out_admin.xml (191) A src/modules/file_out/file_out.c (380) A src/modules/file_out/types.c (88) A src/modules/file_out/types.h (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3741.patch https://github.com/kamailio/kamailio/pull/3741.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3741 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3741(a)github.com>

4 14

git:master:df3d1e5c: file_out: use name instead of index for file_out function parameter
by Henning Westerholt 01 Feb '24

01 Feb '24

Module: kamailio Branch: master Commit: df3d1e5cb80b7a6ac6ce93b582352aaa8e6fd369 URL: https://github.com/kamailio/kamailio/commit/df3d1e5cb80b7a6ac6ce93b582352aa… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-01T19:41:22Z file_out: use name instead of index for file_out function parameter --- 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/df3d1e5cb80b7a6ac6ce93b582352aa… Patch: https://github.com/kamailio/kamailio/commit/df3d1e5cb80b7a6ac6ce93b582352aa… --- diff --git a/src/modules/file_out/doc/file_out_admin.xml b/src/modules/file_out/doc/file_out_admin.xml index b59efdad79f..3054af61672 100644 --- a/src/modules/file_out/doc/file_out_admin.xml +++ b/src/modules/file_out/doc/file_out_admin.xml @@ -166,8 +166,8 @@ modparam("file_out", "base_filename", "accounting") modparam("file_out", "base_filename", "missed_calls") request_route { - file_out("0", "Writing to accounting.out file $rm from $fu"); - file_out("1", "Writing to missed_calls.out file $rm from $fu"); + file_out("accounting", "Writing to accounting.out file $rm from $fu"); + file_out("missed_calls", "Writing to missed_calls.out file $rm from $fu"); } ... </programlisting> diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 04cc041aa86..1b9bfba7bb0 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -51,6 +51,7 @@ static int fo_init_file(const int index); static int fo_close_file(const int index); static int fo_check_interval(); 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_count_assigned_files(); static void fo_log_writer_process(int rank); static int fo_add_filename(modparam_t type, void *val); @@ -201,6 +202,37 @@ static void fo_log_writer_process(int rank) } } +static int fo_fixup_str_index(void **param, int param_no) +{ + + fparam_t *p; + int index = 0; + + p = (fparam_t *)pkg_malloc(sizeof(fparam_t)); + if(!p) { + PKG_MEM_ERROR; + return E_OUT_OF_MEM; + } + memset(p, 0, sizeof(fparam_t)); + p->orig = *param; + + /* Map string to index */ + while(index < *fo_number_of_files) { + if(strcmp(fo_base_filename[index], (char *)*param) == 0) { + LM_DBG("Found index %d for %s\n", index, (char *)*param); + p->v.i = (int)index; + p->fixed = (void *)(long)index; + p->type = FPARAM_INT; + *param = (void *)p; + return 0; + } + index++; + } + + LM_ERR("Couldn't find index for %s\n", (char *)*param); + pkg_free(p); + return -1; +} /* * fixup function for two parameters * 1st param: int @@ -209,7 +241,7 @@ static void fo_log_writer_process(int rank) static int fo_fixup_int_pvar(void **param, int param_no) { if(param_no == 1) { - return fixup_igp_null(param, param_no); + return fo_fixup_str_index(param, param_no); } else if(param_no == 2) { return fixup_var_pve_str_12(param, param_no); }

1 0

git:master:6478ac00: file_out: adjust syntax of examples to standard
by Henning Westerholt 01 Feb '24

01 Feb '24

Module: kamailio Branch: master Commit: 6478ac00e9bf1180092010b0df4656630d4550c2 URL: https://github.com/kamailio/kamailio/commit/6478ac00e9bf1180092010b0df46566… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-01T19:33:38Z file_out: adjust syntax of examples to standard --- Modified: src/modules/file_out/doc/file_out_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6478ac00e9bf1180092010b0df46566… Patch: https://github.com/kamailio/kamailio/commit/6478ac00e9bf1180092010b0df46566… --- diff --git a/src/modules/file_out/doc/file_out_admin.xml b/src/modules/file_out/doc/file_out_admin.xml index a701156ccba..b59efdad79f 100644 --- a/src/modules/file_out/doc/file_out_admin.xml +++ b/src/modules/file_out/doc/file_out_admin.xml @@ -76,9 +76,9 @@ <example> <title>Set <varname>base_folder</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("file_out", "base_folder", "/tmp/file_out/") - ... +... +modparam("file_out", "base_folder", "/tmp/file_out/") +... </programlisting> </example> @@ -95,9 +95,9 @@ <example> <title>Set <varname>base_filename</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("file_out", "base_filename", "accounting") - ... +... +modparam("file_out", "base_filename", "accounting") +... </programlisting> </example> @@ -114,9 +114,9 @@ <example> <title>Set <varname>extension</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("file_out", "extension", ".txt") - ... +... +modparam("file_out", "extension", ".txt") +... </programlisting> </example> @@ -133,9 +133,9 @@ <example> <title>Set <varname>interval_seconds</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("file_out", "interval_seconds", "300") - ... +... +modparam("file_out", "interval_seconds", "300") +... </programlisting> </example> @@ -161,16 +161,15 @@ <title> <function>file_out</function> usage</title> <programlisting format="linespecific"> - ... - modparam("file_out", "base_filename", "accounting") - modparam("file_out", "base_filename", "missed_calls") - ... - request_route { - - file_out("0", "Writing to accounting.out file $rm from $fu (IP:$si:$sp)"); - file_out("1", "Writing to missed_calls.out file $rm from $fu (IP:$si:$sp)"); - ... - } +... +modparam("file_out", "base_filename", "accounting") +modparam("file_out", "base_filename", "missed_calls") + +request_route { + file_out("0", "Writing to accounting.out file $rm from $fu"); + file_out("1", "Writing to missed_calls.out file $rm from $fu"); +} +... </programlisting> </example> </section>

1 0

git:master:a6892009: file_out: fix error in XML include for README
by Henning Westerholt 01 Feb '24

01 Feb '24

Module: kamailio Branch: master Commit: a6892009361ceff1475b568a2317b5d8a7c889cc URL: https://github.com/kamailio/kamailio/commit/a6892009361ceff1475b568a2317b5d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-01T19:25:12Z file_out: fix error in XML include for README --- Modified: src/modules/file_out/doc/file_out.xml --- Diff: https://github.com/kamailio/kamailio/commit/a6892009361ceff1475b568a2317b5d… Patch: https://github.com/kamailio/kamailio/commit/a6892009361ceff1475b568a2317b5d… --- diff --git a/src/modules/file_out/doc/file_out.xml b/src/modules/file_out/doc/file_out.xml index 16f15f7f9c5..d55415bef86 100644 --- a/src/modules/file_out/doc/file_out.xml +++ b/src/modules/file_out/doc/file_out.xml @@ -34,6 +34,6 @@ </bookinfo> <toc></toc> - <xi:include href="fileout_admin.xml"/> + <xi:include href="file_out_admin.xml"/> </book>

1 0

git:master:4c144ac1: file_out: small doc adaptions
by Henning Westerholt 01 Feb '24

01 Feb '24

Module: kamailio Branch: master Commit: 4c144ac1ad40008b5bd9396aa18d7630145b4c4c URL: https://github.com/kamailio/kamailio/commit/4c144ac1ad40008b5bd9396aa18d763… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-01T19:22:53Z file_out: small doc adaptions --- Modified: src/modules/file_out/doc/file_out_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4c144ac1ad40008b5bd9396aa18d763… Patch: https://github.com/kamailio/kamailio/commit/4c144ac1ad40008b5bd9396aa18d763… --- diff --git a/src/modules/file_out/doc/file_out_admin.xml b/src/modules/file_out/doc/file_out_admin.xml index ed6b18268d0..a701156ccba 100644 --- a/src/modules/file_out/doc/file_out_admin.xml +++ b/src/modules/file_out/doc/file_out_admin.xml @@ -17,15 +17,15 @@ <section> <title>Overview</title> <para> - This is a simple module to support fast streaming output to file name - and handle that changes on an interval. It implements only one function - that streams a chunk of text to the current output file handle. + This is a small module to support fast streaming output to files + and process this changes depending on an interval. It implements only one + function that streams a chunk of text to the current output file handle. </para> <para> The module can be used to write logs for up to 10 different log files. Each log file can be configured to have a different name and extension. - String can contain pseudo-variables. The module will replace the - pseudo-variables with the actual values. The module will also rotate + The processed string can contain pseudo-variables. The module will replace + the pseudo-variables with the actual values. The module will also rotate the log files at a specified interval. The interval is specified in seconds. </para> </section>

1 0

git:master:dd5c9a52: file_out: Module to log custom strings to files (GH #3741)
by GitHub 01 Feb '24

01 Feb '24

Module: kamailio Branch: master Commit: dd5c9a5204eb946e731550a0ee7f3046c7065515 URL: https://github.com/kamailio/kamailio/commit/dd5c9a5204eb946e731550a0ee7f304… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: GitHub <noreply(a)github.com> Date: 2024-02-01T18:15:17+01:00 file_out: Module to log custom strings to files (GH #3741) * add new module to log custom strings to files (GH #3741) * support for multiple files and also file balancing * smaller refactorings will be done afterwards (use string in function for names with internal matching, make worker sleep also configurable * a round of tests has been done, but it will be certainly tested more in the next days --- Added: src/modules/file_out/Makefile Added: src/modules/file_out/doc/Makefile Added: src/modules/file_out/doc/file_out.xml Added: src/modules/file_out/doc/file_out_admin.xml Added: src/modules/file_out/file_out.c Added: src/modules/file_out/types.c Added: src/modules/file_out/types.h --- Diff: https://github.com/kamailio/kamailio/commit/dd5c9a5204eb946e731550a0ee7f304… Patch: https://github.com/kamailio/kamailio/commit/dd5c9a5204eb946e731550a0ee7f304…

1 0

git:master:f0ef9d29: Makefile.groups: added influxdbc module to extra group
by Daniel-Constantin Mierla 01 Feb '24

01 Feb '24

Module: kamailio Branch: master Commit: f0ef9d29e8736e7eb7e7e2c62485704d3506fbdd URL: https://github.com/kamailio/kamailio/commit/f0ef9d29e8736e7eb7e7e2c62485704… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-01T13:49:17+01:00 Makefile.groups: added influxdbc module to extra group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/f0ef9d29e8736e7eb7e7e2c62485704… Patch: https://github.com/kamailio/kamailio/commit/f0ef9d29e8736e7eb7e7e2c62485704… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index df1fde094af..a9b7d16133f 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -23,7 +23,7 @@ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect \ xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ log_custom keepalive ss7ops acc_diameter evrexec \ - sipjson lrkproxy math posops xhttp_prom dlgs sworker + sipjson lrkproxy math posops xhttp_prom dlgs sworker influxdbc # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

git:master:ff94b5a6: influxdbc: added functions to push string and double values
by Daniel-Constantin Mierla 01 Feb '24

01 Feb '24

Module: kamailio Branch: master Commit: ff94b5a691c525ed5687ad76bbf5436a8d877768 URL: https://github.com/kamailio/kamailio/commit/ff94b5a691c525ed5687ad76bbf5436… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-01T13:49:17+01:00 influxdbc: added functions to push string and double values --- Modified: src/modules/influxdbc/influxdbc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ff94b5a691c525ed5687ad76bbf5436… Patch: https://github.com/kamailio/kamailio/commit/ff94b5a691c525ed5687ad76bbf5436… --- diff --git a/src/modules/influxdbc/influxdbc_mod.c b/src/modules/influxdbc/influxdbc_mod.c index 713540fe8d4..b1c79b4b494 100644 --- a/src/modules/influxdbc/influxdbc_mod.c +++ b/src/modules/influxdbc/influxdbc_mod.c @@ -49,6 +49,8 @@ static int w_influxdbc_measure(sip_msg_t *msg, char *pname, char *p2); static int w_influxdbc_measureend(sip_msg_t *msg, char *p1, char *p2); 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 mod_init(void); static int child_init(int); @@ -64,6 +66,10 @@ static cmd_export_t cmds[] = { 0, 0, 0, ANY_ROUTE}, {"influxdbc_long", (cmd_function)w_influxdbc_long, 2, fixup_spve_igp, 0, ANY_ROUTE}, + {"influxdbc_string", (cmd_function)w_influxdbc_string, + 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"influxdbc_double", (cmd_function)w_influxdbc_double, + 2, fixup_spve_spve, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -195,6 +201,53 @@ static int w_influxdbc_long(sip_msg_t *msg, char *pname, char *pvalue) return 1; } +/** + * + */ +static int w_influxdbc_string(sip_msg_t *msg, char *pname, char *pvalue) +{ + str sname; + str sval; + + if(fixup_get_svalue(msg, (gparam_t *)pname, &sname) != 0) { + LM_ERR("unable to get name parameter\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t *)pvalue, &sval) != 0) { + LM_ERR("unable to get value parameter\n"); + return -1; + } + + ic_string(sname.s, sval.s); + + return 1; +} + + +/** + * + */ +static int w_influxdbc_double(sip_msg_t *msg, char *pname, char *pvalue) +{ + str sname; + str sval; + double dval = 0.0; + + if(fixup_get_svalue(msg, (gparam_t *)pname, &sname) != 0) { + LM_ERR("unable to get name parameter\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t *)pvalue, &sval) != 0) { + LM_ERR("unable to get value parameter\n"); + return -1; + } + + ic_double(sname.s, dval); + + return 1; +} + + /** * */

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 February 2024