- sr-dev - kamailio.org

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

git:6.0:d407132a: lib/srdb1/schema: ims_usrloc_scscf definitions
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: d407132aa0accd93f58b7da1b6fdc2cf91b340db URL: https://github.com/kamailio/kamailio/commit/d407132aa0accd93f58b7da1b6fdc2c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T09:00:53+01:00 lib/srdb1/schema: ims_usrloc_scscf definitions related #4100 (cherry picked from commit 283a77887c88c38a240567a7b165478775662d81) --- Added: src/lib/srdb1/schema/contact.xml Added: src/lib/srdb1/schema/impu.xml Added: src/lib/srdb1/schema/impu_contact.xml Added: src/lib/srdb1/schema/impu_subscriber.xml Added: src/lib/srdb1/schema/kamailio-ims_usrloc_scscf.xml Added: src/lib/srdb1/schema/subscriber_scscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/d407132aa0accd93f58b7da1b6fdc2c… Patch: https://github.com/kamailio/kamailio/commit/d407132aa0accd93f58b7da1b6fdc2c…

1 0

git:6.0:0fbaf456: lib/srdb1/schema: ims_charging definitions
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 0fbaf4567973f84721b7e25074b61374e657b34a URL: https://github.com/kamailio/kamailio/commit/0fbaf4567973f84721b7e25074b6137… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T09:00:53+01:00 lib/srdb1/schema: ims_charging definitions related #4100 (cherry picked from commit 48683f3798683a508fc456bcde11a8e59a8a64de) --- Added: src/lib/srdb1/schema/kamailio-ims_charging.xml Added: src/lib/srdb1/schema/ro_session.xml --- Diff: https://github.com/kamailio/kamailio/commit/0fbaf4567973f84721b7e25074b6137… Patch: https://github.com/kamailio/kamailio/commit/0fbaf4567973f84721b7e25074b6137…

1 0

git:master:d9b5f9e0: kamctl: regenerated db creation files
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: d9b5f9e0873092c2dcb59670513a9f69a7b40d15 URL: https://github.com/kamailio/kamailio/commit/d9b5f9e0873092c2dcb59670513a9f6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T08:52:15+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/d9b5f9e0873092c2dcb59670513a9f6… Patch: https://github.com/kamailio/kamailio/commit/d9b5f9e0873092c2dcb59670513a9f6…

1 0

[kamailio/kamailio] lib/srdb1/schema: ims_usrloc_scscf definitions (PR #4110)
by Victor Seva 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #4100 #### Description add ims_usrloc_scscf definitions You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4110 -- Commit Summary -- * lib/srdb1/schema: ims_usrloc_scscf definitions -- File Changes -- A src/lib/srdb1/schema/contact.xml (100) A src/lib/srdb1/schema/impu.xml (99) A src/lib/srdb1/schema/impu_contact.xml (52) A src/lib/srdb1/schema/impu_subscriber.xml (52) A src/lib/srdb1/schema/kamailio-ims_usrloc_scscf.xml (16) A src/lib/srdb1/schema/subscriber_scscf.xml (123) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4110.patch https://github.com/kamailio/kamailio/pull/4110.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4110 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4110(a)github.com>

2 6

git:master:283a7788: lib/srdb1/schema: ims_usrloc_scscf definitions
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 283a77887c88c38a240567a7b165478775662d81 URL: https://github.com/kamailio/kamailio/commit/283a77887c88c38a240567a7b165478… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T08:44:44+01:00 lib/srdb1/schema: ims_usrloc_scscf definitions related #4100 --- Added: src/lib/srdb1/schema/contact.xml Added: src/lib/srdb1/schema/impu.xml Added: src/lib/srdb1/schema/impu_contact.xml Added: src/lib/srdb1/schema/impu_subscriber.xml Added: src/lib/srdb1/schema/kamailio-ims_usrloc_scscf.xml Added: src/lib/srdb1/schema/subscriber_scscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/283a77887c88c38a240567a7b165478… Patch: https://github.com/kamailio/kamailio/commit/283a77887c88c38a240567a7b165478…

1 0

[kamailio/kamailio] lib/srdb1/schema: ims_charging definitions (PR #4111)
by Victor Seva 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #4100 #### Description add ims_charging definitions You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4111 -- Commit Summary -- * lib/srdb1/schema: ims_charging definitions -- File Changes -- A src/lib/srdb1/schema/kamailio-ims_charging.xml (12) A src/lib/srdb1/schema/ro_session.xml (209) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4111.patch https://github.com/kamailio/kamailio/pull/4111.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4111 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4111(a)github.com>

2 5

git:master:48683f37: lib/srdb1/schema: ims_charging definitions
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 48683f3798683a508fc456bcde11a8e59a8a64de URL: https://github.com/kamailio/kamailio/commit/48683f3798683a508fc456bcde11a8e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T08:39:09+01:00 lib/srdb1/schema: ims_charging definitions related #4100 --- Added: src/lib/srdb1/schema/kamailio-ims_charging.xml Added: src/lib/srdb1/schema/ro_session.xml --- Diff: https://github.com/kamailio/kamailio/commit/48683f3798683a508fc456bcde11a8e… Patch: https://github.com/kamailio/kamailio/commit/48683f3798683a508fc456bcde11a8e…

1 0

git:master:9c109f3a: 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: master Commit: 9c109f3a371445e03defde279912fbb4179244bd URL: https://github.com/kamailio/kamailio/commit/9c109f3a371445e03defde279912fbb… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:19:45+01:00 core: tcp_main - include local dst port in conn lookup when using haproxy --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/9c109f3a371445e03defde279912fbb… Patch: https://github.com/kamailio/kamailio/commit/9c109f3a371445e03defde279912fbb… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e0238fe090b..391255cab9d 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1745,7 +1745,8 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, print_ip("ip=", &a->parent->rcv.src_ip, "\n"); #endif if((a->parent->state != S_CONN_BAD) && (port == a->port) - && ((l_port == 0) || (l_port == a->parent->rcv.dst_port)) + && ((l_port == 0) || (l_port == a->parent->rcv.dst_port) + || (l_port == a->parent->cinfo.dst_port)) && (ip_addr_cmp(ip, &a->parent->rcv.src_ip)) && (is_local_ip_any || ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip)

1 0

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

29 Jan '25

Module: kamailio Branch: master Commit: b918e09e9c3e06bddfd7a205f64abb603d589f1c URL: https://github.com/kamailio/kamailio/commit/b918e09e9c3e06bddfd7a205f64abb6… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:19:45+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 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``) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b918e09e9c3e06bddfd7a205f64abb6… Patch: https://github.com/kamailio/kamailio/commit/b918e09e9c3e06bddfd7a205f64abb6… --- 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++)

1 0

[kamailio/kamailio] main: Print open file limits (PR #4117)
by Xenofon Karamanos 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR adds some start-up information for soft and hard limits of open files. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4117 -- Commit Summary -- * main: Print open file limits -- File Changes -- M src/main.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4117.patch https://github.com/kamailio/kamailio/pull/4117.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4117 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4117(a)github.com>

3 8

git:master:4a335848: main: Print open file limits
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 4a335848f1b2b1e685891258803d1acd5540710d URL: https://github.com/kamailio/kamailio/commit/4a335848f1b2b1e685891258803d1ac… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:17:17+01:00 main: Print open file limits --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/4a335848f1b2b1e685891258803d1ac… Patch: https://github.com/kamailio/kamailio/commit/4a335848f1b2b1e685891258803d1ac… --- diff --git a/src/main.c b/src/main.c index 9e315285998..a29857757bc 100644 --- a/src/main.c +++ b/src/main.c @@ -59,6 +59,7 @@ #include <sys/utsname.h> #include <sys/stat.h> #include <sys/mman.h> +#include <sys/resource.h> /* getrlimit */ #include <fcntl.h> #include <sys/time.h> #include <sys/wait.h> @@ -2209,6 +2210,7 @@ int main(int argc, char **argv) char *tbuf_tmp; struct stat st = {0}; long l1 = 0; + struct rlimit lim; int option_index = 0; @@ -3310,7 +3312,16 @@ int main(int argc, char **argv) fprintf(stderr, "ERROR: error could not increase file limits\n"); goto error; } + } else { + if(getrlimit(RLIMIT_NOFILE, &lim) < 0) { + LM_CRIT("cannot get the maximum number of file descriptors: %s\n", + strerror(errno)); + goto error; + } + LM_INFO("current open file limits [soft/hard]: [%lu/%lu]\n", + (unsigned long)lim.rlim_cur, (unsigned long)lim.rlim_max); } + if(mlock_pages) mem_lock_pages();

1 0

[kamailio/kamailio] Fixes SUBSCRIBE and NOTIFY mechanism in case of registration refresh (PR #4123)
by Supreeth Herle 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:  - [ ] 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/4123 -- Commit Summary -- * ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265 * ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to reg events -- File Changes -- M src/modules/ims_registrar_scscf/registrar_notify.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4123.patch https://github.com/kamailio/kamailio/pull/4123.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4123 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4123(a)github.com>

2 3

[kamailio/kamailio] tcp: fix for local TCP/TLS socket matching with 'tcp_reuse_port' enabled (PR #4120)
by pinacolada1610 29 Jan '25

29 Jan '25

- 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 differentiate between sockets on the same IP but different ports.   #### 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 In our installation Kamailio runs multiple SIP-trunks, including TCP/TLS, which may be bound to the same local IP address but different local ports, and it's crucial for us to know exactly which trunk, i.e. local socket/port, was used to receive a SIP message. Additionally, the option "tcp_reuse_port" is also enabled in our environment to start outbound connections from the same TCP/TLS ports that we are listening at. The problem we hit is that identifying a trunk receiving a SIP message by $Rn(Received socket name) $Rp(Received port), which works perfectly fine for UDP trunks, not working for TCP/TLS with "tcp_reuse_port": wrong port and sockname are reported in preudovars. Investigation showed that it always reports the first listening socket (in the order defined in config file) which matches IP and transport protocol. Port is being ignored here e.g. if kamailio is listening on: listen=tcp:192.168.0.11:5060 name "int_tcp_5060" listen=tcp:192.168.0.11:5062 name "int_tcp_5062" listen=tcp:192.168.0.11:5063 name "int_tcp_5063" it will always report $Rn: int_tcp_5060 and $Rp: 5060 for incoming SIP-messages regardless of the actual socket/port being used, even if it's 5062 or 5063 This applies for both TCP and TLS. Additionally we noticed that the issue happens only in case if an incoming SIP message from remote SBC is coming via the tcp-connection which was initially opened as outbound with well-known ports (rather than via a new incoming tcp-connection with ephemeral src/remote port) This pointed us to the function core/tcp_main.c:tcp_do_connect() which handles outbound connections. While opening a new outbound connection to remote SBC, it ignores local/src port while matching it to a listening socket and saves that incorrect info for future use. This behavior makes sense if tcp_reuse_port is disabled as matching ephemeral port would not give any result. But with tcp_reuse_port enabled, we need to take the port into consideration as well. With suggested changes applied we get correct values in $Rn(Received socket name) $Rp(Received port) for inbound messages via all sockets. Tests with tcp_reuse_port disabled show no change in behavior, as expected. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4120 -- Commit Summary -- * tcp: fix for local TCP/TLS socket matching with 'tcp_reuse_port' enabled -- File Changes -- M src/core/tcp_main.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4120.patch https://github.com/kamailio/kamailio/pull/4120.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4120 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4120(a)github.com>

2 3

git:master:75af5c3d: 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: master Commit: 75af5c3d8b14a0b17d34c416f2dfc0df6c3ff6f8 URL: https://github.com/kamailio/kamailio/commit/75af5c3d8b14a0b17d34c416f2dfc0d… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:16:08+01:00 ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to reg events --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/75af5c3d8b14a0b17d34c416f2dfc0d… Patch: https://github.com/kamailio/kamailio/commit/75af5c3d8b14a0b17d34c416f2dfc0d… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index bcddbf17cc2..b1af5189a8d 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -1376,7 +1376,7 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) ret = CSCF_RETURN_TRUE; LM_DBG("Sending 200 OK to subscribing user\n"); subscribe_reply( - msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, &scscf_name_str); + msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, &presentity_uri); if(event_type == IMS_REGISTRAR_SUBSCRIBE || event_type == IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) { @@ -1427,7 +1427,7 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) ret = CSCF_RETURN_TRUE; LM_DBG("Sending 200 OK to subscribing user\n"); subscribe_reply( - msg, 200, MSG_REG_UNSUBSCRIBE_OK, &expires, &scscf_name_str); + msg, 200, MSG_REG_UNSUBSCRIBE_OK, &expires, &presentity_uri); } doneorerror:

1 0

git:master:7de4f84f: 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: master Commit: 7de4f84f08e4ce910c007aad3fa2cadbe4b11dd2 URL: https://github.com/kamailio/kamailio/commit/7de4f84f08e4ce910c007aad3fa2cad… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:16:08+01:00 ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265 --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/7de4f84f08e4ce910c007aad3fa2cad… Patch: https://github.com/kamailio/kamailio/commit/7de4f84f08e4ce910c007aad3fa2cad… --- 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:master:0cb6e35d: 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: master Commit: 0cb6e35d581398d2c5a7086a0d98b113fbb16138 URL: https://github.com/kamailio/kamailio/commit/0cb6e35d581398d2c5a7086a0d98b11… Author: pinacolada1610 <starinchikova(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:15:47+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. --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/0cb6e35d581398d2c5a7086a0d98b11… Patch: https://github.com/kamailio/kamailio/commit/0cb6e35d581398d2c5a7086a0d98b11… --- 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:022940de: db_oracle: fix warning: passing argument 2 of âdb_do_closeâ from incompatible pointer type [-Wincompatible-pointer-types]
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 022940dec70272a19c86604d2fa9af83d8790bb1 URL: https://github.com/kamailio/kamailio/commit/022940dec70272a19c86604d2fa9af8… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:07:27+01:00 db_oracle: fix warning: passing argument 2 of ��db_do_close�� from incompatible pointer type [-Wincompatible-pointer-types] (cherry picked from commit 577a87861a8566e00f2700dfb227dcc8b26393b4) --- Modified: src/modules/db_oracle/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/022940dec70272a19c86604d2fa9af8… Patch: https://github.com/kamailio/kamailio/commit/022940dec70272a19c86604d2fa9af8… --- diff --git a/src/modules/db_oracle/dbase.c b/src/modules/db_oracle/dbase.c index d4c5f05bb06..70a65af31f3 100644 --- a/src/modules/db_oracle/dbase.c +++ b/src/modules/db_oracle/dbase.c @@ -176,7 +176,7 @@ db1_con_t *db_oracle_init(const str *_url) */ void db_oracle_close(db1_con_t *_h) { - db_do_close(_h, db_oracle_free_connection); + db_do_close(_h, (void *)db_oracle_free_connection); }

1 0

git:6.0:ded36e28: dispatcher: copy over the ocdata structure for records kept by rpc add/remove record
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: ded36e28198cb518bfb64ffb0e2cc659a35af9ac URL: https://github.com/kamailio/kamailio/commit/ded36e28198cb518bfb64ffb0e2cc65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:07:19+01:00 dispatcher: copy over the ocdata structure for records kept by rpc add/remove record (cherry picked from commit 77eaba17916109ef5656a276e3f469b29415d6f5) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/ded36e28198cb518bfb64ffb0e2cc65… Patch: https://github.com/kamailio/kamailio/commit/ded36e28198cb518bfb64ffb0e2cc65… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b404ede384b..ca1636edbd2 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2866,14 +2866,16 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) void ds_add_dest_cb(ds_set_t *node, int i, void *arg) { int setn; + ds_dest_t *ndst = NULL; - if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, - node->dlist[i].priority, &node->dlist[i].attrs.body, - *ds_next_idx, &setn, node->dlist[i].dload, - &node->dlist[i].latency_stats) - == NULL) { + ndst = add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, + node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, + &setn, node->dlist[i].dload, &node->dlist[i].latency_stats); + if(ndst == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); + } else { + memcpy(&ndst->ocdata, &node->dlist[i].ocdata, sizeof(ds_ocdata_t)); } return; } @@ -2922,7 +2924,10 @@ int ds_add_dst(int group, str *address, int flags, int priority, str *attrs) /* callback for removing nodes based on setid & address */ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) { - struct ds_filter_dest_cb_arg *filter_arg = (typeof(filter_arg))arg; + ds_dest_t *ndst = NULL; + struct ds_filter_dest_cb_arg *filter_arg; + + filter_arg = (typeof(filter_arg))arg; if(node->id == filter_arg->setid && node->dlist[i].uri.len == filter_arg->dest->uri.len @@ -2931,13 +2936,16 @@ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) == 0) return; - if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, - node->dlist[i].priority, &node->dlist[i].attrs.body, - *ds_next_idx, filter_arg->setn, node->dlist[i].dload, - &node->dlist[i].latency_stats) - == NULL) { + ndst = add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, + node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, + filter_arg->setn, node->dlist[i].dload, + &node->dlist[i].latency_stats); + + if(ndst == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); + } else { + memcpy(&ndst->ocdata, &node->dlist[i].ocdata, sizeof(ds_ocdata_t)); } return; }

1 0

git:6.0:ccd5708c: dspatcher: return the new ds dest for add_dest2list()
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: ccd5708cb02cdc3e6cf76224417c7d04ba30f6e9 URL: https://github.com/kamailio/kamailio/commit/ccd5708cb02cdc3e6cf76224417c7d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:07:12+01:00 dspatcher: return the new ds dest for add_dest2list() - easier to access the fields of the new record afterwards (cherry picked from commit cff6f9fd7051f4b8ac6e4fc59257c239cb32f21d) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/ccd5708cb02cdc3e6cf76224417c7d0… Patch: https://github.com/kamailio/kamailio/commit/ccd5708cb02cdc3e6cf76224417c7d0… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 1d85c34203e..b404ede384b 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -713,7 +713,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) /** * */ -int add_dest2list(int id, str uri, int flags, int priority, str *attrs, +ds_dest_t *add_dest2list(int id, str uri, int flags, int priority, str *attrs, int list_idx, int *setn, int dload, ds_latency_stats_t *latency_stats) { ds_dest_t *dp = NULL; @@ -722,8 +722,9 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, ds_dest_t *dp1 = NULL; dp = pack_dest(uri, flags, priority, attrs, dload); - if(!dp) - goto err; + if(!dp) { + goto error; + } if(latency_stats != NULL) { dp->latency_stats.stdev = latency_stats->stdev; @@ -739,7 +740,7 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, sp = ds_avl_insert(&ds_lists[list_idx], id, setn); if(!sp) { LM_ERR("no more memory.\n"); - goto err; + goto error; } sp->nr++; @@ -766,8 +767,8 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, LM_DBG("dest [%d/%d] <%.*s>\n", sp->id, sp->nr, dp->uri.len, dp->uri.s); - return 0; -err: + return dp; +error: if(dp != NULL) { if(dp->uri.s != NULL) shm_free(dp->uri.s); @@ -776,7 +777,7 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, shm_free(dp); } - return -1; + return NULL; } @@ -1112,7 +1113,7 @@ int ds_load_list(char *lfile) } if(add_dest2list(id, uri, flags, priority, &attrs, *ds_next_idx, &setn, 0, latency_stats) - != 0) { + == NULL) { LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); if(ds_load_mode == 1) { @@ -1372,7 +1373,7 @@ int ds_load_db(void) } if(add_dest2list(id, uri, flags, priority, &attrs, *ds_next_idx, &setn, 0, latency_stats) - != 0) { + == NULL) { dest_errs++; LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); @@ -2870,7 +2871,7 @@ void ds_add_dest_cb(ds_set_t *node, int i, void *arg) node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, &setn, node->dlist[i].dload, &node->dlist[i].latency_stats) - != 0) { + == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); } @@ -2893,7 +2894,7 @@ int ds_add_dst(int group, str *address, int flags, int priority, str *attrs) // add new destination if(add_dest2list(group, *address, flags, priority, attrs, *ds_next_idx, &setn, 0, NULL) - != 0) { + == NULL) { LM_WARN("unable to add destination %.*s to set %d", address->len, address->s, group); if(ds_load_mode == 1) { @@ -2934,7 +2935,7 @@ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, filter_arg->setn, node->dlist[i].dload, &node->dlist[i].latency_stats) - != 0) { + == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); }

1 0

git:master:577a8786: db_oracle: fix warning: passing argument 2 of âdb_do_closeâ from incompatible pointer type [-Wincompatible-pointer-types]
by Ovidiu Sas 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 577a87861a8566e00f2700dfb227dcc8b26393b4 URL: https://github.com/kamailio/kamailio/commit/577a87861a8566e00f2700dfb227dcc… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2025-01-29T01:40:24Z db_oracle: fix warning: passing argument 2 of ��db_do_close�� from incompatible pointer type [-Wincompatible-pointer-types] --- Modified: src/modules/db_oracle/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/577a87861a8566e00f2700dfb227dcc… Patch: https://github.com/kamailio/kamailio/commit/577a87861a8566e00f2700dfb227dcc… --- diff --git a/src/modules/db_oracle/dbase.c b/src/modules/db_oracle/dbase.c index d4c5f05bb06..70a65af31f3 100644 --- a/src/modules/db_oracle/dbase.c +++ b/src/modules/db_oracle/dbase.c @@ -176,7 +176,7 @@ db1_con_t *db_oracle_init(const str *_url) */ void db_oracle_close(db1_con_t *_h) { - db_do_close(_h, db_oracle_free_connection); + db_do_close(_h, (void *)db_oracle_free_connection); }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev