sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
295 discussions

git:6.0:ddd98b09: janssonrpcc: fixed warning var may be used uninitialized
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: ddd98b09c80dc0d15af080e37961b59ecde17689 URL: https://github.com/kamailio/kamailio/commit/ddd98b09c80dc0d15af080e37961b59… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:32:01+01:00 janssonrpcc: fixed warning var may be used uninitialized (cherry picked from commit 3039c02404e05da05a031f6ccf68913a8c1c80eb) --- Modified: src/modules/janssonrpcc/… [View More]

1 0

git:6.0:01429a85: core: tcp_main - include local dst port in conn lookup when using haproxy
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 01429a85381a1d9ad96ce678285358b0ecfe48a1 URL: https://github.com/kamailio/kamailio/commit/01429a85381a1d9ad96ce678285358b… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:54+01:00 core: tcp_main - include local dst port in conn lookup when using haproxy (cherry picked from commit 9c109f3a371445e03defde279912fbb4179244bd) --- Modified: src/core/tcp_main.c --- … [View More]

1 0

git:6.0:60c9bafc: outbound: encode bind address into flow token as destination
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 60c9bafc287bfabe7860b389197e8801e26a6bfb URL: https://github.com/kamailio/kamailio/commit/60c9bafc287bfabe7860b389197e880… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:48+01:00 outbound: encode bind address into flow token as destination This is an attempt to fix the combination of the outbound/rr modules and ``tcp_accept_haproxy=yes``. This combination is … [View More]currently broken, as previously reported on the mailing list: https://www.mail-archive.com/sr-users@lists.kamailio.org/msg21854.html The issue is that the destination address/port combo of the haproxy side is encoded into the flow token. When the rr module decodes the flow token and tries to look up the listening socket using ``find_si``, it cannot be found, because it is given the destination address/port combo of the connection of the haproxy side, not the address/port combo that Kamailio is actually listening on. This patch fixes the issue by encoding the ``bind_address`` of the socket the connection was received on into the flow token as the destination address. The source address remains unchanged, as it *can* be used to look up the TCP connection (with a minor patch to ``_tcpconn_find`` in ``tcp_main.c``) (cherry picked from commit b918e09e9c3e06bddfd7a205f64abb603d589f1c) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/60c9bafc287bfabe7860b389197e880… Patch: https://github.com/kamailio/kamailio/commit/60c9bafc287bfabe7860b389197e880… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index f2e0c7dbc3d..a5f17e4ef99 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -180,15 +180,25 @@ int encode_flow_token(str *flow_token, struct receive_info *rcv) return -1; } + /* By encoding the bind address into the flow token as the destination + address, we make sure that we'll still be able to find the socket when + decoding it even if there's an haproxy in front */ + struct ip_addr dst_ip = rcv->dst_ip; + unsigned short dst_port = rcv->dst_port; + if(rcv->bind_address) { + dst_ip = rcv->bind_address->address; + dst_port = rcv->bind_address->port_no; + } + /* Encode protocol information */ unenc_flow_token[pos++] = - (rcv->dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto; + (dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto; /* Encode destination address */ - for(i = 0; i < (rcv->dst_ip.af == AF_INET6 ? 16 : 4); i++) - unenc_flow_token[pos++] = rcv->dst_ip.u.addr[i]; - unenc_flow_token[pos++] = (rcv->dst_port >> 8) & 0xff; - unenc_flow_token[pos++] = rcv->dst_port & 0xff; + for(i = 0; i < (dst_ip.af == AF_INET6 ? 16 : 4); i++) + unenc_flow_token[pos++] = dst_ip.u.addr[i]; + unenc_flow_token[pos++] = (dst_port >> 8) & 0xff; + unenc_flow_token[pos++] = dst_port & 0xff; /* Encode source address */ for(i = 0; i < (rcv->src_ip.af == AF_INET6 ? 16 : 4); i++) [View Less]

1 0

git:6.0:af3d036f: main: Print open file limits
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: af3d036fbc6ca41be61b79bb6e22ac72266234ea URL: https://github.com/kamailio/kamailio/commit/af3d036fbc6ca41be61b79bb6e22ac7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:42+01:00 main: Print open file limits (cherry picked from commit 4a335848f1b2b1e685891258803d1acd5540710d) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:6.0:5f2c7c7a: ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to reg events
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 5f2c7c7a958d010afd303a4feb95241aefd31dca URL: https://github.com/kamailio/kamailio/commit/5f2c7c7a958d010afd303a4feb95241… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:33+01:00 ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to reg events (cherry picked from commit 75af5c3d8b14a0b17d34c416f2dfc0df6c3ff6f8) --- Modified: src/modules/… [View More]

1 0

git:6.0:225f23a0: ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 225f23a03a2941d44cbb1b56d0d95adcc3f78004 URL: https://github.com/kamailio/kamailio/commit/225f23a03a2941d44cbb1b56d0d95ad… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:27+01:00 ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265 (cherry picked from commit 7de4f84f08e4ce910c007aad3fa2cadbe4b11dd2) --- Modified: src/modules/… [View More]ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/225f23a03a2941d44cbb1b56d0d95ad… Patch: https://github.com/kamailio/kamailio/commit/225f23a03a2941d44cbb1b56d0d95ad… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index aade763a09a..bcddbf17cc2 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -497,13 +497,15 @@ int event_reg(udomain_t *_d, impurecord_t *r_passed, ucontact_t *c_passed, case IMS_REGISTRAR_NONE: return 0; case IMS_REGISTRAR_SUBSCRIBE: + case IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE: if(r_passed || !presentity_uri || !watcher_contact || !_d) { LM_ERR("this is a subscribe called from cfg file: r_passed be " "zero and presentity_uri, watcher_contact and _d should " "be valid for a subscribe"); return 0; } - LM_DBG("Event type is IMS REGISTRAR SUBSCRIBE about to get " + LM_DBG("Event type is IMS REGISTRAR SUBSCRIBE/RE-SUBSCRIBE about " + "to get " "reginfo_full\n"); //lets get IMPU list for presentity as well as register for callbacks (IFF it is a new SUBSCRIBE) @@ -1376,8 +1378,8 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) subscribe_reply( msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, &scscf_name_str); - if(event_type == IMS_REGISTRAR_SUBSCRIBE) { - //do reg event only for the initial subscribe + if(event_type == IMS_REGISTRAR_SUBSCRIBE + || event_type == IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) { if(event_reg(domain, 0, 0, event_type, &presentity_uri, &watcher_contact, 0, 0, 0) != 0) { @@ -1723,7 +1725,8 @@ void create_notifications(udomain_t *_t, impurecord_t *r_passed, } //This is a fix to ensure that when a user subscribes a full reg info is only sent to that UE - if(event_type == IMS_REGISTRAR_SUBSCRIBE) { + if(event_type == IMS_REGISTRAR_SUBSCRIBE + || event_type == IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) { if(contact_match(watcher_contact, &s->watcher_contact) && (presentity_uri->len == s->presentity_uri.len) && (memcmp(s->presentity_uri.s, presentity_uri->s, [View Less]

1 0

git:6.0:1e362f2b: tcp: fix for local TCP/TLS socket matching with 'tcp_reuse_port' enabled
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 1e362f2ba51c6ee9a9e005675a30202e42ceb3a7 URL: https://github.com/kamailio/kamailio/commit/1e362f2ba51c6ee9a9e005675a30202… Author: pinacolada1610 <starinchikova(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:19+01:00 tcp: fix for local TCP/TLS socket matching with 'tcp_reuse_port' enabled - Changed the logic for matching a listening TCP/TLS-socket in tcp_reuse_port scenario, now it considers local … [View More]

1 0

git:6.0:dec19b9d: github: set 6.0 for devcontainer [skip ci]
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: dec19b9d4a2f4cedf31b0f8661add77761d85036 URL: https://github.com/kamailio/kamailio/commit/dec19b9d4a2f4cedf31b0f8661add77… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T10:14:52+01:00 github: set 6.0 for devcontainer [skip ci] --- Modified: .devcontainer/devcontainer.json --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] outbound: encode bind address into flow token as destination (PR #4105)
by Alexander Bakker 29 Jan '25

29 Jan '25

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual … [View More]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 This is an attempt to fix the combination of the outbound/rr modules and ``tcp_accept_haproxy=yes``. This combination is currently broken, as previously reported on the mailing list: https://www.mail-archive.com/sr-users@lists.kamailio.org/msg21854.html The issue is that the destination address/port combo of the haproxy side is encoded into the flow token. When the rr module decodes the flow token and tries to look up the listening socket using ``find_si``, it cannot be found, because it is given the destination address/port combo of the connection of the haproxy side, not the address/port combo that Kamailio is actually listening on. This patch fixes the issue by encoding the ``bind_address`` of the socket the connection was received on into the flow token as the destination address. The source address remains unchanged, as it *can* be used to look up the TCP connection (with a minor patch to ``_tcpconn_find`` in ``tcp_main.c``) While I've done quite a bit of testing with this patchset, I find it difficult to oversee the full impact of this change in Kamailio's large codebase. Any feedback is welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4105 -- Commit Summary -- * outbound: encode bind address into flow token as destination * core: tcp_main - include local dst port in conn lookup when using haproxy -- File Changes -- M src/core/tcp_main.c (3) M src/modules/outbound/outbound_mod.c (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4105.patch https://github.com/kamailio/kamailio/pull/4105.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4105 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4105(a)github.com> [View Less]

3 5

[kamailio/kamailio] janssonrpcc: fixed warning var may be used uninitialized (PR #4129)
by sergey-safarov 29 Jan '25

29 Jan '25

#### 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 … [View More]

2 1

← Newer
1
...
6
7
8
9
10
11
12
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2025