sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
301 discussions

git:master:8cbe99cf: cmake: Splt compiler flag into seperate library to reuse with utils.
by Xenofon Karamanos 07 Jan '25

07 Jan '25

Module: kamailio Branch: master Commit: 8cbe99cf081a5948a9b032bf51e846120d780e92 URL: https://github.com/kamailio/kamailio/commit/8cbe99cf081a5948a9b032bf51e8461… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-07T13:30:59Z cmake: Splt compiler flag into seperate library to reuse with utils. - Add common_compiler_flags INTERFACE library for common compiler flags - Introduce new INTERFACE common_utils used in src/utils/*. - Link compiler flags to common and common_utils - CMake lint --- Added: cmake/utils.cmake Added: utils/CMakeLists.txt Modified: CMakeLists.txt Modified: cmake/compiler-specific.cmake Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/8cbe99cf081a5948a9b032bf51e8461… Patch: https://github.com/kamailio/kamailio/commit/8cbe99cf081a5948a9b032bf51e8461…

1 0

git:master:eb32feab: cmake: Remove duplicate inclusion of defs.cmake
by Xenofon Karamanos 07 Jan '25

07 Jan '25

Module: kamailio Branch: master Commit: eb32feab9c50879117e0ecb5bd8c13c8ac301623 URL: https://github.com/kamailio/kamailio/commit/eb32feab9c50879117e0ecb5bd8c13c… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-07T13:51:00Z cmake: Remove duplicate inclusion of defs.cmake --- Modified: src/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/eb32feab9c50879117e0ecb5bd8c13c… Patch: https://github.com/kamailio/kamailio/commit/eb32feab9c50879117e0ecb5bd8c13c… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 119f320230d..79fccd59821 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,8 +19,6 @@ message(STATUS "CMAKE_C_COMPILER_VERSION: ${CMAKE_C_COMPILER_VERSION}") find_package(Threads REQUIRED) -include(${CMAKE_SOURCE_DIR}/cmake/defs.cmake) - # ----------------------- # The following produces core/autover.h Find Git option(USE_GIT "Use git to get commit information" ON)

1 0

git:master:03f47c7e: cmake/utils: Fix compile_definition instead of option
by Xenofon Karamanos 07 Jan '25

07 Jan '25

Module: kamailio Branch: master Commit: 03f47c7e5b198a0e1be946ca8219fc978f6f54a1 URL: https://github.com/kamailio/kamailio/commit/03f47c7e5b198a0e1be946ca8219fc9… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-07T13:47:30Z cmake/utils: Fix compile_definition instead of option --- Modified: cmake/utils.cmake --- Diff: https://github.com/kamailio/kamailio/commit/03f47c7e5b198a0e1be946ca8219fc9… Patch: https://github.com/kamailio/kamailio/commit/03f47c7e5b198a0e1be946ca8219fc9… --- diff --git a/cmake/utils.cmake b/cmake/utils.cmake index a759fffa460..fdc41a3fc58 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -1,3 +1,3 @@ set(UTIL_NAME "${NAME}") -target_compile_options(${NAME} PRIVATE MOD_NAME="utils/${UTIL_NAME}") +target_compile_definitions(${NAME} PRIVATE MOD_NAME="utils/${UTIL_NAME}")

1 0

git:master:ada0a4c2: cmake/kamcmd: Link if found
by Xenofon Karamanos 07 Jan '25

07 Jan '25

Module: kamailio Branch: master Commit: ada0a4c24700c3eead0217dd1e9794aee9655347 URL: https://github.com/kamailio/kamailio/commit/ada0a4c24700c3eead0217dd1e9794a… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-07T13:46:48Z cmake/kamcmd: Link if found --- Modified: utils/kamcmd/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/ada0a4c24700c3eead0217dd1e9794a… Patch: https://github.com/kamailio/kamailio/commit/ada0a4c24700c3eead0217dd1e9794a… --- diff --git a/utils/kamcmd/CMakeLists.txt b/utils/kamcmd/CMakeLists.txt index e61e9327c24..cb3fa5bcb37 100644 --- a/utils/kamcmd/CMakeLists.txt +++ b/utils/kamcmd/CMakeLists.txt @@ -16,11 +16,11 @@ add_executable(${NAME}) # detect libreadline find_package(PkgConfig REQUIRED) pkg_check_modules(READLINE IMPORTED_TARGET readline) -add_library(readline::readline ALIAS PkgConfig::READLINE) if(READLINE_FOUND) add_library(readline::readline ALIAS PkgConfig::READLINE) target_compile_definitions(${NAME} PRIVATE USE_READLINE) + target_link_libraries(${NAME} PRIVATE readline::readline) endif() include(${CMAKE_SOURCE_DIR}/cmake/utils.cmake) @@ -29,7 +29,7 @@ target_sources(${NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/kamcmd.c ${CMAKE_CURRENT_SOURCE_DIR}/parse_listen_id.c) # target_include_directories(${NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) # target_link_libraries(${NAME} PRIVATE common) -target_link_libraries(${NAME} PRIVATE readline::readline resolv) +target_link_libraries(${NAME} PRIVATE resolv) target_link_libraries(${NAME} PRIVATE common_utils) target_compile_definitions(

