sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
244 discussions

[kamailio/kamailio] db_unixodbc: MariaDB partition is a reserved word and not quoted (Issue #3742)
by space88man 02 Feb '24

02 Feb '24

### Description partition is now a reserved word in MariaDB 10. the column name is correctly quoted with native libmysqlclient/libmariadb so works the column name is not quoted with unixodbc+(libmyodbc8|libmaodbc) and so fails ### Troubleshooting try unquoted insert -- fails unixodbc+libmaodbc insert into location (partition) values (1000); -- works native libmysqlclient|libmariadb insert into location (`partition`) values (1000); #### Reproduction 1. config enable usrloc / registrar with unixodbc + MySQL/MariaDB connector #### Debugging Data SQL insert into statement fails -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3742 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3742(a)github.com>

3 5

Development for v5.8.x is frozen
by Daniel-Constantin Mierla 02 Feb '24

02 Feb '24

Hello, the formal notification that the development for the next major version 5.8.0 is now frozen. The focus has to be on testing the master branch. Also, the master branch should not get commits with new features till the branch 5.8 is created, expected to happen in 2-4 weeks, a matter of how testing goes on. Meanwhile, the commits with new features in the C code can be pushed to personal branches, new pull requests can still be done, but they will be merged after branching 5.8. Can still be done commits with documentation improvements, enhancements to related tools (e.g., kamctl, kamcmd), merging exiting pull requests at this moment, exporting missing KEMI functions and completing the functionality of the new modules added for 5.8. Once the branch 5.8 is created, new features can be pushed again to master branch as usual. From that moment, the v5.8.0 should be out very soon, time used for further testing but also preparing the release of packages. If someone is not sure if a commit brings a new feature, just make a pull request and it can be discussed there on github portal or via sr-dev mailing list. A summary of what is new in upcoming 5.8 is going to be built at: * https://www.kamailio.org/wikidocs/features/new-in-5.8.x/ Upgrade guidelines will be collected at: * https://www.kamailio.org/wikidocs/install/upgrade/5.7.x-to-5.8.0/ Everyone is more than welcome to contribute to the above wiki pages, especially to the upgrade guidelines, to help everyone else during the migration process from v5.7.x to 5.8.x. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio Advanced Training, February 20-22, 2024 -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

1 0

git:master:1fcf9981: file_out: make worker sleep period configurable, to allow to adapt performance parameters
by Henning Westerholt 02 Feb '24

02 Feb '24

Module: kamailio Branch: master Commit: 1fcf99817580379d3e7550d1d874050a3e0315bc URL: https://github.com/kamailio/kamailio/commit/1fcf99817580379d3e7550d1d874050… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-02T13:16:08Z file_out: make worker sleep period configurable, to allow to adapt performance parameters --- 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/1fcf99817580379d3e7550d1d874050… Patch: https://github.com/kamailio/kamailio/commit/1fcf99817580379d3e7550d1d874050… --- diff --git a/src/modules/file_out/doc/file_out_admin.xml b/src/modules/file_out/doc/file_out_admin.xml index 3054af61672..bcb3f5d14e9 100644 --- a/src/modules/file_out/doc/file_out_admin.xml +++ b/src/modules/file_out/doc/file_out_admin.xml @@ -135,6 +135,25 @@ modparam("file_out", "extension", ".txt") <programlisting format="linespecific"> ... modparam("file_out", "interval_seconds", "300") +... + </programlisting> + </example> + + <title> + <varname>worker_usleep</varname> (int)</title> + <para> + The time in microseconds which worker will sleep for until next iteration. + </para> + <para> + <emphasis> + Default value is <quote>10000</quote> (10 ms). + </emphasis> + </para> + <example> + <title>Set <varname>worker_usleep</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("file_out", "worker_usleep", "1000") ... </programlisting> </example> diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 1b9bfba7bb0..dada154eb12 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -61,6 +61,7 @@ char *fo_base_folder = "/var/log/kamailio/file_out/"; char *fo_base_filename[FO_MAX_FILES] = {""}; char *fo_extension = ".out"; int fo_interval_seconds = 10 * 60; +int fo_worker_usleep = 10000; /* Shared variables */ fo_queue_t *fo_queue = NULL; @@ -78,7 +79,8 @@ static param_export_t params[] = { {"base_folder", PARAM_STRING, &fo_base_folder}, {"base_filename", PARAM_STRING | PARAM_USE_FUNC, &fo_add_filename}, {"interval_seconds", PARAM_INT, &fo_interval_seconds}, - {"extension", PARAM_STRING, &fo_extension}, {0, 0, 0}}; + {"extension", PARAM_STRING, &fo_extension}, + {"worker_usleep", PARAM_INT, &fo_worker_usleep}, {0, 0, 0}}; struct module_exports exports = { "file_out", /* module name */ @@ -139,7 +141,7 @@ static int child_init(int rank) return 0; } - pid = fork_process(PROC_NOCHLDINIT, "log_writ", 1); + pid = fork_process(PROC_NOCHLDINIT, "fo_writer", 1); if(pid < 0) { LM_ERR("fork failed\n"); return -1; /* error */ @@ -159,7 +161,7 @@ static int child_init(int rank) /* update the local config framework structures */ cfg_update(); - usleep(10000); + usleep(fo_worker_usleep); fo_log_writer_process(rank); } // return 0;

1 0

[kamailio/kamailio] core: Fix check to also work for KEMI framework (PR #3718)
by Xenofon Karamanos 02 Feb '24

02 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 - [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 an issue regarding KEMI framework for onsend_route. KSR.set_drop() in [ksr_onsend_route](https://www.kamailio.org/wikidocs/cookbooks/5.7.x/core/#o… does not make kamailio dropping the message when using kemi (python3) (probably holds true for other engines too): This is exactly the example from [documentation](https://kamailio.org/docs/tutorials/devel/kamailio-kemi-fram…: ``` def ksr_onsend_route(self, msg): KSR.set_drop() exit() ``` The issue arises because we are not setting `ret = 0` when the drop flag is set, but instead check if it's not set to return `ret=1` (The case for native that returns `0` but no `DROP_R_F` was set). **Note**: KEMI Case: `ret = 1` always See [app_python3/apy_kemi.c](https://github.com/kamailio/kamailio/blob/79697b4d5… Native case: `ret` can be `0` for drop, or `1` for success You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3718 -- Commit Summary -- * core: Fix check to also work for KEMI framework -- File Changes -- M src/core/onsend.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3718.patch https://github.com/kamailio/kamailio/pull/3718.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3718 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3718(a)github.com>

2 3

git:master:82593a09: core: properly handle drop() action for kemi engines
by Daniel-Constantin Mierla 02 Feb '24

02 Feb '24

Module: kamailio Branch: master Commit: 82593a09f8ef6d53e7e88238c057bbcdd9ab287b URL: https://github.com/kamailio/kamailio/commit/82593a09f8ef6d53e7e88238c057bbc… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-02T10:56:41+01:00 core: properly handle drop() action for kemi engines - GH #3718 --- Modified: src/core/onsend.c --- Diff: https://github.com/kamailio/kamailio/commit/82593a09f8ef6d53e7e88238c057bbc… Patch: https://github.com/kamailio/kamailio/commit/82593a09f8ef6d53e7e88238c057bbc… --- diff --git a/src/core/onsend.c b/src/core/onsend.c index a4d81781de7..84186cd67ed 100644 --- a/src/core/onsend.c +++ b/src/core/onsend.c @@ -87,7 +87,18 @@ int run_onsend(sip_msg_t *orig_msg, dest_info_t *dst, char *buf, int len) orig_msg->fwd_send_flags = fwd_snd_flags_bak; orig_msg->rpl_send_flags = rpl_snd_flags_bak; exec_post_script_cb(orig_msg, ONSEND_CB_TYPE); - if((ret == 0) && !(ra_ctx.run_flags & DROP_R_F)) { + /* - handle drop action with flag DROP_R_F + * KEMI case (python,lua,jsdt) + * ret = 1 always + * Native case: + * ret = 1 success + * ret = 0 drop the message + */ + if(ra_ctx.run_flags & DROP_R_F) { + ret = 0; + } else if(ret == 0) { + /* native case where run_actions return 0 + * but DROP_R_F is not set */ ret = 1; } } else {

1 0

git:master:a2268239: influxdbc: fix compile warnings
by Daniel-Constantin Mierla 02 Feb '24

02 Feb '24

Module: kamailio Branch: master Commit: a226823910735c315fc31df0e46132710db38def URL: https://github.com/kamailio/kamailio/commit/a226823910735c315fc31df0e461327… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-02T09:27:10+01:00 influxdbc: fix compile warnings --- Modified: src/modules/influxdbc/ic.c --- Diff: https://github.com/kamailio/kamailio/commit/a226823910735c315fc31df0e461327… Patch: https://github.com/kamailio/kamailio/commit/a226823910735c315fc31df0e461327… --- diff --git a/src/modules/influxdbc/ic.c b/src/modules/influxdbc/ic.c index 093eb5dd60b..09ab462ffcb 100644 --- a/src/modules/influxdbc/ic.c +++ b/src/modules/influxdbc/ic.c @@ -145,8 +145,6 @@ void ic_influx_userpw(char *user, char *pw) int create_socket() /* returns 1 for error and 0 for ok */ { - int i; - static char buffer[4096]; static struct sockaddr_in serv_addr; if(debug) @@ -171,11 +169,11 @@ int create_socket() /* returns 1 for error and 0 for ok */ void ic_check(long adding) /* Check the buffer space */ { - if(output == (char *)0) { /* First time create the buffer * - if( (output = (char *)malloc(MEGABYTE)) == (char *)-1) + if(output == (char *)0) { /* First time create the buffer */ + /* if( (output = (char *)malloc(MEGABYTE)) == (char *)-1) error("failed to malloc() output buffer"); } - if(output_char + (2*adding) > output_size) /* When near the end of the output buffer, extend it*/ + if(output_char + (2*adding) > output_size) */ /* When near the end of the output buffer, extend it*/ if((output = (char *)realloc(output, output_size + MEGABYTE)) == (char *)-1) error("failed to realloc() output buffer"); @@ -293,7 +291,6 @@ void ic_string(char *name, char *value) void ic_push() { - char header[1024]; char result[1024]; char buffer[1024 * 8]; int ret;

1 0

git:master:b85471a7: Makefile.defs: version set to 5.8.0-pre0
by Daniel-Constantin Mierla 02 Feb '24

02 Feb '24

Module: kamailio Branch: master Commit: b85471a7c28324fcb890961a1ad67810bfbb8ac4 URL: https://github.com/kamailio/kamailio/commit/b85471a7c28324fcb890961a1ad6781… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-02T08:56:52+01:00 Makefile.defs: version set to 5.8.0-pre0 - mark start of testing for v5.8.x series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b85471a7c28324fcb890961a1ad6781… Patch: https://github.com/kamailio/kamailio/commit/b85471a7c28324fcb890961a1ad6781… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index b3067c493d3..0b6086d0a3d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 8 SUBLEVEL = 0 -EXTRAVERSION = -dev3 +EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:8c5e9758: Makefile.defs: version set to 5.8.0-dev3
by Daniel-Constantin Mierla 02 Feb '24

02 Feb '24

Module: kamailio Branch: master Commit: 8c5e97589fc0fed121ee6e8ca4adbf9ec63ad2eb URL: https://github.com/kamailio/kamailio/commit/8c5e97589fc0fed121ee6e8ca4adbf9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-02T08:55:38+01:00 Makefile.defs: version set to 5.8.0-dev3 - mark end of development for v5.8.x series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/8c5e97589fc0fed121ee6e8ca4adbf9… Patch: https://github.com/kamailio/kamailio/commit/8c5e97589fc0fed121ee6e8ca4adbf9… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index b088bcfffe2..b3067c493d3 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 8 SUBLEVEL = 0 -EXTRAVERSION = -dev2 +EXTRAVERSION = -dev3 # memory manager switcher # 0 - f_malloc (fast malloc) @@ -2212,4 +2212,3 @@ export $(saved_chg_vars) endif # ifneq ($(exported_vars),1) endif # ifeq ($(makefile_defs),1) -

1 0

git:master:03e60c80: Makefile.groups: added file_out to extra group
by Daniel-Constantin Mierla 02 Feb '24

02 Feb '24

Module: kamailio Branch: master Commit: 03e60c809a0ac26b402bdf1154d6ec7b0476f26a URL: https://github.com/kamailio/kamailio/commit/03e60c809a0ac26b402bdf1154d6ec7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-02T07:35:48+01:00 Makefile.groups: added file_out to extra group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/03e60c809a0ac26b402bdf1154d6ec7… Patch: https://github.com/kamailio/kamailio/commit/03e60c809a0ac26b402bdf1154d6ec7… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index a9b7d16133f..fec21d47bdd 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -22,7 +22,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ 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 \ + log_custom keepalive ss7ops acc_diameter evrexec file_out \ sipjson lrkproxy math posops xhttp_prom dlgs sworker influxdbc # - common modules depending on database

1 0

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

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