- sr-dev - kamailio.org

git:master:ff58d71f: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 19 Nov '24

19 Nov '24

Module: kamailio Branch: master Commit: ff58d71f3d6c01e6c1a000c5f4de8fc8f5bedc3d URL: https://github.com/kamailio/kamailio/commit/ff58d71f3d6c01e6c1a000c5f4de8fc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-19T16:16:09+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/ff58d71f3d6c01e6c1a000c5f4de8fc… Patch: https://github.com/kamailio/kamailio/commit/ff58d71f3d6c01e6c1a000c5f4de8fc…

1 0

git:master:75e17db2: pv: Ensure URI enclosed in <> when changing Display Name
by Daniel-Constantin Mierla 19 Nov '24

19 Nov '24

Module: kamailio Branch: master Commit: 75e17db22afa92929054ccf36c8ca9b5daafccd8 URL: https://github.com/kamailio/kamailio/commit/75e17db22afa92929054ccf36c8ca9b… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T16:15:59+01:00 pv: Ensure URI enclosed in <> when changing Display Name --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/75e17db22afa92929054ccf36c8ca9b… Patch: https://github.com/kamailio/kamailio/commit/75e17db22afa92929054ccf36c8ca9b… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index e36c5004032..f112931a735 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -76,6 +76,8 @@ int _pv_pid = 0; #define PV_HDR_DELIM "," #define PV_HDR_DELIM_LEN (sizeof(PV_HDR_DELIM) - 1) +static int is_uri_enclosed(struct sip_msg *msg, struct to_body *tb); + int pv_get_msgid(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { if(msg == NULL) @@ -3607,9 +3609,13 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, pv_value_t *val, struct to_body *tb, int type) { str buf = {0, 0}; + str buf_uri = {0, 0}; struct lump *l = NULL; int loffset = 0; + int loffset_uri = 0; int llen = 0; + int llen_uri = 0; + int is_enclosed = 0; if(msg == NULL || param == NULL) { LM_ERR("bad parameters\n"); @@ -3683,7 +3689,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, } buf.s = pkg_malloc(val->rs.len); if(buf.s == 0) { - LM_ERR("no more pkg mem\n"); + PKG_MEM_ERROR; goto error; } buf.len = val->rs.len; @@ -3715,6 +3721,29 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, } buf.len = val->rs.len; memcpy(buf.s, val->rs.s, val->rs.len); + + /* Check if the URI is enclosed in angle brackets */ + is_enclosed = is_uri_enclosed(msg, tb); + /* If uri is not enclosed, we need to enclose it in < > + before adding display name */ + if(!is_enclosed) { + LM_DBG("URI is not enclosed in angle brackets\n"); + /* Enclose URI in angle brackets */ + loffset_uri = tb->uri.s - msg->buf; + llen_uri = tb->uri.len; + /* Add angle brackets */ + buf_uri.s = pkg_malloc(tb->uri.len + 2); + if(buf_uri.s == 0) { + LM_ERR("no more pkg mem\n"); + goto error; + } + buf_uri.len = tb->uri.len + 2; + buf_uri.s[0] = '<'; + memcpy(buf_uri.s + 1, tb->uri.s, tb->uri.len); + buf_uri.s[buf_uri.len - 1] = '>'; + LM_DBG("URI after enclosing: %.*s\n", buf_uri.len, buf_uri.s); + } + if(tb->display.len == 0) { l = anchor_lump(msg, tb->body.s - msg->buf, 0, 0); buf.s[buf.len] = ' '; @@ -3744,6 +3773,24 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, if(buf.s != 0) pkg_free(buf.s); } + + if(llen_uri > 0) { + if((l = del_lump(msg, loffset_uri, llen_uri, 0)) == 0) { + LM_ERR("failed to delete xto attribute %d\n", type); + goto error; + } + } + /* set new value when given */ + if(l != NULL && buf_uri.len > 0) { + if(insert_new_lump_after(l, buf_uri.s, buf_uri.len, 0) == 0) { + LM_ERR("failed to set xto attribute %d\n", type); + goto error; + } + } else { + if(buf_uri.s != 0) + pkg_free(buf_uri.s); + } + return 0; error: @@ -3752,6 +3799,26 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return -1; } +int is_uri_enclosed(struct sip_msg *msg, struct to_body *tb) +{ + /* Check for the presence of display name */ + if(tb->display.len == 0) { + /* Display name not found */ + char *uri_body = tb->body.s; + + /* Assuming a valid sip message (true otherwise parser fails way before) + if it starts with '<' there is a respective '>'. + Also, parser trims any leading white space if no DisplayName is found + */ + if(uri_body[0] == '<') { + return 1; + } + return 0; + } + /* Display name found, URI should/must be enclosed */ + return 1; +} + int pv_set_to_attr(struct sip_msg *msg, pv_param_t *param, int op, pv_value_t *val, int type) {

