sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
294 discussions

git:master:a1bdef91: cmake: messages about not finding docs-related tools made status
by Daniel-Constantin Mierla 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: a1bdef919414173e8327a8dd65ecaa2fca279d6a URL: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-20T10:54:14+01:00 cmake: messages about not finding docs-related tools made status - they should not be needed for development and usual installation, warning makes it look like something relevant cannot be done --- Modified: cmake/modules-docs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2… Patch: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2… --- diff --git a/cmake/modules-docs.cmake b/cmake/modules-docs.cmake index 10b1b70a8f2..721ba7d0b45 100644 --- a/cmake/modules-docs.cmake +++ b/cmake/modules-docs.cmake @@ -6,12 +6,12 @@ find_program(LYNX_EXECUTABLE lynx QUIET) find_program(DOCBOOK2X_EXECUTABLE docbook2x-man QUIET) if(BUILD_DOC AND (NOT XSLTPROC_EXECUTABLE OR NOT LYNX_EXECUTABLE)) - message(WARNING "xsltproc or lynx not found but required for doc generation.") + message(STATUS "xsltproc or lynx not found but required for doc generation.") set(BUILD_DOC OFF) endif() if(BUILD_DOC AND (NOT DOCBOOK2X_EXECUTABLE)) - message(WARNING "docbook2x-man not found but required for man generation.") + message(STATUS "docbook2x-man not found but required for man generation.") set(BUILD_DOC OFF) endif()

1 0

git:master:09628a8e: cmake: fix typo, missing KRADIUS
by Victor Seva 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: 09628a8e6060a21805fccccc1f530062fca1bb75 URL: https://github.com/kamailio/kamailio/commit/09628a8e6060a21805fccccc1f53006… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-20T09:18:45+01:00 cmake: fix typo, missing KRADIUS --- Modified: .pre-commit-config.yaml Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/09628a8e6060a21805fccccc1f53006… Patch: https://github.com/kamailio/kamailio/commit/09628a8e6060a21805fccccc1f53006… --- diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7892175df39..c5df7975c1f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,4 +16,10 @@ repos: rev: v0.6.13 hooks: - id: cmake-format + verbose: true + args: + - -c cmake/cmake-format.py - id: cmake-lint + verbose: true + args: + - -c cmake/cmake-format.py diff --git a/cmake/groups.cmake b/cmake/groups.cmake index b3562cbbbcc..9cd7ddf77dc 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -720,7 +720,7 @@ list( KPOSTGRES KCPL KXML - KRAIDUS + KRADIUS KUNIXODBC KPERL KSNMPSTATS

1 0

git:master:0a5db680: cmake: Remove depracated modules from groups
by Xenofon Karamanos 17 Jan '25

17 Jan '25

Module: kamailio Branch: master Commit: 0a5db6808e859e88aae739e277d1647e05a4f4c6 URL: https://github.com/kamailio/kamailio/commit/0a5db6808e859e88aae739e277d1647… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-17T14:56:31Z cmake: Remove depracated modules from groups - cmake lint --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/0a5db6808e859e88aae739e277d1647… Patch: https://github.com/kamailio/kamailio/commit/0a5db6808e859e88aae739e277d1647…

1 0

git:master:eeffe798: cmake: Fix ignoring excluded module
by Xenofon Karamanos 17 Jan '25

17 Jan '25

Module: kamailio Branch: master Commit: eeffe798b85d4f8c580c221b0e655b1b49a7420f URL: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-17T14:56:31Z cmake: Fix ignoring excluded module - When adding groups, we now also check if they contain a user-excluded module. --- Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1… Patch: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1… --- diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 22c1341db8a..be55da5f065 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -4,6 +4,7 @@ set(MODULES_DIR "${CMAKE_CURRENT_SOURCE_DIR}") # Initialize a global property to track added modules set_property(GLOBAL PROPERTY ADDED_MODULES_LIST "") set_property(GLOBAL PROPERTY ALL_MODULE_DOC_TARGETS "") +set_property(GLOBAL PROPERTY EXCLUDED_MODULES_LIST "") include(${CMAKE_SOURCE_DIR}/cmake/groups.cmake) @@ -52,9 +53,12 @@ function(add_module_group group_modules) foreach(module_name IN LISTS group_modules) # Check if the module has already been added get_property(ALREADY_ADDED GLOBAL PROPERTY ADDED_MODULES_LIST) - if(";${ALREADY_ADDED};" MATCHES ";${module_name};") + if("${module_name}" IN_LIST ALREADY_ADDED) message( STATUS "Module ${module_name} has already been added. Skipping...") + elseif("${module_name}" IN_LIST EXCLUDED_MODULES_LIST) + message(STATUS "Module ${module_name} is excluded. Skipping...") + list(REMOVE_ITEM ADDED_MODULES_LIST ${module_name}) else() # Construct the path to the module set(module_path "${MODULES_DIR}/${module_name}") @@ -108,28 +112,6 @@ function(add_module_group group_modules) endforeach() endfunction() -list(APPEND FINAL_MODULES_LIST "") - -# Parse and add extra modules specified by the user -separate_arguments(INCLUDE_MODULES_LIST UNIX_COMMAND "${INCLUDE_MODULES}") -message( - STATUS - "Extra modules (if module already included already from group is ignored): - ${INCLUDE_MODULES_LIST}") -list(APPEND FINAL_MODULES_LIST ${INCLUDE_MODULES_LIST}) - -# Exclude modules that were explicitly excluded by the user -separate_arguments(EXCLUDE_MODULES_LIST UNIX_COMMAND "${EXCLUDE_MODULES}") -message(STATUS "Excluded modules (exlcude even if in included modules): - ${EXCLUDE_MODULES_LIST}") -foreach(module_name IN LISTS EXCLUDE_MODULES_LIST) - # if in list remove it and print a message - if(";${FINAL_MODULES_LIST};" MATCHES ";${module_name};") - list(REMOVE_ITEM FINAL_MODULES_LIST ${module_name}) - message(STATUS "Removed module: ${module_name}") - endif() -endforeach() - # Define targets before adding the groups and modules, so that we can add # dependencies to them. add_custom_target( @@ -140,8 +122,19 @@ add_custom_target( add_custom_target(kamailio_docs_man COMMENT "Generating man pages") +# Parse and add extra modules specified by the user +separate_arguments(INCLUDE_MODULES_LIST UNIX_COMMAND "${INCLUDE_MODULES}") +message( + STATUS + "Extra modules (if module already included already from group is ignored): + ${INCLUDE_MODULES_LIST}") +list(APPEND USER_MODULES_LIST ${INCLUDE_MODULES_LIST}) + +separate_arguments(EXCLUDED_MODULES_LIST UNIX_COMMAND "${EXCLUDE_MODULES}") +message(STATUS "Excluded modules (exlcude even if in included modules): + ${EXCLUDED_MODULES_LIST}") + # Add each group of modules -add_module_group("${FINAL_MODULES_LIST}") foreach(group IN LISTS FULL_MODULE_GROUP_NAMES) get_property(MODULES_IN_GROUP VARIABLE PROPERTY "${group}") if(VERBOSE) @@ -149,10 +142,12 @@ foreach(group IN LISTS FULL_MODULE_GROUP_NAMES) endif() add_module_group("${MODULES_IN_GROUP}") endforeach() +add_module_group("${USER_MODULES_LIST}") 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 +# https://gitlab.kitware.com/cmake/cmake/-/issues/26571 add_custom_target(modules COMMENT "Building modules") add_dependencies(modules ${ADDED_MODULES_LIST})

1 0

git:master:81b84ef8: parser/sdp: more details in logs for setting fmtp payload
by Daniel-Constantin Mierla 17 Jan '25

17 Jan '25

Module: kamailio Branch: master Commit: 81b84ef83f59981b6e5f199055e9ab6a94c58b38 URL: https://github.com/kamailio/kamailio/commit/81b84ef83f59981b6e5f199055e9ab6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-17T09:31:42+01:00 parser/sdp: more details in logs for setting fmtp payload --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/81b84ef83f59981b6e5f199055e9ab6… Patch: https://github.com/kamailio/kamailio/commit/81b84ef83f59981b6e5f199055e9ab6… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index 06fc411f502..5eb04b0c047 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -233,7 +233,13 @@ void set_sdp_payload_attr(sdp_payload_attr_t *payload_attr, str *rtp_enc, void set_sdp_payload_fmtp(sdp_payload_attr_t *payload_attr, str *fmtp_string) { if(payload_attr == NULL) { - LM_ERR("Invalid payload location\n"); + if(fmtp_string != NULL && fmtp_string->s != NULL + && fmtp_string->len > 0) { + LM_ERR("Invalid payload location - fmtp: %.*s\n", fmtp_string->len, + fmtp_string->s); + } else { + LM_ERR("Invalid payload location\n"); + } return; } payload_attr->fmtp_string.s = fmtp_string->s; @@ -354,6 +360,8 @@ sdp_payload_attr_t *get_sdp_payload4payload( } } + LM_DBG("payload not found: %.*s\n", rtp_payload->len, rtp_payload->s); + return NULL; }

1 0

