- sr-dev - kamailio.org

git:master:394cc191: cmake: Refines uninstall script and updates CMake options
by Xenofon Karamanos 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: 394cc191e172f49525c91e3540eb590edf8bd101 URL: https://github.com/kamailio/kamailio/commit/394cc191e172f49525c91e3540eb590… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-03T15:14:15Z cmake: Refines uninstall script and updates CMake options - Modifies uninstall logic removing duplicate file entries when both .cfg and .cfg sample are installed - Remove unused SCTP and duplicate fast memory statistics options in CMake --- Modified: cmake/cmake_uninstall.cmake.in Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/394cc191e172f49525c91e3540eb590… Patch: https://github.com/kamailio/kamailio/commit/394cc191e172f49525c91e3540eb590… --- diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in index 333534f3068..1087faf024e 100644 --- a/cmake/cmake_uninstall.cmake.in +++ b/cmake/cmake_uninstall.cmake.in @@ -6,10 +6,12 @@ if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") endif() file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files) -list(APPEND files "@CMAKE_INSTALL_PREFIX@/etc/kamailio/kamailio.cfg") -list(APPEND files "@CMAKE_INSTALL_PREFIX@/etc/kamailio/kamctlrc") - string(REGEX REPLACE "\n" ";" files "${files}") + +list(APPEND files "@CMAKE_INSTALL_PREFIX@/etc/@MAIN_NAME@/@CFG_NAME@.cfg") +list(APPEND files "@CMAKE_INSTALL_PREFIX@/etc/@MAIN_NAME@/kamctlrc") +list(REMOVE_DUPLICATES files) + foreach(file ${files}) message(STATUS "Uninstalling $ENV{DESTDIR}${file}") if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") @@ -26,7 +28,7 @@ foreach(file ${files}) if(NOT "${rm_retval}" STREQUAL 0) message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}") endif() - else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") + else() message(STATUS "File $ENV{DESTDIR}${file} does not exist.") endif() endforeach() diff --git a/cmake/defs.cmake b/cmake/defs.cmake index c3a338ec5ea..10940d2030c 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -45,7 +45,6 @@ endif() option(KMSTATS "Kamailio statistics" ON) option(FMSTATS "Fast memory statistics" ON) option(WITHAS "With Application server support" ON) -option(SCTP "SCTP support" ON) option(RAW_SOCKS "Raw sockets support" ON) option(MEMPKG "Package memory or sys " ON) @@ -80,7 +79,6 @@ option(USE_DST_BLOCKLIST "Use destination blacklist" ON) option(HAVE_RESOLV_RES "Have resolv_res" ON) option(KSR_PTHREAD_MUTEX_SHARED "Use shared mutex for TLS" ON) -option(FMSTATS "Fast memory statistics" ON) option(STATISTICS "Statistics" ON) # if(${MEMPKG}) target_compile_definitions(common INTERFACE PKG_MALLOC) else() # if(${MEMDBGSYS}) target_compile_definitions(common INTERFACE DDBG_SYS_MEMORY) @@ -271,8 +269,6 @@ if(NO_DEV_POLL) target_compile_definitions(common INTERFACE NO_DEV_POLL) endif() -# if(USE_SCTP) target_compile_definitions(common INTERFACE USE_SCTP) endif() - if(RAW_SOCKS) target_compile_definitions(common INTERFACE RAW_SOCKS) endif()

1 0

git:master:6235369e: cmake: Update platform-specific flags
by Xenofon Karamanos 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: 6235369e1deab4b87c999d5f00fb59b6609b3df6 URL: https://github.com/kamailio/kamailio/commit/6235369e1deab4b87c999d5f00fb59b… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-03T14:19:43Z cmake: Update platform-specific flags - Update the platform-specific flags in the "os-specific.cmake" file for Linux and DragonFly BSD. - Add new files "dragonfly.cmake" and "linux.cmake" in the "os-specific" directory to define the flags for DragonFly BSD and Linux, respectively. - Add a new file "macos.cmake" in the "os-specific" directory to define the flags for Mac OS X. - Update the "defs.cmake" file to print the availability of fast lock. --- Added: cmake/os-specific/dragonfly.cmake Added: cmake/os-specific/linux.cmake Added: cmake/os-specific/macos.cmake Modified: cmake/defs.cmake Modified: cmake/os-specific.cmake --- Diff: https://github.com/kamailio/kamailio/commit/6235369e1deab4b87c999d5f00fb59b… Patch: https://github.com/kamailio/kamailio/commit/6235369e1deab4b87c999d5f00fb59b…

1 0

git:master:76e18d0d: xlog: evaluate prefix for kemi functions
by Daniel-Constantin Mierla 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: 76e18d0d13a41e93094f9084ac44e0809f91b109 URL: https://github.com/kamailio/kamailio/commit/76e18d0d13a41e93094f9084ac44e08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-03T08:03:57+01:00 xlog: evaluate prefix for kemi functions --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/76e18d0d13a41e93094f9084ac44e08… Patch: https://github.com/kamailio/kamailio/commit/76e18d0d13a41e93094f9084ac44e08… --- diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index 98c6e49a0f9..f19d3c1467f 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -886,6 +886,7 @@ int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg) int lf = xlog_facility; pv_elem_t *xmodel = NULL; str txt = {0, 0}; + char *_xlog_prefix_val = _xlog_prefix; if(!is_printable(llevel)) return 1; @@ -901,6 +902,18 @@ int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg) return -1; } + if(_xlog_prefix_mode) { + str _xlog_prefix_str; + _xlog_prefix_str.s = _xlog_prefix_buf; + _xlog_prefix_str.len = buf_size; + if(pv_printf(msg, _xlog_prefix_pvs, _xlog_prefix_str.s, + &_xlog_prefix_str.len) + == 0 + && _xlog_prefix_str.len > 0) { + _xlog_prefix_val = _xlog_prefix_buf; + } + } + if(lfacility != NULL) { lfacility->s[lfacility->len] = '\0'; lf = str2facility(lfacility->s); @@ -910,8 +923,7 @@ int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg) lf = xlog_facility; } } - LOG_FN(lf, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); - ; + LOG_FN(lf, llevel, _xlog_prefix_val, "%.*s", txt.len, txt.s); pv_elem_free_all(xmodel); return 1; }

1 0

[kamailio/kamailio] "Critical" level does not work for Python3s KSR.xlog.* (Issue #4048)
by Ben Kaufman 02 Dec '24

02 Dec '24

### Description When calling inline functions using `app_python3s_exec()`, setting the level to critical using either `KSR.xlog.xcrit("foo\n")` or using `KSR.xlog.xlog("L_CRIT", "foo\n")` Do not set the level on the log line in a manner consistent with other log levels. #### Reproduction Kamailio code: ``` request_route { app_python3s_exec("log_test"); . . . } ``` Python code to contrast how info level logging and critical level logging differ: ``` def log_test(): KSR.xlog.xinfo("This line log level: xinfo = INFO\n"); KSR.xlog.xcrit("This line log level: xcrit = CRITICAL\n"); KSR.xlog.xlog("L_INFO", "This line log level: xlog = L_INFO\n"); KSR.xlog.xlog("L_CRIT", "This line log level: xlog = L_CRIT\n"); ``` #### Log Messages Log output. Note how the info level lines begin with INFO, but the critical level lines begin with an empty string: ``` 2(8) INFO: <script>: This line log level: xinfo = INFO 2(8) : <script>: This line log level: xcrit = CRITICAL 2(8) INFO: <script>: This line log level: xlog = L_INFO 2(8) : <script>: This line log level: xlog = L_CRIT ``` ### Possible Solutions The critical level lines should begin with `CRITICAL` - this is what happens if the xlog function is called in Kamailio script. The output should look like this: ``` 2(8) INFO: <script>: This line log level: xinfo = INFO 2(8) CRITICAL: <script>: This line log level: xcrit = CRITICAL 2(8) INFO: <script>: This line log level: xlog = L_INFO 2(8) CRITICAL: <script>: This line log level: xlog = L_CRIT ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 15:03:24 Nov 18 2024 with gcc 13.2.1 ``` * **Operating System**: Tested in docker on Windows 11 (WSL2) using alpine linux as a base. `/etc/os-releas`: ``` NAME="Alpine Linux" ID=alpine VERSION_ID=3.20.2 PRETTY_NAME="Alpine Linux v3.20" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4048 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4048(a)github.com>

2 2

git:master:a493e2e0: xlog: use crit level with prefix for kemi xcrit() and xlog()
by Daniel-Constantin Mierla 02 Dec '24

02 Dec '24

Module: kamailio Branch: master Commit: a493e2e0006f89d2f8b5e903134407109ef587da URL: https://github.com/kamailio/kamailio/commit/a493e2e0006f89d2f8b5e9031344071… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-02T20:19:45+01:00 xlog: use crit level with prefix for kemi xcrit() and xlog() - GH #4048 --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/a493e2e0006f89d2f8b5e9031344071… Patch: https://github.com/kamailio/kamailio/commit/a493e2e0006f89d2f8b5e9031344071… --- diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index 5ec3f6ccad5..98c6e49a0f9 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -924,10 +924,12 @@ int ki_xlog_get_level(str *slevel) llevel = L_ALERT; } else if(slevel->len == 5 && strncasecmp(slevel->s, "l_bug", 5) == 0) { llevel = L_BUG; + } else if(slevel->len == 7 && strncasecmp(slevel->s, "l_crit0", 7) == 0) { + llevel = L_CRIT; } else if(slevel->len == 7 && strncasecmp(slevel->s, "l_crit2", 7) == 0) { llevel = L_CRIT2; } else if(slevel->len == 6 && strncasecmp(slevel->s, "l_crit", 6) == 0) { - llevel = L_CRIT; + llevel = L_CRIT2; } else if(slevel->len == 5 && strncasecmp(slevel->s, "l_err", 5) == 0) { llevel = L_ERR; } else if(slevel->len == 6 && strncasecmp(slevel->s, "l_warn", 6) == 0) { @@ -989,7 +991,7 @@ int ki_xalert(sip_msg_t *msg, str *lmsg) int ki_xcrit(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, NULL, L_CRIT, lmsg); + return ki_xlog_ex(msg, NULL, L_CRIT2, lmsg); } /**

1 0

git:master:299db405: src/Makefiles: filter out CMakeLists.txt from modules discovery
by Daniel-Constantin Mierla 02 Dec '24

02 Dec '24

Module: kamailio Branch: master Commit: 299db405e54741e4dc1ec04e6658d6bc99901edf URL: https://github.com/kamailio/kamailio/commit/299db405e54741e4dc1ec04e6658d6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-02T18:00:18+01:00 src/Makefiles: filter out CMakeLists.txt from modules discovery --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/299db405e54741e4dc1ec04e6658d6b… Patch: https://github.com/kamailio/kamailio/commit/299db405e54741e4dc1ec04e6658d6b… --- diff --git a/src/Makefile b/src/Makefile index 28106b06852..4ba662535bb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -118,10 +118,10 @@ endif endif else # config.mak doesn't need to be used ifneq (,$(filter cfg config cfg-defs,$(word 1,$(MAKECMDGOALS)))) -# needed here to avoid starting a config submake -# (e.g. rm -f config.mak; make config.mak), which would either require +# needed here to avoid starting a config submake +# (e.g. rm -f config.mak; make config.mak), which would either require # double Makefile.defs defines execution (suboptimal), would loose -# $(value ...) expansion or would cause some warning (if Makefile.defs exec. +# $(value ...) expansion or would cause some warning (if Makefile.defs exec. # is skipped in the "main" makefile invocation). $(shell rm -rf config.mak) config_mak=0 @@ -154,12 +154,13 @@ export extra_defs # When group_include is used, we want: include_modules (based on group_include) # - exclude_modules -ifneq ($(modules_configured),1) +ifneq ($(modules_configured),1) #modules_all=$(filter-out modules/CVS,$(wildcard modules/*)) # create modules*_all vars $(foreach mods,$(modules_dirs),$(eval \ - $(mods)_all=$$(filter-out $(mods)/CVS,$$(wildcard $(mods)/*)))) + $(mods)_all=$$(filter-out $(mods)/CVS $(mods)/CMakeLists.txt, \ + $$(wildcard $(mods)/*)))) #debugging #$(foreach mods,$(modules_dirs),$(info "$(mods)_all=$($(mods)_all)")) @@ -168,7 +169,7 @@ $(foreach mods,$(modules_dirs),$(eval \ $(mods)=$$(filter-out $$(addprefix $(mods)/, \ $$(exclude_modules) $$(static_modules)), \ $$(addprefix $(mods)/, $$(include_modules) )) )) -else +else # Standard, old resultant set $(foreach mods,$(modules_dirs),$(eval \ $(mods)_noinc=$$(filter-out $$(addprefix $(mods)/, \ @@ -214,14 +215,14 @@ C_INSTALL_UTILS= ../utils/kamctl else C_INSTALL_UTILS= endif -# list of scripts that should be installed along the core +# list of scripts that should be installed along the core # (here a script is something that doesn't have a Makefile) C_INSTALL_SCRIPTS= # list of extra configs that should be installed along the core # Note: all the paths of the form /usr/*lib/$(CFG_NAME)/<module_dir> # will be updated to the directory where the modules will be installed. C_INSTALL_CFGS= -# list of files that should be installed in the arch-independent +# list of files that should be installed in the arch-independent # directory (by default /usr/local/share/$(MAIN_NAME))) C_INSTALL_SHARE= @@ -237,11 +238,11 @@ tar_extra_args+=$(addprefix --exclude=$(notdir $(CURDIR))/, \ ifeq ($(CORE_TLS), 1) tar_extra_args+= else - tar_extra_args+=--exclude=$(notdir $(CURDIR))/tls/* + tar_extra_args+=--exclude=$(notdir $(CURDIR))/tls/* endif ifneq ($(nodeb),) - tar_extra_args+=--exclude=$(notdir $(CURDIR))/debian + tar_extra_args+=--exclude=$(notdir $(CURDIR))/debian tar_name:=$(tar_name)_nodeb endif @@ -513,7 +514,7 @@ $(foreach mods,$(modules_dirs),$(eval $(call MODULES_RULES_template,$(mods)))) modules-all every-module: $(modules_dirs) $(extra_objs): - @echo "Extra objs: $(extra_objs)" + @echo "Extra objs: $(extra_objs)" @for r in $(static_modules_path) "" ; do \ if [ -n "$$r" -a -r "$$r/Makefile" ]; then \ $(call oecho, "" ;) \ @@ -670,10 +671,10 @@ mk-install_dirs: $(cfg_prefix)/$(cfg_dir) $(bin_prefix)/$(bin_dir) \ $(modules_prefix)/$(modules_dir)$(mods) \ $(doc_prefix)/$(doc_dir)$(mods) ) -$(cfg_prefix)/$(cfg_dir): +$(cfg_prefix)/$(cfg_dir): mkdir -p $(cfg_prefix)/$(cfg_dir) -$(run_prefix)/$(run_dir): +$(run_prefix)/$(run_dir): mkdir -p $(run_prefix)/$(run_dir) $(bin_prefix)/$(bin_dir):

1 0

[kamailio/kamailio] Add Initial CMake support (PR #4043)
by Xenofon Karamanos 02 Dec '24

02 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  This PR adds initial support for building kamailio with CMake. See [docs](https://github.com/kamailio/kamailio-wiki/pull/63) for more information on how to build and use CMake. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4043 -- Commit Summary -- * core/resovle: Fix compile if DNS_USE_CACHE not defined * core/forward: Define ret even if USE_TCP is not defined * Add build folder to ignore * Add CMake support * Core compiles and runs successfully on Linux * Add some notes regarding definitions * Add missing definitions * CMake: Clean up and minor fixes * CMake: Add install targets for binary,cfg,kamctl and kamdbctl * CMake: Install utils (kamctl,kamdbctl and required) with sed changes * CMake: Move notes out of pkg * CMake: Add uninstall target * CMake: FIx core building and installing * CMake: Add lib support * CMake: Add initial module support * CMake: Fix formating * Update gitignore/Add cmake-format file * Add aarch64 options * Make cross-compile available * Format CMakeLists with cmake-format * Add build docs support * cmake: add github action * cmake: Remove windows from matrix * cmake: Add aarch64 cross-compile * cmake: rename arm to aarch64 arch * cmake: Add clang support * cmake: Remove duplicate definition * cmake: Upgrade warning to errors to match clang * cmake: Add target host definition * cmake: Allow only by trigger * cmake: Add cmake to most (all) modules * cmake: declare dproto * cmake: Add MOD_NAMEID definitions to modules * cmake: modify build_rpath * Change rpath * cmake: Move kamailio to root folder * cmake: Modify run path of modules * cmake: var/run path change * cmake: make it abs path * cmake: Add option to select groups * cmake: Add all modules group * cmake: Default group set to default modules * cmake: groups update, fixup me * cmake: Add Find MariaDB and MySQL cmake * cmake: Add absolute path for /var/run (fixup with other commit) * cmake: Only search for mariadb * cmake: Update mysql cmake * cmake: Remove app_mono * cmake: modify FindMariaDBCLient.cmake * cmake: Add description to use_mcast option * cmake: Fix format * cmake: Add config files to uninstall target * cmake: Add FindRadius to discover radius client * cmake: Modify dependencies so parser c files are generated when needed * cmake: Policy to link against targets defined in other CMakelists. * cmake: Define MOD_NAME for all modules * cmake: Remove RPath from module's Cmake and use PRIVATE on all * cmake: Add support to exclude modules * cmake: Modules with external deps ready * cmake: Add srdb2 CMakeLists.txt * cmake: Add various Find[Module] for cmake * cmake: Add FindXXX to dedicated folder * cmake: Add CPack for packaging (experimental) * camke: Clean up some commented sections * cmake/modules: Add NETSNMP * cmake/libs: Modify targets with lib_ and add more libs * cmake/modules: Update ALL modules CMakeLists.txt -- File Changes -- A .github/workflows/cmake_build.yml (84) M .gitignore (2) A CMakeLists.txt (61) A CMakelists.notes (54) A cmake/aarch64-toolchain.cmake (28) A cmake/cmake-format.py (240) A cmake/cmake_uninstall.cmake.in (32) A cmake/modules/FindBerkeleyDB.cmake (182) A cmake/modules/FindErlang.cmake (151) A cmake/modules/FindLdap.cmake (119) A cmake/modules/FindLibev.cmake (60) A cmake/modules/FindMariaDBClient.cmake (68) A cmake/modules/FindMySQL.cmake (964) A cmake/modules/FindNETSNMP.cmake (76) A cmake/modules/FindOracle.cmake (115) A cmake/modules/FindRadius.cmake (51) A cmake/modules_docs.cmake (74) A src/CMakeLists.txt (164) A src/compiler-specific.cmake (55) A src/core/CMakeLists.txt (57) A src/core/autover.h.in (6) M src/core/forward.h (6) M src/core/resolve.c (8) A src/defs.cmake (318) A src/lib/CMakeLists.txt (30) A src/lib/ims/CMakeLists.txt (22) A src/lib/print/CMakeLists.txt (18) A src/lib/srdb1/CMakeLists.txt (17) A src/lib/srdb2/CMakeLists.txt (15) A src/lib/trie/CMakeLists.txt (16) A src/modules/CMakeLists.txt (143) A src/modules/acc/CMakeLists.txt (10) A src/modules/acc_diameter/CMakeLists.txt (8) A src/modules/acc_json/CMakeLists.txt (12) A src/modules/acc_radius/CMakeLists.txt (11) A src/modules/alias_db/CMakeLists.txt (10) A src/modules/app_java/CMakeLists.txt (14) A src/modules/app_jsdt/CMakeLists.txt (8) A src/modules/app_lua/CMakeLists.txt (22) A src/modules/app_perl/CMakeLists.txt (14) A src/modules/app_python/CMakeLists.txt (11) A src/modules/app_python3/CMakeLists.txt (10) A src/modules/app_python3s/CMakeLists.txt (10) A src/modules/app_ruby/CMakeLists.txt (10) A src/modules/app_ruby_proc/CMakeLists.txt (12) A src/modules/async/CMakeLists.txt (8) A src/modules/auth/CMakeLists.txt (9) A src/modules/auth_db/CMakeLists.txt (10) A src/modules/auth_diameter/CMakeLists.txt (8) A src/modules/auth_ephemeral/CMakeLists.txt (8) A src/modules/auth_radius/CMakeLists.txt (11) A src/modules/auth_xkeys/CMakeLists.txt (8) A src/modules/avp/CMakeLists.txt (8) A src/modules/avpops/CMakeLists.txt (10) A src/modules/benchmark/CMakeLists.txt (8) A src/modules/blst/CMakeLists.txt (8) A src/modules/call_control/CMakeLists.txt (8) A src/modules/call_obj/CMakeLists.txt (8) A src/modules/carrierroute/CMakeLists.txt (11) A src/modules/cdp/CMakeLists.txt (10) A src/modules/cdp_avp/CMakeLists.txt (8) A src/modules/cfg_db/CMakeLists.txt (10) A src/modules/cfg_rpc/CMakeLists.txt (10) A src/modules/cfgt/CMakeLists.txt (8) A src/modules/cfgutils/CMakeLists.txt (8) A src/modules/cnxcc/CMakeLists.txt (18) A src/modules/corex/CMakeLists.txt (8) A src/modules/counters/CMakeLists.txt (10) A src/modules/cplc/CMakeLists.txt (12) A src/modules/crypto/CMakeLists.txt (10) A src/modules/ctl/CMakeLists.txt (12) A src/modules/db2_ldap/CMakeLists.txt (22) A src/modules/db2_ops/CMakeLists.txt (10) A src/modules/db_berkeley/CMakeLists.txt (12) A src/modules/db_cluster/CMakeLists.txt (10) A src/modules/db_flatstore/CMakeLists.txt (10) A src/modules/db_mongodb/CMakeLists.txt (17) A src/modules/db_mysql/CMakeLists.txt (19) A src/modules/db_oracle/CMakeLists.txt (16) A src/modules/db_perlvdb/CMakeLists.txt (13) A src/modules/db_postgres/CMakeLists.txt (14) A src/modules/db_redis/CMakeLists.txt (21) A src/modules/db_sqlite/CMakeLists.txt (12) A src/modules/db_text/CMakeLists.txt (10) A src/modules/db_unixodbc/CMakeLists.txt (13) A src/modules/debugger/CMakeLists.txt (8) A src/modules/dialog/CMakeLists.txt (10) A src/modules/dialplan/CMakeLists.txt (10) A src/modules/dispatcher/CMakeLists.txt (10) A src/modules/diversion/CMakeLists.txt (8) A src/modules/dlgs/CMakeLists.txt (8) A src/modules/dmq/CMakeLists.txt (10) A src/modules/dmq_usrloc/CMakeLists.txt (8) A src/modules/dnssec/CMakeLists.txt (19) A src/modules/domain/CMakeLists.txt (10) A src/modules/domainpolicy/CMakeLists.txt (10) A src/modules/drouting/CMakeLists.txt (10) A src/modules/enum/CMakeLists.txt (8) A src/modules/erlang/CMakeLists.txt (11) A src/modules/evapi/CMakeLists.txt (10) A src/modules/evrexec/CMakeLists.txt (8) A src/modules/exec/CMakeLists.txt (8) A src/modules/file_out/CMakeLists.txt (8) A src/modules/gcrypt/CMakeLists.txt (12) A src/modules/geoip/CMakeLists.txt (12) A src/modules/geoip2/CMakeLists.txt (13) A src/modules/group/CMakeLists.txt (10) A src/modules/groups.cmake (686) A src/modules/gzcompress/CMakeLists.txt (12) A src/modules/h350/CMakeLists.txt (8) A src/modules/htable/CMakeLists.txt (10) A src/modules/http_async_client/CMakeLists.txt (16) A src/modules/http_client/CMakeLists.txt (10) A src/modules/imc/CMakeLists.txt (10) A src/modules/ims_auth/CMakeLists.txt (10) A src/modules/ims_charging/CMakeLists.txt (10) A src/modules/ims_dialog/CMakeLists.txt (10) A src/modules/ims_diameter_server/CMakeLists.txt (10) A src/modules/ims_icscf/CMakeLists.txt (12) A src/modules/ims_ipsec_pcscf/CMakeLists.txt (14) A src/modules/ims_isc/CMakeLists.txt (11) A src/modules/ims_ocs/CMakeLists.txt (10) A src/modules/ims_qos/CMakeLists.txt (10) A src/modules/ims_qos_npn/CMakeLists.txt (10) A src/modules/ims_registrar_pcscf/CMakeLists.txt (10) A src/modules/ims_registrar_scscf/CMakeLists.txt (10) A src/modules/ims_usrloc_pcscf/CMakeLists.txt (10) A src/modules/ims_usrloc_scscf/CMakeLists.txt (10) A src/modules/influxdbc/CMakeLists.txt (8) A src/modules/ipops/CMakeLists.txt (8) A src/modules/jansson/CMakeLists.txt (12) A src/modules/janssonrpcc/CMakeLists.txt (16) A src/modules/json/CMakeLists.txt (16) A src/modules/jsonrpcc/CMakeLists.txt (16) A src/modules/jsonrpcs/CMakeLists.txt (8) A src/modules/jwt/CMakeLists.txt (16) A src/modules/kafka/CMakeLists.txt (16) A src/modules/kazoo/CMakeLists.txt (33) A src/modules/keepalive/CMakeLists.txt (10) A src/modules/kemix/CMakeLists.txt (8) A src/modules/kex/CMakeLists.txt (8) A src/modules/lcr/CMakeLists.txt (19) A src/modules/ldap/CMakeLists.txt (10) A src/modules/log_custom/CMakeLists.txt (8) A src/modules/log_systemd/CMakeLists.txt (12) A src/modules/lost/CMakeLists.txt (11) A src/modules/lrkproxy/CMakeLists.txt (8) A src/modules/lwsc/CMakeLists.txt (12) A src/modules/mangler/CMakeLists.txt (8) A src/modules/math/CMakeLists.txt (8) A src/modules/matrix/CMakeLists.txt (10) A src/modules/maxfwd/CMakeLists.txt (8) A src/modules/mediaproxy/CMakeLists.txt (8) A src/modules/memcached/CMakeLists.txt (12) A src/modules/microhttpd/CMakeLists.txt (13) A src/modules/misc_radius/CMakeLists.txt (12) A src/modules/misctest/CMakeLists.txt (8) A src/modules/mohqueue/CMakeLists.txt (10) A src/modules/mqtt/CMakeLists.txt (14) A src/modules/mqueue/CMakeLists.txt (10) A src/modules/msilo/CMakeLists.txt (10) A src/modules/msrp/CMakeLists.txt (8) A src/modules/mtree/CMakeLists.txt (10) A src/modules/nat_traversal/CMakeLists.txt (8) A src/modules/nathelper/CMakeLists.txt (8) A src/modules/nats/CMakeLists.txt (12) A src/modules/ndb_cassandra/CMakeLists.txt (12) A src/modules/ndb_mongodb/CMakeLists.txt (12) A src/modules/ndb_redis/CMakeLists.txt (12) A src/modules/nghttp2/CMakeLists.txt (20) A src/modules/nosip/CMakeLists.txt (8) A src/modules/nsq/CMakeLists.txt (29) A src/modules/outbound/CMakeLists.txt (10) A src/modules/p_usrloc/CMakeLists.txt (10) A src/modules/path/CMakeLists.txt (8) A src/modules/pdb/CMakeLists.txt (8) A src/modules/pdt/CMakeLists.txt (10) A src/modules/peering/CMakeLists.txt (11) A src/modules/permissions/CMakeLists.txt (10) A src/modules/phonenum/CMakeLists.txt (49) A src/modules/pike/CMakeLists.txt (8) A src/modules/pipelimit/CMakeLists.txt (10) A src/modules/posops/CMakeLists.txt (8) A src/modules/prefix_route/CMakeLists.txt (10) A src/modules/presence/CMakeLists.txt (14) A src/modules/presence_conference/CMakeLists.txt (10) A src/modules/presence_dialoginfo/CMakeLists.txt (10) A src/modules/presence_mwi/CMakeLists.txt (8) A src/modules/presence_profile/CMakeLists.txt (8) A src/modules/presence_reginfo/CMakeLists.txt (10) A src/modules/presence_xml/CMakeLists.txt (13) A src/modules/print/CMakeLists.txt (8) A src/modules/print_lib/CMakeLists.txt (11) A src/modules/pua/CMakeLists.txt (12) A src/modules/pua_bla/CMakeLists.txt (10) A src/modules/pua_dialoginfo/CMakeLists.txt (10) A src/modules/pua_json/CMakeLists.txt (16) A src/modules/pua_reginfo/CMakeLists.txt (10) A src/modules/pua_rpc/CMakeLists.txt (9) A src/modules/pua_usrloc/CMakeLists.txt (10) A src/modules/pua_xmpp/CMakeLists.txt (10) A src/modules/pv/CMakeLists.txt (9) A src/modules/pv_headers/CMakeLists.txt (8) A src/modules/pvtpl/CMakeLists.txt (8) A src/modules/qos/CMakeLists.txt (8) A src/modules/rabbitmq/CMakeLists.txt (26) A src/modules/ratelimit/CMakeLists.txt (8) A src/modules/regex/CMakeLists.txt (17) A src/modules/registrar/CMakeLists.txt (9) A src/modules/rls/CMakeLists.txt (15) A src/modules/rr/CMakeLists.txt (8) A src/modules/rtimer/CMakeLists.txt (8) A src/modules/rtjson/CMakeLists.txt (8) A src/modules/rtp_media_server/CMakeLists.txt (24) A src/modules/rtpengine/CMakeLists.txt (10) A src/modules/rtpproxy/CMakeLists.txt (10) A src/modules/ruxc/CMakeLists.txt (18) A src/modules/sanity/CMakeLists.txt (8) A src/modules/sca/CMakeLists.txt (10) A src/modules/sctp/CMakeLists.txt (11) A src/modules/sdpops/CMakeLists.txt (8) A src/modules/seas/CMakeLists.txt (8) A src/modules/secfilter/CMakeLists.txt (10) A src/modules/secsipid/CMakeLists.txt (8) A src/modules/secsipid_proc/CMakeLists.txt (21) A src/modules/sipcapture/CMakeLists.txt (10) A src/modules/sipdump/CMakeLists.txt (8) A src/modules/sipjson/CMakeLists.txt (8) A src/modules/siprepo/CMakeLists.txt (8) A src/modules/sipt/CMakeLists.txt (8) A src/modules/siptrace/CMakeLists.txt (10) A src/modules/siputils/CMakeLists.txt (10) A src/modules/sl/CMakeLists.txt (8) A src/modules/slack/CMakeLists.txt (10) A src/modules/sms/CMakeLists.txt (8) A src/modules/smsops/CMakeLists.txt (8) A src/modules/snmpstats/CMakeLists.txt (23) A src/modules/speeddial/CMakeLists.txt (10) A src/modules/sqlops/CMakeLists.txt (10) A src/modules/ss7ops/CMakeLists.txt (8) A src/modules/sst/CMakeLists.txt (8) A src/modules/statistics/CMakeLists.txt (8) A src/modules/statsc/CMakeLists.txt (8) A src/modules/statsd/CMakeLists.txt (8) A src/modules/stirshaken/CMakeLists.txt (12) A src/modules/stun/CMakeLists.txt (8) A src/modules/sworker/CMakeLists.txt (8) A src/modules/systemdops/CMakeLists.txt (12) A src/modules/tcpops/CMakeLists.txt (8) A src/modules/textops/CMakeLists.txt (8) A src/modules/textopsx/CMakeLists.txt (8) A src/modules/timer/CMakeLists.txt (8) A src/modules/tls/CMakeLists.txt (46) A src/modules/tls_wolfssl/CMakeLists.txt (15) A src/modules/tlsa/CMakeLists.txt (35) A src/modules/tm/CMakeLists.txt (12) A src/modules/tmrec/CMakeLists.txt (8) A src/modules/tmx/CMakeLists.txt (9) A src/modules/topoh/CMakeLists.txt (8) A src/modules/topos/CMakeLists.txt (10) A src/modules/topos_redis/CMakeLists.txt (12) A src/modules/tsilo/CMakeLists.txt (12) A src/modules/uac/CMakeLists.txt (10) A src/modules/uac_redirect/CMakeLists.txt (8) A src/modules/uid_auth_db/CMakeLists.txt (9) A src/modules/uid_avp_db/CMakeLists.txt (9) A src/modules/uid_domain/CMakeLists.txt (10) A src/modules/uid_gflags/CMakeLists.txt (10) A src/modules/uid_uri_db/CMakeLists.txt (10) A src/modules/uri_db/CMakeLists.txt (10) A src/modules/userblocklist/CMakeLists.txt (10) A src/modules/usrloc/CMakeLists.txt (10) A src/modules/utils/CMakeLists.txt (12) A src/modules/uuid/CMakeLists.txt (12) A src/modules/websocket/CMakeLists.txt (17) A src/modules/xcap_client/CMakeLists.txt (12) A src/modules/xcap_server/CMakeLists.txt (12) A src/modules/xhttp/CMakeLists.txt (8) A src/modules/xhttp_pi/CMakeLists.txt (12) A src/modules/xhttp_prom/CMakeLists.txt (8) A src/modules/xhttp_rpc/CMakeLists.txt (8) A src/modules/xlog/CMakeLists.txt (8) A src/modules/xmlops/CMakeLists.txt (10) A src/modules/xmlrpc/CMakeLists.txt (12) A src/modules/xmpp/CMakeLists.txt (13) A src/modules/xprint/CMakeLists.txt (8) A src/os-specific.cmake (97) A utils/kamctl/CMakeLists.txt (196) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4043.patch https://github.com/kamailio/kamailio/pull/4043.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4043 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4043(a)github.com>

3 11

git:master:06a6e4a5: build: add initial CMake support for core and modules
by GitHub 02 Dec '24

02 Dec '24

Module: kamailio Branch: master Commit: 06a6e4a54bf1791650aac3e36ad09a573823dd9d URL: https://github.com/kamailio/kamailio/commit/06a6e4a54bf1791650aac3e36ad09a5… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2024-12-02T16:37:23+01:00 build: add initial CMake support for core and modules - add initial CMake support for core and modules (GH #4043) - core/resolve: fix compilation if DNS_USE_CACHE not defined - core/forward: define return even if USE_TCP is not defined - includes documentation building, initial support for other architectures (arm64) and cross-compilation - support for gcc and clang compiler - initial support for CPack packaging - most modules were already integrated, a few remaining with special dependencies are missing - usage and extensions documentation can be found in the kamailio wiki --- Added: .github/workflows/cmake_build.yml Added: CMakeLists.txt Added: CMakelists.notes Added: cmake/aarch64-toolchain.cmake Added: cmake/cmake-format.py Added: cmake/cmake_uninstall.cmake.in Added: cmake/compiler-specific.cmake Added: cmake/defs.cmake Added: cmake/groups.cmake Added: cmake/modules/FindBerkeleyDB.cmake Added: cmake/modules/FindErlang.cmake Added: cmake/modules/FindLdap.cmake Added: cmake/modules/FindLibev.cmake Added: cmake/modules/FindMariaDBClient.cmake Added: cmake/modules/FindMySQL.cmake Added: cmake/modules/FindNETSNMP.cmake Added: cmake/modules/FindOracle.cmake Added: cmake/modules/FindRadius.cmake Added: cmake/modules_docs.cmake Added: cmake/os-specific.cmake Added: src/CMakeLists.txt Added: src/core/CMakeLists.txt Added: src/core/autover.h.in Added: src/lib/CMakeLists.txt Added: src/lib/ims/CMakeLists.txt Added: src/lib/print/CMakeLists.txt Added: src/lib/srdb1/CMakeLists.txt Added: src/lib/srdb2/CMakeLists.txt Added: src/lib/trie/CMakeLists.txt Added: src/modules/CMakeLists.txt Added: src/modules/acc/CMakeLists.txt Added: src/modules/acc_diameter/CMakeLists.txt Added: src/modules/acc_json/CMakeLists.txt Added: src/modules/acc_radius/CMakeLists.txt Added: src/modules/alias_db/CMakeLists.txt Added: src/modules/app_java/CMakeLists.txt Added: src/modules/app_jsdt/CMakeLists.txt Added: src/modules/app_lua/CMakeLists.txt Added: src/modules/app_perl/CMakeLists.txt Added: src/modules/app_python/CMakeLists.txt Added: src/modules/app_python3/CMakeLists.txt Added: src/modules/app_python3s/CMakeLists.txt Added: src/modules/app_ruby/CMakeLists.txt Added: src/modules/app_ruby_proc/CMakeLists.txt Added: src/modules/async/CMakeLists.txt Added: src/modules/auth/CMakeLists.txt Added: src/modules/auth_db/CMakeLists.txt Added: src/modules/auth_diameter/CMakeLists.txt Added: src/modules/auth_ephemeral/CMakeLists.txt Added: src/modules/auth_radius/CMakeLists.txt Added: src/modules/auth_xkeys/CMakeLists.txt Added: src/modules/avp/CMakeLists.txt Added: src/modules/avpops/CMakeLists.txt Added: src/modules/benchmark/CMakeLists.txt Added: src/modules/blst/CMakeLists.txt Added: src/modules/call_control/CMakeLists.txt Added: src/modules/call_obj/CMakeLists.txt Added: src/modules/carrierroute/CMakeLists.txt Added: src/modules/cdp/CMakeLists.txt Added: src/modules/cdp_avp/CMakeLists.txt Added: src/modules/cfg_db/CMakeLists.txt Added: src/modules/cfg_rpc/CMakeLists.txt Added: src/modules/cfgt/CMakeLists.txt Added: src/modules/cfgutils/CMakeLists.txt Added: src/modules/cnxcc/CMakeLists.txt Added: src/modules/corex/CMakeLists.txt Added: src/modules/counters/CMakeLists.txt Added: src/modules/cplc/CMakeLists.txt Added: src/modules/crypto/CMakeLists.txt Added: src/modules/ctl/CMakeLists.txt Added: src/modules/db2_ldap/CMakeLists.txt Added: src/modules/db2_ops/CMakeLists.txt Added: src/modules/db_berkeley/CMakeLists.txt Added: src/modules/db_cluster/CMakeLists.txt Added: src/modules/db_flatstore/CMakeLists.txt Added: src/modules/db_mongodb/CMakeLists.txt Added: src/modules/db_mysql/CMakeLists.txt Added: src/modules/db_oracle/CMakeLists.txt Added: src/modules/db_perlvdb/CMakeLists.txt Added: src/modules/db_postgres/CMakeLists.txt Added: src/modules/db_redis/CMakeLists.txt Added: src/modules/db_sqlite/CMakeLists.txt Added: src/modules/db_text/CMakeLists.txt Added: src/modules/db_unixodbc/CMakeLists.txt Added: src/modules/debugger/CMakeLists.txt Added: src/modules/dialog/CMakeLists.txt Added: src/modules/dialplan/CMakeLists.txt Added: src/modules/dispatcher/CMakeLists.txt Added: src/modules/diversion/CMakeLists.txt Added: src/modules/dlgs/CMakeLists.txt Added: src/modules/dmq/CMakeLists.txt Added: src/modules/dmq_usrloc/CMakeLists.txt Added: src/modules/dnssec/CMakeLists.txt Added: src/modules/domain/CMakeLists.txt Added: src/modules/domainpolicy/CMakeLists.txt Added: src/modules/drouting/CMakeLists.txt Added: src/modules/enum/CMakeLists.txt Added: src/modules/erlang/CMakeLists.txt Added: src/modules/evapi/CMakeLists.txt Added: src/modules/evrexec/CMakeLists.txt Added: src/modules/exec/CMakeLists.txt Added: src/modules/file_out/CMakeLists.txt Added: src/modules/gcrypt/CMakeLists.txt Added: src/modules/geoip/CMakeLists.txt Added: src/modules/geoip2/CMakeLists.txt Added: src/modules/group/CMakeLists.txt Added: src/modules/gzcompress/CMakeLists.txt Added: src/modules/h350/CMakeLists.txt Added: src/modules/htable/CMakeLists.txt Added: src/modules/http_async_client/CMakeLists.txt Added: src/modules/http_client/CMakeLists.txt Added: src/modules/imc/CMakeLists.txt Added: src/modules/ims_auth/CMakeLists.txt Added: src/modules/ims_charging/CMakeLists.txt Added: src/modules/ims_dialog/CMakeLists.txt Added: src/modules/ims_diameter_server/CMakeLists.txt Added: src/modules/ims_icscf/CMakeLists.txt Added: src/modules/ims_ipsec_pcscf/CMakeLists.txt Added: src/modules/ims_isc/CMakeLists.txt Added: src/modules/ims_ocs/CMakeLists.txt Added: src/modules/ims_qos/CMakeLists.txt Added: src/modules/ims_qos_npn/CMakeLists.txt Added: src/modules/ims_registrar_pcscf/CMakeLists.txt Added: src/modules/ims_registrar_scscf/CMakeLists.txt Added: src/modules/ims_usrloc_pcscf/CMakeLists.txt Added: src/modules/ims_usrloc_scscf/CMakeLists.txt Added: src/modules/influxdbc/CMakeLists.txt Added: src/modules/ipops/CMakeLists.txt Added: src/modules/jansson/CMakeLists.txt Added: src/modules/janssonrpcc/CMakeLists.txt Added: src/modules/json/CMakeLists.txt Added: src/modules/jsonrpcc/CMakeLists.txt Added: src/modules/jsonrpcs/CMakeLists.txt Added: src/modules/jwt/CMakeLists.txt Added: src/modules/kafka/CMakeLists.txt Added: src/modules/kazoo/CMakeLists.txt Added: src/modules/keepalive/CMakeLists.txt Added: src/modules/kemix/CMakeLists.txt Added: src/modules/kex/CMakeLists.txt Added: src/modules/lcr/CMakeLists.txt Added: src/modules/ldap/CMakeLists.txt Added: src/modules/log_custom/CMakeLists.txt Added: src/modules/log_systemd/CMakeLists.txt Added: src/modules/lost/CMakeLists.txt Added: src/modules/lrkproxy/CMakeLists.txt Added: src/modules/lwsc/CMakeLists.txt Added: src/modules/mangler/CMakeLists.txt Added: src/modules/math/CMakeLists.txt Added: src/modules/matrix/CMakeLists.txt Added: src/modules/maxfwd/CMakeLists.txt Added: src/modules/mediaproxy/CMakeLists.txt Added: src/modules/memcached/CMakeLists.txt Added: src/modules/microhttpd/CMakeLists.txt Added: src/modules/misc_radius/CMakeLists.txt Added: src/modules/misctest/CMakeLists.txt Added: src/modules/mohqueue/CMakeLists.txt Added: src/modules/mqtt/CMakeLists.txt Added: src/modules/mqueue/CMakeLists.txt Added: src/modules/msilo/CMakeLists.txt Added: src/modules/msrp/CMakeLists.txt Added: src/modules/mtree/CMakeLists.txt Added: src/modules/nat_traversal/CMakeLists.txt Added: src/modules/nathelper/CMakeLists.txt Added: src/modules/nats/CMakeLists.txt Added: src/modules/ndb_cassandra/CMakeLists.txt Added: src/modules/ndb_mongodb/CMakeLists.txt Added: src/modules/ndb_redis/CMakeLists.txt Added: src/modules/nghttp2/CMakeLists.txt Added: src/modules/nosip/CMakeLists.txt Added: src/modules/nsq/CMakeLists.txt Added: src/modules/outbound/CMakeLists.txt Added: src/modules/p_usrloc/CMakeLists.txt Added: src/modules/path/CMakeLists.txt Added: src/modules/pdb/CMakeLists.txt Added: src/modules/pdt/CMakeLists.txt Added: src/modules/peering/CMakeLists.txt Added: src/modules/permissions/CMakeLists.txt Added: src/modules/phonenum/CMakeLists.txt Added: src/modules/pike/CMakeLists.txt Added: src/modules/pipelimit/CMakeLists.txt Added: src/modules/posops/CMakeLists.txt Added: src/modules/prefix_route/CMakeLists.txt Added: src/modules/presence/CMakeLists.txt Added: src/modules/presence_conference/CMakeLists.txt Added: src/modules/presence_dialoginfo/CMakeLists.txt Added: src/modules/presence_mwi/CMakeLists.txt Added: src/modules/presence_profile/CMakeLists.txt Added: src/modules/presence_reginfo/CMakeLists.txt Added: src/modules/presence_xml/CMakeLists.txt Added: src/modules/print/CMakeLists.txt Added: src/modules/print_lib/CMakeLists.txt Added: src/modules/pua/CMakeLists.txt Added: src/modules/pua_bla/CMakeLists.txt Added: src/modules/pua_dialoginfo/CMakeLists.txt Added: src/modules/pua_json/CMakeLists.txt Added: src/modules/pua_reginfo/CMakeLists.txt Added: src/modules/pua_rpc/CMakeLists.txt Added: src/modules/pua_usrloc/CMakeLists.txt Added: src/modules/pua_xmpp/CMakeLists.txt Added: src/modules/pv/CMakeLists.txt Added: src/modules/pv_headers/CMakeLists.txt Added: src/modules/pvtpl/CMakeLists.txt Added: src/modules/qos/CMakeLists.txt Added: src/modules/rabbitmq/CMakeLists.txt Added: src/modules/ratelimit/CMakeLists.txt Added: src/modules/regex/CMakeLists.txt Added: src/modules/registrar/CMakeLists.txt Added: src/modules/rls/CMakeLists.txt Added: src/modules/rr/CMakeLists.txt Added: src/modules/rtimer/CMakeLists.txt Added: src/modules/rtjson/CMakeLists.txt Added: src/modules/rtp_media_server/CMakeLists.txt Added: src/modules/rtpengine/CMakeLists.txt Added: src/modules/rtpproxy/CMakeLists.txt Added: src/modules/ruxc/CMakeLists.txt Added: src/modules/sanity/CMakeLists.txt Added: src/modules/sca/CMakeLists.txt Added: src/modules/sctp/CMakeLists.txt Added: src/modules/sdpops/CMakeLists.txt Added: src/modules/seas/CMakeLists.txt Added: src/modules/secfilter/CMakeLists.txt Added: src/modules/secsipid/CMakeLists.txt Added: src/modules/secsipid_proc/CMakeLists.txt Added: src/modules/sipcapture/CMakeLists.txt Added: src/modules/sipdump/CMakeLists.txt Added: src/modules/sipjson/CMakeLists.txt Added: src/modules/siprepo/CMakeLists.txt Added: src/modules/sipt/CMakeLists.txt Added: src/modules/siptrace/CMakeLists.txt Added: src/modules/siputils/CMakeLists.txt Added: src/modules/sl/CMakeLists.txt Added: src/modules/slack/CMakeLists.txt Added: src/modules/sms/CMakeLists.txt Added: src/modules/smsops/CMakeLists.txt Added: src/modules/snmpstats/CMakeLists.txt Added: src/modules/speeddial/CMakeLists.txt Added: src/modules/sqlops/CMakeLists.txt Added: src/modules/ss7ops/CMakeLists.txt Added: src/modules/sst/CMakeLists.txt Added: src/modules/statistics/CMakeLists.txt Added: src/modules/statsc/CMakeLists.txt Added: src/modules/statsd/CMakeLists.txt Added: src/modules/stirshaken/CMakeLists.txt Added: src/modules/stun/CMakeLists.txt Added: src/modules/sworker/CMakeLists.txt Added: src/modules/systemdops/CMakeLists.txt Added: src/modules/tcpops/CMakeLists.txt Added: src/modules/textops/CMakeLists.txt Added: src/modules/textopsx/CMakeLists.txt Added: src/modules/timer/CMakeLists.txt Added: src/modules/tls/CMakeLists.txt Added: src/modules/tls_wolfssl/CMakeLists.txt Added: src/modules/tlsa/CMakeLists.txt Added: src/modules/tm/CMakeLists.txt Added: src/modules/tmrec/CMakeLists.txt Added: src/modules/tmx/CMakeLists.txt Added: src/modules/topoh/CMakeLists.txt Added: src/modules/topos/CMakeLists.txt Added: src/modules/topos_redis/CMakeLists.txt Added: src/modules/tsilo/CMakeLists.txt Added: src/modules/uac/CMakeLists.txt Added: src/modules/uac_redirect/CMakeLists.txt Added: src/modules/uid_auth_db/CMakeLists.txt Added: src/modules/uid_avp_db/CMakeLists.txt Added: src/modules/uid_domain/CMakeLists.txt Added: src/modules/uid_gflags/CMakeLists.txt Added: src/modules/uid_uri_db/CMakeLists.txt Added: src/modules/uri_db/CMakeLists.txt Added: src/modules/userblocklist/CMakeLists.txt Added: src/modules/usrloc/CMakeLists.txt Added: src/modules/utils/CMakeLists.txt Added: src/modules/uuid/CMakeLists.txt Added: src/modules/websocket/CMakeLists.txt Added: src/modules/xcap_client/CMakeLists.txt Added: src/modules/xcap_server/CMakeLists.txt Added: src/modules/xhttp/CMakeLists.txt Added: src/modules/xhttp_pi/CMakeLists.txt Added: src/modules/xhttp_prom/CMakeLists.txt Added: src/modules/xhttp_rpc/CMakeLists.txt Added: src/modules/xlog/CMakeLists.txt Added: src/modules/xmlops/CMakeLists.txt Added: src/modules/xmlrpc/CMakeLists.txt Added: src/modules/xmpp/CMakeLists.txt Added: src/modules/xprint/CMakeLists.txt Added: utils/kamctl/CMakeLists.txt Modified: .gitignore Modified: src/core/forward.h Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/06a6e4a54bf1791650aac3e36ad09a5… Patch: https://github.com/kamailio/kamailio/commit/06a6e4a54bf1791650aac3e36ad09a5…

1 0

[kamailio/kamailio] Add fix_actions function parameter in fix_actions to allow call of free_fixup functions and free resources (PR #4023)
by Xenofon Karamanos 02 Dec '24

02 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 - [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 - [x] Tested changes locally - [x] Related to issue #3814 #### Description  When the fixup is done in main using fix_rls function (fixing the route lists in cfg file), all the children inherit the memory allocated as a copy that needs separate management. The function responsible for the fixup (fix_actions) is also used to call the free_fixup function with an added argument. Then on main, we call the free_rls ( as fix_rls) on two separate occasions. Once in cleanup() function for the main process and once in the sig_usr() function for each of the children. This seems to work fine and after debugging with `file_out` fixups, I can no longer see memory leaks due to the malloced memory in one of the fixups. - main.c: Call free_rls() in cleanup() function to clean route lists and fixed up parameters in main process. - main.c: Call free_rls() in sig_usr() function to clean route lists and fixed up parameters in child processes. My question is, after a parameter is fixed, is it saved somewhere else, therefore we can immediately free the fix-up resources and not on shutdown? You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4023 -- Commit Summary -- * core: Add fix_actions function parameter in fix_actions to free fixed up resources -- File Changes -- M src/core/route.c (61) M src/core/route.h (3) M src/core/rvalue.c (2) M src/core/switch.c (4) M src/main.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4023.patch https://github.com/kamailio/kamailio/pull/4023.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4023 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4023(a)github.com>

2 6

git:master:c7bb0965: ims_ipsec_pcscf: clang format
by Daniel-Constantin Mierla 02 Dec '24

02 Dec '24

Module: kamailio Branch: master Commit: c7bb0965bde055aaf76cad526eae248ae2165280 URL: https://github.com/kamailio/kamailio/commit/c7bb0965bde055aaf76cad526eae248… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-02T12:39:17+01:00 ims_ipsec_pcscf: clang format --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/c7bb0965bde055aaf76cad526eae248… Patch: https://github.com/kamailio/kamailio/commit/c7bb0965bde055aaf76cad526eae248… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index de261bfbb42..b862d68ebfd 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -809,7 +809,7 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) pcontact_t *pcontact = NULL; struct pcontact_info ci; int ret = IPSEC_CMD_FAIL; // FAIL by default - int fun_ret_c; // Used to store return codes of some functions + int fun_ret_c; // Used to store return codes of some functions tm_cell_t *t = NULL; sip_msg_t *req = NULL; security_t *req_sec_params = NULL; @@ -923,7 +923,8 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) fun_ret_c = add_supported_secagree_header(m); if(fun_ret_c != 0) { - LM_ERR("Could not add secagree header. Failed with code: %d\n", fun_ret_c); + LM_ERR("Could not add secagree header. Failed with code: %d\n", + fun_ret_c); goto cleanup; }

1 0

[kamailio/kamailio] Chore/ipsec logging (PR #4035)
by Lennart Rosam 02 Dec '24

02 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 - [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 - [x] Tested changes locally #### Description While working on an IMS setup, I and @lynxis encountered some cases where it was unclear why some of the related modules would not load. They just did not without printing any messages as to why. I have identified a few cases where logging was missing and added it, in the hope that it might be helpful. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4035 -- Commit Summary -- * ims_scscf: Add more logging to ipsec_create() * ims_ipsec_pcscf: Add error logging -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (14) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4035.patch https://github.com/kamailio/kamailio/pull/4035.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4035 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4035(a)github.com>

2 1

git:master:78565941: ims_ipsec_pcscf: Add error logging
by Daniel-Constantin Mierla 02 Dec '24

02 Dec '24

Module: kamailio Branch: master Commit: 785659417bcc1984f12d5ebe35c134b15d614483 URL: https://github.com/kamailio/kamailio/commit/785659417bcc1984f12d5ebe35c134b… Author: Lennart Rosam <rosam(a)sipgate.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-02T12:37:47+01:00 ims_ipsec_pcscf: Add error logging Currently the module initialization fails when the ipsec listen interfaces cannot be bound and it does not produce a helpful log message for the user. This commit addresses that. Co-authored-by: Alexander Couzens <lynxis(a)fe80.eu> --- Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/785659417bcc1984f12d5ebe35c134b… Patch: https://github.com/kamailio/kamailio/commit/785659417bcc1984f12d5ebe35c134b… --- diff --git a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c index 0c1097d55b3..9ff4a63755e 100644 --- a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c +++ b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c @@ -364,6 +364,7 @@ static int ipsec_add_listen_ifaces() static int mod_init(void) { bind_usrloc_t bind_usrloc; + int ret; bind_usrloc = (bind_usrloc_t)find_export("ul_bind_ims_usrloc_pcscf", 1, 0); if(!bind_usrloc) { @@ -371,7 +372,9 @@ static int mod_init(void) return -1; } - if(bind_usrloc(&ul) < 0) { + ret = bind_usrloc(&ul); + if(ret < 0) { + LM_ERR("bind_userloc() has failed with code %d", ret); return -1; } LM_INFO("Successfully bound to PCSCF Usrloc module\n"); @@ -383,7 +386,9 @@ static int mod_init(void) } LM_INFO("Successfully bound to TM module\n"); - if(ipsec_add_listen_ifaces() != 0) { + ret = ipsec_add_listen_ifaces(); + if(ret != 0) { + LM_ERR("Failed to add ipsec listen interface. Code: %d", ret); return -1; }

1 0

git:master:353b788b: ims_scscf: Add more logging to ipsec_create()
by Daniel-Constantin Mierla 02 Dec '24

02 Dec '24

Module: kamailio Branch: master Commit: 353b788bb3c78a4c0e8c390decdc420322b4927c URL: https://github.com/kamailio/kamailio/commit/353b788bb3c78a4c0e8c390decdc420… Author: Lennart Rosam <rosam(a)sipgate.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-02T12:37:47+01:00 ims_scscf: Add more logging to ipsec_create() Currently there are scenarios where ipsec_create() fails with no more information in the logs. This should make debugging issues a bit easier. Co-authored-by: Alexander Couzens <lynxis(a)fe80.eu> --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/353b788bb3c78a4c0e8c390decdc420… Patch: https://github.com/kamailio/kamailio/commit/353b788bb3c78a4c0e8c390decdc420… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 1f85cffc694..de261bfbb42 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -809,6 +809,7 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) pcontact_t *pcontact = NULL; struct pcontact_info ci; int ret = IPSEC_CMD_FAIL; // FAIL by default + int fun_ret_c; // Used to store return codes of some functions tm_cell_t *t = NULL; sip_msg_t *req = NULL; security_t *req_sec_params = NULL; @@ -893,10 +894,13 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) } if(update_contact_ipsec_params(s, m, old_s) != 0) { + LM_ERR("Could not update ipsec params in contact.\n"); goto cleanup; } - if(create_ipsec_tunnel(&req->rcv.src_ip, s) != 0) { + fun_ret_c = create_ipsec_tunnel(&req->rcv.src_ip, s); + if(fun_ret_c != 0) { + LM_ERR("IPSEC tunnel creation failed.\n"); goto cleanup; } @@ -917,11 +921,15 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) goto cleanup; } - if(add_supported_secagree_header(m) != 0) { + fun_ret_c = add_supported_secagree_header(m); + if(fun_ret_c != 0) { + LM_ERR("Could not add secagree header. Failed with code: %d\n", fun_ret_c); goto cleanup; } - if(add_security_server_header(m, s) != 0) { + fun_ret_c = add_security_server_header(m, s); + if(fun_ret_c != 0) { + LM_ERR("Could not add security server header. Code: %d\n", fun_ret_c); goto cleanup; }

1 0

[kamailio/kamailio] topoh: improve debug info for topoh crash (PR #4039)
by Souradeep Bera 02 Dec '24

02 Dec '24

- print entire socket address for ease of debugging with empty mask ip   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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) - [ ] 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/4039 -- Commit Summary -- * topoh: improve debug info for topoh crash -- File Changes -- M src/modules/topoh/topoh_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4039.patch https://github.com/kamailio/kamailio/pull/4039.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4039 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4039(a)github.com>

2 1

git:master:c6a485b0: topoh: improve debug info for topoh crash
by Daniel-Constantin Mierla 02 Dec '24

02 Dec '24

Module: kamailio Branch: master Commit: c6a485b04c2ed14b77e8747ffcd822f0743d56dd URL: https://github.com/kamailio/kamailio/commit/c6a485b04c2ed14b77e8747ffcd822f… Author: souradeep.bera <souradeep.bera(a)sprinklr.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-02T12:34:16+01:00 topoh: improve debug info for topoh crash - print entire socket address for ease of debugging with empty mask ip --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c6a485b04c2ed14b77e8747ffcd822f… Patch: https://github.com/kamailio/kamailio/commit/c6a485b04c2ed14b77e8747ffcd822f… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 450b0c7d93a..b2f10d120e0 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -317,8 +317,8 @@ int th_build_socket_strings(socket_info_t *socket) str *socket_ip = NULL; if(socket->sockname.s == NULL || socket->sockname.len <= 0) { - LM_ERR("the socket [%.*s] has no name - it must be set\n", - socket->address_str.len, socket->address_str.s); + LM_ERR("the socket %s has no name - it must be set\n", + socket->sock_str.s); return -1; }

1 0

[kamailio/kamailio] db_mongodb: build warning on CentOS 10 (Issue #4037)
by sergey-safarov 01 Dec '24

01 Dec '24

``` make[2]: --libs: No such file or directory CC (gcc) [M db_mongodb.so] db_mongodb_mod.o CC (gcc) [M db_mongodb.so] mongodb_connection.o CC (gcc) [M db_mongodb.so] mongodb_dbase.o mongodb_dbase.c: In function ‘db_mongodb_convert_result’: mongodb_dbase.c:776:25: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 776 | jstr = bson_as_json(itdoc, NULL); | ^~~~ In file included from /usr/include/libmongoc-1.0/mongoc/mongoc.h:22, from /usr/include/libmongoc-1.0/mongoc.h:18, from mongodb_connection.h:26, from mongodb_dbase.c:27: /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ mongodb_dbase.c: In function ‘db_mongodb_query’: mongodb_dbase.c:1003:17: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 1003 | jstr = bson_as_json(seldoc, NULL); | ^~~~ /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ mongodb_dbase.c:1039:25: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 1039 | jstr = bson_as_json(mgcon->colsdoc, NULL); | ^~~~ /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ mongodb_dbase.c: In function ‘db_mongodb_insert’: mongodb_dbase.c:1177:17: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 1177 | jstr = bson_as_json(doc, NULL); | ^~~~ /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ mongodb_dbase.c: In function ‘db_mongodb_delete’: mongodb_dbase.c:1271:17: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 1271 | jstr = bson_as_json(doc, NULL); | ^~~~ /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ make[3]: Entering directory '/root/rpmbuild/BUILD/kamailio-6.0.0-dev3/src/lib/srdb1' make[3]: 'libsrdb1.so.1.0' is up to date. make[3]: Leaving directory '/root/rpmbuild/BUILD/kamailio-6.0.0-dev3/src/lib/srdb1' LD (gcc) [M db_mongodb.so] db_mongodb.so make[2]: --libs: No such file or directory make[2]: --libs: No such file or directory CC (gcc) [M ndb_mongodb.so] mongodb_client.o mongodb_client.c: In function ‘mongodbc_exec_cmd’: mongodb_client.c:266:17: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 266 | rpl->jsonrpl.s = bson_as_json(&reply, NULL); | ^~~ In file included from /usr/include/libmongoc-1.0/mongoc/mongoc.h:22, from /usr/include/libmongoc-1.0/mongoc.h:18, from mongodb_client.h:25, from mongodb_client.c:34: /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ mongodb_client.c:271:25: warning: ‘mongoc_collection_command’ is deprecated: Use mongoc_collection_command_simple instead [-Wdeprecated-declarations] 271 | rpl->cursor = mongoc_collection_command(rpl->collection, | ^~~ In file included from /usr/include/libmongoc-1.0/mongoc/mongoc-client.h:26, from /usr/include/libmongoc-1.0/mongoc/mongoc-bulkwrite.h:22, from /usr/include/libmongoc-1.0/mongoc/mongoc.h:28: /usr/include/libmongoc-1.0/mongoc/mongoc-collection.h:51:1: note: declared here 51 | mongoc_collection_command (mongoc_collection_t *collection, | ^~~~~~~~~~~~~~~~~~~~~~~~~ mongodb_client.c:306:17: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 306 | rpl->jsonrpl.s = bson_as_json(cdoc, NULL); | ^~~ /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ mongodb_client.c: In function ‘mongodbc_next_reply’: mongodb_client.c:482:9: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 482 | rpl->jsonrpl.s = bson_as_json(cdoc, NULL); | ^~~ /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ CC (gcc) [M ndb_mongodb.so] ndb_mongodb_mod.o LD (gcc) [M ndb_mongodb.so] ndb_mongodb.so make[2]: --libs: No such file or directory make[2]: --libs: No such file or directory CC (gcc) [M db_mysql.so] db_mysql.o CC (gcc) [M db_mysql.so] km_db_mysql.o ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4037 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4037(a)github.com>

2 7

git:master:dca29a87: db_mongodb: use STR_VTOZ() macro
by Daniel-Constantin Mierla 01 Dec '24

01 Dec '24

Module: kamailio Branch: master Commit: dca29a87467fd074bcb63a5f20b6834a87fadc5f URL: https://github.com/kamailio/kamailio/commit/dca29a87467fd074bcb63a5f20b6834… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-01T09:02:12+01:00 db_mongodb: use STR_VTOZ() macro --- Modified: src/modules/ndb_mongodb/mongodb_client.c --- Diff: https://github.com/kamailio/kamailio/commit/dca29a87467fd074bcb63a5f20b6834… Patch: https://github.com/kamailio/kamailio/commit/dca29a87467fd074bcb63a5f20b6834… --- diff --git a/src/modules/ndb_mongodb/mongodb_client.c b/src/modules/ndb_mongodb/mongodb_client.c index 94d1b87500b..6f4818a712f 100644 --- a/src/modules/ndb_mongodb/mongodb_client.c +++ b/src/modules/ndb_mongodb/mongodb_client.c @@ -252,14 +252,13 @@ int mongodbc_exec_cmd( mongoc_client_get_collection(rsrv->client, dname->s, cname->s); LM_DBG("trying to execute: [[%.*s]]\n", cmd->len, cmd->s); - c = cmd->s[cmd->len]; - cmd->s[cmd->len] = '\0'; + STR_VTOZ(cmd->s[cmd->len], c); if(!bson_init_from_json(&command, cmd->s, cmd->len, &error)) { cmd->s[cmd->len] = c; LM_ERR("Failed to run command: %s\n", error.message); goto error_exec; } - cmd->s[cmd->len] = c; + STR_ZTOV(cmd->s[cmd->len], c); if(emode == 0) { ret = mongoc_collection_command_simple( rpl->collection, &command, NULL, &reply, &error);

1 0

[kamailio/kamailio] Python exception handling (Issue #4045)
by Matthias Urlichs 30 Nov '24

30 Nov '24

### Description The Python3 modules violate Python's exception handling contract.  ### Troubleshooting #### Reproduction ``` KSR.pc.sets("$fU",None) ``` #### Debugging Data ``` Unhandled exception in the Python code: TypeError: kemi-param-ss() argument 2 must be str, not None The above exception was the direct cause of the following exception: Traceback (most recent call last): File "/usr/local/lib/python3.11/dist-packages/kamailio/trace.py", line 212, in pac return proc(*a, **k) ^^^^^^^^^^^^^ File "/usr/local/lib/python3.11/dist-packages/kamailio/_basic.py", line 181, in ksr_request_route self.do_route(msg) File "/usr/local/lib/python3.11/dist-packages/kamailio/_basic.py", line 261, in do_route self.route_static(msg) File "/usr/local/lib/python3.11/dist-packages/kamailio/_basic.py", line 287, in route_static if self.fix_addrs(msg): ^^^^^^^^^^^^^^^^^^^ File "/usr/local/lib/python3.11/dist-packages/kamailio/_basic.py", line 334, in fix_addrs PV.tU = dnr ^^^^^ File "/usr/local/lib/python3.11/dist-packages/kamailio/var.py", line 46, in __setattr__ return self.__setitem__(k, v) ^^^^^^^^^^^^^^^^^^^^^^ File "/usr/local/lib/python3.11/dist-packages/kamailio/var.py", line 73, in __setitem__ KSR.pv.sets("$fU", v) SystemError: <built-in function sets> returned a result with an exception set ``` ### Possible Solutions See PR #4044 ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` seen with 5.6 and 5.8 ``` * **Operating System**: Debian Stable but doesn't matter -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4045 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4045(a)github.com>

2 3

git:master:3991350b: ndb_mongodb: mongoc_collection_command_with_opts() for mongodb_cmd()
by Daniel-Constantin Mierla 30 Nov '24

30 Nov '24

Module: kamailio Branch: master Commit: 3991350b1acdcd8b3cd575cdbc8932b4f8540e13 URL: https://github.com/kamailio/kamailio/commit/3991350b1acdcd8b3cd575cdbc8932b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-30T10:39:20+01:00 ndb_mongodb: mongoc_collection_command_with_opts() for mongodb_cmd() - mongoc_collection_command() is deprecated with lib v1.29.0 - GH #4037 --- Modified: src/modules/ndb_mongodb/mongodb_client.c --- Diff: https://github.com/kamailio/kamailio/commit/3991350b1acdcd8b3cd575cdbc8932b… Patch: https://github.com/kamailio/kamailio/commit/3991350b1acdcd8b3cd575cdbc8932b… --- diff --git a/src/modules/ndb_mongodb/mongodb_client.c b/src/modules/ndb_mongodb/mongodb_client.c index dd48e5d471e..94d1b87500b 100644 --- a/src/modules/ndb_mongodb/mongodb_client.c +++ b/src/modules/ndb_mongodb/mongodb_client.c @@ -274,8 +274,24 @@ int mongodbc_exec_cmd( bson_destroy(&reply); } else { if(emode == 1) { +#if MONGOC_CHECK_VERSION(1, 29, 0) + opts = bson_new(); + ret = mongoc_collection_command_with_opts( + rpl->collection, &command, NULL, opts, &reply, &error); + bson_free(opts); + if(!ret) { + LM_ERR("Failed to run command: %s\n", error.message); + bson_destroy(&command); + goto error_exec; + } + rpl->jsonrpl.s = _ksr_bson_as_json(&reply, NULL); + rpl->jsonrpl.len = (rpl->jsonrpl.s) ? strlen(rpl->jsonrpl.s) : 0; + bson_destroy(&reply); + goto done; +#else rpl->cursor = mongoc_collection_command(rpl->collection, MONGOC_QUERY_NONE, 0, 0, 0, &command, NULL, 0); +#endif } else { #if MONGOC_CHECK_VERSION(1, 5, 0) if(emode == 3) @@ -313,6 +329,10 @@ int mongodbc_exec_cmd( rpl->jsonrpl.len = (rpl->jsonrpl.s) ? strlen(rpl->jsonrpl.s) : 0; } +#if MONGOC_CHECK_VERSION(1, 29, 0) +done: +#endif + LM_DBG("command result: [[%s]]\n", (rpl->jsonrpl.s) ? rpl->jsonrpl.s : "<null>");

1 0

[kamailio/kamailio] race condition in load distribution Use call load distribution (Issue #4047)
by Muhammad Jawad Ud Din 30 Nov '24

30 Nov '24

i am using the 10 algorithm for the call load distribution it is good but when i put more load on it at create a race condition -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4047 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4047(a)github.com>

2 2

[kamailio/kamailio] ERROR: dispatcher [dispatch.c:1796]: ds_load_remove(): cannot find load for (Issue #4046)
by Muhammad Jawad Ud Din 30 Nov '24

30 Nov '24

hey kindly help me with error as i am using the call load distribution algorithm how i resolve this error -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4046 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4046(a)github.com>

1 1

[kamailio/kamailio] lost: build warning on CentOS 10 (Issue #4038)
by sergey-safarov 29 Nov '24

29 Nov '24

``` CC (gcc) [M lost.so] pidf.o CC (gcc) [M lost.so] response.o CC (gcc) [M lost.so] utilities.o utilities.c: In function ‘lost_held_post_request’: utilities.c:1420:9: warning: ‘xmlKeepBlanksDefault’ is deprecated [-Wdeprecated-declarations] 1420 | xmlKeepBlanksDefault(1); | ^~~~~~~~~~~~~~~~~~~~ In file included from pidf.h:37, from utilities.c:49: /usr/include/libxml2/libxml/parser.h:957:17: note: declared here 957 | xmlKeepBlanksDefault (int val); | ^~~~~~~~~~~~~~~~~~~~ utilities.c: In function ‘lost_held_location_request’: utilities.c:1518:9: warning: ‘xmlKeepBlanksDefault’ is deprecated [-Wdeprecated-declarations] 1518 | xmlKeepBlanksDefault(1); | ^~~~~~~~~~~~~~~~~~~~ /usr/include/libxml2/libxml/parser.h:957:17: note: declared here 957 | xmlKeepBlanksDefault (int val); | ^~~~~~~~~~~~~~~~~~~~ utilities.c: In function ‘lost_find_service_request’: utilities.c:1671:9: warning: ‘xmlKeepBlanksDefault’ is deprecated [-Wdeprecated-declarations] 1671 | xmlKeepBlanksDefault(1); | ^~~~~~~~~~~~~~~~~~~~ /usr/include/libxml2/libxml/parser.h:957:17: note: declared here 957 | xmlKeepBlanksDefault (int val); | ^~~~~~~~~~~~~~~~~~~~ utilities.c: In function ‘lost_parse_geo’: utilities.c:1050:41: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=] 1050 | snprintf(loc->latitude, len, "%s", (char *)bufLat); | ^ utilities.c:1050:9: note: ‘snprintf’ output between 1 and 128 bytes into a destination of size 127 1050 | snprintf(loc->latitude, len, "%s", (char *)bufLat); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ utilities.c:1060:42: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=] 1060 | snprintf(loc->longitude, len, "%s", (char *)bufLon); | ^ utilities.c:1060:9: note: ‘snprintf’ output between 1 and 128 bytes into a destination of size 127 1060 | snprintf(loc->longitude, len, "%s", (char *)bufLon); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ utilities.c:1074:49: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=] 1074 | snprintf(loc->altitude, len, "%s", (char *)bufAlt); | ^ utilities.c:1074:17: note: ‘snprintf’ output between 1 and 128 bytes into a destination of size 127 1074 | snprintf(loc->altitude, len, "%s", (char *)bufAlt); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ LD (gcc) [M lost.so] lost.so ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4038 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4038(a)github.com>

2 2

git:master:784f55cd: lost: removed use of deprecated xmlKeepBlanksDefault()
by Daniel-Constantin Mierla 29 Nov '24

29 Nov '24

Module: kamailio Branch: master Commit: 784f55cdb31de9eda6971e04ee12c2cb88556835 URL: https://github.com/kamailio/kamailio/commit/784f55cdb31de9eda6971e04ee12c2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-29T09:33:58+01:00 lost: removed use of deprecated xmlKeepBlanksDefault() - XML_PARSE_NOBLANKS seems to be used, which is suggested in deprecation message - GH #4038 --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/784f55cdb31de9eda6971e04ee12c2c… Patch: https://github.com/kamailio/kamailio/commit/784f55cdb31de9eda6971e04ee12c2c… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 282bb27a57d..5035185efc1 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -1419,7 +1419,6 @@ char *lost_held_post_request(int *lgth, long rtime, char *type) xmlNodePtr ptrLocationRequest = NULL; xmlNodePtr ptrLocationType = NULL; - xmlKeepBlanksDefault(1); *lgth = 0; /* @@ -1517,7 +1516,6 @@ char *lost_held_location_request(p_lost_held_t held, int *lgth) xmlNodePtr ptrLocationType = NULL; xmlNodePtr ptrDevice = NULL; - xmlKeepBlanksDefault(1); *lgth = 0; /* @@ -1670,8 +1668,6 @@ char *lost_find_service_request(p_lost_loc_t loc, p_lost_list_t path, int *lgth) xmlNodePtr ptrNode = NULL; xmlNodePtr ptrPath = NULL; - xmlKeepBlanksDefault(1); - *lgth = 0; /*

1 0

git:master:4a9bb81a: lost: clang format
by Daniel-Constantin Mierla 29 Nov '24

29 Nov '24

Module: kamailio Branch: master Commit: 4a9bb81a69fbef11d92d294fa1db0711ff8e78db URL: https://github.com/kamailio/kamailio/commit/4a9bb81a69fbef11d92d294fa1db071… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-29T09:15:59+01:00 lost: clang format --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/4a9bb81a69fbef11d92d294fa1db071… Patch: https://github.com/kamailio/kamailio/commit/4a9bb81a69fbef11d92d294fa1db071…

1 0

git:master:be2d3bfe: lost: use buffer size for snprintf
by Daniel-Constantin Mierla 29 Nov '24

29 Nov '24

Module: kamailio Branch: master Commit: be2d3bfe537a692efa8cdc2bd4e4441eed5d0840 URL: https://github.com/kamailio/kamailio/commit/be2d3bfe537a692efa8cdc2bd4e4441… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-29T09:13:49+01:00 lost: use buffer size for snprintf --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/be2d3bfe537a692efa8cdc2bd4e4441… Patch: https://github.com/kamailio/kamailio/commit/be2d3bfe537a692efa8cdc2bd4e4441… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 6e3d9c43f06..ae1bed14fa3 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -1047,7 +1047,7 @@ int lost_parse_geo(xmlNodePtr node, p_lost_loc_t loc) if(loc->latitude == NULL) goto err; - snprintf(loc->latitude, len, "%s", (char *)bufLat); + snprintf(loc->latitude, len + 1, "%s", (char *)bufLat); /* logitude */ len = strlen((char *)bufLon); @@ -1057,7 +1057,7 @@ int lost_parse_geo(xmlNodePtr node, p_lost_loc_t loc) goto err; } - snprintf(loc->longitude, len, "%s", (char *)bufLon); + snprintf(loc->longitude, len + 1, "%s", (char *)bufLon); /* altitude */ if(scan == 3) { @@ -1071,13 +1071,13 @@ int lost_parse_geo(xmlNodePtr node, p_lost_loc_t loc) goto err; } - snprintf(loc->altitude, len, "%s", (char *)bufAlt); + snprintf(loc->altitude, len + 1, "%s", (char *)bufAlt); } /* geolocation */ len = strlen((char *)bufLat) + strlen((char *)bufLon) + 1; if((scan == 3) && (lost_geoloc_3d == 1)) { - len += strlen((char *)bufAlt); + len += strlen((char *)bufAlt) + 1; } loc->geodetic = (char *)pkg_malloc(len + 1); if(loc->geodetic == NULL) { @@ -1089,9 +1089,9 @@ int lost_parse_geo(xmlNodePtr node, p_lost_loc_t loc) } if((scan == 3) && (lost_geoloc_3d == 1)) { s_profile = LOST_PRO_GEO3D; - snprintf(loc->geodetic, len, "%s %s %s", (char *)bufLat, (char *)bufLon, (char *)bufAlt); + snprintf(loc->geodetic, len + 1, "%s %s %s", (char *)bufLat, (char *)bufLon, (char *)bufAlt); } else { - snprintf(loc->geodetic, len, "%s %s", (char *)bufLat, (char *)bufLon); + snprintf(loc->geodetic, len + 1, "%s %s", (char *)bufLat, (char *)bufLon); } /* find <radius> element */

1 0

[kamailio/kamailio] kamcmd tm.t_uac_start error (Issue #4042)
by suiyuemanbu 29 Nov '24

29 Nov '24

kamcmd tm.t_uac_start INVITE sip:1346@192.168.10.22:5080 . . 'From: <sip:1000@192.168.10.11>\r\n' 'To: <sip:1346@192.168.10.22:5080>\r\n' error: 400 - Invalid headers the log is : /usr/bin/kamailio[2773]: ERROR: <core> [core/parser/msg_parser.c:260]: get_hdr_field(): no eol - bad body for <From> (hdr type: 4) [<sip:1000@192.168.10.11>\r\n] /usr/bin/kamailio[2773]: ERROR: <core> [core/parser/msg_parser.c:339]: parse_headers(): bad header field [From: <sip:1000@192.168.10.11>\r\n] kamailio -v version: kamailio 5.7.0 (x86_64/linux) f1e91d please help me, thank you -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4042 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4042(a)github.com>

2 2

git:master:8e6a8e0b: ndb_mongodb: fix for deprecated bson_as_json() from v1.29.0
by Daniel-Constantin Mierla 29 Nov '24

29 Nov '24

Module: kamailio Branch: master Commit: 8e6a8e0baf8a700f36c81d3f808391f03a37c9d1 URL: https://github.com/kamailio/kamailio/commit/8e6a8e0baf8a700f36c81d3f808391f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-29T07:53:31+01:00 ndb_mongodb: fix for deprecated bson_as_json() from v1.29.0 - GH #4037 --- Modified: src/modules/ndb_mongodb/mongodb_client.c --- Diff: https://github.com/kamailio/kamailio/commit/8e6a8e0baf8a700f36c81d3f808391f… Patch: https://github.com/kamailio/kamailio/commit/8e6a8e0baf8a700f36c81d3f808391f… --- diff --git a/src/modules/ndb_mongodb/mongodb_client.c b/src/modules/ndb_mongodb/mongodb_client.c index 946eb6de19f..dd48e5d471e 100644 --- a/src/modules/ndb_mongodb/mongodb_client.c +++ b/src/modules/ndb_mongodb/mongodb_client.c @@ -34,6 +34,12 @@ #include "mongodb_client.h" #include "api.h" +#if MONGOC_CHECK_VERSION(1, 29, 0) +#define _ksr_bson_as_json bson_as_legacy_extended_json +#else +#define _ksr_bson_as_json bson_as_json +#endif + static mongodbc_server_t *_mongodbc_srv_list = NULL; static mongodbc_reply_t *_mongodbc_rpl_list = NULL; @@ -263,7 +269,7 @@ int mongodbc_exec_cmd( goto error_exec; } bson_destroy(&command); - rpl->jsonrpl.s = bson_as_json(&reply, NULL); + rpl->jsonrpl.s = _ksr_bson_as_json(&reply, NULL); rpl->jsonrpl.len = (rpl->jsonrpl.s) ? strlen(rpl->jsonrpl.s) : 0; bson_destroy(&reply); } else { @@ -303,7 +309,7 @@ int mongodbc_exec_cmd( } goto error_exec; } - rpl->jsonrpl.s = bson_as_json(cdoc, NULL); + rpl->jsonrpl.s = _ksr_bson_as_json(cdoc, NULL); rpl->jsonrpl.len = (rpl->jsonrpl.s) ? strlen(rpl->jsonrpl.s) : 0; } @@ -479,7 +485,7 @@ int mongodbc_next_reply(str *name) rpl->jsonrpl.s = NULL; rpl->jsonrpl.len = 0; } - rpl->jsonrpl.s = bson_as_json(cdoc, NULL); + rpl->jsonrpl.s = _ksr_bson_as_json(cdoc, NULL); rpl->jsonrpl.len = (rpl->jsonrpl.s) ? strlen(rpl->jsonrpl.s) : 0; LM_DBG("next cursor result: [[%s]]\n", (rpl->jsonrpl.s) ? rpl->jsonrpl.s : "<null>");

1 0

git:master:a4a86bd1: db_mongodb: fix for deprecated bson_as_json() from v1.29.0
by Daniel-Constantin Mierla 29 Nov '24

29 Nov '24

Module: kamailio Branch: master Commit: a4a86bd1a84ee16630660873486ec7d870a4e361 URL: https://github.com/kamailio/kamailio/commit/a4a86bd1a84ee16630660873486ec7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-29T07:33:58+01:00 db_mongodb: fix for deprecated bson_as_json() from v1.29.0 - GH #4037 --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/a4a86bd1a84ee16630660873486ec7d… Patch: https://github.com/kamailio/kamailio/commit/a4a86bd1a84ee16630660873486ec7d… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index a57324d4afa..df49af6f925 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -29,6 +29,12 @@ #define DB_MONGODB_ROWS_STEP 1000 +#if MONGOC_CHECK_VERSION(1, 29, 0) +#define _ksr_bson_as_json bson_as_legacy_extended_json +#else +#define _ksr_bson_as_json bson_as_json +#endif + typedef struct db_mongodb_result { mongoc_collection_t *collection; /*!< Collection link */ @@ -773,7 +779,7 @@ static int db_mongodb_convert_result(const db1_con_t *_h, db1_res_t *_r) mgres->maxrows = RES_ROW_N(_r); } if(is_printable(L_DBG)) { - jstr = bson_as_json(itdoc, NULL); + jstr = _ksr_bson_as_json(itdoc, NULL); LM_DBG("selected document: %s\n", jstr); bson_free(jstr); } @@ -1000,7 +1006,7 @@ int db_mongodb_query(const db1_con_t *_h, const db_key_t *_k, } if(is_printable(L_DBG)) { - jstr = bson_as_json(seldoc, NULL); + jstr = _ksr_bson_as_json(seldoc, NULL); LM_DBG("query filter: %s\n", jstr); bson_free(jstr); } @@ -1036,7 +1042,7 @@ int db_mongodb_query(const db1_con_t *_h, const db_key_t *_k, } #endif if(is_printable(L_DBG)) { - jstr = bson_as_json(mgcon->colsdoc, NULL); + jstr = _ksr_bson_as_json(mgcon->colsdoc, NULL); LM_DBG("columns filter: %s\n", jstr); bson_free(jstr); } @@ -1174,7 +1180,7 @@ int db_mongodb_insert(const db1_con_t *_h, const db_key_t *_k, goto error; } if(is_printable(L_DBG)) { - jstr = bson_as_json(doc, NULL); + jstr = _ksr_bson_as_json(doc, NULL); LM_DBG("insert document: %s\n", jstr); bson_free(jstr); } @@ -1268,7 +1274,7 @@ int db_mongodb_delete(const db1_con_t *_h, const db_key_t *_k, } if(is_printable(L_DBG)) { - jstr = bson_as_json(doc, NULL); + jstr = _ksr_bson_as_json(doc, NULL); LM_DBG("delete filter document: %s\n", jstr); bson_free(jstr); }

1 0

git:master:5eac8fd5: lib/ims: libxml2 is not needed - removed from makefile
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 5eac8fd5356cc424d87cac4b4102c99e97054414 URL: https://github.com/kamailio/kamailio/commit/5eac8fd5356cc424d87cac4b4102c99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T14:38:08+01:00 lib/ims: libxml2 is not needed - removed from makefile --- Modified: src/lib/ims/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/5eac8fd5356cc424d87cac4b4102c99… Patch: https://github.com/kamailio/kamailio/commit/5eac8fd5356cc424d87cac4b4102c99… --- diff --git a/src/lib/ims/Makefile b/src/lib/ims/Makefile index 482404ca36e..5a3dab42316 100644 --- a/src/lib/ims/Makefile +++ b/src/lib/ims/Makefile @@ -8,30 +8,8 @@ NAME:=kamailio_ims MAJOR_VER=0 MINOR_VER=1 BUGFIX_VER=0 -DEFS+=-DSER +LIBS= -ifeq ($(CROSS_COMPILE),) -XML2CFG=$(shell which xml2-config) -ifeq ($(XML2CFG),) -XML2CFG=$(shell \ - if pkg-config --exists libxml-2.0; then \ - echo 'pkg-config libxml-2.0'; \ - fi) -endif -endif - -ifneq ($(XML2CFG),) - libxml2_includes = $(shell $(XML2CFG) --cflags) - libxml2_libs = $(shell $(XML2CFG) --libs) -else - libxml2_includes = -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include - libxml2_libs = -L$(LOCALBASE)/lib -lxml2 -endif - -INCLUDES= -I$(CURDIR)/.. -I$(CURDIR)/../.. $(libxml2_includes) -LIBS=$(libxml2_libs) -#SERLIBPATH=.. -#SER_LIBS=$(SERLIBPATH)/cds/ser_cds +INCLUDES= -I$(CURDIR)/.. -I$(CURDIR)/../.. include ../../Makefile.libs -

1 0

git:master:97b3d1cd: ims_registrar_scscf: use defined fetchc fixup free function
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 97b3d1cd3daec0741352764cb89f08d6d98fe3df URL: https://github.com/kamailio/kamailio/commit/97b3d1cd3daec0741352764cb89f08d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T11:00:40+01:00 ims_registrar_scscf: use defined fetchc fixup free function --- Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/97b3d1cd3daec0741352764cb89f08d… Patch: https://github.com/kamailio/kamailio/commit/97b3d1cd3daec0741352764cb89f08d… --- diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index 4c55f50f4a0..5e163b0403a 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -262,7 +262,7 @@ static cmd_export_t cmds[] = { {"unregister", (cmd_function)unregister, 2, unreg_fixup, unreg_fixup_free, REQUEST_ROUTE | FAILURE_ROUTE}, {"reg_fetch_contacts", (cmd_function)pv_fetch_contacts, 3, fetchc_fixup, - 0, REQUEST_ROUTE | FAILURE_ROUTE}, + fetchc_fixup_free, REQUEST_ROUTE | FAILURE_ROUTE}, {"reg_free_contacts", (cmd_function)pv_free_contacts, 1, fixup_str_null, fixup_free_str_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"can_subscribe_to_reg", (cmd_function)can_subscribe_to_reg, 1, domain_fixup, 0, REQUEST_ROUTE},

1 0

git:master:b993b824: ims_registrar_pcscf: init and check vb variable
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: b993b824447f30c9533b6ebd90ab74c19ea001bb URL: https://github.com/kamailio/kamailio/commit/b993b824447f30c9533b6ebd90ab74c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T10:56:12+01:00 ims_registrar_pcscf: init and check vb variable --- Modified: src/modules/ims_registrar_pcscf/service_routes.c --- Diff: https://github.com/kamailio/kamailio/commit/b993b824447f30c9533b6ebd90ab74c… Patch: https://github.com/kamailio/kamailio/commit/b993b824447f30c9533b6ebd90ab74c… --- diff --git a/src/modules/ims_registrar_pcscf/service_routes.c b/src/modules/ims_registrar_pcscf/service_routes.c index 26b31ad6f1e..c04db041e0c 100644 --- a/src/modules/ims_registrar_pcscf/service_routes.c +++ b/src/modules/ims_registrar_pcscf/service_routes.c @@ -228,7 +228,7 @@ pcontact_t *getContactP(struct sip_msg *_m, udomain_t *_d, pcontact_info_t search_ci; str received_host = {0, 0}; char srcip[50]; - struct via_body *vb; + struct via_body *vb = NULL; unsigned short port, proto; str host; sip_uri_t contact_uri; @@ -274,7 +274,7 @@ pcontact_t *getContactP(struct sip_msg *_m, udomain_t *_d, "[%d://%.*s:%d]\n", proto, host.len, host.s, port); - if(trust_bottom_via) { + if(trust_bottom_via && vb) { if(vb->received != NULL && vb->received->value.len > 0) { received_host = vb->received->value; } else { @@ -285,7 +285,7 @@ pcontact_t *getContactP(struct sip_msg *_m, udomain_t *_d, received_host.s = srcip; } unsigned short received_port = 0; - if(trust_bottom_via) { + if(trust_bottom_via && vb) { if(vb->rport != NULL && vb->rport->value.len > 0) { received_port = atoi(vb->rport->value.s); } else { @@ -298,7 +298,7 @@ pcontact_t *getContactP(struct sip_msg *_m, udomain_t *_d, received_port = 5060; } char received_proto = 0; - if(trust_bottom_via && vb->proto) { + if(trust_bottom_via && vb && vb->proto) { received_proto = vb->proto; } else { received_proto = _m->rcv.proto;

1 0

git:master:c36dd7e9: http_async_client: remove unnecessary str len
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: c36dd7e9c8b01aae5f35e8c576188cd34b1f8aa6 URL: https://github.com/kamailio/kamailio/commit/c36dd7e9c8b01aae5f35e8c576188cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T10:51:56+01:00 http_async_client: remove unnecessary str len --- Modified: src/modules/http_async_client/async_http.c Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/c36dd7e9c8b01aae5f35e8c576188cd… Patch: https://github.com/kamailio/kamailio/commit/c36dd7e9c8b01aae5f35e8c576188cd… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index 1dbe8adc5c1..2ece3a9dd32 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -522,7 +522,7 @@ int async_send_query(sip_msg_t *msg, str *query, str *cbname) q_idx++; snprintf(q_id, MAX_ID_LEN + 1, "%u-%u", (unsigned int)getpid(), q_idx); - strncpy(aq->id, q_id, strlen(q_id)); + strcpy(aq->id, q_id); aq->query_params.tls_client_cert = NULL; if(ah_params.tls_client_cert) { diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index a57aba9c951..daceb932ec9 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -100,7 +100,7 @@ void event_cb(int fd, short kind, void *userp) update_stat(timeouts, 1); const char *error = "TIMEOUT"; - strncpy(cell->error, error, strlen(error) + 1); + strcpy(cell->error, error); reply_error(cell); @@ -218,7 +218,7 @@ int check_mcode(CURLMcode code, char *error) break; } LM_ERR("ERROR: %s\n", s); - strncpy(error, s, strlen(s) + 1); + strcpy(error, s); return -1; } return 0;

1 0

git:master:eab6682e: keepalive: use memcpy for coping data
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: eab6682e4d8bebaf97f85c55b0863ad435e1d133 URL: https://github.com/kamailio/kamailio/commit/eab6682e4d8bebaf97f85c55b0863ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T10:39:44+01:00 keepalive: use memcpy for coping data --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/eab6682e4d8bebaf97f85c55b0863ad… Patch: https://github.com/kamailio/kamailio/commit/eab6682e4d8bebaf97f85c55b0863ad… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index b1b3581cb34..4c8a186b660 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -210,9 +210,10 @@ int ka_str_copy(str *src, str *dest, char *prefix) return -1; } - if(prefix) - strncpy(dest->s, prefix, lp); - strncpy(dest->s + lp, src->s, src->len); + if(prefix) { + memcpy(dest->s, prefix, lp); + } + memcpy(dest->s + lp, src->s, src->len); dest->s[src->len + lp] = '\0'; dest->len = src->len + lp;

1 0

git:master:92698848: core: removed unnecessary use of strlen
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 926988487358e1ae3ba79ca999629c452e2d32df URL: https://github.com/kamailio/kamailio/commit/926988487358e1ae3ba79ca999629c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T10:36:47+01:00 core: removed unnecessary use of strlen --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/926988487358e1ae3ba79ca999629c4… Patch: https://github.com/kamailio/kamailio/commit/926988487358e1ae3ba79ca999629c4… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 5db20255874..afd67173a5d 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -512,7 +512,7 @@ int ksr_locate_module(char *mod_path, char **new_path) len++; } path[len] = 0; - strncat(path, mod_path, strlen(mod_path)); + strcat(path, mod_path); if(stat(path, &stat_buf) == -1) { LM_DBG("module file not found <%s>\n", path);

1 0

git:master:c2ff02b6: core: modparam - use memcpy for data cloning
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: c2ff02b6d07c0f84dcbe5d0d47de3f12ed791e3a URL: https://github.com/kamailio/kamailio/commit/c2ff02b6d07c0f84dcbe5d0d47de3f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T10:35:19+01:00 core: modparam - use memcpy for data cloning --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/c2ff02b6d07c0f84dcbe5d0d47de3f1… Patch: https://github.com/kamailio/kamailio/commit/c2ff02b6d07c0f84dcbe5d0d47de3f1… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index b48d9e82442..a166cc50706 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -151,7 +151,7 @@ int set_mod_param_regex(char *regex, char *name, modparam_t type, void *val) pkg_free(reg); return -1; } - strncpy(*((char **)ptr), (char *)val2, len_param); + memcpy(*((char **)ptr), (char *)val2, len_param); (*((char **)ptr))[len_param] = '\0'; break;

1 0

git:master:78f272da: async: fixed typo in log message
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 78f272da156ff7796dd84697bbf04522b7a08009 URL: https://github.com/kamailio/kamailio/commit/78f272da156ff7796dd84697bbf0452… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T08:33:41+01:00 async: fixed typo in log message --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/78f272da156ff7796dd84697bbf0452… Patch: https://github.com/kamailio/kamailio/commit/78f272da156ff7796dd84697bbf0452… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 504efa28125..722eb0cdbf9 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -130,7 +130,7 @@ static int mod_init(void) { /* init faked sip msg */ if(faked_msg_init() < 0) { - LM_ERR("failed to iit local sip msg\n"); + LM_ERR("failed to init local sip msg\n"); return -1; }

1 0

git:master:2fccae6c: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 2fccae6cf901edf8b9515636b348246297a06131 URL: https://github.com/kamailio/kamailio/commit/2fccae6cf901edf8b9515636b348246… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-28T08:31:10+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/2fccae6cf901edf8b9515636b348246… Patch: https://github.com/kamailio/kamailio/commit/2fccae6cf901edf8b9515636b348246…

1 0

git:master:97c9aca6: async: docs for mode parameter
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 97c9aca6d2e7300b295c5cc7f9cd405d563d31b2 URL: https://github.com/kamailio/kamailio/commit/97c9aca6d2e7300b295c5cc7f9cd405… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T08:22:15+01:00 async: docs for mode parameter --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97c9aca6d2e7300b295c5cc7f9cd405… Patch: https://github.com/kamailio/kamailio/commit/97c9aca6d2e7300b295c5cc7f9cd405… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index f11e28540ed..4bfa5da48e7 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -129,6 +129,27 @@ modparam("async", "ms_timer", 10) ... modparam("async", "return", 1) ... +</programlisting> + </example> + </section> + <section id="async.p.mode"> + <title><varname>mode</varname> (int)</title> + <para> + Control if the module should bind (0) to tm or not (1). It may not + be needed to use tm functions (e.g., when needing async_tkv_emit() + only). + </para> + <para> + <emphasis> + Default value is 0 (bind to tm module). + </emphasis> + </para> + <example> + <title>Set <varname>mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("async", "mode", 1) +... </programlisting> </example> </section>

1 0

git:master:21d48531: async: added parameter mode
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 21d4853139523920810a9d73916f3435a5a73d70 URL: https://github.com/kamailio/kamailio/commit/21d4853139523920810a9d73916f343… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T08:16:11+01:00 async: added parameter mode - control if binding to tm should be done or not --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/21d4853139523920810a9d73916f343… Patch: https://github.com/kamailio/kamailio/commit/21d4853139523920810a9d73916f343… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 5353082359f..504efa28125 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -43,6 +43,7 @@ MODULE_VERSION static int async_workers = 1; static int async_ms_timer = 0; static int async_return = 0; +static int async_mode = 0; static int mod_init(void); static int child_init(int); @@ -97,6 +98,7 @@ static param_export_t params[]={ {"workers", PARAM_INT, &async_workers}, {"ms_timer", PARAM_INT, &async_ms_timer}, {"return", PARAM_INT, &async_return}, + {"mode", PARAM_INT, &async_mode}, {0, 0, 0} }; @@ -132,13 +134,18 @@ static int mod_init(void) return -1; } - if(load_tm_api(&tmb) == -1) { - LM_ERR("cannot load the TM-functions. Missing TM module?\n"); - return -1; + if(async_mode == 0) { + if(load_tm_api(&tmb) == -1) { + LM_ERR("cannot load the TM-functions. Missing TM module?\n"); + return -1; + } + } else { + memset(&tmb, 0, sizeof(struct tm_binds)); } - if(async_workers <= 0) + if(async_workers <= 0) { return 0; + } if(async_init_timer_list() < 0) { LM_ERR("cannot initialize internal structure\n"); @@ -173,8 +180,9 @@ static int child_init(int rank) if(rank != PROC_MAIN) return 0; - if(async_workers <= 0) + if(async_workers <= 0) { return 0; + } for(i = 0; i < async_workers; i++) { if(fork_basic_timer(PROC_TIMER, "ASYNC MOD TIMER", 1 /*socks flag*/,

1 0

git:master:b003a718: corez: set sndinfo attributes for corex_sip_reply_out()
by Daniel-Constantin Mierla 27 Nov '24

27 Nov '24

Module: kamailio Branch: master Commit: b003a7184a02da5fd6dfe27def8d928d363e36ce URL: https://github.com/kamailio/kamailio/commit/b003a7184a02da5fd6dfe27def8d928… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-27T15:36:33+01:00 corez: set sndinfo attributes for corex_sip_reply_out() --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b003a7184a02da5fd6dfe27def8d928… Patch: https://github.com/kamailio/kamailio/commit/b003a7184a02da5fd6dfe27def8d928… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 115e50f8a03..9f22b445ece 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -1453,6 +1453,16 @@ static int corex_sip_reply_out(sr_event_param_t *evp) str evname = str_init("corex:reply-out"); memset(&sndinfo, 0, sizeof(onsend_info_t)); + sndinfo.dst = evp->dst; + if(evp->rpl != NULL) { + sndinfo.msg = evp->rpl; + sndinfo.buf = evp->rpl->buf; + sndinfo.len = evp->rpl->len; + } else { + sndinfo.msg = evp->req; + sndinfo.buf = evp->req->buf; + sndinfo.len = evp->req->len; + } if(corex_evrt_reply_out_no >= 0 || corex_evcb_reply_out.len > 0) { run_onsend_evroute(&sndinfo, corex_evrt_reply_out_no,

1 0

git:master:13f77911: core: parameter to set async_tkv_evcb
by Daniel-Constantin Mierla 27 Nov '24

27 Nov '24

Module: kamailio Branch: master Commit: 13f77911ebf5c5b53c9793727a9c5b4f1f0865fe URL: https://github.com/kamailio/kamailio/commit/13f77911ebf5c5b53c9793727a9c5b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-27T12:20:05+01:00 core: parameter to set async_tkv_evcb - name of event route or kemi callback for tkv processing --- Modified: src/core/async_task.c Modified: src/core/async_task.h Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/13f77911ebf5c5b53c9793727a9c5b4… Patch: https://github.com/kamailio/kamailio/commit/13f77911ebf5c5b53c9793727a9c5b4…

1 0

[kamailio/kamailio] kamailio exceed limit issue (Issue #4040)
by Muhammad Jawad Ud Din 27 Nov '24

27 Nov '24

route[HANDLE_INVITE] { if (!has_totag()) { if (!t_newtran()) { xlog("L_ERROR", "Failed to create new transaction\n"); sl_reply_error(); exit; } if (!is_present_hf("X-VICIdial-Client-Id")) { xlog("L_WARN", "INVITE received without X-VICIdial-Client-Id header\n"); t_reply("400", "Bad Request - Missing Client ID"); exit; } if ($rU == $null) { xlog("L_WARN", "INVITE received with empty Request-URI username\n"); t_reply("400", "Bad Request - Missing User"); exit; } $var(full_client_id) = $hdr(X-VICIdial-Client-Id); # Extract parent ID if ($var(full_client_id) =~ "^(CID_[0-9]+)-[a-z]$") { $var(parent_client_id) = $(var(full_client_id){re.subst,/^(CID_[0-9]+)-[a-z]$/\1/}); } else { $var(parent_client_id) = $var(full_client_id); } # CPS Check and Rate Limiting lock("cps_counter"); # Get current CPS count and max limit $var(current_cps) = $sht(client_limits=>$var(parent_client_id)); $var(max_cps) = $sht(client_max_cps=>$var(parent_client_id)); xlog("L_INFO", "CPS Check - Client: $var(parent_client_id), Current: $var(current_cps), Max: $var(max_cps)\n"); # Check for configured limit if($var(max_cps) == $null) { unlock("cps_counter"); xlog("L_WARN", "No CPS limit configured for client $var(parent_client_id)\n"); t_reply("403", "Client Not Authorized"); exit; } # Get concurrent calls $var(concurrent_calls) = $sht(client_calls=>$var(parent_client_id)); if($var(concurrent_calls) == $null) { $var(concurrent_calls) = 0; } # Strict limit check if($var(concurrent_calls) >= $var(max_cps)) { unlock("cps_counter"); xlog("L_WARN", "Concurrent call limit reached for $var(parent_client_id): $var(concurrent_calls)/$var(max_cps)\n"); t_reply("503", "Concurrent Call Limit Exceeded"); exit; } # Allow call and increment counter if($var(current_cps) == $null) { $sht(client_limits=>$var(parent_client_id)) = 1; } else { $sht(client_limits=>$var(parent_client_id)) = $var(current_cps) + 1; } xlog("L_INFO", "Call allowed for $var(parent_client_id): Concurrent=$var(concurrent_calls+1)/$var(max_cps)\n"); unlock("cps_counter"); $var(user) = $rU; # Extract parent client ID if this is a child ID if ($var(full_client_id) =~ "^(CID_[0-9]+)-[a-z]$") { $var(parent_client_id) = $(var(full_client_id){re.subst,/^(CID_[0-9]+)-[a-z]$/\1/}); $var(is_child) = 1; } else { $var(parent_client_id) = $var(full_client_id); $var(is_child) = 0; } $avp(full_client_id) = $var(full_client_id); $avp(parent_client_id) = $var(parent_client_id); $avp(user) = $var(user); $var(call_id) = $ci; route(GENERATE_SERIAL_NUMBER); # Track client calls lock("client_counter"); # Update parent counter $var(parent_calls) = $sht(client_calls=>$var(parent_client_id)); if($var(parent_calls) == $null) { $var(parent_calls) = 0; } $sht(client_calls=>$var(parent_client_id)) = $var(parent_calls) + 1; # If it's a child ID, update its individual counter too if ($var(is_child) == 1) { $var(child_calls) = $sht(client_calls=>$var(full_client_id)); if($var(child_calls) == $null) { $var(child_calls) = 0; } $sht(client_calls=>$var(full_client_id)) = $var(child_calls) + 1; } # Store mappings $sht(client_calls=>$var(call_id)) = $var(parent_client_id); $sht(client_original=>$var(call_id)) = $var(full_client_id); unlock("client_counter"); # Find destination with lowest active calls $var(min_calls) = 999; $var(selected_dst) = ""; lock("calls_counter"); if (ds_select_dst("4", "4")) { $var(count) = 0; # Add counter $var(current_calls) = $sht(active_calls=>$du); if ($var(current_calls) == $null) { $var(current_calls) = 0; } if ($var(current_calls) < $var(min_calls)) { $var(min_calls) = $var(current_calls); $var(selected_dst) = $du; } while(ds_next_dst() && $var(count) < 350) { # Set higher than 280 $var(count) = $var(count) + 1; $var(current_calls) = $sht(active_calls=>$du); if ($var(current_calls) == $null) { $var(current_calls) = 0; } if ($var(current_calls) < $var(min_calls)) { $var(min_calls) = $var(current_calls); $var(selected_dst) = $du; } } } if ($var(selected_dst) != "" && $var(min_calls) < 25) { $du = $var(selected_dst); # Add this block - Double check the count hasn't changed $var(current_count) = $sht(active_calls=>$du); if ($var(current_count) >= 25) { unlock("calls_counter"); xlog("L_ERROR", "Count increased during selection for $du to $var(current_count)\n"); t_reply("503", "Service Unavailable"); exit; } # Store Call-ID to destination mapping $sht(active_calls=>$var(call_id)) = $du; # Increment call counter $sht(active_calls=>$du) = $var(min_calls) + 1; unlock("calls_counter"); route(RELAY_INVITE); } else { unlock("calls_counter"); xlog("L_NOTICE", "Unlocked $ci"); $du = "sip:34.125.5.64:5060"; t_on_failure("FINAL_FAILURE"); if (!t_relay()) { t_reply("500", "Internal Server Error"); } } } else { route(RELAY); } } here is my invite rout configuration if you look at to the cps limit this is occultly the call per second limit on the client id when i set it 200 and the start calling up to 3000 per seconds so some time or for a bit of time it exceed the limit 201 or 202 then it start enforce 200 so if anyone have the best idea or suggestion regarding to this with the good ms time -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4040 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4040(a)github.com>

2 2

git:master:a6c7538c: core: new parameter to define async_tkv_gname
by Daniel-Constantin Mierla 27 Nov '24

27 Nov '24

Module: kamailio Branch: master Commit: a6c7538cb873aa8ee173eadffecbe3fdefe40bd7 URL: https://github.com/kamailio/kamailio/commit/a6c7538cb873aa8ee173eadffecbe3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-27T09:18:06+01:00 core: new parameter to define async_tkv_gname --- Modified: src/core/async_task.c Modified: src/core/async_task.h Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/a6c7538cb873aa8ee173eadffecbe3f… Patch: https://github.com/kamailio/kamailio/commit/a6c7538cb873aa8ee173eadffecbe3f… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index e66205335fa..66b3d2c0b08 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -537,6 +537,16 @@ int async_task_run(async_wgroup_t *awg, int idx) static async_wgroup_t *_async_tkv_awg = NULL; static async_tkv_param_t *_ksr_async_tkv_param = NULL; static int _ksr_async_tkv_ridx = -1; +static str async_tkv_gname = str_init("tkv"); + +/** + * + */ +void async_tkv_gname_set(char *gname) +{ + async_tkv_gname.s = gname; + async_tkv_gname.len = strlen(async_tkv_gname.s); +} /** * @@ -551,10 +561,12 @@ async_tkv_param_t *ksr_async_tkv_param_get(void) */ void async_tkv_init(void) { - str gname = str_init("tkv"); str evname = str_init("core:tkv"); - _async_tkv_awg = async_task_group_find(&gname); + if(async_tkv_gname.len <= 0) { + return; + } + _async_tkv_awg = async_task_group_find(&async_tkv_gname); _ksr_async_tkv_ridx = route_lookup(&event_rt, evname.s); if(_ksr_async_tkv_ridx <= 0 diff --git a/src/core/async_task.h b/src/core/async_task.h index 67df94d6169..8319f0b8a46 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -69,5 +69,6 @@ typedef struct async_tkv_param void async_tkv_init(void); int async_tkv_emit(int dtype, char *pkey, char *fmt, ...); async_tkv_param_t *ksr_async_tkv_param_get(void); +void async_tkv_gname_set(char *gname); #endif diff --git a/src/core/cfg.lex b/src/core/cfg.lex index a557f62754f..91aece447f3 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -381,6 +381,7 @@ ASYNC_WORKERS async_workers ASYNC_USLEEP async_usleep ASYNC_NONBLOCK async_nonblock ASYNC_WORKERS_GROUP async_workers_group +ASYNC_TKV_GNAME async_tkv_gname CHECK_VIA check_via PHONE2TEL phone2tel MEMLOG "memlog"|"mem_log" @@ -874,6 +875,7 @@ IMPORTFILE "import_file" <INITIAL>{ASYNC_USLEEP} { count(); yylval.strval=yytext; return ASYNC_USLEEP; } <INITIAL>{ASYNC_NONBLOCK} { count(); yylval.strval=yytext; return ASYNC_NONBLOCK; } <INITIAL>{ASYNC_WORKERS_GROUP} { count(); yylval.strval=yytext; return ASYNC_WORKERS_GROUP; } +<INITIAL>{ASYNC_TKV_GNAME} { count(); yylval.strval=yytext; return ASYNC_TKV_GNAME; } <INITIAL>{CHECK_VIA} { count(); yylval.strval=yytext; return CHECK_VIA; } <INITIAL>{PHONE2TEL} { count(); yylval.strval=yytext; return PHONE2TEL; } <INITIAL>{MEMLOG} { count(); yylval.strval=yytext; return MEMLOG; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 1033e61cb19..f5544a96ac6 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -397,6 +397,7 @@ extern char *default_routename; %token ASYNC_USLEEP %token ASYNC_NONBLOCK %token ASYNC_WORKERS_GROUP +%token ASYNC_TKV_GNAME %token CHECK_VIA %token PHONE2TEL %token MEMLOG @@ -1088,6 +1089,8 @@ assign_stm: | ASYNC_NONBLOCK EQUAL error { yyerror("number expected"); } | ASYNC_WORKERS_GROUP EQUAL STRING { async_task_set_workers_group($3); } | ASYNC_WORKERS_GROUP EQUAL error { yyerror("string expected"); } + | ASYNC_TKV_GNAME EQUAL STRING { async_tkv_gname_set($3); } + | ASYNC_TKV_GNAME EQUAL error { yyerror("string expected"); } | CHECK_VIA EQUAL NUMBER { check_via=$3; } | CHECK_VIA EQUAL error { yyerror("boolean value expected"); } | PHONE2TEL EQUAL NUMBER { phone2tel=$3; }

1 0

git:master:a433cdf5: modules: readme files regenerated - jsonrpcs ... [skip ci]
by Kamailio Dev 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: a433cdf5532e9b2e945fa4ced2e07c0566c01eb3 URL: https://github.com/kamailio/kamailio/commit/a433cdf5532e9b2e945fa4ced2e07c0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-26T15:46:10+01:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/a433cdf5532e9b2e945fa4ced2e07c0… Patch: https://github.com/kamailio/kamailio/commit/a433cdf5532e9b2e945fa4ced2e07c0… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index d4aa520a5ea..1e14cf89af0 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -421,6 +421,8 @@ event_route[xhttp:request] { ... jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); +jsonrpc_exec('{"jsonrpc": "2.0", "method": "corex.debug", "params": [ 2 ], "id": + 1}'); ... 6. JSONRPC Commands

1 0

git:master:5437ad1a: jsonrpcs: docs - example for jsonrpc_exec() with rpc params
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 5437ad1a1dd691707e6ea1774e5c8ff6a72d30a7 URL: https://github.com/kamailio/kamailio/commit/5437ad1a1dd691707e6ea1774e5c8ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T15:41:44+01:00 jsonrpcs: docs - example for jsonrpc_exec() with rpc params --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5437ad1a1dd691707e6ea1774e5c8ff… Patch: https://github.com/kamailio/kamailio/commit/5437ad1a1dd691707e6ea1774e5c8ff… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index ab8aee4fcd0..f16cac7a7ee 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -495,6 +495,7 @@ event_route[xhttp:request] { ... jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); +jsonrpc_exec('{"jsonrpc": "2.0", "method": "corex.debug", "params": [ 2 ], "id": 1}'); ... </programlisting> </example>

1 0

Request for assistance with Microsoft Teams and Asterisk integration
by Giuseppe Marletta 26 Nov '24

26 Nov '24

Dear Kamailio Team, My name is Marletta, and I am a technician. I am working on a project involving Kamailio and need some information or assistance to configure its integration with Microsoft Teams and Asterisk. Specifically, I would like to know: 1. Is this integration feasible? 2. Which certificates should be used? 3. How can I validate the communication between Kamailio and Teams? I have consulted the official documentation and forums but could not find comprehensive answers. Would it be possible to receive your support or be directed to relevant resources or experts? Thank you in advance for your time and for the work you do to support this remarkable open-source community. I remain available to provide further details or clarifications. Best regards / 此致 [cid:image001.png@01DB3F60.F5D74DE0] Giuseppe Marletta Viale Europa, 128 - 65010 SPOLTORE (PE) Tel [+39] 085 4450011- Fax [+39] 085 4459477 PI e C.F. 01635460684 www.tecnojest.com<http://www.tecnojest.com/> [Image result for you tube icon]<https://www.youtube.com/@tecnojestsrl>[cid:image003.png@01DB3F60.F5D74DE0]<http://www.tecnojest.com/> [cid:image004.png@01DB3F60.F5D74DE0] <https://www.linkedin.com/company/tecnojests.r.l./> Le informazioni contenute nella presente e-mail e nei documenti eventualmente allegati possono essere confidenziali e sono comunque riservate al destinatario della stessa. La loro diffusione, distribuzione e/o copiatura da parte di terzi è proibita. I contenuti testuali sono divulgati a mero titolo informativo, gli stessi non possono essere rivendicati come impegni, ordini o commesse se non accompagnati da specifico documento firmato a norma di legge. Se avete ricevuto questa comunicazione per errore, Vi preghiamo di informare immediatamente il mittente del messaggio e di distruggere questa e-mail. This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure or distribution of the material in this e-mail is strictly forbidden.

2 1

git:master:50ae4a98: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 50ae4a986c93ef8e405732d52f79ab98505888a4 URL: https://github.com/kamailio/kamailio/commit/50ae4a986c93ef8e405732d52f79ab9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-26T13:31:10+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/50ae4a986c93ef8e405732d52f79ab9… Patch: https://github.com/kamailio/kamailio/commit/50ae4a986c93ef8e405732d52f79ab9… --- diff --git a/src/modules/async/README b/src/modules/async/README index a703c1224b1..f1ac057d01a 100644 --- a/src/modules/async/README +++ b/src/modules/async/README @@ -39,6 +39,7 @@ Daniel-Constantin Mierla 4.6. async_task_group_route(routename, groupname) 4.7. async_task_data(routename, data) 4.8. async_task_group_data(routename, groupname, data) + 4.9. async_tkv_emit(type, key, value) List of Examples @@ -54,6 +55,7 @@ Daniel-Constantin Mierla 1.10. async_task_group_route usage 1.11. async_task_data usage 1.12. async_task_group_data usage + 1.13. async_tkv_emit usage Chapter 1. Admin Guide @@ -81,6 +83,7 @@ Chapter 1. Admin Guide 4.6. async_task_group_route(routename, groupname) 4.7. async_task_data(routename, data) 4.8. async_task_group_data(routename, groupname, data) + 4.9. async_tkv_emit(type, key, value) 1. Overview @@ -168,6 +171,7 @@ modparam("async", "return", 1) 4.6. async_task_group_route(routename, groupname) 4.7. async_task_data(routename, data) 4.8. async_task_group_data(routename, groupname, data) + 4.9. async_tkv_emit(type, key, value) 4.1. async_route(routename, seconds) @@ -416,3 +420,24 @@ route[RESUME] { exit; } ... + +4.9. async_tkv_emit(type, key, value) + + Emit a type-key-value event. + + This function can be used from ANY_ROUTE. + + Example 1.13. async_tkv_emit usage +... +async_workers_group="name=tkv;workers=1;nonblock=0;usleep=0" +... +request_route { + ... + async_tkv_emit("8000", "call", "caller='$fU';callee='$tU'"); + ... +} +event_route[core:tkv] { + xinfo("$atkv(type) / $atkv(key) / $atkv(val)\n"); + exit; +} +...

1 0

git:master:3eff208d: async: docs for async_tkv_emit()
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 3eff208df921d6693a015836a266bf87212aae96 URL: https://github.com/kamailio/kamailio/commit/3eff208df921d6693a015836a266bf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T13:15:48+01:00 async: docs for async_tkv_emit() --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3eff208df921d6693a015836a266bf8… Patch: https://github.com/kamailio/kamailio/commit/3eff208df921d6693a015836a266bf8… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 152c6be5db7..f11e28540ed 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -463,6 +463,35 @@ route[RESUME] { exit; } ... +</programlisting> + </example> + </section> + <section id="async.f.async_tkv_emit"> + <title> + <function moreinfo="none">async_tkv_emit(type, key, value)</function> + </title> + <para> + Emit a type-key-value event. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>async_tkv_emit</function> usage</title> + <programlisting format="linespecific"> +... +async_workers_group="name=tkv;workers=1;nonblock=0;usleep=0" +... +request_route { + ... + async_tkv_emit("8000", "call", "caller='$fU';callee='$tU'"); + ... +} +event_route[core:tkv] { + xinfo("$atkv(type) / $atkv(key) / $atkv(val)\n"); + exit; +} +... </programlisting> </example> </section>

1 0

git:master:dd081219: async: exported async_tkv_emit() function
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: dd0812196cede94aeea01f9c67ffe363a38ca100 URL: https://github.com/kamailio/kamailio/commit/dd0812196cede94aeea01f9c67ffe36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T12:58:40+01:00 async: exported async_tkv_emit() function --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dd0812196cede94aeea01f9c67ffe36… Patch: https://github.com/kamailio/kamailio/commit/dd0812196cede94aeea01f9c67ffe36… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index bd31880064f..5353082359f 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -63,6 +63,9 @@ static int w_async_task_group_data( sip_msg_t *msg, char *rt, char *gr, char *pdata); static int fixup_async_task_route(void **param, int param_no); +static int w_async_tkv_emit( + sip_msg_t *msg, char *ptype, char *pkey, char *pval); + /* tm */ struct tm_binds tmb; @@ -84,6 +87,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"async_task_group_data", (cmd_function)w_async_task_group_data, 3, fixup_async_task_route, 0, ANY_ROUTE}, + {"async_tkv_emit", (cmd_function)w_async_tkv_emit, 3, fixup_iss, + fixup_free_iss, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -644,6 +649,34 @@ static int w_async_task_group_data( return ki_async_task_group_data(msg, &rn, &gn, &sdata); } +/** + * + */ +static int w_async_tkv_emit(sip_msg_t *msg, char *ptype, char *pkey, char *pval) +{ + int ret = -1; + int vtype = 0; + str skey = STR_NULL; + str sval = STR_NULL; + + if(fixup_get_ivalue(msg, (gparam_t *)ptype, &vtype) != 0) { + LM_ERR("failed getting type parameter\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t *)pkey, &skey) != 0) { + LM_ERR("failed getting key parameter\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t *)pval, &sval) != 0) { + LM_ERR("failed getting value parameter\n"); + return -1; + } + + ret = async_tkv_emit(vtype, skey.s, "%s", sval.s); + + return (ret == 0) ? 1 : ret; +} + /** * */

1 0

git:master:e3349b79: core: helper fixup functions for int-str-str parameters
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: e3349b793f811538e84713472757b06634d16efb URL: https://github.com/kamailio/kamailio/commit/e3349b793f811538e84713472757b06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T12:45:28+01:00 core: helper fixup functions for int-str-str parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/e3349b793f811538e84713472757b06… Patch: https://github.com/kamailio/kamailio/commit/e3349b793f811538e84713472757b06… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 18785662936..767c6a45a82 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -1062,6 +1062,38 @@ int fixup_free_isi(void **param, int param_no) } } +/** + * + */ +int fixup_iss(void **param, int param_no) +{ + switch(param_no) { + case 1: + return fixup_igp_null(param, 1); + case 2: + case 3: + return fixup_spve_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_iss(void **param, int param_no) +{ + switch(param_no) { + case 1: + return fixup_free_igp_null(param, 1); + case 2: + case 3: + return fixup_free_spve_null(param, 1); + default: + return E_UNSPEC; + } +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 092f65b93bc..6ec0280ac70 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -187,6 +187,9 @@ int fixup_free_ssii(void **param, int param_no); int fixup_isi(void **param, int param_no); int fixup_free_isi(void **param, int param_no); +int fixup_iss(void **param, int param_no); +int fixup_free_iss(void **param, int param_no); + int fixup_isii(void **param, int param_no); int fixup_free_isii(void **param, int param_no);

1 0

git:master:77e7494d: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 77e7494d29d891c44a49377a462b0c82e6769f1e URL: https://github.com/kamailio/kamailio/commit/77e7494d29d891c44a49377a462b0c8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-26T10:46:10+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/77e7494d29d891c44a49377a462b0c8… Patch: https://github.com/kamailio/kamailio/commit/77e7494d29d891c44a49377a462b0c8… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index ef5c56f6df6..44439a450d7 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1678,6 +1678,11 @@ onreply_route { The parameters can include variables. + The returns 1 (cfg-true) when the oc attrbutes are udpated for a + destination record; -1 (cfg-false) when there is an internal error; -2 + (cfg-false) when no destination is updated (e.g., not found or the + ocseq condition fails). + This function can be used from ANY_ROUTE. Example 1.61. ds_oc_set_attrs() usage

1 0

git:master:76f2d91d: dispatcher: updated docs for ds_oc_set_attrs()
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 76f2d91dc00fa33368d4df0d5a25a2dbbbc9f8c7 URL: https://github.com/kamailio/kamailio/commit/76f2d91dc00fa33368d4df0d5a25a2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T10:39:35+01:00 dispatcher: updated docs for ds_oc_set_attrs() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/76f2d91dc00fa33368d4df0d5a25a2d… Patch: https://github.com/kamailio/kamailio/commit/76f2d91dc00fa33368d4df0d5a25a2d… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 5e7cb95953c..f311be2f1ff 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2073,6 +2073,10 @@ onreply_route { </listitem> </itemizedlist> <para>The parameters can include variables.</para> + <para>The returns 1 (cfg-true) when the oc attrbutes are udpated for a + destination record; -1 (cfg-false) when there is an internal error; + -2 (cfg-false) when no destination is updated (e.g., not found or the + ocseq condition fails).</para> <para> This function can be used from ANY_ROUTE. </para>

1 0

git:master:cf724165: dispatcher: ds_oc_set_attrs() return -2 when no oc attributes are updated
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: cf72416567d915c1024471e917b933d057452ed9 URL: https://github.com/kamailio/kamailio/commit/cf72416567d915c1024471e917b933d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T10:36:07+01:00 dispatcher: ds_oc_set_attrs() return -2 when no oc attributes are updated --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cf72416567d915c1024471e917b933d… Patch: https://github.com/kamailio/kamailio/commit/cf72416567d915c1024471e917b933d… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 1c31ca3fc95..3d536b7c171 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -483,6 +483,7 @@ int ds_oc_set_attrs( tdiff.tv_sec = (((itval > 0) ? itval : 500) * 1000) / 1000000; tdiff.tv_usec = (((itval > 0) ? itval : 500) * 1000) % 1000000; + ret = -2; for(i = 0; i < idx->nr; i++) { if(idx->dlist[i].uri.len == duri->len && strncasecmp(idx->dlist[i].uri.s, duri->s, duri->len) == 0) {

1 0

git:master:0571cb9c: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 0571cb9c7ae2ba3a045e11b003bfba9e5ca6c9fc URL: https://github.com/kamailio/kamailio/commit/0571cb9c7ae2ba3a045e11b003bfba9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-26T10:31:10+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/0571cb9c7ae2ba3a045e11b003bfba9… Patch: https://github.com/kamailio/kamailio/commit/0571cb9c7ae2ba3a045e11b003bfba9… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 2a6148504db..ef5c56f6df6 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -122,7 +122,8 @@ Federico Cabiddu 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) + 4.17. ds_dsg_fetch_uri(setid, uri) + 4.18. ds_oc_set_attrs(setid, uri, rval, tval, sval) 5. RPC Commands @@ -213,9 +214,10 @@ Federico Cabiddu 1.57. ds_load_unset usage 1.58. ds_reload usage 1.59. ds_dsg_fetch() usage - 1.60. ds_oc_set_attrs() usage - 1.61. dispatcher list file - 1.62. Kamailio config script - sample dispatcher usage + 1.60. ds_dsg_fetch_uri() usage + 1.61. ds_oc_set_attrs() usage + 1.62. dispatcher list file + 1.63. Kamailio config script - sample dispatcher usage Chapter 1. Admin Guide @@ -292,7 +294,8 @@ Chapter 1. Admin Guide 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) + 4.17. ds_dsg_fetch_uri(setid, uri) + 4.18. ds_oc_set_attrs(setid, uri, rval, tval, sval) 5. RPC Commands @@ -1120,7 +1123,8 @@ modparam("dispatcher", "ds_interval_mode", 7200) 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) + 4.17. ds_dsg_fetch_uri(setid, uri) + 4.18. ds_oc_set_attrs(setid, uri, rval, tval, sval) 4.1. ds_select_dst(set, alg[, limit]) @@ -1638,7 +1642,24 @@ onreply_route { xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); ... -4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) +4.17. ds_dsg_fetch_uri(setid, uri) + + Sets the destination group id to setid for fetching $dsg(key) + attributes and the overload-control attributes to the corresponding uri + record from that group. + + Parameters: setid - integer or variable holding the set id value; uri - + string or variables holding the SIP URI value. + + This function can be used from ANY_ROUTE. + + Example 1.60. ds_dsg_fetch_uri() usage +... + ds_dsg_fetch_uri("1", "sip:127.0.0.1:5080"); + xinfo("set id: 1 - all: $dsg(count); active: $dsg(active); $dsg(ocrate)\n"); +... + +4.18. ds_oc_set_attrs(setid, uri, rval, tval, sval) Sets the overload control rate, time internval limit and sequence number for the destination record (setid, uri) following RFC7339 @@ -1659,7 +1680,7 @@ onreply_route { This function can be used from ANY_ROUTE. - Example 1.60. ds_oc_set_attrs() usage + Example 1.61. ds_oc_set_attrs() usage ... ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "180000", "1"); ... @@ -1964,7 +1985,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) For database, each element of a line resides in a different column. Next is a dispatcher.list file example: - Example 1.61. dispatcher list file + Example 1.62. dispatcher list file ... # # dispatcher destination sets (groups) @@ -1989,7 +2010,7 @@ r,opt) Next listing shows a sample config for using the dispatcher module. - Example 1.62. Kamailio config script - sample dispatcher usage + Example 1.63. Kamailio config script - sample dispatcher usage ... #!KAMAILIO #

1 0

git:master:2bbba597: dispatcher: docs for ds_dsg_fetch_uri()
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 2bbba597c6b7bbef79b0c8be78b4dc94e010ec26 URL: https://github.com/kamailio/kamailio/commit/2bbba597c6b7bbef79b0c8be78b4dc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T10:16:20+01:00 dispatcher: docs for ds_dsg_fetch_uri() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2bbba597c6b7bbef79b0c8be78b4dc9… Patch: https://github.com/kamailio/kamailio/commit/2bbba597c6b7bbef79b0c8be78b4dc9… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 81d5b19cd00..5e7cb95953c 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2011,6 +2011,31 @@ onreply_route { ds_dsg_fetch("1"); xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); ... +</programlisting> + </example> + </section> + <section id="dispatcher.f.ds_dsg_fetch_uri"> + <title> + <function moreinfo="none">ds_dsg_fetch_uri(setid, uri)</function> + </title> + <para> + Sets the destination group id to setid for fetching $dsg(key) attributes + and the overload-control attributes to the corresponding uri record from + that group. + </para> + <para>Parameters: <emphasis>setid</emphasis> - integer or variable + holding the set id value; <emphasis>uri</emphasis> - string or variables + holding the SIP URI value.</para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>ds_dsg_fetch_uri()</function> usage</title> + <programlisting format="linespecific"> +... + ds_dsg_fetch_uri("1", "sip:127.0.0.1:5080"); + xinfo("set id: 1 - all: $dsg(count); active: $dsg(active); $dsg(ocrate)\n"); +... </programlisting> </example> </section>

1 0

git:master:c1f814b2: fipatcher: more fields to $dsg(...) related to overload control
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: c1f814b2c01d2589e41eac06d3e63571933105eb URL: https://github.com/kamailio/kamailio/commit/c1f814b2c01d2589e41eac06d3e6357… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T10:11:24+01:00 fipatcher: more fields to $dsg(...) related to overload control --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/c1f814b2c01d2589e41eac06d3e6357… Patch: https://github.com/kamailio/kamailio/commit/c1f814b2c01d2589e41eac06d3e6357… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 852296bbad1..d5abb6a62ac 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1528,6 +1528,14 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 4: /* pinactive */ return pv_get_sintval( msg, param, res, (int)((inactive * 100) / count)); + case 5: /* octime_sec */ + return pv_get_sintval(msg, param, res, (long)ocdata.octime.tv_sec); + case 6: /* octime_usec */ + return pv_get_sintval(msg, param, res, (long)ocdata.octime.tv_usec); + case 7: /* ocseq */ + return pv_get_sintval(msg, param, res, ocdata.ocseq); + case 8: /* ocrate */ + return pv_get_sintval(msg, param, res, ocdata.ocrate); default: return pv_get_null(msg, param, res); } @@ -1545,12 +1553,16 @@ static int pv_parse_dsg(pv_spec_p sp, str *in) case 5: if(strncmp(in->s, "count", 5) == 0) sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "ocseq", 5) == 0) + sp->pvp.pvn.u.isname.name.n = 7; else goto error; break; case 6: if(strncmp(in->s, "active", 6) == 0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "ocrate", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 8; else goto error; break; @@ -1572,6 +1584,18 @@ static int pv_parse_dsg(pv_spec_p sp, str *in) else goto error; break; + case 10: + if(strncmp(in->s, "octime_sec", 10) == 0) + sp->pvp.pvn.u.isname.name.n = 5; + else + goto error; + break; + case 11: + if(strncmp(in->s, "octime_usec", 11) == 0) + sp->pvp.pvn.u.isname.name.n = 6; + else + goto error; + break; default: goto error; }

1 0

git:master:c9ec6cad: dispatcher: function to fetch by group id and uri
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: c9ec6cad7300d40beef095116bcdd361bc9690c4 URL: https://github.com/kamailio/kamailio/commit/c9ec6cad7300d40beef095116bcdd36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T19:58:06+01:00 dispatcher: function to fetch by group id and uri --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/c9ec6cad7300d40beef095116bcdd36… Patch: https://github.com/kamailio/kamailio/commit/c9ec6cad7300d40beef095116bcdd36… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index d9626000ddc..852296bbad1 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -185,6 +185,7 @@ static int w_ds_reload(struct sip_msg* msg, char*, char*); static int w_ds_is_active(sip_msg_t *msg, char *pset, char *p2); static int w_ds_is_active_uri(sip_msg_t *msg, char *pset, char *puri); static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2); +static int w_ds_dsg_fetch_uri(sip_msg_t *msg, char *pset, char *puri); static int w_ds_oc_set_attrs(sip_msg_t*, char*, char*, char*, char*, char*); static int fixup_ds_is_from_list(void** param, int param_no); @@ -199,6 +200,7 @@ static int pv_parse_dsv(pv_spec_p sp, str *in); static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_dsg(pv_spec_p sp, str *in); static void ds_dsg_fetch(int dg); +static void ds_dsg_fetch_uri(int dg, str *uri); static pv_export_t mod_pvs[] = { { {"dsv", (sizeof("dsv")-1)}, PVT_OTHER, pv_get_dsv, 0, @@ -266,6 +268,8 @@ static cmd_export_t cmds[]={ fixup_isiii, fixup_free_isiii, ANY_ROUTE}, {"ds_dsg_fetch", (cmd_function)w_ds_dsg_fetch, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + {"ds_dsg_fetch_uri", (cmd_function)w_ds_dsg_fetch_uri, 2, + fixup_igp_spve, fixup_free_igp_spve, ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -1367,14 +1371,32 @@ static int pv_parse_dsv(pv_spec_p sp, str *in) /** * */ -static int _pv_dsg_fetch = 1; +static int _pv_dsg_fetch_dg = 1; +static str _pv_dsg_fetch_uri = STR_NULL; /** * */ static void ds_dsg_fetch(int dg) { - _pv_dsg_fetch = dg; + _pv_dsg_fetch_dg = dg; + if(_pv_dsg_fetch_uri.s != NULL) { + pkg_free(_pv_dsg_fetch_uri.s); + } + _pv_dsg_fetch_uri.s = NULL; + _pv_dsg_fetch_uri.len = 0; +} + +/** + * + */ +static void ds_dsg_fetch_uri(int dg, str *uri) +{ + _pv_dsg_fetch_dg = dg; + if(_pv_dsg_fetch_uri.s != NULL) { + pkg_free(_pv_dsg_fetch_uri.s); + } + pkg_str_dup(&_pv_dsg_fetch_uri, uri); } /** @@ -1393,6 +1415,28 @@ static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2) return 1; } +/** + * + */ +static int w_ds_dsg_fetch_uri(sip_msg_t *msg, char *pset, char *puri) +{ + int set; + str suri = STR_NULL; + + if(fixup_get_ivalue(msg, (gparam_p)pset, &set) != 0) { + LM_ERR("cannot get set id param value\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_p)puri, &suri) != 0) { + LM_ERR("cannot get uri param value\n"); + return -1; + } + + ds_dsg_fetch_uri(set, &suri); + + return 1; +} + /** * */ @@ -1439,16 +1483,19 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) int active = 0; int inactive = 0; int j = 0; + ds_ocdata_t ocdata; if(param == NULL) { return -1; } - dsg = ds_list_lookup(_pv_dsg_fetch); + dsg = ds_list_lookup(_pv_dsg_fetch_dg); if(dsg == NULL) { return pv_get_null(msg, param, res); } + memset(&ocdata, 0, sizeof(ds_ocdata_t)); + lock_get(&dsg->lock); count = dsg->nr; for(j = 0; j < dsg->nr; j++) { @@ -1457,6 +1504,14 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } else { active++; } + if(_pv_dsg_fetch_uri.s != NULL && _pv_dsg_fetch_uri.len > 0) { + if((_pv_dsg_fetch_uri.len == dsg->dlist[j].uri.len) + && (strncmp(dsg->dlist[j].uri.s, _pv_dsg_fetch_uri.s, + _pv_dsg_fetch_uri.len) + == 0)) { + memcpy(&ocdata, &dsg->dlist[j].ocdata, sizeof(ds_ocdata_t)); + } + } } lock_release(&dsg->lock);

1 0

git:master:556efcaa: core: tcp - emit async tkv event for read error
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 556efcaa34367dc689ee653b0de9f22ccef073f9 URL: https://github.com/kamailio/kamailio/commit/556efcaa34367dc689ee653b0de9f22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T19:58:06+01:00 core: tcp - emit async tkv event for read error --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/556efcaa34367dc689ee653b0de9f22… Patch: https://github.com/kamailio/kamailio/commit/556efcaa34367dc689ee653b0de9f22… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index cd7790eb958..c08d9bf074f 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -52,6 +52,7 @@ #include "ut.h" #include "trim.h" #include "pt.h" +#include "async_task.h" #include "daemonize.h" #include "cfg/cfg_struct.h" #ifdef CORE_TLS @@ -269,6 +270,9 @@ int tcp_read_data(int fd, struct tcp_connection *c, char *buf, int b_size, strerror(errno), errno, ip_addr2xa(&c->rcv.src_ip), c->rcv.src_port, ip_addr2xa(&c->rcv.dst_ip), c->rcv.dst_port); + async_tkv_emit(1200, "tcp-read-error", + "erno=%d;srcip=%s;dstip=%s", errno, + ip_addr2xa(&c->rcv.src_ip), ip_addr2xa(&c->rcv.dst_ip)); if(errno == ETIMEDOUT) { c->event = TCP_CLOSED_TIMEOUT; } else if(errno == ECONNRESET) {

1 0

[kamailio/kamailio] cdp: fixes for various issues found with Coverity (PR #4030)
by Dragos Vingarzan 25 Nov '24

25 Nov '24

#### Pre-Submission Checklist    - [ ] 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 - [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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Various fixes for issues discovered with the Coverity static analysis tooling. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4030 -- Commit Summary -- * cdp: fixes for various issues found with coverity -- File Changes -- M src/modules/cdp/authstatemachine.c (2) M src/modules/cdp/common.c (8) M src/modules/cdp/diameter_peer.c (6) M src/modules/cdp/receiver.c (4) M src/modules/cdp/session.c (12) M src/modules/cdp/session.h (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4030.patch https://github.com/kamailio/kamailio/pull/4030.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4030 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4030(a)github.com>

4 15

git:master:1ceeba73: cdp: fixed issues discovered during static code analysis
by Dragos Vingarzan 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 1ceeba7364b745b6ca2840e830d006a37460d10e URL: https://github.com/kamailio/kamailio/commit/1ceeba7364b745b6ca2840e830d006a… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-11-25T13:33:40+01:00 cdp: fixed issues discovered during static code analysis This fixes: - 4-bytes (typically uint32_t) used for time_t storage (Y2K38) - print of time_t with %d instead of %ld - reuse of same loop index variable in a sub-loop - use of random(), when kam_rand() could theoretically be better - copy-paste mistake in sp2/sp parameter, where sp2 was meant and sp is probably NULL --- Modified: src/modules/cdp/authstatemachine.c Modified: src/modules/cdp/common.c Modified: src/modules/cdp/diameter_peer.c Modified: src/modules/cdp/receiver.c Modified: src/modules/cdp/session.c Modified: src/modules/cdp/session.h --- Diff: https://github.com/kamailio/kamailio/commit/1ceeba7364b745b6ca2840e830d006a… Patch: https://github.com/kamailio/kamailio/commit/1ceeba7364b745b6ca2840e830d006a…

1 0

git:master:55691f82: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 55691f82666f361bac5efb6355e6f32afb508660 URL: https://github.com/kamailio/kamailio/commit/55691f82666f361bac5efb6355e6f32… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-25T10:46:10+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/55691f82666f361bac5efb6355e6f32… Patch: https://github.com/kamailio/kamailio/commit/55691f82666f361bac5efb6355e6f32…

1 0

[kamailio/kamailio] Add timer to ping rtpengine (PR #4016)
by Xenofon Karamanos 25 Nov '24

25 Nov '24

- Added parameter to control the interval   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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) - [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  This PR adds a timer that its interval can be controlled with the param `ping_interval`. The timer pings all registered rtpengines and disables if any are found not responsive and vice versa. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4016 -- Commit Summary -- * Add timer to ping rtpengines -- File Changes -- M src/modules/rtpengine/rtpengine.c (50) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4016.patch https://github.com/kamailio/kamailio/pull/4016.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4016 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4016(a)github.com>

4 27

git:master:f7fa3a39: rtpengine/docs: Add ping_interval docs
by Xenofon Karamanos 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: f7fa3a39f6c97ca8323a70f30ad4e33699ede23e URL: https://github.com/kamailio/kamailio/commit/f7fa3a39f6c97ca8323a70f30ad4e33… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine/docs: Add ping_interval docs --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f7fa3a39f6c97ca8323a70f30ad4e33… Patch: https://github.com/kamailio/kamailio/commit/f7fa3a39f6c97ca8323a70f30ad4e33… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 9a57c2e551e..a6c58ce401e 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2404,6 +2404,25 @@ modparam("rtpengine", "ping_mode", 0) </section> +<section id="rtpengine.p.ping_interval"> + <title><varname>ping_interval</varname> (integer)</title> + <para> + Specify the interval in seconds between pings to all rtpengines registered. + </para> + <para> + <emphasis> + Default value is <quote>60</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ping_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rtpengine", "ping_interval", 10) +... + </programlisting> + </example> +</section> <section> <title>Functions</title>

1 0

git:master:a29afb3d: rtpengine: Add doxygen function descriptions
by Xenofon Karamanos 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: a29afb3de6d9dd1491667a5858187ae782d8d56d URL: https://github.com/kamailio/kamailio/commit/a29afb3de6d9dd1491667a5858187ae… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine: Add doxygen function descriptions --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a29afb3de6d9dd1491667a5858187ae… Patch: https://github.com/kamailio/kamailio/commit/a29afb3de6d9dd1491667a5858187ae…

1 0

git:master:e183a3e2: rtpengine: Re-enable down servers (but not disabled ones)
by Xenofon Karamanos 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: e183a3e25c3f2088435b3911d13fcb376a89f5c0 URL: https://github.com/kamailio/kamailio/commit/e183a3e25c3f2088435b3911d13fcb3… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine: Re-enable down servers (but not disabled ones) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e183a3e25c3f2088435b3911d13fcb3… Patch: https://github.com/kamailio/kamailio/commit/e183a3e25c3f2088435b3911d13fcb3… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index cd3a76b1403..bdb4b76e4f1 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1898,6 +1898,12 @@ static int rtpengine_iter_cb_ping( *found_rtpp_disabled = 1; crt_rtpp->rn_disabled = 1; } + /* if ping success, enable the rtpp and reset ticks, ONLY IF was not disabled manually */ + else if(crt_rtpp->rn_recheck_ticks != RTPENGINE_MAX_RECHECK_TICKS) { + crt_rtpp->rn_recheck_ticks = RTPENGINE_MIN_RECHECK_TICKS; + crt_rtpp->rn_disabled = 0; + *found_rtpp_disabled = 0; + } return 0; }

1 0

git:master:38234797: rtpengine: Add timer to ping rtpengine
by Xenofon Karamanos 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 38234797332c79b81522c18cc7c6f83be86c0e9b URL: https://github.com/kamailio/kamailio/commit/38234797332c79b81522c18cc7c6f83… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine: Add timer to ping rtpengine - Added parameter to control the interval --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/38234797332c79b81522c18cc7c6f83… Patch: https://github.com/kamailio/kamailio/commit/38234797332c79b81522c18cc7c6f83…

1 0

git:master:e58dc893: core: tcp read - convert ips to different buffers for log messages
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: e58dc89324b30f09853a7430620e632ec5efaad5 URL: https://github.com/kamailio/kamailio/commit/e58dc89324b30f09853a7430620e632… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T10:27:11+01:00 core: tcp read - convert ips to different buffers for log messages --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/e58dc89324b30f09853a7430620e632… Patch: https://github.com/kamailio/kamailio/commit/e58dc89324b30f09853a7430620e632… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index fd60918fe34..cd7790eb958 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -265,10 +265,10 @@ int tcp_read_data(int fd, struct tcp_connection *c, char *buf, int b_size, } } LOG(cfg_get(core, core_cfg, corelog), - "error reading: %s (%d) ([%s]:%u ->", strerror(errno), - errno, ip_addr2a(&c->rcv.src_ip), c->rcv.src_port); - LOG(cfg_get(core, core_cfg, corelog), "-> [%s]:%u)\n", - ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); + "error reading: %s (%d) ([%s]:%u -> [%s]:%u)\n", + strerror(errno), errno, ip_addr2xa(&c->rcv.src_ip), + c->rcv.src_port, ip_addr2xa(&c->rcv.dst_ip), + c->rcv.dst_port); if(errno == ETIMEDOUT) { c->event = TCP_CLOSED_TIMEOUT; } else if(errno == ECONNRESET) { @@ -280,8 +280,8 @@ int tcp_read_data(int fd, struct tcp_connection *c, char *buf, int b_size, LM_DBG("EOF on connection %p (state: %u, flags: %x) - FD %d," " bytes %d, rd-flags %x ([%s]:%u -> [%s]:%u)", c, c->state, c->flags, fd, bytes_read, *flags, - ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, - ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); + ip_addr2xa(&c->rcv.src_ip), c->rcv.src_port, + ip_addr2xa(&c->rcv.dst_ip), c->rcv.dst_port); c->state = S_CONN_EOF; *flags |= RD_CONN_EOF; c->event = TCP_CLOSED_EOF;

1 0

git:master:c82aa6e9: core: helper functions to convert ip to string using a pool of buffers
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: c82aa6e92d3475bb56db761ba65abb64e8f712fd URL: https://github.com/kamailio/kamailio/commit/c82aa6e92d3475bb56db761ba65abb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T10:16:07+01:00 core: helper functions to convert ip to string using a pool of buffers --- Modified: src/core/ip_addr.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/c82aa6e92d3475bb56db761ba65abb6… Patch: https://github.com/kamailio/kamailio/commit/c82aa6e92d3475bb56db761ba65abb6… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index 02c26f969d5..8e2ae6cf42d 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -298,6 +298,52 @@ char *ip_addr2strz(struct ip_addr *ip) return buff; } +#define IP_ADDR_BUF_NR 8 +static char _ksr_addr2x_buff[IP_ADDR_BUF_NR][IP_ADDR_MAX_STR_SIZE]; +static int _ksr_addr2x_idx = 0; + +/* fast ip_addr -> string converter; + * it uses an internal buffer + */ +char *ip_addr2xa(struct ip_addr *ip) +{ + int len; + char *buff; + + buff = _ksr_addr2x_buff[_ksr_addr2x_idx]; + _ksr_addr2x_idx = (_ksr_addr2x_idx + 1) % IP_ADDR_BUF_NR; + + len = ip_addr2sbuf(ip, buff, sizeof(buff) - 1); + buff[len] = 0; + + return buff; +} + + +/* full address in text representation, including [] for ipv6 */ +char *ip_addr2xstrz(struct ip_addr *ip) +{ + char *p; + int len; + char *buff; + + buff = _ksr_addr2x_buff[_ksr_addr2x_idx]; + _ksr_addr2x_idx = (_ksr_addr2x_idx + 1) % IP_ADDR_BUF_NR; + + p = buff; + if(ip->af == AF_INET6) { + *p++ = '['; + } + len = ip_addr2sbuf(ip, p, sizeof(buff) - 3); + p += len; + if(ip->af == AF_INET6) { + *p++ = ']'; + } + *p = 0; + + return buff; +} + /* returns an asciiz string containing the ip and the port * (<ip_addr>:port or [<ipv6_addr>]:port) diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 4a266391190..b55c78bd8bc 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -614,14 +614,18 @@ int ip_addr2sbufz(struct ip_addr *ip, char *buff, int len); #define IP_ADDR_MAX_STR_SIZE (IP6_MAX_STR_SIZE + 1) /* ip62ascii + \0*/ #define IP_ADDR_MAX_STRZ_SIZE (IP6_MAX_STR_SIZE + 3) /* ip62ascii + [ + ] + \0*/ -/* fast ip_addr -> string converter; - * it uses an internal buffer - */ +/* ip addr to string converter; it uses an internal static buffer */ char *ip_addr2a(struct ip_addr *ip); +/* ip addr to string converter; it uses a pool of internal static buffers */ +char *ip_addr2xa(struct ip_addr *ip); -/* full address in text representation, including [] for ipv6 */ +/* full address in text representation, including [] for ipv6 + * - it uses an internal static buffer */ char *ip_addr2strz(struct ip_addr *ip); +/* full address in text representation, including [] for ipv6 + * - it uses a pool of internal static buffers */ +char *ip_addr2xstrz(struct ip_addr *ip); #define SU2A_MAX_STR_SIZE \

1 0

git:master:8d12a04b: async: fixed name of pv in log message
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 8d12a04b57db2f3da6f522b6685161b38ff40d5e URL: https://github.com/kamailio/kamailio/commit/8d12a04b57db2f3da6f522b6685161b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T09:16:30+01:00 async: fixed name of pv in log message --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/8d12a04b57db2f3da6f522b6685161b… Patch: https://github.com/kamailio/kamailio/commit/8d12a04b57db2f3da6f522b6685161b… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 5fb8861a861..26d2e067597 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -701,7 +701,7 @@ int pv_parse_async_name(pv_spec_t *sp, str *in) return 0; error: - LM_ERR("unknown PV time name %.*s\n", in->len, in->s); + LM_ERR("unknown PV async name %.*s\n", in->len, in->s); return -1; }

1 0

git:master:bebf3782: corex: fixed name of pv in log message
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: bebf378252484f770f2dbc9a27e6ad2b7ff7f880 URL: https://github.com/kamailio/kamailio/commit/bebf378252484f770f2dbc9a27e6ad2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T09:16:30+01:00 corex: fixed name of pv in log message --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bebf378252484f770f2dbc9a27e6ad2… Patch: https://github.com/kamailio/kamailio/commit/bebf378252484f770f2dbc9a27e6ad2… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index c5008bfb445..115e50f8a03 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -1533,7 +1533,7 @@ static int pv_parse_atkv_name(pv_spec_t *sp, str *in) return 0; error: - LM_ERR("unknown PV time name %.*s\n", in->len, in->s); + LM_ERR("unknown PV atkv name %.*s\n", in->len, in->s); return -1; }

1 0

git:master:619b1f80: log_custom: add fixup_free* to exported functions
by Federico Cabiddu 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 619b1f80d648e5869389b431e17c12f7b730634e URL: https://github.com/kamailio/kamailio/commit/619b1f80d648e5869389b431e17c12f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-25T08:34:48+01:00 log_custom: add fixup_free* to exported functions --- Modified: src/modules/log_custom/log_custom_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/619b1f80d648e5869389b431e17c12f… Patch: https://github.com/kamailio/kamailio/commit/619b1f80d648e5869389b431e17c12f… --- diff --git a/src/modules/log_custom/log_custom_mod.c b/src/modules/log_custom/log_custom_mod.c index f7ae9a228c5..abb3ababd3b 100644 --- a/src/modules/log_custom/log_custom_mod.c +++ b/src/modules/log_custom/log_custom_mod.c @@ -47,25 +47,28 @@ static int w_log_udp(struct sip_msg *msg, char *txt, char *p2); void _lc_core_log_udp(int lpriority, const char *format, ...); +/* clang-format off */ static cmd_export_t cmds[] = { - {"log_udp", (cmd_function)w_log_udp, 1, fixup_spve_null, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"log_udp", (cmd_function)w_log_udp, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = {{0, 0, 0}}; struct module_exports exports = { - "log_custom", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "log_custom", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported RPC functions */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module initialization function */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ }; +/* clang-format on */ /** * init module function */

1 0

git:master:adffa9e2: ldap: add fixup_free* to exported functions
by Federico Cabiddu 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: adffa9e2b31bf0ad7070420ac821a914fc2bcd6b URL: https://github.com/kamailio/kamailio/commit/adffa9e2b31bf0ad7070420ac821a91… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-25T08:32:48+01:00 ldap: add fixup_free* to exported functions --- Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/adffa9e2b31bf0ad7070420ac821a91… Patch: https://github.com/kamailio/kamailio/commit/adffa9e2b31bf0ad7070420ac821a91… --- diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index 27d44b9d88b..8303885f6ba 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -59,6 +59,8 @@ static int child_init(int rank); static int ldap_result_fixup(void **param, int param_no); static int ldap_filter_url_encode_fixup(void **param, int param_no); static int ldap_result_check_fixup(void **param, int param_no); +static int ldap_fixup_free(void **param, int param_no); +static int ldap_filter_url_encode_fixup_free(void **param, int param_no); /* * exported functions @@ -94,25 +96,25 @@ static dictionary *config_vals = NULL; /* clang-format off */ static cmd_export_t cmds[] = { {"ldap_search", (cmd_function)w_ldap_search, 1, - fixup_spve_null, 0, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result", (cmd_function)w_ldap_result1, 1, - ldap_result_fixup, 0, + ldap_result_fixup, ldap_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result", (cmd_function)w_ldap_result2, 2, - ldap_result_fixup, 0, + ldap_result_fixup, ldap_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result_next", (cmd_function)w_ldap_result_next, 0, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result_check", (cmd_function)w_ldap_result_check_1, 1, - ldap_result_check_fixup, 0, + ldap_result_check_fixup, ldap_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result_check", (cmd_function)w_ldap_result_check_2, 2, - ldap_result_check_fixup, 0, + ldap_result_check_fixup, ldap_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_filter_url_encode", (cmd_function)w_ldap_filter_url_encode, 2, - ldap_filter_url_encode_fixup, 0, + ldap_filter_url_encode_fixup, ldap_filter_url_encode_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"load_ldap", (cmd_function)load_ldap, 0, 0, 0, 0}, @@ -374,6 +376,14 @@ static int ldap_result_fixup(void **param, int param_no) return 0; } +static int ldap_fixup_free(void **param, int param_no) +{ + if(param_no == 1) { + pkg_free(*param); + } + return 0; +} + static int ldap_result_check_fixup(void **param, int param_no) { struct ldap_result_check_params *lp; @@ -475,6 +485,14 @@ static int ldap_filter_url_encode_fixup(void **param, int param_no) return 0; } +static int ldap_filter_url_encode_fixup_free(void **param, int param_no) +{ + if(param_no == 2) { + pkg_free(*param); + } + return 0; +} + /** * */

1 0

git:master:cdafda78: pkg/kamailio: added support for CentOS 10 [skip-ci]
by Sergey Safarov 23 Nov '24

23 Nov '24

Module: kamailio Branch: master Commit: cdafda78c9fc98d9d9fdb7f94e77c9bc60ebf4d1 URL: https://github.com/kamailio/kamailio/commit/cdafda78c9fc98d9d9fdb7f94e77c9b… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2024-11-23T22:03:17+02:00 pkg/kamailio: added support for CentOS 10 [skip-ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cdafda78c9fc98d9d9fdb7f94e77c9b… Patch: https://github.com/kamailio/kamailio/commit/cdafda78c9fc98d9d9fdb7f94e77c9b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 04eb6ba9076..9c32a293be2 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -113,21 +113,21 @@ %bcond_without wolfssl %endif -%if 0%{?rhel} == 9 +%if 0%{?rhel} == 9 || 0%{?rhel} == 10 %if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} -%define dist .el9.centos +%define dist .el%{?centos_ver}.centos %endif %if 0%{?almalinux_ver} %define dist_name centos %define dist_version %{?almalinux} -%define dist .el9.almalinux +%define dist .el%{?almalinux_ver}.almalinux %endif %if 0%{?rocky_ver} %define dist_name centos %define dist_version %{?rocky} -%define dist .el9.rocky +%define dist .el%{?rocky_ver}.rocky %endif %if 0%{?centos_ver} == 0 && 0%{?almalinux_ver} == 0 && 0%{?rocky_ver} == 0 %define dist_name rhel

1 0

git:master:b1f9fc1d: corex: added $atkv(name) variable
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: b1f9fc1d586975a12f6a6d56a76dbf2d3541124c URL: https://github.com/kamailio/kamailio/commit/b1f9fc1d586975a12f6a6d56a76dbf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T19:30:25+01:00 corex: added $atkv(name) variable - get async type-key-value attributes --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b1f9fc1d586975a12f6a6d56a76dbf2… Patch: https://github.com/kamailio/kamailio/commit/b1f9fc1d586975a12f6a6d56a76dbf2… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 0fdf35060ea..c5008bfb445 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -38,6 +38,7 @@ #include "../../core/forward.h" #include "../../core/dns_cache.h" #include "../../core/data_lump.h" +#include "../../core/async_task.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_param.h" @@ -101,12 +102,17 @@ static int corex_dns_cache_param_add(str *pval); static int corex_sip_reply_out(sr_event_param_t *evp); +static int pv_get_atkv(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_atkv_name(pv_spec_t *sp, str *in); + /* clang-format off */ static pv_export_t mod_pvs[] = { {{"cfg", (sizeof("cfg") - 1)}, PVT_OTHER, pv_get_cfg, 0, pv_parse_cfg_name, 0, 0, 0}, {{"lsock", (sizeof("lsock") - 1)}, PVT_OTHER, pv_get_lsock, 0, pv_parse_lsock_name, 0, 0, 0}, + {{"atkv", (sizeof("atkv") - 1)}, PVT_OTHER, pv_get_atkv, 0, + pv_parse_atkv_name, 0, 0, 0}, {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; @@ -1456,6 +1462,81 @@ static int corex_sip_reply_out(sr_event_param_t *evp) return 0; } +/** + * + */ +static int pv_get_atkv(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + async_tkv_param_t *atkvp = NULL; + async_wgroup_t *awg = NULL; + + atkvp = ksr_async_tkv_param_get(); + + if(atkvp == NULL) { + return pv_get_null(msg, param, res); + } + + switch(param->pvn.u.isname.name.n) { + case 0: + return pv_get_sintval(msg, param, res, (long)atkvp->dtype); + case 1: + if(atkvp->skey.s == NULL || atkvp->skey.len < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &atkvp->skey); + case 2: + if(atkvp->sval.s == NULL || atkvp->sval.len < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &atkvp->sval); + case 3: + awg = async_task_workers_get_crt(); + if(awg == NULL || awg->name.s == NULL || awg->name.len < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &awg->name); + default: + return pv_get_null(msg, param, res); + } +} + +/** + * + */ +static int pv_parse_atkv_name(pv_spec_t *sp, str *in) +{ + if(sp == NULL || in == NULL || in->len <= 0) + return -1; + + switch(in->len) { + case 3: + if(strncmp(in->s, "key", 3) == 0) { + sp->pvp.pvn.u.isname.name.n = 1; + } else if(strncmp(in->s, "val", 3) == 0) { + sp->pvp.pvn.u.isname.name.n = 2; + } + break; + case 4: + if(strncmp(in->s, "type", 4) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + break; + case 5: + if(strncmp(in->s, "gname", 5) == 0) + sp->pvp.pvn.u.isname.name.n = 3; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV time name %.*s\n", in->len, in->s); + return -1; +} + /** *

1 0

git:master:88ca83a5: core: function to get current tkv param
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 88ca83a5379dbaca3a87fdcb26dd2855b5ba871d URL: https://github.com/kamailio/kamailio/commit/88ca83a5379dbaca3a87fdcb26dd285… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T19:24:18+01:00 core: function to get current tkv param --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/88ca83a5379dbaca3a87fdcb26dd285… Patch: https://github.com/kamailio/kamailio/commit/88ca83a5379dbaca3a87fdcb26dd285… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index 17c385a51fd..e66205335fa 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -538,6 +538,14 @@ static async_wgroup_t *_async_tkv_awg = NULL; static async_tkv_param_t *_ksr_async_tkv_param = NULL; static int _ksr_async_tkv_ridx = -1; +/** + * + */ +async_tkv_param_t *ksr_async_tkv_param_get(void) +{ + return _ksr_async_tkv_param; +} + /** * */ diff --git a/src/core/async_task.h b/src/core/async_task.h index b4276c2d27c..67df94d6169 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -65,8 +65,9 @@ typedef struct async_tkv_param str sval; } async_tkv_param_t; -#define KSR_ASYNC_TKV_SIZE 512 +#define KSR_ASYNC_TKV_SIZE 1024 void async_tkv_init(void); int async_tkv_emit(int dtype, char *pkey, char *fmt, ...); +async_tkv_param_t *ksr_async_tkv_param_get(void); #endif

1 0

git:master:d2c98b63: core: main - init async type-key-value framework
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: d2c98b63d141a88f29a379f6b5f23122d4997e82 URL: https://github.com/kamailio/kamailio/commit/d2c98b63d141a88f29a379f6b5f2312… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T19:17:44+01:00 core: main - init async type-key-value framework --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/d2c98b63d141a88f29a379f6b5f2312… Patch: https://github.com/kamailio/kamailio/commit/d2c98b63d141a88f29a379f6b5f2312… --- diff --git a/src/main.c b/src/main.c index 6aacc523db8..870a334559b 100644 --- a/src/main.c +++ b/src/main.c @@ -3333,6 +3333,7 @@ int main(int argc, char **argv) #endif /* USE_TLS */ #endif /* USE_TCP */ + async_tkv_init(); sr_core_ert_run_xname("core:modinit-before"); if(init_modules() != 0) {

1 0

git:master:f4e04dac: pv: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: f4e04dac07bc11da08288a8a4a4957c5799c37e9 URL: https://github.com/kamailio/kamailio/commit/f4e04dac07bc11da08288a8a4a4957c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:48:18+01:00 pv: add fixup_free* to exported functions --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/f4e04dac07bc11da08288a8a4a4957c… Patch: https://github.com/kamailio/kamailio/commit/f4e04dac07bc11da08288a8a4a4957c… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 3feedf66cda..e014cf37449 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -535,9 +535,9 @@ int pv_register_api(pv_api_t *); /* clang-format off */ static cmd_export_t cmds[] = { {"pv_isset", (cmd_function)pv_isset, 1, - fixup_pvar_null, 0, ANY_ROUTE}, + fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, {"pv_unset", (cmd_function)pv_unset, 1, - fixup_pvar_null, 0, ANY_ROUTE}, + fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, {"pv_xavp_print", (cmd_function)pv_xavp_print, 0, 0, 0, ANY_ROUTE}, {"pv_xavu_print", (cmd_function)pv_xavu_print, 0, 0, 0, ANY_ROUTE}, {"pv_xavi_print", (cmd_function)pv_xavi_print, 0, 0, 0, ANY_ROUTE}, @@ -552,9 +552,9 @@ static cmd_export_t cmds[] = { {"not_empty", (cmd_function)pv_not_empty, 1, fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, {"xavp_copy", (cmd_function)w_xavp_copy, 3, - pv_xavp_copy_fixup, 0, ANY_ROUTE}, + pv_xavp_copy_fixup, fixup_free_fparam_all, ANY_ROUTE}, {"xavp_copy", (cmd_function)w_xavp_copy_dst, 4, - pv_xavp_copy_fixup, 0, ANY_ROUTE}, + pv_xavp_copy_fixup, fixup_free_fparam_all, ANY_ROUTE}, {"xavp_slist_explode", (cmd_function)w_xavp_slist_explode, 4, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"xavp_params_explode", (cmd_function)w_xavp_params_explode, 2,

1 0

git:master:8ff56760: pv: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 8ff567606175fe2d1c1509a9e0d61c0cf2c87b07 URL: https://github.com/kamailio/kamailio/commit/8ff567606175fe2d1c1509a9e0d61c0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:45:24+01:00 pv: reformat exported structures --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/8ff567606175fe2d1c1509a9e0d61c0… Patch: https://github.com/kamailio/kamailio/commit/8ff567606175fe2d1c1509a9e0d61c0…

1 0

git:master:389e22db: qos: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 389e22db478bb9d36e1fe0d75801b8602f746350 URL: https://github.com/kamailio/kamailio/commit/389e22db478bb9d36e1fe0d75801b86… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:39:47+01:00 qos: reformat exported structures --- Modified: src/modules/qos/qos.c --- Diff: https://github.com/kamailio/kamailio/commit/389e22db478bb9d36e1fe0d75801b86… Patch: https://github.com/kamailio/kamailio/commit/389e22db478bb9d36e1fe0d75801b86… --- diff --git a/src/modules/qos/qos.c b/src/modules/qos/qos.c index 4aa0a9bd2ee..ee44e45929a 100644 --- a/src/modules/qos/qos.c +++ b/src/modules/qos/qos.c @@ -47,29 +47,33 @@ static int qos_flag = -1; struct dlg_binds dialog_st; struct dlg_binds *dlg_binds = &dialog_st; - +/* clang-format off */ static cmd_export_t cmds[] = { - {"load_qos", (cmd_function)load_qos, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}}; + {"load_qos", (cmd_function)load_qos, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; /* * Script parameters */ static param_export_t mod_params[] = { - {"qos_flag", PARAM_INT, &qos_flag}, {0, 0, 0}}; - + {"qos_flag", PARAM_INT, &qos_flag}, + {0, 0, 0} +}; struct module_exports exports = { - "qos", /* module's name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - mod_params, /* param exports */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* reply processing function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - mod_destroy /* module destroy function */ + "qos", /* module's name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + mod_params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ int load_qos(struct qos_binds *qosb) {

1 0

git:master:5484965b: rabbitmq: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 5484965bb912c96dec57b701af0030b03ccdeb44 URL: https://github.com/kamailio/kamailio/commit/5484965bb912c96dec57b701af0030b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:37:49+01:00 rabbitmq: reformat exported structures --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/5484965bb912c96dec57b701af0030b… Patch: https://github.com/kamailio/kamailio/commit/5484965bb912c96dec57b701af0030b… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 709055dc9ab..5008625b939 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -127,34 +127,40 @@ static int rbmq_fixup_free_params(void **param, int param_no) return -1; } +/* clang-format off */ /* module commands */ static cmd_export_t cmds[] = { - {"rabbitmq_publish", (cmd_function)rabbitmq_publish, 4, fixup_spve_all, - fixup_free_spve_all, ANY_ROUTE}, - {"rabbitmq_publish_consume", (cmd_function)rabbitmq_publish_consume, 5, - rbmq_fixup_params, rbmq_fixup_free_params, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"rabbitmq_publish", (cmd_function)rabbitmq_publish, 4, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"rabbitmq_publish_consume", (cmd_function)rabbitmq_publish_consume, 5, + rbmq_fixup_params, rbmq_fixup_free_params, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* module parameters */ -static param_export_t params[] = {{"url", PARAM_STRING, &amqp_url}, - {"amqps_ca_file", PARAM_STRING, &rmq_amqps_ca_file}, - {"timeout_sec", PARAM_INT, &timeout_sec}, - {"timeout_usec", PARAM_INT, &timeout_usec}, - {"direct_reply_to", PARAM_INT, &direct_reply_to}, {0, 0, 0}}; +static param_export_t params[] = { + {"url", PARAM_STRING, &amqp_url}, + {"amqps_ca_file", PARAM_STRING, &rmq_amqps_ca_file}, + {"timeout_sec", PARAM_INT, &timeout_sec}, + {"timeout_usec", PARAM_INT, &timeout_usec}, + {"direct_reply_to", PARAM_INT, &direct_reply_to}, + {0, 0, 0} +}; /* module exports */ struct module_exports exports = { - "rabbitmq", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - mod_child_init, /* per-child init function */ - 0 /* module destroy function */ + "rabbitmq", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + mod_child_init, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /* module init */ static int mod_init(void)

1 0

git:master:5680e3ac: ratelimit: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 5680e3acb5964952ed0b084f7e946bf28f817d61 URL: https://github.com/kamailio/kamailio/commit/5680e3acb5964952ed0b084f7e946bf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:35:38+01:00 ratelimit: add fixup_free* to exported functions --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/5680e3acb5964952ed0b084f7e946bf… Patch: https://github.com/kamailio/kamailio/commit/5680e3acb5964952ed0b084f7e946bf… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index 90065b56698..f67d8a6c3fc 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -218,7 +218,7 @@ static cmd_export_t cmds[] = { {"rl_check", (cmd_function)w_rl_check_forced, 1, fixup_igp_null, fixup_free_pvar_null, REQUEST_ROUTE | LOCAL_ROUTE}, {"rl_check_pipe", (cmd_function)w_rl_check_forced_pipe, 1, - fixup_igp_null, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:0595feb1: ratelimit: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 0595feb17da5632a24f1e44a992335ff66d0b30e URL: https://github.com/kamailio/kamailio/commit/0595feb17da5632a24f1e44a992335f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:34:22+01:00 ratelimit: reformat exported structures --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/0595feb17da5632a24f1e44a992335f… Patch: https://github.com/kamailio/kamailio/commit/0595feb17da5632a24f1e44a992335f… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index 0d31d36b6eb..90065b56698 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -212,39 +212,42 @@ static int ki_rl_check_pipe(struct sip_msg *msg, int pipe); static int set_load_source(modparam_t, void *); */ static void destroy(void); - +/* clang-format off */ static cmd_export_t cmds[] = { - {"rl_check", (cmd_function)w_rl_check_default, 0, 0, 0, ANY_ROUTE}, - {"rl_check", (cmd_function)w_rl_check_forced, 1, fixup_igp_null, - fixup_free_pvar_null, REQUEST_ROUTE | LOCAL_ROUTE}, - {"rl_check_pipe", (cmd_function)w_rl_check_forced_pipe, 1, - fixup_igp_null, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"rl_check", (cmd_function)w_rl_check_default, 0, 0, 0, ANY_ROUTE}, + {"rl_check", (cmd_function)w_rl_check_forced, 1, + fixup_igp_null, fixup_free_pvar_null, REQUEST_ROUTE | LOCAL_ROUTE}, + {"rl_check_pipe", (cmd_function)w_rl_check_forced_pipe, 1, + fixup_igp_null, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; + static param_export_t params[] = { - {"timer_interval", PARAM_INT, &timer_interval}, - {"queue", PARAM_STRING | PARAM_USE_FUNC, (void *)add_queue_params}, - {"pipe", PARAM_STRING | PARAM_USE_FUNC, (void *)add_pipe_params}, - /* RESERVED for future use + {"timer_interval", PARAM_INT, &timer_interval}, + {"queue", PARAM_STRING | PARAM_USE_FUNC, (void *)add_queue_params}, + {"pipe", PARAM_STRING | PARAM_USE_FUNC, (void *)add_pipe_params}, + /* RESERVED for future use {"load_source", PARAM_STRING|PARAM_USE_FUNC, (void *)set_load_source}, */ - {0, 0, 0}}; + {0, 0, 0} +}; static rpc_export_t rpc_methods[]; /** module exports */ struct module_exports exports = { - "ratelimit", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - destroy /* module exit function */ + "ratelimit", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + destroy /* module destroy function */ }; - +/* clang-format on */ /** * converts a mapped str to an int

1 0

git:master:5bebde17: regex: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 5bebde177c357e2aaf5f24537d0d44da51ac914a URL: https://github.com/kamailio/kamailio/commit/5bebde177c357e2aaf5f24537d0d44d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:29:00+01:00 regex: add fixup_free* to exported functions --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5bebde177c357e2aaf5f24537d0d44d… Patch: https://github.com/kamailio/kamailio/commit/5bebde177c357e2aaf5f24537d0d44d… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 11c055c1d10..4c378bb28f0 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -116,13 +116,13 @@ static int w_pcre_match_group(struct sip_msg *_msg, char *_s1, char *_s2); /* clang-format off */ static cmd_export_t cmds[] = { {"pcre_match", (cmd_function)w_pcre_match, 2, - fixup_spve_spve, 0, + fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, {"pcre_match_group", (cmd_function)w_pcre_match_group, 2, - fixup_spve_spve, 0, + fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, {"pcre_match_group", (cmd_function)w_pcre_match_group, 1, - fixup_spve_null, 0, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:71197e76: regex: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 71197e76e02818d8e7e016cefbda3886bec9afb1 URL: https://github.com/kamailio/kamailio/commit/71197e76e02818d8e7e016cefbda388… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:28:11+01:00 regex: reformat exported structures --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/71197e76e02818d8e7e016cefbda388… Patch: https://github.com/kamailio/kamailio/commit/71197e76e02818d8e7e016cefbda388… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 904342ff7fc..11c055c1d10 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -115,21 +115,18 @@ static int w_pcre_match_group(struct sip_msg *_msg, char *_s1, char *_s2); */ /* clang-format off */ static cmd_export_t cmds[] = { - {"pcre_match", (cmd_function)w_pcre_match, 2, fixup_spve_spve, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, + {"pcre_match", (cmd_function)w_pcre_match, 2, + fixup_spve_spve, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, {"pcre_match_group", (cmd_function)w_pcre_match_group, 2, - fixup_spve_spve, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, + fixup_spve_spve, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, {"pcre_match_group", (cmd_function)w_pcre_match_group, 1, - fixup_spve_null, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, + fixup_spve_null, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, {0, 0, 0, 0, 0, 0} }; - /* * Exported parameters */ @@ -144,21 +141,20 @@ static param_export_t params[] = { {0, 0, 0} }; - /* * Module interface */ struct module_exports exports = { - "regex", /*!< module name */ - DEFAULT_DLFLAGS, /*!< dlopen flags */ - cmds, /*!< exported functions */ - params, /*!< exported parameters */ - 0, /*!< exported RPC functions */ - 0, /*!< exported pseudo-variables */ - 0, /*!< response handling function */ - mod_init, /*!< module initialization function */ - 0, /*!< per-child init function */ - destroy /*!< destroy function */ + "regex", /*!< module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + destroy /* module destroy function */ }; /* clang-format on */

1 0

git:master:a0f09749: registrar: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: a0f09749f7607b764523004663e0dd8f23675c22 URL: https://github.com/kamailio/kamailio/commit/a0f09749f7607b764523004663e0dd8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:25:45+01:00 registrar: reformat exported structures --- Modified: src/modules/registrar/registrar.c --- Diff: https://github.com/kamailio/kamailio/commit/a0f09749f7607b764523004663e0dd8… Patch: https://github.com/kamailio/kamailio/commit/a0f09749f7607b764523004663e0dd8…

1 0

git:master:7f3207cc: rls: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 7f3207ccd2757fbdbed53bab5841808c4fc5c1cf URL: https://github.com/kamailio/kamailio/commit/7f3207ccd2757fbdbed53bab5841808… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:09:35+01:00 rls: add fixup_free* to exported functions --- Modified: src/modules/rls/rls.c Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/7f3207ccd2757fbdbed53bab5841808… Patch: https://github.com/kamailio/kamailio/commit/7f3207ccd2757fbdbed53bab5841808… --- diff --git a/src/modules/rls/rls.c b/src/modules/rls/rls.c index c11d3da3476..4a4457dfc7e 100644 --- a/src/modules/rls/rls.c +++ b/src/modules/rls/rls.c @@ -209,15 +209,16 @@ void rlsubs_table_update(unsigned int ticks, void *param); int add_rls_event(modparam_t type, void *val); int rls_update_subs(struct sip_msg *msg, char *puri, char *pevent); int fixup_update_subs(void **param, int param_no); +int fixup_free_update_subs(void **param, int param_no); /* clang-format off */ static cmd_export_t cmds[] = { {"rls_handle_subscribe", (cmd_function)w_rls_handle_subscribe0, 0, 0, 0, REQUEST_ROUTE}, {"rls_handle_subscribe", (cmd_function)w_rls_handle_subscribe1, 1, - fixup_spve_null, 0, REQUEST_ROUTE}, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, {"rls_handle_notify", (cmd_function)w_rls_handle_notify, 0, 0, 0, REQUEST_ROUTE}, {"rls_update_subs", (cmd_function)w_rls_update_subs, 2, - fixup_update_subs, 0, ANY_ROUTE}, + fixup_update_subs, fixup_free_update_subs, ANY_ROUTE}, {"bind_rls", (cmd_function)bind_rls, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index b1d2b9a6582..f96238dbc1c 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -1051,6 +1051,16 @@ int fixup_update_subs(void **param, int param_no) return 0; } +int fixup_free_update_subs(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_spve_null(param, 1); + } else if(param_no == 2) { + return fixup_free_spve_null(param, 1); + } + return 0; +} + void update_a_sub(subs_t *subs_copy) { xmlDocPtr doc = NULL;

1 0

git:master:e56f003a: rls: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: e56f003abaa1f8589193ac1826992929aea6f0b2 URL: https://github.com/kamailio/kamailio/commit/e56f003abaa1f8589193ac182699292… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:09:29+01:00 rls: reformat exported structures --- Modified: src/modules/rls/rls.c --- Diff: https://github.com/kamailio/kamailio/commit/e56f003abaa1f8589193ac182699292… Patch: https://github.com/kamailio/kamailio/commit/e56f003abaa1f8589193ac182699292…

1 0

git:master:5b852254: core: framework to execute async event route with type-key-value
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 5b852254e75365c2886baf1e4be8829ac10b9917 URL: https://github.com/kamailio/kamailio/commit/5b852254e75365c2886baf1e4be8829… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T13:28:20+01:00 core: framework to execute async event route with type-key-value - execute event_route[core:tkv] in async fashion, with data passed in the form of [type, key, value] - the events have to be emitted from parts of the code and the execution of the event route should not block the emitting process --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/5b852254e75365c2886baf1e4be8829… Patch: https://github.com/kamailio/kamailio/commit/5b852254e75365c2886baf1e4be8829… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index bce7ed51faa..17c385a51fd 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -34,11 +34,15 @@ #include <arpa/inet.h> #include <fcntl.h> #include <errno.h> +#include <stdarg.h> #include "dprint.h" #include "sr_module.h" #include "ut.h" #include "pt.h" +#include "kemi.h" +#include "fmsg.h" +#include "receive.h" #include "cfg/cfg_struct.h" #include "parser/parse_param.h" @@ -525,3 +529,126 @@ int async_task_run(async_wgroup_t *awg, int idx) return 0; } + + +/** + * + */ +static async_wgroup_t *_async_tkv_awg = NULL; +static async_tkv_param_t *_ksr_async_tkv_param = NULL; +static int _ksr_async_tkv_ridx = -1; + +/** + * + */ +void async_tkv_init(void) +{ + str gname = str_init("tkv"); + str evname = str_init("core:tkv"); + + _async_tkv_awg = async_task_group_find(&gname); + + _ksr_async_tkv_ridx = route_lookup(&event_rt, evname.s); + if(_ksr_async_tkv_ridx <= 0 + || event_rt.rlist[_ksr_async_tkv_ridx] == NULL) { + LM_DBG("event_route[%s] not defined - skipping\n", evname.s); + _ksr_async_tkv_ridx = -2; + return; + } +} + +/** + * + */ +void async_exec_tkv(void *param) +{ + async_tkv_param_t *adp; + sr_kemi_eng_t *keng = NULL; + sip_msg_t *fmsg = NULL; + str evname = str_init("core:tkv"); + str cbname = str_init("ksr_core_tkv"); + int rtype = 0; + + adp = (async_tkv_param_t *)param; + fmsg = faked_msg_next(); + rtype = get_route_type(); + _ksr_async_tkv_param = adp; + set_route_type(REQUEST_ROUTE); + keng = sr_kemi_eng_get(); + if(keng != NULL) { + if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, &cbname, &evname) < 0) { + LM_ERR("error running event route kemi callback [%.*s]\n", + cbname.len, cbname.s); + } + } else { + if(_ksr_async_tkv_ridx >= 0) { + run_top_route(event_rt.rlist[_ksr_async_tkv_ridx], fmsg, 0); + } + } + ksr_msg_env_reset(); + set_route_type(rtype); + _ksr_async_tkv_param = NULL; + /* param is freed along with the async task strucutre in core */ +} + +/** + * + */ +int async_tkv_emit(int dtype, char *pkey, char *fmt, ...) +{ + async_task_t *at = NULL; + int dsize = 0; + async_tkv_param_t *adp; + va_list va; + char buf[KSR_ASYNC_TKV_SIZE]; + int n = 0; + int klen = 0; + sr_kemi_eng_t *keng = NULL; + + if(_async_tkv_awg == NULL) { + LM_DBG("the async group has not been set\n"); + return -1; + } + keng = sr_kemi_eng_get(); + if(keng == NULL && _ksr_async_tkv_ridx == -2) { + LM_DBG("the event_route[core:tkv] has not been defined\n"); + return -1; + } + + va_start(va, fmt); + n = vsnprintf(buf, KSR_ASYNC_TKV_SIZE, fmt, va); + va_end(va); + + if(n < 0 || n > KSR_ASYNC_TKV_SIZE) { + LM_ERR("failed to print the arguments for key: %s\n", pkey); + return -1; + } + + klen = strlen(pkey); + dsize = sizeof(async_task_t) + sizeof(async_tkv_param_t) + klen + 1 + n + 1; + at = (async_task_t *)shm_malloc(dsize); + if(at == NULL) { + SHM_MEM_ERROR; + return -1; + } + memset(at, 0, dsize); + at->exec = async_exec_tkv; + at->param = (char *)at + sizeof(async_task_t); + adp = (async_tkv_param_t *)at->param; + adp->dtype = dtype; + adp->skey.s = (char *)adp + sizeof(async_tkv_param_t); + adp->skey.len = klen; + memcpy(adp->skey.s, pkey, klen); + adp->skey.len = klen; + adp->sval.s = (char *)adp->skey.s + klen + 1; + memcpy(adp->sval.s, buf, n); + adp->sval.len = n; + + if(async_task_group_send(_async_tkv_awg, at) < 0) { + LM_ERR("failed to send task with key: %s\n", pkey); + shm_free(at); + return -1; + } + + return 0; +} diff --git a/src/core/async_task.h b/src/core/async_task.h index 58386bba8bd..b4276c2d27c 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -58,4 +58,15 @@ async_wgroup_t *async_task_group_find(str *gname); int async_task_group_push(str *gname, async_task_t *task); int async_task_group_send(async_wgroup_t *awg, async_task_t *task); +typedef struct async_tkv_param +{ + int dtype; + str skey; + str sval; +} async_tkv_param_t; + +#define KSR_ASYNC_TKV_SIZE 512 +void async_tkv_init(void); +int async_tkv_emit(int dtype, char *pkey, char *fmt, ...); + #endif

1 0

git:master:ecb99f2f: jwt: add fixup_free* to exported functions
by Federico Cabiddu 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: ecb99f2ff1babe3871af5fba7d7f94e8b0df68cd URL: https://github.com/kamailio/kamailio/commit/ecb99f2ff1babe3871af5fba7d7f94e… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T12:37:09+01:00 jwt: add fixup_free* to exported functions --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ecb99f2ff1babe3871af5fba7d7f94e… Patch: https://github.com/kamailio/kamailio/commit/ecb99f2ff1babe3871af5fba7d7f94e… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 90d8fa5bd03..64c78e63555 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -65,39 +65,45 @@ typedef struct jwt_fcache static jwt_fcache_t *_jwt_fcache_list = NULL; -static cmd_export_t cmds[] = {{"jwt_generate", (cmd_function)w_jwt_generate_4, - 4, fixup_spve_all, 0, ANY_ROUTE}, - {"jwt_generate", (cmd_function)w_jwt_generate_3, 3, fixup_spve_all, 0, - ANY_ROUTE}, - {"jwt_verify", (cmd_function)w_jwt_verify, 4, fixup_spve_all, 0, - ANY_ROUTE}, - {"jwt_verify_key", (cmd_function)w_jwt_verify_key, 4, fixup_spve_all, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"key_mode", PARAM_INT, &_jwt_key_mode}, +/* clang-format off */ +static cmd_export_t cmds[] = { + {"jwt_generate", (cmd_function)w_jwt_generate_4, 4, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, + {"jwt_generate", (cmd_function)w_jwt_generate_3, 3, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, + {"jwt_verify", (cmd_function)w_jwt_verify, 4, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, + {"jwt_verify_key", (cmd_function)w_jwt_verify_key, 4, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; - {0, 0, 0}}; +static param_export_t params[] = { + {"key_mode", PARAM_INT, &_jwt_key_mode}, + {0, 0, 0} +}; static int jwt_pv_get(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int jwt_pv_parse_name(pv_spec_t *sp, str *in); static pv_export_t mod_pvs[] = { - {{"jwt", sizeof("jwt") - 1}, PVT_OTHER, jwt_pv_get, 0, - jwt_pv_parse_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"jwt", sizeof("jwt") - 1}, PVT_OTHER, jwt_pv_get, 0, + jwt_pv_parse_name, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "jwt", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - mod_pvs, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - mod_destroy /* module destroy function */ + "jwt", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + mod_pvs, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /**

1 0

git:master:20a2d57e: jsonrpcs: add fixup_free* to exported functions
by Federico Cabiddu 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 20a2d57e295c6329c0f8358f36915cd6a4cd5783 URL: https://github.com/kamailio/kamailio/commit/20a2d57e295c6329c0f8358f36915cd… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T12:33:45+01:00 jsonrpcs: add fixup_free* to exported functions --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/20a2d57e295c6329c0f8358f36915cd… Patch: https://github.com/kamailio/kamailio/commit/20a2d57e295c6329c0f8358f36915cd… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index ec8c8f4ad17..3400869249a 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -141,34 +141,38 @@ static rpc_t func_param; char jsonrpc_error_buf[JSONRPC_ERROR_REASON_BUF_LEN]; +/* clang-format off */ static cmd_export_t cmds[] = { - {"jsonrpc_dispatch", (cmd_function)jsonrpc_dispatch, 0, 0, 0, - REQUEST_ROUTE}, - {"jsonrpc_exec", (cmd_function)jsonrpc_exec, 1, fixup_spve_null, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"jsonrpc_dispatch", (cmd_function)jsonrpc_dispatch, 0, 0, 0, + REQUEST_ROUTE}, + {"jsonrpc_exec", (cmd_function)jsonrpc_exec, 1, fixup_spve_null, fixup_free_spve_null, + ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"pretty_format", PARAM_INT, &jsonrpc_pretty_format}, - {"transport", PARAM_INT, &jsonrpc_transport}, - {"fifo_name", PARAM_STRING, &jsonrpc_fifo}, - {"fifo_mode", PARAM_INT, &jsonrpc_fifo_mode}, - {"fifo_group", PARAM_STRING, &jsonrpc_fifo_gid_s}, - {"fifo_group", PARAM_INT, &jsonrpc_fifo_gid}, - {"fifo_user", PARAM_STRING, &jsonrpc_fifo_uid_s}, - {"fifo_user", PARAM_INT, &jsonrpc_fifo_uid}, - {"fifo_reply_dir", PARAM_STRING, &jsonrpc_fifo_reply_dir}, - {"dgram_socket", PARAM_STRING, &jsonrpc_dgram_socket}, - {"dgram_workers", PARAM_INT, &jsonrpc_dgram_workers}, - {"dgram_timeout", PARAM_INT, &jsonrpc_dgram_timeout}, - {"dgram_mode", PARAM_INT, &jsonrpc_dgram_unix_socket_mode}, - {"dgram_group", PARAM_STRING, &jsonrpc_dgram_unix_socket_gid_s}, - {"dgram_group", PARAM_INT, &jsonrpc_dgram_unix_socket_gid}, - {"dgram_user", PARAM_STRING, &jsonrpc_dgram_unix_socket_uid_s}, - {"dgram_user", PARAM_INT, &jsonrpc_dgram_unix_socket_uid}, - {"tcp_socket", PARAM_STRING, &jsonrpc_tcp_socket}, - - {0, 0, 0}}; + {"pretty_format", PARAM_INT, &jsonrpc_pretty_format}, + {"transport", PARAM_INT, &jsonrpc_transport}, + {"fifo_name", PARAM_STRING, &jsonrpc_fifo}, + {"fifo_mode", PARAM_INT, &jsonrpc_fifo_mode}, + {"fifo_group", PARAM_STRING, &jsonrpc_fifo_gid_s}, + {"fifo_group", PARAM_INT, &jsonrpc_fifo_gid}, + {"fifo_user", PARAM_STRING, &jsonrpc_fifo_uid_s}, + {"fifo_user", PARAM_INT, &jsonrpc_fifo_uid}, + {"fifo_reply_dir", PARAM_STRING, &jsonrpc_fifo_reply_dir}, + {"dgram_socket", PARAM_STRING, &jsonrpc_dgram_socket}, + {"dgram_workers", PARAM_INT, &jsonrpc_dgram_workers}, + {"dgram_timeout", PARAM_INT, &jsonrpc_dgram_timeout}, + {"dgram_mode", PARAM_INT, &jsonrpc_dgram_unix_socket_mode}, + {"dgram_group", PARAM_STRING, &jsonrpc_dgram_unix_socket_gid_s}, + {"dgram_group", PARAM_INT, &jsonrpc_dgram_unix_socket_gid}, + {"dgram_user", PARAM_STRING, &jsonrpc_dgram_unix_socket_uid_s}, + {"dgram_user", PARAM_INT, &jsonrpc_dgram_unix_socket_uid}, + {"tcp_socket", PARAM_STRING, &jsonrpc_tcp_socket}, + + {0, 0, 0} +}; +/* clang-format on */ static int jsonrpc_pv_get_jrpl( sip_msg_t *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:436e7921: jsonrpcc: reformat exported structures
by Federico Cabiddu 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 436e79216a448b0a270a53f867d89b84269557d9 URL: https://github.com/kamailio/kamailio/commit/436e79216a448b0a270a53f867d89b8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T12:31:36+01:00 jsonrpcc: reformat exported structures --- Modified: src/modules/jsonrpcc/jsonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/436e79216a448b0a270a53f867d89b8… Patch: https://github.com/kamailio/kamailio/commit/436e79216a448b0a270a53f867d89b8… --- diff --git a/src/modules/jsonrpcc/jsonrpcc_mod.c b/src/modules/jsonrpcc/jsonrpcc_mod.c index f374cf4f8c8..308c0f6432e 100644 --- a/src/modules/jsonrpcc/jsonrpcc_mod.c +++ b/src/modules/jsonrpcc/jsonrpcc_mod.c @@ -55,15 +55,16 @@ extern int _jsonrpcc_max_conn_retry; /* max retries to connect */ struct tm_binds tmb; +/* clang-format off */ /* * Exported Functions */ static cmd_export_t cmds[] = { - {"jsonrpc_request", (cmd_function)jsonrpc_request, 5, fixup_request, - fixup_request_free, ANY_ROUTE}, - {"jsonrpc_notification", (cmd_function)jsonrpc_notification, 2, - fixup_notification, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"jsonrpc_request", (cmd_function)jsonrpc_request, 5, fixup_request, + fixup_request_free, ANY_ROUTE}, + {"jsonrpc_notification", (cmd_function)jsonrpc_notification, 2, fixup_notification, + fixup_free_spve_null, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; /* @@ -77,17 +78,18 @@ static param_export_t mod_params[] = {{"servers", PARAM_STRING, &servers_param}, * Exports */ struct module_exports exports = { - "jsonrpcc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - mod_params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - 0 /* module destroy function */ + "jsonrpcc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + mod_params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format off */ static int mod_init(void)

1 0

git:master:a9acbdd9: json: reformat exported structures
by Federico Cabiddu 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: a9acbdd92032dc8adf2f2aa5a584a8a188bc9e7a URL: https://github.com/kamailio/kamailio/commit/a9acbdd92032dc8adf2f2aa5a584a8a… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T12:26:40+01:00 json: reformat exported structures --- Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a9acbdd92032dc8adf2f2aa5a584a8a… Patch: https://github.com/kamailio/kamailio/commit/a9acbdd92032dc8adf2f2aa5a584a8a… --- diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index 89b5d580fe1..d267e5029c7 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -38,33 +38,35 @@ static int fixup_get_field_free(void **param, int param_no); str tr_json_escape_str = str_init("%"); char tr_json_escape_char = '%'; +/* clang-format off */ /* Exported functions */ static tr_export_t mod_trans[] = { - {{"json", sizeof("json") - 1}, json_tr_parse}, {{0, 0}, 0}}; + {{"json", sizeof("json") - 1}, json_tr_parse}, {{0, 0}, 0}}; static cmd_export_t cmds[] = { - {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, - fixup_get_field_free, ANY_ROUTE}, - {"json_get_string", (cmd_function)json_get_string, 3, fixup_get_field, - fixup_get_field_free, ANY_ROUTE}, - {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, + {"json_get_string", (cmd_function)json_get_string, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, + {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = { {"json_escape_char", PARAM_STR, &tr_json_escape_str}, {0, 0, 0}}; struct module_exports exports = { - "json", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - 0, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "json", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + 0, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ int _json_extract_field(struct json_object *json_obj, char *json_name, str *val) {

1 0

git:master:8328024c: janssonrpcc: reformat exported structures
by Federico Cabiddu 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 8328024cd41b2c8a3cffa69db28ab21eed47b2c5 URL: https://github.com/kamailio/kamailio/commit/8328024cd41b2c8a3cffa69db28ab21… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T11:57:40+01:00 janssonrpcc: reformat exported structures --- Modified: src/modules/janssonrpcc/janssonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8328024cd41b2c8a3cffa69db28ab21… Patch: https://github.com/kamailio/kamailio/commit/8328024cd41b2c8a3cffa69db28ab21… --- diff --git a/src/modules/janssonrpcc/janssonrpcc_mod.c b/src/modules/janssonrpcc/janssonrpcc_mod.c index 703f055a9cf..d36b0193878 100644 --- a/src/modules/janssonrpcc/janssonrpcc_mod.c +++ b/src/modules/janssonrpcc/janssonrpcc_mod.c @@ -71,56 +71,57 @@ jansson_to_val_f jsontoval; pv_spec_t jsonrpc_result_pv; #endif + +/* clang-format off */ /* * Exported Functions */ -int jsonrpc_request_no_options( - struct sip_msg *msg, char *conn, char *method, char *params) -{ +int jsonrpc_request_no_options(struct sip_msg *msg, char *conn, char *method, char *params) { return jsonrpc_request(msg, conn, method, params, NULL); } static cmd_export_t cmds[] = { - {"janssonrpc_request", (cmd_function)jsonrpc_request, 4, fixup_req, - fixup_req_free, ANY_ROUTE}, - {"jsansonrpc_request", (cmd_function)jsonrpc_request_no_options, 3, - fixup_req, fixup_req_free, ANY_ROUTE}, - {"janssonrpc_notification", (cmd_function)jsonrpc_notification, 3, - fixup_notify, fixup_notify_free, ANY_ROUTE}, - {"mod_janssonrpc_request", (cmd_function)mod_jsonrpc_request, 0, 0, 0, - 0}, - {0, 0, 0, 0, 0, 0}}; + {"janssonrpc_request", (cmd_function)jsonrpc_request, 4, fixup_req, + fixup_req_free, ANY_ROUTE}, + {"jsansonrpc_request", (cmd_function)jsonrpc_request_no_options, 3, + fixup_req, fixup_req_free, ANY_ROUTE}, + {"janssonrpc_notification", (cmd_function)jsonrpc_notification, 3, + fixup_notify, fixup_notify_free, ANY_ROUTE}, + {"mod_janssonrpc_request", (cmd_function)mod_jsonrpc_request, 0, 0, 0, + 0}, + {0, 0, 0, 0, 0, 0}}; /* * Script Parameters */ static param_export_t mod_params[] = { - {"server", PARAM_STRING | PARAM_USE_FUNC, (void *)parse_server_param}, - {"retry_codes", PARAM_STRING | PARAM_USE_FUNC, - (void *)parse_retry_codes_param}, - {"min_srv_ttl", PARAM_INT | PARAM_USE_FUNC, - (void *)parse_min_ttl_param}, - {"result_pv", PARAM_STRING, &result_pv_str.s}, - {"keep_alive", PARAM_INT | PARAM_USE_FUNC, - (void *)parse_keep_alive_param}, - {0, 0, 0}}; + {"server", PARAM_STRING | PARAM_USE_FUNC, (void *)parse_server_param}, + {"retry_codes", PARAM_STRING | PARAM_USE_FUNC, + (void *)parse_retry_codes_param}, + {"min_srv_ttl", PARAM_INT | PARAM_USE_FUNC, + (void *)parse_min_ttl_param}, + {"result_pv", PARAM_STRING, &result_pv_str.s}, + {"keep_alive", PARAM_INT | PARAM_USE_FUNC, + (void *)parse_keep_alive_param}, + {0, 0, 0}}; /* * Exports */ struct module_exports exports = { - "janssonrpcc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - mod_params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - mod_destroy /* module destroy function */ + "janssonrpcc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + mod_params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ static int mod_init(void) {

1 0

git:master:e742232a: influxdb: add fixup_free* to exported functions
by Federico Cabiddu 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: e742232ab6646ced170ccda5209a4d3ca46103bc URL: https://github.com/kamailio/kamailio/commit/e742232ab6646ced170ccda5209a4d3… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T11:47:05+01:00 influxdb: add fixup_free* to exported functions --- Modified: src/modules/influxdbc/influxdbc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e742232ab6646ced170ccda5209a4d3… Patch: https://github.com/kamailio/kamailio/commit/e742232ab6646ced170ccda5209a4d3… --- diff --git a/src/modules/influxdbc/influxdbc_mod.c b/src/modules/influxdbc/influxdbc_mod.c index 5261b5ea5c4..0b6f2c53874 100644 --- a/src/modules/influxdbc/influxdbc_mod.c +++ b/src/modules/influxdbc/influxdbc_mod.c @@ -63,21 +63,21 @@ static void mod_destroy(void); /* clang-format off */ static cmd_export_t cmds[] = { {"influxdbc_measure", (cmd_function)w_influxdbc_measure, - 1, fixup_spve_null, 0, ANY_ROUTE}, + 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"influxdbc_measureend", (cmd_function)w_influxdbc_measureend, 0, 0, 0, ANY_ROUTE}, {"influxdbc_sub", (cmd_function)w_influxdbc_sub, - 1, fixup_spve_null, 0, ANY_ROUTE}, + 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"influxdbc_subend", (cmd_function)w_influxdbc_subend, 0, 0, 0, ANY_ROUTE}, {"influxdbc_push", (cmd_function)w_influxdbc_push, 0, 0, 0, ANY_ROUTE}, {"influxdbc_long", (cmd_function)w_influxdbc_long, - 2, fixup_spve_igp, 0, ANY_ROUTE}, + 2, fixup_spve_igp, fixup_free_spve_igp, ANY_ROUTE}, {"influxdbc_string", (cmd_function)w_influxdbc_string, - 2, fixup_spve_spve, 0, ANY_ROUTE}, + 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"influxdbc_double", (cmd_function)w_influxdbc_double, - 2, fixup_spve_spve, 0, ANY_ROUTE}, + 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"influxdbc_division", (cmd_function)w_influxdbc_division, 3, fixup_sii, fixup_free_sii, ANY_ROUTE},

1 0

[kamailio/kamailio] rtpengine: use to-tag for NG message when rtpp-flags (PR #4036)
by Donat Zenichev 22 Nov '24

22 Nov '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 - [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 (v5.8.2, v5.8.3, v5.8.4) - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Always use to-tag for NG message with rtpp-flags, if presented. This change is caused by the processing logic being moved to rtpengine with rtpp-flags. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4036 -- Commit Summary -- * rtpengine: use to-tag for NG message when rtpp-flags -- File Changes -- M src/modules/rtpengine/rtpengine.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4036.patch https://github.com/kamailio/kamailio/pull/4036.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4036 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4036(a)github.com>

2 1

git:master:d92d12c0: rtpengine: use to-tag for NG message when rtpp-flags
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: d92d12c055d23c167d5caa38511e5ad3b0a06148 URL: https://github.com/kamailio/kamailio/commit/d92d12c055d23c167d5caa38511e5ad… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T11:19:49+01:00 rtpengine: use to-tag for NG message when rtpp-flags Always use to-tag for NG message with rtpp-flags, if presented. This change is caused by the processing logic being moved to rtpengine with rtpp-flags. --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/d92d12c055d23c167d5caa38511e5ad… Patch: https://github.com/kamailio/kamailio/commit/d92d12c055d23c167d5caa38511e5ad… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7626af31f88..1d710b30324 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3187,7 +3187,7 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, */ /* affects to-tag parsing */ - ng_flags.to = (op == OP_DELETE) ? 0 : 1; + ng_flags.to = (!parse_by_module || op != OP_DELETE) ? 1 : 0; /* module specific parsing */ if(parse_by_module && flags && parse_flags(&ng_flags, msg, &op, flags->s))

1 0

git:master:8a46cb6b: async: removed unused param from async data processing
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 8a46cb6babed5384d09b3dfc07fe15940128d1a3 URL: https://github.com/kamailio/kamailio/commit/8a46cb6babed5384d09b3dfc07fe159… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T11:16:18+01:00 async: removed unused param from async data processing --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c Modified: src/modules/async/async_sleep.h --- Diff: https://github.com/kamailio/kamailio/commit/8a46cb6babed5384d09b3dfc07fe159… Patch: https://github.com/kamailio/kamailio/commit/8a46cb6babed5384d09b3dfc07fe159… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 9d6b5da3cca..bd31880064f 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -577,7 +577,7 @@ int ki_async_task_group_data(sip_msg_t *msg, str *rn, str *gn, str *sdata) } } - if(async_send_data(msg, act, rn, gn, sdata) < 0) + if(async_send_data(act, rn, gn, sdata) < 0) return -1; /* ok */ return 1; diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 605118be3da..5fb8861a861 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -603,8 +603,7 @@ void async_exec_data(void *param) /** * */ -int async_send_data( - sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, str *sdata) +int async_send_data(cfg_action_t *act, str *cbname, str *gname, str *sdata) { async_task_t *at; int dsize; diff --git a/src/modules/async/async_sleep.h b/src/modules/async/async_sleep.h index 0dd268889a5..0b5466f8331 100644 --- a/src/modules/async/async_sleep.h +++ b/src/modules/async/async_sleep.h @@ -51,8 +51,7 @@ int async_ms_sleep( void async_mstimer_exec(unsigned int ticks, void *param); int async_send_task(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname); -int async_send_data( - sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, str *sdata); +int async_send_data(cfg_action_t *act, str *cbname, str *gname, str *sdata); int pv_get_async(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_parse_async_name(pv_spec_t *sp, str *in);

1 0

git:master:cfb20d3c: core: added event_route[core:modinit-before]
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: cfb20d3ca3bc87199664b34754b15526d49bbff7 URL: https://github.com/kamailio/kamailio/commit/cfb20d3ca3bc87199664b34754b1552… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T11:16:18+01:00 core: added event_route[core:modinit-before] - executed by core once before the module-init callbacks are run --- Modified: src/core/events.c Modified: src/core/events.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/cfb20d3ca3bc87199664b34754b1552… Patch: https://github.com/kamailio/kamailio/commit/cfb20d3ca3bc87199664b34754b1552… --- diff --git a/src/core/events.c b/src/core/events.c index 6f108914ba1..4274bce58e0 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -26,6 +26,7 @@ #include "dprint.h" #include "mem/mem.h" #include "route.h" +#include "fmsg.h" #include "events.h" static sr_event_cb_t _sr_events_list; @@ -77,6 +78,36 @@ void sr_core_ert_run(sip_msg_t *msg, int e) } } +/** + * + */ +int sr_core_ert_run_xname(char *evname) +{ + struct run_act_ctx ctx; + int rtb; + int ridx; + sip_msg_t *fmsg; + + fmsg = faked_msg_get_next_clear(); + if(fmsg == NULL) { + LM_ERR("cannot create a fake message\n"); + return -1; + } + ridx = route_lookup(&event_rt, evname); + if(ridx <= 0 || event_rt.rlist[ridx] == NULL) { + LM_DBG("event_route[%s] not defined - skipping\n", evname); + return 0; + } + + rtb = get_route_type(); + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[ridx], fmsg, &ctx); + set_route_type(rtb); + + return 0; +} + /** * */ diff --git a/src/core/events.h b/src/core/events.h index 083acdcec81..cf1ec91d554 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -89,6 +89,7 @@ int sr_event_enabled(int type); void sr_core_ert_init(void); void sr_core_ert_run(sip_msg_t *msg, int e); +int sr_core_ert_run_xname(char *evname); typedef void (*sr_corecb_void_f)(void); typedef struct sr_corecb diff --git a/src/main.c b/src/main.c index 1b9e599fe5c..6aacc523db8 100644 --- a/src/main.c +++ b/src/main.c @@ -3333,6 +3333,8 @@ int main(int argc, char **argv) #endif /* USE_TLS */ #endif /* USE_TCP */ + sr_core_ert_run_xname("core:modinit-before"); + if(init_modules() != 0) { fprintf(stderr, "ERROR: error while initializing modules\n"); goto error;

1 0

git:master:1580d0b0: rr: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 1580d0b0f8742269c6f5b6bb99ac7a96b9f83276 URL: https://github.com/kamailio/kamailio/commit/1580d0b0f8742269c6f5b6bb99ac7a9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T11:10:53+01:00 rr: add fixup_free* to exported functions --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1580d0b0f8742269c6f5b6bb99ac7a9… Patch: https://github.com/kamailio/kamailio/commit/1580d0b0f8742269c6f5b6bb99ac7a9… --- diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index 78d335695c6..8bce1dea3dc 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -73,6 +73,7 @@ static void mod_destroy(void); /* fixup functions */ static int direction_fixup(void **param, int param_no); static int it_list_fixup(void **param, int param_no); +static int it_list_fixup_free(void **param, int param_no); /* wrapper functions */ static int w_loose_route(struct sip_msg *, char *, char *); static int w_loose_route_preloaded(struct sip_msg *, char *, char *); @@ -106,15 +107,15 @@ static cmd_export_t cmds[] = { {"record_route", (cmd_function)w_record_route, 0, 0, 0, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, {"record_route", (cmd_function)w_record_route, 1, - it_list_fixup, 0, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, + it_list_fixup, it_list_fixup_free, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, {"record_route_preset", (cmd_function)w_record_route_preset, 1, - it_list_fixup, 0, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, + it_list_fixup, it_list_fixup_free, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, {"record_route_preset", (cmd_function)w_record_route_preset, 2, - it_list_fixup, 0, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, + it_list_fixup, it_list_fixup_free, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, {"record_route_advertised_address", (cmd_function)w_record_route_advertised_address, 1, - it_list_fixup, 0, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, + it_list_fixup, it_list_fixup_free, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, {"add_rr_param", (cmd_function)w_add_rr_param, 1, - it_list_fixup, 0, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, + it_list_fixup, it_list_fixup_free, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, {"check_route_param", (cmd_function)w_check_route_param, 1, fixup_regexp_null, fixup_free_regexp_null, REQUEST_ROUTE}, {"is_direction", (cmd_function)w_is_direction, 1, @@ -233,6 +234,11 @@ static int it_list_fixup(void **param, int param_no) return 0; } +static int it_list_fixup_free(void **param, int param_no) +{ + pv_elem_free_all(*param); + return 0; +} static int direction_fixup(void **param, int param_no) {

1 0

git:master:4c157538: rr: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 4c157538046dcc70aebf549522a960bca2c25bfd URL: https://github.com/kamailio/kamailio/commit/4c157538046dcc70aebf549522a960b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T11:08:31+01:00 rr: reformat exported structures --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4c157538046dcc70aebf549522a960b… Patch: https://github.com/kamailio/kamailio/commit/4c157538046dcc70aebf549522a960b…

1 0

git:master:fcf8454c: rtimer: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: fcf8454c982c09c6cc89669b7327d000b5c154d9 URL: https://github.com/kamailio/kamailio/commit/fcf8454c982c09c6cc89669b7327d00… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T11:05:03+01:00 rtimer: reformat exported structures --- Modified: src/modules/rtimer/rtimer_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fcf8454c982c09c6cc89669b7327d00… Patch: https://github.com/kamailio/kamailio/commit/fcf8454c982c09c6cc89669b7327d00… --- diff --git a/src/modules/rtimer/rtimer_mod.c b/src/modules/rtimer/rtimer_mod.c index b5b122a6829..5d2249106d4 100644 --- a/src/modules/rtimer/rtimer_mod.c +++ b/src/modules/rtimer/rtimer_mod.c @@ -80,27 +80,34 @@ void stm_main_timer_exec(unsigned int ticks, void *param); int stm_get_worker(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); static int default_interval = 120; - +/* clang-format off */ static pv_export_t rtimer_pvs[] = { - {{"rtimer_worker", (sizeof("rtimer_worker") - 1)}, PVT_OTHER, - stm_get_worker, 0, 0, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"rtimer_worker", (sizeof("rtimer_worker") - 1)}, PVT_OTHER, + stm_get_worker, 0, 0, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"default_interval", PARAM_INT, &default_interval}, - {"timer", PARAM_STRING | PARAM_USE_FUNC, (void *)stm_t_param}, - {"exec", PARAM_STRING | PARAM_USE_FUNC, (void *)stm_e_param}, - {0, 0, 0}}; - + {"default_interval", PARAM_INT, &default_interval}, + {"timer", PARAM_STRING | PARAM_USE_FUNC, (void *)stm_t_param}, + {"exec", PARAM_STRING | PARAM_USE_FUNC, (void *)stm_e_param}, + {0, 0, 0} +}; /** module exports */ -struct module_exports exports = {"rtimer", DEFAULT_DLFLAGS, /* dlopen flags */ - 0, params, 0, /* exported RPC methods */ - rtimer_pvs, /* exported pseudo-variables */ - 0, mod_init, /* module initialization function */ - child_init, /* per-child init function */ - 0}; - +struct module_exports exports = { + "rtimer", + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + rtimer_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + 0 /* module destroy function */ +}; +/* clang-format on */ /** * init module function

1 0

git:master:1ce99a24: rtjson: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 1ce99a243e22eb8acdc94cc8f7ec98a6846760bf URL: https://github.com/kamailio/kamailio/commit/1ce99a243e22eb8acdc94cc8f7ec98a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:58:55+01:00 rtjson: add fixup_free* to exported functions --- Modified: src/modules/rtjson/rtjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1ce99a243e22eb8acdc94cc8f7ec98a… Patch: https://github.com/kamailio/kamailio/commit/1ce99a243e22eb8acdc94cc8f7ec98a… --- diff --git a/src/modules/rtjson/rtjson_mod.c b/src/modules/rtjson/rtjson_mod.c index 48da0e9f9fa..60ace41542f 100644 --- a/src/modules/rtjson/rtjson_mod.c +++ b/src/modules/rtjson/rtjson_mod.c @@ -49,7 +49,7 @@ static int w_rtjson_update_branch(sip_msg_t *msg, char *p1, char *p2); /* clang-format off */ static cmd_export_t cmds[] = { {"rtjson_init_routes", (cmd_function)w_rtjson_init_routes, 1, - fixup_spve_null, 0, REQUEST_ROUTE}, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, {"rtjson_push_routes", (cmd_function)w_rtjson_push_routes, 0, 0, 0, REQUEST_ROUTE}, {"rtjson_next_route", (cmd_function)w_rtjson_next_route, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, {"rtjson_update_branch", (cmd_function)w_rtjson_update_branch, 0, 0, 0, BRANCH_ROUTE},

1 0

git:master:82206086: rtjson: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 82206086f4adf17fa25dae248b49d930532bddd3 URL: https://github.com/kamailio/kamailio/commit/82206086f4adf17fa25dae248b49d93… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:58:24+01:00 rtjson: reformat exported structures --- Modified: src/modules/rtjson/rtjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82206086f4adf17fa25dae248b49d93… Patch: https://github.com/kamailio/kamailio/commit/82206086f4adf17fa25dae248b49d93… --- diff --git a/src/modules/rtjson/rtjson_mod.c b/src/modules/rtjson/rtjson_mod.c index 4661b2ca386..48da0e9f9fa 100644 --- a/src/modules/rtjson/rtjson_mod.c +++ b/src/modules/rtjson/rtjson_mod.c @@ -46,29 +46,34 @@ static int w_rtjson_push_routes(sip_msg_t *msg, char *p1, char *p2); static int w_rtjson_next_route(sip_msg_t *msg, char *p1, char *p2); static int w_rtjson_update_branch(sip_msg_t *msg, char *p1, char *p2); +/* clang-format off */ static cmd_export_t cmds[] = { - {"rtjson_init_routes", (cmd_function)w_rtjson_init_routes, 1, - fixup_spve_null, 0, REQUEST_ROUTE}, - {"rtjson_push_routes", (cmd_function)w_rtjson_push_routes, 0, 0, 0, - REQUEST_ROUTE}, - {"rtjson_next_route", (cmd_function)w_rtjson_next_route, 0, 0, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {"rtjson_update_branch", (cmd_function)w_rtjson_update_branch, 0, 0, 0, - BRANCH_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"rtjson_init_routes", (cmd_function)w_rtjson_init_routes, 1, + fixup_spve_null, 0, REQUEST_ROUTE}, + {"rtjson_push_routes", (cmd_function)w_rtjson_push_routes, 0, 0, 0, REQUEST_ROUTE}, + {"rtjson_next_route", (cmd_function)w_rtjson_next_route, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {"rtjson_update_branch", (cmd_function)w_rtjson_update_branch, 0, 0, 0, BRANCH_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"xavp_cfg", PARAM_STR, &_rtjson_xavp_name}, {0, 0, 0}}; + {"xavp_cfg", PARAM_STR, &_rtjson_xavp_name}, + {0, 0, 0} +}; struct module_exports exports = { - "rtjson", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, params, 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "rtjson", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /** * init module function

1 0

git:master:07134cb4: rtp_media_server: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 07134cb4c2cf66cf2e7e6ba738559c3c1209645a URL: https://github.com/kamailio/kamailio/commit/07134cb4c2cf66cf2e7e6ba738559c3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:55:49+01:00 rtp_media_server: add fixup_free* to exported functions --- Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/07134cb4c2cf66cf2e7e6ba738559c3… Patch: https://github.com/kamailio/kamailio/commit/07134cb4c2cf66cf2e7e6ba738559c3… --- diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index 3e5de0635a6..07a0ebd068b 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -43,8 +43,11 @@ static int child_init(int); static rms_dialog_info_t *rms_dialog_create_leg( rms_dialog_info_t *di, struct sip_msg *msg); static int fixup_rms_action_play(void **param, int param_no); +static int fixup_free_rms_action_play(void **param, int param_no); static int fixup_rms_bridge(void **param, int param_no); +static int fixup_free_rms_bridge(void **param, int param_no); static int fixup_rms_answer(void **param, int param_no); +static int fixup_free_rms_answer(void **param, int param_no); static int rms_hangup_call(rms_dialog_info_t *di); static int rms_bridging_call(rms_dialog_info_t *di, rms_action_t *a); static int rms_bridged_call(rms_dialog_info_t *di, rms_action_t *a); @@ -62,15 +65,15 @@ static int rms_update_media_sockets( /* clang-format off */ static cmd_export_t cmds[] = { {"rms_answer", (cmd_function)rms_answer_f, 1, - fixup_rms_answer, 0, EVENT_ROUTE}, + fixup_rms_answer, fixup_free_rms_answer, EVENT_ROUTE}, {"rms_sip_request", (cmd_function)rms_sip_request_f, 0, 0, 0, EVENT_ROUTE}, {"rms_play", (cmd_function)rms_action_play_f, 2, - fixup_rms_action_play, 0, ANY_ROUTE}, + fixup_rms_action_play, fixup_free_rms_action_play, ANY_ROUTE}, {"rms_dialog_check", (cmd_function)rms_dialog_check_f, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, {"rms_hangup", (cmd_function)rms_hangup_f, 0, 0, 0, EVENT_ROUTE}, {"rms_bridge", (cmd_function)rms_bridge_f, 2, - fixup_rms_bridge, 0, ANY_ROUTE}, + fixup_rms_bridge, fixup_free_rms_bridge, ANY_ROUTE}, {"rms_dialogs_dump", (cmd_function)rms_dialogs_dump_f, 0, 0, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -156,6 +159,13 @@ static int fixup_rms_bridge(void **param, int param_no) return -1; } +static int fixup_free_rms_bridge(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) + return fixup_free_spve_null(param, 1); + return 0; +} + static int fixup_rms_answer(void **param, int param_no) { if(param_no == 1 || param_no == 2) @@ -164,6 +174,13 @@ static int fixup_rms_answer(void **param, int param_no) return -1; } +static int fixup_free_rms_answer(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) + return fixup_free_spve_null(param, 1); + return 0; +} + static int fixup_rms_action_play(void **param, int param_no) { if(param_no == 1 || param_no == 2 || param_no == 3) @@ -172,6 +189,13 @@ static int fixup_rms_action_play(void **param, int param_no) return -1; } +static int fixup_free_rms_action_play(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) + return fixup_free_spve_null(param, 1); + return 0; +} + /** * @return 0 to continue to load Kamailio, -1 to stop the loading * and abort Kamailio.

1 0

git:master:744243d2: rtp_media_server: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 744243d290946644fe0248b2eaa5591d5f9e985f URL: https://github.com/kamailio/kamailio/commit/744243d290946644fe0248b2eaa5591… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:52:14+01:00 rtp_media_server: reformat exported structures --- Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/744243d290946644fe0248b2eaa5591… Patch: https://github.com/kamailio/kamailio/commit/744243d290946644fe0248b2eaa5591… --- diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index a41b5715022..3e5de0635a6 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -59,20 +59,21 @@ static int rms_bridge_f(struct sip_msg *, char *, char *); static int rms_update_media_sockets( struct sip_msg *msg, rms_dialog_info_t *di, rms_sdp_info_t *sdp_info); -static cmd_export_t cmds[] = {{"rms_answer", (cmd_function)rms_answer_f, 1, - fixup_rms_answer, 0, EVENT_ROUTE}, - {"rms_sip_request", (cmd_function)rms_sip_request_f, 0, 0, 0, - EVENT_ROUTE}, - {"rms_play", (cmd_function)rms_action_play_f, 2, fixup_rms_action_play, - 0, ANY_ROUTE}, - {"rms_dialog_check", (cmd_function)rms_dialog_check_f, 0, 0, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, - {"rms_hangup", (cmd_function)rms_hangup_f, 0, 0, 0, EVENT_ROUTE}, - {"rms_bridge", (cmd_function)rms_bridge_f, 2, fixup_rms_bridge, 0, - ANY_ROUTE}, - {"rms_dialogs_dump", (cmd_function)rms_dialogs_dump_f, 0, 0, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"rms_answer", (cmd_function)rms_answer_f, 1, + fixup_rms_answer, 0, EVENT_ROUTE}, + {"rms_sip_request", (cmd_function)rms_sip_request_f, 0, 0, 0, EVENT_ROUTE}, + {"rms_play", (cmd_function)rms_action_play_f, 2, + fixup_rms_action_play, 0, ANY_ROUTE}, + {"rms_dialog_check", (cmd_function)rms_dialog_check_f, 0, + 0, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, + {"rms_hangup", (cmd_function)rms_hangup_f, 0, 0, 0, EVENT_ROUTE}, + {"rms_bridge", (cmd_function)rms_bridge_f, 2, + fixup_rms_bridge, 0, ANY_ROUTE}, + {"rms_dialogs_dump", (cmd_function)rms_dialogs_dump_f, 0, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t mod_params[] = { {"log_file_name", PARAM_STR, &log_fn}, {0, 0, 0}}; @@ -89,6 +90,7 @@ struct module_exports exports = { child_init, mod_destroy, }; +/* clang-format on */ static void run_action_route(rms_dialog_info_t *di, char *route) {

1 0

git:master:fa142bbe: rtpengine: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: fa142bbe6327df2cc6c2cf8e942b9207cb6fe62b URL: https://github.com/kamailio/kamailio/commit/fa142bbe6327df2cc6c2cf8e942b920… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:47:17+01:00 rtpengine: add fixup_free* to exported functions --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/fa142bbe6327df2cc6c2cf8e942b920… Patch: https://github.com/kamailio/kamailio/commit/fa142bbe6327df2cc6c2cf8e942b920…

1 0

git:master:907f213c: rtpproxy: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 907f213cfc93d860a30b839ab4f1ce1690b358ac URL: https://github.com/kamailio/kamailio/commit/907f213cfc93d860a30b839ab4f1ce1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:36:06+01:00 rtpproxy: add fixup_free* to exported functions --- Modified: src/modules/rtpproxy/rtpproxy.c Modified: src/modules/rtpproxy/rtpproxy_stream.c Modified: src/modules/rtpproxy/rtpproxy_stream.h --- Diff: https://github.com/kamailio/kamailio/commit/907f213cfc93d860a30b839ab4f1ce1… Patch: https://github.com/kamailio/kamailio/commit/907f213cfc93d860a30b839ab4f1ce1… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 57f4f4b05e5..6d358d73d46 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -134,6 +134,7 @@ static int rtpproxy_manage2(struct sip_msg *msg, char *flags, char *ip); static int add_rtpproxy_socks(struct rtpp_set *rtpp_list, char *rtpproxy); static int fixup_set_id(void **param, int param_no); +static int fixup_free_set_id(void **param, int param_no); static int set_rtp_proxy_set_f(struct sip_msg *msg, char *str1, char *str2); static struct rtpp_set *select_rtpp_set(int id_set); @@ -194,28 +195,28 @@ static pv_elem_t *extra_id_pv = NULL; /* clang-format off */ static cmd_export_t cmds[] = { {"set_rtp_proxy_set", (cmd_function)set_rtp_proxy_set_f, 1, - fixup_set_id, 0, ANY_ROUTE}, + fixup_set_id, fixup_free_set_id, ANY_ROUTE}, {"unforce_rtp_proxy", (cmd_function)unforce_rtp_proxy1_f, 0, 0, 0, ANY_ROUTE}, {"rtpproxy_destroy", (cmd_function)unforce_rtp_proxy1_f, 0, 0, 0, ANY_ROUTE}, {"unforce_rtp_proxy", (cmd_function)unforce_rtp_proxy1_f, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"rtpproxy_destroy", (cmd_function)unforce_rtp_proxy1_f, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"start_recording", (cmd_function)start_recording_f, 0, 0, 0, ANY_ROUTE}, {"rtpproxy_offer", (cmd_function)rtpproxy_offer1_f, 0, 0, 0, ANY_ROUTE}, {"rtpproxy_offer", (cmd_function)rtpproxy_offer1_f, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"rtpproxy_offer", (cmd_function)rtpproxy_offer2_f, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"rtpproxy_answer", (cmd_function)rtpproxy_answer1_f, 0, 0, 0, ANY_ROUTE}, {"rtpproxy_answer", (cmd_function)rtpproxy_answer1_f, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"rtpproxy_answer", (cmd_function)rtpproxy_answer2_f, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"rtpproxy_stream2uac", (cmd_function)rtpproxy_stream2uac2_f, 2, - fixup_var_str_int, 0, ANY_ROUTE}, + fixup_var_str_int, fixup_free_var_str_int, ANY_ROUTE}, {"rtpproxy_stream2uas", (cmd_function)rtpproxy_stream2uas2_f, 2, - fixup_var_str_int, 0, ANY_ROUTE}, + fixup_var_str_int, fixup_free_var_str_int, ANY_ROUTE}, {"rtpproxy_stop_stream2uac", (cmd_function)rtpproxy_stop_stream2uac2_f, 0, 0, 0, ANY_ROUTE}, {"rtpproxy_stop_stream2uas", (cmd_function)rtpproxy_stop_stream2uas2_f, 0, 0, 0, ANY_ROUTE}, {"rtpproxy_manage", (cmd_function)rtpproxy_manage0, 0, 0, 0, ANY_ROUTE}, @@ -553,6 +554,12 @@ static int fixup_set_id(void **param, int param_no) return 0; } +static int fixup_free_set_id(void **param, int param_no) +{ + pkg_free(*param); + return 0; +} + static void rtpproxy_rpc_enable(rpc_t *rpc, void *ctx) { str rtpp_url; diff --git a/src/modules/rtpproxy/rtpproxy_stream.c b/src/modules/rtpproxy/rtpproxy_stream.c index 625a8e7f368..da02d00e3fc 100644 --- a/src/modules/rtpproxy/rtpproxy_stream.c +++ b/src/modules/rtpproxy/rtpproxy_stream.c @@ -70,6 +70,14 @@ int fixup_var_str_int(void **param, int param_no) return 0; } +int fixup_free_var_str_int(void **param, int param_no) +{ + if(param_no == 1) { + pv_elem_free_all(*param); + } + return 0; +} + int rtpproxy_stream(struct sip_msg *msg, str *pname, int count, int stream2uac) { int nitems; diff --git a/src/modules/rtpproxy/rtpproxy_stream.h b/src/modules/rtpproxy/rtpproxy_stream.h index 377cac4279e..b5fd6bb9a4d 100644 --- a/src/modules/rtpproxy/rtpproxy_stream.h +++ b/src/modules/rtpproxy/rtpproxy_stream.h @@ -29,6 +29,7 @@ #define _RTPPROXY_STREAM_H int fixup_var_str_int(void **, int); +int fixup_free_var_str_int(void **, int); int rtpproxy_stream(struct sip_msg *msg, str *pname, int count, int stream2uac); int rtpproxy_stream2uac2_f(struct sip_msg *, char *, char *); int rtpproxy_stream2uas2_f(struct sip_msg *, char *, char *);

1 0

git:master:d5d19c6f: rtpproxy: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: d5d19c6f0ca1f032d29c851a5c6054b32ff218a5 URL: https://github.com/kamailio/kamailio/commit/d5d19c6f0ca1f032d29c851a5c6054b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:27:22+01:00 rtpproxy: reformat exported structures --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/d5d19c6f0ca1f032d29c851a5c6054b… Patch: https://github.com/kamailio/kamailio/commit/d5d19c6f0ca1f032d29c851a5c6054b…

1 0

git:master:1723be18: sanity: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 1723be183f21fd3225153367a75ed9ab824ad7ec URL: https://github.com/kamailio/kamailio/commit/1723be183f21fd3225153367a75ed9a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:22:04+01:00 sanity: add fixup_free* to exported functions --- Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1723be183f21fd3225153367a75ed9a… Patch: https://github.com/kamailio/kamailio/commit/1723be183f21fd3225153367a75ed9a… --- diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 09dcdb23d43..e55d05f3144 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -58,9 +58,9 @@ static cmd_export_t cmds[] = { {"sanity_check", (cmd_function)w_sanity_check, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, {"sanity_check", (cmd_function)w_sanity_check, 1, - fixup_igp_null, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE | ONREPLY_ROUTE}, {"sanity_check", (cmd_function)w_sanity_check, 2, - fixup_igp_igp, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + fixup_igp_igp, fixup_free_igp_igp, REQUEST_ROUTE | ONREPLY_ROUTE}, {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0},

1 0

git:master:c5bdc923: sanity: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: c5bdc9237b661859b635e8dc7fcfea9526ec9def URL: https://github.com/kamailio/kamailio/commit/c5bdc9237b661859b635e8dc7fcfea9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:21:30+01:00 sanity: reformat exported structures --- Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c5bdc9237b661859b635e8dc7fcfea9… Patch: https://github.com/kamailio/kamailio/commit/c5bdc9237b661859b635e8dc7fcfea9… --- diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 99f64fbf082..09dcdb23d43 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -50,45 +50,51 @@ static int w_sanity_check(sip_msg_t *_msg, char *_msg_check, char *_uri_check); static int w_sanity_reply(sip_msg_t *_msg, char *_p1, char *_p2); static int bind_sanity(sanity_api_t *api); +/* clang-format off */ /* * Exported functions */ -static cmd_export_t cmds[] = {{"sanity_check", (cmd_function)w_sanity_check, 0, - 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, - {"sanity_check", (cmd_function)w_sanity_check, 1, fixup_igp_null, 0, - REQUEST_ROUTE | ONREPLY_ROUTE}, - {"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0, - REQUEST_ROUTE | ONREPLY_ROUTE}, - {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0, - REQUEST_ROUTE | ONREPLY_ROUTE}, - {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0}}; +static cmd_export_t cmds[] = { + {"sanity_check", (cmd_function)w_sanity_check, 0, + 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {"sanity_check", (cmd_function)w_sanity_check, 1, + fixup_igp_null, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {"sanity_check", (cmd_function)w_sanity_check, 2, + fixup_igp_igp, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {"sanity_reply", (cmd_function)w_sanity_reply, 0, + 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ static param_export_t params[] = { - {"default_checks", PARAM_INT, &default_msg_checks}, - {"uri_checks", PARAM_INT, &default_uri_checks}, - {"proxy_require", PARAM_STR, &_sanity_prval}, - {"autodrop", PARAM_INT, &_sanity_drop}, - {"noreply", PARAM_INT, &ksr_sanity_noreply}, {0, 0, 0}}; + {"default_checks", PARAM_INT, &default_msg_checks}, + {"uri_checks", PARAM_INT, &default_uri_checks}, + {"proxy_require", PARAM_STR, &_sanity_prval}, + {"autodrop", PARAM_INT, &_sanity_drop}, + {"noreply", PARAM_INT, &ksr_sanity_noreply}, + {0, 0, 0} +}; /* * Module description */ struct module_exports exports = { - "sanity", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd exports */ - params, /* exported parameters */ - 0, /* RPC methods */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "sanity", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /* * initialize module

1 0

git:master:94e29db0: sca: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 94e29db032546ccfaa085e1b19ecd11ba6bb922d URL: https://github.com/kamailio/kamailio/commit/94e29db032546ccfaa085e1b19ecd11… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:18:16+01:00 sca: reformat exported structures --- Modified: src/modules/sca/sca.c --- Diff: https://github.com/kamailio/kamailio/commit/94e29db032546ccfaa085e1b19ecd11… Patch: https://github.com/kamailio/kamailio/commit/94e29db032546ccfaa085e1b19ecd11…

1 0

git:master:bbd0f09e: sctp: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: bbd0f09e6bef06403a3e28a42abb07043d8857b5 URL: https://github.com/kamailio/kamailio/commit/bbd0f09e6bef06403a3e28a42abb070… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:15:05+01:00 sctp: reformat exported structures --- Modified: src/modules/sctp/sctp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bbd0f09e6bef06403a3e28a42abb070… Patch: https://github.com/kamailio/kamailio/commit/bbd0f09e6bef06403a3e28a42abb070… --- diff --git a/src/modules/sctp/sctp_mod.c b/src/modules/sctp/sctp_mod.c index f5d287902ce..7717fc60829 100644 --- a/src/modules/sctp/sctp_mod.c +++ b/src/modules/sctp/sctp_mod.c @@ -39,45 +39,47 @@ static int mod_init(void); static int sctp_mod_pre_init(void); #endif - -static cmd_export_t cmds[] = {{0, 0, 0, 0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"sctp_socket_rcvbuf", PARAM_INT, &sctp_default_cfg.so_rcvbuf}, - {"sctp_socket_sndbuf", PARAM_INT, &sctp_default_cfg.so_sndbuf}, - {"sctp_autoclose", PARAM_INT, &sctp_default_cfg.autoclose}, - {"sctp_send_ttl", PARAM_INT, &sctp_default_cfg.send_ttl}, - {"sctp_send_retries", PARAM_INT, &sctp_default_cfg.send_retries}, - {"sctp_assoc_tracking", PARAM_INT, &sctp_default_cfg.assoc_tracking}, - {"sctp_assoc_reuse", PARAM_INT, &sctp_default_cfg.assoc_reuse}, - {"sctp_max_assocs", PARAM_INT, &sctp_default_cfg.max_assocs}, - {"sctp_srto_initial", PARAM_INT, &sctp_default_cfg.srto_initial}, - {"sctp_srto_max", PARAM_INT, &sctp_default_cfg.srto_max}, - {"sctp_srto_min", PARAM_INT, &sctp_default_cfg.srto_min}, - {"sctp_asocmaxrxt", PARAM_INT, &sctp_default_cfg.asocmaxrxt}, - {"sctp_init_max_attempts", PARAM_INT, - &sctp_default_cfg.init_max_attempts}, - {"sctp_init_max_timeo", PARAM_INT, &sctp_default_cfg.init_max_timeo}, - {"sctp_hbinterval", PARAM_INT, &sctp_default_cfg.hbinterval}, - {"sctp_pathmaxrxt", PARAM_INT, &sctp_default_cfg.pathmaxrxt}, - {"sctp_sack_delay", PARAM_INT, &sctp_default_cfg.sack_delay}, - {"sctp_sack_freq", PARAM_INT, &sctp_default_cfg.sack_freq}, - {"sctp_max_burst", PARAM_INT, &sctp_default_cfg.max_burst}, - - {0, 0, 0}}; + {"sctp_socket_rcvbuf", PARAM_INT, &sctp_default_cfg.so_rcvbuf}, + {"sctp_socket_sndbuf", PARAM_INT, &sctp_default_cfg.so_sndbuf}, + {"sctp_autoclose", PARAM_INT, &sctp_default_cfg.autoclose}, + {"sctp_send_ttl", PARAM_INT, &sctp_default_cfg.send_ttl}, + {"sctp_send_retries", PARAM_INT, &sctp_default_cfg.send_retries}, + {"sctp_assoc_tracking", PARAM_INT, &sctp_default_cfg.assoc_tracking}, + {"sctp_assoc_reuse", PARAM_INT, &sctp_default_cfg.assoc_reuse}, + {"sctp_max_assocs", PARAM_INT, &sctp_default_cfg.max_assocs}, + {"sctp_srto_initial", PARAM_INT, &sctp_default_cfg.srto_initial}, + {"sctp_srto_max", PARAM_INT, &sctp_default_cfg.srto_max}, + {"sctp_srto_min", PARAM_INT, &sctp_default_cfg.srto_min}, + {"sctp_asocmaxrxt", PARAM_INT, &sctp_default_cfg.asocmaxrxt}, + {"sctp_init_max_attempts", PARAM_INT, &sctp_default_cfg.init_max_attempts}, + {"sctp_init_max_timeo", PARAM_INT, &sctp_default_cfg.init_max_timeo}, + {"sctp_hbinterval", PARAM_INT, &sctp_default_cfg.hbinterval}, + {"sctp_pathmaxrxt", PARAM_INT, &sctp_default_cfg.pathmaxrxt}, + {"sctp_sack_delay", PARAM_INT, &sctp_default_cfg.sack_delay}, + {"sctp_sack_freq", PARAM_INT, &sctp_default_cfg.sack_freq}, + {"sctp_max_burst", PARAM_INT, &sctp_default_cfg.max_burst}, + {0, 0, 0} +}; struct module_exports exports = { - "sctp", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd exports */ - params, /* param exports */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per child init function */ - 0 /* destroy function */ + "sctp", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ int mod_register(char *path, int *dlflags, void *p1, void *p2) {

1 0

git:master:fb7263a3: sdpops: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: fb7263a39a91e32dd39ef3548425ed3d43e7f9f9 URL: https://github.com/kamailio/kamailio/commit/fb7263a39a91e32dd39ef3548425ed3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:13:20+01:00 sdpops: add fixup_free* to exported functions --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fb7263a39a91e32dd39ef3548425ed3… Patch: https://github.com/kamailio/kamailio/commit/fb7263a39a91e32dd39ef3548425ed3… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 34a11697361..e88dcf89ee7 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -95,42 +95,42 @@ static int mod_init(void); /* clang-format off */ static cmd_export_t cmds[] = { {"sdp_remove_line_by_prefix", (cmd_function)w_sdp_remove_line_by_prefix, - 1, fixup_spve_null, 0, ANY_ROUTE}, + 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sdp_remove_line_by_prefix", (cmd_function)w_sdp_remove_line_by_prefix, - 2, fixup_spve_spve, 0, ANY_ROUTE}, + 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"sdp_remove_codecs_by_id", (cmd_function)w_sdp_remove_codecs_by_id, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sdp_remove_codecs_by_id", (cmd_function)w_sdp_remove_codecs_by_id, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"sdp_remove_codecs_by_name", (cmd_function)w_sdp_remove_codecs_by_name, - 1, fixup_spve_null, 0, ANY_ROUTE}, + 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sdp_remove_codecs_by_name", (cmd_function)w_sdp_remove_codecs_by_name, - 2, fixup_spve_spve, 0, ANY_ROUTE}, + 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"sdp_keep_codecs_by_id", (cmd_function)w_sdp_keep_codecs_by_id, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sdp_keep_codecs_by_id", (cmd_function)w_sdp_keep_codecs_by_id, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"sdp_keep_codecs_by_name", (cmd_function)w_sdp_keep_codecs_by_name, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sdp_keep_codecs_by_name", (cmd_function)w_sdp_keep_codecs_by_name, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"sdp_with_media", (cmd_function)w_sdp_with_media, 1, fixup_spve_null, 0, ANY_ROUTE}, {"sdp_with_active_media", (cmd_function)w_sdp_with_active_media, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sdp_remove_media", (cmd_function)w_sdp_remove_media, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sdp_with_transport", (cmd_function)w_sdp_with_transport, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sdp_with_transport_like", (cmd_function)w_sdp_with_transport_like, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sdp_remove_transport", (cmd_function)w_sdp_remove_transport, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sdp_transport", (cmd_function)w_sdp_transport, 1, 0, 0, ANY_ROUTE}, {"sdp_with_codecs_by_id", (cmd_function)w_sdp_with_codecs_by_id, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sdp_with_codecs_by_name", (cmd_function)w_sdp_with_codecs_by_name, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sdp_print", (cmd_function)w_sdp_print, 1, fixup_igp_null, 0, ANY_ROUTE}, {"sdp_get", (cmd_function)w_sdp_get, 1, 0, 0, ANY_ROUTE}, @@ -138,7 +138,7 @@ static cmd_export_t cmds[] = { {"sdp_content", (cmd_function)w_sdp_content_sloppy, 1, 0, 0, ANY_ROUTE}, {"sdp_with_ice", (cmd_function)w_sdp_with_ice, 0, 0, 0, ANY_ROUTE}, {"sdp_get_line_startswith", (cmd_function)w_sdp_get_line_startswith, 2, - fixup_none_spve, 0, ANY_ROUTE}, + fixup_none_spve, fixup_free_none_spve, ANY_ROUTE}, {"sdp_get_address_family", (cmd_function)w_sdp_get_address_family, 0, 0, 0, ANY_ROUTE},

1 0

git:master:2a35ef29: seas: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 2a35ef2966bca64f759c435e248e3b9118a90fc4 URL: https://github.com/kamailio/kamailio/commit/2a35ef2966bca64f759c435e248e3b9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:09:41+01:00 seas: reformat exported structures --- Modified: src/modules/seas/seas.c --- Diff: https://github.com/kamailio/kamailio/commit/2a35ef2966bca64f759c435e248e3b9… Patch: https://github.com/kamailio/kamailio/commit/2a35ef2966bca64f759c435e248e3b9… --- diff --git a/src/modules/seas/seas.c b/src/modules/seas/seas.c index 3c8e17c2673..63ad58b0335 100644 --- a/src/modules/seas/seas.c +++ b/src/modules/seas/seas.c @@ -85,29 +85,35 @@ int read_pipe = 0; struct seas_functions seas_f; -static cmd_export_t cmds[] = {{"as_relay_t", (cmd_function)w_as_relay_t, 1, - fixup_as_relay, 0, REQUEST_ROUTE}, - {"as_relay_sl", (cmd_function)w_as_relay_sl, 1, fixup_as_relay, 0, - REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"as_relay_t", (cmd_function)w_as_relay_t, 1, fixup_as_relay, 0, REQUEST_ROUTE}, + {"as_relay_sl", (cmd_function)w_as_relay_sl, 1, fixup_as_relay, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"listen_sockets", PARAM_STRING, &seas_listen_socket}, - {"stats_socket", PARAM_STRING, &seas_stats_socket}, - {"jain_ping", PARAM_STRING, &jain_ping_config}, - {"servlet_ping", PARAM_STRING, &servlet_ping_config}, - {"clusters", PARAM_STRING, &cluster_cfg}, {0, 0, 0}}; + {"listen_sockets", PARAM_STRING, &seas_listen_socket}, + {"stats_socket", PARAM_STRING, &seas_stats_socket}, + {"jain_ping", PARAM_STRING, &jain_ping_config}, + {"servlet_ping", PARAM_STRING, &servlet_ping_config}, + {"clusters", PARAM_STRING, &cluster_cfg}, + {0, 0, 0} +}; struct module_exports exports = { - "seas", DEFAULT_DLFLAGS, cmds, /* exported commands */ - params, /* exported parameters */ - 0, /* exported RPC methods */ - 0, /* exported module-items (pseudo variables) */ - 0, /* response function */ - seas_init, /* module initialization function */ - seas_child_init, /* per-child init function */ - seas_exit /* module exit function */ + "seas", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + seas_init, /* module initialization function */ + seas_child_init, /* per-child init function */ + seas_exit /* module destroy function */ }; +/* clang-format on */ static int fixup_as_relay(void **param, int param_no) {

1 0

git:master:fa6192c1: secfilter: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: fa6192c1431186f395cf35e270916c2e7756455b URL: https://github.com/kamailio/kamailio/commit/fa6192c1431186f395cf35e270916c2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:05:26+01:00 secfilter: reformat exported structures --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/fa6192c1431186f395cf35e270916c2… Patch: https://github.com/kamailio/kamailio/commit/fa6192c1431186f395cf35e270916c2…

1 0

git:master:612f5d10: sipcapture: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 612f5d10f0d191b0c66e8ef907c09a00239bfcf4 URL: https://github.com/kamailio/kamailio/commit/612f5d10f0d191b0c66e8ef907c09a0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:01:43+01:00 sipcapture: add fixup_free* to exported functions --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/612f5d10f0d191b0c66e8ef907c09a0… Patch: https://github.com/kamailio/kamailio/commit/612f5d10f0d191b0c66e8ef907c09a0… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 82c916dd3bc..9ae34fa9658 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -140,8 +140,11 @@ static int sipcapture_init_rpc(void); static int child_init(int rank); static void destroy(void); static int sipcapture_fixup(void **param, int param_no); +static int sipcapture_fixup_free(void **param, int param_no); static int reportcapture_fixup(void **param, int param_no); +static int reportcapture_fixup_free(void **param, int param_no); static int float2int_fixup(void **param, int param_no); +static int float2int_fixup_free(void **param, int param_no); static int pv_get_hep(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_hep_name(pv_spec_p sp, str *in); @@ -310,14 +313,22 @@ struct hep_timeinfo *heptime = NULL; * Exported functions */ static cmd_export_t cmds[] = { - {"sip_capture", (cmd_function)w_sip_capture0, 0, 0, 0, ANY_ROUTE}, - {"sip_capture", (cmd_function)w_sip_capture1, 1, sipcapture_fixup, 0, ANY_ROUTE}, - {"sip_capture", (cmd_function)w_sip_capture2, 2, sipcapture_fixup, 0, ANY_ROUTE}, - {"report_capture", (cmd_function)w_report_capture1, 1, reportcapture_fixup, 0, ANY_ROUTE}, - {"report_capture", (cmd_function)w_report_capture2, 2, reportcapture_fixup, 0, ANY_ROUTE}, - {"report_capture", (cmd_function)w_report_capture3, 3, reportcapture_fixup, 0, ANY_ROUTE}, - {"float2int", (cmd_function)w_float2int, 2, float2int_fixup, 0, ANY_ROUTE}, - {"sip_capture_forward", (cmd_function)w_sip_capture_forward, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"sip_capture", (cmd_function)w_sip_capture0, 0, + 0, 0, ANY_ROUTE}, + {"sip_capture", (cmd_function)w_sip_capture1, 1, + sipcapture_fixup, sipcapture_fixup_free, ANY_ROUTE}, + {"sip_capture", (cmd_function)w_sip_capture2, 2, + sipcapture_fixup, sipcapture_fixup_free, ANY_ROUTE}, + {"report_capture", (cmd_function)w_report_capture1, 1, + reportcapture_fixup, reportcapture_fixup_free, ANY_ROUTE}, + {"report_capture", (cmd_function)w_report_capture2, 2, + reportcapture_fixup, reportcapture_fixup_free, ANY_ROUTE}, + {"report_capture", (cmd_function)w_report_capture3, 3, + reportcapture_fixup, reportcapture_fixup_free, ANY_ROUTE}, + {"float2int", (cmd_function)w_float2int, 2, + float2int_fixup, float2int_fixup_free, ANY_ROUTE}, + {"sip_capture_forward", (cmd_function)w_sip_capture_forward, 1, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -1108,6 +1119,15 @@ static int sipcapture_fixup(void **param, int param_no) return 0; } +static int sipcapture_fixup_free(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_fparam_all(param, 1); + } + + return 0; +} + static int reportcapture_fixup(void **param, int param_no) { @@ -1124,6 +1144,16 @@ static int reportcapture_fixup(void **param, int param_no) return 0; } +static int reportcapture_fixup_free(void **param, int param_no) +{ + + if(param_no >= 1 && param_no <= 3) { + return fixup_free_fparam_all(param, 1); + } + + return 0; +} + static int float2int_fixup(void **param, int param_no) { @@ -1137,6 +1167,14 @@ static int float2int_fixup(void **param, int param_no) return 0; } +static int float2int_fixup_free(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) { + return fixup_free_fparam_all(param, 1); + } + + return 0; +} static int w_float2int(sip_msg_t *_m, char *_val, char *_coof) {

1 0

git:master:b0531ca5: sipcapture: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: b0531ca55d8d918f58057b393ba13a22e95813b6 URL: https://github.com/kamailio/kamailio/commit/b0531ca55d8d918f58057b393ba13a2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:52:39+01:00 sipcapture: reformat exported structures --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/b0531ca55d8d918f58057b393ba13a2… Patch: https://github.com/kamailio/kamailio/commit/b0531ca55d8d918f58057b393ba13a2…

1 0

git:master:e915258d: sipdump: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: e915258d8a76f811c8e9a7607248cf7149719541 URL: https://github.com/kamailio/kamailio/commit/e915258d8a76f811c8e9a7607248cf7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:47:05+01:00 sipdump: add fixup_free* to exported functions --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e915258d8a76f811c8e9a7607248cf7… Patch: https://github.com/kamailio/kamailio/commit/e915258d8a76f811c8e9a7607248cf7… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 8201ab11e47..cdac1a32ccf 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -74,7 +74,7 @@ int pv_get_sipdump(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); /* clang-format off */ static cmd_export_t cmds[]={ {"sipdump_send", (cmd_function)w_sipdump_send, 1, fixup_spve_null, - 0, ANY_ROUTE}, + fixup_free_spve_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:3cce2ac7: sipjson: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 3cce2ac7f9f8ef2ab10a9c228b9bbaddde3c7d03 URL: https://github.com/kamailio/kamailio/commit/3cce2ac7f9f8ef2ab10a9c228b9bbad… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:45:05+01:00 sipjson: reformat exported structures --- Modified: src/modules/sipjson/sipjson_mod.c Modified: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3cce2ac7f9f8ef2ab10a9c228b9bbad… Patch: https://github.com/kamailio/kamailio/commit/3cce2ac7f9f8ef2ab10a9c228b9bbad… --- diff --git a/src/modules/sipjson/sipjson_mod.c b/src/modules/sipjson/sipjson_mod.c index 06e0d2eeb4c..83564225aa0 100644 --- a/src/modules/sipjson/sipjson_mod.c +++ b/src/modules/sipjson/sipjson_mod.c @@ -41,26 +41,30 @@ static int sj_serialize_data(sip_msg_t *msg, srjson_doc_t *jdoc, str *smode); static int w_sj_serialize(sip_msg_t *msg, char *mode, char *vout); +/* clang-format off */ static cmd_export_t cmds[] = { - {"sj_serialize", (cmd_function)w_sj_serialize, 2, fixup_spve_pvar, - fixup_free_spve_pvar, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{0, 0, 0}}; + {"sj_serialize", (cmd_function)w_sj_serialize, 2, fixup_spve_pvar, + fixup_free_spve_pvar, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; +static param_export_t params[] = { + {0, 0, 0} +}; struct module_exports exports = { - "sipjson", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* module init function */ - 0, /* response function */ - 0, /* per child init function */ - 0 /* destroy function */ + "sipjson", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + 0, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /** * diff --git a/src/modules/siprepo/siprepo_mod.c b/src/modules/siprepo/siprepo_mod.c index e8cd28d10d7..0ce005774e2 100644 --- a/src/modules/siprepo/siprepo_mod.c +++ b/src/modules/siprepo/siprepo_mod.c @@ -75,7 +75,7 @@ static cmd_export_t cmds[]={ {"sr_msg_pull", (cmd_function)w_sr_msg_pull, 4, fixup_sssi, fixup_free_sssi, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, {"sr_msg_async_pull", (cmd_function)w_sr_msg_async_pull, 5, fixup_sr_msg_async_pull, - 0, ANY_ROUTE}, + fixup_free_sr_msg_async_pull, ANY_ROUTE}, {"sr_msg_rm", (cmd_function)w_sr_msg_rm, 2, fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, {"sr_msg_check", (cmd_function)w_sr_msg_check, 0, 0,

1 0

git:master:1241c77c: siprepo: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 1241c77c8ced81bfc2f1a8d72b99d4157d5a61b5 URL: https://github.com/kamailio/kamailio/commit/1241c77c8ced81bfc2f1a8d72b99d41… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:45:05+01:00 siprepo: add fixup_free* to exported functions --- Modified: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1241c77c8ced81bfc2f1a8d72b99d41… Patch: https://github.com/kamailio/kamailio/commit/1241c77c8ced81bfc2f1a8d72b99d41… --- diff --git a/src/modules/siprepo/siprepo_mod.c b/src/modules/siprepo/siprepo_mod.c index e6acc23368e..e8cd28d10d7 100644 --- a/src/modules/siprepo/siprepo_mod.c +++ b/src/modules/siprepo/siprepo_mod.c @@ -59,6 +59,7 @@ static int w_sr_msg_check(sip_msg_t *msg, char *p1, char *p2); static void siprepo_timer_exec(unsigned int ticks, int worker, void *param); static int fixup_sr_msg_async_pull(void **param, int param_no); +static int fixup_free_sr_msg_async_pull(void **param, int param_no); /* clang-format off */ typedef struct sworker_task_param { @@ -293,6 +294,15 @@ static int fixup_sr_msg_async_pull(void **param, int param_no) return 0; } +static int fixup_free_sr_msg_async_pull(void **param, int param_no) +{ + if(param_no >= 1 && param_no <= 4) + return fixup_free_spve_null(param, 1); + if(param_no == 5) + return fixup_free_igp_null(param, 1); + return 0; +} + /** * */

1 0

git:master:2d024cc2: sipt: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 2d024cc28ba3284fca67c4748e1b85349edb15ae URL: https://github.com/kamailio/kamailio/commit/2d024cc28ba3284fca67c4748e1b853… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:45:05+01:00 sipt: reformat exported structures --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/2d024cc28ba3284fca67c4748e1b853… Patch: https://github.com/kamailio/kamailio/commit/2d024cc28ba3284fca67c4748e1b853…

1 0

git:master:64290a1a: siptrace: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 64290a1aa41bba94387045c3d618ca3f7886f517 URL: https://github.com/kamailio/kamailio/commit/64290a1aa41bba94387045c3d618ca3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:45:05+01:00 siptrace: add fixup_free* to exported functions --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/64290a1aa41bba94387045c3d618ca3… Patch: https://github.com/kamailio/kamailio/commit/64290a1aa41bba94387045c3d618ca3… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index a6e276a54fb..43250e0e8c3 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -225,9 +225,9 @@ static cmd_export_t cmds[] = { ANY_ROUTE}, {"sip_trace_msg", (cmd_function)w_sip_trace_msg, 5, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, - {"hlog", (cmd_function)w_hlog1, 1, fixup_spve_null, 0, + {"hlog", (cmd_function)w_hlog1, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, - {"hlog", (cmd_function)w_hlog2, 2, fixup_spve_spve, 0, + {"hlog", (cmd_function)w_hlog2, 2, fixup_spve_spve, fixup_free_spve_null, ANY_ROUTE}, {"sip_trace_mode", (cmd_function)w_sip_trace_mode, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},

1 0

git:master:b074dc24: siputils: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: b074dc24c5bbd60d8bf6306f152c1f8c35eb2fef URL: https://github.com/kamailio/kamailio/commit/b074dc24c5bbd60d8bf6306f152c1f8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:45:04+01:00 siputils: add fixup_free* to exported functions --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/b074dc24c5bbd60d8bf6306f152c1f8… Patch: https://github.com/kamailio/kamailio/commit/b074dc24c5bbd60d8bf6306f152c1f8… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 7fa03902929..6a232d0f668 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -117,6 +117,7 @@ static int w_sip_parse_headers(sip_msg_t *msg, char *p1, char *p2); static int fixup_set_uri(void **param, int param_no); static int fixup_free_set_uri(void **param, int param_no); static int fixup_tel2sip(void **param, int param_no); +static int fixup_free_tel2sip(void **param, int param_no); static int fixup_get_uri_param(void **param, int param_no); static int free_fixup_get_uri_param(void **param, int param_no); static int fixup_option(void **param, int param_no); @@ -143,9 +144,9 @@ static cmd_export_t cmds[] = { free_fixup_get_uri_param, REQUEST_ROUTE | LOCAL_ROUTE}, {"uri_param_rm", (cmd_function)w_uri_param_rm, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, - {"tel2sip", (cmd_function)tel2sip, 3, fixup_tel2sip, 0, + {"tel2sip", (cmd_function)tel2sip, 3, fixup_tel2sip, fixup_free_tel2sip, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, - {"tel2sip2", (cmd_function)tel2sip2, 3, fixup_tel2sip, 0, + {"tel2sip2", (cmd_function)tel2sip2, 3, fixup_tel2sip, fixup_free_tel2sip, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, {"is_uri", (cmd_function)is_uri, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, @@ -364,6 +365,17 @@ static int fixup_tel2sip(void **param, int param_no) return -1; } +static int fixup_free_tel2sip(void **param, int param_no) +{ + if((param_no == 1) || (param_no == 2)) { + fixup_free_fparam_all(param, 1); + } + if(param_no == 3) { + fixup_free_pvar_null(param, 1); + } + return 0; +} + /* */ static int fixup_get_uri_param(void **param, int param_no) {

1 0

git:master:d3e698ec: etc/kamailio.cfg: removed comment about not impleented tls_threads_mode value
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: d3e698eca5410ebd3d08a8850c2149f2d0a54119 URL: https://github.com/kamailio/kamailio/commit/d3e698eca5410ebd3d08a8850c2149f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T09:28:31+01:00 etc/kamailio.cfg: removed comment about not impleented tls_threads_mode value --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/d3e698eca5410ebd3d08a8850c2149f… Patch: https://github.com/kamailio/kamailio/commit/d3e698eca5410ebd3d08a8850c2149f… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 94c97f86628..f77ff3e3aa2 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -229,7 +229,6 @@ tls_max_connections=2048 * 0: disable threaded calls * 1: use thread executors for process#0 only * 2: no thread executors, but use atfork handler to reset thread-locals to NULL - * 3: use thread executors for all processes */ tls_threads_mode=2 #!endif

1 0

git:master:9ec3770f: core: main - tls_threads_mode set to 2 by default
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 9ec3770f88339426c95514bc35a3afc2c2b0def8 URL: https://github.com/kamailio/kamailio/commit/9ec3770f88339426c95514bc35a3afc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T09:19:33+01:00 core: main - tls_threads_mode set to 2 by default - recommended value (KSR_TLS_THREADS_MFORK) for production with latest libssl --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/9ec3770f88339426c95514bc35a3afc… Patch: https://github.com/kamailio/kamailio/commit/9ec3770f88339426c95514bc35a3afc… --- diff --git a/src/main.c b/src/main.c index ab5943e609e..1b9e599fe5c 100644 --- a/src/main.c +++ b/src/main.c @@ -343,7 +343,7 @@ int tls_disable = 0; /* tls enabled by default */ int tls_disable = 1; /* tls disabled by default */ #endif /* CORE_TLS */ /* threads execution mode for tls with libssl */ -int ksr_tls_threads_mode = KSR_TLS_THREADS_MNONE; +int ksr_tls_threads_mode = KSR_TLS_THREADS_MFORK; #endif /* USE_TLS */ #ifdef USE_SCTP int sctp_children_no = 0;

1 0

[kamailio/kamailio] Issue when disconnect ethernet and connect again (Issue #3983)
by LuyenPQ 22 Nov '24

22 Nov '24

Hi team, i got this issue when i change network connection connect and disconnect wifi or lan this is log 09-25 11:31:17.826 4510 4510 E kamailio: ERROR: <core> [core/tcp_main.c:3955]: handle_new_connect(): error while accepting connection(22): Invalid argument 09-25 11:31:22.019 4510 4510 I chatty : uid=0(root) kamailio identical 45884 lines 09-25 11:31:22.022 4510 4510 E kamailio: ERROR: <core> [core/tcp_main.c:3955]: handle_new_connect(): error while accepting connection(22): Invalid argument -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3983 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3983(a)github.com>

2 2

git:master:1189f487: siputils: add fixup_free* to exported functions
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 1189f4874ab3e7ec2c2d1389d1e6ca466c2b8785 URL: https://github.com/kamailio/kamailio/commit/1189f4874ab3e7ec2c2d1389d1e6ca4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T21:06:47+01:00 siputils: add fixup_free* to exported functions --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/1189f4874ab3e7ec2c2d1389d1e6ca4… Patch: https://github.com/kamailio/kamailio/commit/1189f4874ab3e7ec2c2d1389d1e6ca4…

1 0

git:master:d598d05c: sl: add fixup_free* to exported functions
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: d598d05cd076a0b36d63899270a9a5405f15a7b4 URL: https://github.com/kamailio/kamailio/commit/d598d05cd076a0b36d63899270a9a54… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T21:06:47+01:00 sl: add fixup_free* to exported functions --- Modified: src/modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/d598d05cd076a0b36d63899270a9a54… Patch: https://github.com/kamailio/kamailio/commit/d598d05cd076a0b36d63899270a9a54… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 945538a82c3..1f465d6e2d1 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -84,6 +84,7 @@ static int child_init(int rank); static void mod_destroy(); static int fixup_sl_reply(void **param, int param_no); static int fixup_sl_reply_mode(void **param, int param_no); +static int fixup_free_sl_reply_mode(void **param, int param_no); static int pv_get_ltt(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_ltt_name(pv_spec_p sp, str *in); @@ -98,21 +99,18 @@ static pv_export_t mod_pvs[] = { }; static cmd_export_t cmds[] = { - {"sl_send_reply", w_sl_send_reply, 2, fixup_sl_reply, 0, REQUEST_ROUTE}, - {"sl_reply", w_sl_send_reply, 2, fixup_sl_reply, 0, REQUEST_ROUTE}, - {"send_reply", w_send_reply, 2, fixup_sl_reply, 0, + {"sl_send_reply", w_sl_send_reply, 2, fixup_sl_reply, fixup_free_fparam_all, REQUEST_ROUTE}, + {"sl_reply", w_sl_send_reply, 2, fixup_sl_reply, fixup_free_fparam_all, REQUEST_ROUTE}, + {"send_reply", w_send_reply, 2, fixup_sl_reply, fixup_free_fparam_all, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, - {"send_reply_mode", (cmd_function)w_send_reply_mode, 3, - fixup_sl_reply_mode, 0, + {"send_reply_mode", (cmd_function)w_send_reply_mode, 3, fixup_sl_reply_mode, fixup_free_sl_reply_mode, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {"send_reply_error", w_send_reply_error, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {"sl_reply_error", w_sl_reply_error, 0, 0, 0, REQUEST_ROUTE}, {"sl_forward_reply", w_sl_forward_reply0, 0, 0, 0, ONREPLY_ROUTE}, - {"sl_forward_reply", w_sl_forward_reply1, 1, fixup_spve_all, 0, - ONREPLY_ROUTE}, - {"sl_forward_reply", w_sl_forward_reply2, 2, fixup_spve_all, 0, - ONREPLY_ROUTE}, + {"sl_forward_reply", w_sl_forward_reply1, 1, fixup_spve_all, fixup_free_spve_all, ONREPLY_ROUTE}, + {"sl_forward_reply", w_sl_forward_reply2, 2, fixup_spve_all, fixup_free_spve_all, ONREPLY_ROUTE}, {"bind_sl", (cmd_function)bind_sl, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -469,6 +467,16 @@ static int fixup_sl_reply_mode(void **param, int param_no) return 0; } +static int fixup_free_sl_reply_mode(void **param, int param_no) +{ + if(param_no == 1 || param_no == 3) { + fixup_free_fparam_all(param, 1); + } else { + fixup_free_fparam_all(param, param_no); + } + return 0; +} + /** * @brief forward SIP reply statelessly with different code and reason text */

1 0

git:master:73ba0266: pike: disable destroy of internal tree on mod-destroy callback
by Daniel-Constantin Mierla 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 73ba0266cf76083b51e85d877f04f4a3da67d207 URL: https://github.com/kamailio/kamailio/commit/73ba0266cf76083b51e85d877f04f4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-21T20:37:31+01:00 pike: disable destroy of internal tree on mod-destroy callback - it is safer and faster to be removed at once by core or OS when application context is destroyed --- Modified: src/modules/pike/pike.c --- Diff: https://github.com/kamailio/kamailio/commit/73ba0266cf76083b51e85d877f04f4a… Patch: https://github.com/kamailio/kamailio/commit/73ba0266cf76083b51e85d877f04f4a… --- diff --git a/src/modules/pike/pike.c b/src/modules/pike/pike.c index c256049e7d5..e4791dd2046 100644 --- a/src/modules/pike/pike.c +++ b/src/modules/pike/pike.c @@ -145,10 +145,12 @@ static int pike_init(void) void pike_exit(void) { +#if 0 /* destroy semaphore */ if(pike_timer_lock) { lock_destroy(pike_timer_lock); lock_dealloc(pike_timer_lock); + pike_timer_lock = 0; } /* empty the timer list head */ @@ -159,6 +161,9 @@ void pike_exit(void) /* destroy the IP tree */ destroy_ip_tree(); +#endif + + LM_DBG("done\n"); return; }

1 0

git:master:26d6a518: core: ppcfg - use define for size of the buffer for core defined values
by Daniel-Constantin Mierla 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 26d6a518c974cfe509d23e41fe9db6b02f357930 URL: https://github.com/kamailio/kamailio/commit/26d6a518c974cfe509d23e41fe9db6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-21T20:00:22+01:00 core: ppcfg - use define for size of the buffer for core defined values --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/26d6a518c974cfe509d23e41fe9db6b… Patch: https://github.com/kamailio/kamailio/commit/26d6a518c974cfe509d23e41fe9db6b… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 407918aca72..db574ddf769 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -290,7 +290,8 @@ void pp_ifdef_level_error(void) */ void pp_define_core(void) { - char defval[64]; +#define PP_DEFINE_COREVAL_SIZE 64 + char defval[PP_DEFINE_COREVAL_SIZE]; char *p; int n; str_list_t *sb; @@ -302,8 +303,9 @@ void pp_define_core(void) p++; } - n = snprintf(p, 64 - (int)(p - defval), "_%u", VERSIONVAL / 1000000); - if(n < 0 || n >= 64 - (int)(p - defval)) { + n = snprintf(p, PP_DEFINE_COREVAL_SIZE - (int)(p - defval), "_%u", + VERSIONVAL / 1000000); + if(n < 0 || n >= PP_DEFINE_COREVAL_SIZE - (int)(p - defval)) { LM_ERR("failed to build define token\n"); return; } @@ -313,9 +315,9 @@ void pp_define_core(void) return; } - n = snprintf(p, 64 - (int)(p - defval), "_%u_%u", VERSIONVAL / 1000000, - (VERSIONVAL % 1000000) / 1000); - if(n < 0 || n >= 64 - (int)(p - defval)) { + n = snprintf(p, PP_DEFINE_COREVAL_SIZE - (int)(p - defval), "_%u_%u", + VERSIONVAL / 1000000, (VERSIONVAL % 1000000) / 1000); + if(n < 0 || n >= PP_DEFINE_COREVAL_SIZE - (int)(p - defval)) { LM_ERR("failed to build define token\n"); return; } @@ -325,9 +327,10 @@ void pp_define_core(void) return; } - n = snprintf(p, 64 - (int)(p - defval), "_%u_%u_%u", VERSIONVAL / 1000000, - (VERSIONVAL % 1000000) / 1000, VERSIONVAL % 1000); - if(n < 0 || n >= 64 - (int)(p - defval)) { + n = snprintf(p, PP_DEFINE_COREVAL_SIZE - (int)(p - defval), "_%u_%u_%u", + VERSIONVAL / 1000000, (VERSIONVAL % 1000000) / 1000, + VERSIONVAL % 1000); + if(n < 0 || n >= PP_DEFINE_COREVAL_SIZE - (int)(p - defval)) { LM_ERR("failed to build define token\n"); return; } @@ -344,8 +347,8 @@ void pp_define_core(void) return; } - n = snprintf(defval, 64, "%u", VERSIONVAL); - if(n < 0 || n >= 64) { + n = snprintf(defval, PP_DEFINE_COREVAL_SIZE, "%u", VERSIONVAL); + if(n < 0 || n >= PP_DEFINE_COREVAL_SIZE) { LM_ERR("failed to build version define value\n"); return; }

1 0

git:master:790bf50f: slack: add fixup_free* to exported functions
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 790bf50f5ec5a08f6fa0d1bd3c2732fb1317cdd0 URL: https://github.com/kamailio/kamailio/commit/790bf50f5ec5a08f6fa0d1bd3c2732f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:43:58+01:00 slack: add fixup_free* to exported functions --- Modified: src/modules/slack/slack.c Modified: src/modules/slack/slack.h --- Diff: https://github.com/kamailio/kamailio/commit/790bf50f5ec5a08f6fa0d1bd3c2732f… Patch: https://github.com/kamailio/kamailio/commit/790bf50f5ec5a08f6fa0d1bd3c2732f… --- diff --git a/src/modules/slack/slack.c b/src/modules/slack/slack.c index 1ffcfbc1572..3835c13deff 100644 --- a/src/modules/slack/slack.c +++ b/src/modules/slack/slack.c @@ -41,7 +41,7 @@ static char *slack_icon = SLACK_DEFAULT_ICON; * Exported functions */ static cmd_export_t cmds[] = { - {"slack_send", (cmd_function)slack_send1, 1, slack_fixup, 0, ANY_ROUTE}, + {"slack_send", (cmd_function)slack_send1, 1, slack_fixup, slack_fixup_free, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -241,6 +241,20 @@ static int slack_fixup(void **param, int param_no) return slack_fixup_helper(param, param_no); } +static int slack_fixup_free(void **param, int param_no) +{ + sl_msg_t *sm; + if(param_no != 1 || param == NULL || *param == NULL) { + LM_ERR("invalid parameter number %d\n", param_no); + return E_UNSPEC; + } + + sm = *param; + pv_elem_free_all(sm->m); + pkg_free(sm); + return 0; +} + /** * send text message to slack */ diff --git a/src/modules/slack/slack.h b/src/modules/slack/slack.h index 8537cf07772..e4f02fd5fc9 100644 --- a/src/modules/slack/slack.h +++ b/src/modules/slack/slack.h @@ -55,6 +55,7 @@ static int _slack_parse_url_param(char *val); static int _slack_url_param(modparam_t type, void *val); static int slack_fixup(void **param, int param_no); +static int slack_fixup_free(void **param, int param_no); static int slack_send1(struct sip_msg *msg, char *frm, char *str2); static int slack_fixup_helper(void **param, int param_no);

1 0

git:master:9a5000ed: slack: reformat exported structures
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 9a5000edf4d57ab3ecdcf12d6473b6e876dcf1f5 URL: https://github.com/kamailio/kamailio/commit/9a5000edf4d57ab3ecdcf12d6473b6e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:35:59+01:00 slack: reformat exported structures --- Modified: src/modules/slack/slack.c --- Diff: https://github.com/kamailio/kamailio/commit/9a5000edf4d57ab3ecdcf12d6473b6e… Patch: https://github.com/kamailio/kamailio/commit/9a5000edf4d57ab3ecdcf12d6473b6e… --- diff --git a/src/modules/slack/slack.c b/src/modules/slack/slack.c index 6b886996a10..1ffcfbc1572 100644 --- a/src/modules/slack/slack.c +++ b/src/modules/slack/slack.c @@ -36,38 +36,42 @@ static char *slack_channel = SLACK_DEFAULT_CHANNEL; static char *slack_username = SLACK_DEFAULT_USERNAME; static char *slack_icon = SLACK_DEFAULT_ICON; +/* clang-format off */ /** * Exported functions */ static cmd_export_t cmds[] = { - {"slack_send", (cmd_function)slack_send1, 1, slack_fixup, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - + {"slack_send", (cmd_function)slack_send1, 1, slack_fixup, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /** * Exported parameters */ static param_export_t mod_params[] = { - {"slack_url", PARAM_STRING | PARAM_USE_FUNC, (void *)_slack_url_param}, - {"channel", PARAM_STRING, &slack_channel}, // channel starts with # - {"username", PARAM_STRING, &slack_username}, - {"icon_emoji", PARAM_STRING, &slack_icon}, {0, 0, 0}}; + {"slack_url", PARAM_STRING | PARAM_USE_FUNC, (void *)_slack_url_param}, + {"channel", PARAM_STRING, &slack_channel}, // channel starts with # + {"username", PARAM_STRING, &slack_username}, + {"icon_emoji", PARAM_STRING, &slack_icon}, + {0, 0, 0} +}; /** * Module description */ struct module_exports exports = { - "slack", /* 1 module name */ - DEFAULT_DLFLAGS, /* 2 dlopen flags */ - cmds, /* 3 exported functions */ - mod_params, /* 4 exported parameters */ - 0, /* 5 exported RPC functions */ - 0, /* 6 exported pseudo-variables */ - 0, /* 7 response function */ - mod_init, /* 8 module initialization function */ - 0, /* 9 per-child init function */ - mod_destroy /* 0 destroy function */ + "slack", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + mod_params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /** * Module init

1 0

git:master:48d4f936: sms: reformat exported structures
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 48d4f936f95ba2acfeb59211420cb2165716984a URL: https://github.com/kamailio/kamailio/commit/48d4f936f95ba2acfeb59211420cb21… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:33:00+01:00 sms: reformat exported structures --- Modified: src/modules/sms/sms.c --- Diff: https://github.com/kamailio/kamailio/commit/48d4f936f95ba2acfeb59211420cb21… Patch: https://github.com/kamailio/kamailio/commit/48d4f936f95ba2acfeb59211420cb21… --- diff --git a/src/modules/sms/sms.c b/src/modules/sms/sms.c index ea4ba7f1d98..7a4726f03dd 100644 --- a/src/modules/sms/sms.c +++ b/src/modules/sms/sms.c @@ -64,37 +64,38 @@ int *queued_msgs = 0; int use_contact = 0; int sms_report_type = NO_REPORT; - +/* clang-format off */ static cmd_export_t cmds[] = { - {"sms_send_msg_to_net", w_sms_send_msg_to_net, 1, - fixup_sms_send_msg_to_net, 0, REQUEST_ROUTE}, - {"sms_send_msg", w_sms_send_msg, 0, 0, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - - -static param_export_t params[] = {{"networks", PARAM_STRING, &networks_config}, - {"modems", PARAM_STRING, &modems_config}, - {"links", PARAM_STRING, &links_config}, - {"default_net", PARAM_STRING, &default_net_str}, - {"max_sms_parts", PARAM_INT, &max_sms_parts}, - {"domain", PARAM_STR, &_sms_domain}, - {"use_contact", PARAM_INT, &use_contact}, - {"sms_report_type", PARAM_INT, &sms_report_type}, {0, 0, 0}}; + {"sms_send_msg_to_net", w_sms_send_msg_to_net, 1, fixup_sms_send_msg_to_net, 0, REQUEST_ROUTE}, + {"sms_send_msg", w_sms_send_msg, 0, 0, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; +static param_export_t params[] = { + {"networks", PARAM_STRING, &networks_config}, + {"modems", PARAM_STRING, &modems_config}, + {"links", PARAM_STRING, &links_config}, + {"default_net", PARAM_STRING, &default_net_str}, + {"max_sms_parts", PARAM_INT, &max_sms_parts}, + {"domain", PARAM_STR, &_sms_domain}, + {"use_contact", PARAM_INT, &use_contact}, + {"sms_report_type", PARAM_INT, &sms_report_type}, + {0, 0, 0} +}; struct module_exports exports = { - "sms", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response handling function*/ - sms_init, /* module init function */ - sms_child_init, /* per-child init function */ - sms_exit /* module destroy function */ + "sms", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + sms_init, /* module init function */ + sms_child_init, /* per-child init function */ + sms_exit /* module destroy function */ }; - +/* clang-format on */ static int fixup_sms_send_msg_to_net(void **param, int param_no) {

1 0

git:master:4a9867fa: snmpstats: reformat exported structures
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 4a9867faab4e290c3953d8d9ba2d50b3908a48b5 URL: https://github.com/kamailio/kamailio/commit/4a9867faab4e290c3953d8d9ba2d50b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:32:49+01:00 snmpstats: reformat exported structures --- Modified: src/modules/snmpstats/snmpstats.c --- Diff: https://github.com/kamailio/kamailio/commit/4a9867faab4e290c3953d8d9ba2d50b… Patch: https://github.com/kamailio/kamailio/commit/4a9867faab4e290c3953d8d9ba2d50b… --- diff --git a/src/modules/snmpstats/snmpstats.c b/src/modules/snmpstats/snmpstats.c index adf25a73d0d..d17c0730d26 100644 --- a/src/modules/snmpstats/snmpstats.c +++ b/src/modules/snmpstats/snmpstats.c @@ -127,42 +127,37 @@ static int mod_child_init(int rank); * log a useful message and kill the AgentX Sub-Agent child process */ static void mod_destroy(void); +/* clang-format off */ /*! * This structure defines the SNMPStats parameters that can be configured * through the kamailio.cfg configuration file. */ static param_export_t mod_params[] = { - {"sipEntityType", PARAM_STRING | PARAM_USE_FUNC, - (void *)handleSipEntityType}, - {"MsgQueueMinorThreshold", PARAM_INT | PARAM_USE_FUNC, - (void *)set_queue_minor_threshold}, - {"MsgQueueMajorThreshold", PARAM_INT | PARAM_USE_FUNC, - (void *)set_queue_major_threshold}, - {"dlg_minor_threshold", PARAM_INT | PARAM_USE_FUNC, - (void *)set_dlg_minor_threshold}, - {"dlg_major_threshold", PARAM_INT | PARAM_USE_FUNC, - (void *)set_dlg_major_threshold}, - {"snmpgetPath", PARAM_STRING | PARAM_USE_FUNC, - (void *)set_snmpget_path}, - {"snmpCommunity", PARAM_STRING | PARAM_USE_FUNC, - (void *)set_snmp_community}, - {"snmpVersion", PARAM_STRING | PARAM_USE_FUNC, - (void *)set_snmp_version}, - {"export_registrar", PARAM_INT, &snmp_export_registrar}, {0, 0, 0}}; - + {"sipEntityType", PARAM_STRING | PARAM_USE_FUNC, (void *)handleSipEntityType}, + {"MsgQueueMinorThreshold", PARAM_INT | PARAM_USE_FUNC, (void *)set_queue_minor_threshold}, + {"MsgQueueMajorThreshold", PARAM_INT | PARAM_USE_FUNC, (void *)set_queue_major_threshold}, + {"dlg_minor_threshold", PARAM_INT | PARAM_USE_FUNC, (void *)set_dlg_minor_threshold}, + {"dlg_major_threshold", PARAM_INT | PARAM_USE_FUNC, (void *)set_dlg_major_threshold}, + {"snmpgetPath", PARAM_STRING | PARAM_USE_FUNC, (void *)set_snmpget_path}, + {"snmpCommunity", PARAM_STRING | PARAM_USE_FUNC, (void *)set_snmp_community}, + {"snmpVersion", PARAM_STRING | PARAM_USE_FUNC, (void *)set_snmp_version}, + {"export_registrar", PARAM_INT, &snmp_export_registrar}, + {0, 0, 0} +}; struct module_exports exports = { - SNMPSTATS_MODULE_NAME, /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* exported functions */ - mod_params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* reply processing function */ - mod_init, /* module init function */ - mod_child_init, /* per-child init function */ - mod_destroy /* module destroy function */ + SNMPSTATS_MODULE_NAME, /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + mod_params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + mod_child_init, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /*! * The module will fork off a child process to run an snmp command via execve().

1 0

git:master:4e88b059: speeddial: add fixup_free* to exported functions
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 4e88b0592299e69c4d20981d20a23e667268c7c0 URL: https://github.com/kamailio/kamailio/commit/4e88b0592299e69c4d20981d20a23e6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:22:38+01:00 speeddial: add fixup_free* to exported functions --- Modified: src/modules/speeddial/speeddial.c --- Diff: https://github.com/kamailio/kamailio/commit/4e88b0592299e69c4d20981d20a23e6… Patch: https://github.com/kamailio/kamailio/commit/4e88b0592299e69c4d20981d20a23e6… --- diff --git a/src/modules/speeddial/speeddial.c b/src/modules/speeddial/speeddial.c index 0b1b66523d3..cc479213a0a 100644 --- a/src/modules/speeddial/speeddial.c +++ b/src/modules/speeddial/speeddial.c @@ -66,8 +66,8 @@ db1_con_t *db_handle = 0; /* Database connection handle */ /* clang-format off */ /* Exported functions */ static cmd_export_t cmds[] = { - {"sd_lookup", (cmd_function)w_sd_lookup, 1, fixup_spve_null, 0, REQUEST_ROUTE}, - {"sd_lookup", (cmd_function)w_sd_lookup, 2, fixup_spve_spve, 0, REQUEST_ROUTE}, + {"sd_lookup", (cmd_function)w_sd_lookup, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, + {"sd_lookup", (cmd_function)w_sd_lookup, 2, fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:50e48d73: speeddial: reformat exported structures
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 50e48d73df63a002d42fc1446ac90949475276aa URL: https://github.com/kamailio/kamailio/commit/50e48d73df63a002d42fc1446ac9094… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:21:53+01:00 speeddial: reformat exported structures --- Modified: src/modules/speeddial/speeddial.c --- Diff: https://github.com/kamailio/kamailio/commit/50e48d73df63a002d42fc1446ac9094… Patch: https://github.com/kamailio/kamailio/commit/50e48d73df63a002d42fc1446ac9094… --- diff --git a/src/modules/speeddial/speeddial.c b/src/modules/speeddial/speeddial.c index 6b7252e0e33..0b1b66523d3 100644 --- a/src/modules/speeddial/speeddial.c +++ b/src/modules/speeddial/speeddial.c @@ -63,40 +63,41 @@ str dstrip_s = {NULL, 0}; db_func_t db_funcs; /* Database functions */ db1_con_t *db_handle = 0; /* Database connection handle */ - +/* clang-format off */ /* Exported functions */ -static cmd_export_t cmds[] = {{"sd_lookup", (cmd_function)w_sd_lookup, 1, - fixup_spve_null, 0, REQUEST_ROUTE}, - {"sd_lookup", (cmd_function)w_sd_lookup, 2, fixup_spve_spve, 0, - REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - +static cmd_export_t cmds[] = { + {"sd_lookup", (cmd_function)w_sd_lookup, 1, fixup_spve_null, 0, REQUEST_ROUTE}, + {"sd_lookup", (cmd_function)w_sd_lookup, 2, fixup_spve_spve, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* Exported parameters */ -static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"user_column", PARAM_STR, &user_column}, - {"domain_column", PARAM_STR, &domain_column}, - {"sd_user_column", PARAM_STR, &sd_user_column}, - {"sd_domain_column", PARAM_STR, &sd_domain_column}, - {"new_uri_column", PARAM_STR, &new_uri_column}, - {"use_domain", PARAM_INT, &use_domain}, - {"domain_prefix", PARAM_STR, &domain_prefix}, {0, 0, 0}}; - +static param_export_t params[] = { + {"db_url", PARAM_STR, &db_url}, + {"user_column", PARAM_STR, &user_column}, + {"domain_column", PARAM_STR, &domain_column}, + {"sd_user_column", PARAM_STR, &sd_user_column}, + {"sd_domain_column", PARAM_STR, &sd_domain_column}, + {"new_uri_column", PARAM_STR, &new_uri_column}, + {"use_domain", PARAM_INT, &use_domain}, + {"domain_prefix", PARAM_STR, &domain_prefix}, + {0, 0, 0} +}; /* Module interface */ struct module_exports exports = { - "speeddial", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* child initialization function */ - destroy /* destroy function */ + "speeddial", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + destroy /* module destroy function */ }; - +/* clang-format on */ /** *

1 0

git:master:dce9c2a5: sqlops: reformat exported structures
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: dce9c2a572ff1f1be1e4d97ff083a1c2f0fc773c URL: https://github.com/kamailio/kamailio/commit/dce9c2a572ff1f1be1e4d97ff083a1c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:20:03+01:00 sqlops: reformat exported structures --- Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/dce9c2a572ff1f1be1e4d97ff083a1c… Patch: https://github.com/kamailio/kamailio/commit/dce9c2a572ff1f1be1e4d97ff083a1c… --- diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index 7db7303851f..fbf8c3e2b7c 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -81,53 +81,53 @@ int sqlops_log_buf_size = 128; static int sqlops_connect_mode = 0; +/* clang-format off */ static pv_export_t mod_pvs[] = { - {{"dbr", sizeof("dbr") - 1}, PVT_OTHER, pv_get_dbr, 0, - pv_parse_dbr_name, 0, 0, 0}, - {{"sqlrows", sizeof("sqlrows") - 1}, PVT_OTHER, pv_get_sqlrows, 0, - pv_parse_con_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; - -static cmd_export_t cmds[] = {{"sql_query", (cmd_function)sql_query, 3, - fixup_sql_query, 0, ANY_ROUTE}, - {"sql_query", (cmd_function)sql_query2, 2, fixup_sql_query, 0, - ANY_ROUTE}, - {"sql_query_async", (cmd_function)sql_query_async, 2, fixup_sql_query, - 0, ANY_ROUTE}, - {"sql_xquery", (cmd_function)sql_xquery, 3, fixup_sql_xquery, 0, - ANY_ROUTE}, - {"sql_pvquery", (cmd_function)sql_pvquery, 3, fixup_sql_pvquery, 0, - ANY_ROUTE}, - {"sql_result_free", (cmd_function)sql_rfree, 1, fixup_sql_rfree, 0, - ANY_ROUTE}, - {"bind_sqlops", (cmd_function)bind_sqlops, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0}}; + {{"dbr", sizeof("dbr") - 1}, PVT_OTHER, pv_get_dbr, 0, pv_parse_dbr_name, 0, 0, 0}, + {{"sqlrows", sizeof("sqlrows") - 1}, PVT_OTHER, pv_get_sqlrows, 0, pv_parse_con_name, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; + +static cmd_export_t cmds[] = { + {"sql_query", (cmd_function)sql_query, 3, fixup_sql_query, 0, ANY_ROUTE}, + {"sql_query", (cmd_function)sql_query2, 2, fixup_sql_query, 0, ANY_ROUTE}, + {"sql_query_async", (cmd_function)sql_query_async, 2, fixup_sql_query, 0, ANY_ROUTE}, + {"sql_xquery", (cmd_function)sql_xquery, 3, fixup_sql_xquery, 0, ANY_ROUTE}, + {"sql_pvquery", (cmd_function)sql_pvquery, 3, fixup_sql_pvquery, 0, ANY_ROUTE}, + {"sql_result_free", (cmd_function)sql_rfree, 1, fixup_sql_rfree, 0, ANY_ROUTE}, + {"bind_sqlops", (cmd_function)bind_sqlops, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"sqlcon", PARAM_STRING | PARAM_USE_FUNC, (void *)sql_con_param}, - {"sqlres", PARAM_STRING | PARAM_USE_FUNC, (void *)sql_res_param}, - {"tr_buf_size", PARAM_INT, &sqlops_tr_buf_size}, - {"log_buf_size", PARAM_INT, &sqlops_log_buf_size}, - {"connect_mode", PARAM_INT, &sqlops_connect_mode}, - {"results_maxsize", PARAM_INT, &sqlops_results_maxsize}, {0, 0, 0}}; + {"sqlcon", PARAM_STRING | PARAM_USE_FUNC, (void *)sql_con_param}, + {"sqlres", PARAM_STRING | PARAM_USE_FUNC, (void *)sql_res_param}, + {"tr_buf_size", PARAM_INT, &sqlops_tr_buf_size}, + {"log_buf_size", PARAM_INT, &sqlops_log_buf_size}, + {"connect_mode", PARAM_INT, &sqlops_connect_mode}, + {"results_maxsize", PARAM_INT, &sqlops_results_maxsize}, + {0, 0, 0} +}; static tr_export_t mod_trans[] = { - {{"sql", sizeof("sql") - 1}, tr_parse_sql}, {{0, 0}, 0}}; - + {{"sql", sizeof("sql") - 1}, tr_parse_sql}, + {{0, 0}, 0} +}; /** module exports */ struct module_exports exports = { - "sqlops", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported rpc functions */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - destroy /* module destroy function */ + "sqlops", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + destroy /* module destroy function */ }; +/* clang-format on */ static int mod_init(void) {

1 0

git:master:7cda9086: ss7ops: reformat exported structures
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 7cda90863c5437fab97d14772921105a169965da URL: https://github.com/kamailio/kamailio/commit/7cda90863c5437fab97d14772921105… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:19:50+01:00 ss7ops: reformat exported structures --- Modified: src/modules/ss7ops/ss7ops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7cda90863c5437fab97d14772921105… Patch: https://github.com/kamailio/kamailio/commit/7cda90863c5437fab97d14772921105… --- diff --git a/src/modules/ss7ops/ss7ops_mod.c b/src/modules/ss7ops/ss7ops_mod.c index 8772ff56b6b..201f5129bfb 100644 --- a/src/modules/ss7ops/ss7ops_mod.c +++ b/src/modules/ss7ops/ss7ops_mod.c @@ -67,15 +67,6 @@ static int w_isup_to_json(struct sip_msg *_m, char *param1, char *param2); static int pv_get_isup(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_isup_name(pv_spec_p sp, str *in); -static cmd_export_t cmds[] = { - {"isup_to_json", (cmd_function)w_isup_to_json, 1, 0, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static pv_export_t mod_pvs[] = { - {{"isup", sizeof("isup") - 1}, PVT_OTHER, pv_get_isup, 0, - pv_parse_isup_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; - static int mod_init(void) { LM_DBG("ss7 module\n"); @@ -87,18 +78,30 @@ static void destroy(void) LM_DBG("Destroying ss7 module\n"); } +/* clang-format off */ +static cmd_export_t cmds[] = { + {"isup_to_json", (cmd_function)w_isup_to_json, 1, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; + +static pv_export_t mod_pvs[] = { + {{"isup", sizeof("isup") - 1}, PVT_OTHER, pv_get_isup, 0, pv_parse_isup_name, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; + struct module_exports exports = { - "ss7", /*!< module name */ - DEFAULT_DLFLAGS, /*!< dlopen flags */ - cmds, /*!< exported functions */ - 0, /*!< exported parameters */ - 0, /*!< exported rpc functions */ - mod_pvs, /*!< exported pseudo-variables */ - 0, /*!< response handling function */ - mod_init, /*!< module init function */ - 0, /*!< child init function */ - destroy /*!< module destroy function */ + "ss7", /*!< module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + 0, /* exported parameters */ + 0, /* exported rpc functions */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + destroy /* module destroy function */ }; +/* clang-format on */ static const uint8_t *extract_from_m2ua(const uint8_t *data, size_t *len) {

1 0

git:master:2187dcea: sst: reformat exported structures
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 2187dceadca36e443b8830cca15781d92aa13382 URL: https://github.com/kamailio/kamailio/commit/2187dceadca36e443b8830cca15781d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:09:08+01:00 sst: reformat exported structures --- Modified: src/modules/sst/sst.c --- Diff: https://github.com/kamailio/kamailio/commit/2187dceadca36e443b8830cca15781d… Patch: https://github.com/kamailio/kamailio/commit/2187dceadca36e443b8830cca15781d… --- diff --git a/src/modules/sst/sst.c b/src/modules/sst/sst.c index e52081953b6..f725bd127f8 100644 --- a/src/modules/sst/sst.c +++ b/src/modules/sst/sst.c @@ -97,43 +97,50 @@ static int sst_flag = -1; struct dlg_binds dialog_st; struct dlg_binds *dlg_binds = &dialog_st; +/* clang-format off */ /* * Script commands we export. */ -static cmd_export_t cmds[] = {{"sstCheckMin", (cmd_function)sst_check_min, 1, 0, - 0, REQUEST_ROUTE | ONREPLY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +static cmd_export_t cmds[] = { + {"sstCheckMin", (cmd_function)sst_check_min, 1, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* * Script parameters */ static param_export_t mod_params[] = { - {"enable_stats", PARAM_INT, &sst_enable_stats}, - {"min_se", PARAM_INT, &sst_minSE}, - {"timeout_avp", PARAM_STRING, &timeout_spec}, - {"reject_to_small", PARAM_INT, &sst_reject}, - {"sst_flag", PARAM_INT, &sst_flag}, {0, 0, 0}}; + {"enable_stats", PARAM_INT, &sst_enable_stats}, + {"min_se", PARAM_INT, &sst_minSE}, + {"timeout_avp", PARAM_STRING, &timeout_spec}, + {"reject_to_small", PARAM_INT, &sst_reject}, + {"sst_flag", PARAM_INT, &sst_flag}, + {0, 0, 0} +}; #ifdef STATISTICS /* * Export the statistics we have */ static stat_export_t mod_stats[] = { - {"expired_sst", 0, &expired_sst}, {0, 0, 0}}; + {"expired_sst", 0, &expired_sst}, + {0, 0, 0} +}; #endif /* STATISTICS */ struct module_exports exports = { - "sst", /* module's name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - mod_params, /* param exports */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* reply processing function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* Destroy function */ + "sst", /* module's name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + mod_params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /** * The initialization function, called when the module is loaded by

1 0

git:master:b41ff44d: statistics: reformat exported structures
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: b41ff44d27968d07d926ecd4de249f0e8a51ddd7 URL: https://github.com/kamailio/kamailio/commit/b41ff44d27968d07d926ecd4de249f0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:09:07+01:00 statistics: reformat exported structures --- Modified: src/modules/statistics/statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/b41ff44d27968d07d926ecd4de249f0… Patch: https://github.com/kamailio/kamailio/commit/b41ff44d27968d07d926ecd4de249f0… --- diff --git a/src/modules/statistics/statistics.c b/src/modules/statistics/statistics.c index 30e0afd4bde..1800a275259 100644 --- a/src/modules/statistics/statistics.c +++ b/src/modules/statistics/statistics.c @@ -64,32 +64,32 @@ struct long_or_pv pv_spec_t *pv; }; - -static cmd_export_t cmds[] = {{"update_stat", (cmd_function)w_update_stat, 2, - fixup_stat, 0, ANY_ROUTE}, - {"reset_stat", (cmd_function)w_reset_stat, 1, fixup_stat, 0, - REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE - | LOCAL_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"update_stat", (cmd_function)w_update_stat, 2, fixup_stat, 0, ANY_ROUTE}, + {"reset_stat", (cmd_function)w_reset_stat, 1, fixup_stat, 0, + REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | LOCAL_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t mod_params[] = { - {"variable", PARAM_STRING | PARAM_USE_FUNC, (void *)reg_param_stat}, - {0, 0, 0}}; - + {"variable", PARAM_STRING | PARAM_USE_FUNC, (void *)reg_param_stat}, + {0, 0, 0} +}; struct module_exports exports = { - "statistics", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - mod_params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* reply processing function */ - mod_init, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "statistics", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + mod_params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; - +/* clang-format on */ static int reg_param_stat(modparam_t type, void *val) {

1 0

git:master:e3af304a: statsc: reformat exported structures
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: e3af304a0284302d68fd4b3206a93c8e00999b4b URL: https://github.com/kamailio/kamailio/commit/e3af304a0284302d68fd4b3206a93c8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:09:07+01:00 statsc: reformat exported structures --- Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e3af304a0284302d68fd4b3206a93c8… Patch: https://github.com/kamailio/kamailio/commit/e3af304a0284302d68fd4b3206a93c8… --- diff --git a/src/modules/statsc/statsc_mod.c b/src/modules/statsc/statsc_mod.c index 8800018487f..bd16bfe23f2 100644 --- a/src/modules/statsc/statsc_mod.c +++ b/src/modules/statsc/statsc_mod.c @@ -52,29 +52,32 @@ static int child_init(int); static void mod_destroy(void); static int w_statsc_reset(sip_msg_t *msg, char *p1, char *p2); - +/* clang-format off */ static cmd_export_t cmds[] = { - {"statsc_reset", (cmd_function)w_statsc_reset, 0, 0, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"statsc_reset", (cmd_function)w_statsc_reset, 0, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"track", PARAM_STRING | PARAM_USE_FUNC, (void *)statsc_track_param}, - {"interval", PARAM_INT, &statsc_interval}, - {"items", PARAM_INT, &statsc_items}, {0, 0, 0}}; + {"track", PARAM_STRING | PARAM_USE_FUNC, (void *)statsc_track_param}, + {"interval", PARAM_INT, &statsc_interval}, + {"items", PARAM_INT, &statsc_items}, + {0, 0, 0} +}; struct module_exports exports = { - "statsc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd exports */ - params, /* param exports */ - 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "statsc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + mod_destroy /* module destroy function */ }; - +/* clang-format on */ typedef struct statsc_nmap {

1 0

git:master:ee12cb5a: stun: reformat exported structures
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: ee12cb5a87f67ab32a219c1bc3a0b877dfc334a7 URL: https://github.com/kamailio/kamailio/commit/ee12cb5a87f67ab32a219c1bc3a0b87… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:09:07+01:00 stun: reformat exported structures --- Modified: src/modules/stun/stun_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ee12cb5a87f67ab32a219c1bc3a0b87… Patch: https://github.com/kamailio/kamailio/commit/ee12cb5a87f67ab32a219c1bc3a0b87… --- diff --git a/src/modules/stun/stun_mod.c b/src/modules/stun/stun_mod.c index f347f9117c7..efba758fcb6 100644 --- a/src/modules/stun/stun_mod.c +++ b/src/modules/stun/stun_mod.c @@ -36,18 +36,20 @@ MODULE_VERSION static int mod_init(void); static int stun_msg_receive(sr_event_param_t *evp); +/* clang-format off */ struct module_exports exports = { - "stun", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* exported functions */ - 0, /* exported parameters */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - 0, /* per-child initialization function */ - 0 /* destroy function */ + "stun", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + 0, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ static int mod_init(void) {

1 0

git:master:2edf111e: systemdops: reformat exported structures
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 2edf111e73c6a8a640d932c42cfc59ab14dd74b2 URL: https://github.com/kamailio/kamailio/commit/2edf111e73c6a8a640d932c42cfc59a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:09:07+01:00 systemdops: reformat exported structures --- Modified: src/modules/systemdops/systemdops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2edf111e73c6a8a640d932c42cfc59a… Patch: https://github.com/kamailio/kamailio/commit/2edf111e73c6a8a640d932c42cfc59a… --- diff --git a/src/modules/systemdops/systemdops_mod.c b/src/modules/systemdops/systemdops_mod.c index dca86bd5087..d3d4b93eb60 100644 --- a/src/modules/systemdops/systemdops_mod.c +++ b/src/modules/systemdops/systemdops_mod.c @@ -34,18 +34,20 @@ MODULE_VERSION +/* clang-format off */ struct module_exports exports = { - "systemdops", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* cmd (cfg function) exports */ - 0, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - 0, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "systemdops", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + 0, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + 0, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /** *

1 0

git:master:00d95171: textops: reformat exported structures
by Victor Seva 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 00d95171dd15fbbe541027a64d08c32ef55dc605 URL: https://github.com/kamailio/kamailio/commit/00d95171dd15fbbe541027a64d08c32… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-21T19:09:07+01:00 textops: reformat exported structures --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/00d95171dd15fbbe541027a64d08c32… Patch: https://github.com/kamailio/kamailio/commit/00d95171dd15fbbe541027a64d08c32…

1 0

git:master:98f0a2c8: permissions: disable destroy of internal hash tables on mod-destroy callback
by Daniel-Constantin Mierla 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 98f0a2c8b17bcf0f54a183589c2b61a8fd47081f URL: https://github.com/kamailio/kamailio/commit/98f0a2c8b17bcf0f54a183589c2b61a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-21T18:58:16+01:00 permissions: disable destroy of internal hash tables on mod-destroy callback - it is safer and faster to be removed at once by core or OS when application context is destroyed --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/98f0a2c8b17bcf0f54a183589c2b61a… Patch: https://github.com/kamailio/kamailio/commit/98f0a2c8b17bcf0f54a183589c2b61a… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index ae1a5bc76ec..96b2b85b4be 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -746,9 +746,11 @@ static void mod_exit(void) pkg_free(perm_deny[i].filename); } +#if 0 clean_trusted(); clean_addresses(); +#endif }

1 0

git:master:cb029e9b: dialplan: disable destroy of internal hash tables on mod-destroy callback
by Daniel-Constantin Mierla 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: cb029e9b279fa4deaa186eae994fe2b2c9a1a38c URL: https://github.com/kamailio/kamailio/commit/cb029e9b279fa4deaa186eae994fe2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-21T18:54:58+01:00 dialplan: disable destroy of internal hash tables on mod-destroy callback - it is safer and faster to be removed at once by core or OS when application context is destroyed --- Modified: src/modules/dialplan/dp_db.c --- Diff: https://github.com/kamailio/kamailio/commit/cb029e9b279fa4deaa186eae994fe2b… Patch: https://github.com/kamailio/kamailio/commit/cb029e9b279fa4deaa186eae994fe2b… --- diff --git a/src/modules/dialplan/dp_db.c b/src/modules/dialplan/dp_db.c index 64d2a4f3b12..19a30d5194f 100644 --- a/src/modules/dialplan/dp_db.c +++ b/src/modules/dialplan/dp_db.c @@ -257,15 +257,19 @@ void destroy_data(void) pcre2_general_context_free(dpl_gctx); } +#if 0 + /* let shm-free be done all-at-once by process shutdown */ if(dp_rules_hash) { destroy_hash(0); destroy_hash(1); shm_free(dp_rules_hash); dp_rules_hash = 0; } +#endif - if(dp_crt_idx) + if(dp_crt_idx) { shm_free(dp_crt_idx); + } }

1 0

git:master:81450df0: core: use defines for tls threads mode values
by Daniel-Constantin Mierla 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 81450df0c1b247bbd7582c47e00f358f8e20317c URL: https://github.com/kamailio/kamailio/commit/81450df0c1b247bbd7582c47e00f358… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-21T16:55:45+01:00 core: use defines for tls threads mode values --- Modified: src/core/globals.h Modified: src/core/rthreads.h Modified: src/main.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/81450df0c1b247bbd7582c47e00f358… Patch: https://github.com/kamailio/kamailio/commit/81450df0c1b247bbd7582c47e00f358…

1 0

git:master:0583ae7f: modules: readme files regenerated - sqlops ... [skip ci]
by Kamailio Dev 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 0583ae7f70d3a88b21f826033052753fb02b48f8 URL: https://github.com/kamailio/kamailio/commit/0583ae7f70d3a88b21f826033052753… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-21T14:01:10+01:00 modules: readme files regenerated - sqlops ... [skip ci] --- Modified: src/modules/sqlops/README --- Diff: https://github.com/kamailio/kamailio/commit/0583ae7f70d3a88b21f826033052753… Patch: https://github.com/kamailio/kamailio/commit/0583ae7f70d3a88b21f826033052753… --- diff --git a/src/modules/sqlops/README b/src/modules/sqlops/README index d55fab0e081..e6b91d07f53 100644 --- a/src/modules/sqlops/README +++ b/src/modules/sqlops/README @@ -209,10 +209,12 @@ modparam("sqlops", "log_buf_size", 4096) 3.5. connect_mode (int) - Control how the module will connect to database. Values: 0 - connect at - start up or fail 1 - connect at start up but continue even if - connecting to database server fails 2 - do not connect until needed - (this will limit the amount of idle connections) + Control how the module will connect to database. Values: + * 0 connect at start up or fail + * 1 connect at start up but continue even if connecting to database + server fails + * 2 do not connect until needed (this will limit the amount of idle + connections) Default value is 0.

1 0

[kamailio/kamailio] sqlops: new connect mode documentation update (PR #4032)
by Julien Chavanton 21 Nov '24

21 Nov '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 - [x] Documentation You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4032 -- Commit Summary -- * sqlops: new connect mode documentation update -- File Changes -- M src/modules/sqlops/doc/sqlops_admin.xml (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4032.patch https://github.com/kamailio/kamailio/pull/4032.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4032 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4032(a)github.com>

1 1

git:master:378e857a: sqlops: new connect mode documentation update (#4032)
by GitHub 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 378e857aa4eb17fe454b0f96fd4cd0200d31caf4 URL: https://github.com/kamailio/kamailio/commit/378e857aa4eb17fe454b0f96fd4cd02… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2024-11-21T07:53:11-05:00 sqlops: new connect mode documentation update (#4032) --- Modified: src/modules/sqlops/doc/sqlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/378e857aa4eb17fe454b0f96fd4cd02… Patch: https://github.com/kamailio/kamailio/commit/378e857aa4eb17fe454b0f96fd4cd02… --- diff --git a/src/modules/sqlops/doc/sqlops_admin.xml b/src/modules/sqlops/doc/sqlops_admin.xml index beccbcab6dd..70cfe569253 100644 --- a/src/modules/sqlops/doc/sqlops_admin.xml +++ b/src/modules/sqlops/doc/sqlops_admin.xml @@ -221,10 +221,24 @@ modparam("sqlops", "log_buf_size", 4096) <para> Control how the module will connect to database. Values: - 0 - connect at start up or fail - 1 - connect at start up but continue even if connecting to database server fails - 2 - do not connect until needed (this will limit the amount of idle connections) </para> + <itemizedlist> + <listitem> + <para> + <emphasis>0</emphasis> connect at start up or fail + </para> + </listitem> + <listitem> + <para> + <emphasis>1</emphasis> connect at start up but continue even if connecting to database server fails + </para> + </listitem> + <listitem> + <para> + <emphasis>2</emphasis> do not connect until needed (this will limit the amount of idle connections) + </para> + </listitem> + </itemizedlist> <para> <emphasis> Default value is 0.

1 0

git:master:05c72399: ims_registrar_scscf: add fixup_free* to exported functions
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 05c7239986d659b5e14b7aa5d81d9faebb0f9b22 URL: https://github.com/kamailio/kamailio/commit/05c7239986d659b5e14b7aa5d81d9fa… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T10:05:27+01:00 ims_registrar_scscf: add fixup_free* to exported functions --- Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/05c7239986d659b5e14b7aa5d81d9fa… Patch: https://github.com/kamailio/kamailio/commit/05c7239986d659b5e14b7aa5d81d9fa…

1 0

git:master:e5d3aa1e: ims_registrar_pcscf: reformat exported structures
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: e5d3aa1ea04ff7f49deee8f8385a2557f52e41e8 URL: https://github.com/kamailio/kamailio/commit/e5d3aa1ea04ff7f49deee8f8385a255… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T09:48:23+01:00 ims_registrar_pcscf: reformat exported structures --- Modified: src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e5d3aa1ea04ff7f49deee8f8385a255… Patch: https://github.com/kamailio/kamailio/commit/e5d3aa1ea04ff7f49deee8f8385a255…

1 0

git:master:ca5c11af: ims_qos: add fixup_free* to exported functions
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: ca5c11afb53ef089b852fc1406bce40fb29d334b URL: https://github.com/kamailio/kamailio/commit/ca5c11afb53ef089b852fc1406bce40… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T09:37:04+01:00 ims_qos: add fixup_free* to exported functions --- Modified: src/modules/ims_qos/ims_qos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ca5c11afb53ef089b852fc1406bce40… Patch: https://github.com/kamailio/kamailio/commit/ca5c11afb53ef089b852fc1406bce40…

1 0

git:master:2ed7a0e6: ims_icscf: fix exported functions
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 2ed7a0e6fb8ee9a0ded9e13e6e7766075eed89da URL: https://github.com/kamailio/kamailio/commit/2ed7a0e6fb8ee9a0ded9e13e6e77660… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T09:22:24+01:00 ims_icscf: fix exported functions --- Modified: src/modules/ims_icscf/ims_icscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2ed7a0e6fb8ee9a0ded9e13e6e77660… Patch: https://github.com/kamailio/kamailio/commit/2ed7a0e6fb8ee9a0ded9e13e6e77660… --- diff --git a/src/modules/ims_icscf/ims_icscf_mod.c b/src/modules/ims_icscf/ims_icscf_mod.c index 0896f8e141c..126afa485e2 100644 --- a/src/modules/ims_icscf/ims_icscf_mod.c +++ b/src/modules/ims_icscf/ims_icscf_mod.c @@ -119,9 +119,9 @@ static int fixup_free_uar_lir(void **param, int param_no); /* clang-format off */ static cmd_export_t cmds[] = { {"I_perform_user_authorization_request", (cmd_function)I_perform_user_authorization_request, 2, - fixup_uar_lir, fixup_fee_uar_lir, REQUEST_ROUTE}, + fixup_uar_lir, fixup_free_uar_lir, REQUEST_ROUTE}, {"I_perform_location_information_request",(cmd_function)I_perform_location_information_request, 2, - fixup_uar_lir, fixup_fee_uar_lir, REQUEST_ROUTE}, + fixup_uar_lir, fixup_free_uar_lir, REQUEST_ROUTE}, {"I_scscf_select", (cmd_function)I_scscf_select, 1, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, {"I_scscf_drop", (cmd_function)I_scscf_drop, 0,

1 0

git:master:bc0d1a1b: ims_ocs: add fixup_free* to exported functions
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: bc0d1a1b166a7c4eac6d4eb0652d77263db3d0a6 URL: https://github.com/kamailio/kamailio/commit/bc0d1a1b166a7c4eac6d4eb0652d772… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T09:18:45+01:00 ims_ocs: add fixup_free* to exported functions --- Modified: src/modules/ims_ocs/ims_ocs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bc0d1a1b166a7c4eac6d4eb0652d772… Patch: https://github.com/kamailio/kamailio/commit/bc0d1a1b166a7c4eac6d4eb0652d772… --- diff --git a/src/modules/ims_ocs/ims_ocs_mod.c b/src/modules/ims_ocs/ims_ocs_mod.c index 3ee4e4ab485..93af1190989 100644 --- a/src/modules/ims_ocs/ims_ocs_mod.c +++ b/src/modules/ims_ocs/ims_ocs_mod.c @@ -53,22 +53,25 @@ int event_route_ccr_term = 0; static int w_ccr_result( struct sip_msg *msg, char *result, char *grantedunits, char *final); -static cmd_export_t cmds[] = {{"ccr_result", (cmd_function)w_ccr_result, 3, - fixup_var_pve_str_12, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = {{"ccr_result", (cmd_function)w_ccr_result, 3, fixup_var_pve_str_12, fixup_free_fparam_all, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = {{0, 0, 0}}; /** module exports */ struct module_exports exports = {"ims_ocs", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* Exported functions */ - params, 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - mod_child_init, /* per-child init function */ - mod_destroy}; + cmds, /* Exported functions */ + params, 0, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + mod_child_init, /* per-child init function */ + mod_destroy +}; +/* clang-format on */ /** * init module function

1 0

git:master:645ff32f: ims_isc: reformat exported structures
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 645ff32f0e2150f69669212d2de5eb5e3efb75ce URL: https://github.com/kamailio/kamailio/commit/645ff32f0e2150f69669212d2de5eb5… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T09:15:34+01:00 ims_isc: reformat exported structures --- Modified: src/modules/ims_isc/ims_isc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/645ff32f0e2150f69669212d2de5eb5… Patch: https://github.com/kamailio/kamailio/commit/645ff32f0e2150f69669212d2de5eb5…

1 0

git:master:53945198: ims_ipsec_pcscf: add fixup_free* to exported functions
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 5394519800abb8e6ad205f614fa11fb4a3986fe9 URL: https://github.com/kamailio/kamailio/commit/5394519800abb8e6ad205f614fa11fb… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T09:08:41+01:00 ims_ipsec_pcscf: add fixup_free* to exported functions --- Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5394519800abb8e6ad205f614fa11fb… Patch: https://github.com/kamailio/kamailio/commit/5394519800abb8e6ad205f614fa11fb… --- diff --git a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c index b1e9fbe93a7..0c1097d55b3 100644 --- a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c +++ b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c @@ -68,7 +68,7 @@ static int domain_fixup(void **param, int param_no); static int save_fixup2(void **param, int param_no); static int free_uint_fixup(void **param, int param_no); static int unregister_fixup(void **param, int param_no); -static int unregister2_fixup(void **param, int param_no); +static int unregister_fixup_free(void **param, int param_no); extern int bind_ipsec_pcscf(usrloc_api_t *api); @@ -91,9 +91,9 @@ static cmd_export_t cmds[] = { {"ipsec_destroy", (cmd_function)w_destroy, 1, save_fixup2, 0, REQUEST_ROUTE | ONREPLY_ROUTE }, {"ipsec_destroy", (cmd_function)w_destroy, 2, unregister_fixup, - 0, ANY_ROUTE }, - {"ipsec_destroy_by_contact", (cmd_function)w_destroy_by_contact, 4, - unregister2_fixup, 0, ANY_ROUTE}, + unregister_fixup_free, ANY_ROUTE }, + {"ipsec_destroy_by_contact", (cmd_function)w_destroy_by_contact, 4, unregister_fixup, + unregister_fixup_free, ANY_ROUTE}, {"bind_ims_ipsec_pcscf", (cmd_function)bind_ipsec_pcscf, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -495,15 +495,14 @@ static int unregister_fixup(void **param, int param_no) } else { return fixup_spve_all(param, param_no); } - return E_CFG; } -static int unregister2_fixup(void **param, int param_no) +static int unregister_fixup_free(void **param, int param_no) { if(param_no == 1) { - return domain_fixup(param, param_no); + return 0; } else { - return fixup_spve_all(param, param_no); + return fixup_free_spve_all(param, param_no); } }

1 0

git:master:5450313f: ims_icscf: add fixup_free* to exported functions
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 5450313fb0dc2794cd160d44f9d10eb9e1c4c047 URL: https://github.com/kamailio/kamailio/commit/5450313fb0dc2794cd160d44f9d10eb… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T08:56:58+01:00 ims_icscf: add fixup_free* to exported functions --- Modified: src/modules/ims_icscf/ims_icscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5450313fb0dc2794cd160d44f9d10eb… Patch: https://github.com/kamailio/kamailio/commit/5450313fb0dc2794cd160d44f9d10eb…

1 0

git:master:5e1e3b71: ims_diameter_server: add fixup_free* to exported functions
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 5e1e3b71e7394d08c91aaa19c8d83e419a3c8419 URL: https://github.com/kamailio/kamailio/commit/5e1e3b71e7394d08c91aaa19c8d83e4… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T08:46:15+01:00 ims_diameter_server: add fixup_free* to exported functions --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/5e1e3b71e7394d08c91aaa19c8d83e4… Patch: https://github.com/kamailio/kamailio/commit/5e1e3b71e7394d08c91aaa19c8d83e4… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index a5d77bf6bea..bb0f8dc8a9f 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -71,41 +71,46 @@ static int ki_diameter_request_peer(struct sip_msg *msg, str *peer, int appid, static int ki_diameter_request_peer_async(struct sip_msg *msg, str *peer, int appid, int commandcode, str *message); +/* clang-format off */ static cmd_export_t cmds[] = { - {"diameter_request", (cmd_function)w_diameter_request, 3, - fixup_var_pve_str_12, 0, ANY_ROUTE}, - {"diameter_request", (cmd_function)w_diameter_request_peer, 4, - fixup_var_pve_str_12, 0, ANY_ROUTE}, - {"diameter_request_async", (cmd_function)w_diameter_request_async, 3, - fixup_var_pve_str_12, 0, ANY_ROUTE}, - {"diameter_request_async", (cmd_function)w_diameter_request_peer_async, - 4, fixup_var_pve_str_12, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"diameter_request", (cmd_function)w_diameter_request, 3, + fixup_var_pve_str_12, fixup_free_fparam_all, ANY_ROUTE}, + {"diameter_request", (cmd_function)w_diameter_request_peer, 4, + fixup_var_pve_str_12, fixup_free_fparam_all, ANY_ROUTE}, + {"diameter_request_async", (cmd_function)w_diameter_request_async, 3, + fixup_var_pve_str_12, fixup_free_fparam_all, ANY_ROUTE}, + {"diameter_request_async", (cmd_function)w_diameter_request_peer_async, + 4, fixup_var_pve_str_12, fixup_free_fparam_all, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = {{0, 0, 0}}; static pv_export_t mod_pvs[] = { - {{"diameter_command", sizeof("diameter_command") - 1}, PVT_OTHER, - pv_get_command, 0, 0, 0, 0, 0}, - {{"diameter_application", sizeof("diameter_application") - 1}, - PVT_OTHER, pv_get_application, 0, 0, 0, 0, 0}, - {{"diameter_request", sizeof("diameter_request") - 1}, PVT_OTHER, - pv_get_request, 0, 0, 0, 0, 0}, - {{"diameter_response", sizeof("diameter_response") - 1}, PVT_OTHER, - pv_get_response, pv_set_response, 0, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"diameter_command", sizeof("diameter_command") - 1}, PVT_OTHER, + pv_get_command, 0, 0, 0, 0, 0}, + {{"diameter_application", sizeof("diameter_application") - 1}, + PVT_OTHER, pv_get_application, 0, 0, 0, 0, 0}, + {{"diameter_request", sizeof("diameter_request") - 1}, PVT_OTHER, + pv_get_request, 0, 0, 0, 0, 0}, + {{"diameter_response", sizeof("diameter_response") - 1}, PVT_OTHER, + pv_get_response, pv_set_response, 0, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; /** module exports */ struct module_exports exports = {"ims_diameter_server", - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* Exported functions */ - params, /* exported statistics */ - 0, /* exported RPC methods */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - mod_child_init, /* per-child init function */ - mod_destroy}; + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* Exported functions */ + params, /* exported statistics */ + 0, /* exported RPC methods */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + mod_child_init, /* per-child init function */ + mod_destroy +}; +/* clang-format on */ /** * init module function

1 0

git:master:6e19534e: ims_dialog: add fixup_free* to exported functions
by Federico Cabiddu 21 Nov '24

21 Nov '24

Module: kamailio Branch: master Commit: 6e19534e9790188f0db8009170d05f1bd77b5ca5 URL: https://github.com/kamailio/kamailio/commit/6e19534e9790188f0db8009170d05f1… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-21T08:40:58+01:00 ims_dialog: add fixup_free* to exported functions --- Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/6e19534e9790188f0db8009170d05f1… Patch: https://github.com/kamailio/kamailio/commit/6e19534e9790188f0db8009170d05f1…

1 0

git:master:35dcb1d7: db_cassandra: relocated to archive
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 35dcb1d7852282417a11c7771189e50734c0883b URL: https://github.com/kamailio/kamailio/commit/35dcb1d7852282417a11c7771189e50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T18:36:36+01:00 db_cassandra: relocated to archive - new location: https://github.com/kamailio/kamailio-archive --- Removed: src/modules/db_cassandra/Cassandra.cpp Removed: src/modules/db_cassandra/Cassandra.h Removed: src/modules/db_cassandra/Makefile Removed: src/modules/db_cassandra/README Removed: src/modules/db_cassandra/cassandra_constants.cpp Removed: src/modules/db_cassandra/cassandra_constants.h Removed: src/modules/db_cassandra/cassandra_types.cpp Removed: src/modules/db_cassandra/cassandra_types.h Removed: src/modules/db_cassandra/db_cassandra.c Removed: src/modules/db_cassandra/dbcassa_base.cpp Removed: src/modules/db_cassandra/dbcassa_base.h Removed: src/modules/db_cassandra/dbcassa_table.c Removed: src/modules/db_cassandra/dbcassa_table.h Removed: src/modules/db_cassandra/doc/Makefile Removed: src/modules/db_cassandra/doc/db_cassandra.xml Removed: src/modules/db_cassandra/doc/db_cassandra_admin.xml Removed: src/modules/db_cassandra/kamailio_cassa.cfg --- Diff: https://github.com/kamailio/kamailio/commit/35dcb1d7852282417a11c7771189e50… Patch: https://github.com/kamailio/kamailio/commit/35dcb1d7852282417a11c7771189e50…

1 0

git:master:7215f255: modules: readme files regenerated - sqlops ... [skip ci]
by Kamailio Dev 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 7215f2554e3c2551870902fd061f20d5a4160bca URL: https://github.com/kamailio/kamailio/commit/7215f2554e3c2551870902fd061f20d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-20T18:31:10+01:00 modules: readme files regenerated - sqlops ... [skip ci] --- Modified: src/modules/sqlops/README --- Diff: https://github.com/kamailio/kamailio/commit/7215f2554e3c2551870902fd061f20d… Patch: https://github.com/kamailio/kamailio/commit/7215f2554e3c2551870902fd061f20d… --- diff --git a/src/modules/sqlops/README b/src/modules/sqlops/README index e8b7b072fc6..d55fab0e081 100644 --- a/src/modules/sqlops/README +++ b/src/modules/sqlops/README @@ -209,9 +209,10 @@ modparam("sqlops", "log_buf_size", 4096) 3.5. connect_mode (int) - Control if the module must stop loading when connecting to database - server fails during start up. Values: 0 - stop loading; 1 - continue - even if connecting to database server fails. + Control how the module will connect to database. Values: 0 - connect at + start up or fail 1 - connect at start up but continue even if + connecting to database server fails 2 - do not connect until needed + (this will limit the amount of idle connections) Default value is 0.

1 0

[kamailio/kamailio] sqlops: new connect mode to limit the amount of connections (PR #4027)
by Julien Chavanton 20 Nov '24

20 Nov '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 - [x] New feature (non-breaking change which adds new functionality) #### Checklist:  - [x] Tested changes locally #### Description  Very often I only need one connection from a worker process, to cache fill provisioning data to Kamailio. This new sqlops connect mode will reduce the amount of idle connection to the database server significantly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4027 -- Commit Summary -- * sqlops: new connect mode to limit the amount of connections -- File Changes -- M src/modules/sqlops/doc/sqlops_admin.xml (8) M src/modules/sqlops/sql_api.c (5) M src/modules/sqlops/sqlops.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4027.patch https://github.com/kamailio/kamailio/pull/4027.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4027 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4027(a)github.com>

3 7

git:master:a4175247: sqlops: new connect mode to limit the amount of connections (#4027)
by GitHub 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: a41752478201b2235f60b2f22e5d3c4113742b33 URL: https://github.com/kamailio/kamailio/commit/a41752478201b2235f60b2f22e5d3c4… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2024-11-20T12:30:20-05:00 sqlops: new connect mode to limit the amount of connections (#4027) --- Modified: src/modules/sqlops/doc/sqlops_admin.xml Modified: src/modules/sqlops/sql_api.c Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/a41752478201b2235f60b2f22e5d3c4… Patch: https://github.com/kamailio/kamailio/commit/a41752478201b2235f60b2f22e5d3c4…

1 0

git:master:1d83950e: pipelimit: remove destroy of internal structures on mod-destroy callback
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 1d83950eb3f0eba21b2ade1d1c5565b1ef95c1d1 URL: https://github.com/kamailio/kamailio/commit/1d83950eb3f0eba21b2ade1d1c5565b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T17:41:22+01:00 pipelimit: remove destroy of internal structures on mod-destroy callback - it is safer and faster to be removed at once by core or OS when application context is destroyed --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/1d83950eb3f0eba21b2ade1d1c5565b… Patch: https://github.com/kamailio/kamailio/commit/1d83950eb3f0eba21b2ade1d1c5565b… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index 27b247e49c3..a632a4cda51 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -433,45 +433,7 @@ static int mod_init(void) static void destroy(void) { - pl_destroy_htable(); - - if(network_load_value) { - shm_free(network_load_value); - network_load_value = NULL; - } - if(load_value) { - shm_free(load_value); - load_value = NULL; - } - if(load_source) { - shm_free(load_source); - load_source = NULL; - } - if(pid_kp) { - shm_free(pid_kp); - pid_kp = NULL; - } - if(pid_ki) { - shm_free(pid_ki); - pid_ki = NULL; - } - if(pid_kd) { - shm_free(pid_kd); - pid_kd = NULL; - } - if(_pl_pid_setpoint) { - shm_free(_pl_pid_setpoint); - _pl_pid_setpoint = NULL; - } - if(drop_rate) { - shm_free(drop_rate); - drop_rate = NULL; - } - - if(pl_timer) { - timer_free(pl_timer); - pl_timer = NULL; - } + LM_DBG("done"); }

1 0

git:master:6f6504dd: mtree: remove destroy of internal structures on mod-destroy callback
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 6f6504dd6091d0493a8401b4e71ceea98ad5f6ca URL: https://github.com/kamailio/kamailio/commit/6f6504dd6091d0493a8401b4e71ceea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T17:16:11+01:00 mtree: remove destroy of internal structures on mod-destroy callback - it is safer and faster to be removed at once by core or OS when application context is destroyed --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6f6504dd6091d0493a8401b4e71ceea… Patch: https://github.com/kamailio/kamailio/commit/6f6504dd6091d0493a8401b4e71ceea… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 99cd5337bc3..881fd36bf4b 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -312,15 +312,6 @@ static int child_init(int rank) static void mod_destroy(void) { LM_DBG("cleaning up\n"); - mt_destroy_trees(); - if(db_con != NULL && mt_dbf.close != NULL) - mt_dbf.close(db_con); - /* destroy lock */ - if(mt_lock) { - lock_destroy(mt_lock); - lock_dealloc(mt_lock); - mt_lock = 0; - } } static int fixup_mt_match(void **param, int param_no)

1 0

git:master:d984ba4a: pv: reset buf.s to avoid double free on error for pv_set_xto_attr()
by Daniel-Constantin Mierla 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: d984ba4a6b9cc57e7084a87ca617a9d377659d25 URL: https://github.com/kamailio/kamailio/commit/d984ba4a6b9cc57e7084a87ca617a9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-20T17:01:21+01:00 pv: reset buf.s to avoid double free on error for pv_set_xto_attr() --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/d984ba4a6b9cc57e7084a87ca617a9d… Patch: https://github.com/kamailio/kamailio/commit/d984ba4a6b9cc57e7084a87ca617a9d… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 1054a6ae57b..3eeba112324 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3788,8 +3788,10 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, goto error; } } else { - if(buf.s != 0) + if(buf.s != 0) { pkg_free(buf.s); + buf.s = NULL; + } } if(llen_uri > 0) { @@ -3805,8 +3807,9 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, goto error; } } else { - if(buf_uri.s != 0) + if(buf_uri.s != 0) { pkg_free(buf_uri.s); + } } return 0;

1 0

git:master:8cf59e2b: textopsx: add fixup_free* to exported functions
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 8cf59e2bd1f9bb60d68b52f175df5dad9c34b533 URL: https://github.com/kamailio/kamailio/commit/8cf59e2bd1f9bb60d68b52f175df5da… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T16:07:21+01:00 textopsx: add fixup_free* to exported functions --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/8cf59e2bd1f9bb60d68b52f175df5da… Patch: https://github.com/kamailio/kamailio/commit/8cf59e2bd1f9bb60d68b52f175df5da… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 8982924296a..4f6944816c3 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -128,12 +128,12 @@ static cmd_export_t cmds[] = { {"msg_set_buffer", (cmd_function)msg_set_buffer_f, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | ONREPLY_ROUTE}, {"change_reply_status", change_reply_status_f, 2, - change_reply_status_fixup, 0, ONREPLY_ROUTE}, + change_reply_status_fixup, fixup_free_fparam_all, ONREPLY_ROUTE}, {"change_reply_status_code", change_reply_status_code_f, 1, - fixup_igp_null, 0, ONREPLY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ONREPLY_ROUTE}, {"remove_body", (cmd_function)w_remove_body_f, 0, 0, 0, ANY_ROUTE}, - {"keep_hf", (cmd_function)w_keep_hf_f, 0, fixup_regexp_null, 0, ANY_ROUTE}, - {"keep_hf", (cmd_function)w_keep_hf_f, 1, fixup_regexp_null, 0, ANY_ROUTE}, + {"keep_hf", (cmd_function)w_keep_hf_f, 0, fixup_regexp_null, fixup_free_regexp_null, ANY_ROUTE}, + {"keep_hf", (cmd_function)w_keep_hf_f, 1, fixup_regexp_null, fixup_free_regexp_null, ANY_ROUTE}, {"fnmatch", (cmd_function)w_fnmatch2_f, 2, fixup_fnmatch, 0, ANY_ROUTE}, {"fnmatch", (cmd_function)w_fnmatch3_f, 3, fixup_fnmatch, 0, ANY_ROUTE}, {"append_hf_value", insupddel_hf_value_f, 2, append_hf_value_fixup, 0,

1 0

git:master:55216ee0: tsilo: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 55216ee07d5904adc6e9b9750c5b78c9cf100fcf URL: https://github.com/kamailio/kamailio/commit/55216ee07d5904adc6e9b9750c5b78c… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T15:31:40+01:00 tsilo: add fixup_free* to exported functions --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/55216ee07d5904adc6e9b9750c5b78c… Patch: https://github.com/kamailio/kamailio/commit/55216ee07d5904adc6e9b9750c5b78c… --- diff --git a/src/modules/tsilo/tsilo.c b/src/modules/tsilo/tsilo.c index 719f7cb0f3a..5d290485227 100644 --- a/src/modules/tsilo/tsilo.c +++ b/src/modules/tsilo/tsilo.c @@ -62,14 +62,15 @@ static int w_ts_append_to(struct sip_msg *msg, char *idx, char *lbl, char *d); static int w_ts_append_to2( struct sip_msg *msg, char *idx, char *lbl, char *d, char *ruri); static int fixup_ts_append_to(void **param, int param_no); +static int fixup_free_ts_append_to(void **param, int param_no); static int w_ts_append(struct sip_msg *_msg, char *_table, char *_ruri); static int fixup_ts_append(void **param, int param_no); +static int fixup_free_ts_append(void **param, int param_no); static int w_ts_append_by_contact2( struct sip_msg *_msg, char *_table, char *_ruri); static int w_ts_append_by_contact3( struct sip_msg *_msg, char *_table, char *_ruri, char *_contact); static int w_ts_append_branches(struct sip_msg *_msg, char *_ruri, char *_p2); -static int fixup_ts_append_by_contact(void **param, int param_no); static int w_ts_store(struct sip_msg *msg, char *p1, char *p2); static int w_ts_store1(struct sip_msg *msg, char *_ruri, char *p2); @@ -81,24 +82,23 @@ stat_var *added_branches; /* clang-format off */ static cmd_export_t cmds[] = { - {"ts_append_to", (cmd_function)w_ts_append_to, 3, fixup_ts_append_to, 0, + {"ts_append_to", (cmd_function)w_ts_append_to, 3, fixup_ts_append_to, fixup_free_ts_append_to, REQUEST_ROUTE | FAILURE_ROUTE}, - {"ts_append_to", (cmd_function)w_ts_append_to2, 4, fixup_ts_append_to, - 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"ts_append", (cmd_function)w_ts_append, 2, fixup_ts_append, 0, + {"ts_append_to", (cmd_function)w_ts_append_to2, 4, fixup_ts_append_to, fixup_free_ts_append_to, REQUEST_ROUTE | FAILURE_ROUTE}, - {"ts_append_by_contact", (cmd_function)w_ts_append_by_contact2, - 2, /* for two parameters */ - fixup_ts_append_by_contact, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"ts_append_by_contact", (cmd_function)w_ts_append_by_contact3, - 3, /* for three parameters */ - fixup_ts_append_by_contact, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"ts_append_branches", (cmd_function)w_ts_append_branches, 1, - fixup_spve_null, fixup_free_spve_null, + {"ts_append", (cmd_function)w_ts_append, 2, fixup_ts_append, fixup_free_ts_append, + REQUEST_ROUTE | FAILURE_ROUTE}, + {"ts_append_by_contact", (cmd_function)w_ts_append_by_contact2, 2, fixup_ts_append, fixup_free_ts_append, + /* for two parameters */ + REQUEST_ROUTE | FAILURE_ROUTE}, + {"ts_append_by_contact", (cmd_function)w_ts_append_by_contact3, 3,fixup_ts_append, fixup_free_ts_append, + /* for three parameters */ + REQUEST_ROUTE | FAILURE_ROUTE}, + {"ts_append_branches", (cmd_function)w_ts_append_branches, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"ts_store", (cmd_function)w_ts_store, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"ts_store", (cmd_function)w_ts_store1, 1, fixup_spve_null, 0, + {"ts_store", (cmd_function)w_ts_store1, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -239,6 +239,16 @@ static int fixup_ts_append_to(void **param, int param_no) return 0; } +static int fixup_free_ts_append_to(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) { + fixup_free_igp_null(param, 1); + } else if(param_no == 4) { + fixup_free_spve_null(param, 1); + } + return 0; +} + static int fixup_ts_append(void **param, int param_no) { if(param_no == 1) { @@ -257,19 +267,11 @@ static int fixup_ts_append(void **param, int param_no) return 0; } -static int fixup_ts_append_by_contact(void **param, int param_no) +static int fixup_free_ts_append(void **param, int param_no) { - if(param_no == 1) { - if(strlen((char *)*param) <= 1 - && (*(char *)(*param) == 0 || *(char *)(*param) == '0')) { - *param = (void *)0; - LM_ERR("empty table name\n"); - return -1; - } - } if(param_no == 2 || param_no == 3) { - return fixup_spve_null(param, 1); + fixup_free_spve_null(param, 1); } return 0;

1 0

git:master:c499dac3: tmrec: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: c499dac336469de50a520adebeaa3b408791f308 URL: https://github.com/kamailio/kamailio/commit/c499dac336469de50a520adebeaa3b4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T15:22:20+01:00 tmrec: reformat exported structures --- Modified: src/modules/tmrec/tmrec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c499dac336469de50a520adebeaa3b4… Patch: https://github.com/kamailio/kamailio/commit/c499dac336469de50a520adebeaa3b4… --- diff --git a/src/modules/tmrec/tmrec_mod.c b/src/modules/tmrec/tmrec_mod.c index 298552d8db5..fb07d45eeb0 100644 --- a/src/modules/tmrec/tmrec_mod.c +++ b/src/modules/tmrec/tmrec_mod.c @@ -60,35 +60,39 @@ int tmrec_wday = 0; char tmrec_separator = '|'; char *tmrec_separator_param = NULL; -static cmd_export_t cmds[] = {{"tmrec_match", (cmd_function)w_tmrec_match, 1, - fixup_tmrec_match, 0, ANY_ROUTE}, - {"tmrec_match", (cmd_function)w_tmrec_match, 2, fixup_tmrec_match, 0, - ANY_ROUTE}, - {"is_leap_year", (cmd_function)w_is_leap_year, 0, fixup_is_leap_year, 0, - ANY_ROUTE}, - {"is_leap_year", (cmd_function)w_is_leap_year, 1, fixup_is_leap_year, 0, - ANY_ROUTE}, - {"time_period_match", (cmd_function)w_time_period_match, 1, - fixup_time_period_match, 0, ANY_ROUTE}, - {"time_period_match", (cmd_function)w_time_period_match, 2, - fixup_time_period_match, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"wday", PARAM_INT, &tmrec_wday}, - {"separator", PARAM_STRING, &tmrec_separator_param}, {0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"tmrec_match", (cmd_function)w_tmrec_match, 1, + fixup_tmrec_match, 0, ANY_ROUTE}, + {"tmrec_match", (cmd_function)w_tmrec_match, 2, fixup_tmrec_match, 0, ANY_ROUTE}, + {"is_leap_year", (cmd_function)w_is_leap_year, 0, fixup_is_leap_year, 0, ANY_ROUTE}, + {"is_leap_year", (cmd_function)w_is_leap_year, 1, fixup_is_leap_year, 0, ANY_ROUTE}, + {"time_period_match", (cmd_function)w_time_period_match, 1, + fixup_time_period_match, 0, ANY_ROUTE}, + {"time_period_match", (cmd_function)w_time_period_match, 2, + fixup_time_period_match, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; -struct module_exports exports = { - "tmrec", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module init function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ +static param_export_t params[] = { + {"wday", PARAM_INT, &tmrec_wday}, + {"separator", PARAM_STRING, &tmrec_separator_param}, + {0, 0, 0} }; +struct module_exports exports = { + "tmrec", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module init function */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ +}; +/* clang-format on */ /** * init module function

1 0

git:master:f1ce7400: tmx: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: f1ce74009aa0266207b054cdacc254bf222cd41c URL: https://github.com/kamailio/kamailio/commit/f1ce74009aa0266207b054cdacc254b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T15:19:16+01:00 tmx: reformat exported structures --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f1ce74009aa0266207b054cdacc254b… Patch: https://github.com/kamailio/kamailio/commit/f1ce74009aa0266207b054cdacc254b…

1 0

git:master:a4a1f9d1: topos_redis: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: a4a1f9d19213dcfa471b7e2accf9b05f5b1b9735 URL: https://github.com/kamailio/kamailio/commit/a4a1f9d19213dcfa471b7e2accf9b05… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T15:14:05+01:00 topos_redis: reformat exported structures --- Modified: src/modules/topos_redis/topos_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a4a1f9d19213dcfa471b7e2accf9b05… Patch: https://github.com/kamailio/kamailio/commit/a4a1f9d19213dcfa471b7e2accf9b05… --- diff --git a/src/modules/topos_redis/topos_redis_mod.c b/src/modules/topos_redis/topos_redis_mod.c index 19975cb74a3..761190f5ca7 100644 --- a/src/modules/topos_redis/topos_redis_mod.c +++ b/src/modules/topos_redis/topos_redis_mod.c @@ -47,24 +47,29 @@ topos_api_t _tps_api = {0}; ndb_redis_api_t _tps_redis_api = {0}; -static cmd_export_t cmds[] = {{0, 0, 0, 0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"serverid", PARAM_STR, &_topos_redis_serverid}, {0, 0, 0}}; + {"serverid", PARAM_STR, &_topos_redis_serverid}, + {0, 0, 0} +}; struct module_exports exports = { - "topos_redis", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "topos_redis", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ }; - +/* clang-format on */ /** *

1 0

git:master:8f4e66d3: tsilo: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 8f4e66d3617b38077a827f5ac158074cbd45207c URL: https://github.com/kamailio/kamailio/commit/8f4e66d3617b38077a827f5ac158074… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T15:11:44+01:00 tsilo: reformat exported structures --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/8f4e66d3617b38077a827f5ac158074… Patch: https://github.com/kamailio/kamailio/commit/8f4e66d3617b38077a827f5ac158074…

1 0

git:master:24961934: ims_charging: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 24961934218578d3a3e8db5e0e6d65b0a31d903a URL: https://github.com/kamailio/kamailio/commit/24961934218578d3a3e8db5e0e6d65b… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:54:59+01:00 ims_charging: add fixup_free* to exported functions --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/24961934218578d3a3e8db5e0e6d65b… Patch: https://github.com/kamailio/kamailio/commit/24961934218578d3a3e8db5e0e6d65b…

1 0

git:master:065987e8: uac_redirect: add fixup_free* to exported functions
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 065987e8c18b88aeed9b68c2e204ae4b51e56989 URL: https://github.com/kamailio/kamailio/commit/065987e8c18b88aeed9b68c2e204ae4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T14:54:04+01:00 uac_redirect: add fixup_free* to exported functions --- Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/065987e8c18b88aeed9b68c2e204ae4… Patch: https://github.com/kamailio/kamailio/commit/065987e8c18b88aeed9b68c2e204ae4… --- diff --git a/src/modules/uac_redirect/uac_redirect.c b/src/modules/uac_redirect/uac_redirect.c index 505a09ffd5b..35d7b54998f 100644 --- a/src/modules/uac_redirect/uac_redirect.c +++ b/src/modules/uac_redirect/uac_redirect.c @@ -71,14 +71,15 @@ static int w_get_redirect1(struct sip_msg *msg, char *dir, char *foo); static int w_get_redirect2(struct sip_msg *msg, char *dir, char *foo); static int regexp_compile(char *re_s, regex_t **re); static int get_redirect_fixup(void **param, int param_no); +static int get_redirect_fixup_free(void **param, int param_no); static int setf_fixup(void **param, int param_no); /* clang-format off */ static cmd_export_t cmds[] = { {"set_deny_filter", (cmd_function)w_set_deny, 2, setf_fixup, 0, FAILURE_ROUTE}, {"set_accept_filter", (cmd_function)w_set_accept, 2, setf_fixup, 0, FAILURE_ROUTE}, - {"get_redirects", (cmd_function)w_get_redirect2, 2, get_redirect_fixup, 0, FAILURE_ROUTE}, - {"get_redirects", (cmd_function)w_get_redirect1, 1, get_redirect_fixup, 0, FAILURE_ROUTE}, + {"get_redirects", (cmd_function)w_get_redirect2, 2, get_redirect_fixup, get_redirect_fixup_free, FAILURE_ROUTE}, + {"get_redirects", (cmd_function)w_get_redirect1, 1, get_redirect_fixup, get_redirect_fixup_free, FAILURE_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -177,6 +178,13 @@ static int get_redirect_fixup(void **param, int param_no) return 0; } +static int get_redirect_fixup_free(void **param, int param_no) +{ + if(param_no == 2) { + return fixup_free_spve_null(param, 1); + } + return 0; +} static int setf_fixup(void **param, int param_no) {

1 0

git:master:aaf32a47: uac_redirect: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: aaf32a472ff0729fd4230a02948ad6e4de06451c URL: https://github.com/kamailio/kamailio/commit/aaf32a472ff0729fd4230a02948ad6e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T14:49:54+01:00 uac_redirect: reformat exported structures --- Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/aaf32a472ff0729fd4230a02948ad6e… Patch: https://github.com/kamailio/kamailio/commit/aaf32a472ff0729fd4230a02948ad6e… --- diff --git a/src/modules/uac_redirect/uac_redirect.c b/src/modules/uac_redirect/uac_redirect.c index d5699a7bd48..505a09ffd5b 100644 --- a/src/modules/uac_redirect/uac_redirect.c +++ b/src/modules/uac_redirect/uac_redirect.c @@ -73,40 +73,40 @@ static int regexp_compile(char *re_s, regex_t **re); static int get_redirect_fixup(void **param, int param_no); static int setf_fixup(void **param, int param_no); +/* clang-format off */ +static cmd_export_t cmds[] = { + {"set_deny_filter", (cmd_function)w_set_deny, 2, setf_fixup, 0, FAILURE_ROUTE}, + {"set_accept_filter", (cmd_function)w_set_accept, 2, setf_fixup, 0, FAILURE_ROUTE}, + {"get_redirects", (cmd_function)w_get_redirect2, 2, get_redirect_fixup, 0, FAILURE_ROUTE}, + {"get_redirects", (cmd_function)w_get_redirect1, 1, get_redirect_fixup, 0, FAILURE_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; -static cmd_export_t cmds[] = {{"set_deny_filter", (cmd_function)w_set_deny, 2, - setf_fixup, 0, FAILURE_ROUTE}, - {"set_accept_filter", (cmd_function)w_set_accept, 2, setf_fixup, 0, - FAILURE_ROUTE}, - {"get_redirects", (cmd_function)w_get_redirect2, 2, get_redirect_fixup, - 0, FAILURE_ROUTE}, - {"get_redirects", (cmd_function)w_get_redirect1, 1, get_redirect_fixup, - 0, FAILURE_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"deny_filter", PARAM_STRING, &deny_filter_s}, - {"accept_filter", PARAM_STRING, &accept_filter_s}, - {"default_filter", PARAM_STRING, &def_filter_s}, - {"acc_function", PARAM_STR, &uacred_acc_fct_s}, - {"acc_db_table", PARAM_STR, &uacred_acc_db_table}, - {"bflags", PARAM_INT, &bflags}, - {"flags_hdr_mode", PARAM_INT, &flags_hdr_mode}, - {"q_value", PARAM_INT, &_redirect_q_value}, {0, 0, 0}}; - +static param_export_t params[] = { + {"deny_filter", PARAM_STRING, &deny_filter_s}, + {"accept_filter", PARAM_STRING, &accept_filter_s}, + {"default_filter", PARAM_STRING, &def_filter_s}, + {"acc_function", PARAM_STR, &uacred_acc_fct_s}, + {"acc_db_table", PARAM_STR, &uacred_acc_db_table}, + {"bflags", PARAM_INT, &bflags}, + {"flags_hdr_mode", PARAM_INT, &flags_hdr_mode}, + {"q_value", PARAM_INT, &_redirect_q_value}, + {0, 0, 0} +}; struct module_exports exports = { - "uac_redirect", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - redirect_init, /* module initialization function */ - child_init, /* per-child init function */ - 0 /* module destroy function */ + "uac_redirect", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported RPC functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + redirect_init, /* module initialization function */ + child_init, /* per-child init function */ + 0 /* module destroy function */ }; - +/* clang-format on */ int get_nr_max(char *s, unsigned char *max) {

1 0

git:master:96e98152: uid_auth_db: add fixup_free* to exported functions
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 96e98152faf6a47c0380a85b9fc9bd63794bbcc6 URL: https://github.com/kamailio/kamailio/commit/96e98152faf6a47c0380a85b9fc9bd6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T14:41:57+01:00 uid_auth_db: add fixup_free* to exported functions --- Modified: src/modules/uid_auth_db/uid_auth_db_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/96e98152faf6a47c0380a85b9fc9bd6… Patch: https://github.com/kamailio/kamailio/commit/96e98152faf6a47c0380a85b9fc9bd6… --- diff --git a/src/modules/uid_auth_db/uid_auth_db_mod.c b/src/modules/uid_auth_db/uid_auth_db_mod.c index 87842a04506..4bb4caeee63 100644 --- a/src/modules/uid_auth_db/uid_auth_db_mod.c +++ b/src/modules/uid_auth_db/uid_auth_db_mod.c @@ -103,10 +103,10 @@ int credentials_n; /* Number of credentials in the list */ * Exported functions */ static cmd_export_t cmds[] = { - {"www_authenticate", www_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, - {"www_authorize", www_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, - {"proxy_authenticate", proxy_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, - {"proxy_authorize", proxy_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, + {"www_authenticate", www_authenticate, 2, authdb_fixup, fixup_free_fparam_all, REQUEST_ROUTE}, + {"www_authorize", www_authenticate, 2, authdb_fixup, fixup_free_fparam_all, REQUEST_ROUTE}, + {"proxy_authenticate", proxy_authenticate, 2, authdb_fixup, fixup_free_fparam_all, REQUEST_ROUTE}, + {"proxy_authorize", proxy_authenticate, 2, authdb_fixup, fixup_free_fparam_all, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:985193bd: uid_auth_db: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 985193bd6ae93e9a6e5517bef4bb5bedba7505a3 URL: https://github.com/kamailio/kamailio/commit/985193bd6ae93e9a6e5517bef4bb5be… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T14:41:57+01:00 uid_auth_db: reformat exported structures --- Modified: src/modules/uid_auth_db/uid_auth_db_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/985193bd6ae93e9a6e5517bef4bb5be… Patch: https://github.com/kamailio/kamailio/commit/985193bd6ae93e9a6e5517bef4bb5be… --- diff --git a/src/modules/uid_auth_db/uid_auth_db_mod.c b/src/modules/uid_auth_db/uid_auth_db_mod.c index 06cb3030d94..87842a04506 100644 --- a/src/modules/uid_auth_db/uid_auth_db_mod.c +++ b/src/modules/uid_auth_db/uid_auth_db_mod.c @@ -98,51 +98,53 @@ str *credentials; /* Parsed list of credentials to load */ int credentials_n; /* Number of credentials in the list */ +/* clang-format off */ /* * Exported functions */ -static cmd_export_t cmds[] = {{"www_authenticate", www_authenticate, 2, - authdb_fixup, 0, REQUEST_ROUTE}, - {"www_authorize", www_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, - {"proxy_authenticate", proxy_authenticate, 2, authdb_fixup, 0, - REQUEST_ROUTE}, - {"proxy_authorize", proxy_authenticate, 2, authdb_fixup, 0, - REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - +static cmd_export_t cmds[] = { + {"www_authenticate", www_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, + {"www_authorize", www_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, + {"proxy_authenticate", proxy_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, + {"proxy_authorize", proxy_authenticate, 2, authdb_fixup, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ -static param_export_t params[] = {{"db_url", PARAM_STRING, &db_url}, - {"username_column", PARAM_STR, &username_column}, - {"did_column", PARAM_STR, &did_column}, - {"realm_column", PARAM_STR, &realm_column}, - {"password_column", PARAM_STR, &pass_column}, - {"password_column_2", PARAM_STR, &pass_column_2}, - {"plain_password_column", PARAM_STR, &plain_password_column}, - {"flags_column", PARAM_STR, &flags_column}, - {"calculate_ha1", PARAM_INT, &calc_ha1}, - {"load_credentials", PARAM_STR, &credentials_list}, - {"use_did", PARAM_INT, &use_did}, - {"check_all_ha1", PARAM_INT, &check_all}, {0, 0, 0}}; - +static param_export_t params[] = { + {"db_url", PARAM_STRING, &db_url}, + {"username_column", PARAM_STR, &username_column}, + {"did_column", PARAM_STR, &did_column}, + {"realm_column", PARAM_STR, &realm_column}, + {"password_column", PARAM_STR, &pass_column}, + {"password_column_2", PARAM_STR, &pass_column_2}, + {"plain_password_column", PARAM_STR, &plain_password_column}, + {"flags_column", PARAM_STR, &flags_column}, + {"calculate_ha1", PARAM_INT, &calc_ha1}, + {"load_credentials", PARAM_STR, &credentials_list}, + {"use_did", PARAM_INT, &use_did}, + {"check_all_ha1", PARAM_INT, &check_all}, + {0, 0, 0} +}; /* * Module interface */ struct module_exports exports = { - "uid_auth_db", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module init function */ - child_init, /* child init function */ - destroy /* destroy function */ + "uid_auth_db", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module init function */ + child_init, /* child init function */ + destroy /* destroy function */ }; +/* clang-format on */ static authdb_table_info_t *registered_tables = NULL;

1 0

git:master:20bf9c83: ims_auth: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 20bf9c834030f098fcc934135380eebc7bd4ff45 URL: https://github.com/kamailio/kamailio/commit/20bf9c834030f098fcc934135380eeb… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:31:25+01:00 ims_auth: add fixup_free* to exported functions --- Modified: src/modules/ims_auth/ims_auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/20bf9c834030f098fcc934135380eeb… Patch: https://github.com/kamailio/kamailio/commit/20bf9c834030f098fcc934135380eeb…

1 0

[kamailio/kamailio] Add missing fixup_free* to exported functions (PR #4031)
by Federico Cabiddu 20 Nov '24

20 Nov '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, ...) - [xx 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 - [ ] 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/4031 -- Commit Summary -- * cnxcc: add fixup_free function * corex: add fixup_free to file_read function * crypto: add fixup_free function * dispatcher: add fixup_free to several exported functions * dlgs: fix some fixup_free * enum: add fixup_free* to exported functions * evapi: add fixup_free* to exported functions * exec: add fixup_free* to exported functions -- File Changes -- M src/modules/cnxcc/cnxcc_mod.c (20) M src/modules/corex/corex_mod.c (20) M src/modules/crypto/crypto_mod.c (18) M src/modules/dispatcher/dispatcher.c (42) M src/modules/dlgs/dlgs_mod.c (6) M src/modules/enum/enum_mod.c (10) M src/modules/evapi/evapi_mod.c (29) M src/modules/exec/exec_mod.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4031.patch https://github.com/kamailio/kamailio/pull/4031.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4031 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4031(a)github.com>

1 14

git:master:b3d64393: http_async_client: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: b3d64393f9c9c87bf76f2d01e2fe4764a3c0aeca URL: https://github.com/kamailio/kamailio/commit/b3d64393f9c9c87bf76f2d01e2fe476… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 http_async_client: add fixup_free* to exported functions --- Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b3d64393f9c9c87bf76f2d01e2fe476… Patch: https://github.com/kamailio/kamailio/commit/b3d64393f9c9c87bf76f2d01e2fe476… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 40c45bb4a23..0a9cbb0fbfb 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -166,7 +166,7 @@ enum http_time_name_t /* clang-format off */ static cmd_export_t cmds[] = { {"http_async_query", (cmd_function)w_http_async_query, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:ff6e7d6d: htable: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: ff6e7d6d7a5288a5f6e247943c6bf45d40c9ed94 URL: https://github.com/kamailio/kamailio/commit/ff6e7d6d7a5288a5f6e247943c6bf45… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 htable: add fixup_free* to exported functions --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/ff6e7d6d7a5288a5f6e247943c6bf45… Patch: https://github.com/kamailio/kamailio/commit/ff6e7d6d7a5288a5f6e247943c6bf45… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 48f9e1c7724..8c97ac681c6 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -67,6 +67,7 @@ static int child_init(int rank); static void destroy(void); static int fixup_ht_key(void **param, int param_no); +static int fixup_free_ht_key(void **param, int param_no); static int w_ht_rm(sip_msg_t *msg, char *htname, char *itname); static int ht_rm_name_re(struct sip_msg *msg, char *key, char *foo); static int ht_rm_value_re(struct sip_msg *msg, char *key, char *foo); @@ -119,36 +120,36 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"sht_print", (cmd_function)ht_print, 0, 0, 0, ANY_ROUTE}, - {"sht_rm", (cmd_function)w_ht_rm, 2, fixup_spve_spve, 0, ANY_ROUTE}, - {"sht_rm_name_re", (cmd_function)ht_rm_name_re, 1, fixup_ht_key, 0, + {"sht_rm", (cmd_function)w_ht_rm, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, + {"sht_rm_name_re", (cmd_function)ht_rm_name_re, 1, fixup_ht_key, fixup_free_ht_key, ANY_ROUTE}, - {"sht_rm_value_re", (cmd_function)ht_rm_value_re, 1, fixup_ht_key, 0, + {"sht_rm_value_re", (cmd_function)ht_rm_value_re, 1, fixup_ht_key, fixup_free_ht_key, ANY_ROUTE}, - {"sht_rm_name", (cmd_function)w_ht_rm_name, 3, fixup_spve_all, 0, + {"sht_rm_name", (cmd_function)w_ht_rm_name, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, - {"sht_rm_value", (cmd_function)w_ht_rm_value, 3, fixup_spve_all, 0, + {"sht_rm_value", (cmd_function)w_ht_rm_value, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, - {"sht_match_name", (cmd_function)w_ht_match_name, 3, fixup_spve_all, 0, + {"sht_match_name", (cmd_function)w_ht_match_name, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, - {"sht_has_name", (cmd_function)w_ht_match_name, 3, fixup_spve_all, 0, + {"sht_has_name", (cmd_function)w_ht_match_name, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"sht_match_str_value", (cmd_function)w_ht_match_str_value, 3, - fixup_spve_all, 0, ANY_ROUTE}, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"sht_has_str_value", (cmd_function)w_ht_match_str_value, 3, - fixup_spve_all, 0, ANY_ROUTE}, - {"sht_lock", (cmd_function)w_ht_slot_lock, 1, fixup_ht_key, 0, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"sht_lock", (cmd_function)w_ht_slot_lock, 1, fixup_ht_key, fixup_free_ht_key, ANY_ROUTE}, - {"sht_unlock", (cmd_function)w_ht_slot_unlock, 1, fixup_ht_key, 0, + {"sht_unlock", (cmd_function)w_ht_slot_unlock, 1, fixup_ht_key, fixup_free_ht_key, ANY_ROUTE}, - {"sht_reset", (cmd_function)ht_reset, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"sht_reset", (cmd_function)ht_reset, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sht_iterator_start", (cmd_function)w_ht_iterator_start, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"sht_iterator_next", (cmd_function)w_ht_iterator_next, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sht_iterator_end", (cmd_function)w_ht_iterator_end, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"sht_iterator_rm", (cmd_function)w_ht_iterator_rm, 1, fixup_spve_null, - 0, ANY_ROUTE}, + fixup_free_spve_null, ANY_ROUTE}, {"sht_iterator_sets", (cmd_function)w_ht_iterator_sets, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"sht_iterator_seti", (cmd_function)w_ht_iterator_seti, 2, @@ -378,6 +379,12 @@ static int fixup_ht_key(void **param, int param_no) return 0; } +static int fixup_free_ht_key(void **param, int param_no) +{ + pkg_free(*param); + return 0; +} + /** * */

1 0

git:master:59ec3f21: h350: add fixup_free to exported function
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 59ec3f219c345f2dd783baaf5fd118f760044ff4 URL: https://github.com/kamailio/kamailio/commit/59ec3f219c345f2dd783baaf5fd118f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 h350: add fixup_free to exported function --- Modified: src/modules/h350/h350_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/59ec3f219c345f2dd783baaf5fd118f… Patch: https://github.com/kamailio/kamailio/commit/59ec3f219c345f2dd783baaf5fd118f… --- diff --git a/src/modules/h350/h350_mod.c b/src/modules/h350/h350_mod.c index 81275a13242..c0f08a5b5a0 100644 --- a/src/modules/h350/h350_mod.c +++ b/src/modules/h350/h350_mod.c @@ -42,6 +42,7 @@ static int child_init(int rank); * fixup functions */ static int one_str_pv_elem_fixup(void **param, int param_no); +static int one_str_pv_elem_fixup_free(void **param, int param_no); static int h350_auth_lookup_fixup(void **param, int param_no); /* @@ -70,53 +71,48 @@ int h350_search_scope_int = -1; */ ldap_api_t ldap_api; +/* clang-format off */ /* * Exported functions */ static cmd_export_t cmds[] = { - {"h350_sipuri_lookup", (cmd_function)w_h350_sipuri_lookup, 1, - one_str_pv_elem_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE - | LOCAL_ROUTE}, - {"h350_auth_lookup", (cmd_function)w_h350_auth_lookup, 2, - h350_auth_lookup_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE - | LOCAL_ROUTE}, - {"h350_result_call_preferences", (cmd_function)w_h350_call_preferences, - 1, one_str_pv_elem_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE - | LOCAL_ROUTE}, - {"h350_result_service_level", (cmd_function)w_h350_service_level, 1, - one_str_pv_elem_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE - | LOCAL_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - + {"h350_sipuri_lookup", (cmd_function)w_h350_sipuri_lookup, 1, one_str_pv_elem_fixup, one_str_pv_elem_fixup_free, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE | LOCAL_ROUTE}, + {"h350_auth_lookup", (cmd_function)w_h350_auth_lookup, 2, h350_auth_lookup_fixup, 0, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE | LOCAL_ROUTE}, + {"h350_result_call_preferences", (cmd_function)w_h350_call_preferences, 1, one_str_pv_elem_fixup, one_str_pv_elem_fixup, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE | LOCAL_ROUTE}, + {"h350_result_service_level", (cmd_function)w_h350_service_level, 1, one_str_pv_elem_fixup, one_str_pv_elem_fixup, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE | LOCAL_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ static param_export_t params[] = { - {"ldap_session", PARAM_STRING, &h350_ldap_session}, - {"base_dn", PARAM_STRING, &h350_base_dn}, - {"search_scope", PARAM_STRING, &h350_search_scope}, {0, 0, 0}}; + {"ldap_session", PARAM_STRING, &h350_ldap_session}, + {"base_dn", PARAM_STRING, &h350_base_dn}, + {"search_scope", PARAM_STRING, &h350_search_scope}, {0, 0, 0} +}; /* * Module interface */ struct module_exports exports = { - "h350", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* Exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* child initialization function */ - 0 /* destroy function */ + "h350", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* Exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module initialization function */ + child_init, /* child initialization function */ + 0 /* destroy function */ }; +/* clang-format on */ static int child_init(int rank) { @@ -208,6 +204,22 @@ static int one_str_pv_elem_fixup(void **param, int param_no) return 0; } +static int one_str_pv_elem_fixup_free(void **param, int param_no) +{ + str s; + + if(param_no == 1) { + s.s = (char *)*param; + if(s.s == 0 || s.s[0] == 0) { + return 0; + } else { + pv_elem_free_all(*param); + } + } + + return 0; +} + static int h350_auth_lookup_fixup(void **param, int param_no) { pv_elem_t *model;

1 0

git:master:13998407: group: add fixup_free to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 13998407d5b42b40586e3c9f605624e26d89d953 URL: https://github.com/kamailio/kamailio/commit/13998407d5b42b40586e3c9f605624e… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 group: add fixup_free to exported functions --- Modified: src/modules/group/group_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/13998407d5b42b40586e3c9f605624e… Patch: https://github.com/kamailio/kamailio/commit/13998407d5b42b40586e3c9f605624e… --- diff --git a/src/modules/group/group_mod.c b/src/modules/group/group_mod.c index adc8ae94f8f..27f427a1e50 100644 --- a/src/modules/group/group_mod.c +++ b/src/modules/group/group_mod.c @@ -71,9 +71,11 @@ static int mod_init(void); /*! Header field fixup */ static int hf_fixup(void **param, int param_no); +static int hf_fixup_free(void **param, int param_no); /*! get user group ID fixup */ static int get_gid_fixup(void **param, int param_no); +static int get_gid_fixup_free(void **param, int param_no); #define TABLE "grp" @@ -106,47 +108,49 @@ db_func_t group_dbf; db1_con_t *group_dbh = 0; +/* clang-format off */ /*! * Exported functions */ static cmd_export_t cmds[] = { - {"is_user_in", (cmd_function)is_user_in, 2, hf_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, - {"get_user_group", (cmd_function)get_user_group, 2, get_gid_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"is_user_in", (cmd_function)is_user_in, 2, hf_fixup, hf_fixup_free, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, + {"get_user_group", (cmd_function)get_user_group, 2, get_gid_fixup, get_gid_fixup_free, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, + {0, 0, 0, 0, 0, 0}}; /*! * Exported parameters */ static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"table", PARAM_STR, &table}, {"user_column", PARAM_STR, &user_column}, - {"domain_column", PARAM_STR, &domain_column}, - {"group_column", PARAM_STR, &group_column}, - {"use_domain", PARAM_INT, &use_domain}, - {"re_table", PARAM_STR, &re_table}, - {"re_exp_column", PARAM_STR, &re_exp_column}, - {"re_gid_column", PARAM_STR, &re_gid_column}, - {"multiple_gid", PARAM_INT, &multiple_gid}, {0, 0, 0}}; + {"table", PARAM_STR, &table}, {"user_column", PARAM_STR, &user_column}, + {"domain_column", PARAM_STR, &domain_column}, + {"group_column", PARAM_STR, &group_column}, + {"use_domain", PARAM_INT, &use_domain}, + {"re_table", PARAM_STR, &re_table}, + {"re_exp_column", PARAM_STR, &re_exp_column}, + {"re_gid_column", PARAM_STR, &re_gid_column}, + {"multiple_gid", PARAM_INT, &multiple_gid}, {0, 0, 0}}; /*! * Module interface */ struct module_exports exports = { - "group", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - child_init, /* per-child init function */ - destroy /* module destroy function */ + "group", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + destroy /* module destroy function */ }; +/* clang-format on */ static int child_init(int rank) { @@ -281,6 +285,14 @@ static int hf_fixup(void **param, int param_no) return 0; } +static int hf_fixup_free(void **param, int param_no) +{ + if(param_no == 2) { + pkg_free(*param); + } + return 0; +} + /*! * \brief Group ID fixup @@ -318,6 +330,15 @@ static int get_gid_fixup(void **param, int param_no) return 0; } +static int get_gid_fixup_free(void **param, int param_no) +{ + if(param_no == 2) { + pv_spec_free(*param); + } + + return 0; +} + /** * */

1 0

git:master:e1030203: geoip2: add fixup_free to exported funrcions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: e10302033e42f25cf88b975fe9926d9210028299 URL: https://github.com/kamailio/kamailio/commit/e10302033e42f25cf88b975fe9926d9… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 geoip2: add fixup_free to exported funrcions --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e10302033e42f25cf88b975fe9926d9… Patch: https://github.com/kamailio/kamailio/commit/e10302033e42f25cf88b975fe9926d9… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index cfb40f69860..2a9329d3cef 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -63,7 +63,7 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"geoip2_match", (cmd_function)w_geoip2_match, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"geoip2_distance", (cmd_function)w_geoip2_distance, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0}

1 0

git:master:7251ba1f: geoip: add fixup_free to exported funrcions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 7251ba1fd6c888a2f352cf1763d213031e7e3f6a URL: https://github.com/kamailio/kamailio/commit/7251ba1fd6c888a2f352cf1763d2130… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 geoip: add fixup_free to exported funrcions --- Modified: src/modules/geoip/geoip_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7251ba1fd6c888a2f352cf1763d2130… Patch: https://github.com/kamailio/kamailio/commit/7251ba1fd6c888a2f352cf1763d2130… --- diff --git a/src/modules/geoip/geoip_mod.c b/src/modules/geoip/geoip_mod.c index 9c953d06d74..d3a36855e7c 100644 --- a/src/modules/geoip/geoip_mod.c +++ b/src/modules/geoip/geoip_mod.c @@ -55,7 +55,7 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"geoip_match", (cmd_function)w_geoip_match, 2, - fixup_spve_spve, 0, ANY_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:8099e2d0: file_out: reformat exported structures
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 8099e2d0b9fdc8826e21013a3fa67d89ebdd88b2 URL: https://github.com/kamailio/kamailio/commit/8099e2d0b9fdc8826e21013a3fa67d8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 file_out: reformat exported structures --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/8099e2d0b9fdc8826e21013a3fa67d8… Patch: https://github.com/kamailio/kamailio/commit/8099e2d0b9fdc8826e21013a3fa67d8… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index a13d3531dde..1234827eab1 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -75,28 +75,28 @@ int *fo_number_of_files = NULL; time_t fo_current_timestamp = 0; +/* clang-format off */ static cmd_export_t cmds[] = { - {"file_out", (cmd_function)fo_write_to_file, 2, fo_fixup_int_pvar, - fo_fixup_free_int_pvar, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"file_out", (cmd_function)fo_write_to_file, 2, fo_fixup_int_pvar, fo_fixup_free_int_pvar, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = {{"base_folder", PARAM_STR, &fo_base_folder}, - {"file", PARAM_STR | PARAM_USE_FUNC, &fo_add_filename}, - {"worker_usleep", PARAM_INT, &fo_worker_usleep}, {0, 0, 0}}; + {"file", PARAM_STR | PARAM_USE_FUNC, &fo_add_filename}, + {"worker_usleep", PARAM_INT, &fo_worker_usleep}, {0, 0, 0}}; struct module_exports exports = { - "file_out", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - child_init, /* per-child init function */ - destroy /* module destroy function */ + "file_out", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + destroy /* module destroy function */ }; - +/* clang-format on */ static int mod_init(void) {

1 0

git:master:6232b8ae: exec: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 6232b8ae29988bfe17ddf6e0bd483eec854ab72b URL: https://github.com/kamailio/kamailio/commit/6232b8ae29988bfe17ddf6e0bd483ee… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 exec: add fixup_free* to exported functions --- Modified: src/modules/exec/exec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6232b8ae29988bfe17ddf6e0bd483ee… Patch: https://github.com/kamailio/kamailio/commit/6232b8ae29988bfe17ddf6e0bd483ee… --- diff --git a/src/modules/exec/exec_mod.c b/src/modules/exec/exec_mod.c index df5366e3ffa..0fd463de35a 100644 --- a/src/modules/exec/exec_mod.c +++ b/src/modules/exec/exec_mod.c @@ -56,6 +56,7 @@ static int w_exec_avp(struct sip_msg *msg, char *cmd, char *avpl); static int w_exec_cmd(struct sip_msg *msg, char *cmd, char *foo); static int exec_avp_fixup(void **param, int param_no); +static int exec_avp_fixup_free(void **param, int param_no); inline static void exec_shutdown(void); @@ -64,16 +65,11 @@ inline static void exec_shutdown(void); * Exported functions */ static cmd_export_t cmds[] = { - {"exec_dset", (cmd_function)w_exec_dset, 1, fixup_spve_null, 0, - REQUEST_ROUTE|FAILURE_ROUTE}, - {"exec_msg", (cmd_function)w_exec_msg, 1, fixup_spve_null, 0, - REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, - {"exec_avp", (cmd_function)w_exec_avp, 1, fixup_spve_null, 0, - REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, - {"exec_avp", (cmd_function)w_exec_avp, 2, exec_avp_fixup, 0, - REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, - {"exec_cmd", (cmd_function)w_exec_cmd, 1, fixup_spve_null, 0, - ANY_ROUTE}, + {"exec_dset", (cmd_function)w_exec_dset, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|FAILURE_ROUTE}, + {"exec_msg", (cmd_function)w_exec_msg, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + {"exec_avp", (cmd_function)w_exec_avp, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + {"exec_avp", (cmd_function)w_exec_avp, 2, exec_avp_fixup, exec_avp_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + {"exec_cmd", (cmd_function)w_exec_cmd, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -268,6 +264,16 @@ static int exec_avp_fixup(void **param, int param_no) return 0; } +static int exec_avp_fixup_free(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_spve_null(param, 1); + } else if(param_no == 2) { + free_pvname_list((pvname_list_t *)param); + } + return 0; +} + static int ki_exec_cmd(sip_msg_t *msg, str *cmd) { int ret;

1 0

git:master:dd0a9624: evapi: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: dd0a9624660ea58aa6f97828ecd526fc7dba3a43 URL: https://github.com/kamailio/kamailio/commit/dd0a9624660ea58aa6f97828ecd526f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 evapi: add fixup_free* to exported functions --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dd0a9624660ea58aa6f97828ecd526f… Patch: https://github.com/kamailio/kamailio/commit/dd0a9624660ea58aa6f97828ecd526f…

1 0

git:master:03287733: enum: add fixup_free* to exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 03287733434a6c2762ffad653917e15bbc462e0c URL: https://github.com/kamailio/kamailio/commit/03287733434a6c2762ffad653917e15… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 enum: add fixup_free* to exported functions --- Modified: src/modules/enum/enum_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/03287733434a6c2762ffad653917e15… Patch: https://github.com/kamailio/kamailio/commit/03287733434a6c2762ffad653917e15… --- diff --git a/src/modules/enum/enum_mod.c b/src/modules/enum/enum_mod.c index d7c3280841f..c1eb4a0359c 100644 --- a/src/modules/enum/enum_mod.c +++ b/src/modules/enum/enum_mod.c @@ -58,9 +58,9 @@ str service = {0, 0}; /* clang-format off */ static cmd_export_t cmds[] = { {"enum_query", (cmd_function)enum_query_0, 0, 0, 0, REQUEST_ROUTE}, - {"enum_query", (cmd_function)enum_query_1, 1, fixup_spve_null, 0, + {"enum_query", (cmd_function)enum_query_1, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, - {"enum_query", (cmd_function)enum_query_2, 2, fixup_spve_spve, 0, + {"enum_query", (cmd_function)enum_query_2, 2, fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE}, {"enum_pv_query", (cmd_function)enum_pv_query_1, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, @@ -75,9 +75,9 @@ static cmd_export_t cmds[] = { {"is_from_user_enum", (cmd_function)is_from_user_enum_2, 2, fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE}, {"i_enum_query", (cmd_function)i_enum_query_0, 0, 0, 0, REQUEST_ROUTE}, - {"i_enum_query", (cmd_function)i_enum_query_1, 1, fixup_spve_null, 0, + {"i_enum_query", (cmd_function)i_enum_query_1, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, - {"i_enum_query", (cmd_function)i_enum_query_2, 2, fixup_spve_spve, 0, + {"i_enum_query", (cmd_function)i_enum_query_2, 2, fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -192,4 +192,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_enum_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:e7cecd66: dlgs: fix some fixup_free
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: e7cecd66a77669e32e5abc2ff4458e017c2a2f61 URL: https://github.com/kamailio/kamailio/commit/e7cecd66a77669e32e5abc2ff4458e0… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 dlgs: fix some fixup_free --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e7cecd66a77669e32e5abc2ff4458e0… Patch: https://github.com/kamailio/kamailio/commit/e7cecd66a77669e32e5abc2ff4458e0… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index e9821d05d4a..f06c9d0ceaa 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -71,11 +71,11 @@ static cmd_export_t cmds[]={ {"dlgs_count", (cmd_function)w_dlgs_count, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"dlgs_tags_add", (cmd_function)w_dlgs_tags_add, 1, fixup_spve_null, - fixup_spve_null, ANY_ROUTE}, + fixup_free_spve_null, ANY_ROUTE}, {"dlgs_tags_rm", (cmd_function)w_dlgs_tags_rm, 1, fixup_spve_null, - fixup_spve_null, ANY_ROUTE}, + fixup_free_spve_null, ANY_ROUTE}, {"dlgs_tags_count", (cmd_function)w_dlgs_tags_count, 1, fixup_spve_null, - fixup_spve_null, ANY_ROUTE}, + fixup_free_spve_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:a05b1433: dispatcher: add fixup_free to several exported functions
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: a05b143385975f0cce349ff7ea1f4647f175cc3c URL: https://github.com/kamailio/kamailio/commit/a05b143385975f0cce349ff7ea1f464… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 dispatcher: add fixup_free to several exported functions --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/a05b143385975f0cce349ff7ea1f464… Patch: https://github.com/kamailio/kamailio/commit/a05b143385975f0cce349ff7ea1f464…

1 0

git:master:52f02ca5: crypto: add fixup_free function
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 52f02ca5f6d09c5323c582c9cf08990f0bc97ac5 URL: https://github.com/kamailio/kamailio/commit/52f02ca5f6d09c5323c582c9cf08990… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 crypto: add fixup_free function --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/52f02ca5f6d09c5323c582c9cf08990… Patch: https://github.com/kamailio/kamailio/commit/52f02ca5f6d09c5323c582c9cf08990… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index f3e644000f9..84f70813602 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -69,6 +69,7 @@ static int w_crypto_nio_decrypt(sip_msg_t *msg, char *p1, char *p2); static int w_crypto_hmac_sha256( sip_msg_t *msg, char *inb, char *keyb, char *outb); static int fixup_crypto_hmac(void **param, int param_no); +static int fixup_free_crypto_hmac(void **param, int param_no); static char *_crypto_salt_param = "k8hTm4aZ"; @@ -95,7 +96,7 @@ static cmd_export_t cmds[] = { {"crypto_netio_decrypt", (cmd_function)w_crypto_nio_decrypt, 0, 0, 0, ANY_ROUTE}, {"crypto_hmac_sha256", (cmd_function)w_crypto_hmac_sha256, 3, - fixup_crypto_hmac, 0, ANY_ROUTE}, + fixup_crypto_hmac, fixup_free_crypto_hmac, ANY_ROUTE}, {"load_crypto", (cmd_function)load_crypto, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}}; @@ -451,6 +452,19 @@ static int fixup_crypto_hmac(void **param, int param_no) return 0; } +/** + * + */ +static int fixup_free_crypto_hmac(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) { + fixup_free_spve_null(param, 1); + } else if(param_no == 3) { + fixup_free_pvar_null(param, 1); + } + return 0; +} + /** * */

1 0

git:master:82e653c0: corex: add fixup_free to file_read function
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 82e653c026219704a4c065e9a523f88c214b2faf URL: https://github.com/kamailio/kamailio/commit/82e653c026219704a4c065e9a523f88… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 corex: add fixup_free to file_read function --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82e653c026219704a4c065e9a523f88… Patch: https://github.com/kamailio/kamailio/commit/82e653c026219704a4c065e9a523f88… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index a6f06a2f26b..0fdf35060ea 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -79,6 +79,7 @@ static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2); static int w_is_socket_name(sip_msg_t *msg, char *psockname, char *p2); static int fixup_file_op(void **param, int param_no); +static int fixup_free_file_op(void **param, int param_no); static sr_kemi_xval_t _sr_kemi_corex_xval = {0}; static str corex_evcb_reply_out = STR_NULL; @@ -148,7 +149,7 @@ static cmd_export_t cmds[] = { {"msg_iflag_is_set", (cmd_function)w_msg_iflag_is_set, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"file_read", (cmd_function)w_file_read, 2, - fixup_file_op, 0, ANY_ROUTE}, + fixup_file_op, fixup_free_file_op, ANY_ROUTE}, {"file_write", (cmd_function)w_file_write, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"setxflag", (cmd_function)w_setxflag, 1, @@ -911,6 +912,23 @@ static int fixup_file_op(void **param, int param_no) return -1; } +/** + * + */ +static int fixup_free_file_op(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_spve_null(param, 1); + } + + if(param_no == 2) { + return fixup_free_pvar_null(param, 1); + } + + LM_ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + /** * */

1 0

git:master:ef84f28a: cnxcc: add fixup_free function
by Federico Cabiddu 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: ef84f28a61b513a72f4abb96ec0fc1240223add1 URL: https://github.com/kamailio/kamailio/commit/ef84f28a61b513a72f4abb96ec0fc12… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-20T14:19:11+01:00 cnxcc: add fixup_free function --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ef84f28a61b513a72f4abb96ec0fc12… Patch: https://github.com/kamailio/kamailio/commit/ef84f28a61b513a72f4abb96ec0fc12… --- diff --git a/src/modules/cnxcc/cnxcc_mod.c b/src/modules/cnxcc/cnxcc_mod.c index 0c59bb069b9..0f0fb7acf96 100644 --- a/src/modules/cnxcc/cnxcc_mod.c +++ b/src/modules/cnxcc/cnxcc_mod.c @@ -74,6 +74,7 @@ data_t _data; struct dlg_binds _dlgbinds; static int cnxcc_set_max_credit_fixup(void **param, int param_no); +static int cnxcc_set_max_credit_fixup_free(void **param, int param_no); /* * module core functions @@ -153,7 +154,7 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"cnxcc_set_max_credit", (cmd_function) __set_max_credit, 6, - cnxcc_set_max_credit_fixup, NULL, ANY_ROUTE}, + cnxcc_set_max_credit_fixup, cnxcc_set_max_credit_fixup_free, ANY_ROUTE}, {"cnxcc_set_max_time", (cmd_function) __set_max_time, 2, fixup_spve_igp, fixup_free_spve_igp, ANY_ROUTE}, {"cnxcc_update_max_time", (cmd_function) __update_max_time, 2, @@ -238,6 +239,23 @@ static int cnxcc_set_max_credit_fixup(void **param, int param_no) } } +static int cnxcc_set_max_credit_fixup_free(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + case 3: + case 4: + return fixup_free_spve_all(param, param_no); + case 5: + case 6: + return fixup_free_igp_all(param, param_no); + default: + LM_ERR("unexpected parameter number: %d\n", param_no); + return E_CFG; + } +} + static int __mod_init(void) { int len;

1 0

git:master:43563cf9: uid_avp_db: add fixup_free* to exported functions
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 43563cf9888386aa0d7e4d5f63e9ee1147777e6c URL: https://github.com/kamailio/kamailio/commit/43563cf9888386aa0d7e4d5f63e9ee1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T14:16:50+01:00 uid_avp_db: add fixup_free* to exported functions --- Modified: src/modules/uid_avp_db/extra_attrs.c Modified: src/modules/uid_avp_db/extra_attrs.h Modified: src/modules/uid_avp_db/uid_avp_db.c --- Diff: https://github.com/kamailio/kamailio/commit/43563cf9888386aa0d7e4d5f63e9ee1… Patch: https://github.com/kamailio/kamailio/commit/43563cf9888386aa0d7e4d5f63e9ee1… --- diff --git a/src/modules/uid_avp_db/extra_attrs.c b/src/modules/uid_avp_db/extra_attrs.c index c8fde1bb184..171ea041ac0 100644 --- a/src/modules/uid_avp_db/extra_attrs.c +++ b/src/modules/uid_avp_db/extra_attrs.c @@ -459,6 +459,14 @@ int extra_attrs_fixup(void **param, int param_no) return 0; } +int extra_attrs_fixup_free(void **param, int param_no) +{ + if(param_no == 2) { + return fixup_free_fparam_2(param, param_no); + } + return 0; +} + /******* locking *******/ #define LOCK_CNT 32 diff --git a/src/modules/uid_avp_db/extra_attrs.h b/src/modules/uid_avp_db/extra_attrs.h index bd5d1933c47..ba35d34bdfd 100644 --- a/src/modules/uid_avp_db/extra_attrs.h +++ b/src/modules/uid_avp_db/extra_attrs.h @@ -16,6 +16,7 @@ int save_extra_attrs(struct sip_msg *msg, char *_table, char *_id); int remove_extra_attrs(struct sip_msg *msg, char *_table, char *_id); int extra_attrs_fixup(void **param, int param_no); +int extra_attrs_fixup_free(void **param, int param_no); int lock_extra_attrs(struct sip_msg *msg, char *_table, char *_id); int unlock_extra_attrs(struct sip_msg *msg, char *_table, char *_id); diff --git a/src/modules/uid_avp_db/uid_avp_db.c b/src/modules/uid_avp_db/uid_avp_db.c index 20ffca560d3..372e898c51a 100644 --- a/src/modules/uid_avp_db/uid_avp_db.c +++ b/src/modules/uid_avp_db/uid_avp_db.c @@ -76,16 +76,16 @@ static cmd_export_t cmds[] = { {"load_attrs", load_attrs, 2, attrs_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, /* functions for loading/storing flagged attributes into DB */ - {"load_extra_attrs", load_extra_attrs, 2, extra_attrs_fixup, 0, + {"load_extra_attrs", load_extra_attrs, 2, extra_attrs_fixup, extra_attrs_fixup_free, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, - {"save_extra_attrs", save_extra_attrs, 2, extra_attrs_fixup, 0, + {"save_extra_attrs", save_extra_attrs, 2, extra_attrs_fixup, extra_attrs_fixup_free, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, - {"remove_extra_attrs", remove_extra_attrs, 2, extra_attrs_fixup, 0, + {"remove_extra_attrs", remove_extra_attrs, 2, extra_attrs_fixup, extra_attrs_fixup_free, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, /* locking attrs - needed for proper work! */ - {"lock_extra_attrs", lock_extra_attrs, 2, extra_attrs_fixup, 0, + {"lock_extra_attrs", lock_extra_attrs, 2, extra_attrs_fixup, extra_attrs_fixup_free, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, - {"unlock_extra_attrs", unlock_extra_attrs, 2, extra_attrs_fixup, 0, + {"unlock_extra_attrs", unlock_extra_attrs, 2, extra_attrs_fixup, extra_attrs_fixup_free, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:5f78ba33: uid_avp_db: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 5f78ba3367cedcde0c0fb55b8aca6f37b8569e44 URL: https://github.com/kamailio/kamailio/commit/5f78ba3367cedcde0c0fb55b8aca6f3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T14:07:24+01:00 uid_avp_db: reformat exported structures --- Modified: src/modules/uid_avp_db/uid_avp_db.c --- Diff: https://github.com/kamailio/kamailio/commit/5f78ba3367cedcde0c0fb55b8aca6f3… Patch: https://github.com/kamailio/kamailio/commit/5f78ba3367cedcde0c0fb55b8aca6f3…

1 0

git:master:d728b14b: uid_domain: add fixup_free* to exported functions
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: d728b14bf2987b89ddfd131f66b62943424afa5f URL: https://github.com/kamailio/kamailio/commit/d728b14bf2987b89ddfd131f66b6294… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T13:57:59+01:00 uid_domain: add fixup_free* to exported functions --- Modified: src/modules/uid_domain/uid_domain_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d728b14bf2987b89ddfd131f66b6294… Patch: https://github.com/kamailio/kamailio/commit/d728b14bf2987b89ddfd131f66b6294… --- diff --git a/src/modules/uid_domain/uid_domain_mod.c b/src/modules/uid_domain/uid_domain_mod.c index eed0a27122d..e140e003d95 100644 --- a/src/modules/uid_domain/uid_domain_mod.c +++ b/src/modules/uid_domain/uid_domain_mod.c @@ -56,6 +56,7 @@ static int lookup_domain(struct sip_msg *msg, char *s1, char *s2); static int get_did(str *did, str *domain); static int lookup_domain_fixup(void **param, int param_no); +static int lookup_domain_fixup_free(void **param, int param_no); MODULE_VERSION @@ -121,8 +122,8 @@ static domain_t dom_buf[2]; * Exported functions */ static cmd_export_t cmds[] = { - {"is_local", is_local, 1, fixup_var_str_1, 0, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {"lookup_domain", lookup_domain, 2, lookup_domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {"is_local", is_local, 1, fixup_var_str_1, fixup_free_fparam_1, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {"lookup_domain", lookup_domain, 2, lookup_domain_fixup, lookup_domain_fixup_free, REQUEST_ROUTE | FAILURE_ROUTE}, {"get_did", (cmd_function)get_did, 0, 0, 0, 0}, {"bind_domain", (cmd_function)bind_domain, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -569,3 +570,11 @@ static int lookup_domain_fixup(void **param, int param_no) return 0; } + +static int lookup_domain_fixup_free(void **param, int param_no) +{ + if(param_no == 2) { + return fixup_free_fparam_all(param, 2); + } + return 0; +}

1 0

git:master:f63e5488: uid_domain: reformat exported structures
by Victor Seva 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: f63e5488b713e1a98ced684d43e9a69e12160516 URL: https://github.com/kamailio/kamailio/commit/f63e5488b713e1a98ced684d43e9a69… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-20T13:53:01+01:00 uid_domain: reformat exported structures --- Modified: src/modules/uid_domain/uid_domain_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f63e5488b713e1a98ced684d43e9a69… Patch: https://github.com/kamailio/kamailio/commit/f63e5488b713e1a98ced684d43e9a69… --- diff --git a/src/modules/uid_domain/uid_domain_mod.c b/src/modules/uid_domain/uid_domain_mod.c index a75253c1473..eed0a27122d 100644 --- a/src/modules/uid_domain/uid_domain_mod.c +++ b/src/modules/uid_domain/uid_domain_mod.c @@ -116,52 +116,54 @@ domain_t **domains_2 = 0; /* List of domains 2 */ */ static domain_t dom_buf[2]; +/* clang-format off */ /* * Exported functions */ static cmd_export_t cmds[] = { - {"is_local", is_local, 1, fixup_var_str_1, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {"lookup_domain", lookup_domain, 2, lookup_domain_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {"get_did", (cmd_function)get_did, 0, 0, 0, 0}, - {"bind_domain", (cmd_function)bind_domain, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0}}; - + {"is_local", is_local, 1, fixup_var_str_1, 0, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {"lookup_domain", lookup_domain, 2, lookup_domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {"get_did", (cmd_function)get_did, 0, 0, 0, 0}, + {"bind_domain", (cmd_function)bind_domain, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ -static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"db_mode", PARAM_INT, &db_mode}, - {"domain_table", PARAM_STR, &domain_table}, - {"domain_col", PARAM_STR, &domain_col}, - {"did_col", PARAM_STR, &did_col}, {"flags_col", PARAM_STR, &flags_col}, - {"domattr_table", PARAM_STR, &domattr_table}, - {"domattr_did", PARAM_STR, &domattr_did}, - {"domattr_name", PARAM_STR, &domattr_name}, - {"domattr_type", PARAM_STR, &domattr_type}, - {"domattr_value", PARAM_STR, &domattr_value}, - {"domattr_flags", PARAM_STR, &domattr_flags}, - {"load_domain_attrs", PARAM_INT, &load_domain_attrs}, {0, 0, 0}}; - +static param_export_t params[] = { + {"db_url", PARAM_STR, &db_url}, + {"db_mode", PARAM_INT, &db_mode}, + {"domain_table", PARAM_STR, &domain_table}, + {"domain_col", PARAM_STR, &domain_col}, + {"did_col", PARAM_STR, &did_col}, + {"flags_col", PARAM_STR, &flags_col}, + {"domattr_table", PARAM_STR, &domattr_table}, + {"domattr_did", PARAM_STR, &domattr_did}, + {"domattr_name", PARAM_STR, &domattr_name}, + {"domattr_type", PARAM_STR, &domattr_type}, + {"domattr_value", PARAM_STR, &domattr_value}, + {"domattr_flags", PARAM_STR, &domattr_flags}, + {"load_domain_attrs", PARAM_INT, &load_domain_attrs}, + {0, 0, 0} +}; /* * Module interface */ struct module_exports exports = { - "uid_domain", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - domain_rpc, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - destroy /* module destroy function */ + "uid_domain", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + domain_rpc, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + destroy /* module destroy function */ }; - +/* clang-format off */ static int init_db(void) {

1 0

git:master:03af5047: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 20 Nov '24

20 Nov '24

Module: kamailio Branch: master Commit: 03af5047a38c9df4fbc407505fd03467f1584977 URL: https://github.com/kamailio/kamailio/commit/03af5047a38c9df4fbc407505fd0346… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-20T13:46:10+01:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/03af5047a38c9df4fbc407505fd0346… Patch: https://github.com/kamailio/kamailio/commit/03af5047a38c9df4fbc407505fd0346…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev