sr-dev December 2024

sr-dev@lists.kamailio.org

17 participants
351 discussions

Start a nNew thread

[kamailio/kamailio] outbound/doc: Fix logic error (PR #4087)
by Xenofon Karamanos 06 Jan '25

06 Jan '25

2 2

git:master:5433322c: cmake: Install core readme and install readme
by Xenofon Karamanos 31 Dec '24

31 Dec '24

Module: kamailio Branch: master Commit: 5433322c1f06a74f58b1ad1b44d221cfe1452bb2 URL: https://github.com/kamailio/kamailio/commit/5433322c1f06a74f58b1ad1b44d221c… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-31T10:58:39Z cmake: Install core readme and install readme --- Modified: src/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/5433322c1f06a74f58b1ad1b44d221c… Patch: https://github.com/kamailio/kamailio/commit/5433322c1f06a74f58b1ad1b44d221c… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0faa97fffad..7424b599acf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -90,8 +90,9 @@ set_target_properties( kamailio PROPERTIES ENABLE_EXPORTS TRUE OUTPUT_NAME ${MAIN_NAME} ) -target_compile_options(kamailio - PUBLIC "-ffile-prefix-map=${CMAKE_SOURCE_DIR}/src/=") +target_compile_options( + kamailio PUBLIC "-ffile-prefix-map=${CMAKE_SOURCE_DIR}/src/=" +) add_subdirectory(core) add_subdirectory(lib) @@ -143,8 +144,15 @@ install( COMPONENT kamailio-core ) -# Install the configuration file (kamailio.cfg) ${CFG_NAME} using a CODE block to check -# existence at install time instead of configure time +# Install the docs of core +install( + FILES ${CMAKE_SOURCE_DIR}/README ${CMAKE_SOURCE_DIR}/INSTALL + DESTINATION ${CMAKE_INSTALL_DOCDIR} + COMPONENT kamailio-docs +) + +# Install the configuration file (kamailio.cfg) ${CFG_NAME} using a CODE block +# to check existence at install time instead of configure time # If(EXISTS ..) require full path install( CODE "

1 0

git:master:2692148d: cmake: Install README from source tree
by Xenofon Karamanos 30 Dec '24

30 Dec '24

Module: kamailio Branch: master Commit: 2692148d92bb8b17709eb4cbddd8e653bbf5c14a URL: https://github.com/kamailio/kamailio/commit/2692148d92bb8b17709eb4cbddd8e65… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-30T15:57:40Z cmake: Install README from source tree - module_name_doc target will only produce the formats found in the build folder. - module_name_readme target that modifies the source tree needs to be called explicitly --- Modified: cmake/modules-docs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/2692148d92bb8b17709eb4cbddd8e65… Patch: https://github.com/kamailio/kamailio/commit/2692148d92bb8b17709eb4cbddd8e65… --- diff --git a/cmake/modules-docs.cmake b/cmake/modules-docs.cmake index b24ae061af2..edd7e8451d7 100644 --- a/cmake/modules-docs.cmake +++ b/cmake/modules-docs.cmake @@ -95,7 +95,6 @@ function(docs_add_module module_name) add_custom_target( ${module_name}_doc DEPENDS ${module_name}_doc_text ${module_name}_doc_html - ${module_name}_readme COMMENT "Processing target ${module_name}_doc") # Each version has seperate custon commands for not recompiling all if 1 gets @@ -146,13 +145,9 @@ function(docs_add_module module_name) endif() install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${module_name}/${module_name}.txt + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${module_name}/README RENAME README.${module_name} DESTINATION ${CMAKE_INSTALL_DOCDIR}/modules - COMPONENT kamailio_docs - # Since the depepndencies might not have been build as they are not in the - # default target and required to build explicitly using `make - # kamailio_docs`, allow them to be optional. - OPTIONAL) + COMPONENT kamailio_docs) endif() endfunction()

1 0

git:master:18705086: cmake: Documentation targets always available regardless of `BUILD_DOC` option.
by Xenofon Karamanos 30 Dec '24

30 Dec '24

Module: kamailio Branch: master Commit: 18705086c2dbeef21afc059c887ab2c6178deba9 URL: https://github.com/kamailio/kamailio/commit/18705086c2dbeef21afc059c887ab2c… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-30T15:49:04Z cmake: Documentation targets always available regardless of `BUILD_DOC` option. - Warn if BUILD_DOC is enabled but missing required programs - CMake lint --- Modified: cmake/modules-docs.cmake Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/18705086c2dbeef21afc059c887ab2c… Patch: https://github.com/kamailio/kamailio/commit/18705086c2dbeef21afc059c887ab2c…

1 0

git:master:600f5c49: cmake: Fix path for installing utils-bin and utils-cfg
by Xenofon Karamanos 30 Dec '24

30 Dec '24

Module: kamailio Branch: master Commit: 600f5c49f8857f4b17c669c2d74106fe74264d9c URL: https://github.com/kamailio/kamailio/commit/600f5c49f8857f4b17c669c2d74106f… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-30T15:49:04Z cmake: Fix path for installing utils-bin and utils-cfg --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/600f5c49f8857f4b17c669c2d74106f… Patch: https://github.com/kamailio/kamailio/commit/600f5c49f8857f4b17c669c2d74106f… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index 75208d63222..fd98e7b8d84 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -126,24 +126,29 @@ install( " COMPONENT kamailio-utils-cfg) +# Install targets + # Custom target for installing the kamailio-cfg component add_custom_target( install-kamailio-utils-cfg - COMMAND ${CMAKE_COMMAND} --install . --component kamailio-utils-cfg + COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR} --component + kamailio-utils-cfg COMMENT "Installing kamailio-utils-cfg component") # Custom target for installing the kamailio-utils-bin component add_custom_target( install-kamailio-utils-bin - COMMAND ${CMAKE_COMMAND} --install . --component kamailio-utils-bin + COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR} --component + kamailio-utils-bin COMMENT "Installing kamailio-utils-bin component" DEPENDS kamctl kamdbctl) # Custom target for installing the kamailio-utils component -add_custom_target( - install-kamailio-utils # COMMENT "Installing kamailio-utils-cfg and - # kamailio-utils-bin components" - DEPENDS install-kamailio-utils-cfg install-kamailio-utils-bin) +add_custom_target(install-kamailio-utils COMMENT "Installing utils components") +add_dependencies(install-kamailio-utils install-kamailio-utils-cfg + install-kamailio-utils-bin) + +# ---------- # ---------- # dbschema target: Old Makefiles: make dbschema declared in src/ Makefile This

1 0

git:master:45a81b84: cmake: Add `modules` target
by Xenofon Karamanos 30 Dec '24

30 Dec '24

Module: kamailio Branch: master Commit: 45a81b840637d7bb2c3387ab33309c8fb81f1a0a URL: https://github.com/kamailio/kamailio/commit/45a81b840637d7bb2c3387ab33309c8… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-30T15:49:04Z cmake: Add `modules` target - Compile only the configured modules but not the core --- Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/45a81b840637d7bb2c3387ab33309c8… Patch: https://github.com/kamailio/kamailio/commit/45a81b840637d7bb2c3387ab33309c8… --- diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 6570b4afdf2..955399ee168 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -141,6 +141,12 @@ foreach(group IN LISTS FULL_MODULE_GROUP_NAMES) add_module_group("${MODULES_IN_GROUP}") endforeach() +get_property(ADDED_MODULES_LIST GLOBAL PROPERTY ADDED_MODULES_LIST) +message(STATUS "Modules to be built: ${ADDED_MODULES_LIST}") +# TODO: Comment is not showing. probably a bug in CMAKE +add_custom_target(modules COMMENT "Building modules") +add_dependencies(modules ${ADDED_MODULES_LIST}) + # Add a kamailio_docs target that depends on all module documentation targets if(BUILD_DOC) get_property(ADDED_MODULES_LIST GLOBAL PROPERTY ADDED_MODULES_LIST)

1 0

git:master:7cb55fcb: cmake: Respect provided CMAKE_C_STANDARD
by Xenofon Karamanos 30 Dec '24

30 Dec '24

Module: kamailio Branch: master Commit: 7cb55fcbf3f138da18ca5dc9c3cd626bd470b727 URL: https://github.com/kamailio/kamailio/commit/7cb55fcbf3f138da18ca5dc9c3cd626… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-30T15:49:04Z cmake: Respect provided CMAKE_C_STANDARD - Format and lint --- Modified: CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/7cb55fcbf3f138da18ca5dc9c3cd626… Patch: https://github.com/kamailio/kamailio/commit/7cb55fcbf3f138da18ca5dc9c3cd626… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7235a6f683d..c5611326d8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,16 +12,21 @@ set(RELEASE "${PROJECT_VERSION}${EXTRAVERSION}") message(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}") message(STATUS "RELEASE: ${RELEASE}") -math( - EXPR - VERSIONVAL - "${PROJECT_VERSION_MAJOR}*1000000 + ${PROJECT_VERSION_MINOR}*1000 + ${PROJECT_VERSION_PATCH}" +# cmake-format: off +# Set the version number as a single integer +math(EXPR VERSIONVAL + "${PROJECT_VERSION_MAJOR}*1000000 + + ${PROJECT_VERSION_MINOR}*1000 + + ${PROJECT_VERSION_PATCH}" ) message(STATUS "VERSIONVAL: ${VERSIONVAL}") +# cmake-format: on -# Specify the C standard -set(CMAKE_C_STANDARD 11) -set(CMAKE_C_STANDARD_REQUIRED True) +# Specify the C standard if non provided by user +if(NOT CMAKE_C_STANDARD) + set(CMAKE_C_STANDARD 11) + set(CMAKE_C_STANDARD_REQUIRED True) +endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") @@ -33,6 +38,7 @@ include(${CMAKE_SOURCE_DIR}/cmake/BuildType.cmake) set(MAIN_NAME "kamailio" CACHE STRING "Main binary name") + # use kamailio config set(CFG_NAME "kamailio" @@ -61,6 +67,8 @@ if(NOT TARGET uninstall) "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake-uninstall.cmake" IMMEDIATE @ONLY) add_custom_target( - uninstall COMMAND ${CMAKE_COMMAND} -P - ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake-uninstall.cmake) + uninstall + COMMAND ${CMAKE_COMMAND} -P + ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake-uninstall.cmake + COMMENT "Uninstalling") endif()

1 0

git:master:ad35c241: cmake: Update min version required to 3.10
by Xenofon Karamanos 30 Dec '24

30 Dec '24

Module: kamailio Branch: master Commit: ad35c24196c921a3e870f4a48b6d286748d78d48 URL: https://github.com/kamailio/kamailio/commit/ad35c24196c921a3e870f4a48b6d286… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-30T15:48:15Z cmake: Update min version required to 3.10 --- Modified: cmake/compiler-specific.cmake Modified: cmake/defs.cmake Modified: cmake/os-specific.cmake Modified: src/modules/CMakeLists.txt Modified: src/modules/presence/CMakeLists.txt Modified: src/modules/presence_xml/CMakeLists.txt Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/ad35c24196c921a3e870f4a48b6d286… Patch: https://github.com/kamailio/kamailio/commit/ad35c24196c921a3e870f4a48b6d286… --- diff --git a/cmake/compiler-specific.cmake b/cmake/compiler-specific.cmake index 7ecd87b75ad..950b64941ab 100644 --- a/cmake/compiler-specific.cmake +++ b/cmake/compiler-specific.cmake @@ -2,7 +2,6 @@ # common flags and options for the project The flags are defined as INTERFACE # properties of the common library The flags are then used by the other # libraries and executables -cmake_minimum_required(VERSION 3.10) # Define the common flags and options for GCC option(PROFILE "Enable profiling" OFF) diff --git a/cmake/defs.cmake b/cmake/defs.cmake index bc08b2ce4ac..a01a43eaf65 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -2,7 +2,6 @@ # common flags and options for the project The flags are defined as INTERFACE # properties of the common library The flags are then used by the other # libraries and executables -cmake_minimum_required(VERSION 3.10) add_library(common INTERFACE) diff --git a/cmake/os-specific.cmake b/cmake/os-specific.cmake index 7fbbd4763a2..d70a44cf379 100644 --- a/cmake/os-specific.cmake +++ b/cmake/os-specific.cmake @@ -1,8 +1,7 @@ -# Quite analogous to the Makefile.defs file -# This file is used to define the common flags and options for the project -# The flags are defined as INTERFACE properties of the common library -# The flags are then used by the other libraries and executables -cmake_minimum_required(VERSION 3.10) +# Quite analogous to the Makefile.defs file This file is used to define the +# common flags and options for the project The flags are defined as INTERFACE +# properties of the common library The flags are then used by the other +# libraries and executables set(OS_SPECIFIC_DIR "${CMAKE_SOURCE_DIR}/cmake/os-specific") if(CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index a1b474a4502..6570b4afdf2 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -73,6 +73,7 @@ function(add_module_group group_modules) if(POLICY CMP0079) cmake_policy(SET CMP0079 NEW) endif() + target_link_libraries(${module_name} PRIVATE common_modules) target_compile_definitions( ${module_name} PRIVATE MOD_NAMEID=${module_name} diff --git a/src/modules/presence/CMakeLists.txt b/src/modules/presence/CMakeLists.txt index dbac5d4862e..ef19545fcb2 100644 --- a/src/modules/presence/CMakeLists.txt +++ b/src/modules/presence/CMakeLists.txt @@ -1,6 +1,3 @@ -# 3.12 For libxml2 target -cmake_minimum_required(VERSION 3.12) - file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) diff --git a/src/modules/presence_xml/CMakeLists.txt b/src/modules/presence_xml/CMakeLists.txt index dbac5d4862e..ef19545fcb2 100644 --- a/src/modules/presence_xml/CMakeLists.txt +++ b/src/modules/presence_xml/CMakeLists.txt @@ -1,6 +1,3 @@ -# 3.12 For libxml2 target -cmake_minimum_required(VERSION 3.12) - file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index 2b017836025..75208d63222 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.10) - project(kamailio_utils) # if(NOT basedir) set(KAMCTL_TMP_DIR "/tmp") else() set(KAMCTL_TMP_DIR

1 0

[kamailio/kamailio] secfilter‌: support remove rule in Whitelist and Blacklist (PR #4086)
by AsedMorteza 30 Dec '24

30 Dec '24

#### 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) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description ##### **Summary** This update introduces new functionality to the `secfilter` module, enabling the removal of entries from both the Blacklist and Whitelist. It also includes automatic detection and removal of duplicate values from these lists. ##### **Details** * Users can now remove specific entries from the Blacklist or Whitelist based on type (e.g., IP, domain, user) and a given value. * Supports removal of single or multiple matching entries in one operation. ##### **Benefits** - Improves the usability and flexibility of the `secfilter` module by allowing fine-grained control over list management. - Ensures that the Blacklist and Whitelist are kept clean and free from redundant entries. - Enhances performance by reducing unnecessary duplication in the lists. ##### Testing This feature was tested using `kmcmd` commands in various scenarios: - Removing the **first element** in the list. - Removing an element from the **middle** of the list. - Removing the **last element** in the list. - Removing **all matching elements** in the list. In all cases, the commands worked correctly, and the lists were updated and cleaned as expected. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4086 -- Commit Summary -- * secfilter‌: support remove rule in Whitelist and Blacklist * Merge remote-tracking branch 'origin/master' into Feature/5-support-remove-rule-in-Whitelist-Blacklist * secfilter‌: support remove rule in Whitelist and Blacklist * edit end of file -- File Changes -- M src/modules/secfilter/secfilter.c (8) M src/modules/secfilter/secfilter.h (3) M src/modules/secfilter/secfilter_db.c (106) M src/modules/secfilter/secfilter_rpc.c (94) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4086.patch https://github.com/kamailio/kamailio/pull/4086.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4086 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4086(a)github.com>

1 2

git:master:ced87834: dialog: removed unused parameter for kemi update state function
by Daniel-Constantin Mierla 29 Dec '24

29 Dec '24

Module: kamailio Branch: master Commit: ced878347cdeb03f9160a5e29bed47e48ff362b6 URL: https://github.com/kamailio/kamailio/commit/ced878347cdeb03f9160a5e29bed47e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-29T10:17:24+01:00 dialog: removed unused parameter for kemi update state function --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/ced878347cdeb03f9160a5e29bed47e… Patch: https://github.com/kamailio/kamailio/commit/ced878347cdeb03f9160a5e29bed47e… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index af892f080da..6e6bd93aabf 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1225,7 +1225,7 @@ static int w_dlg_set_state(sip_msg_t *msg, char *pstate, char *p2) /** * */ -static int ki_dlg_update_state(sip_msg_t *msg, str *state) +static int ki_dlg_update_state(sip_msg_t *msg) { return dlg_update_state(msg); }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2024