- sr-dev - kamailio.org

git:master:e9684113: Makefile.groups: removed osp module
by Daniel-Constantin Mierla 23 Jul '24

23 Jul '24

Module: kamailio Branch: master Commit: e96841130fd4d3a1e362170beef6b83e7a84f1cc URL: https://github.com/kamailio/kamailio/commit/e96841130fd4d3a1e362170beef6b83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-23T12:56:32+02:00 Makefile.groups: removed osp module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/e96841130fd4d3a1e362170beef6b83… Patch: https://github.com/kamailio/kamailio/commit/e96841130fd4d3a1e362170beef6b83… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index b40781bf5cd..bda4f36a258 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -172,9 +172,6 @@ mod_list_ims=cdp cdp_avp ims_dialog ims_auth ims_isc ims_icscf ims_qos ims_qos_n ims_usrloc_scscf ims_charging ims_ocs ims_diameter_server \ ims_ipsec_pcscf -# - modules depending on osp toolkit library -mod_list_osp=osp - # - modules depending on java library mod_list_java=app_java @@ -268,7 +265,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_redis) \ $(mod_list_mono) $(mod_list_ims) \ $(mod_list_cassandra) $(mod_list_oracle) \ - $(mod_list_outbound) $(mod_list_osp) \ + $(mod_list_outbound) \ $(mod_list_java) $(mod_list_dnssec) \ $(mod_list_sctp) $(mod_list_autheph) \ $(mod_list_gzcompress) $(mod_list_uuid) \

1 0

git:master:193a8457: osp: module relocated to archive
by Daniel-Constantin Mierla 23 Jul '24

23 Jul '24

Module: kamailio Branch: master Commit: 193a8457af56dea6e7a1320df1d77d52e0951584 URL: https://github.com/kamailio/kamailio/commit/193a8457af56dea6e7a1320df1d77d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-23T12:54:27+02:00 osp: module relocated to archive --- Removed: src/modules/osp/Makefile Removed: src/modules/osp/README Removed: src/modules/osp/RELEASE-NOTES.txt Removed: src/modules/osp/destination.c Removed: src/modules/osp/destination.h Removed: src/modules/osp/doc/Makefile Removed: src/modules/osp/doc/osp.xml Removed: src/modules/osp/doc/osp_admin.xml Removed: src/modules/osp/doc/osp_devel.xml Removed: src/modules/osp/etc/cacert_0.pem Removed: src/modules/osp/etc/localcert.pem Removed: src/modules/osp/etc/pkey.pem Removed: src/modules/osp/etc/sample-osp-kamailio.cfg Removed: src/modules/osp/globals.c Removed: src/modules/osp/orig_transaction.c Removed: src/modules/osp/orig_transaction.h Removed: src/modules/osp/osp_mod.c Removed: src/modules/osp/osp_mod.h Removed: src/modules/osp/osptoolkit.c Removed: src/modules/osp/osptoolkit.h Removed: src/modules/osp/provider.c Removed: src/modules/osp/provider.h Removed: src/modules/osp/sipheader.c Removed: src/modules/osp/sipheader.h Removed: src/modules/osp/term_transaction.c Removed: src/modules/osp/term_transaction.h Removed: src/modules/osp/tm.c Removed: src/modules/osp/tm.h Removed: src/modules/osp/usage.c Removed: src/modules/osp/usage.h --- Diff: https://github.com/kamailio/kamailio/commit/193a8457af56dea6e7a1320df1d77d5… Patch: https://github.com/kamailio/kamailio/commit/193a8457af56dea6e7a1320df1d77d5…

1 0

git:master:29510872: erlang: init xavps for safety destroy on error
by Daniel-Constantin Mierla 23 Jul '24

23 Jul '24

Module: kamailio Branch: master Commit: 29510872607deb3238411b358c422d004fb307b7 URL: https://github.com/kamailio/kamailio/commit/29510872607deb3238411b358c422d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-23T11:57:48+02:00 erlang: init xavps for safety destroy on error --- Modified: src/modules/erlang/pv_tuple.c --- Diff: https://github.com/kamailio/kamailio/commit/29510872607deb3238411b358c422d0… Patch: https://github.com/kamailio/kamailio/commit/29510872607deb3238411b358c422d0… --- diff --git a/src/modules/erlang/pv_tuple.c b/src/modules/erlang/pv_tuple.c index d25b98caea9..22fc7863dfe 100644 --- a/src/modules/erlang/pv_tuple.c +++ b/src/modules/erlang/pv_tuple.c @@ -56,8 +56,8 @@ int pv_tuple_set( sr_xavp_t *tuples_root; sr_xavp_t *tuple; sr_xavp_t *th, *new, *old, *prv = NULL; - sr_xavp_t *tuple_xavp; - sr_xavp_t *elem_xavp; + sr_xavp_t *tuple_xavp = NULL; + sr_xavp_t *elem_xavp = NULL; sr_xval_t tuple_val; pv_param_t p; pv_value_t empty;

1 0

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,bullseye #2722
by kamailio＠sipwise.com 23 Jul '24