1 0

[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

[kamailio/kamailio] siputils: HOTFIX generated icid-value too short (PR #4026)
by Eik Rentzow 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 - [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 - icid-value is only 17 characters and not unique - Re-parsing of generated PCV with icid-generated is 2 characters too short, cutting generated-by value or creating false warning Following warning was produced, which shows the problem. > WARNING: siputils [chargingvector.c:240]: sip_parse_charging_vector(): icid-generated-at is missing icid-> value=4557000A000E52000;icid-generated-a You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4026 -- Commit Summary -- * siputils: generated icid-value too short -- File Changes -- M src/modules/siputils/chargingvector.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4026.patch https://github.com/kamailio/kamailio/pull/4026.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4026 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4026(a)github.com>

2 2

git:master:66350831: siputils: generated icid-value too short
by Daniel-Constantin Mierla 19 Nov '24

19 Nov '24

Module: kamailio Branch: master Commit: 66350831872370a5a06f2ee44e8609ceb0164592 URL: https://github.com/kamailio/kamailio/commit/66350831872370a5a06f2ee44e8609c… Author: Eik Rentzow <rentzow(a)gmx.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T15:51:32+01:00 siputils: generated icid-value too short - icid-value is only 17 charaters and not unique - Re-parsing of generated PCV with icid-generated is 2 characters too short, cutting generated-by value or creating false warning --- Modified: src/modules/siputils/chargingvector.c --- Diff: https://github.com/kamailio/kamailio/commit/66350831872370a5a06f2ee44e8609c… Patch: https://github.com/kamailio/kamailio/commit/66350831872370a5a06f2ee44e8609c… --- diff --git a/src/modules/siputils/chargingvector.c b/src/modules/siputils/chargingvector.c index c49e3ebf1a2..110f06be77d 100644 --- a/src/modules/siputils/chargingvector.c +++ b/src/modules/siputils/chargingvector.c @@ -147,7 +147,7 @@ static void sip_generate_charging_vector(char *pcv, const unsigned int maxsize) const char *endptr = ptr + maxsize - 1; for(int i = 0; i < len && ptr < endptr; i++) { - ptr += (snprintf(ptr, 3, "%02X", newConferenceIdentifier[i]) - 1); + ptr += snprintf(ptr, 3, "%02X", newConferenceIdentifier[i]); } } @@ -258,6 +258,7 @@ static int sip_get_charging_vector( } sip_initialize_pcv_buffers(); + _siputils_pcv_status = PCV_NONE; for(hf = msg->headers; hf; hf = hf->next) { if(hf->name.s[0] != 'P') { @@ -298,7 +299,6 @@ static int sip_get_charging_vector( } } LM_DBG("No valid P-Charging-Vector header found.\n"); - _siputils_pcv_status = PCV_NONE; *hf_pcv = NULL; return 1; } @@ -482,7 +482,7 @@ int sip_handle_pcv(struct sip_msg *msg, char *flags, char *str2) /* if generated and added, copy buffer and reparse it */ sip_initialize_pcv_buffers(); - _siputils_pcv.len = body_len - CRLF_LEN; + _siputils_pcv.len = body_len; memcpy(_siputils_pcv.s, pcv_body, _siputils_pcv.len); if(sip_parse_charging_vector( _siputils_pcv_buf, sizeof(_siputils_pcv_buf))) {

1 0

git:master:59ac31e4: sca: use core function for parsing to header and uri
by Daniel-Constantin Mierla 19 Nov '24

19 Nov '24

Module: kamailio Branch: master Commit: 59ac31e496f4d5250567cc3c8fbafa0710f888ed URL: https://github.com/kamailio/kamailio/commit/59ac31e496f4d5250567cc3c8fbafa0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T15:09:52+01:00 sca: use core function for parsing to header and uri - instead of local implementation --- Modified: src/modules/sca/sca_util.c --- Diff: https://github.com/kamailio/kamailio/commit/59ac31e496f4d5250567cc3c8fbafa0… Patch: https://github.com/kamailio/kamailio/commit/59ac31e496f4d5250567cc3c8fbafa0… --- diff --git a/src/modules/sca/sca_util.c b/src/modules/sca/sca_util.c index 3e8e6d16bd2..1d5d7178713 100644 --- a/src/modules/sca/sca_util.c +++ b/src/modules/sca/sca_util.c @@ -215,22 +215,11 @@ int sca_get_msg_to_header(sip_msg_t *msg, sca_to_body_t *to) return (-1); } to->flags = SCA_UTIL_FLAG_TO_BODY_MSG; - to->hdr = get_to(msg); - if(to->hdr == NULL) { - parse_to(msg->to->body.s, - msg->to->body.s + msg->to->body.len + 1, // end of buffer - to->hdr); - if(to->hdr->error != PARSE_OK) { - LM_ERR("Bad To header\n"); - return (-1); - } - } - - // ensure the URI is parsed for future use - if(parse_uri(to->hdr->uri.s, to->hdr->uri.len, GET_TO_PURI(msg)) < 0) { - LM_ERR("Failed to parse To URI %.*s\n", STR_FMT(&to->hdr->uri)); + if(parse_to_uri(msg) == NULL) { + LM_ERR("Bad To header\n"); return (-1); } + to->hdr = get_to(msg); } else { LM_DBG("using $avp(%.*s)[%.*s] as to uri\n", STR_FMT(&sca->cfg->to_uri_avp.s), STR_FMT(&uri));

1 0

git:master:84a448b9: modules: readme files regenerated - db_sqlite ... [skip ci]
by Kamailio Dev 19 Nov '24

19 Nov '24

Module: kamailio Branch: master Commit: 84a448b94d2a926285c24f74f60a66d707d05880 URL: https://github.com/kamailio/kamailio/commit/84a448b94d2a926285c24f74f60a66d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-19T14:31:10+01:00 modules: readme files regenerated - db_sqlite ... [skip ci] --- Modified: src/modules/db_sqlite/README --- Diff: https://github.com/kamailio/kamailio/commit/84a448b94d2a926285c24f74f60a66d… Patch: https://github.com/kamailio/kamailio/commit/84a448b94d2a926285c24f74f60a66d…

1 0

[kamailio/kamailio] db_sqlite: Add busy timeout param to improve concurrency (PR #4029)
by Andreas Granig 19 Nov '24

19 Nov '24

It's needed specifically when setting WAL, because on module loading, each child creates its own DB connection and sets the WAL (or other options you might set), and it all happens roughly at the same time. Without setting the busy-timeout, starting of kamailio will fail due to locking issues with sqlite.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4029 -- Commit Summary -- * db_sqlite: Add busy timeout param to improve concurrency -- File Changes -- M src/modules/db_sqlite/db_sqlite.c (52) M src/modules/db_sqlite/db_sqlite.h (1) M src/modules/db_sqlite/dbase.c (16) M src/modules/db_sqlite/doc/db_sqlite.xml (16) M src/modules/db_sqlite/doc/db_sqlite_admin.xml (49) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4029.patch https://github.com/kamailio/kamailio/pull/4029.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4029 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4029(a)github.com>

1 1

git:master:9d21fa05: db_sqlite: Add busy timeout param to improve concurrency
by Andreas Granig 19 Nov '24

19 Nov '24

Module: kamailio Branch: master Commit: 9d21fa0562b8b4379b882d89715c58028eb358dd URL: https://github.com/kamailio/kamailio/commit/9d21fa0562b8b4379b882d89715c580… Author: Andreas Granig <agranig(a)linguin.org> Committer: Andreas Granig <agranig(a)linguin.org> Date: 2024-11-19T14:18:09+01:00 db_sqlite: Add busy timeout param to improve concurrency It's needed specifically when setting WAL, because on module loading, each child creates its own DB connection and sets the WAL (or other options you might set), and it all happens roughly at the same time. Without setting the busy-timeout, starting of kamailio will fail due to locking issues with sqlite. --- Modified: src/modules/db_sqlite/db_sqlite.c Modified: src/modules/db_sqlite/db_sqlite.h Modified: src/modules/db_sqlite/dbase.c Modified: src/modules/db_sqlite/doc/db_sqlite.xml Modified: src/modules/db_sqlite/doc/db_sqlite_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9d21fa0562b8b4379b882d89715c580… Patch: https://github.com/kamailio/kamailio/commit/9d21fa0562b8b4379b882d89715c580…

1 0

[kamailio/kamailio] db_sqlite: Add busy timeout param to improve concurrency. (PR #4028)
by Andreas Granig 19 Nov '24

19 Nov '24

It's needed specifically when setting WAL, because on module loading, each child creates its own DB connection and sets the WAL (or other options you might set), and it all happens roughly at the same time. Without setting the busy-timeout, starting of kamailio will fail due to locking issues with sqlite.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4028 -- Commit Summary -- * db_sqlite: Add busy timeout param to improve concurrency. -- File Changes -- M src/modules/db_sqlite/db_sqlite.c (52) M src/modules/db_sqlite/db_sqlite.h (1) M src/modules/db_sqlite/dbase.c (13) M src/modules/db_sqlite/doc/db_sqlite_admin.xml (48) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4028.patch https://github.com/kamailio/kamailio/pull/4028.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4028 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4028(a)github.com>

1 5

git:master:0d68c816: textops: free substitution expression for subst_v()
by Daniel-Constantin Mierla 19 Nov '24

19 Nov '24

Module: kamailio Branch: master Commit: 0d68c816bd72be78fef827ee923897f90c521570 URL: https://github.com/kamailio/kamailio/commit/0d68c816bd72be78fef827ee923897f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T12:20:21+01:00 textops: free substitution expression for subst_v() --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/0d68c816bd72be78fef827ee923897f… Patch: https://github.com/kamailio/kamailio/commit/0d68c816bd72be78fef827ee923897f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index d28d7f508cf..8be84dfca3c 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1555,6 +1555,7 @@ static int subst_v_helper_f( if(nmatches < 0) { LM_ERR("substitution failed\n"); } + subst_expr_free(se); return -1; } memset(&val, 0, sizeof(pv_value_t)); @@ -1565,6 +1566,7 @@ static int subst_v_helper_f( pkg_free(result->s); pkg_free(result); + subst_expr_free(se); return 1; }

1 0

git:master:67497692: dispatcher: updated boundary checks for uint32_t ocmin and ocmax
by Daniel-Constantin Mierla 19 Nov '24

19 Nov '24

Module: kamailio Branch: master Commit: 67497692ff4a74a5cb3dc774184252243ea5c47b URL: https://github.com/kamailio/kamailio/commit/67497692ff4a74a5cb3dc7741842522… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T11:55:34+01:00 dispatcher: updated boundary checks for uint32_t ocmin and ocmax --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/67497692ff4a74a5cb3dc7741842522… Patch: https://github.com/kamailio/kamailio/commit/67497692ff4a74a5cb3dc7741842522… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 83bb7636206..1c31ca3fc95 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -412,13 +412,13 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) if(dest->ocdata.ocmax > 100) { dest->ocdata.ocmax = 100; } - if(dest->ocdata.ocmax <= 0) { + if(dest->ocdata.ocmax == 0) { dest->ocdata.ocmax = 100; } if(dest->ocdata.ocmin > 100) { dest->ocdata.ocmin = 0; } - if(dest->ocdata.ocmin < 0) { + if(dest->ocdata.ocmin > dest->ocdata.ocmax) { dest->ocdata.ocmin = 0; } if(dest->ocdata.ocrate > 100) {

1 0

git:master:5957ba50: core: socket info - relocate ip address conversion for log message
by Daniel-Constantin Mierla 18 Nov '24

18 Nov '24

Module: kamailio Branch: master Commit: 5957ba50c8da1c543272643994190ba015221432 URL: https://github.com/kamailio/kamailio/commit/5957ba50c8da1c543272643994190ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-18T14:19:38+01:00 core: socket info - relocate ip address conversion for log message --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/5957ba50c8da1c543272643994190ba… Patch: https://github.com/kamailio/kamailio/commit/5957ba50c8da1c543272643994190ba… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 35b85d6be7f..566dbf830b1 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1784,6 +1784,8 @@ int add_interfaces(char *if_name, int family, unsigned short port, continue; if(family && family != ifa->ifa_addr->sa_family) continue; + sockaddr2ip_addr(&addr, (struct sockaddr *)ifa->ifa_addr); + tmp = ip_addr2a(&addr); if(ifa->ifa_addr->sa_family == AF_INET6) { struct sockaddr_in6 *caddr = (struct sockaddr_in6 *)ifa->ifa_addr; if((sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_SKIP) @@ -1794,8 +1796,6 @@ int add_interfaces(char *if_name, int family, unsigned short port, continue; } } - sockaddr2ip_addr(&addr, (struct sockaddr *)ifa->ifa_addr); - tmp = ip_addr2a(&addr); if(ifa->ifa_flags & IFF_LOOPBACK) flags = SI_IS_LO; else

1 0

git:master:37905817: tsilo: switch to get/set T/branch tm api functions
by Daniel-Constantin Mierla 18 Nov '24

18 Nov '24

Module: kamailio Branch: master Commit: 37905817d2a5a2e25a357d5797d0e26c9bb80a39 URL: https://github.com/kamailio/kamailio/commit/37905817d2a5a2e25a357d5797d0e26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-18T08:29:43+01:00 tsilo: switch to get/set T/branch tm api functions --- Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/37905817d2a5a2e25a357d5797d0e26… Patch: https://github.com/kamailio/kamailio/commit/37905817d2a5a2e25a357d5797d0e26… --- diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index 7ad83aaa02a..406ff7c97b0 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -113,8 +113,7 @@ int ts_append_to(struct sip_msg *msg, int tindex, int tlabel, char *table, contact->len, contact->s); } - orig_t = _tmb.t_gett(); - orig_branch = _tmb.t_gett_branch(); + _tmb.get_tb(&orig_t, &orig_branch); /* lookup a transaction based on its identifier (hash_index:label) */ if(_tmb.t_lookup_ident(&t, tindex, tlabel) < 0) { @@ -164,7 +163,7 @@ int ts_append_to(struct sip_msg *msg, int tindex, int tlabel, char *table, * Restore the original transaction (if any) */ if(t) _tmb.unref_cell(t); - _tmb.t_sett(orig_t, orig_branch); + _tmb.set_tb(orig_t, orig_branch); return ret; } @@ -212,8 +211,7 @@ int ts_append_branches(sip_msg_t *msg, str *ruri) LM_DBG("transaction %u:%u found for %.*s, going to append branches\n", ptr->tindex, ptr->tlabel, t_uri->len, t_uri->s); - orig_t = _tmb.t_gett(); - orig_branch = _tmb.t_gett_branch(); + _tmb.get_tb(&orig_t, &orig_branch); /* lookup a transaction based on its identifier (hash_index:label) */ if(_tmb.t_lookup_ident(&t, ptr->tindex, ptr->tlabel) < 0 || t == NULL) { @@ -247,7 +245,7 @@ int ts_append_branches(sip_msg_t *msg, str *ruri) /* unref the transaction which had been referred by t_lookup_ident() call. * Restore the original transaction (if any) */ _tmb.unref_cell(t); - _tmb.t_sett(orig_t, orig_branch); + _tmb.set_tb(orig_t, orig_branch); } unlock_entry_by_ruri(t_uri);

1 0

git:master:da33e5bd: tm: exports get/set t/branch functions to intermodule api
by Daniel-Constantin Mierla 18 Nov '24

18 Nov '24

Module: kamailio Branch: master Commit: da33e5bdefb45730f9b0536ec86d0ef7abc8e3d8 URL: https://github.com/kamailio/kamailio/commit/da33e5bdefb45730f9b0536ec86d0ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-18T06:59:10+01:00 tm: exports get/set t/branch functions to intermodule api --- Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/da33e5bdefb45730f9b0536ec86d0ef… Patch: https://github.com/kamailio/kamailio/commit/da33e5bdefb45730f9b0536ec86d0ef… --- diff --git a/src/modules/tm/t_lookup.h b/src/modules/tm/t_lookup.h index e9c019c7b46..25f6d9eaa6e 100644 --- a/src/modules/tm/t_lookup.h +++ b/src/modules/tm/t_lookup.h @@ -79,7 +79,9 @@ int get_t_branch(void); typedef void (*tsett_f)(struct cell *t, int branch); void set_t(struct cell *t, int branch); +typedef void (*tm_get_tb_f)(struct cell **t, int *branch); void tm_get_tb(struct cell **t, int *branch); +typedef void (*tm_set_tb_f)(struct cell *t, int branch); void tm_set_tb(struct cell *t, int branch); #define T_GET_TI "t_get_trans_ident" diff --git a/src/modules/tm/tm_load.c b/src/modules/tm/tm_load.c index 7149873515e..0b4ff49e447 100644 --- a/src/modules/tm/tm_load.c +++ b/src/modules/tm/tm_load.c @@ -144,6 +144,8 @@ int load_tm(struct tm_binds *tmb) tmb->t_release_transaction = t_release_transaction; tmb->t_uas_request_clean_parsed = t_uas_request_clean_parsed; tmb->t_reply_error = ki_t_reply_error; + tmb->get_tb = tm_get_tb; + tmb->set_tb = tm_set_tb; return 1; } diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index bf41eb789ef..4d160b585dc 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -131,6 +131,8 @@ struct tm_binds trelease_t t_release_transaction; t_uas_request_clean_parsed_f t_uas_request_clean_parsed; t_no_param_f t_reply_error; + tm_get_tb_f get_tb; + tm_set_tb_f set_tb; }; typedef struct tm_binds tm_api_t;

1 0

[kamailio/kamailio] no corresponding socket found error (Issue #3583)
by descartin 16 Nov '24

16 Nov '24

Hello all we are seeing these kind of logs in a Debian GNU/Linux 11 using kamailio 5.5.6 ```Sep 21 17:41:13 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155702]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:[164.152.22.248:5060](http://164.152.22.248:5060/)) Sep 21 17:41:13 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155698]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:[208.74.138.184:5060](http://208.74.138.184:5060/)) Sep 21 17:41:13 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155695]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:[208.74.138.181:5060](http://208.74.138.181:5060/)) Sep 21 17:41:14 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155693]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:[38.102.250.60:5060](http://38.102.250.60:5060/)) Sep 21 17:41:14 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155707]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:[87.1.1.27:5060](http://87.1.1.27:5060/)) Sep 21 17:41:14 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155707]: ERROR: tm [ut.h:302]: uri2dst2(): no corresponding socket for "87.1.1.27" af 2 Sep 21 17:41:14 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155707]: ERROR: tm [t_fwd.c:470]: prepare_new_uac(): can't fwd to af 2, proto 1 (no corresponding listening socket) Sep 21 17:41:14 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155697]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:[208.74.138.184:5060](http://208.74.138.184:5060/)) Sep 21 17:41:14 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155694]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:[192.40.216.97:5060](http://192.40.216.97:5060/)) Sep 21 17:41:14 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155694]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:[208.74.138.180:5060](http://208.74.138.180:5060/)) Sep 21 17:41:14 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155714]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:[87.1.1.27:5060](http://87.1.1.27:5060/)) ``` The kamailio instance we are using is receiving around 1500 calls per second in average when we do start seeing these errors more frequently In this instance we are using multihomed the listen address list is ``` children=14 socket_workers=1 listen=udp:[192.168.99.70:5081](http://192.168.99.70:5081/) listen=udp:[192.168.99.81:5060](http://192.168.99.81:5060/) listen=udp:[87.1.1.27:5060](http://87.1.1.27:5060/) listen=tcp:[192.168.96.105:8095](http://192.168.96.105:8095/) listen=tcp:[87.1.1.27:5060](http://87.1.1.27:5060/) tcp_children=6 port=5060 ``` We use the first worker only to perform the OPTIONS requests from the dispatcher module. The sockets listen=udp:[192.168.99.81:5060](http://192.168.99.81:5060/) listen=udp:[87.1.1.27:5060](http://87.1.1.27:5060/) are used to communicate both A and B legs so when a message is received at [192.168.99.81:5060](http://192.168.99.81:5060/) we send it to [87.1.1.27:5060](http://87.1.1.27:5060/) and viceversa We were using $fs variable before doing the t_relay() function. This way is working, but when load increases, seems sometimes kamailio doesn't get the proper socket to forward the reply. I think the errors mainly are related to responses which are being forwarded, like if the function get_sock_info_list was not able to retrieve the listen interfaces we have tried to set in the onreply routes the commands set_recv_socket("udp:[192.168.99.81:5060](http://192.168.99.81:5060/)"); set_send_socket("udp:[87.1.1.27:5060](http://87.1.1.27:5060/)"); (when reply goes from private to public domain) and it seems it reduces the number of ``` Sep 21 17:41:13 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155702]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:[164.152.22.248:5060](http://164.152.22.248:5060/)) Sep 21 17:41:13 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155698]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:[208.74.138.184:5060](http://208.74.138.184:5060/)) Sep 21 17:41:13 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155695]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:[208.74.138.181:5060](http://208.74.138.181:5060/)) Sep 21 17:41:14 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155693]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:[38.102.250.60:5060](http://38.102.250.60:5060/)) errors ``` But i honestly don't know why the ```Sep 21 17:41:14 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155707]: ERROR: tm [ut.h:302]: uri2dst2(): no corresponding socket for "87.1.1.27" af 2 Sep 21 17:41:14 lax-dedge-1 /usr/local/kamailio/sbin/kamailio[3155707]: ERROR: tm [t_fwd.c:470]: prepare_new_uac(): can't fwd to af 2, proto 1 (no corresponding listening socket) appear ``` We also tried to increase the kernel buffers rmem and wmem from 208KB (as we had by default) to 4MB Do you know a reason which could cause these logs to appear? Any setup that could mitigate them? thanks a lot and regards david escartin -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3583 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3583(a)github.com>

5 6

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev