sr-dev July 2024

sr-dev@lists.kamailio.org

16 participants
208 discussions

git:5.7:2deec6b4: sipcapture: add missing headers for inet_ntop()

by Victor Seva

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"

2 months, 2 weeks

git:5.8:164d1ecc: sipcapture: add missing headers for inet_ntop()

by Victor Seva

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"

2 months, 2 weeks

[kamailio/kamailio] hep.c:985:41: error: implicit declaration of function ‘inet_ntop’ (Issue #3927)

by Victor Seva

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>

2 months, 2 weeks

git:master:fe505c96: sipcapture: add missing headers for inet_ntop()

by Victor Seva

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"

2 months, 2 weeks

git:master:b6de4b92: modules: readme files regenerated - sqlops ... [skip ci]

by Kamailio Dev

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…

2 months, 2 weeks

[kamailio/kamailio] sqlops: Don't truncated sql command when logging. (PR #3903)

by Xenofon Karamanos

#### 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 months, 2 weeks

git:master:e5407c05: sqlops: Add log_buf_size param for logging raw queries.

by Xenofon Karamanos

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}};

2 months, 2 weeks

git:5.8:685f45c4: dialplan: remove pcre2_free() warning

by Victor Seva

Module: kamailio Branch: 5.8 Commit: 685f45c4adf911ac41c14b55ad36dd4b8b51897c URL: https://github.com/kamailio/kamailio/commit/685f45c4adf911ac41c14b55ad36dd4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T13:42:31+02:00 dialplan: remove pcre2_free() warning related to #3851 (cherry picked from commit 70563ca0629a8de5aa5427b003f441e6c3a40c6a) --- Modified: src/modules/dialplan/dp_db.c --- Diff: https://github.com/kamailio/kamailio/commit/685f45c4adf911ac41c14b55ad36dd4… Patch: https://github.com/kamailio/kamailio/commit/685f45c4adf911ac41c14b55ad36dd4… --- diff --git a/src/modules/dialplan/dp_db.c b/src/modules/dialplan/dp_db.c index 857a2e43e75..64d2a4f3b12 100644 --- a/src/modules/dialplan/dp_db.c +++ b/src/modules/dialplan/dp_db.c @@ -203,8 +203,10 @@ static void *pcre2_malloc(size_t size, void *ext) static void pcre2_free(void *ptr, void *ext) { - shm_free(ptr); - ptr = NULL; + if(ptr) { + shm_free(ptr); + ptr = NULL; + } } int init_data(void)

2 months, 2 weeks

git:5.8:64a01ebe: lcr: remove pcre2_free() warning

by Victor Seva

Module: kamailio Branch: 5.8 Commit: 64a01ebec255ece59be3683bab421b35505d745d URL: https://github.com/kamailio/kamailio/commit/64a01ebec255ece59be3683bab421b3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T13:42:31+02:00 lcr: remove pcre2_free() warning related to #3851 (cherry picked from commit 310b631007082f553117d126b6b9bd915be596ac) --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/64a01ebec255ece59be3683bab421b3… Patch: https://github.com/kamailio/kamailio/commit/64a01ebec255ece59be3683bab421b3… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index dac215a9eb5..bbd397d5186 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -433,8 +433,10 @@ static void *pcre2_malloc(size_t size, void *ext) static void pcre2_free(void *ptr, void *ext) { - shm_free(ptr); - ptr = NULL; + if(ptr) { + shm_free(ptr); + ptr = NULL; + } } /*

2 months, 2 weeks

git:5.8:1946e35c: regex: remove pcre2_free() warning

by Victor Seva

Module: kamailio Branch: 5.8 Commit: 1946e35c4d144fba3067d3fee5d1bd030dc4a609 URL: https://github.com/kamailio/kamailio/commit/1946e35c4d144fba3067d3fee5d1bd0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T13:42:31+02:00 regex: remove pcre2_free() warning related to #3851 (cherry picked from commit b86030cfbd66ba95f33f312595edae29e2b5cde0) --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1946e35c4d144fba3067d3fee5d1bd0… Patch: https://github.com/kamailio/kamailio/commit/1946e35c4d144fba3067d3fee5d1bd0… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 52ed60b295c..f4e93e48a3e 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -170,8 +170,10 @@ static void *pcre2_malloc(size_t size, void *ext) static void pcre2_free(void *ptr, void *ext) { - shm_free(ptr); - ptr = NULL; + if(ptr) { + shm_free(ptr); + ptr = NULL; + } } /*! \brief

2 months, 2 weeks

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2024