sr-dev February 2025

sr-dev@lists.kamailio.org

9 participants
169 discussions

git:master:1f3b4505: dialplan: cmake - add pcre2
by Henning Westerholt 25 Feb '25

25 Feb '25

Module: kamailio Branch: master Commit: 1f3b45056caf298062c6fbe683660ac6c158331a URL: https://github.com/kamailio/kamailio/commit/1f3b45056caf298062c6fbe683660ac… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-02-25T11:50:31+01:00 dialplan: cmake - add pcre2 --- Modified: src/modules/dialplan/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/1f3b45056caf298062c6fbe683660ac… Patch: https://github.com/kamailio/kamailio/commit/1f3b45056caf298062c6fbe683660ac… --- diff --git a/src/modules/dialplan/CMakeLists.txt b/src/modules/dialplan/CMakeLists.txt index 9c8de963961..9d716f3ebb0 100644 --- a/src/modules/dialplan/CMakeLists.txt +++ b/src/modules/dialplan/CMakeLists.txt @@ -1,3 +1,14 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) + +find_package(pcre2 QUIET) +if(NOT pcre2_FOUND) + message(STATUS "PCRE2 library not found... looking with pkg-config") + find_package(PkgConfig REQUIRED) + # TODO: verify we want 8-bit libpcre2 + pkg_check_modules(pcre2 REQUIRED IMPORTED_TARGET libpcre2-8) + add_library(PCRE2::8BIT ALIAS PkgConfig::pcre2) +endif() + +target_link_libraries(${module_name} PRIVATE PCRE2::8BIT)

1 0

git:master:41b2cba7: sctp: cmake - search for libsctp on linux only
by Henning Westerholt 25 Feb '25

25 Feb '25

Module: kamailio Branch: master Commit: 41b2cba74a9fff204b2cc671670073d008b3c6b1 URL: https://github.com/kamailio/kamailio/commit/41b2cba74a9fff204b2cc671670073d… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-02-25T11:50:31+01:00 sctp: cmake - search for libsctp on linux only --- Modified: src/modules/sctp/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/41b2cba74a9fff204b2cc671670073d… Patch: https://github.com/kamailio/kamailio/commit/41b2cba74a9fff204b2cc671670073d… --- diff --git a/src/modules/sctp/CMakeLists.txt b/src/modules/sctp/CMakeLists.txt index 22e51fd7c08..0913855cb22 100644 --- a/src/modules/sctp/CMakeLists.txt +++ b/src/modules/sctp/CMakeLists.txt @@ -14,11 +14,11 @@ endif() target_include_directories(${module_name} PRIVATE ${SCTP_INCLUDE_DIR}) -find_library( - SCTP_LIBRARY - NAMES sctp - PATHS /usr/lib /usr/local/lib) +if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + find_library( + SCTP_LIBRARY + NAMES sctp + PATHS /usr/lib /usr/local/lib) -if(UNIX) target_link_libraries(${module_name} PRIVATE ${SCTP_LIBRARY}) endif()

1 0

git:master:11a609d0: lib/ims: libxml2 is not needed - removed from cmake
by Henning Westerholt 25 Feb '25

25 Feb '25

Module: kamailio Branch: master Commit: 11a609d06b527470c535a20866c48cafdedcb820 URL: https://github.com/kamailio/kamailio/commit/11a609d06b527470c535a20866c48ca… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-02-25T11:50:31+01:00 lib/ims: libxml2 is not needed - removed from cmake --- Modified: src/lib/ims/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/11a609d06b527470c535a20866c48ca… Patch: https://github.com/kamailio/kamailio/commit/11a609d06b527470c535a20866c48ca… --- diff --git a/src/lib/ims/CMakeLists.txt b/src/lib/ims/CMakeLists.txt index a501df57c48..914a09b9eab 100644 --- a/src/lib/ims/CMakeLists.txt +++ b/src/lib/ims/CMakeLists.txt @@ -1,4 +1,2 @@ -find_package(LibXml2 REQUIRED) - file(GLOB SRC_FILES "*.c") target_sources(kamailio PUBLIC ${SRC_FILES})

1 0

git:master:29e51c13: misc/examples: update default webrtc cfg to current main kamailio.cfg state
by Henning Westerholt 25 Feb '25

25 Feb '25

Module: kamailio Branch: master Commit: 29e51c139725a58b2cbe9cfe409a1c62b3904a3e URL: https://github.com/kamailio/kamailio/commit/29e51c139725a58b2cbe9cfe409a1c6… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-02-25T10:37:34Z misc/examples: update default webrtc cfg to current main kamailio.cfg state --- Modified: misc/examples/webrtc/kamailio-default-websocket.cfg --- Diff: https://github.com/kamailio/kamailio/commit/29e51c139725a58b2cbe9cfe409a1c6… Patch: https://github.com/kamailio/kamailio/commit/29e51c139725a58b2cbe9cfe409a1c6…

1 0

git:master:3b28e015: kamailio.cfg: small whitespace indention fix
by Henning Westerholt 25 Feb '25

25 Feb '25

Module: kamailio Branch: master Commit: 3b28e0151d15e7883c0ce81e63851fd9952dd2db URL: https://github.com/kamailio/kamailio/commit/3b28e0151d15e7883c0ce81e63851fd… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-02-25T10:32:40Z kamailio.cfg: small whitespace indention fix --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/3b28e0151d15e7883c0ce81e63851fd… Patch: https://github.com/kamailio/kamailio/commit/3b28e0151d15e7883c0ce81e63851fd… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index a9b675b6bd9..4cdd0091cb3 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1016,7 +1016,7 @@ event_route[xhttp:request] { xhttp_reply("200", "OK", "text/html", "<html><body>Wrong URL $hu</body></html>"); - exit; + exit; } #!endif

1 0

git:master:4f573561: kamailio.cfg: small whitespace indention fix, spelling fix
by Henning Westerholt 25 Feb '25

25 Feb '25

Module: kamailio Branch: master Commit: 4f573561797b297131464699bd1ed6f0b5d7ed75 URL: https://github.com/kamailio/kamailio/commit/4f573561797b297131464699bd1ed6f… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-02-25T09:29:37Z kamailio.cfg: small whitespace indention fix, spelling fix --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/4f573561797b297131464699bd1ed6f… Patch: https://github.com/kamailio/kamailio/commit/4f573561797b297131464699bd1ed6f… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index a46f5734bfc..a9b675b6bd9 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -157,13 +157,13 @@ import_file "kamailio-local.cfg" #!endif # - flags -# FLT_ - per transaction (message) flags +# FLT_ - per transaction (message) flags #!define FLT_ACC 1 #!define FLT_ACCMISSED 2 #!define FLT_ACCFAILED 3 #!define FLT_NATS 5 -# FLB_ - per branch flags +# FLB_ - per branch flags #!define FLB_NATB 6 #!define FLB_NATSIPPING 7 @@ -192,7 +192,7 @@ children=8 # tcp_children=8 /* UDP receiving mode: - * - 0: multi-process (defaut) + * - 0: multi-process (default) * - 1: multi-threaded with async worker group 'udp' * - 2: per socket configuration (see core cookbook) */ # async_workers_group="name=udp;workers=8"

1 0

git:master:6cdbaa18: ims_dialog: right timer function prototype for print_all_dlgs()
by Daniel-Constantin Mierla 24 Feb '25

24 Feb '25

Module: kamailio Branch: master Commit: 6cdbaa1815bdcadc467f36109c6e3a7d00c344f5 URL: https://github.com/kamailio/kamailio/commit/6cdbaa1815bdcadc467f36109c6e3a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-24T12:30:26+01:00 ims_dialog: right timer function prototype for print_all_dlgs() --- Modified: src/modules/ims_dialog/dlg_handlers.c Modified: src/modules/ims_dialog/dlg_handlers.h --- Diff: https://github.com/kamailio/kamailio/commit/6cdbaa1815bdcadc467f36109c6e3a7… Patch: https://github.com/kamailio/kamailio/commit/6cdbaa1815bdcadc467f36109c6e3a7… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index 3487d7f4c2a..4acc5c3ad45 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -2048,7 +2048,7 @@ void internal_print_all_dlg(struct dlg_cell *dlg) * \return void */ -void print_all_dlgs() +void print_all_dlgs(unsigned int ticks, void *param) { //print all dialog information - this is just for testing and is set to happen every 10 seconds diff --git a/src/modules/ims_dialog/dlg_handlers.h b/src/modules/ims_dialog/dlg_handlers.h index fd8ef143352..5aafb054b18 100644 --- a/src/modules/ims_dialog/dlg_handlers.h +++ b/src/modules/ims_dialog/dlg_handlers.h @@ -196,7 +196,7 @@ void dlg_tmcb_dummy(struct cell *t, int type, struct tmcb_params *param); * \return void */ -void print_all_dlgs(); +void print_all_dlgs(unsigned int ticks, void *param); /*! * \brief Helper function that prints all the properties of a dialog including all the dlg_out's

1 0

[kamailio/kamailio] sl: doesn't handle 1xx_replies while metric exists (Issue #4144)
by Boris Korzun 24 Feb '25

24 Feb '25

### Description There're `1xx_replies` metric in `sl` module. But the metric doesn't work. ### Troubleshooting There're no handle in `void update_sl_stats(int code)`. https://github.com/kamailio/kamailio/blob/f37940b9a113ab79611f851334af7f8fb… ### Proposal Remove `1xx_replies` from `sl` module. Or add the handling. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4144 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4144(a)github.com>

2 2

git:master:f43c132d: sl: stats for 1xx replies
by Daniel-Constantin Mierla 24 Feb '25

24 Feb '25

Module: kamailio Branch: master Commit: f43c132db9b1dc71f623d592fb46d487ba492c7d URL: https://github.com/kamailio/kamailio/commit/f43c132db9b1dc71f623d592fb46d48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-24T09:57:38+01:00 sl: stats for 1xx replies - GH #4144 --- Modified: src/modules/sl/sl_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/f43c132db9b1dc71f623d592fb46d48… Patch: https://github.com/kamailio/kamailio/commit/f43c132db9b1dc71f623d592fb46d48… --- diff --git a/src/modules/sl/sl_stats.c b/src/modules/sl/sl_stats.c index 3394e0251f0..8e8c835c23b 100644 --- a/src/modules/sl/sl_stats.c +++ b/src/modules/sl/sl_stats.c @@ -148,7 +148,7 @@ void update_sl_stats(int code) my_stats = &(*sl_stats)[process_no]; - if(code >= 700 || code < 200) { + if(code >= 700 || code < 100) { my_stats->err[RT_xxx]++; } else if(code >= 600) { my_stats->err[RT_6xx]++; @@ -203,7 +203,7 @@ void update_sl_stats(int code) my_stats->err[RT_3xx]++; break; } - } else { /* 2xx */ + } else if(code >= 200) { switch(code) { case 200: my_stats->err[RT_200]++; @@ -215,6 +215,8 @@ void update_sl_stats(int code) my_stats->err[RT_2xx]++; break; } + } else { /* 1xx */ + my_stats->err[RT_1xx]++; } }

1 0

[kamailio/kamailio] SEGV in dialog module (PR #4151)
by Dennis 24 Feb '25

24 Feb '25

Fixes for SEGV in dialog module.   #### 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 Hi ! The problem - periodically, 2-3 times in а month, kamailio dumps core with SEGV. Different OS versions (Ubuntu 18,20,22), different kamailio versions from 5.7.1 up to 5.8.4, high call load, python kemi, actively used dialog module. Analyzing core files shows more or less the same picture - SEGV happends in dialog mododule around the dialog vars, can be in rpc call (dlg.list), in destroy dlg, in accessing dlg variable. Backtrace can look like: ``` Core was generated by `/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg'. Program terminated with signal SIGSEGV, Segmentation fault. #0 get_dlg_variable_unsafe (dlg=dlg@entry=0x7fa2818849b8, key=key@entry=0x7ffe67990d68) at dlg_var.c:236 236 dlg_var.c: No such file or directory. (gdb) bt full #0 get_dlg_variable_unsafe (dlg=dlg@entry=0x7fa2818849b8, key=key@entry=0x7ffe67990d68) at dlg_var.c:236 var = 0x8 var_list = <optimized out> #1 0x00007fa2a2ce0397 in get_dlg_varref (dlg=dlg@entry=0x7fa2818849b8, key=key@entry=0x7ffe67990d68) at dlg_var.c:297 var = 0x0 __func__ = "get_dlg_varref" #2 0x00007fa2a2ccd429 in ki_dlg_var_get_mode (msg=<optimized out>, name=0x7ffe67990d68, rmode=0) at dialog.c:2462 dlg = 0x7fa2818849b8 pval = <optimized out> #3 0x000055e2d5b87cbb in sr_kemi_exec_func (ket=ket@entry=0x7fa2a2d0c0c0 <sr_kemi_dialog_exports+1728>, msg=msg@entry=0x7fa2a34577c0, pno=pno@entry=1, vps=vps@entry=0x7ffe67990d60) at core/kemiexec.c:82 ret = <optimized out> __func__ = "sr_kemi_exec_func" #4 0x00007fa2a2930376 in sr_apy_kemi_exec_func_ex (ket=ket@entry=0x7fa2a2d0c0c0 <sr_kemi_dialog_exports+1728>, self=self@entry=0x7fa280ce2b80, args=args@entry=0x7fa2804ba3a0, idx=idx@entry=485) at apy_kemi.c:327 fname = <optimized out> i = <optimized out> ret = <optimized out> vps = {{vtype = 2, v = {n = -2142122656, l = 140335914274144, s = {s = 0x7fa28051cd60 "rtpe_setid", len = 10}, dict = 0x7fa28051cd60}}, {vtype = 0, v = {n = 0, l = 0, s = {s = 0x0, len = 0}, dict = 0x0}}, {vtype = 0, v = { n = 0, l = 0, s = {s = 0x0, len = 0}, dict = 0x0}}, {vtype = 0, v = {n = 0, l = 0, s = {s = 0x0, len = 0}, dict = 0x0}}, {vtype = 0, v = {n = 0, l = 0, s = {s = 0x0, len = 0}, dict = 0x0}}, {vtype = 0, v = {n = 0, l = 0, s = {s = 0x0, len = 0}, dict = 0x0}}} env_P = <optimized out> lmsg = 0x7fa2a34577c0 xret = <optimized out> slen = 10 alen = 1 pobj = <optimized out> __func__ = "sr_apy_kemi_exec_func_ex" #5 0x00007fa2a2931f45 in sr_apy_kemi_exec_func (self=0x7fa280ce2b80, args=0x7fa2804ba3a0, idx=485) at apy_kemi.c:356 ket = 0x7fa2a2d0c0c0 <sr_kemi_dialog_exports+1728> ret = 0x0 pstate = 0x0 pframe = 0x0 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = 2, tz_dsttime = 0} tdiff = <optimized out> __func__ = "sr_apy_kemi_exec_func" #6 0x00007fa2a266f697 in ?? () from /lib/x86_64-linux-gnu/libpython3.8.so.1.0 ``` Inspecting dlg vars, the chain look like this: ``` (gdb) frame 0 #0 get_dlg_variable_unsafe (dlg=dlg@entry=0x7fa2818849b8, key=key@entry=0x7ffe67990d68) at dlg_var.c:236 236 in dlg_var.c (gdb) p *dlg.vars $1 = {key = {s = 0x7fa2833ea040 "mos", len = 3}, value = {s = 0x7fa2833ea0b0 "4.3", len = 3}, vflags = 1, next = 0x7fa2825fa3d0} (gdb) p *$.next $2 = {key = {s = 0x7fa200332e34 <error: Cannot access memory at address 0x7fa200332e34>, len = -1061109568}, value = {s = 0xabcdefed <error: Cannot access memory at address 0xabcdefed>, len = 49}, vflags = 1, next = 0x8} (gdb) ``` Additionaly, inspecting logs i found that this is happends in SIP race conditions, f.e. when caller and calle sends BYE at the same time and kamailio processing two different transactions of same dialog in two different workers, so present some competition from identical scenarios. Long time i can't reproduce this in lab, until insert an artificial delay into the scenario which process BYE request to increase competition. This code quickly causes SEGV in race conditions with BYE: ``` #kemi get/set dlg var while time.time()-start < 0.5: for i in ('bbb','ccc'): dlgvar=KSR.dialog.var_get(i) KSR.dialog.var_sets(i,str(random.randint(1,500000))) ``` SEGV not fire if i change dialog var_get/set to kamscript variant: ``` while time.time()-start < 0.5: for i in ('bbb','ccc'): dlgvar=KSR.pv.get(f"$dlg_var({i})") KSR.pv.sets(f"$dlg_var({i})", str(random.randint(1,500000))) ``` By analyzing source i found some places which are not properly covered by locks, and some dangerous places where direct pointer to dialog var structure used, which can change in concurrent process, so in first case i insert the locks, in second - it is better to use the clone of variable in private PV buffer. Also found some mistakes with dialog flags, which can potentionaly affect DMQ and DB dialog behavior. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4151 -- Commit Summary -- * dialog: covering by locks accessing/changing variables in kemi functions -- File Changes -- M src/modules/dialog/dialog.c (36) M src/modules/dialog/dlg_hash.h (2) M src/modules/dialog/dlg_var.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4151.patch https://github.com/kamailio/kamailio/pull/4151.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4151 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4151(a)github.com>

3 7

← Newer
1
2
3
4
5
6
7
8
9
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2025