- sr-dev - kamailio.org

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

[kamailio/kamailio] The future of internal libraries (Issue #4041)
by Daniel-Constantin Mierla 27 Jan '25

27 Jan '25

Considering that it hasn't been much activity around the internal libraries for long time, I was wondering if it still makes sense to keep them like they are or merge them in the core. Recently, during the devel meeting, I relocated a couple of them to the archive. The `lib/binrpc` (and `print`) can have the same fate, being not actually used. The srdb1 is very common and I guess it is very rare the case when a deployment is used without a module not depending on it (e.g., even if dispatcher is used with a list file, the code is still linked to this library). The `trie` library is small and `ims` is actually a set of getter functions for message attribtues/headers. The `srdb2` is not used much, but I think the right approach for it is to change the modules using it to `libsrdb1` and get rid of it completely sometime in the future. Till then the code is not big and can reside as part of the core. The benefits I see are in simplifying the build system (current makefiles and hopefully soon-to-be-merged the one based on cmake), reducing also the time to compute compile and link dependencies; getting rid of packaging complexity (same library may be needed by different modules, which, when packaged separately, the library has to be in a 3rd package, or have dependency of the other module's package -- probably now the libs are shipped with the core package). The code for libs can stay at the same location, so source code for modules doesn't need to be updated, just that they are compiled with the core, removing internal libs from makefiles. Thinking that we go for 6.0.x, clarifying the plans for this component and cleaning it, if decided so, should fit well in such version number jump. Opinions? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4041 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4041(a)github.com>

4 14

git:master:200cdb31: core/parser/sdp: proper test for media ip separator
by Daniel-Constantin Mierla 26 Jan '25

26 Jan '25

Module: kamailio Branch: master Commit: 200cdb318569191cd012dfe99b252f98fe9623b9 URL: https://github.com/kamailio/kamailio/commit/200cdb318569191cd012dfe99b252f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-26T18:07:54+01:00 core/parser/sdp: proper test for media ip separator --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/200cdb318569191cd012dfe99b252f9… Patch: https://github.com/kamailio/kamailio/commit/200cdb318569191cd012dfe99b252f9… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 61022b6148f..893ef0e58a4 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -561,7 +561,7 @@ int extract_mediaip(str *body, str *mediaip, int *pf, char *line) * - for length, at least 6: ' IP[4|6] x...' * - white space after */ - if(cp + 6 > mediaip->s + mediaip->len && cp[4] != ' ') { + if(cp + 6 > mediaip->s + mediaip->len || cp[4] != ' ') { LM_ERR("invalid content for `%s' line\n", line); return -1; }

1 0