[kamailio/kamailio] lib/srdb1/schema: ims_usrloc_pcscf definitions (PR #4108)
by Victor Seva 16 Jan '25

16 Jan '25

#### 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #4100 #### Description db_schema for ims_usrloc_pcscf module You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4108 -- Commit Summary -- * lib/srdb1/schema: ims_usrloc_pcscf definitions * utils/kamctl: regenerate db table definitions -- File Changes -- A src/lib/srdb1/schema/kamailio-ims_usrloc_pcscf.xml (12) A src/lib/srdb1/schema/location_pcscf.xml (436) A utils/kamctl/db_sqlite/ims_usrloc_pcscf-create.sql (52) M utils/kamctl/mysql/ims_usrloc_pcscf-create.sql (99) A utils/kamctl/oracle/ims_usrloc_pcscf-create.sql (60) A utils/kamctl/postgres/ims_usrloc_pcscf-create.sql (52) A utils/kamctl/xhttp_pi/ims_usrloc_pcscf-mod (167) A utils/kamctl/xhttp_pi/ims_usrloc_pcscf-table (51) M utils/kamctl/xhttp_pi/pi_framework.xml (218) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4108.patch https://github.com/kamailio/kamailio/pull/4108.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4108 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4108(a)github.com>

2 8

git:master:fbf120d3: cmake: Add dbschema_xhttp_pi to have consisteny across the targets
by Xenofon Karamanos 16 Jan '25

16 Jan '25

Module: kamailio Branch: master Commit: fbf120d3696b63ecd90055b136fd40c87b5db68e URL: https://github.com/kamailio/kamailio/commit/fbf120d3696b63ecd90055b136fd40c… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-16T13:40:18Z cmake: Add dbschema_xhttp_pi to have consisteny across the targets --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/fbf120d3696b63ecd90055b136fd40c… Patch: https://github.com/kamailio/kamailio/commit/fbf120d3696b63ecd90055b136fd40c… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index c5eb602a18a..10ef2cf9db8 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -314,6 +314,14 @@ else() if("xhttp_pi" IN_LIST FINAL_MODULES_LIST) add_db_target(pi_framework_table "${STYLESHEETS}/pi_framework_table.xsl") add_db_target(pi_framework_mod "${STYLESHEETS}/pi_framework_mod.xsl") + add_custom_target(dbschema_xhttp_pi) + add_dependencies(dbschema_xhttp_pi dbschema_pi_framework_table + dbschema_pi_framework_mod) + + add_custom_target(dbschema_xhttp_pi_clean) + add_dependencies(dbschema_xhttp_pi dbschema_pi_framework_table_clean + dbschema_pi_framework_mod_clean) + add_dependencies(dbschema dbschema_pi_framework_table dbschema_pi_framework_mod) add_dependencies(dbschema_clean dbschema_pi_framework_table_clean

1 0

git:master:a4f44cea: utils/kamctl: regenerate db table definitions
by Henning Westerholt 16 Jan '25

16 Jan '25

Module: kamailio Branch: master Commit: a4f44ceaaf2203e79c8b2f1ea19a7ffc18c2712a URL: https://github.com/kamailio/kamailio/commit/a4f44ceaaf2203e79c8b2f1ea19a7ff… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-16T13:35:47+01:00 utils/kamctl: regenerate db table definitions related #4100 --- Added: utils/kamctl/db_sqlite/ims_usrloc_pcscf-create.sql Added: utils/kamctl/oracle/ims_usrloc_pcscf-create.sql Added: utils/kamctl/postgres/ims_usrloc_pcscf-create.sql Added: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-mod Added: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-table Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/a4f44ceaaf2203e79c8b2f1ea19a7ff… Patch: https://github.com/kamailio/kamailio/commit/a4f44ceaaf2203e79c8b2f1ea19a7ff…

1 0

git:master:f339eb7e: lib/srdb1/schema: ims_usrloc_pcscf definitions
by Henning Westerholt 16 Jan '25

16 Jan '25

Module: kamailio Branch: master Commit: f339eb7e5aee90229f3d6046d5f7586a1622f4bb URL: https://github.com/kamailio/kamailio/commit/f339eb7e5aee90229f3d6046d5f7586… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-16T13:35:47+01:00 lib/srdb1/schema: ims_usrloc_pcscf definitions related #4100 --- Added: src/lib/srdb1/schema/kamailio-ims_usrloc_pcscf.xml Added: src/lib/srdb1/schema/location_pcscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/f339eb7e5aee90229f3d6046d5f7586… Patch: https://github.com/kamailio/kamailio/commit/f339eb7e5aee90229f3d6046d5f7586…

1 0

git:master:5fe61ec6: core: tcp - remove level and function name from log message
by Daniel-Constantin Mierla 16 Jan '25

16 Jan '25

Module: kamailio Branch: master Commit: 5fe61ec6dbcd9d2dde3f2bd978dad5130ac5bff9 URL: https://github.com/kamailio/kamailio/commit/5fe61ec6dbcd9d2dde3f2bd978dad51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-16T10:47:25+01:00 core: tcp - remove level and function name from log message --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/5fe61ec6dbcd9d2dde3f2bd978dad51… Patch: https://github.com/kamailio/kamailio/commit/5fe61ec6dbcd9d2dde3f2bd978dad51… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index ae75027083b..2cf24246be7 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1528,8 +1528,7 @@ int tcp_read_req(struct tcp_connection *con, int *bytes_read, if(unlikely(bytes < 0)) { LOG(cfg_get(core, core_cfg, corelog), - "ERROR: tcp_read_req: error reading - c: %p r: %p (%d)\n", - con, req, bytes); + "error reading - c: %p r: %p (%d)\n", con, req, bytes); resp = CONN_ERROR; goto end_req; }

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
30
Older →

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