sr-dev December 2023

sr-dev@lists.kamailio.org

14 participants
239 discussions

git:master:75de09f3: ims_ipsec_pcscf: reset destination URI after value is used to decide destination protocol to use
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 75de09f369abad7192c853e74c99741feadec619 URL: https://github.com/kamailio/kamailio/commit/75de09f369abad7192c853e74c99741… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:07:40+01:00 ims_ipsec_pcscf: reset destination URI after value is used to decide destination protocol to use --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/75de09f369abad7192c853e74c99741… Patch: https://github.com/kamailio/kamailio/commit/75de09f369abad7192c853e74c99741… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index de61ad7cf6b..47f9e401702 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -1016,13 +1016,6 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) // from URI //int uri_len = 4 /* strlen("sip:") */ + ci.via_host.len + 5 /* max len of port number */ ; - if(!(_cflags & IPSEC_NODSTURI_RESET) && (m->dst_uri.s != NULL)) { - LM_DBG("resetting dst uri [%.*s]\n", m->dst_uri.len, m->dst_uri.s); - pkg_free(m->dst_uri.s); - m->dst_uri.s = NULL; - m->dst_uri.len = 0; - } - if(_cflags & IPSEC_FORWARD_USEVIA) { vb = cscf_get_last_via(m); } @@ -1119,6 +1112,13 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) } } + if(!(_cflags & IPSEC_NODSTURI_RESET) && (m->dst_uri.s != NULL)) { + LM_DBG("resetting dst uri [%.*s]\n", m->dst_uri.len, m->dst_uri.s); + pkg_free(m->dst_uri.s); + m->dst_uri.s = NULL; + m->dst_uri.len = 0; + } + if(!(_cflags & IPSEC_NODSTURI_RESET)) { char buf[1024]; int buf_len;

1 0

[kamailio/kamailio] Dialogs loaded from the DB are no longer saved. (Issue #3669)
by Dennis 28 Dec '23

28 Dec '23

Hi ! ### Description I have а scenario where dialogs are saved at kamailio shutdown and loaded at startup, the dialog module related configuration: modparam("dialog", "db_url", DBURL) modparam("dialog", "db_mode", 3) When kamailio shut down first time all dialogs a saved in DB, upon startup they loaded as expected, but when in some resonable short time kamailio shutdowned again with active dialogs loaded at startup, they not saved in DB. I think this happens because the dialog dflags in load_dialog_info_from_db function set to zero after dialog loaded, so in update_dialog_dbinfo_unsafe such dialogs are ignored (no DLG_FLAG_NEW, no DLG_FLAG_CHANGED set). #### Debugging Data Before shutdown: kamcmd> dlg.list { h_entry: 521 h_id: 11463 ref: 2 call-id: 7z32YR9BCg from_uri: sip:XXXXX@[XXXX:XXXX:b081:1320::1:2c] to_uri: sip:YYYYY@[XXXX:XXXX:0:201d::a1] state: 4 start_ts: 1702137597 init_ts: 1702137595 end_ts: 0 duration: 18 timeout: 1702144797 lifetime: 7200 **dflags: 643** sflags: 0 iflags: 0 ..... After startup: kamcmd> dlg.list { h_entry: 521 h_id: 11463 ref: 2 call-id: 7z32YR9BCg from_uri: sip:XXXXX@[XXXX:XXXX:b081:1320::1:2c] to_uri: sip:YYYYY@[XXXX:XXXX:0:201d::a1] state: 4 start_ts: 1702137597 init_ts: 1702137636 end_ts: 0 duration: 46 timeout: 1702144798 lifetime: 7201 **dflags: 0** sflags: 0 iflags: 0 .... ### Possible Solutions At first glance, it's easy to set dlg->flags = DLG_FLAG_CHANGED (or may be to DLG_FLAG_NEW|DLG_FLAG_CHANGED) after loading from the database in load_dialog_info_from_db function, but I'm not sure if this could break anything else (e.g. DMQ). ### Additional Information * **Kamailio Version** - kamailio 5.7.2 (x86_64/linux) * **Operating System**: Ubuntu 18.04.6 LTS -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3669 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3669(a)github.com>

4 10

[kamailio/kamailio] Fixed saving dialogs on shutdown that are already loaded at startup in db_mode 3 (PR #3688)
by Dennis 28 Dec '23

28 Dec '23

…tartup when using db_mode 3 - The dialogs that loaded at startup are not saved in DB on shutdown, and so not loaded at restart, fixes issue #3669   #### 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 - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3688 -- Commit Summary -- * dialog: fixed saving dialogs on shutdown that are already loaded at startup when using db_mode 3 -- File Changes -- M src/modules/dialog/dlg_db_handler.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3688.patch https://github.com/kamailio/kamailio/pull/3688.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3688 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3688(a)github.com>

3 7

git:master:2d00ce54: dialog: fixed saving dialogs on shutdown that are already loaded at startup when using db_mode 3
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 2d00ce546bb0852dc1784d5bc2e794d06f919577 URL: https://github.com/kamailio/kamailio/commit/2d00ce546bb0852dc1784d5bc2e794d… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:06:12+01:00 dialog: fixed saving dialogs on shutdown that are already loaded at startup when using db_mode 3 - The dialogs that loaded at startup are not saved in DB on shutdown, and so not loaded at restart, fixes issue #3669 --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/2d00ce546bb0852dc1784d5bc2e794d… Patch: https://github.com/kamailio/kamailio/commit/2d00ce546bb0852dc1784d5bc2e794d… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index ecfd872504f..b6fe1afda6f 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -509,6 +509,9 @@ int load_dialog_info_from_db( get_ticks()); dlg->dflags = 0; + if(mode == 0 && dlg_db_mode == DB_MODE_SHUTDOWN) { + dlg->dflags |= DLG_FLAG_NEW; + } if(mode != 0) { if(loaded_extra < DLG_MAX_DB_LOAD_EXTRA) {

1 0

[kamailio/kamailio] haproxy parser: wrong values (Issue #3683)
by sergey-safarov 28 Dec '23

28 Dec '23

### Description Found error in the haproxy protocol parser Does not properly parsed ``` $rcv(rcvip) $rcv(srcport) $rcv(rcvport) ``` #### Reproduction This can be tested suing config file ``` #!define IPV6_ADDR ::1 tcp_accept_haproxy=yes received_route_mode=1 listen=tcp:[IPV6_ADDR]:45060 loadmodule "xlog.so" loadmodule "pv.so" event_route[core:msg-received] { xerr("Source IP: $rcv(srcip)\n"); xerr("Received socket: $rcv(rcvip)\n"); xerr("Source port: $rcv(srcport)\n"); xerr("Received port: $rcv(rcvport)\n"); } request_route { drop; } ``` Then required send call via haproxy server ```sh sipp -l 1 -m 1 -t t1 -sn uac [2600::5] ``` #### Log Messages ``` 4(1749405) ERROR: <script>: Source IP: 2600:xxx:6d5:aa02::c3 4(1749405) ERROR: <script>: Received socket: 2600:xxx:6d5:aa02::c3 4(1749405) ERROR: <script>: Source port: 50707 4(1749405) ERROR: <script>: Received port: 50195 ``` Here is `received socket` contains "source ip" and porst parsed in the reverse order. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3683 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3683(a)github.com>

2 1

git:master:c5237830: core: fixed haproxy protocol parser
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: c5237830f3e7fbeec403a0190471a066081c1117 URL: https://github.com/kamailio/kamailio/commit/c5237830f3e7fbeec403a0190471a06… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:05:14+01:00 core: fixed haproxy protocol parser fixes GH #3683 --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/c5237830f3e7fbeec403a0190471a06… Patch: https://github.com/kamailio/kamailio/commit/c5237830f3e7fbeec403a0190471a06… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 4972b7d20af..35034d1baa8 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1018,12 +1018,12 @@ int tcpconn_read_haproxy(struct tcp_connection *c) src_ip->af = AF_INET; src_ip->len = 4; src_ip->u.addr32[0] = hdr.v2.addr.ip4.src_addr; - c->rcv.src_port = hdr.v2.addr.ip4.src_port; + c->rcv.src_port = htons(hdr.v2.addr.ip4.src_port); dst_ip->af = AF_INET; dst_ip->len = 4; dst_ip->u.addr32[0] = hdr.v2.addr.ip4.dst_addr; - c->rcv.dst_port = hdr.v2.addr.ip4.dst_port; + c->rcv.dst_port = htons(hdr.v2.addr.ip4.dst_port); goto done; @@ -1031,12 +1031,12 @@ int tcpconn_read_haproxy(struct tcp_connection *c) src_ip->af = AF_INET6; src_ip->len = 16; memcpy(src_ip->u.addr, hdr.v2.addr.ip6.src_addr, 16); - c->rcv.src_port = hdr.v2.addr.ip6.src_port; + c->rcv.src_port = htons(hdr.v2.addr.ip6.src_port); dst_ip->af = AF_INET6; dst_ip->len = 16; - memcpy(dst_ip->u.addr, hdr.v2.addr.ip6.src_addr, 16); - c->rcv.dst_port = hdr.v2.addr.ip6.dst_port; + memcpy(dst_ip->u.addr, hdr.v2.addr.ip6.dst_addr, 16); + c->rcv.dst_port = htons(hdr.v2.addr.ip6.dst_port); goto done;

1 0

[kamailio/kamailio] core: fixed haproxy protocol parser (PR #3685)
by sergey-safarov 28 Dec '23

28 Dec '23

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

2 2

git:master:23a1d067: dialog: rename function parameter to avoid shadowing of global variable
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 23a1d06737fa6d2509b6f88574ad171aa32cf275 URL: https://github.com/kamailio/kamailio/commit/23a1d06737fa6d2509b6f88574ad171… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T10:21:01+01:00 dialog: rename function parameter to avoid shadowing of global variable --- Modified: src/modules/dialog/dlg_profile.c --- Diff: https://github.com/kamailio/kamailio/commit/23a1d06737fa6d2509b6f88574ad171… Patch: https://github.com/kamailio/kamailio/commit/23a1d06737fa6d2509b6f88574ad171… --- diff --git a/src/modules/dialog/dlg_profile.c b/src/modules/dialog/dlg_profile.c index 5dd3b372d49..43aee6278e0 100644 --- a/src/modules/dialog/dlg_profile.c +++ b/src/modules/dialog/dlg_profile.c @@ -70,21 +70,21 @@ static sruid_t _dlg_profile_sruid; /*! * \brief Add profile definitions to the global list * \see new_dlg_profile - * \param profiles profile name + * \param profiledef profile name * \param has_value set to 0 for a profile without value, otherwise it has a value * \return 0 on success, -1 on failure */ -int add_profile_definitions(char *profiles, unsigned int has_value) +int add_profile_definitions(char *profiledef, unsigned int has_value) { char *p; char *d; str name; unsigned int i; - if(profiles == NULL || strlen(profiles) == 0) + if(profiledef == NULL || strlen(profiledef) == 0) return 0; - p = profiles; + p = profiledef; do { /* locate name of profile */ name.s = p;

1 0

git:master:4b862326: timer: rename local variable to avoid shadowing global
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 4b862326cce4b16154353d393d60c8f12762da86 URL: https://github.com/kamailio/kamailio/commit/4b862326cce4b16154353d393d60c8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T12:09:26+01:00 timer: rename local variable to avoid shadowing global --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/4b862326cce4b16154353d393d60c8f… Patch: https://github.com/kamailio/kamailio/commit/4b862326cce4b16154353d393d60c8f… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index a7741496626..2f3f1b1bf34 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -88,12 +88,12 @@ static timer_action_t *timer_executed = 0; } static timer_action_t *find_action_by_name( - timer_action_t *timer_actions, char *name, int len) + timer_action_t *timer_actions_list, char *name, int len) { timer_action_t *a; if(len == -1) len = strlen(name); - for(a = timer_actions; a; a = a->next) { + for(a = timer_actions_list; a; a = a->next) { if(a->timer_name && strlen(a->timer_name) == len && strncmp(name, a->timer_name, len) == 0) return a;

1 0

[kamailio/kamailio] tm: Reset local_response_sent_lookup (PR #3687)
by Xenofon Karamanos 27 Dec '23

27 Dec '23

#### 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 - [x] Related to issue #3064 (replace XXXX with an open issue number) #### Description  This PR fixes #3064. It resets the check variable back to 0 after sending a tm:local-response reply. As of currently, event_route[tm:local-response] will be called only max `children` times (one for each) and then won't process any more. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3687 -- Commit Summary -- * tm: Reset local_response_sent_lookup -- File Changes -- M src/modules/tm/t_reply.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3687.patch https://github.com/kamailio/kamailio/pull/3687.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3687 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3687(a)github.com>

2 3

← Newer
1
...
5
6
7
8
9
10
11
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2023