[kamailio/kamailio] Unexpected return code from route with switch-case block (Issue #4088)
by Marat 24 Jan '25

24 Jan '25

### Description I see unexpected return code from route if there is no explicit `return` and switch-case block.  #### Reproduction Here is simple configuration part: ``` route(TEST_ROUTE_WITH_SWITCH); xlog("L_WARN", "TEST_ROUTE_WITH_SWITCH result $rc\n"); ... route[TEST_ROUTE_WITH_SWITCH] { $var(a) = "a"; switch ($var(a)) { case "a": case "b": $var(b) = $var(a); break; default: $var(c) = $var(a); } # must be optional according to documentation: # https://www.kamailio.org/wiki/cookbooks/5.3.x/core#return # > If no value is specified, or a route reaches its end without executing a return statement, it returns 1. # # return 1; } ``` Log: ``` WARNING: <script>: TEST_ROUTE_WITH_SWITCH result 0 ``` At the same time if there is no switch-block, return code is 1 as expected: ``` route[TEST_ROUTE_WITH_SWITCH] { $var(a) = "a"; } ``` Log: ``` WARNING: <script>: TEST_ROUTE_WITH_SWITCH w/o switch-case result 1 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` $ ./build/sbin/kamailio -v version: kamailio 5.7.5 (x86_64/linux) b47500-dirty 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: b47500 -dirty compiled on 22:02:13 Nov 9 2024 with /usr/bin/gcc 11.3.1 ``` * **Operating System**:  ``` Oracle Linux 9 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4088 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4088(a)github.com>

2 2

[kamailio/kamailio] Module dispatcher: ds_is_active() return incorrect. (Issue #4001)
by Minh Vũ 24 Jan '25

24 Jan '25

#### Kamailo 5.8 ### Description I use ```ds_is_active function()``` in ```dispatcher``` module. ``` $var(sip_url) = $sht(conf_fs=>$var(conf_id)); # sip:192.168.1.44:5060 if(ds_is_active("1", "$var(sip_url)")){ #### is allways run } ``` or ```ds_is_active("1", $var(sip_url))``` #### Debugging Data When I check dispatcher: ``` "DEST": { "URI": "sip:192.168.1.44:5060", "FLAGS": "IP", "PRIORITY": 0, "ATTRS": { "BODY": "rweight=50;weight=50;cc=1", "DUID": null, "MAXLOAD": 0, "WEIGHT": 50, "RWEIGHT": 50, "SOCKET": null, "SOCKNAME": null, "OBPROXY": null } } ``` Why is the flag set to ```IP```, but ```ds_is_active()``` returns true? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4001 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4001(a)github.com>

3 5

git:master:65e51b77: presence: do not break on one notify sending failure
by Daniel-Constantin Mierla 24 Jan '25

24 Jan '25

Module: kamailio Branch: master Commit: 65e51b776290a1981e9ac27fbe6b47813516bc8b URL: https://github.com/kamailio/kamailio/commit/65e51b776290a1981e9ac27fbe6b478… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-24T16:53:10+01:00 presence: do not break on one notify sending failure - try all of them, debug message with successful and failure counters - GH #4118 --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/65e51b776290a1981e9ac27fbe6b478… Patch: https://github.com/kamailio/kamailio/commit/65e51b776290a1981e9ac27fbe6b478… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 47a11b23183..191cac0d04b 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1557,6 +1557,8 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) subs_t *subs_array = NULL, *s = NULL; str *notify_body = NULL, *aux_body = NULL; int ret_code = -1; + int retOK = 0; + int retErr = 0; subs_array = get_subs_dialog(pres_uri, event, NULL); if(subs_array == NULL) { @@ -1586,7 +1588,9 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) < 0) { LM_ERR("Could not send notify for [event]=%.*s\n", event->name.len, event->name.s); - goto done; + retErr++; + } else { + retOK++; } if(aux_body != NULL) { @@ -1599,7 +1603,10 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) } } - ret_code = 1; + LM_DBG("sent ok: %d - err: %d\n", retOK, retErr); + if(retOK > 0) { + ret_code = 1; + } done: free_subs_list(subs_array, PKG_MEM_TYPE, 0);

1 0

git:master:b788c39b: github: [codeql] use all available processors when building [skip ci]
by GitHub 24 Jan '25

24 Jan '25

Module: kamailio Branch: master Commit: b788c39bf848fe9d04d0429094156028a991845b URL: https://github.com/kamailio/kamailio/commit/b788c39bf848fe9d04d042909415602… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: GitHub <noreply(a)github.com> Date: 2025-01-24T15:29:25+01:00 github: [codeql] use all available processors when building [skip ci] --- Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/b788c39bf848fe9d04d042909415602… Patch: https://github.com/kamailio/kamailio/commit/b788c39bf848fe9d04d042909415602… --- diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 9cdeafc77ff..1ca3734de17 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -75,7 +75,7 @@ jobs: - name: Build cpp if: ${{ matrix.language == 'cpp' }} - run: make all + run: make -j$(nproc) all - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3

1 0

git:master:f69b22ce: cmake: Install snmpstats files
by Xenofon Karamanos 24 Jan '25

24 Jan '25

Module: kamailio Branch: master Commit: f69b22ce3cdc2c06739c11f19c9ebeb5eb1727f3 URL: https://github.com/kamailio/kamailio/commit/f69b22ce3cdc2c06739c11f19c9ebeb… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-24T09:59:18Z cmake: Install snmpstats files --- Modified: src/modules/snmpstats/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/f69b22ce3cdc2c06739c11f19c9ebeb… Patch: https://github.com/kamailio/kamailio/commit/f69b22ce3cdc2c06739c11f19c9ebeb… --- diff --git a/src/modules/snmpstats/CMakeLists.txt b/src/modules/snmpstats/CMakeLists.txt index fa3980030db..ac416979da7 100644 --- a/src/modules/snmpstats/CMakeLists.txt +++ b/src/modules/snmpstats/CMakeLists.txt @@ -7,3 +7,8 @@ find_package(NETSNMP REQUIRED) # TODO: Compiles fine but need to do some more verifcation target_link_libraries(${module_name} PRIVATE NETSNMP::NETSNMP) + +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mibs + DESTINATION ${CMAKE_INSTALL_DATADIR}/snmp/ + OPTIONAL)

1 0

git:5.8:0cf639ec: pkg/kamailio: added support for CentOS 10 [skip-ci]
by Sergey Safarov 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: 0cf639eceb6a8fea50d19184add989e049dfb6ca URL: https://github.com/kamailio/kamailio/commit/0cf639eceb6a8fea50d19184add989e… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-01-23T16:14:59+02:00 pkg/kamailio: added support for CentOS 10 [skip-ci] (cherry picked from commit cdafda78c9fc98d9d9fdb7f94e77c9bc60ebf4d1) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0cf639eceb6a8fea50d19184add989e… Patch: https://github.com/kamailio/kamailio/commit/0cf639eceb6a8fea50d19184add989e… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 9c9c257fafb..eb0885e71c5 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -116,21 +116,21 @@ %bcond_without wolfssl %endif -%if 0%{?rhel} == 9 +%if 0%{?rhel} == 9 || 0%{?rhel} == 10 %if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} -%define dist .el9.centos +%define dist .el%{?centos_ver}.centos %endif %if 0%{?almalinux_ver} %define dist_name centos %define dist_version %{?almalinux} -%define dist .el9.almalinux +%define dist .el%{?almalinux_ver}.almalinux %endif %if 0%{?rocky_ver} %define dist_name centos %define dist_version %{?rocky} -%define dist .el9.rocky +%define dist .el%{?rocky_ver}.rocky %endif %if 0%{?centos_ver} == 0 && 0%{?almalinux_ver} == 0 && 0%{?rocky_ver} == 0 %define dist_name rhel

1 0

git:5.8:0e51b497: pkg/kamailio: simplified systemd unit files installation [skip ci]
by Sergey Safarov 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: 0e51b497a19c525a89d5fead5e0854b2b18317dd URL: https://github.com/kamailio/kamailio/commit/0e51b497a19c525a89d5fead5e0854b… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-01-23T14:56:40+02:00 pkg/kamailio: simplified systemd unit files installation [skip ci] (cherry picked from commit c47108eacba1a6cf7e8564a00ff0850f621d29aa) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0e51b497a19c525a89d5fead5e0854b… Patch: https://github.com/kamailio/kamailio/commit/0e51b497a19c525a89d5fead5e0854b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index f160ec6d7ad..9c9c257fafb 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1205,7 +1205,6 @@ sed -i -e 's|/usr/sbin/kamailio|/usr/sbin/kamailio --atexit=no|' pkg/kamailio/ob %build -ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 export FREERADIUS=1 %endif @@ -1444,29 +1443,29 @@ install -d %{buildroot}%{_sharedstatedir}/kamailio # On RedHat 6 like install -d %{buildroot}%{_var}/run/kamailio install -d %{buildroot}%{_sysconfdir}/rc.d/init.d -install -m755 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.init \ +install -m755 pkg/kamailio/obs/kamailio.init \ %{buildroot}%{_sysconfdir}/rc.d/init.d/kamailio %else # systemd install -d %{buildroot}%{_unitdir} -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.service %{buildroot}%{_unitdir}/kamailio.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf +install -Dpm 0644 pkg/kamailio/obs/kamailio.service %{buildroot}%{_unitdir}/kamailio.service +install -Dpm 0644 pkg/kamailio/obs/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service +install -Dpm 0644 pkg/kamailio/obs/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service +install -Dpm 0644 pkg/kamailio/obs/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf +install -Dpm 0644 pkg/kamailio/obs/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf %endif %if 0%{?suse_version} install -d %{buildroot}%{_fillupdir} -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.sipcapture %else install -d %{buildroot}%{_sysconfdir}/sysconfig -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/sipcapture %endif

1 0

git:6.0:2790d202: pkg/kamailio: simplified systemd unit files installation [skip ci]
by Sergey Safarov 23 Jan '25

23 Jan '25

Module: kamailio Branch: 6.0 Commit: 2790d202e2756e1b5037239983b134d04bdb73f3 URL: https://github.com/kamailio/kamailio/commit/2790d202e2756e1b5037239983b134d… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-01-23T14:54:15+02:00 pkg/kamailio: simplified systemd unit files installation [skip ci] (cherry picked from commit c47108eacba1a6cf7e8564a00ff0850f621d29aa) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/2790d202e2756e1b5037239983b134d… Patch: https://github.com/kamailio/kamailio/commit/2790d202e2756e1b5037239983b134d… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8eba6e06aac..de909ffd85b 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1198,7 +1198,6 @@ sed -i -e 's|/usr/sbin/kamailio|/usr/sbin/kamailio --atexit=no|' pkg/kamailio/ob %build -ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 export FREERADIUS=1 %endif @@ -1431,29 +1430,29 @@ install -d %{buildroot}%{_sharedstatedir}/kamailio # On RedHat 6 like install -d %{buildroot}%{_var}/run/kamailio install -d %{buildroot}%{_sysconfdir}/rc.d/init.d -install -m755 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.init \ +install -m755 pkg/kamailio/obs/kamailio.init \ %{buildroot}%{_sysconfdir}/rc.d/init.d/kamailio %else # systemd install -d %{buildroot}%{_unitdir} -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.service %{buildroot}%{_unitdir}/kamailio.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf +install -Dpm 0644 pkg/kamailio/obs/kamailio.service %{buildroot}%{_unitdir}/kamailio.service +install -Dpm 0644 pkg/kamailio/obs/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service +install -Dpm 0644 pkg/kamailio/obs/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service +install -Dpm 0644 pkg/kamailio/obs/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf +install -Dpm 0644 pkg/kamailio/obs/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf %endif %if 0%{?suse_version} install -d %{buildroot}%{_fillupdir} -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.sipcapture %else install -d %{buildroot}%{_sysconfdir}/sysconfig -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/sipcapture %endif

1 0

git:master:08eda6e8: pkg/kamailio: simplified systemd unit files installation
by Sergey Safarov 23 Jan '25

23 Jan '25

Module: kamailio Branch: master Commit: 08eda6e89c1fb899959c3f07efd93db30d7cb30c URL: https://github.com/kamailio/kamailio/commit/08eda6e89c1fb899959c3f07efd93db… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-01-23T14:52:25+02:00 pkg/kamailio: simplified systemd unit files installation --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/08eda6e89c1fb899959c3f07efd93db… Patch: https://github.com/kamailio/kamailio/commit/08eda6e89c1fb899959c3f07efd93db… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8eba6e06aac..de909ffd85b 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1198,7 +1198,6 @@ sed -i -e 's|/usr/sbin/kamailio|/usr/sbin/kamailio --atexit=no|' pkg/kamailio/ob %build -ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 export FREERADIUS=1 %endif @@ -1431,29 +1430,29 @@ install -d %{buildroot}%{_sharedstatedir}/kamailio # On RedHat 6 like install -d %{buildroot}%{_var}/run/kamailio install -d %{buildroot}%{_sysconfdir}/rc.d/init.d -install -m755 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.init \ +install -m755 pkg/kamailio/obs/kamailio.init \ %{buildroot}%{_sysconfdir}/rc.d/init.d/kamailio %else # systemd install -d %{buildroot}%{_unitdir} -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.service %{buildroot}%{_unitdir}/kamailio.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf +install -Dpm 0644 pkg/kamailio/obs/kamailio.service %{buildroot}%{_unitdir}/kamailio.service +install -Dpm 0644 pkg/kamailio/obs/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service +install -Dpm 0644 pkg/kamailio/obs/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service +install -Dpm 0644 pkg/kamailio/obs/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf +install -Dpm 0644 pkg/kamailio/obs/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf %endif %if 0%{?suse_version} install -d %{buildroot}%{_fillupdir} -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.sipcapture %else install -d %{buildroot}%{_sysconfdir}/sysconfig -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/sipcapture %endif

1 0

Build failed in Jenkins: kamailio60-nightly-repos » amd64,buster,master #1
by kamailio＠sipwise.com 23 Jan '25

23 Jan '25

See <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> Changes: ------------------------------------------ [...truncated 1.33 KiB...] originally caused by: Started by user Victor Seva Running as SYSTEM Building on the built-in node in workspace <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> [master] $ /bin/sh -xe /tmp/jenkins1711263832817387987.sh + echo * Removing files workspace before copying artifacts from another project. * * Removing files workspace before copying artifacts from another project. * + rm -f ./* Copied 48 artifacts from "kamailio60-nightly-binaries » amd64,buster" build number 1 [master] $ /bin/sh -xe /tmp/jenkins1081858712971152040.sh + /home/admin/kamailio-deb-jenkins/scripts/jdg-repository + set -e + '[' -z /srv/repository/kamailio60-nightly ']' + repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + echo '*** Sourcing /etc/jenkins/debian_glue ***' *** Sourcing /etc/jenkins/debian_glue *** + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio60-nightly ']' + false + '[' '' = true ']' + ARCHITECTURES='amd64 i386 source' + COMPONENTS=main + UDEB_COMPONENTS=main + '[' 1 -gt 1 ']' + '[' 1 -lt 1 ']' + REPOS=buster ++ dpkg --list jenkins-debian-glue ++ awk '/^ii/ {print $3}' + JENKINS_DEBIAN_GLUE_VERSION=0.23.0+0~20240619103048.364~1.gbp807dcd + '[' -n 0.23.0+0~20240619103048.364~1.gbp807dcd ']' + echo '*** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd ***' *** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd *** + '[' -z '' ']' + echo '*** Repository variable DEFAULT_REPOSITORY is unset, using default [] ***' *** Repository variable DEFAULT_REPOSITORY is unset, using default [] *** + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio60-nightly ']' + mkdir -p /srv/repository/kamailio60-nightly/conf ++ id -un + chown jenkins /srv/repository/kamailio60-nightly/conf + touch /srv/repository/kamailio60-nightly/conf/distributions + '[' -z 508EA4C8 ']' ++ id -un + flock --timeout 5 9 + grep -q '^$Codename\|Suite$: buster$' /srv/repository/kamailio60-nightly/conf/distributions + cat + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + '[' -n main ']' + printf 'UDebComponents: main\n' + printf 'Tracking: minimal\n' + '[' -n 508EA4C8 ']' + echo '*** Signing repository with Key ID 508EA4C8 ***' *** Signing repository with Key ID 508EA4C8 *** + printf 'SignWith: 508EA4C8\n' + echo 'Added buster as new codename/repos to the reprepro configuration.' Added buster as new codename/repos to the reprepro configuration. ++ id -un + rm -f /var/lock/jdg-generate-reprepro-codename.jenkins + set -u + umask 022 + PATH=/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin + export QEMU_RESERVED_VA=0x0 + QEMU_RESERVED_VA=0x0 + export TERM=dumb + TERM=dumb ++ date + echo '*** Starting /usr/bin/build-and-provide-package at Thu 23 Jan 2025 09:08:11 AM UTC ***' *** Starting /usr/bin/build-and-provide-package at Thu 23 Jan 2025 09:08:11 AM UTC *** ++ sed -e 's/^$[0-9]*$.*/\1/' + start_seconds=3627106 ++ dpkg --list jenkins-debian-glue ++ awk '/^ii/ {print $3}' + JENKINS_DEBIAN_GLUE_VERSION=0.23.0+0~20240619103048.364~1.gbp807dcd + '[' -n 0.23.0+0~20240619103048.364~1.gbp807dcd ']' + echo '*** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd ***' *** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd *** ++ dpkg --print-architecture + HOST_ARCH=amd64 + '[' -n amd64 ']' + echo '*** Identified host architecture amd64 ***' *** Identified host architecture amd64 *** + trap bailout SIGHUP SIGINT SIGQUIT SIGABRT SIGALRM SIGTERM + checks_and_defaults + '[' -z /srv/repository/kamailio60-nightly ']' + local repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio60-nightly ']' + false + '[' -n '' ']' + '[' -z kamailio60-nightly-repos/architecture=amd64,distribution=buster,label=master ']' + '[' -z amd64 ']' + set_debootstrap + '[' -n '' ']' + '[' amd64 = amd64 ']' + DEBOOTSTRAP=debootstrap + return 0 + '[' -z '' ']' + REPREPRO_OPTS='-v --waitforlock 1000' + echo '*** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 ***' *** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 *** + REPREPRO_CMD=reprepro + '[' -z '' ']' + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio60-nightly ']' + '[' -z '' ']' + PBUILDER_HOOKDIR=/usr/share/jenkins-debian-glue/pbuilder-hookdir/ + '[' -z '' ']' + '[' -z '' ']' + FREIGHT_VARLIB=/var/lib/freight + FREIGHT_VARCACHE=/var/cache/freight + FREIGHT_CONF=/etc/freight.conf + '[' '' = true ']' + clean_workspace ++ pwd + echo '*** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…]>: ***' *** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…]>: *** + ls -la ./ total 12 drwxr-xr-x 3 jenkins jenkins 4096 Jan 23 09:08 . drwxr-xr-x 3 jenkins jenkins 4096 Jan 23 09:08 .. drwxr-xr-x 2 jenkins jenkins 4096 Jan 23 09:08 binaries + identify_package_name + PACKAGE=kamailio60-nightly + PACKAGE=kamailio60-nightly + '[' -n kamailio60-nightly ']' + echo '*** Identified Debian package name kamailio60-nightly ***' *** Identified Debian package name kamailio60-nightly *** + set_base_path + '[' -n binaries/ ']' + echo '*** Using provided binaries/ as BASE_PATH ***' *** Using provided binaries/ as BASE_PATH *** + build_info + '[' -n buster ']' + echo '*** Using supplied repository name buster ***' *** Using supplied repository name buster *** + identify_sourcefile + '[' -n '' ']' + echo '*** Identifying newest package version ***' *** Identifying newest package version *** + newest_version= + for file in "${BASE_PATH}/"*.dsc ++ awk '/^Source: / {print $2}' binaries//kamailio_6.0.0~rc0+bpo10.20250123081832.1.dsc + SOURCE_PACKAGE=kamailio ++ basename binaries//kamailio_6.0.0~rc0+bpo10.20250123081832.1.dsc .dsc + p=kamailio_6.0.0~rc0+bpo10.20250123081832.1 + '[' kamailio_6.0.0~rc0+bpo10.20250123081832.1 = '*' ']' + cur_version=6.0.0~rc0+bpo10.20250123081832.1 + '[' -z '' ']' + newest_version=6.0.0~rc0+bpo10.20250123081832.1 + echo '*** Found package version 6.0.0~rc0+bpo10.20250123081832.1 ***' *** Found package version 6.0.0~rc0+bpo10.20250123081832.1 *** + sourcefile='binaries//kamailio_*6.0.0~rc0+bpo10.20250123081832.1.dsc' + echo '*** Using binaries//kamailio_*6.0.0~rc0+bpo10.20250123081832.1.dsc (version: 6.0.0~rc0+bpo10.20250123081832.1)' *** Using binaries//kamailio_*6.0.0~rc0+bpo10.20250123081832.1.dsc (version: 6.0.0~rc0+bpo10.20250123081832.1) + dist_and_arch_settings + '[' -z amd64 ']' + '[' amd64 = all ']' + arch=amd64 + echo '*** architecture is set to amd64 ***' *** architecture is set to amd64 *** + '[' -n buster ']' + local DIST=buster + '[' -n '' ']' + echo '*** Using cowbuilder base for distribution buster ***' *** Using cowbuilder base for distribution buster *** + COWBUILDER_DIST=buster + '[' -n '' ']' + COWBUILDER_BASE=/var/cache/pbuilder/base-buster-amd64.cow + echo '*** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-buster-amd64.cow as cowbuilder base.cow ***' *** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-buster-amd64.cow as cowbuilder base.cow *** + local lockfiles=/run/lock/buster-amd64 + build_lockfile=/run/lock/buster-amd64.building.2610813 + update_lockfile=/run/lock/buster-amd64.update + update_lockfile_pid=/run/lock/buster-amd64.update.2610813 + '[' -n true ']' + echo '*** Config variable '\''PROVIDE_ONLY'\'' is set, ignoring request to run cowbuilder. ***' *** Config variable 'PROVIDE_ONLY' is set, ignoring request to run cowbuilder. *** + '[' -n '' ']' + deploy_to_releases + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + reprepro_wrapper + '[' -n '' ']' + '[' -d /srv/repository/kamailio60-nightly ']' + '[' -r /srv/repository/kamailio60-nightly/conf/distributions ']' + grep -q '^$Codename\|Suite$: buster$' /srv/repository/kamailio60-nightly/conf/distributions + remove_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_REMOVAL *** + return 0 + remove_missing_binary_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL *** + return 0 + echo '*** Including packages in repository buster ***' *** Including packages in repository buster *** ++ get_arch_changes ++ case ${architecture} in ++ echo amd64 + reprepro -b /srv/repository/kamailio60-nightly -v --waitforlock 1000 --ignore=wrongdistribution --ignore=uploaders --ignore=surprisingbinary include buster <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> Error: packages database contains unused 'bionic|main|amd64' database. This usually means you removed some component, architecture or even a whole distribution from conf/distributions. In that case you most likely want to call reprepro clearvanished to get rid of the databases belonging to those removed parts. (Another reason to get this error is using conf/ and db/ directories belonging to different reprepro repositories). To ignore use --ignore=undefinedtarget. There have been errors! Could not acquire lock: /srv/repository/kamailio60-nightly/db/lockfile already exists! Waiting 10 seconds before trying again. + '[' 255 -eq 0 ']' + bailout 1 'Error: Failed to include binary package in buster repository.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to include binary package in buster repository.' ']' + echo 'Error: Failed to include binary package in buster repository.' Error: Failed to include binary package in buster repository. + rm -f /run/lock/buster-amd64.building.2610813 + '[' -r /run/lock/buster-amd64.update.2610813 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> to avoid problems in next run. *** + rm -f <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> + '[' -n '' ']' + '[' -n '' ']' + '[' -n 3627106 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=10 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Thu 23 Jan 2025 09:08:22 AM UTC [running 10 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Thu 23 Jan 2025 09:08:22 AM UTC [running 10 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints

1 1

git:5.8:b05e8e85: db_unixodbc: fix incompatible-pointer-types warning
by Daniel-Constantin Mierla 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: b05e8e854bde2ef4ac4c40f227e0794f1a6583ff URL: https://github.com/kamailio/kamailio/commit/b05e8e854bde2ef4ac4c40f227e0794… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-23T12:06:18+01:00 db_unixodbc: fix incompatible-pointer-types warning > dbase.c: In function 'db_unixodbc_close_impl': > dbase.c:261:32: error: passing argument 2 of 'db_do_close' from incompatible pointer type [-Wincompatible-pointer-types] > 261 | return db_do_close(_h, db_unixodbc_free_connection); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > | | > | void (*)(struct my_con *) > In file included from val.h:34, > from dbase.c:33: > ../../lib/srdb1/db.h:495:40: note: expected 'void (*)(struct pool_con *)' but argument is of type 'void (*)(struct my_con *)' > 495 | void db_do_close(db1_con_t *_h, void (*free_connection)(struct pool_con *)); > | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > make[2]: *** [../../Makefile.rules:101: dbase.o] Error 1 related #4064 (cherry picked from commit 7f24bc09863220b4c14e2046708c10ff0891c038) --- Modified: src/modules/db_unixodbc/connection.c Modified: src/modules/db_unixodbc/connection.h --- Diff: https://github.com/kamailio/kamailio/commit/b05e8e854bde2ef4ac4c40f227e0794… Patch: https://github.com/kamailio/kamailio/commit/b05e8e854bde2ef4ac4c40f227e0794… --- diff --git a/src/modules/db_unixodbc/connection.c b/src/modules/db_unixodbc/connection.c index 92b1cdb9ecb..d56f2ac37a5 100644 --- a/src/modules/db_unixodbc/connection.c +++ b/src/modules/db_unixodbc/connection.c @@ -179,14 +179,17 @@ struct my_con *db_unixodbc_new_connection(struct db_id *id) /* * Close the connection and release memory */ -void db_unixodbc_free_connection(struct my_con *con) +void db_unixodbc_free_connection(struct pool_con *con) { + struct my_con *_c; + if(!con) return; - SQLFreeHandle(SQL_HANDLE_ENV, con->env); - SQLDisconnect(con->dbc); - SQLFreeHandle(SQL_HANDLE_DBC, con->dbc); - pkg_free(con); + _c = (struct my_con *)con; + SQLFreeHandle(SQL_HANDLE_ENV, _c->env); + SQLDisconnect(_c->dbc); + SQLFreeHandle(SQL_HANDLE_DBC, _c->dbc); + pkg_free(_c); } diff --git a/src/modules/db_unixodbc/connection.h b/src/modules/db_unixodbc/connection.h index d94f0b48e07..a37bb1e3906 100644 --- a/src/modules/db_unixodbc/connection.h +++ b/src/modules/db_unixodbc/connection.h @@ -83,7 +83,7 @@ struct my_con *db_unixodbc_new_connection(struct db_id *id); /* * Close the connection and release memory */ -void db_unixodbc_free_connection(struct my_con *con); +void db_unixodbc_free_connection(struct pool_con *con); char *db_unixodbc_build_conn_str(const struct db_id *id, char *buf);

1 0

git:master:640bd4fb: cmake: Fix naming to be clear we want the CLIENT version
by Xenofon Karamanos 23 Jan '25

23 Jan '25

Module: kamailio Branch: master Commit: 640bd4fb7529ad8b0a9415775679dca5e64c52be URL: https://github.com/kamailio/kamailio/commit/640bd4fb7529ad8b0a9415775679dca… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-23T10:56:49Z cmake: Fix naming to be clear we want the CLIENT version --- Added: cmake/modules/FindLibfreeradiusClient.cmake Modified: cmake/modules/FindRadius.cmake Removed: cmake/modules/FindLibfreeradius.cmake --- Diff: https://github.com/kamailio/kamailio/commit/640bd4fb7529ad8b0a9415775679dca… Patch: https://github.com/kamailio/kamailio/commit/640bd4fb7529ad8b0a9415775679dca…

1 0

git:master:3198b66a: core: more checks for extract_candidate()
by Daniel-Constantin Mierla 23 Jan '25

23 Jan '25

Module: kamailio Branch: master Commit: 3198b66aa5dbda1c6a03f46a610073671cbd5157 URL: https://github.com/kamailio/kamailio/commit/3198b66aa5dbda1c6a03f46a6100736… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-23T11:52:29+01:00 core: more checks for extract_candidate() --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/3198b66aa5dbda1c6a03f46a6100736… Patch: https://github.com/kamailio/kamailio/commit/3198b66aa5dbda1c6a03f46a6100736… --- 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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev