sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
295 discussions

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

[kamailio/kamailio] htable: Fix expiry on assignment (PR #4103)
by Bastian Triller 27 Jan '25

27 Jan '25

Update cell expiry on assignment for htables w/o updateexpiry (analogue to #4079).   #### 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 - [ ] 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  Currently Kamailio does not update expiry when assigning a value to an expired cell if htable's `updateexpire` equals `0`. So expired cells aren't usable as long htable timer cleans up these cells. Reproduction 1: ``` #!KAMAILIO listen=udp:127.0.0.1:9999 log_stderror=yes loadmodule "xlog.so" loadmodule "pv.so" loadmodule "sl.so" loadmodule "htable.so" modparam("htable", "htable", "foo=>autoexpire=1;updateexpire=0;initval=0") request_route { if ($sht(foo=>bar) == $null) { xlog("it's null, init it\n"); } $sht(foo=>bar) = $sht(foo=>bar) + 1; xlog("$Ts value $sht(foo=>bar)\texpire $shtex(foo=>bar)\n"); sl_send_reply("200", "Hello"); } ``` output: ``` 0(787651) ERROR: <script>: 1736855046 value 1 expire 1 0(787651) ERROR: <script>: 1736855046 value 2 expire 1 0(787651) ERROR: <script>: 1736855047 value 3 expire 0 0(787651) ERROR: <script>: 1736855048 value 0 expire 4294967295 0(787651) ERROR: <script>: 1736855048 value 0 expire 4294967295 0(787651) ERROR: <script>: 1736855049 value 0 expire 4294967294 0(787651) ERROR: <script>: 1736855050 value 0 expire 4294967293 SNIP expire decreases while value stays 0 0(787651) ERROR: <script>: 1736855066 value 1 expire 1 0(787651) ERROR: <script>: 1736855066 value 2 expire 1 0(787651) ERROR: <script>: 1736855067 value 3 expire 0 ``` Reproduction 2: ``` #!KAMAILIO listen=udp:127.0.0.1:9999 log_stderror=yes loadmodule "xlog.so" loadmodule "pv.so" loadmodule "sl.so" loadmodule "htable.so" modparam("htable", "htable", "baz=>") modparam("htable", "htable", "foo=>autoexpire=1;updateexpire=0") request_route { if ($sht(foo=>bar) == $null) { xlog("it's null, init it\n"); } $sht(foo=>bar) = $_s($shtinc(baz=>cnt)); xlog("$Ts value $sht(foo=>bar)\texpire $shtex(foo=>bar)\n"); sl_send_reply("200", "Hello"); } event_route[htable:mod-init] { xlog("htable:mod-init\n"); # $sht(foo=>bar) = 0; $sht(baz=>cnt) = 0; } ``` output: ``` 0(789709) ERROR: <script>: it's null, init it 0(789709) ERROR: <script>: 1736855379 value 1 expire 1 0(789709) ERROR: <script>: 1736855379 value 2 expire 1 0(789709) ERROR: <script>: 1736855380 value 3 expire 0 0(789709) ERROR: <script>: 1736855380 value 4 expire 0 0(789709) ERROR: <script>: it's null, init it 0(789709) ERROR: <script>: 1736855381 value <null> expire 4294967295 0(789709) ERROR: <script>: it's null, init it 0(789709) ERROR: <script>: 1736855382 value <null> expire 4294967294 SNIP expire decreases value stays null 0(789709) ERROR: <script>: it's null, init it 0(789709) ERROR: <script>: 1736855399 value 33 expire 1 0(789709) ERROR: <script>: 1736855399 value 34 expire 1 0(789709) ERROR: <script>: 1736855400 value 35 expire 0 0(789709) ERROR: <script>: 1736855400 value 36 expire 0 ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4103 -- Commit Summary -- * htable: Fix expiry on assignment -- File Changes -- M src/modules/htable/ht_api.c (24) M src/modules/htable/ht_api.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4103.patch https://github.com/kamailio/kamailio/pull/4103.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4103 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4103(a)github.com>

2 2

git:master:75994f40: htable: Fix expiry on assignment
by Daniel-Constantin Mierla 27 Jan '25

27 Jan '25

Module: kamailio Branch: master Commit: 75994f40c99ffa2c7c33e5fce5e3d3cd8db7d780 URL: https://github.com/kamailio/kamailio/commit/75994f40c99ffa2c7c33e5fce5e3d3c… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-27T10:15:59+01:00 htable: Fix expiry on assignment Update cell expiry on assignment for htables w/o updateexpiry (analogue to #4079). --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/75994f40c99ffa2c7c33e5fce5e3d3c… Patch: https://github.com/kamailio/kamailio/commit/75994f40c99ffa2c7c33e5fce5e3d3c… --- 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

← Newer
1
...
12
13
14
15
16
17
18
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2025