sr-dev July 2024

sr-dev@lists.kamailio.org

16 participants
211 discussions

git:master:5a1f80f2: xprint: check to avoid double free
by Daniel-Constantin Mierla 22 Jul '24

22 Jul '24

Module: kamailio Branch: master Commit: 5a1f80f266069dbc453b44a856f225c254e7c050 URL: https://github.com/kamailio/kamailio/commit/5a1f80f266069dbc453b44a856f225c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-22T10:02:09+02:00 xprint: check to avoid double free --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/5a1f80f266069dbc453b44a856f225c… Patch: https://github.com/kamailio/kamailio/commit/5a1f80f266069dbc453b44a856f225c… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index e4442ba87f4..b6fc5066556 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1896,6 +1896,7 @@ int xl_mod_init() str_ipaddr.s[str_ipaddr.len] = '\0'; } else { pkg_free(s); + s = NULL; str_ipaddr.len = 0; PKG_MEM_ERROR_FMT("for str_ipaddr\n"); } @@ -1914,7 +1915,8 @@ int xl_mod_init() } } } - pkg_free(s); + if(s != NULL) + pkg_free(s); DBG("Hostname: %.*s\n", str_hostname.len, ZSW(str_hostname.s)); DBG("Domainname: %.*s\n", str_domainname.len, ZSW(str_domainname.s));

1 0

git:master:dc71c0a5: topoh: 0-init alocated structures
by Daniel-Constantin Mierla 19 Jul '24

19 Jul '24

Module: kamailio Branch: master Commit: dc71c0a5791ebc1306648b5ed338613050e32f5c URL: https://github.com/kamailio/kamailio/commit/dc71c0a5791ebc1306648b5ed338613… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-19T20:00:12+02:00 topoh: 0-init alocated structures --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dc71c0a5791ebc1306648b5ed338613… Patch: https://github.com/kamailio/kamailio/commit/dc71c0a5791ebc1306648b5ed338613… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index fe63bf88c7f..7dffa829504 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -321,12 +321,12 @@ int th_build_socket_strings(socket_info_t *socket) != 0) return 0; - socket_strings = pkg_malloc(sizeof(struct th_socket_strings)); + socket_strings = pkg_mallocxz(sizeof(struct th_socket_strings)); if(socket_strings == NULL) { PKG_MEM_ERROR_FMT("socket_strings\n"); goto error; } - table_entry = pkg_malloc(sizeof(struct str_hash_entry)); + table_entry = pkg_mallocxz(sizeof(struct str_hash_entry)); if(table_entry == NULL) { PKG_MEM_ERROR_FMT("table_entry\n"); goto error;

1 0

git:master:20f2096d: core: removed unnecessary destroy
by Daniel-Constantin Mierla 19 Jul '24

19 Jul '24

Module: kamailio Branch: master Commit: 20f2096d314253e7e74688da664de2830289a276 URL: https://github.com/kamailio/kamailio/commit/20f2096d314253e7e74688da664de28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-19T20:00:12+02:00 core: removed unnecessary destroy --- Modified: src/core/rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/20f2096d314253e7e74688da664de28… Patch: https://github.com/kamailio/kamailio/commit/20f2096d314253e7e74688da664de28… --- diff --git a/src/core/rvalue.c b/src/core/rvalue.c index 9cc1812c294..4c0137060ad 100644 --- a/src/core/rvalue.c +++ b/src/core/rvalue.c @@ -1085,8 +1085,6 @@ long rval_get_long(struct run_act_ctx *h, struct sip_msg *msg, long *i, LM_BUG("invalid cached value:cache type %d, value type %d\n", cache ? cache->cache_type : 0, cache ? cache->val_type : 0); error: - if(destroy_pval) - pv_value_destroy(&pval); *i = 0; return -1; }

1 0

git:5.7:2deec6b4: sipcapture: add missing headers for inet_ntop()
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: 5.7 Commit: 2deec6b43b8149ebb8c027a68709c2a708f01be9 URL: https://github.com/kamailio/kamailio/commit/2deec6b43b8149ebb8c027a68709c2a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T17:36:34+02:00 sipcapture: add missing headers for inet_ntop() fixes #3927 (cherry picked from commit fe505c9654541ec60f14e5a50896bb11751e61e4) (cherry picked from commit 164d1ecca7e94beba24013f31276bdc1f2ee04a1) --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/2deec6b43b8149ebb8c027a68709c2a… Patch: https://github.com/kamailio/kamailio/commit/2deec6b43b8149ebb8c027a68709c2a… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index db7ea912e11..3485f330a45 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -21,6 +21,8 @@ * */ +#include <arpa/inet.h> + #include "../../core/sr_module.h" #include "../../core/dprint.h" #include "../../core/events.h"

1 0

git:5.8:164d1ecc: sipcapture: add missing headers for inet_ntop()
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: 5.8 Commit: 164d1ecca7e94beba24013f31276bdc1f2ee04a1 URL: https://github.com/kamailio/kamailio/commit/164d1ecca7e94beba24013f31276bdc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T17:35:29+02:00 sipcapture: add missing headers for inet_ntop() fixes #3927 (cherry picked from commit fe505c9654541ec60f14e5a50896bb11751e61e4) --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/164d1ecca7e94beba24013f31276bdc… Patch: https://github.com/kamailio/kamailio/commit/164d1ecca7e94beba24013f31276bdc… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index db7ea912e11..3485f330a45 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -21,6 +21,8 @@ * */ +#include <arpa/inet.h> + #include "../../core/sr_module.h" #include "../../core/dprint.h" #include "../../core/events.h"

1 0

[kamailio/kamailio] hep.c:985:41: error: implicit declaration of function ‘inet_ntop’ (Issue #3927)
by Victor Seva 18 Jul '24

18 Jul '24

From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1075961 ``` kamailio currently FTBFS on s390x, but built there before. The same problem can be observed on ppc64: https://buildd.debian.org/status/fetch.php?pkg=kamailio&arch=s390x&ver=5.8.… hep.c: In function ‘hepv3_get_chunk’: hep.c:985:41: error: implicit declaration of function ‘inet_ntop’ [-Werror=implicit-function-declaration] 985 | inet_ntop(AF_INET, &(hg->hep_src_ip4->data), ipstr, | ^~~~~~~~~ gcc -fPIC -DPIC -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.8.2"' -DARCH='"s390x"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 13.3.0"' -D__CPU_s390x -D__OS_linux -DVERSIONVAL=5008002 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DUSE_PTHREAD_MUTEX -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -DMOD_NAME='"sipcapture"' -DMOD_NAMEID='sipcapture' -c sipcapture.c -o sipcapture.o -MMD -MP In file included from ../../core/atomic_ops.h:180, from ../../core/locking.h:72, from ../../core/rpc.h:34, from ../../core/sr_module.h:36, from sipcapture.c:54: ... make[4]: *** [../../Makefile.rules:100: hep.o] Error 1 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3927 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3927(a)github.com>

1 1

git:master:fe505c96: sipcapture: add missing headers for inet_ntop()
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: fe505c9654541ec60f14e5a50896bb11751e61e4 URL: https://github.com/kamailio/kamailio/commit/fe505c9654541ec60f14e5a50896bb1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T17:30:52+02:00 sipcapture: add missing headers for inet_ntop() fixes #3927 --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/fe505c9654541ec60f14e5a50896bb1… Patch: https://github.com/kamailio/kamailio/commit/fe505c9654541ec60f14e5a50896bb1… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index db7ea912e11..3485f330a45 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -21,6 +21,8 @@ * */ +#include <arpa/inet.h> + #include "../../core/sr_module.h" #include "../../core/dprint.h" #include "../../core/events.h"

1 0

git:master:b6de4b92: modules: readme files regenerated - sqlops ... [skip ci]
by Kamailio Dev 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: b6de4b92fd18d541c745e07cfaefaf7c56c45f18 URL: https://github.com/kamailio/kamailio/commit/b6de4b92fd18d541c745e07cfaefaf7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-07-18T15:46:10+02:00 modules: readme files regenerated - sqlops ... [skip ci] --- Modified: src/modules/sqlops/README --- Diff: https://github.com/kamailio/kamailio/commit/b6de4b92fd18d541c745e07cfaefaf7… Patch: https://github.com/kamailio/kamailio/commit/b6de4b92fd18d541c745e07cfaefaf7…

1 0

[kamailio/kamailio] sqlops: Don't truncated sql command when logging. (PR #3903)
by Xenofon Karamanos 18 Jul '24

18 Jul '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR Fixes a bug where logging shows a truncated command instead of the original one. Original query in .cfg: `sql_query("ca", "UPDATE dialog SET timeout = timeout + 1 WHERE callid = '$ci' AND timeout > 0;` logged error before fix: sql_do_query(): cannot do the query [UPDATE dialog SET timeout = timeout + 1 WHERE callid = 'al@there] logged error after fix: sql_do_query(): cannot do the query [UPDATE dialog SET timeout = timeout + 1 WHERE callid = 'al(a)there.com AND timeout > 0;] You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3903 -- Commit Summary -- * sqlops: Don't truncated sql command when logging. -- File Changes -- M src/modules/sqlops/sql_api.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3903.patch https://github.com/kamailio/kamailio/pull/3903.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3903 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3903(a)github.com>

2 6

git:master:e5407c05: sqlops: Add log_buf_size param for logging raw queries.
by Xenofon Karamanos 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: e5407c058f88fe06be2ee5da468ce2929748e31f URL: https://github.com/kamailio/kamailio/commit/e5407c058f88fe06be2ee5da468ce29… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-07-18T16:37:15+03:00 sqlops: Add log_buf_size param for logging raw queries. --- Modified: src/modules/sqlops/doc/sqlops_admin.xml Modified: src/modules/sqlops/sql_api.c Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/e5407c058f88fe06be2ee5da468ce29… Patch: https://github.com/kamailio/kamailio/commit/e5407c058f88fe06be2ee5da468ce29… --- diff --git a/src/modules/sqlops/doc/sqlops_admin.xml b/src/modules/sqlops/doc/sqlops_admin.xml index aeaa54ef0ff..c26c63ebcd4 100644 --- a/src/modules/sqlops/doc/sqlops_admin.xml +++ b/src/modules/sqlops/doc/sqlops_admin.xml @@ -191,6 +191,28 @@ modparam("sqlops", "sqlres", "ra") ... modparam("sqlops", "tr_buf_size", 4096) ... +</programlisting> + </example> + </section> + <section id="sqlops.p.log_buf_size"> + <title><varname>log_buf_size</varname> (int)</title> + <para> + The size of the buffer (characters) when logging raw SQL operations. + </para> + <para> + Note: When the buffer is smaller than the SQL operation, the operation is logged truncated up to log_buf_size. + </para> + <para> + <emphasis> + Default value is 128. + </emphasis> + </para> + <example> + <title>Set <varname>log_buf_size</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sqlops", "log_buf_size", 4096) +... </programlisting> </example> </section> @@ -607,4 +629,3 @@ xlog("Affected rows: $sqlrows(ca)\n"); </section> </section> </chapter> - diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index b76edbd480e..255121dd87d 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -36,6 +36,7 @@ #include "sql_api.h" extern int sqlops_results_maxsize; +extern int sqlops_log_buf_size; sql_con_t *_sql_con_root = NULL; sql_result_t *_sql_result_root = NULL; @@ -276,7 +277,9 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) } if(con->dbf.raw_query(con->dbh, query, &db_res) != 0) { LM_ERR("cannot do the query [%.*s]\n", - (query->len > 64) ? 64 : query->len, query->s); + (query->len > sqlops_log_buf_size) ? sqlops_log_buf_size + : query->len, + query->s); return -1; } diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index 1b0859b1ca5..900dcacb371 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -77,6 +77,7 @@ static int sql_res_param(modparam_t type, void *val); extern int sqlops_tr_buf_size; int sqlops_results_maxsize = 32; +int sqlops_log_buf_size = 128; static int sqlops_connect_mode = 0; @@ -106,6 +107,7 @@ static param_export_t params[] = { {"sqlcon", PARAM_STRING | USE_FUNC_PARAM, (void *)sql_con_param}, {"sqlres", PARAM_STRING | USE_FUNC_PARAM, (void *)sql_res_param}, {"tr_buf_size", PARAM_INT, &sqlops_tr_buf_size}, + {"log_buf_size", PARAM_INT, &sqlops_log_buf_size}, {"connect_mode", PARAM_INT, &sqlops_connect_mode}, {"results_maxsize", PARAM_INT, &sqlops_results_maxsize}, {0, 0, 0}};

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2024