sr-dev

sr-dev@lists.kamailio.org

16 participants
45406 discussions

git:master:26b8bd41: cmake: Add ppc64 arch compile options
by Xenofon Karamanos 24 Jul '25

24 Jul '25

Module: kamailio Branch: master Commit: 26b8bd414ba4cef25c8d5bcfd5a5d97cecf759d2 URL: https://github.com/kamailio/kamailio/commit/26b8bd414ba4cef25c8d5bcfd5a5d97… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-07-24T13:11:45Z cmake: Add ppc64 arch compile options --- Modified: cmake/compiler-specific.cmake --- Diff: https://github.com/kamailio/kamailio/commit/26b8bd414ba4cef25c8d5bcfd5a5d97… Patch: https://github.com/kamailio/kamailio/commit/26b8bd414ba4cef25c8d5bcfd5a5d97… --- diff --git a/cmake/compiler-specific.cmake b/cmake/compiler-specific.cmake index 0e1fe0a04b3..e541dfb2f24 100644 --- a/cmake/compiler-specific.cmake +++ b/cmake/compiler-specific.cmake @@ -68,4 +68,36 @@ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") # common INTERFACE -ftree-vectorize -fno-strict-overflow ) endif() endif() + +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64$") + # PowerPC 64-bit specific flags + if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_definitions(common_compiler_flags INTERFACE CC_GCC_LIKE_ASM) + target_compile_options(common_compiler_flags INTERFACE -funroll-loops -fsigned-char) + + # Try to get CPUTYPE from the environment, fallback to "powerpc64" if not set + if(DEFINED ENV{CPUTYPE} AND NOT "$ENV{CPUTYPE}" STREQUAL "") + set(CPUTYPE "$ENV{CPUTYPE}") + else() + set(CPUTYPE "powerpc64") + endif() + + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.2) + target_compile_options( + common_compiler_flags INTERFACE -ftree-vectorize -fno-strict-overflow -mtune=${CPUTYPE} + -maltivec + ) + elseif(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.0) + target_compile_options( + common_compiler_flags INTERFACE -ftree-vectorize -mtune=${CPUTYPE} -maltivec + ) + elseif(CMAKE_C_COMPILER_VERSION VERSION_LESS 3.0) + message( + WARNING + "GCC version ${CMAKE_C_COMPILER_VERSION} is too old for ppc64. Try GCC 3.0 or newer." + ) + endif() + # else() + # message(FATAL_ERROR "Unsupported compiler (${CMAKE_C_COMPILER_ID}) for ppc64. Try GCC.") + endif() endif()

1 0

git:master:25810b12: cmake: Adopt regex to match only ppc and ppc64 and nothing more.
by Xenofon Karamanos 24 Jul '25

24 Jul '25

Module: kamailio Branch: master Commit: 25810b126740e741698d5067bca0e79c5cb12b16 URL: https://github.com/kamailio/kamailio/commit/25810b126740e741698d5067bca0e79… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-07-24T13:11:45Z cmake: Adopt regex to match only ppc and ppc64 and nothing more. --- Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/25810b126740e741698d5067bca0e79… Patch: https://github.com/kamailio/kamailio/commit/25810b126740e741698d5067bca0e79… --- diff --git a/cmake/defs.cmake b/cmake/defs.cmake index c2c56519233..790cc02ee22 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -159,7 +159,7 @@ option(USE_FAST_LOCK "Use fast locking if available" ON) # Check the system processor type and set USE_FAST_LOCK accordingly if(USE_FAST_LOCK) if(CMAKE_SYSTEM_PROCESSOR MATCHES - "i386|i486|i586|i686|x86_64|amd64|sparc64|sparc|ppc|ppc64|alpha|mips2|mips64" + "i386|i486|i586|i686|x86_64|amd64|sparc64|sparc|ppc$|ppc64$|alpha|mips2|mips64" ) set(USE_FAST_LOCK YES) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")

1 0

git:master:053eb87f: cmake: Fix condition for fast_lock on unknown archs
by Xenofon Karamanos 24 Jul '25

24 Jul '25

Module: kamailio Branch: master Commit: 053eb87f5338b0fc94dcb3e0d6b4c7416c854140 URL: https://github.com/kamailio/kamailio/commit/053eb87f5338b0fc94dcb3e0d6b4c74… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-07-24T13:11:45Z cmake: Fix condition for fast_lock on unknown archs --- Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/053eb87f5338b0fc94dcb3e0d6b4c74… Patch: https://github.com/kamailio/kamailio/commit/053eb87f5338b0fc94dcb3e0d6b4c74… --- diff --git a/cmake/defs.cmake b/cmake/defs.cmake index d186974e2e4..c2c56519233 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -174,14 +174,14 @@ if(USE_FAST_LOCK) set(USE_FAST_LOCK NO) target_compile_definitions(common INTERFACE MIPS_HAS_LLSC) # likely target_compile_definitions(common INTERFACE NOSMP) # very likely - elseif() + else() message(STATUS "Fast locking not available for this platform, disabling USE_FAST_LOCK") set(USE_FAST_LOCK NO) endif() endif() # Add definitions if USE_FAST_LOCK is YES -message(STATUS "Fast lock available: ${USE_FAST_LOCK}") +message(STATUS "Fast lock available: USE_FAST_LOCK=${USE_FAST_LOCK}") if(USE_FAST_LOCK) # If fast lock is available, add the definitions for it, else each OS will # have its own locking method

1 0

git:master:97345507: cmake: Fix component group names for dbshema generation
by Xenofon Karamanos 24 Jul '25

24 Jul '25

Module: kamailio Branch: master Commit: 97345507045bee739b006298a586dfaedc2b09e8 URL: https://github.com/kamailio/kamailio/commit/97345507045bee739b006298a586dfa… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-07-24T13:11:45Z cmake: Fix component group names for dbshema generation - dbshema modules generated components that were not provided by user - if a module with dbschema is included in the include_modules list, it will now be in "user_specified_list" component instead of the actual KGROUP component that might be not included. --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/97345507045bee739b006298a586dfa… Patch: https://github.com/kamailio/kamailio/commit/97345507045bee739b006298a586dfa… --- diff --git a/cmake/groups.cmake b/cmake/groups.cmake index c629ee49f93..353611f03be 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -754,7 +754,7 @@ set(MODULE_GROUP_PACKAGE_GROUPS # Add group names to available group and provide "ALL_PACKAGED" as well # for easier packaging using components -list(APPEND AVAILABLE_GROUPS ALL_PACKAGED ${MODULE_GROUP_PACKAGE_GROUPS}) +list(APPEND AVAILABLE_GROUPS ALL_PACKAGED KMINI ${MODULE_GROUP_PACKAGE_GROUPS}) # Find the group name for the target by checking if the module is in the # list of modules to be built and if so, use the group name of that module @@ -764,28 +764,20 @@ function(find_group_name module) "" PARENT_SCOPE ) - # This was need due to the dbschema.cmake - # If one select one of these option as group - # we want the group name to match instead of the actual group it belongs to - if(MODULE_GROUP_NAME STREQUAL "ALL" - OR MODULE_GROUP_NAME STREQUAL "DEFAULT" - OR MODULE_GROUP_NAME STREQUAL "STANDARD" - OR MODULE_GROUP_NAME STREQUAL "COMMON" - ) - set(group_name - "${MODULE_GROUP_NAME}" - PARENT_SCOPE - ) - return() + separate_arguments(groups_to_search_in UNIX_COMMAND ${MODULE_GROUP_NAME}) + list(FIND groups_to_search_in "ALL_PACKAGED" group_index) + if(group_index GREATER -1) + # Remove it from the list and append the package groups + list(REMOVE_AT groups_to_search_in ${group_index}) + list(APPEND groups_to_search_in ${MODULE_GROUP_PACKAGE_GROUPS}) endif() - # message(WARNING "groups to search in" ${MODULE_GROUP_PACKAGE_GROUPS}) - # Get all variable names in the current CMake context - foreach(group IN LISTS MODULE_GROUP_PACKAGE_GROUPS) - # message(WARNING "Modules in group ${group}: ${MODULES_IN_GROUP}") - # message(WARNING "Checking group ${group} for db ${module}") + # message(WARNING "Groups provided by the user ${groups_to_search_in}") + # message(WARNING "Looking for group for db ${module}") + foreach(group IN LISTS groups_to_search_in) get_property(MODULES_IN_GROUP VARIABLE PROPERTY "MODULE_GROUP_${group}") + # message(WARNING "Modules in group ${group}: ${MODULES_IN_GROUP}") if("${module}" IN_LIST MODULES_IN_GROUP) - # message(WARNING "Found group ${group} for db ${module}") + # message(WARNING "Found group ${group} for db ${module}") set(group_name "${group}" PARENT_SCOPE @@ -793,5 +785,12 @@ function(find_group_name module) return() endif() endforeach() - message((STATUS "module ${module} not found in any group")) + message(STATUS "module ${module} not found in any group") + # if not found in any group, it's probably in include_modules list + # Use the group name "user_specified_list" associated with include_modules + # list, otherwise it will generate Unknown group component + set(group_name + "user_specified_list" + PARENT_SCOPE + ) endfunction()

