sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
296 discussions

git:5.8:f65cfc6d: db_redis: stop searching for keys if scan_key is set
by Victor Seva 07 Jan '25

07 Jan '25

Module: kamailio Branch: 5.8 Commit: f65cfc6d6de1c44a0e53bb28f3c38d0b490f7e1c URL: https://github.com/kamailio/kamailio/commit/f65cfc6d6de1c44a0e53bb28f3c38d0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-07T18:39:03+01:00 db_redis: stop searching for keys if scan_key is set (cherry picked from commit 73914396c127529e7e0d58f3e92170891840cbc2) --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/f65cfc6d6de1c44a0e53bb28f3c38d0… Patch: https://github.com/kamailio/kamailio/commit/f65cfc6d6de1c44a0e53bb28f3c38d0… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 84c0c3a9459..f7bace11cde 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -794,6 +794,7 @@ static int db_redis_build_query_keys(km_redis_con_t *con, const str *table_name, type->type.s); } keyname.s = NULL; + break; } else if(keyname.s) { pkg_free(keyname.s); keyname.s = NULL;

1 0

git:master:73914396: db_redis: stop searching for keys if scan_key is set
by Victor Seva 07 Jan '25

07 Jan '25

Module: kamailio Branch: master Commit: 73914396c127529e7e0d58f3e92170891840cbc2 URL: https://github.com/kamailio/kamailio/commit/73914396c127529e7e0d58f3e921708… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-07T18:37:52+01:00 db_redis: stop searching for keys if scan_key is set --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/73914396c127529e7e0d58f3e921708… Patch: https://github.com/kamailio/kamailio/commit/73914396c127529e7e0d58f3e921708… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 5621ea6bd69..7f1d5720bd6 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -796,6 +796,7 @@ static int db_redis_build_query_keys(km_redis_con_t *con, const str *table_name, type->type.s); } keyname.s = NULL; + break; } else if(keyname.s) { pkg_free(keyname.s); keyname.s = NULL;

1 0

git:master:853bf9eb: cmake: Fix installation path for modules man7
by Xenofon Karamanos 07 Jan '25

07 Jan '25

Module: kamailio Branch: master Commit: 853bf9ebd24b3802a7e55d494fa7e9a42e261560 URL: https://github.com/kamailio/kamailio/commit/853bf9ebd24b3802a7e55d494fa7e9a… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-07T13:30:59Z cmake: Fix installation path for modules man7 --- Modified: cmake/modules-docs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/853bf9ebd24b3802a7e55d494fa7e9a… Patch: https://github.com/kamailio/kamailio/commit/853bf9ebd24b3802a7e55d494fa7e9a… --- diff --git a/cmake/modules-docs.cmake b/cmake/modules-docs.cmake index a8ed23f2b99..10b1b70a8f2 100644 --- a/cmake/modules-docs.cmake +++ b/cmake/modules-docs.cmake @@ -178,7 +178,7 @@ function(docs_add_module module_name) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/${module_name}/${module_name}.7 - DESTINATION ${CMAKE_INSTALL_DOCDIR}/modules + DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man7 COMPONENT kamailio_docs OPTIONAL) endif()

1 0

git:master:37bb0d05: cmake: Add kamcmd util
by Xenofon Karamanos 07 Jan '25

07 Jan '25

Module: kamailio Branch: master Commit: 37bb0d05f5b2cda9125e6767808d48772a73c22b URL: https://github.com/kamailio/kamailio/commit/37bb0d05f5b2cda9125e6767808d487… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-07T13:30:59Z cmake: Add kamcmd util --- Added: utils/kamcmd/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/37bb0d05f5b2cda9125e6767808d487… Patch: https://github.com/kamailio/kamailio/commit/37bb0d05f5b2cda9125e6767808d487… --- diff --git a/utils/kamcmd/CMakeLists.txt b/utils/kamcmd/CMakeLists.txt new file mode 100644 index 00000000000..46b2994995e --- /dev/null +++ b/utils/kamcmd/CMakeLists.txt @@ -0,0 +1,40 @@ +set(KAMCMD_RELEASE 1.5) +set(KAMCMD_UTIL_SRC_NAME "kamcmd") + +set(KAMCMD_CUSTOM_NAME + "" + CACHE STRING "Custom name for the kamcmd util") + +if(NOT KAMCMD_CUSTOM_NAME) + set(NAME "kamcmd") # Hardcoded name if empty +elseif() + set(NAME "${KAMCMD_CUSTOM_NAME}") +endif() + +add_executable(${NAME}) + +# detect libreadline +find_package(PkgConfig REQUIRED) +pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) +add_library(readline::readline ALIAS PkgConfig::READLINE) + +if(READLINE_FOUND) + target_compile_definitions(${NAME} PRIVATE USE_READLINE) +endif() + +include(${CMAKE_SOURCE_DIR}/cmake/utils.cmake) + +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 common_utils) + +target_compile_definitions( + ${NAME} + PRIVATE NAME="${NAME}" SRNAME="${MAIN_NAME}" VERSION="${KAMCMD_RELEASE}" + RUN_DIR="/${CMAKE_INSTALL_LOCALSTATEDIR}/run/${MAIN_NAME}" + __OS_${OS_LOWER}) + +install(TARGETS ${NAME} DESTINATION ${CMAKE_INSTALL_SBINDIR})

1 0

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

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