1 0

git:master:5a3585a4: cmake/kamcmd: Add alias if readline found
by Xenofon Karamanos 07 Jan '25

07 Jan '25

Module: kamailio Branch: master Commit: 5a3585a43d91ecbff4d0733eae898a2068356758 URL: https://github.com/kamailio/kamailio/commit/5a3585a43d91ecbff4d0733eae898a2… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-07T13:39:16Z cmake/kamcmd: Add alias if readline found --- Modified: utils/kamcmd/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/5a3585a43d91ecbff4d0733eae898a2… Patch: https://github.com/kamailio/kamailio/commit/5a3585a43d91ecbff4d0733eae898a2… --- diff --git a/utils/kamcmd/CMakeLists.txt b/utils/kamcmd/CMakeLists.txt index c5e039a4d35..e61e9327c24 100644 --- a/utils/kamcmd/CMakeLists.txt +++ b/utils/kamcmd/CMakeLists.txt @@ -19,6 +19,7 @@ pkg_check_modules(READLINE IMPORTED_TARGET readline) add_library(readline::readline ALIAS PkgConfig::READLINE) if(READLINE_FOUND) + add_library(readline::readline ALIAS PkgConfig::READLINE) target_compile_definitions(${NAME} PRIVATE USE_READLINE) endif()

1 0

git:master:f3acc421: cmake: Fix cmake-lint
by Xenofon Karamanos 07 Jan '25

07 Jan '25

Module: kamailio Branch: master Commit: f3acc421cc9b01af43c0dee6a851acb02498abd6 URL: https://github.com/kamailio/kamailio/commit/f3acc421cc9b01af43c0dee6a851acb… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-07T13:36:30Z cmake: Fix cmake-lint --- Modified: src/CMakeLists.txt Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/f3acc421cc9b01af43c0dee6a851acb… Patch: https://github.com/kamailio/kamailio/commit/f3acc421cc9b01af43c0dee6a851acb…

1 0

git:master:5a5a9fc8: cmake/kamcmd: Don't require readline
by Xenofon Karamanos 07 Jan '25

07 Jan '25

Module: kamailio Branch: master Commit: 5a5a9fc876335c88691a631b41b10ec41f1d599f URL: https://github.com/kamailio/kamailio/commit/5a5a9fc876335c88691a631b41b10ec… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-07T13:36:23Z cmake/kamcmd: Don't require readline --- Modified: utils/kamcmd/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/5a5a9fc876335c88691a631b41b10ec… Patch: https://github.com/kamailio/kamailio/commit/5a5a9fc876335c88691a631b41b10ec… --- diff --git a/utils/kamcmd/CMakeLists.txt b/utils/kamcmd/CMakeLists.txt index 46b2994995e..c5e039a4d35 100644 --- a/utils/kamcmd/CMakeLists.txt +++ b/utils/kamcmd/CMakeLists.txt @@ -15,7 +15,7 @@ add_executable(${NAME}) # detect libreadline find_package(PkgConfig REQUIRED) -pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) +pkg_check_modules(READLINE IMPORTED_TARGET readline) add_library(readline::readline ALIAS PkgConfig::READLINE) if(READLINE_FOUND)

1 0

git:master:fbed7b5b: modules: readme files regenerated - outbound ... [skip ci]
by Kamailio Dev 06 Jan '25

06 Jan '25

Module: kamailio Branch: master Commit: fbed7b5b6ef30842ee65d76bb2fca11b3246368d URL: https://github.com/kamailio/kamailio/commit/fbed7b5b6ef30842ee65d76bb2fca11… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-01-06T13:31:10+01:00 modules: readme files regenerated - outbound ... [skip ci] --- Modified: src/modules/outbound/README --- Diff: https://github.com/kamailio/kamailio/commit/fbed7b5b6ef30842ee65d76bb2fca11… Patch: https://github.com/kamailio/kamailio/commit/fbed7b5b6ef30842ee65d76bb2fca11… --- diff --git a/src/modules/outbound/README b/src/modules/outbound/README index 8e65a606dc6..d452dfc991a 100644 --- a/src/modules/outbound/README +++ b/src/modules/outbound/README @@ -256,7 +256,7 @@ onreply_route { } failure_route[FAIL_OUTBOUND] { - if (t_branch_timeout() || !t_branch_replied()) { + if (t_branch_timeout() && !t_branch_replied()) { send_reply("430", "Flow Failed"); } }

1 0

[kamailio/kamailio] htable: Fix de-/increment w/ auto expire (PR #4079)
by Bastian Triller 06 Jan '25

06 Jan '25

Update item expiration value during de-/incrementation for htables that are configured with autoexpire and updateexpire disabled. Otherwise an item cannot be used until timer cleaned it up.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Using following configuration ``` #!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") request_route { if ($sht(foo=>bar) == $null) { $sht(foo=>bar) = 0; } $var(foo) = $shtdec(foo=>bar); xlog("$Ts single value $sht(foo=>bar)\texpire $shtex(foo=>bar)\n"); sl_send_reply("200", "Hello"); } ``` running ``` while true; do sleep 0.3; sipsak -vs sip:localhost:9999 ; done ``` produces following output ``` 0(1414153) ERROR: <script>: 1734539304 single value -1 expire 1 0(1414153) ERROR: <script>: 1734539305 single value -2 expire 0 0(1414153) ERROR: <script>: 1734539305 single value -3 expire 0 0(1414153) ERROR: <script>: 1734539305 single value -4 expire 0 0(1414153) ERROR: <script>: 1734539306 single value <null> expire 4294967295 0(1414153) ERROR: <script>: 1734539306 single value <null> expire 4294967295 0(1414153) ERROR: <script>: 1734539306 single value <null> expire 4294967295 0(1414153) ERROR: <script>: 1734539306 single value <null> expire 4294967295 0(1414153) ERROR: <script>: 1734539307 single value <null> expire 4294967294 0(1414153) ERROR: <script>: 1734539307 single value <null> expire 4294967294 0(1414153) ERROR: <script>: 1734539307 single value <null> expire 4294967294 0(1414153) ERROR: <script>: 1734539308 single value <null> expire 4294967293 0(1414153) ERROR: <script>: 1734539308 single value <null> expire 4294967293 0(1414153) ERROR: <script>: 1734539308 single value <null> expire 4294967293 0(1414153) ERROR: <script>: 1734539309 single value <null> expire 4294967292 0(1414153) ERROR: <script>: 1734539309 single value <null> expire 4294967292 0(1414153) ERROR: <script>: 1734539309 single value <null> expire 4294967292 0(1414153) ERROR: <script>: 1734539310 single value <null> expire 4294967291 0(1414153) ERROR: <script>: 1734539310 single value <null> expire 4294967291 0(1414153) ERROR: <script>: 1734539310 single value <null> expire 4294967291 0(1414153) ERROR: <script>: 1734539311 single value <null> expire 4294967290 0(1414153) ERROR: <script>: 1734539311 single value <null> expire 4294967290 0(1414153) ERROR: <script>: 1734539311 single value <null> expire 4294967290 0(1414153) ERROR: <script>: 1734539312 single value <null> expire 4294967289 0(1414153) ERROR: <script>: 1734539312 single value <null> expire 4294967289 0(1414153) ERROR: <script>: 1734539312 single value <null> expire 4294967289 0(1414153) ERROR: <script>: 1734539313 single value <null> expire 4294967288 0(1414153) ERROR: <script>: 1734539313 single value <null> expire 4294967288 0(1414153) ERROR: <script>: 1734539313 single value <null> expire 4294967288 0(1414153) ERROR: <script>: 1734539314 single value <null> expire 4294967287 0(1414153) ERROR: <script>: 1734539314 single value <null> expire 4294967287 0(1414153) ERROR: <script>: 1734539314 single value <null> expire 4294967287 0(1414153) ERROR: <script>: 1734539315 single value <null> expire 4294967286 0(1414153) ERROR: <script>: 1734539315 single value <null> expire 4294967286 0(1414153) ERROR: <script>: 1734539315 single value <null> expire 4294967286 0(1414153) ERROR: <script>: 1734539316 single value <null> expire 4294967285 0(1414153) ERROR: <script>: 1734539316 single value <null> expire 4294967285 0(1414153) ERROR: <script>: 1734539316 single value <null> expire 4294967285 0(1414153) ERROR: <script>: 1734539316 single value <null> expire 4294967285 0(1414153) ERROR: <script>: 1734539317 single value <null> expire 4294967284 0(1414153) ERROR: <script>: 1734539317 single value <null> expire 4294967284 0(1414153) ERROR: <script>: 1734539317 single value <null> expire 4294967284 0(1414153) ERROR: <script>: 1734539318 single value <null> expire 4294967283 0(1414153) ERROR: <script>: 1734539318 single value <null> expire 4294967283 0(1414153) ERROR: <script>: 1734539318 single value <null> expire 4294967283 0(1414153) ERROR: <script>: 1734539319 single value <null> expire 4294967282 0(1414153) ERROR: <script>: 1734539319 single value <null> expire 4294967282 0(1414153) ERROR: <script>: 1734539319 single value <null> expire 4294967282 0(1414153) ERROR: <script>: 1734539320 single value <null> expire 4294967281 0(1414153) ERROR: <script>: 1734539320 single value <null> expire 4294967281 0(1414153) ERROR: <script>: 1734539320 single value <null> expire 4294967281 0(1414153) ERROR: <script>: 1734539321 single value <null> expire 4294967280 0(1414153) ERROR: <script>: 1734539321 single value <null> expire 4294967280 0(1414153) ERROR: <script>: 1734539321 single value <null> expire 4294967280 0(1414153) ERROR: <script>: 1734539322 single value <null> expire 4294967279 0(1414153) ERROR: <script>: 1734539322 single value <null> expire 4294967279 0(1414153) ERROR: <script>: 1734539322 single value <null> expire 4294967279 0(1414153) ERROR: <script>: 1734539323 single value <null> expire 4294967278 0(1414153) ERROR: <script>: 1734539323 single value <null> expire 4294967278 0(1414153) ERROR: <script>: 1734539323 single value <null> expire 4294967278 0(1414153) ERROR: <script>: 1734539324 single value <null> expire 4294967277 0(1414153) ERROR: <script>: 1734539324 single value <null> expire 4294967277 0(1414153) ERROR: <script>: 1734539324 single value -1 expire 1 0(1414153) ERROR: <script>: 1734539325 single value -2 expire 0 0(1414153) ERROR: <script>: 1734539325 single value -3 expire 0 0(1414153) ERROR: <script>: 1734539325 single value -4 expire 0 ``` When adding `initval=0` to `htable` configuration log output changes `<null>` to `0` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4079 -- Commit Summary -- * htable: Fix de-/increment w/ auto expire -- File Changes -- M src/modules/htable/ht_api.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4079.patch https://github.com/kamailio/kamailio/pull/4079.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4079 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4079(a)github.com>

2 3

git:master:b8062321: htable: Fix de-/increment w/ auto expire
by Daniel-Constantin Mierla 06 Jan '25

06 Jan '25

Module: kamailio Branch: master Commit: b8062321572e1523bb9478fd2421c5a8bc8314af URL: https://github.com/kamailio/kamailio/commit/b8062321572e1523bb9478fd2421c5a… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-06T13:18:45+01:00 htable: Fix de-/increment w/ auto expire Update item expiration value during de-/incrementation for htables that are configured with autoexpire and updateexpire disabled. Otherwise an item cannot be used until timer cleaned it up. --- Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/b8062321572e1523bb9478fd2421c5a… Patch: https://github.com/kamailio/kamailio/commit/b8062321572e1523bb9478fd2421c5a… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 559ee9784d2..9190dd310ff 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -743,6 +743,10 @@ ht_cell_t *ht_cell_value_add(ht_t *ht, str *name, int val, ht_cell_t *old) if(now > 0 && it->expire != 0 && it->expire < now) { /* entry has expired */ + it->expire = ht->htexpire; + if(it->expire) { + it->expire += now; + } if(ht->flags == PV_VAL_INT) { /* initval is integer, use it to create a fresh entry */ it->flags &= ~AVP_VAL_STR;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2025