sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
297 discussions

git:master:8ebae54c: cmake: Use pkg-config instead for json-c dev package.
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 8ebae54cff261b95fcece3be3719da511cc35084 URL: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-29T10:07:24Z cmake: Use pkg-config instead for json-c dev package. --- Modified: src/modules/nsq/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5… Patch: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5… --- diff --git a/src/modules/nsq/CMakeLists.txt b/src/modules/nsq/CMakeLists.txt index b4a482c2a47..e6acfa9a2f7 100644 --- a/src/modules/nsq/CMakeLists.txt +++ b/src/modules/nsq/CMakeLists.txt @@ -4,13 +4,19 @@ add_library(${module_name} SHARED ${MODULE_SOURCES}) find_package(Libev REQUIRED) -find_package(json-c QUIET) -if(NOT json-c_FOUND) - message(STATUS "json-c not found. looking with pkg-config") - find_package(PkgConfig REQUIRED) - pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) - add_library(json-c::json-c ALIAS PkgConfig::json-c) -endif() +# TODO: When we have a proper cmake config file for json-c for most OS, we can +# use that instead of pkg-config. +# json-c v 0.14 and 0.15 have wrong include directories in their cmake config +# files. uncomment the following line when we have a proper cmake config file +# for json-c for most OS. +# find_package(json-c 0.16 CONFIG) + +# if(NOT json-c_FOUND) +# message(STATUS "json-c not found. looking with pkg-config") +find_package(PkgConfig REQUIRED) +pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) +add_library(json-c::json-c ALIAS PkgConfig::json-c) +# endif() find_package(CURL REQUIRED)

1 0

git:master:e7f9531a: cmake: Use pkg-config instead for json-c dev package.
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: e7f9531adc6f319b6889d5644eb55a9cccfdd27d URL: https://github.com/kamailio/kamailio/commit/e7f9531adc6f319b6889d5644eb55a9… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-29T10:03:55Z cmake: Use pkg-config instead for json-c dev package. --- Modified: src/modules/json/CMakeLists.txt Modified: src/modules/jsonrpcc/CMakeLists.txt Modified: src/modules/kazoo/CMakeLists.txt Modified: src/modules/pua_json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/e7f9531adc6f319b6889d5644eb55a9… Patch: https://github.com/kamailio/kamailio/commit/e7f9531adc6f319b6889d5644eb55a9…

1 0

git:6.0:620eb2f0: kamctl: regenerated db creation files
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 620eb2f029c74006200d19dae1450e7735e3ec2e URL: https://github.com/kamailio/kamailio/commit/620eb2f029c74006200d19dae1450e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:34:25+01:00 kamctl: regenerated db creation files --- Modified: utils/kamctl/db_berkeley/kamailio/contact Modified: utils/kamctl/db_berkeley/kamailio/impu Modified: utils/kamctl/db_berkeley/kamailio/impu_contact Modified: utils/kamctl/db_berkeley/kamailio/impu_subscriber Modified: utils/kamctl/db_berkeley/kamailio/ro_session Modified: utils/kamctl/db_berkeley/kamailio/subscriber_scscf Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/ims_charging-create.sql Modified: utils/kamctl/db_sqlite/ims_usrloc_scscf-create.sql Modified: utils/kamctl/dbtext/kamailio/contact Modified: utils/kamctl/dbtext/kamailio/impu Modified: utils/kamctl/dbtext/kamailio/impu_contact Modified: utils/kamctl/dbtext/kamailio/impu_subscriber Modified: utils/kamctl/dbtext/kamailio/pcscf_location Modified: utils/kamctl/dbtext/kamailio/ro_session Modified: utils/kamctl/dbtext/kamailio/subscriber_scscf Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/contact.json Modified: utils/kamctl/mongodb/kamailio/impu.json Modified: utils/kamctl/mongodb/kamailio/impu_contact.json Modified: utils/kamctl/mongodb/kamailio/impu_subscriber.json Modified: utils/kamctl/mongodb/kamailio/ro_session.json Modified: utils/kamctl/mongodb/kamailio/subscriber_scscf.json 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/oracle/ims_charging-create.sql Modified: utils/kamctl/oracle/ims_usrloc_scscf-create.sql Modified: utils/kamctl/postgres/ims_charging-create.sql Modified: utils/kamctl/postgres/ims_usrloc_scscf-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/620eb2f029c74006200d19dae1450e7… Patch: https://github.com/kamailio/kamailio/commit/620eb2f029c74006200d19dae1450e7…

1 0

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/janssonrpc_server.c --- Diff: https://github.com/kamailio/kamailio/commit/ddd98b09c80dc0d15af080e37961b59… Patch: https://github.com/kamailio/kamailio/commit/ddd98b09c80dc0d15af080e37961b59… --- 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

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 --- Diff: https://github.com/kamailio/kamailio/commit/01429a85381a1d9ad96ce678285358b… Patch: https://github.com/kamailio/kamailio/commit/01429a85381a1d9ad96ce678285358b… --- 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: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 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++)

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/af3d036fbc6ca41be61b79bb6e22ac7… Patch: https://github.com/kamailio/kamailio/commit/af3d036fbc6ca41be61b79bb6e22ac7… --- 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

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/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/5f2c7c7a958d010afd303a4feb95241… Patch: https://github.com/kamailio/kamailio/commit/5f2c7c7a958d010afd303a4feb95241… --- 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: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

← 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