sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
299 discussions

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/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,

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 port as well. With 'tcp_reuse_port' option enabled, the local port is meaningful and helps to differenciate between sockets on the same IP but different ports. (cherry picked from commit 0cb6e35d581398d2c5a7086a0d98b113fbb16138) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/1e362f2ba51c6ee9a9e005675a30202… Patch: https://github.com/kamailio/kamailio/commit/1e362f2ba51c6ee9a9e005675a30202… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index bc1327204e8..e0238fe090b 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1332,6 +1332,7 @@ inline static int tcp_do_connect(union sockaddr_union *server, union sockaddr_union my_name; socklen_t my_name_len; struct ip_addr ip; + unsigned short port; #ifdef TCP_ASYNC int n; #endif /* TCP_ASYNC */ @@ -1437,14 +1438,19 @@ inline static int tcp_do_connect(union sockaddr_union *server, from = &my_name; /* update from with the real "from" address */ su2ip_addr(&ip, &my_name); find_socket: +#ifdef SO_REUSEPORT + port = cfg_get(tcp, tcp_cfg, reuse_port) ? su_getport(from) : 0; +#else + port = 0; +#endif #ifdef USE_TLS if(unlikely(type == PROTO_TLS)) { - *res_si = find_si(&ip, 0, PROTO_TLS); + *res_si = find_si(&ip, port, PROTO_TLS); } else { - *res_si = find_si(&ip, 0, PROTO_TCP); + *res_si = find_si(&ip, port, PROTO_TCP); } #else - *res_si = find_si(&ip, 0, PROTO_TCP); + *res_si = find_si(&ip, port, PROTO_TCP); #endif if(unlikely(*res_si == 0)) {

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/dec19b9d4a2f4cedf31b0f8661add77… Patch: https://github.com/kamailio/kamailio/commit/dec19b9d4a2f4cedf31b0f8661add77… --- diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2a307c79e3e..947a7ec9a5e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ */ "name": "Debian", "build": { - "cacheFrom": "ghcr.io/kamailio/kamailio-master-devcontainer", + "cacheFrom": "ghcr.io/kamailio/kamailio-6.0-devcontainer", "context": "../pkg/kamailio/deb", "dockerfile": "Dockerfile" },

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 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>

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 (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 On CentOS, the present build error var may be used uninitialized. This fixes this. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4129 -- Commit Summary -- * janssonrpcc: fixed warning var may be used uninitialized -- File Changes -- M src/modules/janssonrpcc/janssonrpc_server.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4129.patch https://github.com/kamailio/kamailio/pull/4129.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4129 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4129(a)github.com>

2 1

git:master:3039c024: janssonrpcc: fixed warning var may be used uninitialized
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 3039c02404e05da05a031f6ccf68913a8c1c80eb URL: https://github.com/kamailio/kamailio/commit/3039c02404e05da05a031f6ccf68913… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T09:15:04+01:00 janssonrpcc: fixed warning var may be used uninitialized --- Modified: src/modules/janssonrpcc/janssonrpc_server.c --- Diff: https://github.com/kamailio/kamailio/commit/3039c02404e05da05a031f6ccf68913… Patch: https://github.com/kamailio/kamailio/commit/3039c02404e05da05a031f6ccf68913… --- diff --git a/src/modules/janssonrpcc/janssonrpc_server.c b/src/modules/janssonrpcc/janssonrpc_server.c index 3fb4d7c624f..5a98a6fc1f9 100644 --- a/src/modules/janssonrpcc/janssonrpc_server.c +++ b/src/modules/janssonrpcc/janssonrpc_server.c @@ -130,6 +130,7 @@ int jsonrpc_parse_server(char *server_s, jsonrpc_server_group_t **group_ptr) param_t *pit = NULL; param_t *freeme = NULL; str conn; + conn.s = NULL; str addr; addr.s = NULL; str srv;

1 0

[kamailio/kamailio] UB: Kamailio 5.8.2 - Transformations + Psuedo Variables + Topos (Issue #4127)
by Brandon Armstead 29 Jan '25

29 Jan '25

### Description Unexpected Behavior from transformations, psuedo variables, and topos. Topos is in use for topology hiding I'm not sure if this is part of the problem as I can't easily test this in the current environment, although I do know indexes should work with $hdr() psuedo variables. *Issue 1* ``` Record-Route: <sip:a@a.com>,<sip:b@b.com>,<sip:c@c.com> $(hdr(Record-Route)[0]) results in "<sip:a@a.com>,<sip:b@b.com>,<sip:c@c.com>" ``` Expected result would be <sip:a@a.com> I've also tested using index 1 incase 0 was equivalent to *, same results. Which lead me to the second issue. *issue 2* ``` Correct: $(hdr(Record-Route)[*]) results in <sip:a@a.com>,<sip:b@b.com>,<sip:c@c.com> Correct: $(hdr(Record-Route)[*]{re.subst,/,/|/g}) results in <sip:a@a.com>|<sip:b@b.com>|<sip:c@c.com> Incorrect: $(hdr(Record-Route)[*]{re.subst,/,/|/g}{param.valueat,0,|}) results in some random string pulled from part of the Record-Route header ``` Expected result would be <sip:a@a.com> ### Possible Solutions TBD ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 ``` * **Operating System**: ``` Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4127 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4127(a)github.com>

2 2

git:6.0:489b46bd: pkg/kamailio/deb: version set 6.0.0
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 489b46bd9ffaa8a9e6fed5281f7df250cf1ad777 URL: https://github.com/kamailio/kamailio/commit/489b46bd9ffaa8a9e6fed5281f7df25… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T09:07:06+01:00 pkg/kamailio/deb: version set 6.0.0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/noble/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/489b46bd9ffaa8a9e6fed5281f7df25… Patch: https://github.com/kamailio/kamailio/commit/489b46bd9ffaa8a9e6fed5281f7df25…

1 0

Releasing v5.8.5
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Hello, I am considering to release Kamailio v5.8.5 (out of branch 5.8) on Thursday, Jan 23, 2025. If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

1 2

git:6.0:ce5cbf12: kamctl: regenerated db creation files
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: ce5cbf1263e38e51973d2515b047f2213a8f6039 URL: https://github.com/kamailio/kamailio/commit/ce5cbf1263e38e51973d2515b047f22… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T09:01:46+01:00 kamctl: regenerated db creation files --- Added: utils/kamctl/db_berkeley/kamailio/contact Added: utils/kamctl/db_berkeley/kamailio/impu Added: utils/kamctl/db_berkeley/kamailio/impu_contact Added: utils/kamctl/db_berkeley/kamailio/impu_subscriber Added: utils/kamctl/db_berkeley/kamailio/ro_session Added: utils/kamctl/db_berkeley/kamailio/subscriber_scscf Added: utils/kamctl/db_redis/kamailio/contact Added: utils/kamctl/db_redis/kamailio/impu Added: utils/kamctl/db_redis/kamailio/impu_contact Added: utils/kamctl/db_redis/kamailio/impu_subscriber Added: utils/kamctl/db_redis/kamailio/ro_session Added: utils/kamctl/db_redis/kamailio/subscriber_scscf Added: utils/kamctl/db_sqlite/ims_charging-create.sql Added: utils/kamctl/db_sqlite/ims_usrloc_scscf-create.sql Added: utils/kamctl/dbtext/kamailio/contact Added: utils/kamctl/dbtext/kamailio/impu Added: utils/kamctl/dbtext/kamailio/impu_contact Added: utils/kamctl/dbtext/kamailio/impu_subscriber Added: utils/kamctl/dbtext/kamailio/ro_session Added: utils/kamctl/dbtext/kamailio/subscriber_scscf Added: utils/kamctl/mongodb/kamailio/contact.json Added: utils/kamctl/mongodb/kamailio/impu.json Added: utils/kamctl/mongodb/kamailio/impu_contact.json Added: utils/kamctl/mongodb/kamailio/impu_subscriber.json Added: utils/kamctl/mongodb/kamailio/ro_session.json Added: utils/kamctl/mongodb/kamailio/subscriber_scscf.json Added: utils/kamctl/oracle/ims_charging-create.sql Added: utils/kamctl/oracle/ims_usrloc_scscf-create.sql Added: utils/kamctl/postgres/ims_charging-create.sql Added: utils/kamctl/postgres/ims_usrloc_scscf-create.sql Added: utils/kamctl/xhttp_pi/ims_charging-mod Added: utils/kamctl/xhttp_pi/ims_charging-table Added: utils/kamctl/xhttp_pi/ims_usrloc_scscf-mod Added: utils/kamctl/xhttp_pi/ims_usrloc_scscf-table Modified: utils/kamctl/db_berkeley/kamailio/pcscf_location Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/dbtext/kamailio/pcscf_location Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/ims_charging-create.sql Modified: utils/kamctl/mysql/ims_usrloc_scscf-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/ce5cbf1263e38e51973d2515b047f22… Patch: https://github.com/kamailio/kamailio/commit/ce5cbf1263e38e51973d2515b047f22…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
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