- sr-dev - kamailio.org

[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

git:master:77eaba17: dispatcher: copy over the ocdata structure for records kept by rpc add/remove record
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 77eaba17916109ef5656a276e3f469b29415d6f5 URL: https://github.com/kamailio/kamailio/commit/77eaba17916109ef5656a276e3f469b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:39:12+01:00 dispatcher: copy over the ocdata structure for records kept by rpc add/remove record --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/77eaba17916109ef5656a276e3f469b… Patch: https://github.com/kamailio/kamailio/commit/77eaba17916109ef5656a276e3f469b… --- 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:master:cff6f9fd: dspatcher: return the new ds dest for add_dest2list()
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: cff6f9fd7051f4b8ac6e4fc59257c239cb32f21d URL: https://github.com/kamailio/kamailio/commit/cff6f9fd7051f4b8ac6e4fc59257c23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:39:12+01:00 dspatcher: return the new ds dest for add_dest2list() - easier to access the fields of the new record afterwards --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cff6f9fd7051f4b8ac6e4fc59257c23… Patch: https://github.com/kamailio/kamailio/commit/cff6f9fd7051f4b8ac6e4fc59257c23… --- 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:6.0:db1ddc0d: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: db1ddc0dd2d663887ecfd24b9d74322518e8e98f URL: https://github.com/kamailio/kamailio/commit/db1ddc0dd2d663887ecfd24b9d74322… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-01-28T18:19:54+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/file_out/README --- Diff: https://github.com/kamailio/kamailio/commit/db1ddc0dd2d663887ecfd24b9d74322… Patch: https://github.com/kamailio/kamailio/commit/db1ddc0dd2d663887ecfd24b9d74322… --- diff --git a/src/modules/file_out/README b/src/modules/file_out/README index 88a49eed0c2..89ca58147c1 100644 --- a/src/modules/file_out/README +++ b/src/modules/file_out/README @@ -103,18 +103,19 @@ Chapter 1. Admin Guide Absolute path to the folder where log files should be saved. - Default value is ��/var/log/kamailio/file_out/��. + Default value is ��/var/log/kamailio/file_out��. Example 1.1. Set base_folder parameter ... -modparam("file_out", "base_folder", "/tmp/file_out/") +modparam("file_out", "base_folder", "/tmp/file_out") # trailing slash will be ad +ded. ... 3.2. file (string) The definition of a file and its properties. The value of the parameter may have the following format: - * "name=accounting;extension=.out;interval=20" + * "name=accounting;extension=.out;interval=20;prefix=accounting:" The parameter can be set multiple times to define more files in same configuration file. @@ -124,6 +125,8 @@ modparam("file_out", "base_folder", "/tmp/file_out/") Default value is ��.out��. * interval (Optional) - the interval in seconds of the file rotation Default value is ��600�� (10min). + * prefix (Optional) - the prefix for log messages + Default value is ��""�� (empty string). Example 1.2. Set file parameter ...

1 0

file_out module README is not up to date
by Henning Westerholt 28 Jan '25

28 Jan '25

Hello, the file_out module README is not up to date. Should I just fix it manually, or could somebody trigger the automatic auto-build job for it? Maybe it was not included so far? Thanks, Henning henning@app01:~/repositories/kamailio$ git diff diff --git a/src/modules/file_out/README b/src/modules/file_out/README index 88a49eed0c..89ca58147c 100644 --- a/src/modules/file_out/README +++ b/src/modules/file_out/README @@ -103,18 +103,19 @@ Chapter 1. Admin Guide Absolute path to the folder where log files should be saved. - Default value is "/var/log/kamailio/file_out/". + Default value is "/var/log/kamailio/file_out". Example 1.1. Set base_folder parameter ... -modparam("file_out", "base_folder", "/tmp/file_out/") +modparam("file_out", "base_folder", "/tmp/file_out") # trailing slash will be ad +ded. ... 3.2. file (string) The definition of a file and its properties. The value of the parameter may have the following format: - * "name=accounting;extension=.out;interval=20" + * "name=accounting;extension=.out;interval=20;prefix=accounting:" The parameter can be set multiple times to define more files in same configuration file. @@ -124,6 +125,8 @@ modparam("file_out", "base_folder", "/tmp/file_out/") Default value is ".out". * interval (Optional) - the interval in seconds of the file rotation Default value is "600" (10min). + * prefix (Optional) - the prefix for log messages + Default value is """" (empty string). Example 1.2. Set file parameter ...

2 1

git:master:1dabcc6c: modules: readme files regenerated - file_out ... [skip ci]
by Kamailio Dev 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 1dabcc6c863a3f2da5834b0a9773ffb744c6d62e URL: https://github.com/kamailio/kamailio/commit/1dabcc6c863a3f2da5834b0a9773ffb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-01-28T18:11:49+01:00 modules: readme files regenerated - file_out ... [skip ci] --- Modified: src/modules/file_out/README --- Diff: https://github.com/kamailio/kamailio/commit/1dabcc6c863a3f2da5834b0a9773ffb… Patch: https://github.com/kamailio/kamailio/commit/1dabcc6c863a3f2da5834b0a9773ffb… --- diff --git a/src/modules/file_out/README b/src/modules/file_out/README index 88a49eed0c2..89ca58147c1 100644 --- a/src/modules/file_out/README +++ b/src/modules/file_out/README @@ -103,18 +103,19 @@ Chapter 1. Admin Guide Absolute path to the folder where log files should be saved. - Default value is ��/var/log/kamailio/file_out/��. + Default value is ��/var/log/kamailio/file_out��. Example 1.1. Set base_folder parameter ... -modparam("file_out", "base_folder", "/tmp/file_out/") +modparam("file_out", "base_folder", "/tmp/file_out") # trailing slash will be ad +ded. ... 3.2. file (string) The definition of a file and its properties. The value of the parameter may have the following format: - * "name=accounting;extension=.out;interval=20" + * "name=accounting;extension=.out;interval=20;prefix=accounting:" The parameter can be set multiple times to define more files in same configuration file. @@ -124,6 +125,8 @@ modparam("file_out", "base_folder", "/tmp/file_out/") Default value is ��.out��. * interval (Optional) - the interval in seconds of the file rotation Default value is ��600�� (10min). + * prefix (Optional) - the prefix for log messages + Default value is ��""�� (empty string). Example 1.2. Set file parameter ...

1 0

git:6.0:374b7e46: kamctl: refresh db creation files
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 374b7e46881bbf591fd56305d3572ab3c12d1979 URL: https://github.com/kamailio/kamailio/commit/374b7e46881bbf591fd56305d3572ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:03:47+01:00 kamctl: refresh db creation files --- Added: utils/kamctl/db_berkeley/kamailio/pcscf_location Added: utils/kamctl/db_redis/kamailio/pcscf_location Added: utils/kamctl/dbtext/kamailio/pcscf_location Added: utils/kamctl/mongodb/kamailio/pcscf_location.json Modified: utils/kamctl/db_berkeley/kamailio/dialog_out Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/htable-create.sql Modified: utils/kamctl/db_sqlite/ims_dialog-create.sql Modified: utils/kamctl/db_sqlite/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/dbtext/kamailio/dialog_in Modified: utils/kamctl/dbtext/kamailio/dialog_out Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/dialog_in.json Modified: utils/kamctl/mongodb/kamailio/dialog_out.json Modified: utils/kamctl/mysql/htable-create.sql Modified: utils/kamctl/mysql/ims_dialog-create.sql Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/oracle/htable-create.sql Modified: utils/kamctl/oracle/ims_dialog-create.sql Modified: utils/kamctl/oracle/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/postgres/htable-create.sql Modified: utils/kamctl/postgres/ims_dialog-create.sql Modified: utils/kamctl/postgres/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-mod Modified: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-table Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/374b7e46881bbf591fd56305d3572ab… Patch: https://github.com/kamailio/kamailio/commit/374b7e46881bbf591fd56305d3572ab…

1 0

git:6.0:c1f8cb4d: ims_qos_npn/doc/Makefile: proper xml file name
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: c1f8cb4de71ec11d669484db8b67484caf96b288 URL: https://github.com/kamailio/kamailio/commit/c1f8cb4de71ec11d669484db8b67484… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:03:22+01:00 ims_qos_npn/doc/Makefile: proper xml file name (cherry picked from commit 9daea6c00dc5b613d9e4b7ffd711ee7999e31ad5) --- Modified: src/modules/ims_qos_npn/doc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/c1f8cb4de71ec11d669484db8b67484… Patch: https://github.com/kamailio/kamailio/commit/c1f8cb4de71ec11d669484db8b67484… --- diff --git a/src/modules/ims_qos_npn/doc/Makefile b/src/modules/ims_qos_npn/doc/Makefile index 4ab9c620042..6517aef6b72 100644 --- a/src/modules/ims_qos_npn/doc/Makefile +++ b/src/modules/ims_qos_npn/doc/Makefile @@ -1,4 +1,4 @@ -docs = ims_qos.xml +docs = ims_qos_npn.xml docbook_dir = ../../../../doc/docbook include $(docbook_dir)/Makefile.module

1 0

git:6.0:4fe03b9e: srdb1/schema/location_pcscf.xml: table location renamed to pcscf_location
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 4fe03b9e59e0e4598419818cf1770312eeada86a URL: https://github.com/kamailio/kamailio/commit/4fe03b9e59e0e4598419818cf177031… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:03:14+01:00 srdb1/schema/location_pcscf.xml: table location renamed to pcscf_location - fix conflict with default table for registrar/usrloc - GH #4124 (cherry picked from commit fc02c3ca46bd96e50cbb6903a2efe48cb134377b) --- Modified: src/lib/srdb1/schema/location_pcscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/4fe03b9e59e0e4598419818cf177031… Patch: https://github.com/kamailio/kamailio/commit/4fe03b9e59e0e4598419818cf177031… --- diff --git a/src/lib/srdb1/schema/location_pcscf.xml b/src/lib/srdb1/schema/location_pcscf.xml index a85f07bf75b..8538bf72ed6 100644 --- a/src/lib/srdb1/schema/location_pcscf.xml +++ b/src/lib/srdb1/schema/location_pcscf.xml @@ -7,8 +7,8 @@ ]> -<table id="location" xmlns:db="http://docbook.org/ns/docbook"> - <name>location</name> +<table id="pcscf_location" xmlns:db="http://docbook.org/ns/docbook"> + <name>pcscf_location</name> <version>7</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description>

1 0

git:master:9daea6c0: ims_qos_npn/doc/Makefile: proper xml file name
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 9daea6c00dc5b613d9e4b7ffd711ee7999e31ad5 URL: https://github.com/kamailio/kamailio/commit/9daea6c00dc5b613d9e4b7ffd711ee7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T17:58:46+01:00 ims_qos_npn/doc/Makefile: proper xml file name --- Modified: src/modules/ims_qos_npn/doc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/9daea6c00dc5b613d9e4b7ffd711ee7… Patch: https://github.com/kamailio/kamailio/commit/9daea6c00dc5b613d9e4b7ffd711ee7… --- diff --git a/src/modules/ims_qos_npn/doc/Makefile b/src/modules/ims_qos_npn/doc/Makefile index 4ab9c620042..6517aef6b72 100644 --- a/src/modules/ims_qos_npn/doc/Makefile +++ b/src/modules/ims_qos_npn/doc/Makefile @@ -1,4 +1,4 @@ -docs = ims_qos.xml +docs = ims_qos_npn.xml docbook_dir = ../../../../doc/docbook include $(docbook_dir)/Makefile.module

1 0

[kamailio/kamailio] ERROR: Creating extra tables failed at ims_icscf! (Issue #4124)
by Luke Escudé 28 Jan '25

28 Jan '25

### Description Installing Kamailio 5.8.5 on Debian 12, running kamdbctl create kamailio continually fails with error "ERROR: Creating extra tables failed at ims_icscf!" ### Troubleshooting #### Reproduction Create a brand new VM with Debian 12, clone Kamailio from git tag 5.8.5, and follow the steps: make include_modules="db_mysql crypto http_async_client http_client jansson janssonrpcc json jsonrpcc lcr presence presence_dialoginfo presence_mwi presence_reginfo presence_xml tls utils uuid xmlops" cfg make all make install # Installs Kamailio in /usr/local/sbin make install-systemd-debian sed -i 's/^# DBENGINE/DBENGINE/' /usr/local/etc/kamailio/kamctlrc kamdbctl create kamailio Will result in the error occurring. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4124 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4124(a)github.com>

2 2

git:5.8:1b4aa300: kamctl: renegenerate db creation files
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 5.8 Commit: 1b4aa300292dd6bdd64e174111939293fbbd76ed URL: https://github.com/kamailio/kamailio/commit/1b4aa300292dd6bdd64e17411193929… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T17:47:11+01:00 kamctl: renegenerate db creation files - GH #4124 --- Added: utils/kamctl/db_berkeley/kamailio/nds_trusted_domains Added: utils/kamctl/db_berkeley/kamailio/s_cscf Added: utils/kamctl/db_berkeley/kamailio/s_cscf_capabilities Added: utils/kamctl/db_redis/kamailio/nds_trusted_domains Added: utils/kamctl/db_redis/kamailio/s_cscf Added: utils/kamctl/db_redis/kamailio/s_cscf_capabilities Added: utils/kamctl/db_sqlite/ims_icscf-create.sql Added: utils/kamctl/dbtext/kamailio/nds_trusted_domains Added: utils/kamctl/dbtext/kamailio/s_cscf Added: utils/kamctl/dbtext/kamailio/s_cscf_capabilities Added: utils/kamctl/mongodb/kamailio/nds_trusted_domains.json Added: utils/kamctl/mongodb/kamailio/s_cscf.json Added: utils/kamctl/mongodb/kamailio/s_cscf_capabilities.json Added: utils/kamctl/mysql/ims_icscf-create.sql Added: utils/kamctl/oracle/ims_icscf-create.sql Added: utils/kamctl/postgres/ims_icscf-create.sql Added: utils/kamctl/xhttp_pi/ims_icscf-mod Added: utils/kamctl/xhttp_pi/ims_icscf-table Modified: utils/kamctl/xhttp_pi/acc-mod Modified: utils/kamctl/xhttp_pi/alias_db-mod Modified: utils/kamctl/xhttp_pi/auth_db-mod Modified: utils/kamctl/xhttp_pi/avpops-mod Modified: utils/kamctl/xhttp_pi/carrierroute-mod Modified: utils/kamctl/xhttp_pi/cpl-mod Modified: utils/kamctl/xhttp_pi/dialog-mod Modified: utils/kamctl/xhttp_pi/dialplan-mod Modified: utils/kamctl/xhttp_pi/dispatcher-mod Modified: utils/kamctl/xhttp_pi/domain-mod Modified: utils/kamctl/xhttp_pi/domainpolicy-mod Modified: utils/kamctl/xhttp_pi/drouting-mod Modified: utils/kamctl/xhttp_pi/group-mod Modified: utils/kamctl/xhttp_pi/htable-mod Modified: utils/kamctl/xhttp_pi/imc-mod Modified: utils/kamctl/xhttp_pi/lcr-mod Modified: utils/kamctl/xhttp_pi/matrix-mod Modified: utils/kamctl/xhttp_pi/mohqueue-mod Modified: utils/kamctl/xhttp_pi/msilo-mod Modified: utils/kamctl/xhttp_pi/mtree-mod Modified: utils/kamctl/xhttp_pi/pdt-mod Modified: utils/kamctl/xhttp_pi/permissions-mod Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/pipelimit-mod Modified: utils/kamctl/xhttp_pi/presence-mod Modified: utils/kamctl/xhttp_pi/purple-mod Modified: utils/kamctl/xhttp_pi/registrar-mod Modified: utils/kamctl/xhttp_pi/rls-mod Modified: utils/kamctl/xhttp_pi/rtpengine-mod Modified: utils/kamctl/xhttp_pi/rtpproxy-mod Modified: utils/kamctl/xhttp_pi/sca-mod Modified: utils/kamctl/xhttp_pi/secfilter-mod Modified: utils/kamctl/xhttp_pi/siptrace-mod Modified: utils/kamctl/xhttp_pi/speeddial-mod Modified: utils/kamctl/xhttp_pi/standard-mod Modified: utils/kamctl/xhttp_pi/topos-mod Modified: utils/kamctl/xhttp_pi/uac-mod Modified: utils/kamctl/xhttp_pi/uid_auth_db-mod Modified: utils/kamctl/xhttp_pi/uid_avp_db-mod Modified: utils/kamctl/xhttp_pi/uid_domain-mod Modified: utils/kamctl/xhttp_pi/uid_gflags-mod Modified: utils/kamctl/xhttp_pi/uid_uri_db-mod Modified: utils/kamctl/xhttp_pi/uri_db-mod Modified: utils/kamctl/xhttp_pi/userblocklist-mod Modified: utils/kamctl/xhttp_pi/usrloc-mod --- Diff: https://github.com/kamailio/kamailio/commit/1b4aa300292dd6bdd64e17411193929… Patch: https://github.com/kamailio/kamailio/commit/1b4aa300292dd6bdd64e17411193929…

1 0

git:6.0:be2c68f8: outbound: Fix flow_token_secret bug
by Henning Westerholt 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: be2c68f86fcf84dac24501a6b24a6573917894aa URL: https://github.com/kamailio/kamailio/commit/be2c68f86fcf84dac24501a6b24a657… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-28T16:33:55Z outbound: Fix flow_token_secret bug - flow_token_secret is of type str and not char* - check the length of the string instead of memory for initialization (cherry picked from commit 046ba41e431fec7fad0c82a9091ea9e27d9f677d) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/be2c68f86fcf84dac24501a6b24a657… Patch: https://github.com/kamailio/kamailio/commit/be2c68f86fcf84dac24501a6b24a657… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index f3c80f18c15..f2e0c7dbc3d 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -66,7 +66,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"force_outbound_flag", PARAM_INT, &ob_force_flag}, {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {"flow_token_secret", PARAM_STR, &flow_token_secret}, {0, 0, 0} }; @@ -86,7 +86,7 @@ struct module_exports exports = { static void mod_init_openssl(void) { - if(flow_token_secret.s) { + if(flow_token_secret.s && flow_token_secret.len > 0) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); #if OPENSSL_VERSION_NUMBER < 0x030000000L

1 0

git:master:360bccbc: kamctl: regenerated db creation files
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 360bccbca1fe7515384065651034374be303bab3 URL: https://github.com/kamailio/kamailio/commit/360bccbca1fe7515384065651034374… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T17:28:19+01:00 kamctl: regenerated db creation files --- Added: utils/kamctl/db_berkeley/kamailio/pcscf_location Added: utils/kamctl/db_redis/kamailio/pcscf_location Added: utils/kamctl/dbtext/kamailio/pcscf_location Added: utils/kamctl/mongodb/kamailio/pcscf_location.json Modified: utils/kamctl/db_sqlite/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/oracle/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/postgres/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-mod Modified: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-table Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/360bccbca1fe7515384065651034374… Patch: https://github.com/kamailio/kamailio/commit/360bccbca1fe7515384065651034374…

1 0

git:master:fc02c3ca: srdb1/schema/location_pcscf.xml: table location renamed to pcscf_location
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: fc02c3ca46bd96e50cbb6903a2efe48cb134377b URL: https://github.com/kamailio/kamailio/commit/fc02c3ca46bd96e50cbb6903a2efe48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T17:28:19+01:00 srdb1/schema/location_pcscf.xml: table location renamed to pcscf_location - fix conflict with default table for registrar/usrloc - GH #4124 --- Modified: src/lib/srdb1/schema/location_pcscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/fc02c3ca46bd96e50cbb6903a2efe48… Patch: https://github.com/kamailio/kamailio/commit/fc02c3ca46bd96e50cbb6903a2efe48… --- diff --git a/src/lib/srdb1/schema/location_pcscf.xml b/src/lib/srdb1/schema/location_pcscf.xml index a85f07bf75b..8538bf72ed6 100644 --- a/src/lib/srdb1/schema/location_pcscf.xml +++ b/src/lib/srdb1/schema/location_pcscf.xml @@ -7,8 +7,8 @@ ]> -<table id="location" xmlns:db="http://docbook.org/ns/docbook"> - <name>location</name> +<table id="pcscf_location" xmlns:db="http://docbook.org/ns/docbook"> + <name>pcscf_location</name> <version>7</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description>

1 0

[kamailio/kamailio] cmake: should we use >= 3.13, i.e., "more modern cmake" generation? (Issue #4078)
by space88man 28 Jan '25

28 Jan '25

### Description From the cmake timeline 3.0(2014) is called "modern cmake" and ~3.12/3.13(2018) is "more modern cmake" : https://www.youtube.com/watch?v=y7ndUhdQuU8 Since we are doing a major renovation on the kamailio build system should we target the "more modern" generation (that is already > 5 years old). This will encourage the project to follow cmake best practices. Ping @xkaraman @miconda Versions in debian: buster(3.13) bullseye(3.25) bookworm/trixie(3.30) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4078 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4078(a)github.com>

8 25

[kamailio/kamailio] outbound: Fix flow_token_secret bug (PR #4125)
by Xenofon Karamanos 28 Jan '25

28 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes a bug where when `flow_token_secret` was provided, it was not initialized properly and always set to an empty string. - flow_token_secret is of type str and not char* - check the length of the string instead of memory for initialization You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4125 -- Commit Summary -- * outbound: Fix flow_token_secret bug -- File Changes -- M src/modules/outbound/outbound_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4125.patch https://github.com/kamailio/kamailio/pull/4125.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4125 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4125(a)github.com>

3 4

git:master:046ba41e: outbound: Fix flow_token_secret bug
by Henning Westerholt 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 046ba41e431fec7fad0c82a9091ea9e27d9f677d URL: https://github.com/kamailio/kamailio/commit/046ba41e431fec7fad0c82a9091ea9e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-28T17:11:49+01:00 outbound: Fix flow_token_secret bug - flow_token_secret is of type str and not char* - check the length of the string instead of memory for initialization --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/046ba41e431fec7fad0c82a9091ea9e… Patch: https://github.com/kamailio/kamailio/commit/046ba41e431fec7fad0c82a9091ea9e… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index f3c80f18c15..f2e0c7dbc3d 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -66,7 +66,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"force_outbound_flag", PARAM_INT, &ob_force_flag}, {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {"flow_token_secret", PARAM_STR, &flow_token_secret}, {0, 0, 0} }; @@ -86,7 +86,7 @@ struct module_exports exports = { static void mod_init_openssl(void) { - if(flow_token_secret.s) { + if(flow_token_secret.s && flow_token_secret.len > 0) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); #if OPENSSL_VERSION_NUMBER < 0x030000000L

1 0

git:master:99d36df0: cmake/json: Remove find_package call. Use pkg-config instead.
by Xenofon Karamanos 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 99d36df0a15bbb960b2d7ee5916d65a55b9b26cd URL: https://github.com/kamailio/kamailio/commit/99d36df0a15bbb960b2d7ee5916d65a… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-28T14:05:25Z cmake/json: Remove find_package call. Use pkg-config instead. --- Modified: src/modules/json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/99d36df0a15bbb960b2d7ee5916d65a… Patch: https://github.com/kamailio/kamailio/commit/99d36df0a15bbb960b2d7ee5916d65a… --- diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt index 72df4d390f5..5d791dbd03d 100644 --- a/src/modules/json/CMakeLists.txt +++ b/src/modules/json/CMakeLists.txt @@ -2,13 +2,18 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(json-c 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() +# 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() target_link_libraries(${module_name} PRIVATE json-c::json-c)

1 0

git:master:532744ee: cmake/json: Use CONFIG mode
by Xenofon Karamanos 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 532744eebf1014939c4ccd9a6aa4e7d6fbb454ac URL: https://github.com/kamailio/kamailio/commit/532744eebf1014939c4ccd9a6aa4e7d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-28T11:18:24Z cmake/json: Use CONFIG mode --- Modified: src/modules/json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/532744eebf1014939c4ccd9a6aa4e7d… Patch: https://github.com/kamailio/kamailio/commit/532744eebf1014939c4ccd9a6aa4e7d… --- diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt index c4cbf81440c..72df4d390f5 100644 --- a/src/modules/json/CMakeLists.txt +++ b/src/modules/json/CMakeLists.txt @@ -2,7 +2,8 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(json-c QUIET) +find_package(json-c CONFIG) + if(NOT json-c_FOUND) message(STATUS "json-c not found. looking with pkg-config") find_package(PkgConfig REQUIRED)

1 0

git:6.0:3a480f03: etc/kamailio.cfg: close comment for tls_threads_mode
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 3a480f03fa54855059b72db8304f47cca7ee753e URL: https://github.com/kamailio/kamailio/commit/3a480f03fa54855059b72db8304f47c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:14:00+01:00 etc/kamailio.cfg: close comment for tls_threads_mode (cherry picked from commit d8d627eff7de268a487d7f91cc52e7ba8a6c708e) --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/3a480f03fa54855059b72db8304f47c… Patch: https://github.com/kamailio/kamailio/commit/3a480f03fa54855059b72db8304f47c… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index a61227d4173..a06e09fdc77 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -234,9 +234,10 @@ tls_max_connections=2048 /* For OpenSSL 3 integration * functions calling libssl3 can be invoked in a transient thread * 0: disable threaded calls - * 1: use thread executors for process#0 only - * 2: no thread executors, but use atfork handler to reset thread-locals to NULL + * 1: use thread executors for process #0 only + * 2: no thread executors, but use atfork handler to reset thread-locals to NULL */ tls_threads_mode=2 + #!endif /* set it to yes to enable sctp and load sctp.so module */

1 0

git:6.0:b4718cd7: http_async_client: check returned cell inside check_multi_info()
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: b4718cd7dca8e037664dbc49a1cfac684906ecea URL: https://github.com/kamailio/kamailio/commit/b4718cd7dca8e037664dbc49a1cfac6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:50+01:00 http_async_client: check returned cell inside check_multi_info() (cherry picked from commit b16550fa72d23084b4221769fe74b1f3c357c9fd) --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/b4718cd7dca8e037664dbc49a1cfac6… Patch: https://github.com/kamailio/kamailio/commit/b4718cd7dca8e037664dbc49a1cfac6… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index 30ae016d720..7edc0ddc1a0 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -604,7 +604,7 @@ void check_multi_info(struct http_m_global *g) CURL *easy; CURLcode res; - struct http_m_cell *cell; + struct http_m_cell *cell = NULL; double tmp_time; LM_DBG("REMAINING: %d\n", g->still_running); @@ -616,9 +616,15 @@ void check_multi_info(struct http_m_global *g) curl_easy_getinfo(easy, CURLINFO_EFFECTIVE_URL, &eff_url); - LM_DBG("DONE: %s => (%d) %s\n", eff_url, res, cell->error); + LM_DBG("DONE: %s => (%d)\n", eff_url, res); cell = http_m_cell_lookup(easy); + if(cell == NULL) { + LM_ERR("failed to get the cell\n"); + curl_multi_remove_handle(g->multi, easy); + curl_easy_cleanup(easy); + continue; + } if(msg->data.result != 0) { LM_ERR("handle %p returned error %d: %s\n", easy, res, cell->error);

1 0

git:6.0:dfa9239c: htable: wrapped maco code in do {} while(0)
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: dfa9239cf6df7644e9fe6b83cfc33aff518a19c6 URL: https://github.com/kamailio/kamailio/commit/dfa9239cf6df7644e9fe6b83cfc33af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:39+01:00 htable: wrapped maco code in do {} while(0) (cherry picked from commit 65a296b3478503ed3519ea9156d8f46f5cb9ce2a) --- Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/dfa9239cf6df7644e9fe6b83cfc33af… Patch: https://github.com/kamailio/kamailio/commit/dfa9239cf6df7644e9fe6b83cfc33af… --- diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 4e0757f237b..d9fc187e722 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -144,10 +144,19 @@ ht_cell_t *ht_iterator_get_current(str *iname); void ht_slot_lock(ht_t *ht, int idx); void ht_slot_unlock(ht_t *ht, int idx); -#define HT_UPDATE_EXPIRE(ht, it, now) \ - if(ht->updateexpire || (now && it->expire && it->expire < now)) \ - it->expire = now + ht->htexpire -#define HT_COPY_EXPIRE(ht, it, now, src) \ - HT_UPDATE_EXPIRE(ht, it, now); \ - else it->expire = src->expire +#define HT_UPDATE_EXPIRE(ht, it, now) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } \ + } while(0) +#define HT_COPY_EXPIRE(ht, it, now, src) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } else { \ + it->expire = src->expire; \ + } \ + } while(0) + #endif

1 0

git:6.0:b38925b0: htable: Fix expiry on assignment
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: b38925b0b3628539840de2b6240da75b9f9f3cc6 URL: https://github.com/kamailio/kamailio/commit/b38925b0b3628539840de2b6240da75… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:31+01:00 htable: Fix expiry on assignment Update cell expiry on assignment for htables w/o updateexpiry (analogue to #4079). (cherry picked from commit 75994f40c99ffa2c7c33e5fce5e3d3cd8db7d780) --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/b38925b0b3628539840de2b6240da75… Patch: https://github.com/kamailio/kamailio/commit/b38925b0b3628539840de2b6240da75… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 9190dd310ff..47b4b975194 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -496,9 +496,7 @@ int ht_set_cell_ex( it->value.s.s[it->value.s.len] = '\0'; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } @@ -514,11 +512,7 @@ int ht_set_cell_ex( cell->next = it->next; cell->prev = it->prev; if(exv <= 0) { - if(ht->updateexpire) { - cell->expire = now + ht->htexpire; - } else { - cell->expire = it->expire; - } + HT_COPY_EXPIRE(ht, cell, now, it); } else { it->expire = now + exv; } @@ -535,9 +529,7 @@ int ht_set_cell_ex( it->value.n = val->n; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } @@ -556,11 +548,7 @@ int ht_set_cell_ex( return -1; } if(exv <= 0) { - if(ht->updateexpire) { - cell->expire = now + ht->htexpire; - } else { - cell->expire = it->expire; - } + HT_COPY_EXPIRE(ht, cell, now, it); } else { it->expire = now + exv; } @@ -578,9 +566,7 @@ int ht_set_cell_ex( it->value.n = val->n; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 5ac11b9bb00..4e0757f237b 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -143,4 +143,11 @@ ht_cell_t *ht_iterator_get_current(str *iname); void ht_slot_lock(ht_t *ht, int idx); void ht_slot_unlock(ht_t *ht, int idx); + +#define HT_UPDATE_EXPIRE(ht, it, now) \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) \ + it->expire = now + ht->htexpire +#define HT_COPY_EXPIRE(ht, it, now, src) \ + HT_UPDATE_EXPIRE(ht, it, now); \ + else it->expire = src->expire #endif

1 0

git:6.0:9c44aec6: core/parser/sdp: proper test for media ip separator
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 9c44aec667fc3c088612dd31935bce2eb082812d URL: https://github.com/kamailio/kamailio/commit/9c44aec667fc3c088612dd31935bce2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:23+01:00 core/parser/sdp: proper test for media ip separator (cherry picked from commit 200cdb318569191cd012dfe99b252f98fe9623b9) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/9c44aec667fc3c088612dd31935bce2… Patch: https://github.com/kamailio/kamailio/commit/9c44aec667fc3c088612dd31935bce2… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 61022b6148f..893ef0e58a4 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -561,7 +561,7 @@ int extract_mediaip(str *body, str *mediaip, int *pf, char *line) * - for length, at least 6: ' IP[4|6] x...' * - white space after */ - if(cp + 6 > mediaip->s + mediaip->len && cp[4] != ' ') { + if(cp + 6 > mediaip->s + mediaip->len || cp[4] != ' ') { LM_ERR("invalid content for `%s' line\n", line); return -1; }

1 0

git:6.0:9e21ce85: presence: do not break on one notify sending failure
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 9e21ce85d0c97679f9e14f9c31108f2dcdad772e URL: https://github.com/kamailio/kamailio/commit/9e21ce85d0c97679f9e14f9c31108f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:11+01:00 presence: do not break on one notify sending failure - try all of them, debug message with successful and failure counters - GH #4118 (cherry picked from commit 65e51b776290a1981e9ac27fbe6b47813516bc8b) --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/9e21ce85d0c97679f9e14f9c31108f2… Patch: https://github.com/kamailio/kamailio/commit/9e21ce85d0c97679f9e14f9c31108f2… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 47a11b23183..191cac0d04b 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1557,6 +1557,8 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) subs_t *subs_array = NULL, *s = NULL; str *notify_body = NULL, *aux_body = NULL; int ret_code = -1; + int retOK = 0; + int retErr = 0; subs_array = get_subs_dialog(pres_uri, event, NULL); if(subs_array == NULL) { @@ -1586,7 +1588,9 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) < 0) { LM_ERR("Could not send notify for [event]=%.*s\n", event->name.len, event->name.s); - goto done; + retErr++; + } else { + retOK++; } if(aux_body != NULL) { @@ -1599,7 +1603,10 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) } } - ret_code = 1; + LM_DBG("sent ok: %d - err: %d\n", retOK, retErr); + if(retOK > 0) { + ret_code = 1; + } done: free_subs_list(subs_array, PKG_MEM_TYPE, 0);

1 0

git:6.0:a5ac9e04: core: more checks for extract_candidate()
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: a5ac9e04b91971da44256373904450501f9a4493 URL: https://github.com/kamailio/kamailio/commit/a5ac9e04b91971da442563739044505… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:12:47+01:00 core: more checks for extract_candidate() (cherry picked from commit 3198b66aa5dbda1c6a03f46a610073671cbd5157) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/a5ac9e04b91971da442563739044505… Patch: https://github.com/kamailio/kamailio/commit/a5ac9e04b91971da442563739044505… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 483cfdec70e..61022b6148f 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -314,7 +314,7 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream) int len, fl; sdp_ice_attr_t *ice_attr; - if((body->len < 12) || (strncasecmp(body->s, "a=candidate:", 12) != 0)) { + if((body->len <= 12) || (strncasecmp(body->s, "a=candidate:", 12) != 0)) { /*LM_DBG("We are not pointing to an a=candidate: attribute =>`%.*s'\n", body->len, body->s); */ return -1; } @@ -332,6 +332,10 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream) start = space + 1; len = len - (space - start + 1); + if(start + len > body->s + body->len) { + LM_ERR("no component in `a=candidate'\n"); + return -1; + } space = memchr(start, 32, len); if(space == NULL) { LM_ERR("no component in `a=candidate'\n");

1 0

git:6.0:6e2a37c4: core: extended logs for subst lumps
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 6e2a37c449a14c03f9c086ae9fb61729d8fce393 URL: https://github.com/kamailio/kamailio/commit/6e2a37c449a14c03f9c086ae9fb6172… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:12:31+01:00 core: extended logs for subst lumps (cherry picked from commit d307fee57b7a8a7e0b5ccf0956464a159e156b73) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/6e2a37c449a14c03f9c086ae9fb6172… Patch: https://github.com/kamailio/kamailio/commit/6e2a37c449a14c03f9c086ae9fb6172…

1 0

git:master:d8d627ef: etc/kamailio.cfg: close comment for tls_threads_mode
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: d8d627eff7de268a487d7f91cc52e7ba8a6c708e URL: https://github.com/kamailio/kamailio/commit/d8d627eff7de268a487d7f91cc52e7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:10:33+01:00 etc/kamailio.cfg: close comment for tls_threads_mode --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/d8d627eff7de268a487d7f91cc52e7b… Patch: https://github.com/kamailio/kamailio/commit/d8d627eff7de268a487d7f91cc52e7b… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index a61227d4173..a06e09fdc77 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -234,9 +234,10 @@ tls_max_connections=2048 /* For OpenSSL 3 integration * functions calling libssl3 can be invoked in a transient thread * 0: disable threaded calls - * 1: use thread executors for process#0 only - * 2: no thread executors, but use atfork handler to reset thread-locals to NULL + * 1: use thread executors for process #0 only + * 2: no thread executors, but use atfork handler to reset thread-locals to NULL */ tls_threads_mode=2 + #!endif /* set it to yes to enable sctp and load sctp.so module */

1 0

git:master:feb37185: cmake: fix CPL definition
by Victor Seva 27 Jan '25

27 Jan '25

Module: kamailio Branch: master Commit: feb371852ea9b53a1dd95fec0db0943c5fb160ad URL: https://github.com/kamailio/kamailio/commit/feb371852ea9b53a1dd95fec0db0943… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-27T19:41:30+01:00 cmake: fix CPL definition --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/feb371852ea9b53a1dd95fec0db0943… Patch: https://github.com/kamailio/kamailio/commit/feb371852ea9b53a1dd95fec0db0943… --- diff --git a/cmake/groups.cmake b/cmake/groups.cmake index 9cd7ddf77dc..73ef6d632dd 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -167,7 +167,7 @@ set(MOD_LIST_POSTGRES db_postgres) set(MOD_LIST_UNIXODBC db_unixodbc) # * modules depending on xml2 library -set(MOD_LIST_CPLC cplc) +set(MOD_LIST_CPL cplc) # * modules depending on xml2 library set(MOD_LIST_XMLDEPS xhttp_pi xmlrpc xmlops) @@ -385,7 +385,7 @@ set(MOD_LIST_ALL ${MOD_LIST_UNIXODBC} ${MOD_LIST_XMLDEPS} ${MOD_LIST_PERLDEPS} - ${MOD_LIST_CPLC} + ${MOD_LIST_CPL} ${MOD_LIST_XMPP} ${MOD_LIST_BERKELEY} ${MOD_LIST_UTILS}

1 0

git:master:b16550fa: http_async_client: check returned cell inside check_multi_info()
by Daniel-Constantin Mierla 27 Jan '25

27 Jan '25

Module: kamailio Branch: master Commit: b16550fa72d23084b4221769fe74b1f3c357c9fd URL: https://github.com/kamailio/kamailio/commit/b16550fa72d23084b4221769fe74b1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-27T16:06:49+01:00 http_async_client: check returned cell inside check_multi_info() --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/b16550fa72d23084b4221769fe74b1f… Patch: https://github.com/kamailio/kamailio/commit/b16550fa72d23084b4221769fe74b1f… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index 30ae016d720..7edc0ddc1a0 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -604,7 +604,7 @@ void check_multi_info(struct http_m_global *g) CURL *easy; CURLcode res; - struct http_m_cell *cell; + struct http_m_cell *cell = NULL; double tmp_time; LM_DBG("REMAINING: %d\n", g->still_running); @@ -616,9 +616,15 @@ void check_multi_info(struct http_m_global *g) curl_easy_getinfo(easy, CURLINFO_EFFECTIVE_URL, &eff_url); - LM_DBG("DONE: %s => (%d) %s\n", eff_url, res, cell->error); + LM_DBG("DONE: %s => (%d)\n", eff_url, res); cell = http_m_cell_lookup(easy); + if(cell == NULL) { + LM_ERR("failed to get the cell\n"); + curl_multi_remove_handle(g->multi, easy); + curl_easy_cleanup(easy); + continue; + } if(msg->data.result != 0) { LM_ERR("handle %p returned error %d: %s\n", easy, res, cell->error);

1 0

Unable to build json module on Amazon Linux 2023 using cmake
by Ovidiu Sas 27 Jan '25

27 Jan '25

Trying to build kamailio on Amazon Linux 2023. The json-c-devel package was installed, Unlike older versions of json, the json.h is located here: /usr/include/json-c/json.h This is correctly identified by pkg-config: # pkg-config --cflags json-c -I/usr/include/json-c Kamailio source code was installed under: /usr/local/src/kamailio Build directory: /usr/local/src/kamailio_build Configure the build: # cmake -S /usr/local/src/kamailio -B /usr/local/src/kamailio_build -DINCLUDE_MODULES="json" -DEXCLUDE_MODULES="async auth benchmark blst cfg_rpc cfgutils corex counters ctl debugger diversion enum exec ipops kex mangler maxfwd mediaproxy mqueue nat_traversal nathelper path pike pv ratelimit rr rtimer rtpproxy sanity sdpops siputils sl statistics textops textopsx tm tmx topoh xlog rtpengine stun sipt tcpops auth_xkeys smsops tsilo cfgt statsc topos topos_htable sipdump pv_headers kemix avp auth_diameter call_control call_obj dmq domainpolicy msrp carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson log_custom keepalive ss7ops acc_diameter evrexec file_out sipjson lrkproxy math posops xhttp_prom dlgs sworker influxdbc acc alias_db auth_db avpops cfg_db db_text db_flatstore db_cluster dialog dispatcher domain drouting group htable imc matrix mohqueue msilo mtree p_usrloc pdt permissions pipelimit prefix_route registrar sipcapture siptrace speeddial sqlops uac uri_db userblocklist usrloc secfilter db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags uid_uri_db misctest app_jsdt" -DVERBOSE=ON -- The C compiler identification is GNU 11.4.1 -- The CXX compiler identification is GNU 11.4.1 -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working C compiler: /usr/bin/cc - skipped -- Detecting C compile features -- Detecting C compile features - done -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Check for working CXX compiler: /usr/bin/c++ - skipped -- Detecting CXX compile features -- Detecting CXX compile features - done -- PROJECT_VERSION: 6.0.0 -- RELEASE: 6.0.0-pre0 -- VERSIONVAL: 6000000 -- Setting build type to 'Debug' as none was specified. -- OS: Linux -- OS version: 6.1.119-129.201.amzn2023.x86_64 -- Host Processor: x86_64 -- Target Processor: x86_64 -- Target Processor Alias: x86_64 -- Fast lock available: YES -- Configuring for Linux -- Cross compile: FALSE -- CMAKE_INSTALL_PREFIX: /usr/local -- CMAKE_INSTALL_LIBDIR: /usr/local/lib64 -- CMAKE_INSTALL_BINDIR: /usr/local/bin -- CMAKE_INSTALL_SBINDIR: /usr/local/sbin -- CMAKE_INSTALL_SYSCONFDIR: /usr/local/etc -- CMAKE_INSTALL_LOCALSTATEDIR:/usr/local/var/run/kamailio -- CMAKE_INSTALL_DATADIR: /usr/local/share -- CMAKE_INSTALL_DOCDIR: /usr/local/share/doc/kamailio -- CMAKE_INSTALL_MANDIR: /usr/local/share/man -- CMAKE_C_COMPILER: /usr/bin/cc -- CMAKE_C_COMPILER_ID: GNU -- CMAKE_C_COMPILER_VERSION: 11.4.1 -- Looking for pthread.h -- Looking for pthread.h - found -- Performing Test CMAKE_HAVE_LIBC_PTHREAD -- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Success -- Found Threads: TRUE -- Compile definitions for common: FAST_LOCK;ADAPTIVE_WAIT;ADAPTIVE_WAIT_LOOPS=1024;USE_TCP;USE_TLS;TLS_HOOKS;USE_NAPTR;USE_DNS_CACHE;F_MALLOC;Q_MALLOC;TLSF_MALLOC;MALLOC_STATS;DBG_SR_MEMORY;USE_DNS_FAILOVER;USE_DST_BLOCKLIST;HAVE_RESOLV_RES;USE_MCAST;DISABLE_NAGLE;DNS_IP_HACK;SHM_MMAP;PKG_MALLOC;RAW_SOCKS;KSR_PTHREAD_MUTEX_SHARED;FMSTATS;KMSTATS;HAVE_GETHOSTBYNAME2;HAVE_UNION_SEMUN;HAVE_SCHED_YIELD;HAVE_MSG_NOSIGNAL;HAVE_MSGHDR_MSG_CONTROL;HAVE_ALLOCA_H;HAVE_TIMEGM;HAVE_SCHED_SETSCHEDULER;HAVE_IP_MREQN;USE_RAW_SOCKS;HAVE_SELECT;HAVE_EPOLL;HAVE_SIGIO_RT;SIGINFO64_WORKAROUND;NAME="kamailio";VERSION="6.0.0-pre0";ARCH="x86_64";OS=Linux;OS_QUOTED="Linux";COMPILER="gcc 11.4.1";__CPU_x86_64;__OS_linux;VERSIONVAL=6000000;CFG_DIR="/usr/local/etc/kamailio/";SHARE_DIR="/usr/local/share/kamailio/";RUN_DIR="/run/kamailio";$<$<BOOL:ON>:USE_SCTP>;$<$<BOOL:ON>:STATISTICS> -- Compile options for common: MY_INTERFACE_OPTIONS-NOTFOUND -- Found FLEX: /usr/bin/flex (found version "2.6.4") -- Found BISON: /usr/bin/bison (found version "3.7.4") -- Found LibXml2: /usr/lib64/libxml2.so (found version "2.10.4") -- Building groups: DEFAULT -- xsltproc or lynx not found but required for doc generation. -- DOCS_XSL_VAIDATION=OFFDisabling xsl validation when generating documentation -- Extra modules (if module already included already from group is ignored): json -- Excluded modules (exlcude even if in included modules): async;auth;benchmark;blst;cfg_rpc;cfgutils;corex;counters;ctl;debugger;diversion;enum;exec;ipops;kex;mangler;maxfwd;mediaproxy;mqueue;nat_traversal;nathelper;path;pike;pv;ratelimit;rr;rtimer;rtpproxy;sanity;sdpops;siputils;sl;statistics;textops;textopsx;tm;tmx;topoh;xlog;rtpengine;stun;sipt;tcpops;auth_xkeys;smsops;tsilo;cfgt;statsc;topos;topos_htable;sipdump;pv_headers;kemix;avp;auth_diameter;call_control;call_obj;dmq;domainpolicy;msrp;carrierroute;pdb;qos;sca;seas;sms;sst;timer;tmrec;uac_redirect;xhttp;xhttp_rpc;xprint;jsonrpcs;nosip;dmq_usrloc;statsd;rtjson;log_custom;keepalive;ss7ops;acc_diameter;evrexec;file_out;sipjson;lrkproxy;math;posops;xhttp_prom;dlgs;sworker;influxdbc;acc;alias_db;auth_db;avpops;cfg_db;db_text;db_flatstore;db_cluster;dialog;dispatcher;domain;drouting;group;htable;imc;matrix;mohqueue;msilo;mtree;p_usrloc;pdt;permissions;pipelimit;prefix_route;registrar;sipcapture;siptrace;speeddial;sqlops;uac;uri_db;userblocklist;usrloc;secfilter;db2_ops;uid_auth_db;uid_avp_db;uid_domain;uid_gflags;uid_uri_db;misctest;app_jsdt -- Modules in MODULE_GROUP_DEFAULT: async;auth;benchmark;blst;cfg_rpc;cfgutils;corex;counters;ctl;debugger;diversion;enum;exec;ipops;kex;mangler;maxfwd;mediaproxy;mqueue;nat_traversal;nathelper;path;pike;pv;ratelimit;rr;rtimer;rtpproxy;sanity;sdpops;siputils;sl;statistics;textops;textopsx;tm;tmx;topoh;xlog;rtpengine;stun;sipt;tcpops;auth_xkeys;smsops;tsilo;cfgt;statsc;topos;topos_htable;sipdump;pv_headers;kemix;avp;auth_diameter;call_control;call_obj;dmq;domainpolicy;msrp;carrierroute;pdb;qos;sca;seas;sms;sst;timer;tmrec;uac_redirect;xhttp;xhttp_rpc;xprint;jsonrpcs;nosip;dmq_usrloc;statsd;rtjson;log_custom;keepalive;ss7ops;acc_diameter;evrexec;file_out;sipjson;lrkproxy;math;posops;xhttp_prom;dlgs;sworker;influxdbc;acc;alias_db;auth_db;avpops;cfg_db;db_text;db_flatstore;db_cluster;dialog;dispatcher;domain;drouting;group;htable;imc;matrix;mohqueue;msilo;mtree;p_usrloc;pdt;permissions;pipelimit;prefix_route;registrar;sipcapture;siptrace;speeddial;sqlops;uac;uri_db;userblocklist;usrloc;secfilter;db2_ops;uid_auth_db;uid_avp_db;uid_domain;uid_gflags;uid_uri_db;misctest;app_jsdt -- Module async is excluded. Skipping... -- Module auth is excluded. Skipping... -- Module benchmark is excluded. Skipping... -- Module blst is excluded. Skipping... -- Module cfg_rpc is excluded. Skipping... -- Module cfgutils is excluded. Skipping... -- Module corex is excluded. Skipping... -- Module counters is excluded. Skipping... -- Module ctl is excluded. Skipping... -- Module debugger is excluded. Skipping... -- Module diversion is excluded. Skipping... -- Module enum is excluded. Skipping... -- Module exec is excluded. Skipping... -- Module ipops is excluded. Skipping... -- Module kex is excluded. Skipping... -- Module mangler is excluded. Skipping... -- Module maxfwd is excluded. Skipping... -- Module mediaproxy is excluded. Skipping... -- Module mqueue is excluded. Skipping... -- Module nat_traversal is excluded. Skipping... -- Module nathelper is excluded. Skipping... -- Module path is excluded. Skipping... -- Module pike is excluded. Skipping... -- Module pv is excluded. Skipping... -- Module ratelimit is excluded. Skipping... -- Module rr is excluded. Skipping... -- Module rtimer is excluded. Skipping... -- Module rtpproxy is excluded. Skipping... -- Module sanity is excluded. Skipping... -- Module sdpops is excluded. Skipping... -- Module siputils is excluded. Skipping... -- Module sl is excluded. Skipping... -- Module statistics is excluded. Skipping... -- Module textops is excluded. Skipping... -- Module textopsx is excluded. Skipping... -- Module tm is excluded. Skipping... -- Module tmx is excluded. Skipping... -- Module topoh is excluded. Skipping... -- Module xlog is excluded. Skipping... -- Module rtpengine is excluded. Skipping... -- Module stun is excluded. Skipping... -- Module sipt is excluded. Skipping... -- Module tcpops is excluded. Skipping... -- Module auth_xkeys is excluded. Skipping... -- Module smsops is excluded. Skipping... -- Module tsilo is excluded. Skipping... -- Module cfgt is excluded. Skipping... -- Module statsc is excluded. Skipping... -- Module topos is excluded. Skipping... -- Module topos_htable is excluded. Skipping... -- Module sipdump is excluded. Skipping... -- Module pv_headers is excluded. Skipping... -- Module kemix is excluded. Skipping... -- Module avp is excluded. Skipping... -- Module auth_diameter is excluded. Skipping... -- Module call_control is excluded. Skipping... -- Module call_obj is excluded. Skipping... -- Module dmq is excluded. Skipping... -- Module domainpolicy is excluded. Skipping... -- Module msrp is excluded. Skipping... -- Module carrierroute is excluded. Skipping... -- Module pdb is excluded. Skipping... -- Module qos is excluded. Skipping... -- Module sca is excluded. Skipping... -- Module seas is excluded. Skipping... -- Module sms is excluded. Skipping... -- Module sst is excluded. Skipping... -- Module timer is excluded. Skipping... -- Module tmrec is excluded. Skipping... -- Module uac_redirect is excluded. Skipping... -- Module xhttp is excluded. Skipping... -- Module xhttp_rpc is excluded. Skipping... -- Module xprint is excluded. Skipping... -- Module jsonrpcs is excluded. Skipping... -- Module nosip is excluded. Skipping... -- Module dmq_usrloc is excluded. Skipping... -- Module statsd is excluded. Skipping... -- Module rtjson is excluded. Skipping... -- Module log_custom is excluded. Skipping... -- Module keepalive is excluded. Skipping... -- Module ss7ops is excluded. Skipping... -- Module acc_diameter is excluded. Skipping... -- Module evrexec is excluded. Skipping... -- Module file_out is excluded. Skipping... -- Module sipjson is excluded. Skipping... -- Module lrkproxy is excluded. Skipping... -- Module math is excluded. Skipping... -- Module posops is excluded. Skipping... -- Module xhttp_prom is excluded. Skipping... -- Module dlgs is excluded. Skipping... -- Module sworker is excluded. Skipping... -- Module influxdbc is excluded. Skipping... -- Module acc is excluded. Skipping... -- Module alias_db is excluded. Skipping... -- Module auth_db is excluded. Skipping... -- Module avpops is excluded. Skipping... -- Module cfg_db is excluded. Skipping... -- Module db_text is excluded. Skipping... -- Module db_flatstore is excluded. Skipping... -- Module db_cluster is excluded. Skipping... -- Module dialog is excluded. Skipping... -- Module dispatcher is excluded. Skipping... -- Module domain is excluded. Skipping... -- Module drouting is excluded. Skipping... -- Module group is excluded. Skipping... -- Module htable is excluded. Skipping... -- Module imc is excluded. Skipping... -- Module matrix is excluded. Skipping... -- Module mohqueue is excluded. Skipping... -- Module msilo is excluded. Skipping... -- Module mtree is excluded. Skipping... -- Module p_usrloc is excluded. Skipping... -- Module pdt is excluded. Skipping... -- Module permissions is excluded. Skipping... -- Module pipelimit is excluded. Skipping... -- Module prefix_route is excluded. Skipping... -- Module registrar is excluded. Skipping... -- Module sipcapture is excluded. Skipping... -- Module siptrace is excluded. Skipping... -- Module speeddial is excluded. Skipping... -- Module sqlops is excluded. Skipping... -- Module uac is excluded. Skipping... -- Module uri_db is excluded. Skipping... -- Module userblocklist is excluded. Skipping... -- Module usrloc is excluded. Skipping... -- Module secfilter is excluded. Skipping... -- Module db2_ops is excluded. Skipping... -- Module uid_auth_db is excluded. Skipping... -- Module uid_avp_db is excluded. Skipping... -- Module uid_domain is excluded. Skipping... -- Module uid_gflags is excluded. Skipping... -- Module uid_uri_db is excluded. Skipping... -- Module misctest is excluded. Skipping... -- Module app_jsdt is excluded. Skipping... -- Modules to be built: json -- xsltproc is not found. Skip dbschema target. -- Found PkgConfig: /usr/bin/pkg-config (found version "1.8.0") -- Checking for module 'readline' -- Found readline, version 8.1 -- Configuring done -- Generating done -- Build files have been written to: /usr/local/src/kamailio_build Building: # cmake --build /usr/local/src/kamailio_build /usr/bin/cmake -S/usr/local/src/kamailio -B/usr/local/src/kamailio_build --check-build-system CMakeFiles/Makefile.cmake 0 /usr/bin/cmake -E cmake_progress_start /usr/local/src/kamailio_build/CMakeFiles /usr/local/src/kamailio_build//CMakeFiles/progress.marks /usr/bin/gmake -f CMakeFiles/Makefile2 all gmake[1]: Entering directory '/usr/local/src/kamailio_build' /usr/bin/gmake -f src/core/CMakeFiles/GenerateParser.dir/build.make src/core/CMakeFiles/GenerateParser.dir/depend gmake[2]: Entering directory '/usr/local/src/kamailio_build' cd /usr/local/src/kamailio_build && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /usr/local/src/kamailio /usr/local/src/kamailio/src/core /usr/local/src/kamailio_build /usr/local/src/kamailio_build/src/core /usr/local/src/kamailio_build/src/core/CMakeFiles/GenerateParser.dir/DependInfo.cmake --color= gmake[2]: Leaving directory '/usr/local/src/kamailio_build' /usr/bin/gmake -f src/core/CMakeFiles/GenerateParser.dir/build.make src/core/CMakeFiles/GenerateParser.dir/build gmake[2]: Entering directory '/usr/local/src/kamailio_build' [ 0%] Generating cfg.tab.c and cfg.tab.h from cfg.y cd /usr/local/src/kamailio_build/src/core && /usr/bin/bison -d -b cfg -o /usr/local/src/kamailio_build/src/core/cfg.tab.c /usr/local/src/kamailio/src/core/cfg.y [ 1%] Generating lex.yy.c from cfg.lex cd /usr/local/src/kamailio_build/src/core && /usr/bin/flex -o /usr/local/src/kamailio_build/src/core/lex.yy.c /usr/local/src/kamailio/src/core/cfg.lex [ 1%] Generating parser source files gmake[2]: Leaving directory '/usr/local/src/kamailio_build' [ 1%] Built target GenerateParser /usr/bin/gmake -f src/CMakeFiles/kamailio.dir/build.make src/CMakeFiles/kamailio.dir/depend gmake[2]: Entering directory '/usr/local/src/kamailio_build' cd /usr/local/src/kamailio_build && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /usr/local/src/kamailio /usr/local/src/kamailio/src /usr/local/src/kamailio_build /usr/local/src/kamailio_build/src /usr/local/src/kamailio_build/src/CMakeFiles/kamailio.dir/DependInfo.cmake --color= gmake[2]: Leaving directory '/usr/local/src/kamailio_build' /usr/bin/gmake -f src/CMakeFiles/kamailio.dir/build.make src/CMakeFiles/kamailio.dir/build gmake[2]: Entering directory '/usr/local/src/kamailio_build' [ 2%] Building C object src/CMakeFiles/kamailio.dir/main.c.o cd /usr/local/src/kamailio_build/src && /usr/bin/cc -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DARCH=\"x86_64\" -DCC_GCC_LIKE_ASM -DCFG_DIR=\"/usr/local/etc/kamailio/\" -DCOMPILER="\"gcc 11.4.1\"" -DDBG_SR_MEMORY -DDISABLE_NAGLE -DDNS_IP_HACK -DFAST_LOCK -DFMSTATS -DF_MALLOC -DHAVE_ALLOCA_H -DHAVE_EPOLL -DHAVE_GETHOSTBYNAME2 -DHAVE_IP_MREQN -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_MSG_NOSIGNAL -DHAVE_RESOLV_RES -DHAVE_SCHED_SETSCHEDULER -DHAVE_SCHED_YIELD -DHAVE_SELECT -DHAVE_SIGIO_RT -DHAVE_TIMEGM -DHAVE_UNION_SEMUN -DKMSTATS -DKSR_PTHREAD_MUTEX_SHARED -DMALLOC_STATS -DMODS_DIR=\"/usr/local/lib64/kamailio/modules\" -DNAME=\"kamailio\" -DOS=Linux -DOS_QUOTED=\"Linux\" -DPKG_MALLOC -DQ_MALLOC -DRAW_SOCKS -DRUN_DIR=\"/run/kamailio\" -DSHARE_DIR=\"/usr/local/share/kamailio/\" -DSHM_MMAP -DSIGINFO64_WORKAROUND -DSTATISTICS -DTLSF_MALLOC -DTLS_HOOKS -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_MCAST -DUSE_NAPTR -DUSE_RAW_SOCKS -DUSE_SCTP -DUSE_TCP -DUSE_TLS -DVERSION=\"6.0.0-pre0\" -DVERSIONVAL=6000000 -D__CPU_x86_64 -D__OS_linux -Dkamailio_EXPORTS -I/usr/local/src/kamailio/src/core -g -ffile-prefix-map=/usr/local/src/kamailio/src/= -Wall -funroll-loops -Wcast-align -Werror=implicit-function-declaration -Werror=implicit-int -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -std=gnu11 -MD -MT src/CMakeFiles/kamailio.dir/main.c.o -MF CMakeFiles/kamailio.dir/main.c.o.d -o CMakeFiles/kamailio.dir/main.c.o -c /usr/local/src/kamailio/src/main.c ... [ 91%] Linking C executable kamailio cd /usr/local/src/kamailio_build/src && /usr/bin/cmake -E cmake_link_script CMakeFiles/kamailio.dir/link.txt --verbose=1 /usr/bin/cc -g -Wl,--export-dynamic -rdynamic -m64 CMakeFiles/kamailio.dir/main.c.o CMakeFiles/kamailio.dir/lib/ims/ims_getters.c.o CMakeFiles/kamailio.dir/lib/srdb1/db.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_id.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_pool.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_query.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_res.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_row.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_ut.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_val.c.o CMakeFiles/kamailio.dir/lib/srdb2/db.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_cmd.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_con.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_ctx.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_drv.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_fld.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_gen.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_pool.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_rec.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_res.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_uri.c.o CMakeFiles/kamailio.dir/lib/trie/dtrie.c.o CMakeFiles/kamailio.dir/core/action.c.o CMakeFiles/kamailio.dir/core/async_task.c.o CMakeFiles/kamailio.dir/core/atomic_ops.c.o CMakeFiles/kamailio.dir/core/basex.c.o CMakeFiles/kamailio.dir/core/bit_count.c.o CMakeFiles/kamailio.dir/core/bit_scan.c.o CMakeFiles/kamailio.dir/core/cfg/cfg.c.o CMakeFiles/kamailio.dir/core/cfg/cfg_ctx.c.o CMakeFiles/kamailio.dir/core/cfg/cfg_script.c.o CMakeFiles/kamailio.dir/core/cfg/cfg_select.c.o CMakeFiles/kamailio.dir/core/cfg/cfg_struct.c.o CMakeFiles/kamailio.dir/core/cfg_core.c.o CMakeFiles/kamailio.dir/core/cfg_parser.c.o CMakeFiles/kamailio.dir/core/core_cmd.c.o CMakeFiles/kamailio.dir/core/counters.c.o CMakeFiles/kamailio.dir/core/crc.c.o CMakeFiles/kamailio.dir/core/crypto/md5.c.o CMakeFiles/kamailio.dir/core/crypto/md5utils.c.o CMakeFiles/kamailio.dir/core/crypto/rijndael.c.o CMakeFiles/kamailio.dir/core/crypto/sha256.c.o CMakeFiles/kamailio.dir/core/crypto/shautils.c.o CMakeFiles/kamailio.dir/core/daemonize.c.o CMakeFiles/kamailio.dir/core/data_lump.c.o CMakeFiles/kamailio.dir/core/data_lump_rpl.c.o CMakeFiles/kamailio.dir/core/dns_cache.c.o CMakeFiles/kamailio.dir/core/dns_func.c.o CMakeFiles/kamailio.dir/core/dprint.c.o CMakeFiles/kamailio.dir/core/dset.c.o CMakeFiles/kamailio.dir/core/dst_blocklist.c.o CMakeFiles/kamailio.dir/core/endianness.c.o CMakeFiles/kamailio.dir/core/error.c.o CMakeFiles/kamailio.dir/core/events.c.o CMakeFiles/kamailio.dir/core/flags.c.o CMakeFiles/kamailio.dir/core/fmsg.c.o CMakeFiles/kamailio.dir/core/forward.c.o CMakeFiles/kamailio.dir/core/hash_func.c.o CMakeFiles/kamailio.dir/core/id.c.o CMakeFiles/kamailio.dir/core/io_wait.c.o CMakeFiles/kamailio.dir/core/ip_addr.c.o CMakeFiles/kamailio.dir/core/kemi.c.o CMakeFiles/kamailio.dir/core/kemiexec.c.o CMakeFiles/kamailio.dir/core/local_timer.c.o CMakeFiles/kamailio.dir/core/lock_ops.c.o CMakeFiles/kamailio.dir/core/locking.c.o CMakeFiles/kamailio.dir/core/lvalue.c.o CMakeFiles/kamailio.dir/core/mem/f_malloc.c.o CMakeFiles/kamailio.dir/core/mem/memtest.c.o CMakeFiles/kamailio.dir/core/mem/pkg.c.o CMakeFiles/kamailio.dir/core/mem/q_malloc.c.o CMakeFiles/kamailio.dir/core/mem/shm.c.o CMakeFiles/kamailio.dir/core/mem/tlsf_malloc.c.o CMakeFiles/kamailio.dir/core/mod_fix.c.o CMakeFiles/kamailio.dir/core/modparam.c.o CMakeFiles/kamailio.dir/core/msg_translator.c.o CMakeFiles/kamailio.dir/core/nonsip_hooks.c.o CMakeFiles/kamailio.dir/core/onsend.c.o CMakeFiles/kamailio.dir/core/parser/contact/contact.c.o CMakeFiles/kamailio.dir/core/parser/contact/parse_contact.c.o CMakeFiles/kamailio.dir/core/parser/digest/digest.c.o CMakeFiles/kamailio.dir/core/parser/digest/digest_parser.c.o CMakeFiles/kamailio.dir/core/parser/digest/param_parser.c.o CMakeFiles/kamailio.dir/core/parser/hf.c.o CMakeFiles/kamailio.dir/core/parser/msg_parser.c.o CMakeFiles/kamailio.dir/core/parser/parse_addr_spec.c.o CMakeFiles/kamailio.dir/core/parser/parse_allow.c.o CMakeFiles/kamailio.dir/core/parser/parse_body.c.o CMakeFiles/kamailio.dir/core/parser/parse_content.c.o CMakeFiles/kamailio.dir/core/parser/parse_cseq.c.o CMakeFiles/kamailio.dir/core/parser/parse_date.c.o CMakeFiles/kamailio.dir/core/parser/parse_disposition.c.o CMakeFiles/kamailio.dir/core/parser/parse_diversion.c.o CMakeFiles/kamailio.dir/core/parser/parse_event.c.o CMakeFiles/kamailio.dir/core/parser/parse_expires.c.o CMakeFiles/kamailio.dir/core/parser/parse_fline.c.o CMakeFiles/kamailio.dir/core/parser/parse_from.c.o CMakeFiles/kamailio.dir/core/parser/parse_hname2.c.o CMakeFiles/kamailio.dir/core/parser/parse_identity.c.o CMakeFiles/kamailio.dir/core/parser/parse_identityinfo.c.o CMakeFiles/kamailio.dir/core/parser/parse_methods.c.o CMakeFiles/kamailio.dir/core/parser/parse_nameaddr.c.o CMakeFiles/kamailio.dir/core/parser/parse_option_tags.c.o CMakeFiles/kamailio.dir/core/parser/parse_param.c.o CMakeFiles/kamailio.dir/core/parser/parse_ppi_pai.c.o CMakeFiles/kamailio.dir/core/parser/parse_privacy.c.o CMakeFiles/kamailio.dir/core/parser/parse_refer_to.c.o CMakeFiles/kamailio.dir/core/parser/parse_require.c.o CMakeFiles/kamailio.dir/core/parser/parse_retry_after.c.o CMakeFiles/kamailio.dir/core/parser/parse_rpid.c.o CMakeFiles/kamailio.dir/core/parser/parse_rr.c.o CMakeFiles/kamailio.dir/core/parser/parse_sipifmatch.c.o CMakeFiles/kamailio.dir/core/parser/parse_subscription_state.c.o CMakeFiles/kamailio.dir/core/parser/parse_supported.c.o CMakeFiles/kamailio.dir/core/parser/parse_to.c.o CMakeFiles/kamailio.dir/core/parser/parse_uri.c.o CMakeFiles/kamailio.dir/core/parser/parse_via.c.o CMakeFiles/kamailio.dir/core/parser/parser_f.c.o CMakeFiles/kamailio.dir/core/parser/sdp/sdp.c.o CMakeFiles/kamailio.dir/core/parser/sdp/sdp_helpr_funcs.c.o CMakeFiles/kamailio.dir/core/pass_fd.c.o CMakeFiles/kamailio.dir/core/ppcfg.c.o CMakeFiles/kamailio.dir/core/proxy.c.o CMakeFiles/kamailio.dir/core/pt.c.o CMakeFiles/kamailio.dir/core/pv_core.c.o CMakeFiles/kamailio.dir/core/pvapi.c.o CMakeFiles/kamailio.dir/core/qvalue.c.o CMakeFiles/kamailio.dir/core/rand/cryptorand.c.o CMakeFiles/kamailio.dir/core/rand/fastrand.c.o CMakeFiles/kamailio.dir/core/rand/fortuna/fortuna.c.o CMakeFiles/kamailio.dir/core/rand/fortuna/random.c.o CMakeFiles/kamailio.dir/core/rand/isaac/rand.c.o CMakeFiles/kamailio.dir/core/raw_listener.c.o CMakeFiles/kamailio.dir/core/raw_sock.c.o CMakeFiles/kamailio.dir/core/re.c.o CMakeFiles/kamailio.dir/core/receive.c.o CMakeFiles/kamailio.dir/core/resolve.c.o CMakeFiles/kamailio.dir/core/route.c.o CMakeFiles/kamailio.dir/core/route_struct.c.o CMakeFiles/kamailio.dir/core/rpc_lookup.c.o CMakeFiles/kamailio.dir/core/rvalue.c.o CMakeFiles/kamailio.dir/core/script_cb.c.o CMakeFiles/kamailio.dir/core/sctp_core.c.o CMakeFiles/kamailio.dir/core/select.c.o CMakeFiles/kamailio.dir/core/select_buf.c.o CMakeFiles/kamailio.dir/core/select_core.c.o CMakeFiles/kamailio.dir/core/shm_init.c.o CMakeFiles/kamailio.dir/core/signals.c.o CMakeFiles/kamailio.dir/core/sip_msg_clone.c.o CMakeFiles/kamailio.dir/core/sock_ut.c.o CMakeFiles/kamailio.dir/core/socket_info.c.o CMakeFiles/kamailio.dir/core/sr_compat.c.o CMakeFiles/kamailio.dir/core/sr_module.c.o CMakeFiles/kamailio.dir/core/srapi.c.o CMakeFiles/kamailio.dir/core/str.c.o CMakeFiles/kamailio.dir/core/str_list.c.o CMakeFiles/kamailio.dir/core/strutils.c.o CMakeFiles/kamailio.dir/core/stun.c.o CMakeFiles/kamailio.dir/core/switch.c.o CMakeFiles/kamailio.dir/core/tcp_main.c.o CMakeFiles/kamailio.dir/core/tcp_options.c.o CMakeFiles/kamailio.dir/core/tcp_read.c.o CMakeFiles/kamailio.dir/core/tcp_stats.c.o CMakeFiles/kamailio.dir/core/timer.c.o CMakeFiles/kamailio.dir/core/timer_proc.c.o CMakeFiles/kamailio.dir/core/tls_hooks.c.o CMakeFiles/kamailio.dir/core/tsend.c.o CMakeFiles/kamailio.dir/core/udp_server.c.o CMakeFiles/kamailio.dir/core/usr_avp.c.o CMakeFiles/kamailio.dir/core/ut.c.o CMakeFiles/kamailio.dir/core/utils/srjson.c.o CMakeFiles/kamailio.dir/core/utils/sruid.c.o CMakeFiles/kamailio.dir/core/utils/tmrec.c.o CMakeFiles/kamailio.dir/core/ver.c.o CMakeFiles/kamailio.dir/core/xavp.c.o CMakeFiles/kamailio.dir/core/lex.yy.c.o CMakeFiles/kamailio.dir/core/cfg.tab.c.o -o kamailio -lm -ldl -lresolv gmake[2]: Leaving directory '/usr/local/src/kamailio_build' [ 91%] Built target kamailio /usr/bin/gmake -f src/modules/json/CMakeFiles/json.dir/build.make src/modules/json/CMakeFiles/json.dir/depend gmake[2]: Entering directory '/usr/local/src/kamailio_build' cd /usr/local/src/kamailio_build && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /usr/local/src/kamailio /usr/local/src/kamailio/src/modules/json /usr/local/src/kamailio_build /usr/local/src/kamailio_build/src/modules/json /usr/local/src/kamailio_build/src/modules/json/CMakeFiles/json.dir/DependInfo.cmake --color= gmake[2]: Leaving directory '/usr/local/src/kamailio_build' /usr/bin/gmake -f src/modules/json/CMakeFiles/json.dir/build.make src/modules/json/CMakeFiles/json.dir/build gmake[2]: Entering directory '/usr/local/src/kamailio_build' [ 92%] Building C object src/modules/json/CMakeFiles/json.dir/json_funcs.c.o cd /usr/local/src/kamailio_build/src/modules/json && /usr/bin/cc -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DARCH=\"x86_64\" -DCC_GCC_LIKE_ASM -DCFG_DIR=\"/usr/local/etc/kamailio/\" -DCOMPILER="\"gcc 11.4.1\"" -DDBG_SR_MEMORY -DDISABLE_NAGLE -DDNS_IP_HACK -DFAST_LOCK -DFMSTATS -DF_MALLOC -DHAVE_ALLOCA_H -DHAVE_EPOLL -DHAVE_GETHOSTBYNAME2 -DHAVE_IP_MREQN -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_MSG_NOSIGNAL -DHAVE_RESOLV_RES -DHAVE_SCHED_SETSCHEDULER -DHAVE_SCHED_YIELD -DHAVE_SELECT -DHAVE_SIGIO_RT -DHAVE_TIMEGM -DHAVE_UNION_SEMUN -DKMSTATS -DKSR_PTHREAD_MUTEX_SHARED -DMALLOC_STATS -DMOD_NAME=\"json\" -DMOD_NAMEID=json -DNAME=\"kamailio\" -DOS=Linux -DOS_QUOTED=\"Linux\" -DPKG_MALLOC -DQ_MALLOC -DRAW_SOCKS -DRUN_DIR=\"/run/kamailio\" -DSHARE_DIR=\"/usr/local/share/kamailio/\" -DSHM_MMAP -DSIGINFO64_WORKAROUND -DSTATISTICS -DTLSF_MALLOC -DTLS_HOOKS -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_MCAST -DUSE_NAPTR -DUSE_RAW_SOCKS -DUSE_SCTP -DUSE_TCP -DUSE_TLS -DVERSION=\"6.0.0-pre0\" -DVERSIONVAL=6000000 -D__CPU_x86_64 -D__OS_linux -Djson_EXPORTS -g -fPIC -ffile-prefix-map=/usr/local/src/kamailio/src/modules/json/= -fPIC -Wall -funroll-loops -Wcast-align -Werror=implicit-function-declaration -Werror=implicit-int -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -std=gnu11 -MD -MT src/modules/json/CMakeFiles/json.dir/json_funcs.c.o -MF CMakeFiles/json.dir/json_funcs.c.o.d -o CMakeFiles/json.dir/json_funcs.c.o -c /usr/local/src/kamailio/src/modules/json/json_funcs.c /usr/local/src/kamailio/src/modules/json/json_funcs.c:26:10: fatal error: json.h: No such file or directory 26 | #include <json.h> | ^~~~~~~~ compilation terminated. gmake[2]: *** [src/modules/json/CMakeFiles/json.dir/build.make:79: src/modules/json/CMakeFiles/json.dir/json_funcs.c.o] Error 1 gmake[2]: Leaving directory '/usr/local/src/kamailio_build' gmake[1]: *** [CMakeFiles/Makefile2:633: src/modules/json/CMakeFiles/json.dir/all] Error 2 gmake[1]: Leaving directory '/usr/local/src/kamailio_build' gmake: *** [Makefile:159: all] Error 2 -ovidiu

3 2

git:master:f4d7e298: cmake/perl: Install files / Add perl user link and def options
by Xenofon Karamanos 27 Jan '25

27 Jan '25

Module: kamailio Branch: master Commit: f4d7e298bb351be5f12652083bd5e37109748169 URL: https://github.com/kamailio/kamailio/commit/f4d7e298bb351be5f12652083bd5e37… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-27T14:23:44Z cmake/perl: Install files / Add perl user link and def options - Fix perl extra_c_flags parsing by using SHELL: - Add user option PERL_LDOPTS to define extra ldopts - Add user option PERL_CCOPTS to define extra defs - Add new generated file to compilation - Add new target for sgml docs - Add install directives for perl libraries --- Modified: src/modules/app_perl/CMakeLists.txt Modified: src/modules/db_perlvdb/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/f4d7e298bb351be5f12652083bd5e37… Patch: https://github.com/kamailio/kamailio/commit/f4d7e298bb351be5f12652083bd5e37…

1 0

git:master:65a296b3: htable: wrapped maco code in do {} while(0)
by Daniel-Constantin Mierla 27 Jan '25

27 Jan '25

Module: kamailio Branch: master Commit: 65a296b3478503ed3519ea9156d8f46f5cb9ce2a URL: https://github.com/kamailio/kamailio/commit/65a296b3478503ed3519ea9156d8f46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-27T10:20:49+01:00 htable: wrapped maco code in do {} while(0) --- Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/65a296b3478503ed3519ea9156d8f46… Patch: https://github.com/kamailio/kamailio/commit/65a296b3478503ed3519ea9156d8f46… --- diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 4e0757f237b..d9fc187e722 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -144,10 +144,19 @@ ht_cell_t *ht_iterator_get_current(str *iname); void ht_slot_lock(ht_t *ht, int idx); void ht_slot_unlock(ht_t *ht, int idx); -#define HT_UPDATE_EXPIRE(ht, it, now) \ - if(ht->updateexpire || (now && it->expire && it->expire < now)) \ - it->expire = now + ht->htexpire -#define HT_COPY_EXPIRE(ht, it, now, src) \ - HT_UPDATE_EXPIRE(ht, it, now); \ - else it->expire = src->expire +#define HT_UPDATE_EXPIRE(ht, it, now) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } \ + } while(0) +#define HT_COPY_EXPIRE(ht, it, now, src) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } else { \ + it->expire = src->expire; \ + } \ + } while(0) + #endif

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev