sr-dev November 2024

sr-dev@lists.kamailio.org

20 participants
372 discussions

[kamailio/kamailio] Fixed segfault when using kazoo_query in kazoo mod (PR #4002)
by Remco van Vugt 19 Nov '24

19 Nov '24

A response to the amqp query caused a segfault in libc - Refactored parts of the code to be more readable and DRY - Split up functions for 3/4/5 arguments passed - Tested in 8.5.2 #### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description The current state of the module was not usable anymore as everything up from 5.5.x caused a segfault when the kazoo_query method was executed. Refactored the module a bit to make sure it is works again 5.8.x You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4002 -- Commit Summary -- * Fixed segfault when using kazoo_query in kazoo mod -- File Changes -- M src/modules/kazoo/kazoo.c (10) M src/modules/kazoo/kz_amqp.c (67) M src/modules/kazoo/kz_amqp.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4002.patch https://github.com/kamailio/kamailio/pull/4002.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4002 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4002(a)github.com>

3 16

git:master:5a4b91e9: kazoo: fixed segfault when using kazoo_query
by Daniel-Constantin Mierla 19 Nov '24

19 Nov '24

Module: kamailio Branch: master Commit: 5a4b91e92b03160e13ef83ad486fb64fdae71c7f URL: https://github.com/kamailio/kamailio/commit/5a4b91e92b03160e13ef83ad486fb64… Author: Remco van Vugt <r.vanvugt(a)raffel.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T16:05:27+01:00 kazoo: fixed segfault when using kazoo_query - Refactored parts of the code to be more readable and DRY - Split up functions for 3/4/5 arguments passed to avoid segfault - Fixed pseudovar allocation for returning results - Tested in 8.5.2 --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/5a4b91e92b03160e13ef83ad486fb64… Patch: https://github.com/kamailio/kamailio/commit/5a4b91e92b03160e13ef83ad486fb64…

1 0

[kamailio/kamailio] modules/snmpstats: exit with `ksr_exit()` instead of standard `exit()` (PR #3993)
by Anton Yabchinskiy 19 Nov '24

19 Nov '24

The former respects the `--atexit=no` from Kamailio command line. See note on `atexit` in TLS module "Overview".   #### 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  I'm using `tls` module along with some other modules. On Kamailio termination there are a lot of "freeing already freed pointer" messages from `qm_free()`. Also there may be a corrupted memory report (followed by `abort()`) from `qm_debug_check_frag()`. I'm aware of `--atexit=no` required for `tls`, and Kamailio is indeed started as `kamailio --atexit=no -m 16 -n 1 -w . -f some.cfg`. The `tls` module is loaded and configured something like this: ``` disable_core_dump=no debug=2 memdbg=2 # mem_safety=0 enable_tls=yes listen=tls:127.0.0.1:5060 mpath="lib64/kamailio/modules" loadmodule "tls.so" modparam("tls", "init_mode", 1) modparam("tls", "config", "tls.cfg"); loadmodule "snmpstats.so" modparam("snmpstats", "sipEntityType", "proxyServer") modparam("snmpstats", "snmpgetPath", "/usr/bin/") modparam("snmpstats", "snmpCommunity", "MySNMPComunity") modparam("snmpstats", "snmpVersion", "2c") loadmodule "xlog.so" route { xlog("L_NOTICE", "Hello\n"); } ``` Running Kamailio and then stopping it with `SIGTERM` yields the following. Some blocks of shared memory are allocated by the main process (PID 62575). E.g., one of the blocks: ``` 0(62575) INFO: <core> [core/mem/q_malloc.c:429]: qm_malloc(): qm_malloc(0x7facc5dc0000, 8) returns address 0x7facc5e55810 frag. 0x7facc5e557d8 (size=8) on 1 -th hit ``` On termination, this address is freed by another process (PID 62583). Somewhere after "sig_usr(): signal 15 received" message there's the following entry in the log: ``` 5(62583) INFO: <core> [core/mem/q_malloc.c:495]: qm_free(): qm_free(0x7facc5dc0000, 0x7facc5e55810), called from tls: tls_init.c: ser_free(400) ``` Then later the same address is freed again, by the main process (PID 62575). That's due to explicit call to `OPENSSL_cleanup()` from `tls_h_mod_destroy_f()` in `tls` module: ``` 0(62575) INFO: tls [tls_init.c:1063]: tls_h_mod_destroy_f(): executing openssl v1.1+ cleanup 0(62575) INFO: <core> [core/mem/q_malloc.c:495]: qm_free(): qm_free(0x7facc5dc0000, 0x7facc5e55810), called from tls: tls_init.c: ser_free(400) 0(62575) CRITICAL: <core> [core/mem/q_malloc.c:535]: qm_free(): BUG: freeing already freed pointer (0x7facc5e55810), called from tls: tls_init.c: ser_free(400), first free tls: tls_init.c: ser_free(400) - ignoring ``` It depends on initial conditions (which modules are loaded, what is the configuration, etc.), but sometimes `qm_debug_check_frag()` detects memory corruption and calls `abort()`: ``` 0(62575) CRITICAL: <core> [core/mem/q_malloc.c:126]: qm_debug_check_frag(): BUG: qm: fragm. 0x7facc5e891e0 (address 0x7facc5e89218) beginning overwritten (7facc5e85498)! Memory allocator was called from tls: tls_init.c:400. Fragment marked by :140376711102467. Exec from core/mem/q_malloc.c:526. ``` The output of `kamcmd core.ps` suggests that the offending process (PID 62583) is related to SNMP: ``` 62575 main process - attendant … 62583 SNMP AgentX ``` The "SNMP AgentX" process in `snmpstats` overrides some signal handlers (including the `SIGTERM` one) and calls `exit()`: ``` /*! Creates a child that will become the AgentX sub-agent. The child will * insulate itself from the rest of Kamailio by overriding most of signal * handlers. */ void agentx_child(int rank) { … /* Setup a SIGTERM handler */ sigfillset(&new_sigterm_handler.sa_mask); new_sigterm_handler.sa_flags = 0; new_sigterm_handler.sa_handler = sigterm_handler; sigaction(SIGTERM, &new_sigterm_handler, NULL); … } ``` ``` static void sigterm_handler(int signal) { /* Just exit. The master agent will clean everything up for us */ exit(0); } ``` Looks like this `exit()` triggers an extra call to `OPENSSL_cleanup`, implicitly armed by OpenSSL itself on startup. So, the OpenSSL cleanup gets called twice. As for now I've fixed the issue by replacing this `exit(0)` with `ksr_exit(0)` which respects the `--atexit=no` command line option. But I wonder is it a right way to do it. As far as I can see, code in `src/modules/` ignores `ksr_exit()` and uses plain `exit()`. Is it for a reason? Shouldn't modules also exit with `ksr_exit`? You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3993 -- Commit Summary -- * modules/snmpstats: exit with ksr_exit() instead of standard exit() -- File Changes -- M src/modules/snmpstats/snmpstats.c (5) M src/modules/snmpstats/sub_agent.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3993.patch https://github.com/kamailio/kamailio/pull/3993.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3993 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3993(a)github.com>

2 2

git:master:ed5899b8: modules/snmpstats: exit with ksr_exit() instead of standard exit()
by Daniel-Constantin Mierla 19 Nov '24

19 Nov '24

Module: kamailio Branch: master Commit: ed5899b8213a28eb5659edfd5b1b9740ba6a5ab5 URL: https://github.com/kamailio/kamailio/commit/ed5899b8213a28eb5659edfd5b1b974… Author: Anton Yabchinskiy <arn(a)bestmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T16:04:13+01:00 modules/snmpstats: exit with ksr_exit() instead of standard exit() The former respects the `--atexit=no` from Kamailio command line. See note on `atexit` in TLS module "Overview". --- Modified: src/modules/snmpstats/snmpstats.c Modified: src/modules/snmpstats/sub_agent.c --- Diff: https://github.com/kamailio/kamailio/commit/ed5899b8213a28eb5659edfd5b1b974… Patch: https://github.com/kamailio/kamailio/commit/ed5899b8213a28eb5659edfd5b1b974… --- diff --git a/src/modules/snmpstats/snmpstats.c b/src/modules/snmpstats/snmpstats.c index 34b699bdeb2..ac0614f777e 100644 --- a/src/modules/snmpstats/snmpstats.c +++ b/src/modules/snmpstats/snmpstats.c @@ -92,6 +92,7 @@ #include "../../core/script_cb.h" #include "../../core/mem/mem.h" #include "../../core/mem/shm_mem.h" +#include "../../core/daemonize.h" #include "snmpSIPRegUserTable.h" #include "snmpSIPContactTable.h" @@ -561,14 +562,14 @@ static int spawn_sysUpTime_child(void) "kamailioSIPServiceStartTime is defaulting to zero\n"); close(snmpget_fd); free(full_path_to_snmpget); - exit(-1); + ksr_exit(-1); } /* We should never be able to get here, because execve() is never * supposed to return. */ close(snmpget_fd); free(full_path_to_snmpget); - exit(-1); + ksr_exit(-1); } diff --git a/src/modules/snmpstats/sub_agent.c b/src/modules/snmpstats/sub_agent.c index 92ca838c944..cc3ff06aa02 100644 --- a/src/modules/snmpstats/sub_agent.c +++ b/src/modules/snmpstats/sub_agent.c @@ -65,6 +65,7 @@ #include "../../core/dprint.h" #include "../../core/cfg/cfg_struct.h" +#include "../../core/daemonize.h" static int keep_running; @@ -72,7 +73,7 @@ static int keep_running; static void sigterm_handler(int signal) { /* Just exit. The master agent will clean everything up for us */ - exit(0); + ksr_exit(0); } /*! This function: @@ -125,7 +126,7 @@ static int initialize_agentx(void) LM_DBG("Shutting down Kamailio SNMPD MasterX sub agent.\n"); snmp_shutdown(AGENT_PROCESS_NAME); SOCK_CLEANUP; - exit(0); + ksr_exit(0); return 0; }

1 0

[kamailio/kamailio] rtpengine: update doc (PR #3998)
by Ihor Olkhovskyi 19 Nov '24

19 Nov '24

- explicit mention of label= flag - add explanations regarding mos_A/B_label_pv parameters - typo fixes   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3998 -- Commit Summary -- * rtpengine: update doc -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (48) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3998.patch https://github.com/kamailio/kamailio/pull/3998.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3998 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3998(a)github.com>

2 2

git:master:43f4c0f9: rtpengine: update doc
by Daniel-Constantin Mierla 19 Nov '24

19 Nov '24

Module: kamailio Branch: master Commit: 43f4c0f9455d57f5b4e4963358fe214c85532bc6 URL: https://github.com/kamailio/kamailio/commit/43f4c0f9455d57f5b4e4963358fe214… Author: Ihor Olkhovskyi <ihor.olkhovskyi(a)cern.ch> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T16:02:44+01:00 rtpengine: update doc - explicit mention of label= flag - add explanations regarding mos_A/B_label_pv parameters - typo fixes --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/43f4c0f9455d57f5b4e4963358fe214… Patch: https://github.com/kamailio/kamailio/commit/43f4c0f9455d57f5b4e4963358fe214…

1 0

[kamailio/kamailio] core: add other 4xx reply error count stats (PR #4014)
by AsedMorteza 19 Nov '24

19 Nov '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) - [ ] New feature (non-breaking change which adds new functionality) - [x] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4014 -- Commit Summary -- * core: add other 4xx reply error count stats -- File Changes -- M src/modules/kex/core_stats.c (115) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4014.patch https://github.com/kamailio/kamailio/pull/4014.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4014 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4014(a)github.com>

2 2

git:master:21f12f10: core: add other 4xx reply error count stats
by Daniel-Constantin Mierla 19 Nov '24

19 Nov '24

Module: kamailio Branch: master Commit: 21f12f108bd04b95a51704a570bc8215b26bf71b URL: https://github.com/kamailio/kamailio/commit/21f12f108bd04b95a51704a570bc821… Author: AsedMorteza <mortezatorabi001(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T16:01:49+01:00 core: add other 4xx reply error count stats --- Modified: src/modules/kex/core_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/21f12f108bd04b95a51704a570bc821… Patch: https://github.com/kamailio/kamailio/commit/21f12f108bd04b95a51704a570bc821…

1 0

[kamailio/kamailio] lib/srdb1: Allow '/' in database URL passwords (PR #4017)
by Kent Anderson 19 Nov '24

19 Nov '24

- Modify parsing of a database URL so that a '/' character is accepted as a valid character in the password part of the URL.   #### 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 change modifies the parsing of the DB URL so that '/' characters can be included in the password field. The modified algorithm is similar to that used when a '@' character is contained in the password. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4017 -- Commit Summary -- * lib/srdb1: Allow '/' in database URL passwords -- File Changes -- M src/lib/srdb1/db_id.c (35) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4017.patch https://github.com/kamailio/kamailio/pull/4017.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4017 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4017(a)github.com>

4 5

git:master:91abfdf6: lib/srdb1: Allow '/' in database URL passwords
by Daniel-Constantin Mierla 19 Nov '24

19 Nov '24

Module: kamailio Branch: master Commit: 91abfdf6ebf942cbb0234be36812a9513f92f96b URL: https://github.com/kamailio/kamailio/commit/91abfdf6ebf942cbb0234be36812a95… Author: Kent <kent(a)amtelco.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T16:00:45+01:00 lib/srdb1: Allow '/' in database URL passwords - Modify parsing of a database URL so that a '/' character is accepted as a valid character in the password part of the URL. --- Modified: src/lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/91abfdf6ebf942cbb0234be36812a95… Patch: https://github.com/kamailio/kamailio/commit/91abfdf6ebf942cbb0234be36812a95… --- diff --git a/src/lib/srdb1/db_id.c b/src/lib/srdb1/db_id.c index 93b36253b3b..2546a5f56f0 100644 --- a/src/lib/srdb1/db_id.c +++ b/src/lib/srdb1/db_id.c @@ -237,14 +237,33 @@ static int parse_db_url(struct db_id *id, const str *url) break; case '/': - id->host = prev_token; - prev_token = 0; - id->port = str2s(begin, url->s + i - begin, 0); - if(dupl_string_name( - &id->database, url->s + i + 1, url->s + len) - < 0) - goto err; - return 0; + /* go to last '@' when '/' is part of a password */ + a = 0; + for(j = i + 1; j < len; j++) { + if(url->s[j] == '@') { + a = j; + } + } + if(a != 0) { + st = ST_HOST; + id->username = prev_token; + prev_token = 0; + i = a; + if(dupl_string(&id->password, begin, url->s + i) + < 0) + goto err; + begin = url->s + i + 1; + break; + } else { + id->host = prev_token; + prev_token = 0; + id->port = str2s(begin, url->s + i - begin, 0); + if(dupl_string_name(&id->database, url->s + i + 1, + url->s + len) + < 0) + goto err; + return 0; + } } break;

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2024