1 0

git:master:78dbbda4: cmake: Fix help string and allow mutliple values from gui
by Xenofon Karamanos 24 Jul '25

24 Jul '25

Module: kamailio Branch: master Commit: 78dbbda4ca74e18c4a99c87520abd5d7906af4d3 URL: https://github.com/kamailio/kamailio/commit/78dbbda4ca74e18c4a99c87520abd5d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-07-24T13:11:45Z cmake: Fix help string and allow mutliple values from gui - Allow providing multiple space seperated groups in guis like ccmake instead of the single option - ALL_PACKAGED option refined to be allowed with other groups as well. - Providing ALL_PACKAGED with another group will append the another group to the list of groups comprising the ALL_PACKAGED option. - Remove duplicates in the group list if any --- Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/78dbbda4ca74e18c4a99c87520abd5d… Patch: https://github.com/kamailio/kamailio/commit/78dbbda4ca74e18c4a99c87520abd5d… --- diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 32840740a92..18dd8fe094c 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -12,16 +12,21 @@ include(${CMAKE_SOURCE_DIR}/cmake/groups.cmake) set(AVAILABLE_GROUP_NAMES ${AVAILABLE_GROUPS}) set(MODULE_GROUP_NAME "DEFAULT" - CACHE STRING "Group of modules to build (one or multiple space seperated group)" + CACHE STRING "Groups of modules to build (one or multiple space seperated group)" ) -set_property(CACHE MODULE_GROUP_NAME PROPERTY STRINGS ${AVAILABLE_GROUP_NAMES}) # User may provide multiple groups seperated by space -if(MODULE_GROUP_NAME STREQUAL "ALL_PACKAGED") - set(MODULE_GROUP_LIST ${MODULE_GROUP_PACKAGE_GROUPS}) -else() - separate_arguments(MODULE_GROUP_LIST UNIX_COMMAND "${MODULE_GROUP_NAME}") - message(STATUS "Building groups: ${MODULE_GROUP_LIST}") +separate_arguments(MODULE_GROUP_LIST UNIX_COMMAND "${MODULE_GROUP_NAME}") + +# Deduplicate the list +list(REMOVE_DUPLICATES MODULE_GROUP_LIST) +list(FIND MODULE_GROUP_LIST "ALL_PACKAGED" INDEX) + +if(INDEX GREATER -1) + # Remove it from the lists + list(REMOVE_AT MODULE_GROUP_LIST ${INDEX}) + list(APPEND MODULE_GROUP_LIST ${MODULE_GROUP_PACKAGE_GROUPS}) + message(STATUS "Building all packaged modules along with other provided groups.") endif() # Check if elements in MODULE_GROUP_LIST are valid by checking against @@ -40,6 +45,7 @@ foreach(group_name IN LISTS MODULE_GROUP_LIST) # message(STATUS "Modules: ${MODULE_GROUP}") endif() endforeach() +message(STATUS "Building groups: ${MODULE_GROUP_LIST}") # message(STATUS "Expanded module groups: ${FULL_MODULE_GROUP_NAMES}") # Allow users to specify extra modules to build

1 0

git:master:ae28e398: cmake: Remove Flavour options
by Xenofon Karamanos 24 Jul '25

24 Jul '25

Module: kamailio Branch: master Commit: ae28e39830f79ee2abf34518678749678e7d14bb URL: https://github.com/kamailio/kamailio/commit/ae28e39830f79ee2abf345186787496… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-07-24T12:48:45Z cmake: Remove Flavour options --- Modified: cmake/defs.cmake Modified: src/modules/tm/CMakeLists.txt Modified: src/modules/tsilo/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/ae28e39830f79ee2abf345186787496… Patch: https://github.com/kamailio/kamailio/commit/ae28e39830f79ee2abf345186787496… --- diff --git a/cmake/defs.cmake b/cmake/defs.cmake index 7fa11e89093..d186974e2e4 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -38,15 +38,6 @@ message(STATUS "Target Processor Alias: ${TARGET_ARCH}") # supported_archs) message(FATAL_ERROR "Target architecture not supported") # endif() -# Flavor of the project flavour: sip-router, ser or kamailio This is used to -# define the MAIN_NAME flag TODO: Kamailio only -set(flavours kamailio) -set(FLAVOUR - "kamailio" - CACHE STRING "Flavour of the project" -) -set_property(CACHE FLAVOUR PROPERTY STRINGS ${flavours}) - # Verbose option (for debugging purposes) (was quiet in Makefile.defs) Probably # not needed in CMake and can be removed Use the -DCMAKE_VERBOSE_MAKEFILE=ON # option to enable verbose mode @@ -93,17 +84,25 @@ option(HAVE_RESOLV_RES "Have resolv_res" ON) option(KSR_PTHREAD_MUTEX_SHARED "Use shared mutex for TLS" ON) option(STATISTICS "Statistics" ON) -# if(${MEMPKG}) target_compile_definitions(common INTERFACE PKG_MALLOC) else() -# if(${MEMDBGSYS}) target_compile_definitions(common INTERFACE DDBG_SYS_MEMORY) -# endif() endif() + +# if(${MEMPKG}) +# target_compile_definitions(common INTERFACE PKG_MALLOC) +# else() +# if(${MEMDBGSYS}) +# target_compile_definitions(common INTERFACE DDBG_SYS_MEMORY) +# endif() +# endif() # ----------------------- # TLS support # ----------------------- option(TLS_HOOKS "TLS hooks support" ON) option(CORE_TLS "CORE_TLS" OFF) -# set(CORE_TLS "" CACHE STRING "CORE_TLS") set(TLS_HOOKS ON CACHE BOOL "TLS -# hooks support") +# set(CORE_TLS "" CACHE STRING "CORE_TLS") +# set(TLS_HOOKS +# ON +# CACHE BOOL "TLS hooks support" +# ) if(${CORE_TLS}) set(RELEASE "${RELEASE}-tls") diff --git a/src/modules/tm/CMakeLists.txt b/src/modules/tm/CMakeLists.txt index ba90e2400fd..fcc0c026057 100644 --- a/src/modules/tm/CMakeLists.txt +++ b/src/modules/tm/CMakeLists.txt @@ -2,6 +2,4 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -if(${FLAVOUR} STREQUAL "kamailio") - target_compile_definitions(${module_name} PRIVATE WITH_EVENT_LOCAL_REQUEST) -endif() +target_compile_definitions(${module_name} PRIVATE WITH_EVENT_LOCAL_REQUEST) diff --git a/src/modules/tsilo/CMakeLists.txt b/src/modules/tsilo/CMakeLists.txt index ba90e2400fd..fcc0c026057 100644 --- a/src/modules/tsilo/CMakeLists.txt +++ b/src/modules/tsilo/CMakeLists.txt @@ -2,6 +2,4 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -if(${FLAVOUR} STREQUAL "kamailio") - target_compile_definitions(${module_name} PRIVATE WITH_EVENT_LOCAL_REQUEST) -endif() +target_compile_definitions(${module_name} PRIVATE WITH_EVENT_LOCAL_REQUEST)

1 0

git:master:5f55e27a: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 24 Jul '25

24 Jul '25

Module: kamailio Branch: master Commit: 5f55e27aae585c64d3d7983439354b6cc52c26e0 URL: https://github.com/kamailio/kamailio/commit/5f55e27aae585c64d3d7983439354b6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-24T14:31:10+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/5f55e27aae585c64d3d7983439354b6… Patch: https://github.com/kamailio/kamailio/commit/5f55e27aae585c64d3d7983439354b6… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index b6f8a0c0ba2..ccb67fd4bc3 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -1661,22 +1661,23 @@ verify_client = optional_no_ca Control the TLS key logging functionality, available for libssl version greater than 1.1.0. Its value is composed from bitwise values (can be made as sum of them): - * 0 - keys logging inactive - * 1 (bit 1) - keys logging active - * 2 (bit 2) - write keys to NOTICE log - * 4 (bit 3) - write keys to file + * 0 - keys logging not enabled + * 1 (bit 1) - initialise keys logging + * 2 (bit 2) - keys logging active + * 4 (bit 3) - write keys to NOTICE log + * 8 (bit 4) - write keys to file The default value: 0. Example 1.52. Set keylog_mode parameter ... -modparam("tls", "keylog_mode", 7) +modparam("tls", "keylog_mode", 15) ... 10.43. keylog_file (str) Path to the file where to write the TLS keys. The values are appended - to the content of the file. The value 4 (bit 3) has to be set to + to the content of the file. The value 8 (bit 4) has to be set to keylog_mode parameter. The default value: NULL.

1 0

git:master:f9020010: tls: docs updated for keylog_mode init flag
by Daniel-Constantin Mierla 24 Jul '25

24 Jul '25

Module: kamailio Branch: master Commit: f90200105624ea32c833a184815870426fb64d10 URL: https://github.com/kamailio/kamailio/commit/f90200105624ea32c833a1848158704… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-24T14:25:44+02:00 tls: docs updated for keylog_mode init flag --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/f90200105624ea32c833a1848158704… Patch: https://github.com/kamailio/kamailio/commit/f90200105624ea32c833a1848158704… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index c29c29d073c..28bcbe18587 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1515,16 +1515,19 @@ verify_client = optional_no_ca </para> <itemizedlist> <listitem> - <para><emphasis>0</emphasis> - keys logging inactive</para> + <para><emphasis>0</emphasis> - keys logging not enabled</para> </listitem> <listitem> - <para><emphasis>1 (bit 1)</emphasis> - keys logging active</para> + <para><emphasis>1 (bit 1)</emphasis> - initialise keys logging</para> </listitem> <listitem> - <para><emphasis>2 (bit 2)</emphasis> - write keys to NOTICE log</para> + <para><emphasis>2 (bit 2)</emphasis> - keys logging active</para> </listitem> <listitem> - <para><emphasis>4 (bit 3)</emphasis> - write keys to file</para> + <para><emphasis>4 (bit 3)</emphasis> - write keys to NOTICE log</para> + </listitem> + <listitem> + <para><emphasis>8 (bit 4)</emphasis> - write keys to file</para> </listitem> </itemizedlist> <para> @@ -1534,7 +1537,7 @@ verify_client = optional_no_ca <title>Set <varname>keylog_mode</varname> parameter</title> <programlisting> ... -modparam("tls", "keylog_mode", 7) +modparam("tls", "keylog_mode", 15) ... </programlisting> </example> @@ -1543,7 +1546,7 @@ modparam("tls", "keylog_mode", 7) <title><varname>keylog_file</varname> (str)</title> <para> Path to the file where to write the TLS keys. The values are appended - to the content of the file. The value 4 (bit 3) has to be set to + to the content of the file. The value 8 (bit 4) has to be set to keylog_mode parameter. </para> <para>

1 0

git:master:79a76ca6: tls: add init flag for keylog_mode
by Daniel-Constantin Mierla 24 Jul '25

24 Jul '25

Module: kamailio Branch: master Commit: 79a76ca6dde85c477890e28b5ce4132458060b0d URL: https://github.com/kamailio/kamailio/commit/79a76ca6dde85c477890e28b5ce4132… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-24T14:21:20+02:00 tls: add init flag for keylog_mode - used to initialized key logging without active flag --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_util.c Modified: src/modules/tls/tls_util.h --- Diff: https://github.com/kamailio/kamailio/commit/79a76ca6dde85c477890e28b5ce4132… Patch: https://github.com/kamailio/kamailio/commit/79a76ca6dde85c477890e28b5ce4132… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index 0bb91734d3d..b58aaf09006 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1091,6 +1091,9 @@ static int tls_server_name_cb(SSL *ssl, int *ad, void *private) static void ksr_tls_keylog_callback(const SSL *ssl, const char *line) { + if(!(ksr_tls_keylog_mode & KSR_TLS_KEYLOG_MODE_ACTIVE)) { + return; + } if(ksr_tls_keylog_mode & KSR_TLS_KEYLOG_MODE_MLOG) { LM_NOTICE("tlskeylog: %s\n", line); } @@ -1161,7 +1164,7 @@ static int ksr_tls_fix_domain(tls_domain_t *d, tls_domain_t *def) ERR_reason_error_string(e)); return -1; } - if(ksr_tls_keylog_mode & KSR_TLS_KEYLOG_MODE_ACTIVE) { + if(ksr_tls_keylog_mode & KSR_TLS_KEYLOG_MODE_INIT) { SSL_CTX_set_keylog_callback(d->ctx[i], ksr_tls_keylog_callback); } if(d->method > TLS_USE_TLSvRANGE) { diff --git a/src/modules/tls/tls_util.c b/src/modules/tls/tls_util.c index 89b3ccb3b2d..21b63bb19f8 100644 --- a/src/modules/tls/tls_util.c +++ b/src/modules/tls/tls_util.c @@ -124,7 +124,7 @@ void tls_openssl_clear_errors(void) */ int ksr_tls_keylog_file_init(void) { - if(!((ksr_tls_keylog_mode & KSR_TLS_KEYLOG_MODE_ACTIVE) + if(!((ksr_tls_keylog_mode & KSR_TLS_KEYLOG_MODE_INIT) && (ksr_tls_keylog_mode & KSR_TLS_KEYLOG_MODE_FILE))) { return 0; } diff --git a/src/modules/tls/tls_util.h b/src/modules/tls/tls_util.h index 6a24c039794..dc575cdfe7b 100644 --- a/src/modules/tls/tls_util.h +++ b/src/modules/tls/tls_util.h @@ -32,9 +32,10 @@ #include "../../core/str.h" #include "tls_domain.h" -#define KSR_TLS_KEYLOG_MODE_ACTIVE (1) -#define KSR_TLS_KEYLOG_MODE_MLOG (1 << 1) -#define KSR_TLS_KEYLOG_MODE_FILE (1 << 2) +#define KSR_TLS_KEYLOG_MODE_INIT (1) +#define KSR_TLS_KEYLOG_MODE_ACTIVE (1 << 1) +#define KSR_TLS_KEYLOG_MODE_MLOG (1 << 2) +#define KSR_TLS_KEYLOG_MODE_FILE (1 << 3) static inline int tls_err_ret( char *s, SSL *ssl, tls_domains_cfg_t **tls_domains_cfg)

1 0

git:master:24d310e4: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 24 Jul '25

24 Jul '25

Module: kamailio Branch: master Commit: 24d310e463754d29b60ad919e7fcbd150cfca7f1 URL: https://github.com/kamailio/kamailio/commit/24d310e463754d29b60ad919e7fcbd1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-24T12:46:10+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/24d310e463754d29b60ad919e7fcbd1… Patch: https://github.com/kamailio/kamailio/commit/24d310e463754d29b60ad919e7fcbd1… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 3a8f18e5774..b6f8a0c0ba2 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -73,6 +73,8 @@ Olle E. Johansson 10.39. engine_algorithms (string) 10.40. verify_client (string) 10.41. provider_quirks (integer) + 10.42. keylog_mode (int) + 10.43. keylog_file (str) 11. Functions @@ -151,9 +153,11 @@ Olle E. Johansson 1.49. Set rand_engine parameter 1.50. Set verify_client modparam parameter 1.51. Set verify_client tls.cfg parameter - 1.52. is_peer_verified usage - 1.53. tls_set_connect_server_id usage - 1.54. Use of event_route[tls:connection-out] + 1.52. Set keylog_mode parameter + 1.53. Set keylog_file parameter + 1.54. is_peer_verified usage + 1.55. tls_set_connect_server_id usage + 1.56. Use of event_route[tls:connection-out] Chapter 1. Admin Guide @@ -211,6 +215,8 @@ Chapter 1. Admin Guide 10.39. engine_algorithms (string) 10.40. verify_client (string) 10.41. provider_quirks (integer) + 10.42. keylog_mode (int) + 10.43. keylog_file (str) 11. Functions @@ -651,6 +657,8 @@ Place holder 10.39. engine_algorithms (string) 10.40. verify_client (string) 10.41. provider_quirks (integer) + 10.42. keylog_mode (int) + 10.43. keylog_file (str) 10.1. tls_method (string) @@ -1648,6 +1656,36 @@ verify_client = optional_no_ca * 1 - create a new `OSSL_LIB_CTX` context in the child process. Known to be required when using OpenSSL 3 pkcs11-provider. +10.42. keylog_mode (int) + + Control the TLS key logging functionality, available for libssl version + greater than 1.1.0. Its value is composed from bitwise values (can be + made as sum of them): + * 0 - keys logging inactive + * 1 (bit 1) - keys logging active + * 2 (bit 2) - write keys to NOTICE log + * 4 (bit 3) - write keys to file + + The default value: 0. + + Example 1.52. Set keylog_mode parameter +... +modparam("tls", "keylog_mode", 7) +... + +10.43. keylog_file (str) + + Path to the file where to write the TLS keys. The values are appended + to the content of the file. The value 4 (bit 3) has to be set to + keylog_mode parameter. + + The default value: NULL. + + Example 1.53. Set keylog_file parameter +... +modparam("tls", "keylog_file", "/tmp/kamailio-tls-keylog.txt") +... + 11. Functions 11.1. is_peer_verified() @@ -1661,7 +1699,7 @@ verify_client = optional_no_ca It can be used only in a request route. - Example 1.52. is_peer_verified usage + Example 1.54. is_peer_verified usage ... if (proto==TLS && !is_peer_verified()) { sl_send_reply("400", "No certificate or verification failed"); @@ -1680,7 +1718,7 @@ verify_client = optional_no_ca It can be used only in ANY_ROUTE. - Example 1.53. tls_set_connect_server_id usage + Example 1.55. tls_set_connect_server_id usage ... tls_set_connect_server_id("clientone"); ... @@ -1772,7 +1810,7 @@ verify_client = optional_no_ca If drop() is executed in the event route, then the data is no longer sent over the connection. - Example 1.54. Use of event_route[tls:connection-out] + Example 1.56. Use of event_route[tls:connection-out] ... event_route[tls:connection-out] { if($sndto(ip)=="1.2.3.4") {

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