sr-dev May 2025

sr-dev@lists.kamailio.org

13 participants
122 discussions

git:master:c1e81dfa: textops: docs for str_all_in()
by Daniel-Constantin Mierla 20 May '25

20 May '25

Module: kamailio Branch: master Commit: c1e81dfa915f5c52da83cf02cbecdcf881eb057c URL: https://github.com/kamailio/kamailio/commit/c1e81dfa915f5c52da83cf02cbecdcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-20T09:17:00+02:00 textops: docs for str_all_in() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c1e81dfa915f5c52da83cf02cbecdcf… Patch: https://github.com/kamailio/kamailio/commit/c1e81dfa915f5c52da83cf02cbecdcf… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 86f02b97336..9560eb6d663 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1955,6 +1955,29 @@ if (str_any_in("$hdr(X-Hdr)", ";',:")) { </example> </section> + <section id="textops.f.str_all_in"> + <title> + <function moreinfo="none">str_all_in(txt, clist)</function> + </title> + <para> + Return 1 (true) if all character in "clist" are found inside "txt". + Both paramters can contain variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>str_all_in</function> usage</title> + <programlisting format="linespecific"> +... +if (str_all_in("$hdr(X-Hdr)", ".;-")) { + # do interesting stuff here +} +... +</programlisting> + </example> + </section> + <section id="textops.f.set_body_multipart"> <title> <function moreinfo="none">set_body_multipart([txt, content_type][, boundary])</function>

1 0

git:master:1c398d31: textops: added str_all_in() function
by Daniel-Constantin Mierla 20 May '25

20 May '25

Module: kamailio Branch: master Commit: 1c398d313f5b73e7ee8cf5415b2e3045989ba385 URL: https://github.com/kamailio/kamailio/commit/1c398d313f5b73e7ee8cf5415b2e304… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-20T09:17:00+02:00 textops: added str_all_in() function - check if a group of characters is inside a string --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/1c398d313f5b73e7ee8cf5415b2e304… Patch: https://github.com/kamailio/kamailio/commit/1c398d313f5b73e7ee8cf5415b2e304… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index aee46a301a6..4a541399f18 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -142,6 +142,7 @@ static int ends_with_f(struct sip_msg *msg, char *str1, char *str2); static int str_find_f(sip_msg_t *msg, char *str1, char *str2); static int str_ifind_f(sip_msg_t *msg, char *str1, char *str2); static int str_any_in_f(sip_msg_t *msg, char *str1, char *str2); +static int str_all_in_f(struct sip_msg *msg, char *str1, char *str2); static int remove_hf_re_f(struct sip_msg *msg, char *key, char *foo); static int remove_hf_exp_f(sip_msg_t *msg, char *ematch, char *eskip); static int is_present_hf_re_f(struct sip_msg *msg, char *key, char *foo); @@ -291,6 +292,8 @@ static cmd_export_t cmds[] = { ANY_ROUTE}, {"str_any_in", (cmd_function)str_any_in_f, 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"str_all_in", (cmd_function)str_all_in_f, 2, fixup_spve_spve, 0, + ANY_ROUTE}, {"is_audio_on_hold", (cmd_function)is_audio_on_hold_f, 0, 0, 0, ANY_ROUTE}, {"append_time_to_request", (cmd_function)append_time_request_f, 0, 0, 0, @@ -4630,6 +4633,47 @@ static int str_any_in_f(struct sip_msg *msg, char *str1, char *str2) return ki_str_any_in(msg, &s1, &s2); } +static int ki_str_all_in(sip_msg_t *msg, str *txt, str *clist) +{ + int i, j, f; + + if(txt == NULL || txt->len <= 0 || clist == NULL || clist->len <= 0) { + return -1; + } + + for(j = 0; j < clist->len; j++) { + f = 0; + for(i = 0; i < txt->len; i++) { + if(txt->s[i] == clist->s[j]) { + f = 1; + break; + } + } + if(f == 0) { + return -1; + } + } + + return 1; +} + +static int str_all_in_f(struct sip_msg *msg, char *str1, char *str2) +{ + str s1; + str s2; + + if(fixup_get_svalue(msg, (gparam_p)str1, &s1) != 0) { + LM_ERR("cannot get first parameter\n"); + return -8; + } + if(fixup_get_svalue(msg, (gparam_p)str2, &s2) != 0) { + LM_ERR("cannot get second parameter\n"); + return -8; + } + + return ki_str_all_in(msg, &s1, &s2); +} + static int ki_is_audio_on_hold(sip_msg_t *msg) { int sdp_session_num = 0, sdp_stream_num; @@ -5512,6 +5556,11 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("str_all_in"), + SR_KEMIP_INT, ki_str_all_in, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("is_audio_on_hold"), SR_KEMIP_INT, ki_is_audio_on_hold, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] cmake: Main change is the component based installation. (PR #4244)
by Xenofon Karamanos 19 May '25

19 May '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) - [x] New feature (non-breaking change which adds new functionality) - [x] 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  This PRs main focus is to introduce components groups for easier building of various groups. Other main changes: - Forbid in-source builds - First draft packaging file for easier debian generation - Introduce checksymbol exists for feature detection - Since during the dev of itm more and more commits were included, I am creating a PR for easier rollback if something goes wrong. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4244 -- Commit Summary -- * cmake: Use components to install groups * cmake: Forbid in-source builds * cmake: Warning if no modules/group were selected * cmake: If BUILD_DOC options is set to ON, include doc and man targets to default target! * cmake: quote variables for expansion * cmake: Better handling of doc generation dependencies * cmake: Fix formatting according to cmake-format config file * cmake: Refactor packaging setup and improve installation paths * cmake: Fix build paths for dbschema. * cmake: Remove warning message * cmake: Add check and warning for module docs * cmake: Add missing defintion * cmake: Add some comments * cmake: Introduce CheckSymbolExists for feature detection * cmake: Remove unused groups * cmake: Fix wrong name of option * cmake: Remove unnessecary components to be consistent * cmake: Quiet fail for rabbit-mq * cmake: Remove find_package for ORTP and Mediastreamer2 libraries -- File Changes -- M CMakeLists.txt (23) M cmake/compiler-specific.cmake (6) A cmake/db_files.cmake (51) A cmake/dbschema.cmake (117) A cmake/deb-packaging.cmake (18) M cmake/defs.cmake (51) M cmake/groups.cmake (179) M cmake/modules-docs.cmake (144) M cmake/os-specific.cmake (8) M cmake/os-specific/darwin.cmake (8) M cmake/os-specific/dragonfly.cmake (12) M cmake/os-specific/freebsd.cmake (8) M cmake/os-specific/linux.cmake (14) M src/CMakeLists.txt (79) M src/core/CMakeLists.txt (2) M src/modules/CMakeLists.txt (46) M src/modules/app_perl/CMakeLists.txt (10) M src/modules/auth_radius/CMakeLists.txt (3) M src/modules/crypto/CMakeLists.txt (2) M src/modules/db_berkeley/CMakeLists.txt (7) M src/modules/db_mongodb/CMakeLists.txt (25) M src/modules/db_mysql/CMakeLists.txt (7) M src/modules/db_oracle/CMakeLists.txt (7) M src/modules/db_postgres/CMakeLists.txt (7) M src/modules/db_redis/CMakeLists.txt (3) M src/modules/db_sqlite/CMakeLists.txt (7) M src/modules/db_text/CMakeLists.txt (13) M src/modules/dnssec/CMakeLists.txt (2) M src/modules/kazoo/CMakeLists.txt (4) M src/modules/rabbitmq/CMakeLists.txt (3) M src/modules/rtp_media_server/CMakeLists.txt (21) M src/modules/snmpstats/CMakeLists.txt (3) M src/modules/tls/CMakeLists.txt (2) M src/modules/xhttp_pi/CMakeLists.txt (18) M utils/db_berkeley/CMakeLists.txt (1) M utils/kamcmd/CMakeLists.txt (13) M utils/kamctl/CMakeLists.txt (293) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4244.patch https://github.com/kamailio/kamailio/pull/4244.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4244 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4244(a)github.com>

1 9

git:master:6753acd0: cmake: Centralize dbschema generation
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 6753acd06859e5e5e34a7981765c4bcdbeb66897 URL: https://github.com/kamailio/kamailio/commit/6753acd06859e5e5e34a7981765c4bc… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Centralize dbschema generation - Do not define the targets if xsltproc is missing --- Modified: cmake/dbschema.cmake Modified: src/CMakeLists.txt Modified: src/modules/db_berkeley/CMakeLists.txt Modified: src/modules/db_mongodb/CMakeLists.txt Modified: src/modules/db_mysql/CMakeLists.txt Modified: src/modules/db_oracle/CMakeLists.txt Modified: src/modules/db_postgres/CMakeLists.txt Modified: src/modules/db_redis/CMakeLists.txt Modified: src/modules/db_sqlite/CMakeLists.txt Modified: src/modules/db_text/CMakeLists.txt Modified: src/modules/xhttp_pi/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/6753acd06859e5e5e34a7981765c4bc… Patch: https://github.com/kamailio/kamailio/commit/6753acd06859e5e5e34a7981765c4bc…

1 0

git:master:f9bbac51: cmake: Fix wrong name of option
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: f9bbac5167e98952ef5b1764c3f2c4b6939fd25d URL: https://github.com/kamailio/kamailio/commit/f9bbac5167e98952ef5b1764c3f2c4b… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Fix wrong name of option --- Modified: cmake/dbschema.cmake --- Diff: https://github.com/kamailio/kamailio/commit/f9bbac5167e98952ef5b1764c3f2c4b… Patch: https://github.com/kamailio/kamailio/commit/f9bbac5167e98952ef5b1764c3f2c4b… --- diff --git a/cmake/dbschema.cmake b/cmake/dbschema.cmake index db7ff430d92..eac256f17e2 100644 --- a/cmake/dbschema.cmake +++ b/cmake/dbschema.cmake @@ -19,8 +19,8 @@ else() add_custom_target(dbschema_clean COMMENT "Cleaning schemas for all dbs...") endif() - option(XSLT_VALIDATE, "Enable schema validation during XSL transformations" ON) - option(XSLT_VERBOSE, "Enable verbose output for XSL transformations" OFF) + option(XSLT_VALIDATE "Enable schema validation during XSL transformations" ON) + option(XSLT_VERBOSE "Enable verbose output for XSL transformations" OFF) set(XSLTPROC_FLAGS --xinclude) if(NOT ${XSLT_VALIDATE})

1 0

git:master:497b7d94: cmake: Add some comments
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 497b7d94b8d3575cf7399c8537e96297bcd4062b URL: https://github.com/kamailio/kamailio/commit/497b7d94b8d3575cf7399c8537e9629… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Add some comments --- Modified: cmake/compiler-specific.cmake Modified: cmake/db_files.cmake Modified: cmake/dbschema.cmake Modified: cmake/os-specific.cmake Modified: src/CMakeLists.txt Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/497b7d94b8d3575cf7399c8537e9629… Patch: https://github.com/kamailio/kamailio/commit/497b7d94b8d3575cf7399c8537e9629…

1 0

git:master:782d9319: cmake: Add check and warning for module docs
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 782d93197c928f8856a7026c93aebd223c6cb682 URL: https://github.com/kamailio/kamailio/commit/782d93197c928f8856a7026c93aebd2… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Add check and warning for module docs --- Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/782d93197c928f8856a7026c93aebd2… Patch: https://github.com/kamailio/kamailio/commit/782d93197c928f8856a7026c93aebd2… --- diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 33948dc9f6c..dea294090a6 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -107,8 +107,14 @@ function(add_module_group group_name group_modules) ) # Add the module to the list of added modules set_property(GLOBAL APPEND PROPERTY ADDED_MODULES_LIST ${module_name}) - docs_add_module(${group_name} ${module_name}) - set_property(GLOBAL APPEND PROPERTY ALL_MODULE_DOC_TARGETS ${module_name}_doc) + if(NOT EXISTS ${CMAKE_SOURCE_DIR}/src/modules/${module_name}/doc/${module_name}.xml) + message(WARNING "No documentation found for module ${module_name}.") + return() + else() + docs_add_module(${group_name} ${module_name}) + set_property(GLOBAL APPEND PROPERTY ALL_MODULE_DOC_TARGETS ${module_name}_doc) + endif() + else() message(FATAL_ERROR "Module directory ${module_path} does not exist.") endif()

1 0

git:master:478ddb1f: cmake: Fix build paths for dbschema.
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 478ddb1f38817ac4730d0f499c73046be26b6907 URL: https://github.com/kamailio/kamailio/commit/478ddb1f38817ac4730d0f499c73046… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Fix build paths for dbschema. - Build artifcats of dbschema should be in utils folder --- Modified: cmake/dbschema.cmake --- Diff: https://github.com/kamailio/kamailio/commit/478ddb1f38817ac4730d0f499c73046… Patch: https://github.com/kamailio/kamailio/commit/478ddb1f38817ac4730d0f499c73046… --- diff --git a/cmake/dbschema.cmake b/cmake/dbschema.cmake index 515b1048b9b..a380281a295 100644 --- a/cmake/dbschema.cmake +++ b/cmake/dbschema.cmake @@ -62,7 +62,7 @@ else() add_custom_target( dbschema_${db_name} COMMAND ${CMAKE_COMMAND} -E make_directory "${db_name_folder}" - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/utils/kamctl COMMENT "Creating schemas for ${db_name}" ) @@ -86,7 +86,7 @@ else() PRE_BUILD COMMAND "XML_CATALOG_FILES=${CATALOG}" ${XSLTPROC_EXECUTABLE} ${XSLTPROC_FLAGS} --stringparam dir - ${CMAKE_CURRENT_BINARY_DIR}/${db_name_folder}/${folder_suffix} --stringparam prefix + ${CMAKE_BINARY_DIR}/utils/kamctl/${db_name_folder}/${folder_suffix} --stringparam prefix ${prefix} --stringparam db ${db_name} ${xsl_file} "kamailio-${table}.xml" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/src/lib/srdb1/schema" COMMENT "Processing ${table} for ${db_name}" @@ -95,7 +95,8 @@ else() add_custom_target( dbschema_${db_name}_clean - COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/${db_name_folder}" + COMMAND ${CMAKE_COMMAND} -E remove_directory + "${CMAKE_BINARY_DIR}/utils/kamctl/${db_name_folder}" COMMENT "Cleaning ${db_name} schema files" )

1 0

git:master:0550b630: cmake: Fix formatting and add some comments.
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 0550b6300703ec5536a033e1d4ba4d70ec53f83a URL: https://github.com/kamailio/kamailio/commit/0550b6300703ec5536a033e1d4ba4d7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Fix formatting and add some comments. - Remove unused replacement SRC_NAME to MAIN_NAME --- Modified: CMakeLists.txt Modified: src/CMakeLists.txt Modified: src/core/CMakeLists.txt Modified: src/modules/CMakeLists.txt Modified: src/modules/app_perl/CMakeLists.txt Modified: utils/kamcmd/CMakeLists.txt Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/0550b6300703ec5536a033e1d4ba4d7… Patch: https://github.com/kamailio/kamailio/commit/0550b6300703ec5536a033e1d4ba4d7…

1 0

git:master:08bfcad2: cmake: Better handling of doc generation dependencies
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 08bfcad2c34855dbadd3c9eafda72b38a6e65a1c URL: https://github.com/kamailio/kamailio/commit/08bfcad2c34855dbadd3c9eafda72b3… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Better handling of doc generation dependencies --- Modified: cmake/modules-docs.cmake Modified: src/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/08bfcad2c34855dbadd3c9eafda72b3… Patch: https://github.com/kamailio/kamailio/commit/08bfcad2c34855dbadd3c9eafda72b3…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2025