sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
242 discussions

git:5.7:bf40176e: core/rthreads.h: use global ksr_tls_threads_mode to constrain thread

by Victor Seva

Module: kamailio Branch: 5.7 Commit: bf40176e34e869b567a0f36eab28739508797080 URL: https://github.com/kamailio/kamailio/commit/bf40176e34e869b567a0f36eab28739… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-12T07:52:26+01:00 core/rthreads.h: use global ksr_tls_threads_mode to constrain thread wrapping - 0: run wrapped function directly - 1: run wrapped function in thread for process#0 else run directly - 2: always run wrapped function in thread --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/bf40176e34e869b567a0f36eab28739… Patch: https://github.com/kamailio/kamailio/commit/bf40176e34e869b567a0f36eab28739… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index fa60ccef071..e96f45c9395 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -27,6 +27,7 @@ */ #include <pthread.h> +#include "./globals.h" /* * prototype: void *fn(void *arg) { ... } */ @@ -39,9 +40,11 @@ static void *run_threadP(_thread_proto fn, void *arg) pthread_t tid; void *ret; - if(likely(process_no)) { + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg); } + pthread_create(&tid, NULL, fn, arg); pthread_join(tid, &ret); @@ -73,7 +76,9 @@ static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) #ifdef USE_TLS pthread_t tid; void *ret; - if(likely(process_no)) { + + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2); } @@ -84,7 +89,7 @@ static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) return ret; #else return fn(arg1, arg2); -#endif /* USE_TLS */ +#endif } #endif @@ -107,18 +112,19 @@ static void run_threadV(_thread_protoV fn) { #ifdef USE_TLS pthread_t tid; - if(likely(process_no)) { + + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { fn(); return; } - pthread_create(&tid, NULL, (_thread_proto)run_thread_wrapV, &(struct _thread_argsV){fn}); pthread_join(tid, NULL); #else fn(); -#endif /* USE_TLS */ +#endif } #endif @@ -146,10 +152,10 @@ static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2) pthread_t tid; int ret; - if(likely(process_no)) { + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2); } - pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4PP, &(struct _thread_args4PP){fn, arg1, arg2, &ret}); pthread_join(tid, NULL); @@ -182,17 +188,17 @@ static void run_thread0P(_thread_proto0P fn, void *arg1) #ifdef USE_TLS pthread_t tid; - if(likely(process_no)) { + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { fn(arg1); return; } - pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap0P, &(struct _thread_args0P){fn, arg1}); pthread_join(tid, NULL); #else - fn(arg1); -#endif /* USE_TLS */ + fn(arg1) +#endif } #endif @@ -234,7 +240,8 @@ static int run_thread4P5I2P2(_thread_proto4P5I2P2 fn, void *arg1, void *arg2, pthread_t tid; int ret; - if(likely(process_no)) { + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); } pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4P5I2P2,

9 months, 2 weeks

git:5.7:3697d763: core: added tls_threads_mode global parameter

by Victor Seva

Module: kamailio Branch: 5.7 Commit: 3697d763e340b7e88532a8b1920b0088c08fbc72 URL: https://github.com/kamailio/kamailio/commit/3697d763e340b7e88532a8b1920b008… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-12T07:52:26+01:00 core: added tls_threads_mode global parameter - control how to execute functions that may be using libssl3 behind --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/3697d763e340b7e88532a8b1920b008… Patch: https://github.com/kamailio/kamailio/commit/3697d763e340b7e88532a8b1920b008… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 82278d5447a..d342aa5143d 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -439,6 +439,7 @@ TCP_WAIT_DATA "tcp_wait_data" TCP_SCRIPT_MODE "tcp_script_mode" DISABLE_TLS "disable_tls"|"tls_disable" ENABLE_TLS "enable_tls"|"tls_enable" +TLS_THREADS_MODE "tls_threads_mode" TLSLOG "tlslog"|"tls_log" TLS_PORT_NO "tls_port_no" TLS_METHOD "tls_method" @@ -953,6 +954,7 @@ IMPORTFILE "import_file" <INITIAL>{TCP_SCRIPT_MODE} { count(); yylval.strval=yytext; return TCP_SCRIPT_MODE; } <INITIAL>{DISABLE_TLS} { count(); yylval.strval=yytext; return DISABLE_TLS; } <INITIAL>{ENABLE_TLS} { count(); yylval.strval=yytext; return ENABLE_TLS; } +<INITIAL>{TLS_THREADS_MODE} { count(); yylval.strval=yytext; return TLS_THREADS_MODE; } <INITIAL>{TLSLOG} { count(); yylval.strval=yytext; return TLS_PORT_NO; } <INITIAL>{TLS_PORT_NO} { count(); yylval.strval=yytext; return TLS_PORT_NO; } <INITIAL>{TLS_METHOD} { count(); yylval.strval=yytext; return TLS_METHOD; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 1f2ad7fb3fa..412fe5dece4 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -469,6 +469,7 @@ extern char *default_routename; %token TCP_SCRIPT_MODE %token DISABLE_TLS %token ENABLE_TLS +%token TLS_THREADS_MODE %token TLSLOG %token TLS_PORT_NO %token TLS_METHOD @@ -1440,6 +1441,14 @@ assign_stm: #endif } | ENABLE_TLS EQUAL error { yyerror("boolean value expected"); } + | TLS_THREADS_MODE EQUAL NUMBER { + #ifdef USE_TLS + ksr_tls_threads_mode = $3; + #else + warn("tls support not compiled in"); + #endif + } + | TLS_THREADS_MODE EQUAL error { yyerror("int value expected"); } | TLSLOG EQUAL NUMBER { #ifdef CORE_TLS tls_log=$3; diff --git a/src/core/globals.h b/src/core/globals.h index 207205c9957..0487a3114eb 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -108,6 +108,7 @@ extern int ksr_tcp_script_mode; #ifdef USE_TLS extern int tls_disable; extern unsigned short tls_port_no; +extern int ksr_tls_threads_mode; #endif #ifdef USE_SCTP extern int sctp_disable; diff --git a/src/main.c b/src/main.c index 8e34285fde2..f7cb643ea34 100644 --- a/src/main.c +++ b/src/main.c @@ -326,8 +326,9 @@ int tcp_disable = 0; /* 1 if tcp is disabled */ int tls_disable = 0; /* tls enabled by default */ #else int tls_disable = 1; /* tls disabled by default */ -#endif /* CORE_TLS */ -#endif /* USE_TLS */ +#endif /* CORE_TLS */ +int ksr_tls_threads_mode = 0; /* threads execution mode for tls with libssl */ +#endif /* USE_TLS */ #ifdef USE_SCTP int sctp_children_no = 0; int sctp_disable = 2; /* 1 if sctp is disabled, 2 if auto mode, 0 enabled */

9 months, 2 weeks

[kamailio/kamailio] Restore libssl default behaviour on stable; opt-in to libssl thread-guards required (PR #3754)

by space88man

#### 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) - [X] 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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This PR restores the default behaviour of stable branch and makes libssl thread-guard work opt-in. - user's config from 5.7.3 will run unchanged - backport tls_threads_mode = 0|1|2 from dev; user must explicitly opt-in to libssl changes Scenario 1: user does not change 5.7.3 configuration; then libssl thread-guards will be disabled and Kamailio will run as before Scenario 2: user must opt-in to libssl thread-guards; `tls_threads_mode` has been backported from dev and user must use `tls_threads_mode = 1` in the configuration. The default value is `tls_threads_mode = 0` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3754 -- Commit Summary -- * core: added tls_threads_mode global parameter * core/rthreads.h: use global ksr_tls_threads_mode to constrain thread * Sample etc/kamailio.cfg: global var tls_threads_mode * tls: restore default to bypass thread guards -- File Changes -- M etc/kamailio.cfg (17) M src/core/cfg.lex (2) M src/core/cfg.y (9) M src/core/globals.h (1) M src/core/rthreads.h (33) M src/main.c (5) M src/modules/tls/tls_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3754.patch https://github.com/kamailio/kamailio/pull/3754.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3754 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3754(a)github.com>

9 months, 2 weeks

[kamailio/kamailio] new ims dialogue is not created (Issue #3676)

by deepak-git-account

### Description While doing a call, new dialogue is not created in PCSCF. RX feature is on. As per my understanding, ims_dialog has one call back function and it invokes dlg_onreq() function and a new dialgue can be created (function is dlg_new_dialog). And in the traces, that is not happening.  ### Troubleshooting I have added additional traces for troubleshooting, and I can see that in case of PCSCF, new dialog is not created. And later on Rx feature is not working as expected. #### Reproduction Everytime  Need to do Two UEs VoLTE registration and then a call from UE1 to UE2 #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ![image](https://github.com/kamailio/kamailio/assets/64190746/9e41f486-61ad-4974-bd1c-b57a1602c57f) ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` root@openims-node-focal:/usr/local/etc/kamailio# kamailio -v version: kamailio 5.7.2 (x86_64/linux) 02958e 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: 02958e compiled on 18:07:29 Oct 17 2023 with gcc 9.4.0 * **Operating System**: ubuntu uname -a Linux openims-node-focal 5.4.0-166-generic #183-Ubuntu SMP Mon Oct 2 11:28:33 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3676 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3676(a)github.com>

9 months, 2 weeks

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,jammy #2597

by kamailio＠sipwise.com

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

9 months, 2 weeks

git:master:f2772bd0: influxdbc: function to add double value as divison of int numbers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f2772bd0248a1e75a82f4cad55280fa2b4f98578 URL: https://github.com/kamailio/kamailio/commit/f2772bd0248a1e75a82f4cad55280fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-10T22:28:26+01:00 influxdbc: function to add double value as divison of int numbers --- Modified: src/modules/influxdbc/influxdbc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f2772bd0248a1e75a82f4cad55280fa… Patch: https://github.com/kamailio/kamailio/commit/f2772bd0248a1e75a82f4cad55280fa… --- diff --git a/src/modules/influxdbc/influxdbc_mod.c b/src/modules/influxdbc/influxdbc_mod.c index 90f6107ac68..5261b5ea5c4 100644 --- a/src/modules/influxdbc/influxdbc_mod.c +++ b/src/modules/influxdbc/influxdbc_mod.c @@ -53,6 +53,8 @@ static int w_influxdbc_push(sip_msg_t *msg, char *p1, char *p2); static int w_influxdbc_long(sip_msg_t *msg, char *pname, char *pvalue); static int w_influxdbc_string(sip_msg_t *msg, char *pname, char *pvalue); static int w_influxdbc_double(sip_msg_t *msg, char *pname, char *pvalue); +static int w_influxdbc_division( + sip_msg_t *msg, char *pname, char *pdividend, char *pdivisor); static int mod_init(void); static int child_init(int); @@ -76,6 +78,8 @@ static cmd_export_t cmds[] = { 2, fixup_spve_spve, 0, ANY_ROUTE}, {"influxdbc_double", (cmd_function)w_influxdbc_double, 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"influxdbc_division", (cmd_function)w_influxdbc_division, + 3, fixup_sii, fixup_free_sii, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -323,6 +327,38 @@ static int w_influxdbc_double(sip_msg_t *msg, char *pname, char *pvalue) } +/** + * + */ +static int w_influxdbc_division( + sip_msg_t *msg, char *pname, char *pdividend, char *pdivisor) +{ + str sname; + int idividend; + int idivisor; + + if(fixup_get_svalue(msg, (gparam_t *)pname, &sname) != 0) { + LM_ERR("unable to get name parameter\n"); + return -1; + } + if(fixup_get_ivalue(msg, (gparam_t *)pdividend, &idividend) != 0) { + LM_ERR("unable to get dividend parameter\n"); + return -1; + } + if(fixup_get_ivalue(msg, (gparam_t *)pdivisor, &idivisor) != 0) { + LM_ERR("unable to get divisor parameter\n"); + return -1; + } + if(idivisor == 0) { + ic_double(sname.s, 0.0); + return 1; + } + + ic_double(sname.s, (double)idividend / (double)idivisor); + + return 1; +} + /** * */

9 months, 2 weeks

git:master:ce437384: core: helper fixup functions for (str, str, int) parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ce437384ce13bb78b01d3d18f9ddfdd6b8e37fa5 URL: https://github.com/kamailio/kamailio/commit/ce437384ce13bb78b01d3d18f9ddfdd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-10T22:28:26+01:00 core: helper fixup functions for (str, str, int) parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/ce437384ce13bb78b01d3d18f9ddfdd… Patch: https://github.com/kamailio/kamailio/commit/ce437384ce13bb78b01d3d18f9ddfdd… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index ecd870c0ca5..10be560982f 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -843,6 +843,38 @@ int fixup_free_ssi(void **param, int param_no) } } +/** + * + */ +int fixup_sii(void **param, int param_no) +{ + switch(param_no) { + case 1: + return fixup_spve_null(param, 1); + case 2: + case 3: + return fixup_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_sii(void **param, int param_no) +{ + switch(param_no) { + case 1: + return fixup_free_spve_null(param, 1); + case 2: + case 3: + return fixup_free_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index a76d64f0ce7..3143f060426 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -168,6 +168,9 @@ int fixup_free_igp_regexp(void **param, int param_no); int fixup_ssi(void **param, int param_no); int fixup_free_ssi(void **param, int param_no); +int fixup_sii(void **param, int param_no); +int fixup_free_sii(void **param, int param_no); + int fixup_sssi(void **param, int param_no); int fixup_free_sssi(void **param, int param_no);

9 months, 2 weeks

[kamailio/kamailio] [pua] reginfo_increase_version does nothing (Issue #3234)

by Matteo

9 months, 3 weeks

[kamailio/kamailio] file_out: Add support for extensions and interval per file. (PR #3750)

by Xenofon Karamanos

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR updates `file_out` module to support the definition of extension and interval on a per-file basis. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3750 -- Commit Summary -- * file_out: Add support for multiple files, extensions and interval * file_out: Update docs -- File Changes -- M src/modules/file_out/doc/file_out_admin.xml (117) M src/modules/file_out/file_out.c (164) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3750.patch https://github.com/kamailio/kamailio/pull/3750.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3750 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3750(a)github.com>

9 months, 3 weeks

git:master:44fcca35: file_out: Update docs

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 44fcca3596438841c0752d39dedfbe7de07a30c5 URL: https://github.com/kamailio/kamailio/commit/44fcca3596438841c0752d39dedfbe7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-02-09T16:20:08+02:00 file_out: Update docs --- Modified: src/modules/file_out/doc/file_out_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/44fcca3596438841c0752d39dedfbe7… Patch: https://github.com/kamailio/kamailio/commit/44fcca3596438841c0752d39dedfbe7…

9 months, 3 weeks

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2024