23 Jul '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> Changes: ------------------------------------------ [...truncated 153.38 KiB...] rm -f TAGS tags *.dbg .*.swp rm -f rtpengine.d rtpengine.d rtpengine.d *~ rm -f TAGS tags *.dbg .*.swp rm -f rtpproxy.d rtpproxy.d rtpproxy.d *~ rm -f TAGS tags *.dbg .*.swp rm -f ruxc.d ruxc.d ruxc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sanity.d sanity.d sanity.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sca.d sca.d sca.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sctp.d sctp.d sctp.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sdpops.d sdpops.d sdpops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f seas.d seas.d seas.d *~ rm -f TAGS tags *.dbg .*.swp rm -f secfilter.d secfilter.d secfilter.d *~ rm -f TAGS tags *.dbg .*.swp rm -f secsipid.d secsipid.d secsipid.d *~ rm -f TAGS tags *.dbg .*.swp rm -f secsipid_proc.d secsipid_proc.d secsipid_proc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipcapture.d sipcapture.d sipcapture.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipdump.d sipdump.d sipdump.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipjson.d sipjson.d sipjson.d *~ rm -f TAGS tags *.dbg .*.swp rm -f siprepo.d siprepo.d siprepo.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipt.d sipt.d sipt.d *~ rm -f TAGS tags *.dbg .*.swp rm -f siptrace.d siptrace.d siptrace.d *~ rm -f TAGS tags *.dbg .*.swp rm -f siputils.d siputils.d siputils.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sl.d sl.d sl.d *~ rm -f TAGS tags *.dbg .*.swp rm -f slack.d slack.d slack.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sms.d sms.d sms.d *~ rm -f TAGS tags *.dbg .*.swp rm -f smsops.d smsops.d smsops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f snmpstats.d snmpstats.d snmpstats.d *~ rm -f TAGS tags *.dbg .*.swp rm -f speeddial.d speeddial.d speeddial.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sqlops.d sqlops.d sqlops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f ss7ops.d ss7ops.d ss7ops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sst.d sst.d sst.d *~ rm -f TAGS tags *.dbg .*.swp rm -f statistics.d statistics.d statistics.d *~ rm -f TAGS tags *.dbg .*.swp rm -f statsc.d statsc.d statsc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f statsd.d statsd.d statsd.d *~ rm -f TAGS tags *.dbg .*.swp rm -f stirshaken.d stirshaken.d stirshaken.d *~ rm -f TAGS tags *.dbg .*.swp rm -f stun.d stun.d stun.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sworker.d sworker.d sworker.d *~ rm -f TAGS tags *.dbg .*.swp rm -f systemdops.d systemdops.d systemdops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tcpops.d tcpops.d tcpops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f textops.d textops.d textops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f textopsx.d textopsx.d textopsx.d *~ rm -f TAGS tags *.dbg .*.swp rm -f timer.d timer.d timer.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tls.d tls.d tls.d *~ Package wolfssl was not found in the pkg-config search path. Perhaps you should add the directory containing `wolfssl.pc' to the PKG_CONFIG_PATH environment variable No package 'wolfssl' found Makefile:65: sources = tls_cfg.c tls_config.c tls_ct_wrq.c tls_domain.c tls_init.c tls_rpc.c tls_select.c tls_server.c tls_util.c tls_verify.c tls_wolfssl_mod.c , auto_gen = , objs = tls_cfg.o tls_config.o tls_ct_wrq.o tls_domain.o tls_init.o tls_rpc.o tls_select.o tls_server.o tls_util.o tls_verify.o tls_wolfssl_mod.o rm -f TAGS tags *.dbg .*.swp rm -f tls_wolfssl.d tls_wolfssl.d tls_wolfssl.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tlsa.d tlsa.d tlsa.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tm.d tm.d tm.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tmrec.d tmrec.d tmrec.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tmx.d tmx.d tmx.d *~ rm -f TAGS tags *.dbg .*.swp rm -f topoh.d topoh.d topoh.d *~ rm -f TAGS tags *.dbg .*.swp rm -f topos.d topos.d topos.d *~ rm -f TAGS tags *.dbg .*.swp rm -f topos_redis.d topos_redis.d topos_redis.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tsilo.d tsilo.d tsilo.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uac.d uac.d uac.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uac_redirect.d uac_redirect.d uac_redirect.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_auth_db.d uid_auth_db.d uid_auth_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_avp_db.d uid_avp_db.d uid_avp_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_domain.d uid_domain.d uid_domain.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_gflags.d uid_gflags.d uid_gflags.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_uri_db.d uid_uri_db.d uid_uri_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uri_db.d uri_db.d uri_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f userblocklist.d userblocklist.d userblocklist.d *~ rm -f TAGS tags *.dbg .*.swp rm -f usrloc.d usrloc.d usrloc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f utils.d utils.d utils.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uuid.d uuid.d uuid.d *~ rm -f TAGS tags *.dbg .*.swp rm -f websocket.d websocket.d websocket.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xcap_client.d xcap_client.d xcap_client.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xcap_server.d xcap_server.d xcap_server.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp.d xhttp.d xhttp.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp_pi.d xhttp_pi.d xhttp_pi.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp_prom.d xhttp_prom.d xhttp_prom.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp_rpc.d xhttp_rpc.d xhttp_rpc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xlog.d xlog.d xlog.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xmlops.d xmlops.d xmlops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xmlrpc.d xmlrpc.d xmlrpc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xmpp.d xmpp.d xmpp.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xprint.d xprint.d xprint.d *~ make[2]: Leaving directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/src' make[1]: Leaving directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745' dh_clean dh_clean: warning: Compatibility levels before 10 are deprecated (level 9 in use) dpkg-source -b . dpkg-source: info: using source format '3.0 (native)' dpkg-source: info: building kamailio in kamailio_6.0.0~dev2+bpo11.20240720005440.2745.tar.xz dpkg-source: info: building kamailio in kamailio_6.0.0~dev2+bpo11.20240720005440.2745.dsc debian/rules binary dh_testdir # Add here commands to configure the package. /usr/bin/make FLAVOUR=kamailio cfg prefix=/usr cfg_prefix=/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/debian/kamailio \ cfg_target=/etc/kamailio/ \ BASEDIR=/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/debian/kamailio \ skip_modules=" bdb dbtext oracle pa iptrtpproxy dnssec java nats tls_wolfssl" \ CC_EXTRA_OPTS="-Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745=. -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE" \ LD_EXTRA_OPTS="-Wl,-z,relro" \ group_include="kstandard" quiet=verbose make[1]: Entering directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745' /usr/bin/make -C src/ cfg make[2]: Entering directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/src' normal Makefile.defs exec target architecture <x86_64>, host architecture <x86_64> rm -f modules.lst making config... /usr/bin/make --no-print-directory modules.lst config.mak loaded Makefile.defs defs skipped /usr/bin/make --no-print-directory -wC . cfg-defs normal Makefile.defs exec target architecture <x86_64>, host architecture <x86_64> make[4]: Nothing to be done for 'cfg-defs'. config.mak loaded Makefile.defs defs skipped saving modules list... make[2]: Leaving directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/src' make[1]: Leaving directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745' touch configure-stamp dh_testdir /usr/bin/make all quiet=verbose make[1]: Entering directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745' /usr/bin/make -C src/ all make[2]: Entering directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/src' config.mak loaded Makefile:116: *** "bad config.mak, try re-running make cfg". Stop. make[2]: Leaving directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745/src' make[1]: *** [Makefile:34: all] Error 2 make[1]: Leaving directory '/build/kamailio-6.0.0~dev2+bpo11.20240720005440.2745' make: *** [debian/rules:130: test_build_all] Error 2 dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 I: copying local configuration E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.16366/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.16366/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_kJGwZY filesystem I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: Cleaning COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.16366 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /run/lock/bullseye-amd64.building.16033 + '[' -r /run/lock/bullseye-amd64.update.16033 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.gTX97Iau9L ']' + rm -rf /tmp/tmp.gTX97Iau9L + '[' -n /tmp/apt-jdg_kJGwZY ']' + sudo rm -rf /tmp/apt-jdg_kJGwZY + '[' -n 292 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=102 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Sat Jul 20 01:04:44 UTC 2024 [running 102 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Sat Jul 20 01:04:44 UTC 2024 [running 102 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

[kamailio/kamailio] nghttp2 module causing Kamailio P-CSCF to crash on connect (Issue #3917)
by NUCLEAR-WAR 22 Jul '24

22 Jul '24

### Description I am doing some experiments with NGHTTP2 Module to make use of it in some scenarios, where Kamailio receives HTTP2 requests and has t react on them, unfortunately the module is causing Kamailio to crash upon receiving a request and need to be restarted. Also the Docs for the module need some correction : https://www.kamailio.org/docs/modules/5.9.x/modules/nghttp2.html Missing required Parameters : modparam("nghttp2", "tls_private_key", "key_in_PEM_Format") modparam("nghttp2", "tls_public_key", "certificate_in_PEM_Format") also $nghttp2(url) is wrong, $nghttp2(path) or $nghttp2(pathfull) is the correct ones. its also annoying to have it only working in TLS, would it possible to make it also works without TLS ? #### Reproduction the fastest way it to connect to NGHTTP2 server with curl : curl --http2-prior-knowledge -v -k https://server_ip:port/ #### Debugging Data ``` 92(132) DEBUG: nghttp2 [nghttp2_server.c:717]: eventcb(): 172.22.0.1 connected 92(132) DEBUG: nghttp2 [nghttp2_server.c:507]: on_request_recv(): 172.22.0.1 GET / 92(132) DEBUG: nghttp2 [nghttp2_mod.c:522]: ksr_event_route(): executing event_route[nghttp2:request] (1) free(): invalid pointer 102(142) CRITICAL: <core> [core/pass_fd.c:281]: receive_fd(): EOF on 7 102(142) DEBUG: <core> [core/tcp_main.c:3984]: handle_ser_child(): dead child 92, pid 132 (shutting down?) 102(142) DEBUG: <core> [core/io_wait.h:599]: io_watch_del(): DBG: io_watch_del (0x5b85ddc10ae0, 7, -1, 0x0) fd_no=130 called 0(40) ALERT: <core> [main.c:806]: handle_sigs(): child process 132 exited by a signal 6 0(40) ALERT: <core> [main.c:810]: handle_sigs(): core was generated ``` #### Log Messages  ``` https://pastebin.com/MQe4F5sv ``` ### Additional Information * **Kamailio Version** 5.8 * **Operating System**: Ubuntu 24.04 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3917 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3917(a)github.com>

3 14

git:master:7350a80a: nghttp2: duplicate reply status code in nghttp2_send_reply()
by Daniel-Constantin Mierla 22 Jul '24

22 Jul '24

Module: kamailio Branch: master Commit: 7350a80a1d4d121a75e12529553191c4a9038f56 URL: https://github.com/kamailio/kamailio/commit/7350a80a1d4d121a75e12529553191c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-22T14:44:42+02:00 nghttp2: duplicate reply status code in nghttp2_send_reply() - expected to be freed later - GH #3917 --- Modified: src/modules/nghttp2/nghttp2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7350a80a1d4d121a75e12529553191c… Patch: https://github.com/kamailio/kamailio/commit/7350a80a1d4d121a75e12529553191c… --- diff --git a/src/modules/nghttp2/nghttp2_mod.c b/src/modules/nghttp2/nghttp2_mod.c index a6b63b56e84..28b80544107 100644 --- a/src/modules/nghttp2/nghttp2_mod.c +++ b/src/modules/nghttp2/nghttp2_mod.c @@ -299,8 +299,14 @@ static int ksr_nghttp2_send_reply(sip_msg_t *msg, str *rcode, str *sbody) int rv; ssize_t writelen; int pipefd[2]; + char *p; - _ksr_nghttp2_ctx.rplhdrs_v[0].value = (uint8_t *)rcode->s; + p = strndup(rcode->s, rcode->len); + if(p == NULL) { + SYS_MEM_ERROR; + return -1; + } + _ksr_nghttp2_ctx.rplhdrs_v[0].value = (uint8_t *)p; _ksr_nghttp2_ctx.rplhdrs_v[0].valuelen = rcode->len; if(_ksr_nghttp2_ctx.rplhdrs_n == 0) {

1 0

[kamailio/kamailio] Warnings emitted when calling functions from dialplan module (Issue #3851)
by Ben Kaufman 22 Jul '24

22 Jul '24

### Description Calling functions from the `dialplan` module in 5.8 (`dp_translate()`, `dp_match()`) results in the following line being logged: ``` WARNING: <core> [core/mem/q_malloc.c:520]: qm_free(): WARNING: free(0) called from dialplan: dp_db.c: pcre2_free(206) ``` Is this a functional problem, or just a case of overly aggressive logging? ### Troubleshooting #### Reproduction Reproducible with the following kamailio config: ``` #!KAMAILIO loadmodule "pv" loadmodule "db_sqlite" loadmodule "xlog" loadmodule "dialplan" disable_tcp = true force_rport = true !!define DBFILE /etc/kamailio/kamailio.sqlite modparamx("db_sqlite","db_set_readonly", "$def(DBFILE)") modparamx("dialplan","db_url", "sqlite:///$def(DBFILE)") modparam("dialplan", "attrs_pvar", "$avp(dp_attrs)") request_route { if ( $rm == "ACK" ) { exit; } xinfo("$ci New request\n"); dp_match("1", "$rU"); exit; } ``` The warning log is issued in 5.8 but not 5.7. Reproduced by sending a request with SIPp: ``` sipp -sn uac -m 1 -s 15554445555 localhost ``` ### Possible Solutions Not sure if this is just a case of logging being overly aggressive, or an issue with the module's memory management. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.1 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 12.2.0 ``` Tested using docker `debian:12-slim` using the official packages from `http://deb.kamailio.org/kamailio58` * **Operating System**: Docker debian:12-slim, but also observed in Alpine Linux/ -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3851 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3851(a)github.com>

6 13

git:master:34749ab1: utils: jump to error on pkg allocation failure
by Daniel-Constantin Mierla 22 Jul '24

22 Jul '24

Module: kamailio Branch: master Commit: 34749ab13b31504358761c964f794b283931394c URL: https://github.com/kamailio/kamailio/commit/34749ab13b31504358761c964f794b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-22T11:01:16+02:00 utils: jump to error on pkg allocation failure --- Modified: src/modules/utils/xcap_auth.c --- Diff: https://github.com/kamailio/kamailio/commit/34749ab13b31504358761c964f794b2… Patch: https://github.com/kamailio/kamailio/commit/34749ab13b31504358761c964f794b2… --- diff --git a/src/modules/utils/xcap_auth.c b/src/modules/utils/xcap_auth.c index 3824b2d484a..5c986a18cd3 100644 --- a/src/modules/utils/xcap_auth.c +++ b/src/modules/utils/xcap_auth.c @@ -418,11 +418,13 @@ int get_rules_doc(str *user, str *domain, int type, str **rules_doc) doc = (str *)pkg_malloc(sizeof(str)); if(doc == NULL) { PKG_MEM_ERROR; + goto error; } doc->s = (char *)pkg_malloc(body.len * sizeof(char)); if(doc->s == NULL) { pkg_free(doc); PKG_MEM_ERROR; + goto error; } memcpy(doc->s, body.s, body.len); doc->len = body.len; @@ -514,4 +516,4 @@ int w_xcap_auth_status(struct sip_msg *_msg, char *_sp1, char *_sp2) } return ki_xcap_auth_status(_msg, &watcher_uri, &presentity_uri); -} \ No newline at end of file +}

1 0

git:master:79a668b8: tls: check lenght when parsing pv alt name
by Daniel-Constantin Mierla 22 Jul '24

22 Jul '24

Module: kamailio Branch: master Commit: 79a668b8bdb0e085adb3581d718e5fd5ae73e2e4 URL: https://github.com/kamailio/kamailio/commit/79a668b8bdb0e085adb3581d718e5fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-22T10:41:47+02:00 tls: check lenght when parsing pv alt name --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/79a668b8bdb0e085adb3581d718e5fd… Patch: https://github.com/kamailio/kamailio/commit/79a668b8bdb0e085adb3581d718e5fd… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index c788eabcd63..8b1a0457c0a 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -1190,13 +1190,13 @@ int pv_parse_alt_name(pv_spec_p sp, str *in) if(in->s == NULL || in->len <= 0) return -1; - if(strncmp(in->s, "DNS", 3) == 0) { + if(in->len == 3 && strncmp(in->s, "DNS", 3) == 0) { sp->pvp.pvn.u.isname.name.n = PV_COMP_HOST; - } else if(strncmp(in->s, "URI", 3) == 0) { + } else if(in->len == 3 && strncmp(in->s, "URI", 3) == 0) { sp->pvp.pvn.u.isname.name.n = PV_COMP_URI; - } else if(strncmp(in->s, "EMAIL", 5) == 0) { + } else if(in->len == 5 && strncmp(in->s, "EMAIL", 5) == 0) { sp->pvp.pvn.u.isname.name.n = PV_COMP_E; - } else if(strncmp(in->s, "IP", 2) == 0) { + } else if(in->len == 2 && strncmp(in->s, "IP", 2) == 0) { sp->pvp.pvn.u.isname.name.n = PV_COMP_IP; } else { LM_ERR("Unsupported alt name %s\n", in->s);

1 0

git:master:7c06997a: tls: remove uselss pv format parsing in pv_parse_alt_name()
by Daniel-Constantin Mierla 22 Jul '24

22 Jul '24

Module: kamailio Branch: master Commit: 7c06997a1b6e77ae0642d369f532219dc35ef8e0 URL: https://github.com/kamailio/kamailio/commit/7c06997a1b6e77ae0642d369f532219… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-22T10:23:31+02:00 tls: remove uselss pv format parsing in pv_parse_alt_name() --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/7c06997a1b6e77ae0642d369f532219… Patch: https://github.com/kamailio/kamailio/commit/7c06997a1b6e77ae0642d369f532219… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index c7eb96bd9fa..c788eabcd63 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -1187,14 +1187,9 @@ static int pv_comp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) int pv_parse_alt_name(pv_spec_p sp, str *in) { - pv_elem_t *fmt = NULL; - if(in->s == NULL || in->len <= 0) return -1; - if(pv_parse_format(in, &fmt) < 0 || fmt == NULL) { - LM_ERR("wrong format[%.*s]\n", in->len, in->s); - return -1; - } + if(strncmp(in->s, "DNS", 3) == 0) { sp->pvp.pvn.u.isname.name.n = PV_COMP_HOST; } else if(strncmp(in->s, "URI", 3) == 0) {

1 0

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

git:5.8:685f45c4: dialplan: remove pcre2_free() warning
by Victor Seva 18 Jul '24

18 Jul '24

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)

1 0

git:5.8:64a01ebe: lcr: remove pcre2_free() warning
by Victor Seva 18 Jul '24

18 Jul '24

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; + } } /*

1 0

git:5.8:1946e35c: regex: remove pcre2_free() warning
by Victor Seva 18 Jul '24

18 Jul '24

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

1 0

git:master:70563ca0: dialplan: remove pcre2_free() warning
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 70563ca0629a8de5aa5427b003f441e6c3a40c6a URL: https://github.com/kamailio/kamailio/commit/70563ca0629a8de5aa5427b003f441e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T13:41:16+02:00 dialplan: remove pcre2_free() warning related to #3851 --- Modified: src/modules/dialplan/dp_db.c --- Diff: https://github.com/kamailio/kamailio/commit/70563ca0629a8de5aa5427b003f441e… Patch: https://github.com/kamailio/kamailio/commit/70563ca0629a8de5aa5427b003f441e… --- 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)

1 0

git:master:310b6310: lcr: remove pcre2_free() warning
by Victor Seva 18 Jul '24

18 Jul '24

Module: kamailio Branch: master Commit: 310b631007082f553117d126b6b9bd915be596ac URL: https://github.com/kamailio/kamailio/commit/310b631007082f553117d126b6b9bd9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-18T13:41:15+02:00 lcr: remove pcre2_free() warning related to #3851 --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/310b631007082f553117d126b6b9bd9… Patch: https://github.com/kamailio/kamailio/commit/310b631007082f553117d126b6b9bd9… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 6cad2830fb6..f53de3b3668 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; + } } /*

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev