sr-dev December 2023

sr-dev@lists.kamailio.org

14 participants
235 discussions

git:master:1191ab4e: tm: check get_t() result for consistency
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: 1191ab4e5e03b35714ec1ad9d9bf2dd9665c71fd URL: https://github.com/kamailio/kamailio/commit/1191ab4e5e03b35714ec1ad9d9bf2dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T12:02:01+01:00 tm: check get_t() result for consistency --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/1191ab4e5e03b35714ec1ad9d9bf2dd… Patch: https://github.com/kamailio/kamailio/commit/1191ab4e5e03b35714ec1ad9d9bf2dd… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 67b954b03c8..b2866a685cc 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2565,6 +2565,10 @@ int t_check_trans(struct sip_msg *msg) return 1; case 1: /* found */ t = get_t(); + if(t == NULL || t == T_UNDEFINED) { + LM_WARN("unexpected transaction value\n"); + return -1; + } if(msg->REQ_METHOD == METHOD_ACK) { /* ack to neg. reply or ack to local trans. * => process it and end the script */

1 0

git:master:4e2edcb0: sipcapture: signed iterator to cover negative condition
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: 4e2edcb0acdac56a9c5946525e427cdd44d0289e URL: https://github.com/kamailio/kamailio/commit/4e2edcb0acdac56a9c5946525e427cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T11:38:48+01:00 sipcapture: signed iterator to cover negative condition --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/4e2edcb0acdac56a9c5946525e427cd… Patch: https://github.com/kamailio/kamailio/commit/4e2edcb0acdac56a9c5946525e427cd… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 8958e39d9f0..d39ee1fa7c4 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -483,7 +483,7 @@ int parse_table_names(str table_name, str **table_names) char *p = NULL; unsigned int no_tables; char *table_name_cpy; - unsigned int i; + int i; /*parse and save table names*/ no_tables = 1;

1 0

git:master:cae0f9a1: ratelimit: reorder for safer storage size
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: cae0f9a1302a79d748155401117e934a5a8e272f URL: https://github.com/kamailio/kamailio/commit/cae0f9a1302a79d748155401117e934… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T11:24:24+01:00 ratelimit: reorder for safer storage size --- Modified: src/modules/ratelimit/rl_statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/cae0f9a1302a79d748155401117e934… Patch: https://github.com/kamailio/kamailio/commit/cae0f9a1302a79d748155401117e934… --- diff --git a/src/modules/ratelimit/rl_statistics.c b/src/modules/ratelimit/rl_statistics.c index 237c7acd9a2..4e00dbeda38 100644 --- a/src/modules/ratelimit/rl_statistics.c +++ b/src/modules/ratelimit/rl_statistics.c @@ -182,7 +182,7 @@ int get_socket_list_from_proto_and_family( return 0; } - *ipList = pkg_malloc(numberOfSockets * (num_ip_octets + 1) * sizeof(int)); + *ipList = pkg_malloc(sizeof(int) * numberOfSockets * (num_ip_octets + 1)); /* We couldn't allocate memory for the IP List. So all we can do is * fail. */

1 0

[kamailio/kamailio] tm: Update doc for t_check_trans() (PR #3673)
by Stefan Mititelu 13 Dec '23

13 Dec '23

#### 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  I was looking in code at how t_check_trans() works and updated doc. Please let me know if I understood correctly how it behaves for non-acks and non-cancel, when transaction is found. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3673 -- Commit Summary -- * tm: Update doc for t_check_trans() -- File Changes -- M src/modules/tm/doc/functions.xml (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3673.patch https://github.com/kamailio/kamailio/pull/3673.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3673 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3673(a)github.com>

2 5

Jenkins build is still unstable: kamailiodev-nightly-binaries » amd64,stretch #2548
by kamailio＠sipwise.com 13 Dec '23

13 Dec '23

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 2

git:master:aaeb54c8: pkg/kamailio/deb: override lintian error on stretch [skip ci]
by Victor Seva 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: aaeb54c8b630b4aac50df75ff430ad5baea6746c URL: https://github.com/kamailio/kamailio/commit/aaeb54c8b630b4aac50df75ff430ad5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-12T15:38:33+01:00 pkg/kamailio/deb: override lintian error on stretch [skip ci] --- Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jammy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/aaeb54c8b630b4aac50df75ff430ad5… Patch: https://github.com/kamailio/kamailio/commit/aaeb54c8b630b4aac50df75ff430ad5…

1 0

git:5.7:75aecd3f: pv: remove extra len increment for some uri transformations
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: 5.7 Commit: 75aecd3f2e10509d5ed71cc5e89ae6f5c3bd0fea URL: https://github.com/kamailio/kamailio/commit/75aecd3f2e10509d5ed71cc5e89ae6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T13:10:29+01:00 pv: remove extra len increment for some uri transformations (cherry picked from commit 3fe9a279abecf6f367ce9fd2d4b085c41c87ad77) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/75aecd3f2e10509d5ed71cc5e89ae6f… Patch: https://github.com/kamailio/kamailio/commit/75aecd3f2e10509d5ed71cc5e89ae6f… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 5204c8fa22c..67c43d83b46 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1595,7 +1595,6 @@ int tr_eval_uri( sv.len++; memcpy(_tr_buffer, sv.s, sv.len); sv.s = _tr_buffer; - sv.len++; if((_tr_parsed_uri.user.len > 0) && (subtype != TR_URI_DURI)) { memcpy(sv.s + sv.len, _tr_parsed_uri.user.s, _tr_parsed_uri.user.len);

1 0

git:master:3fe9a279: pv: remove extra len increment for some uri transformations
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 3fe9a279abecf6f367ce9fd2d4b085c41c87ad77 URL: https://github.com/kamailio/kamailio/commit/3fe9a279abecf6f367ce9fd2d4b085c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T13:09:54+01:00 pv: remove extra len increment for some uri transformations --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/3fe9a279abecf6f367ce9fd2d4b085c… Patch: https://github.com/kamailio/kamailio/commit/3fe9a279abecf6f367ce9fd2d4b085c… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 2c60cc7e656..3c51be15f74 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1595,7 +1595,6 @@ int tr_eval_uri( sv.len++; memcpy(_tr_buffer, sv.s, sv.len); sv.s = _tr_buffer; - sv.len++; if((_tr_parsed_uri.user.len > 0) && (subtype != TR_URI_DURI)) { memcpy(sv.s + sv.len, _tr_parsed_uri.user.s, _tr_parsed_uri.user.len);

1 0

[kamailio/kamailio] `xavp_params_implode()` drops data from BIGINT datatype (Issue #3663)
by Ben Kaufman 12 Dec '23

12 Dec '23

### Description I came across the following while trying to serialize SQL data to xavp (`sql_xquery()`) and then serializing the result to htable using `xavp_params_implode()`. One of the data columns has a type of `BIGINT`. The resulting string had neither the key nor value. I recognize that Kamailio does not currently have support for 64 bit integers and that adding support for it is probably not a trivial matter. My request here is really that if the value is going to be dropped it would be good if `pv` would omit a warning. #### Reproduction MySQL table: ```sql CREATE TABLE dids ( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, did varchar(11) NOT NULL, route_id BIGINT NOT NULL, failure_route_id INT NOT NULL, description VARCHAR(255) ); ``` With data like this: ```sql INSERT INTO dids ( did, route_id, failure_route_id, description ) VALUES ( '15555551000', 101, 1006, 'Alice' ); ``` And the following Kamailio code: ``` $var(query) = "SELECT * " + "FROM dids " + "WHERE did = " + $(rU{sql.val.str}); sql_xquery("db", "$var(query)", "did_data"); xavp_params_implode("did_data", "$sht(did=>$rU)"); xinfo("Serialized query result: [$sht(did=>$rU)]\n"); ``` The following log line results - the `route_id` is missing all together: ``` 1(7) INFO: <script>: Serialized query result: [id=1;did=15555551000;failure_route_id=1006;description=Alice;] ``` ### Possible Solutions It's worth noting that the value is usable out of the XAVP. `$xavp(did=>route_id)` is retrievable, and the problem seems to be only when running `xavp_params_implode()`. In a perfect world, the key and value would be retained and put into the serialized data, however I'm not sure of the complexity of this (what if the the value exceeds a 32 bit int?, etc). With that said, my only real request would be that if a value is dropped that a warning is omitted with a rough explanation of the reason ("omitting _keyName_ unknown_ data type", etc). ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.7.3 ``` * **Operating System**: Alpine 3.18 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3663 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3663(a)github.com>

2 3

git:master:185e7f64: kazoo: fixed rabbitmq-c deprecation warning
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 185e7f64668cf4e8de3fa83d482e02e90b4fd3e5 URL: https://github.com/kamailio/kamailio/commit/185e7f64668cf4e8de3fa83d482e02e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T12:50:18+01:00 kazoo: fixed rabbitmq-c deprecation warning --- Modified: src/modules/kazoo/Makefile Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/185e7f64668cf4e8de3fa83d482e02e… Patch: https://github.com/kamailio/kamailio/commit/185e7f64668cf4e8de3fa83d482e02e… --- diff --git a/src/modules/kazoo/Makefile b/src/modules/kazoo/Makefile index b7b1e1615cd..c0c7e9d3d22 100644 --- a/src/modules/kazoo/Makefile +++ b/src/modules/kazoo/Makefile @@ -11,6 +11,10 @@ ifeq ($(BUILDER),) JSONC=$(shell ls $(SYSBASE)/include/lib/libjson*.so $(LOCALBASE)/lib/libjson*.so 2>/dev/null | grep json-c) else JSONC=$(shell pkg-config --libs json-c 2>/dev/null | grep json-c) + + ifeq ($(shell pkg-config --atleast-version=0.13.0 librabbitmq; echo $$?),0) + DEFS += -DRABBITMQ_DEPRECATION + endif endif ifneq ($(JSONC),) diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index a5cb429270a..ed696116514 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -29,10 +29,19 @@ #include <stdio.h> #include <stdlib.h> #include <stdint.h> + +#if RABBITMQ_DEPRECATION +#include <rabbitmq-c/amqp.h> +#include <rabbitmq-c/framing.h> +#include <rabbitmq-c/tcp_socket.h> +#include <rabbitmq-c/ssl_socket.h> +#else #include <amqp.h> #include <amqp_framing.h> #include <amqp_tcp_socket.h> #include <amqp_ssl_socket.h> +#endif + #include <json.h> #include <uuid/uuid.h> #include "../../core/mem/mem.h" diff --git a/src/modules/kazoo/kz_amqp.h b/src/modules/kazoo/kz_amqp.h index 6cfddbed8ac..faca990f166 100644 --- a/src/modules/kazoo/kz_amqp.h +++ b/src/modules/kazoo/kz_amqp.h @@ -32,7 +32,12 @@ #include <fcntl.h> #include <event.h> #include <sys/timerfd.h> + +#if RABBITMQ_DEPRECATION +#include <rabbitmq-c/amqp.h> +#else #include <amqp.h> +#endif #include "../../core/sr_module.h" #include "../../core/str.h"

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2023