- sr-dev - kamailio.org

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev