sr-dev January 2025

sr-dev@lists.kamailio.org

19 participants
184 discussions

git:master:a404f598: xhttp_prom: free memory in case of startup problems, use standard memory log helper

by Henning Westerholt

Module: kamailio Branch: master Commit: a404f598dce129cdd3d73dd0e79e011e0948b0c1 URL: https://github.com/kamailio/kamailio/commit/a404f598dce129cdd3d73dd0e79e011… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-10T16:11:26Z xhttp_prom: free memory in case of startup problems, use standard memory log helper --- Modified: src/modules/xhttp_prom/xhttp_prom.c --- Diff: https://github.com/kamailio/kamailio/commit/a404f598dce129cdd3d73dd0e79e011… Patch: https://github.com/kamailio/kamailio/commit/a404f598dce129cdd3d73dd0e79e011… --- diff --git a/src/modules/xhttp_prom/xhttp_prom.c b/src/modules/xhttp_prom/xhttp_prom.c index 247b349ee5b..73cc29d58c3 100644 --- a/src/modules/xhttp_prom/xhttp_prom.c +++ b/src/modules/xhttp_prom/xhttp_prom.c @@ -304,7 +304,7 @@ static int mod_init(void) size_t len_comma = xhttp_prom_tags.len + 4; xhttp_prom_tags_comma = shm_malloc(len_comma); if(xhttp_prom_tags_comma == NULL) { - LM_ERR("cannot allocate memory for helper variable\n"); + SHM_MEM_ERROR; return -1; } memset(xhttp_prom_tags_comma, 0, len_comma); @@ -314,7 +314,8 @@ static int mod_init(void) size_t len_braces = xhttp_prom_tags.len + 4; xhttp_prom_tags_braces = shm_malloc(len_braces); if(xhttp_prom_tags_braces == NULL) { - LM_ERR("cannot allocate memory for helper variable\n"); + SHM_MEM_ERROR; + shm_free(xhttp_prom_tags_comma); return -1; } memset(xhttp_prom_tags_braces, 0, len_braces);

3 weeks, 4 days

[kamailio/kamailio] xhttp_prom: new xhttp_prom_tags paramete (PR #4073)

by Christian Berger

- allows custom tags to be added to prometheus metrics - Addresses GH issue #4021   #### 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #4021 #### Description  This change adds a new parameter `xhttp_prom_tags`. It allows the user to append tags to the prometheus metrics. This makes those metrics a lot more useful when having multiple kamailio instances running on a single host. This is done by 2 shared memory helper variables which contain the parameter in different formats. This way it is easy to print them out with minimal changes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4073 -- Commit Summary -- * xhttp_prom: new xhttp_prom_tags paramete -- File Changes -- M src/modules/xhttp_prom/doc/xhttp_prom_admin.xml (25) M src/modules/xhttp_prom/prom.c (30) M src/modules/xhttp_prom/xhttp_prom.c (50) M src/modules/xhttp_prom/xhttp_prom.h (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4073.patch https://github.com/kamailio/kamailio/pull/4073.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4073 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4073(a)github.com>

3 weeks, 4 days

git:master:f92de6d0: xhttp_prom: new xhttp_prom_tags parameter

by Henning Westerholt

Module: kamailio Branch: master Commit: f92de6d0e5d0080f602a953113ecdc8fa53738d5 URL: https://github.com/kamailio/kamailio/commit/f92de6d0e5d0080f602a953113ecdc8… Author: Christian Berger <berger(a)sipgate.de> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-10T17:08:55+01:00 xhttp_prom: new xhttp_prom_tags parameter - allows custom tags to be added to prometheus metrics - Addresses GH issue #4021 --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml Modified: src/modules/xhttp_prom/prom.c Modified: src/modules/xhttp_prom/xhttp_prom.c Modified: src/modules/xhttp_prom/xhttp_prom.h --- Diff: https://github.com/kamailio/kamailio/commit/f92de6d0e5d0080f602a953113ecdc8… Patch: https://github.com/kamailio/kamailio/commit/f92de6d0e5d0080f602a953113ecdc8…

3 weeks, 4 days

[kamailio/kamailio] examples: fix kamailio ims cfg file for basic volte call (PR #4090)

by Supreeth Herle

#### 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) - [ ] 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) - [ ] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4090 -- Commit Summary -- * examples: fix kamailio ims cfg file for basic volte call -- File Changes -- M misc/examples/ims/icscf/icscf.cfg.sample (12) M misc/examples/ims/icscf/icscf.xml.sample (6) M misc/examples/ims/icscf/kamailio.cfg (32) M misc/examples/ims/pcscf/kamailio.cfg (182) M misc/examples/ims/pcscf/pcscf.cfg.sample (55) M misc/examples/ims/pcscf/pcscf.xml.sample (6) M misc/examples/ims/pcscf/route/mo.cfg (99) M misc/examples/ims/pcscf/route/mt.cfg (101) M misc/examples/ims/pcscf/route/register.cfg (198) M misc/examples/ims/pcscf/route/rtp.cfg (90) M misc/examples/ims/scscf/kamailio.cfg (115) M misc/examples/ims/scscf/scscf.cfg.sample (24) M misc/examples/ims/scscf/scscf.xml.sample (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4090.patch https://github.com/kamailio/kamailio/pull/4090.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4090 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4090(a)github.com>

3 weeks, 5 days

git:master:ce455325: examples: fix kamailio ims cfg file for basic volte call

by Henning Westerholt

Module: kamailio Branch: master Commit: ce45532512e65f58f77f01f50f3a2ee0bf79d7f1 URL: https://github.com/kamailio/kamailio/commit/ce45532512e65f58f77f01f50f3a2ee… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-10T17:02:51+01:00 examples: fix kamailio ims cfg file for basic volte call --- Modified: misc/examples/ims/icscf/icscf.cfg.sample Modified: misc/examples/ims/icscf/icscf.xml.sample Modified: misc/examples/ims/icscf/kamailio.cfg Modified: misc/examples/ims/pcscf/kamailio.cfg Modified: misc/examples/ims/pcscf/pcscf.cfg.sample Modified: misc/examples/ims/pcscf/pcscf.xml.sample Modified: misc/examples/ims/pcscf/route/mo.cfg Modified: misc/examples/ims/pcscf/route/mt.cfg Modified: misc/examples/ims/pcscf/route/register.cfg Modified: misc/examples/ims/pcscf/route/rtp.cfg Modified: misc/examples/ims/scscf/kamailio.cfg Modified: misc/examples/ims/scscf/scscf.cfg.sample Modified: misc/examples/ims/scscf/scscf.xml.sample --- Diff: https://github.com/kamailio/kamailio/commit/ce45532512e65f58f77f01f50f3a2ee… Patch: https://github.com/kamailio/kamailio/commit/ce45532512e65f58f77f01f50f3a2ee…

3 weeks, 5 days

[kamailio/kamailio] core: parser - set URI type to TELS_URI_T for user=phone SIPS R-URI (PR #4093)

by Alexander Bakker

#### 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Fixes an issue where setting the ``$rU`` for a SIPS R-URI containing ``user=phone`` would overwrite the scheme to ``sip``. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4093 -- Commit Summary -- * core: parser - set URI type to TELS_URI_T for user=phone SIPS R-URI -- File Changes -- M src/core/parser/parse_uri.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4093.patch https://github.com/kamailio/kamailio/pull/4093.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4093 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4093(a)github.com>

3 weeks, 5 days

git:master:8801cf72: core: parser - set URI type to TELS_URI_T for user=phone SIPS R-URI

by Henning Westerholt

Module: kamailio Branch: master Commit: 8801cf72c77e9233c789a9a0a1536ac524d5abf6 URL: https://github.com/kamailio/kamailio/commit/8801cf72c77e9233c789a9a0a1536ac… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-10T17:00:23+01:00 core: parser - set URI type to TELS_URI_T for user=phone SIPS R-URI Fixes an issue where setting the ``$rU`` for a SIPS R-URI containing ``user=phone`` would overwrite the scheme to ``sip``. --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/8801cf72c77e9233c789a9a0a1536ac… Patch: https://github.com/kamailio/kamailio/commit/8801cf72c77e9233c789a9a0a1536ac… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 9c16fffd1c1..718f6735422 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -1277,7 +1277,7 @@ int parse_uri(char *buf, int len, struct sip_uri *uri) uri->sip_params = uri->params; if((phone2tel) && (uri->user_param_val.len == 5) && (strncmp(uri->user_param_val.s, "phone", 5) == 0)) { - uri->type = TEL_URI_T; + uri->type = uri->type == SIPS_URI_T ? TELS_URI_T : TEL_URI_T; uri->flags |= URI_SIP_USER_PHONE; /* move params from user into uri->params */ p = q_memchr(uri->user.s, ';', uri->user.len);

3 weeks, 5 days

git:master:b5b40ef6: cmake: Add install targets for missing configuration files

by Xenofon Karamanos

Module: kamailio Branch: master Commit: b5b40ef61901579f020f8eff002bd6e978919335 URL: https://github.com/kamailio/kamailio/commit/b5b40ef61901579f020f8eff002bd6e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-10T15:37:13Z cmake: Add install targets for missing configuration files - tls: Add comment and use the --install for the install target like the rest - auth_radius: Add dictionary installation - xhttp_pi: Add pi_framework.xml --- Modified: src/modules/auth_radius/CMakeLists.txt Modified: src/modules/tls/CMakeLists.txt Modified: src/modules/xhttp_pi/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/b5b40ef61901579f020f8eff002bd6e… Patch: https://github.com/kamailio/kamailio/commit/b5b40ef61901579f020f8eff002bd6e…

3 weeks, 5 days

git:master:abb4a6a1: cmake/tls: Add targets for installing cfg and cert

by Xenofon Karamanos

Module: kamailio Branch: master Commit: abb4a6a195995901294bae105355a3414edaf05c URL: https://github.com/kamailio/kamailio/commit/abb4a6a195995901294bae105355a34… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-10T14:38:24Z cmake/tls: Add targets for installing cfg and cert --- Modified: src/modules/tls/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/abb4a6a195995901294bae105355a34… Patch: https://github.com/kamailio/kamailio/commit/abb4a6a195995901294bae105355a34… --- diff --git a/src/modules/tls/CMakeLists.txt b/src/modules/tls/CMakeLists.txt index 84c1110d9eb..b9c6d1dd0f2 100644 --- a/src/modules/tls/CMakeLists.txt +++ b/src/modules/tls/CMakeLists.txt @@ -38,6 +38,50 @@ else() ZLIB::ZLIB Threads::Threads) endif() -# target_link_libraries(${module_name} PRIVATE ${CMAKE_THREAD_LIBS_INIT}) +# Install the configuration file (tls.cfg) using a CODE block to check +# existence at install time instead of configure time +install( + CODE " + set(dir \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SYSCONFDIR}/${MAIN_NAME}\") + set(file \"tls.cfg\") + if(EXISTS \"\${dir}/\${file}\") + message(STATUS \"\${file} already exists in \${dir}/\${file}. + Installing as \${file}.sample\") + file(INSTALL \"${CMAKE_CURRENT_SOURCE_DIR}/\${file}\" + DESTINATION \"${CMAKE_INSTALL_FULL_SYSCONFDIR}/${MAIN_NAME}\" + RENAME \"\${file}.sample\" + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) + else() + file(INSTALL \"${CMAKE_CURRENT_SOURCE_DIR}/\${file}\" + DESTINATION \"${CMAKE_INSTALL_FULL_SYSCONFDIR}/${MAIN_NAME}\" + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + endif() +" + COMPONENT tls-cfg) -# TODO: Install files such as cfg and modify it with sed and certs +add_custom_command( + OUTPUT tls.cfg.sample + COMMAND + sed -e "s#\/usr/local/etc/kamailio/#${CMAKE_INSTALL_FULL_SYSCONFDIR}#g" -e + "s#kamailio-selfsigned#${MAIN_NAME}-selfsigned#g" < tls.cfg > + ${CMAKE_CURRENT_BINARY_DIR}/tls.cfg.sample + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + +# Always build/generate tls.cfg.sample in the build directory +# This is needed for the default install target to pick it up +add_custom_target(tls_cfg_sample ALL DEPENDS tls.cfg.sample) + +add_custom_target( + tls-install-cfg + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/tls.cfg.sample + ${CMAKE_INSTALL_FULL_SYSCONFDIR}/${MAIN_NAME} + COMMENT "Installing tls.cfg.sample to ${MAIN_NAME} config directory") +add_dependencies(tls-install-cfg tls_cfg_sample) + +# Add tls-cert target +add_custom_target( + tls-install-cert + COMMAND ${CMAKE_COMMAND} -E env MAIN_NAME=${MAIN_NAME} ./tls_cert.sh -d + ${CMAKE_INSTALL_FULL_SYSCONFDIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

3 weeks, 5 days

git:master:001390d8: cmake: Don't build all utils unless required by modules

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 001390d802c73e840e57015763a4b6164ae2eb6d URL: https://github.com/kamailio/kamailio/commit/001390d802c73e840e57015763a4b61… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-10T12:17:00Z cmake: Don't build all utils unless required by modules - Build always kamctl and kamcmd - The rest of utils should be included from the module that requires them or a new add_subdirectory in src/CMakelists.txt --- Modified: CMakeLists.txt Modified: src/modules/db_berkeley/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/001390d802c73e840e57015763a4b61… Patch: https://github.com/kamailio/kamailio/commit/001390d802c73e840e57015763a4b61… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index f3ccd88160d..d8836184b73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,9 @@ include(${CMAKE_SOURCE_DIR}/cmake/defs.cmake) add_subdirectory(src) # Add utils -add_subdirectory(utils) +# add_subdirectory(utils) +add_subdirectory(utils/kamctl) +add_subdirectory(utils/kamcmd) # TODO: Packaging stuuf. These should be on different file propably set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) diff --git a/src/modules/db_berkeley/CMakeLists.txt b/src/modules/db_berkeley/CMakeLists.txt index 1ff6f84245d..f2884f8e51e 100644 --- a/src/modules/db_berkeley/CMakeLists.txt +++ b/src/modules/db_berkeley/CMakeLists.txt @@ -8,4 +8,7 @@ find_package(BerkeleyDB REQUIRED) target_link_libraries(${module_name} PRIVATE BerkeleyDB::BerkeleyDB) # Build also the util function found in utils/db_berkeley/ +# This is needed to build the kamdb_recover utility +add_subdirectory(${CMAKE_SOURCE_DIR}/utils/db_berkeley + ${CMAKE_BINARY_DIR}/utils/db_berkeley) add_dependencies(${module_name} kamdb_recover)

3 weeks, 5 days

← Newer
1
...
11
12
13
14
15
16
17
18
19
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