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()
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
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.
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") {