- sr-dev - kamailio.org

git:master:06cc2560: db_sqlite: fix incompatible-pointer-types warning
by Victor Seva 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: 06cc2560e5358468178ef3e5c795a8a0ec67b693 URL: https://github.com/kamailio/kamailio/commit/06cc2560e5358468178ef3e5c795a8a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-10T23:58:06+01:00 db_sqlite: fix incompatible-pointer-types warning fixes #4064 --- Modified: src/modules/db_sqlite/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/06cc2560e5358468178ef3e5c795a8a… Patch: https://github.com/kamailio/kamailio/commit/06cc2560e5358468178ef3e5c795a8a… --- diff --git a/src/modules/db_sqlite/dbase.c b/src/modules/db_sqlite/dbase.c index 77b4fc3bc32..dd2030d2e43 100644 --- a/src/modules/db_sqlite/dbase.c +++ b/src/modules/db_sqlite/dbase.c @@ -142,14 +142,17 @@ db1_con_t *db_sqlite_init(const str *_url) * No function should be called after this */ -static void db_sqlite_free_connection(struct sqlite_connection *con) +static void db_sqlite_free_connection(struct pool_con *con) { + struct sqlite_connection *_c; + if(!con) return; + _c = (struct sqlite_connection *)con; - sqlite3_close(con->conn); - free_db_id(con->hdr.id); - pkg_free(con); + sqlite3_close(_c->conn); + free_db_id(_c->hdr.id); + pkg_free(_c); } void db_sqlite_close(db1_con_t *_h)

1 0

git:master:d87d950c: github: alpine improve nightly builds check [skip ci]
by Victor Seva 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: d87d950c8eb78ab97fdf0c3461b2f086edb6e0a3 URL: https://github.com/kamailio/kamailio/commit/d87d950c8eb78ab97fdf0c3461b2f08… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-10T23:36:55+01:00 github: alpine improve nightly builds check [skip ci] compare last_sha built instead of just commit date --- Modified: .github/workflows/alpine.yml --- Diff: https://github.com/kamailio/kamailio/commit/d87d950c8eb78ab97fdf0c3461b2f08… Patch: https://github.com/kamailio/kamailio/commit/d87d950c8eb78ab97fdf0c3461b2f08…

1 0

git:master:4cbcec43: github: execute codeql on pkg-kamailio-docker container [skip ci]
by Victor Seva 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: 4cbcec438c0a6a8ba4899ef4d9e9511acde33de6 URL: https://github.com/kamailio/kamailio/commit/4cbcec438c0a6a8ba4899ef4d9e9511… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-10T19:31:07+01:00 github: execute codeql on pkg-kamailio-docker container [skip ci] --- Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/4cbcec438c0a6a8ba4899ef4d9e9511… Patch: https://github.com/kamailio/kamailio/commit/4cbcec438c0a6a8ba4899ef4d9e9511… --- diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0328ba9233a..84460230bba 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -19,19 +19,20 @@ jobs: matrix: language: [ javascript, cpp, python ] + container: + image: ghcr.io/kamailio/pkg-kamailio-docker:${{ github.ref_name }}-bookworm + credentials: + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + volumes: + - ${{ github.workspace }}:/code + steps: - name: Checkout uses: actions/checkout@v4 with: submodules: recursive - - name: Install Packages (cpp) - if: ${{ matrix.language == 'cpp' }} - run: | - sudo apt-get update - sudo apt-get install --yes bison default-libmysqlclient-dev flex libcurl4-openssl-dev libjansson-dev libhiredis-dev libevent-dev liblua5.1-0-dev libpcre3-dev libncurses5-dev libpq-dev libreadline-dev libssl-dev libunistring-dev libmicrohttpd-dev libxml2-dev pkg-config python3 python3-dev uuid-dev zlib1g-dev - sudo apt-get clean - - name: Configure (cpp) if: ${{ matrix.language == 'cpp' }} run: make include_modules='app_lua app_python3 cnxcc db_mysql db_postgres db_redis dialplan http_client jansson lcr ndb_redis presence presence_xml presence_dialoginfo pua pua_dialoginfo topos_redis uuid websocket xmlops' cfg

1 0

git:master:a266e051: github: codeql.yml on self-hosted runner
by GitHub 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: a266e051fd6b45617dc8966effd96a1d08d85960 URL: https://github.com/kamailio/kamailio/commit/a266e051fd6b45617dc8966effd96a1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: GitHub <noreply(a)github.com> Date: 2024-12-10T18:41:02+01:00 github: codeql.yml on self-hosted runner --- Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/a266e051fd6b45617dc8966effd96a1… Patch: https://github.com/kamailio/kamailio/commit/a266e051fd6b45617dc8966effd96a1… --- diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index aa6d9194b07..0328ba9233a 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -8,7 +8,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64, codeql] permissions: actions: read contents: read

1 0

git:master:a08da7b3: cmake: Use evaluated full paths from cmake for correct handling of special cases
by Xenofon Karamanos 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: a08da7b34b01f4b0a579fbfdc141bf2944613736 URL: https://github.com/kamailio/kamailio/commit/a08da7b34b01f4b0a579fbfdc141bf2… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-10T14:39:03Z cmake: Use evaluated full paths from cmake for correct handling of special cases --- Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/a08da7b34b01f4b0a579fbfdc141bf2… Patch: https://github.com/kamailio/kamailio/commit/a08da7b34b01f4b0a579fbfdc141bf2… --- diff --git a/cmake/defs.cmake b/cmake/defs.cmake index 4214ef57121..bb9a0b680a7 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -6,8 +6,6 @@ cmake_minimum_required(VERSION 3.10) add_library(common INTERFACE) -message(STATUS "CMAKE_C_COMPILER_VERSION: ${CMAKE_C_COMPILER_VERSION}") - set(OS ${CMAKE_SYSTEM_NAME}) message(STATUS "OS: ${OS}") @@ -109,6 +107,10 @@ if(NOT ${LIBSSL_SET_MUTEX_SHARED}) STATUS "Checking if can enable workaround for libssl 1.1+ to set shared mutex attribute" ) + + # TODO: This can probably be reduced to a just a find_package(OpenSSL) call + # and then check the version + # If we are cross-compiling, cmake should search for library on the target or both target/host if(NOT DEFINED CMAKE_CROSSCOMPILING OR NOT ${CMAKE_CROSSCOMPILING}) message(STATUS "Checking for OpenSSL 1.1.0") find_package(OpenSSL 1.1.0) @@ -306,11 +308,11 @@ target_compile_definitions( ${TARGET_ARCH} __OS_${OS_LOWER} VERSIONVAL=${VERSIONVAL} - CFG_DIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${CFG_NAME}/" - SHARE_DIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${MAIN_NAME}/" + CFG_DIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}/${CFG_NAME}/" + SHARE_DIR="${CMAKE_INSTALL_FULL_DATADIR}/${MAIN_NAME}/" # Absolute path this run is always /var/run/kamailio either for local or # system installs - RUN_DIR="/${CMAKE_INSTALL_LOCALSTATEDIR}/run/${MAIN_NAME}" + RUN_DIR="${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/${MAIN_NAME}" ${LOCK_METHOD} # Module stuff? PIC

1 0

git:master:b6f25031: cmake: Build type set to Debug
by Xenofon Karamanos 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: b6f25031590e472f0f63b3e2a4fa61dad946a582 URL: https://github.com/kamailio/kamailio/commit/b6f25031590e472f0f63b3e2a4fa61d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-10T12:37:00Z cmake: Build type set to Debug --- Added: cmake/BuildType.cmake Modified: CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/b6f25031590e472f0f63b3e2a4fa61d… Patch: https://github.com/kamailio/kamailio/commit/b6f25031590e472f0f63b3e2a4fa61d… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index f7270f0abc3..47e7c0b2a55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,9 @@ message(STATUS "VERSIONVAL: ${VERSIONVAL}") set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD_REQUIRED True) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") + +include(${CMAKE_SOURCE_DIR}/cmake/BuildType.cmake) # ----------------------- # Main project name # ----------------------- @@ -37,8 +40,6 @@ set(CFG_NAME CACHE STRING "Config name" ) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") - # Add the source directory add_subdirectory(src) diff --git a/cmake/BuildType.cmake b/cmake/BuildType.cmake new file mode 100644 index 00000000000..7b15e3e052f --- /dev/null +++ b/cmake/BuildType.cmake @@ -0,0 +1,21 @@ +# Set a default build type if none was specified +set(default_build_type "Release") +if(EXISTS "${CMAKE_SOURCE_DIR}/.git") + set(default_build_type "Debug") +endif() + +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + message( + STATUS + "Setting build type to '${default_build_type}' as none was specified." + ) + set(CMAKE_BUILD_TYPE + "${default_build_type}" + CACHE STRING "Choose the type of build." FORCE + ) + # Set the possible values of build type for cmake-gui + set_property( + CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" + "RelWithDebInfo" + ) +endif()

1 0

git:master:329f95e9: cmake: Do not link to kamailio binary
by Xenofon Karamanos 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: 329f95e95f7f80e5af2495f0a4273885a5112051 URL: https://github.com/kamailio/kamailio/commit/329f95e95f7f80e5af2495f0a427388… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-10T10:34:08Z cmake: Do not link to kamailio binary --- Modified: src/modules/acc/CMakeLists.txt Modified: src/modules/acc_diameter/CMakeLists.txt Modified: src/modules/acc_json/CMakeLists.txt Modified: src/modules/acc_radius/CMakeLists.txt Modified: src/modules/alias_db/CMakeLists.txt Modified: src/modules/app_java/CMakeLists.txt Modified: src/modules/app_jsdt/CMakeLists.txt Modified: src/modules/app_lua/CMakeLists.txt Modified: src/modules/app_perl/CMakeLists.txt Modified: src/modules/app_python/CMakeLists.txt Modified: src/modules/app_python3/CMakeLists.txt Modified: src/modules/app_python3s/CMakeLists.txt Modified: src/modules/app_ruby/CMakeLists.txt Modified: src/modules/app_ruby_proc/CMakeLists.txt Modified: src/modules/async/CMakeLists.txt Modified: src/modules/auth/CMakeLists.txt Modified: src/modules/auth_db/CMakeLists.txt Modified: src/modules/auth_diameter/CMakeLists.txt Modified: src/modules/auth_ephemeral/CMakeLists.txt Modified: src/modules/auth_radius/CMakeLists.txt Modified: src/modules/auth_xkeys/CMakeLists.txt Modified: src/modules/avp/CMakeLists.txt Modified: src/modules/avpops/CMakeLists.txt Modified: src/modules/benchmark/CMakeLists.txt Modified: src/modules/blst/CMakeLists.txt Modified: src/modules/call_control/CMakeLists.txt Modified: src/modules/call_obj/CMakeLists.txt Modified: src/modules/carrierroute/CMakeLists.txt Modified: src/modules/cdp/CMakeLists.txt Modified: src/modules/cdp_avp/CMakeLists.txt Modified: src/modules/cfg_db/CMakeLists.txt Modified: src/modules/cfg_rpc/CMakeLists.txt Modified: src/modules/cfgt/CMakeLists.txt Modified: src/modules/cfgutils/CMakeLists.txt Modified: src/modules/cnxcc/CMakeLists.txt Modified: src/modules/corex/CMakeLists.txt Modified: src/modules/counters/CMakeLists.txt Modified: src/modules/cplc/CMakeLists.txt Modified: src/modules/crypto/CMakeLists.txt Modified: src/modules/ctl/CMakeLists.txt Modified: src/modules/db2_ldap/CMakeLists.txt Modified: src/modules/db2_ops/CMakeLists.txt Modified: src/modules/db_berkeley/CMakeLists.txt Modified: src/modules/db_cluster/CMakeLists.txt Modified: src/modules/db_flatstore/CMakeLists.txt Modified: src/modules/db_mongodb/CMakeLists.txt Modified: src/modules/db_mysql/CMakeLists.txt Modified: src/modules/db_oracle/CMakeLists.txt Modified: src/modules/db_perlvdb/CMakeLists.txt Modified: src/modules/db_postgres/CMakeLists.txt Modified: src/modules/db_redis/CMakeLists.txt Modified: src/modules/db_sqlite/CMakeLists.txt Modified: src/modules/db_text/CMakeLists.txt Modified: src/modules/db_unixodbc/CMakeLists.txt Modified: src/modules/debugger/CMakeLists.txt Modified: src/modules/dialog/CMakeLists.txt Modified: src/modules/dialplan/CMakeLists.txt Modified: src/modules/dispatcher/CMakeLists.txt Modified: src/modules/diversion/CMakeLists.txt Modified: src/modules/dlgs/CMakeLists.txt Modified: src/modules/dmq/CMakeLists.txt Modified: src/modules/dmq_usrloc/CMakeLists.txt Modified: src/modules/dnssec/CMakeLists.txt Modified: src/modules/domain/CMakeLists.txt Modified: src/modules/domainpolicy/CMakeLists.txt Modified: src/modules/drouting/CMakeLists.txt Modified: src/modules/enum/CMakeLists.txt Modified: src/modules/erlang/CMakeLists.txt Modified: src/modules/evapi/CMakeLists.txt Modified: src/modules/evrexec/CMakeLists.txt Modified: src/modules/exec/CMakeLists.txt Modified: src/modules/file_out/CMakeLists.txt Modified: src/modules/gcrypt/CMakeLists.txt Modified: src/modules/geoip/CMakeLists.txt Modified: src/modules/geoip2/CMakeLists.txt Modified: src/modules/group/CMakeLists.txt Modified: src/modules/gzcompress/CMakeLists.txt Modified: src/modules/h350/CMakeLists.txt Modified: src/modules/htable/CMakeLists.txt Modified: src/modules/http_async_client/CMakeLists.txt Modified: src/modules/http_client/CMakeLists.txt Modified: src/modules/imc/CMakeLists.txt Modified: src/modules/ims_auth/CMakeLists.txt Modified: src/modules/ims_charging/CMakeLists.txt Modified: src/modules/ims_dialog/CMakeLists.txt Modified: src/modules/ims_diameter_server/CMakeLists.txt Modified: src/modules/ims_icscf/CMakeLists.txt Modified: src/modules/ims_ipsec_pcscf/CMakeLists.txt Modified: src/modules/ims_isc/CMakeLists.txt Modified: src/modules/ims_ocs/CMakeLists.txt Modified: src/modules/ims_qos/CMakeLists.txt Modified: src/modules/ims_qos_npn/CMakeLists.txt Modified: src/modules/ims_registrar_pcscf/CMakeLists.txt Modified: src/modules/ims_registrar_scscf/CMakeLists.txt Modified: src/modules/ims_usrloc_pcscf/CMakeLists.txt Modified: src/modules/ims_usrloc_scscf/CMakeLists.txt Modified: src/modules/influxdbc/CMakeLists.txt Modified: src/modules/ipops/CMakeLists.txt Modified: src/modules/jansson/CMakeLists.txt Modified: src/modules/janssonrpcc/CMakeLists.txt Modified: src/modules/json/CMakeLists.txt Modified: src/modules/jsonrpcc/CMakeLists.txt Modified: src/modules/jsonrpcs/CMakeLists.txt Modified: src/modules/jwt/CMakeLists.txt Modified: src/modules/kafka/CMakeLists.txt Modified: src/modules/kazoo/CMakeLists.txt Modified: src/modules/keepalive/CMakeLists.txt Modified: src/modules/kemix/CMakeLists.txt Modified: src/modules/kex/CMakeLists.txt Modified: src/modules/lcr/CMakeLists.txt Modified: src/modules/ldap/CMakeLists.txt Modified: src/modules/log_custom/CMakeLists.txt Modified: src/modules/log_systemd/CMakeLists.txt Modified: src/modules/lost/CMakeLists.txt Modified: src/modules/lrkproxy/CMakeLists.txt Modified: src/modules/lwsc/CMakeLists.txt Modified: src/modules/mangler/CMakeLists.txt Modified: src/modules/math/CMakeLists.txt Modified: src/modules/matrix/CMakeLists.txt Modified: src/modules/maxfwd/CMakeLists.txt Modified: src/modules/mediaproxy/CMakeLists.txt Modified: src/modules/memcached/CMakeLists.txt Modified: src/modules/microhttpd/CMakeLists.txt Modified: src/modules/misc_radius/CMakeLists.txt Modified: src/modules/misctest/CMakeLists.txt Modified: src/modules/mohqueue/CMakeLists.txt Modified: src/modules/mqtt/CMakeLists.txt Modified: src/modules/mqueue/CMakeLists.txt Modified: src/modules/msilo/CMakeLists.txt Modified: src/modules/msrp/CMakeLists.txt Modified: src/modules/mtree/CMakeLists.txt Modified: src/modules/nat_traversal/CMakeLists.txt Modified: src/modules/nathelper/CMakeLists.txt Modified: src/modules/nats/CMakeLists.txt Modified: src/modules/ndb_cassandra/CMakeLists.txt Modified: src/modules/ndb_mongodb/CMakeLists.txt Modified: src/modules/ndb_redis/CMakeLists.txt Modified: src/modules/nghttp2/CMakeLists.txt Modified: src/modules/nosip/CMakeLists.txt Modified: src/modules/nsq/CMakeLists.txt Modified: src/modules/outbound/CMakeLists.txt Modified: src/modules/p_usrloc/CMakeLists.txt Modified: src/modules/path/CMakeLists.txt Modified: src/modules/pdb/CMakeLists.txt Modified: src/modules/pdt/CMakeLists.txt Modified: src/modules/peering/CMakeLists.txt Modified: src/modules/permissions/CMakeLists.txt Modified: src/modules/phonenum/CMakeLists.txt Modified: src/modules/pike/CMakeLists.txt Modified: src/modules/pipelimit/CMakeLists.txt Modified: src/modules/posops/CMakeLists.txt Modified: src/modules/prefix_route/CMakeLists.txt Modified: src/modules/presence/CMakeLists.txt Modified: src/modules/presence_conference/CMakeLists.txt Modified: src/modules/presence_dialoginfo/CMakeLists.txt Modified: src/modules/presence_mwi/CMakeLists.txt Modified: src/modules/presence_profile/CMakeLists.txt Modified: src/modules/presence_reginfo/CMakeLists.txt Modified: src/modules/presence_xml/CMakeLists.txt Modified: src/modules/pua/CMakeLists.txt Modified: src/modules/pua_bla/CMakeLists.txt Modified: src/modules/pua_dialoginfo/CMakeLists.txt Modified: src/modules/pua_json/CMakeLists.txt Modified: src/modules/pua_reginfo/CMakeLists.txt Modified: src/modules/pua_rpc/CMakeLists.txt Modified: src/modules/pua_usrloc/CMakeLists.txt Modified: src/modules/pua_xmpp/CMakeLists.txt Modified: src/modules/pv/CMakeLists.txt Modified: src/modules/pv_headers/CMakeLists.txt Modified: src/modules/pvtpl/CMakeLists.txt Modified: src/modules/qos/CMakeLists.txt Modified: src/modules/rabbitmq/CMakeLists.txt Modified: src/modules/ratelimit/CMakeLists.txt Modified: src/modules/regex/CMakeLists.txt Modified: src/modules/registrar/CMakeLists.txt Modified: src/modules/rls/CMakeLists.txt Modified: src/modules/rr/CMakeLists.txt Modified: src/modules/rtimer/CMakeLists.txt Modified: src/modules/rtjson/CMakeLists.txt Modified: src/modules/rtp_media_server/CMakeLists.txt Modified: src/modules/rtpengine/CMakeLists.txt Modified: src/modules/rtpproxy/CMakeLists.txt Modified: src/modules/ruxc/CMakeLists.txt Modified: src/modules/sanity/CMakeLists.txt Modified: src/modules/sca/CMakeLists.txt Modified: src/modules/sctp/CMakeLists.txt Modified: src/modules/sdpops/CMakeLists.txt Modified: src/modules/seas/CMakeLists.txt Modified: src/modules/secfilter/CMakeLists.txt Modified: src/modules/secsipid/CMakeLists.txt Modified: src/modules/secsipid_proc/CMakeLists.txt Modified: src/modules/sipcapture/CMakeLists.txt Modified: src/modules/sipdump/CMakeLists.txt Modified: src/modules/sipjson/CMakeLists.txt Modified: src/modules/siprepo/CMakeLists.txt Modified: src/modules/sipt/CMakeLists.txt Modified: src/modules/siptrace/CMakeLists.txt Modified: src/modules/siputils/CMakeLists.txt Modified: src/modules/sl/CMakeLists.txt Modified: src/modules/slack/CMakeLists.txt Modified: src/modules/sms/CMakeLists.txt Modified: src/modules/smsops/CMakeLists.txt Modified: src/modules/snmpstats/CMakeLists.txt Modified: src/modules/speeddial/CMakeLists.txt Modified: src/modules/sqlops/CMakeLists.txt Modified: src/modules/ss7ops/CMakeLists.txt Modified: src/modules/sst/CMakeLists.txt Modified: src/modules/statistics/CMakeLists.txt Modified: src/modules/statsc/CMakeLists.txt Modified: src/modules/statsd/CMakeLists.txt Modified: src/modules/stirshaken/CMakeLists.txt Modified: src/modules/stun/CMakeLists.txt Modified: src/modules/sworker/CMakeLists.txt Modified: src/modules/systemdops/CMakeLists.txt Modified: src/modules/tcpops/CMakeLists.txt Modified: src/modules/textops/CMakeLists.txt Modified: src/modules/textopsx/CMakeLists.txt Modified: src/modules/timer/CMakeLists.txt Modified: src/modules/tls/CMakeLists.txt Modified: src/modules/tls_wolfssl/CMakeLists.txt Modified: src/modules/tlsa/CMakeLists.txt Modified: src/modules/tm/CMakeLists.txt Modified: src/modules/tmrec/CMakeLists.txt Modified: src/modules/tmx/CMakeLists.txt Modified: src/modules/topoh/CMakeLists.txt Modified: src/modules/topos/CMakeLists.txt Modified: src/modules/topos_redis/CMakeLists.txt Modified: src/modules/tsilo/CMakeLists.txt Modified: src/modules/uac/CMakeLists.txt Modified: src/modules/uac_redirect/CMakeLists.txt Modified: src/modules/uid_auth_db/CMakeLists.txt Modified: src/modules/uid_avp_db/CMakeLists.txt Modified: src/modules/uid_domain/CMakeLists.txt Modified: src/modules/uid_gflags/CMakeLists.txt Modified: src/modules/uid_uri_db/CMakeLists.txt Modified: src/modules/uri_db/CMakeLists.txt Modified: src/modules/userblocklist/CMakeLists.txt Modified: src/modules/usrloc/CMakeLists.txt Modified: src/modules/utils/CMakeLists.txt Modified: src/modules/uuid/CMakeLists.txt Modified: src/modules/websocket/CMakeLists.txt Modified: src/modules/xcap_client/CMakeLists.txt Modified: src/modules/xcap_server/CMakeLists.txt Modified: src/modules/xhttp/CMakeLists.txt Modified: src/modules/xhttp_pi/CMakeLists.txt Modified: src/modules/xhttp_prom/CMakeLists.txt Modified: src/modules/xhttp_rpc/CMakeLists.txt Modified: src/modules/xlog/CMakeLists.txt Modified: src/modules/xmlops/CMakeLists.txt Modified: src/modules/xmlrpc/CMakeLists.txt Modified: src/modules/xmpp/CMakeLists.txt Modified: src/modules/xprint/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/329f95e95f7f80e5af2495f0a427388… Patch: https://github.com/kamailio/kamailio/commit/329f95e95f7f80e5af2495f0a427388…

1 0

[kamailio/kamailio] cmake: Link internal libraries to core and remove them from modules (PR #4059)
by Xenofon Karamanos 10 Dec '24

10 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 - [x] Related to issue #4041 #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4059 -- Commit Summary -- * cmake: Link internal libraries to core and remove them from modules -- File Changes -- M src/CMakeLists.txt (4) M src/lib/CMakeLists.txt (2) M src/lib/ims/CMakeLists.txt (2) M src/lib/srdb1/CMakeLists.txt (2) M src/lib/srdb2/CMakeLists.txt (2) M src/lib/trie/CMakeLists.txt (2) M src/modules/acc/CMakeLists.txt (2) M src/modules/alias_db/CMakeLists.txt (2) M src/modules/auth_db/CMakeLists.txt (2) M src/modules/avpops/CMakeLists.txt (1) M src/modules/carrierroute/CMakeLists.txt (1) M src/modules/cfg_db/CMakeLists.txt (1) M src/modules/cnxcc/CMakeLists.txt (2) M src/modules/cplc/CMakeLists.txt (2) M src/modules/db2_ldap/CMakeLists.txt (1) M src/modules/db2_ops/CMakeLists.txt (1) M src/modules/db_berkeley/CMakeLists.txt (1) M src/modules/db_cluster/CMakeLists.txt (1) M src/modules/db_flatstore/CMakeLists.txt (1) M src/modules/db_mongodb/CMakeLists.txt (1) M src/modules/db_oracle/CMakeLists.txt (1) M src/modules/db_perlvdb/CMakeLists.txt (1) M src/modules/db_postgres/CMakeLists.txt (1) M src/modules/db_redis/CMakeLists.txt (1) M src/modules/db_sqlite/CMakeLists.txt (2) M src/modules/db_text/CMakeLists.txt (2) M src/modules/db_unixodbc/CMakeLists.txt (2) M src/modules/dialog/CMakeLists.txt (1) M src/modules/dialplan/CMakeLists.txt (1) M src/modules/dispatcher/CMakeLists.txt (1) M src/modules/dmq/CMakeLists.txt (1) M src/modules/domain/CMakeLists.txt (1) M src/modules/domainpolicy/CMakeLists.txt (1) M src/modules/drouting/CMakeLists.txt (1) M src/modules/group/CMakeLists.txt (1) M src/modules/htable/CMakeLists.txt (1) M src/modules/imc/CMakeLists.txt (1) M src/modules/ims_auth/CMakeLists.txt (2) M src/modules/ims_charging/CMakeLists.txt (1) M src/modules/ims_dialog/CMakeLists.txt (1) M src/modules/ims_diameter_server/CMakeLists.txt (1) M src/modules/ims_icscf/CMakeLists.txt (1) M src/modules/ims_ipsec_pcscf/CMakeLists.txt (1) M src/modules/ims_isc/CMakeLists.txt (1) M src/modules/ims_ocs/CMakeLists.txt (1) M src/modules/ims_qos/CMakeLists.txt (1) M src/modules/ims_qos_npn/CMakeLists.txt (1) M src/modules/ims_usrloc_pcscf/CMakeLists.txt (1) M src/modules/ims_usrloc_scscf/CMakeLists.txt (1) M src/modules/kazoo/CMakeLists.txt (1) M src/modules/keepalive/CMakeLists.txt (1) M src/modules/lcr/CMakeLists.txt (1) M src/modules/matrix/CMakeLists.txt (1) M src/modules/mohqueue/CMakeLists.txt (1) M src/modules/mqueue/CMakeLists.txt (1) M src/modules/msilo/CMakeLists.txt (1) M src/modules/mtree/CMakeLists.txt (1) M src/modules/p_usrloc/CMakeLists.txt (1) M src/modules/pdt/CMakeLists.txt (1) M src/modules/permissions/CMakeLists.txt (1) M src/modules/pipelimit/CMakeLists.txt (1) M src/modules/prefix_route/CMakeLists.txt (1) M src/modules/presence/CMakeLists.txt (1) M src/modules/presence_xml/CMakeLists.txt (1) M src/modules/pua/CMakeLists.txt (1) M src/modules/rls/CMakeLists.txt (1) M src/modules/rtpengine/CMakeLists.txt (1) M src/modules/rtpproxy/CMakeLists.txt (1) M src/modules/sca/CMakeLists.txt (1) M src/modules/secfilter/CMakeLists.txt (1) M src/modules/sipcapture/CMakeLists.txt (1) M src/modules/siptrace/CMakeLists.txt (1) M src/modules/siputils/CMakeLists.txt (1) M src/modules/speeddial/CMakeLists.txt (1) M src/modules/sqlops/CMakeLists.txt (1) M src/modules/topos/CMakeLists.txt (1) M src/modules/uac/CMakeLists.txt (1) M src/modules/uid_auth_db/CMakeLists.txt (1) M src/modules/uid_avp_db/CMakeLists.txt (1) M src/modules/uid_domain/CMakeLists.txt (1) M src/modules/uid_gflags/CMakeLists.txt (1) M src/modules/uid_uri_db/CMakeLists.txt (1) M src/modules/uri_db/CMakeLists.txt (1) M src/modules/userblocklist/CMakeLists.txt (1) M src/modules/usrloc/CMakeLists.txt (1) M src/modules/utils/CMakeLists.txt (1) M src/modules/xcap_client/CMakeLists.txt (1) M src/modules/xcap_server/CMakeLists.txt (1) M src/modules/xhttp/CMakeLists.txt (2) M src/modules/xhttp_pi/CMakeLists.txt (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4059.patch https://github.com/kamailio/kamailio/pull/4059.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4059 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4059(a)github.com>

3 8

git:master:9ff2bb86: cmake: Add generating parsing files dependency
by Xenofon Karamanos 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: 9ff2bb869dafca8521a0da7f112c3846f86c5f7e URL: https://github.com/kamailio/kamailio/commit/9ff2bb869dafca8521a0da7f112c384… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-10T10:31:59Z cmake: Add generating parsing files dependency --- Modified: src/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/9ff2bb869dafca8521a0da7f112c384… Patch: https://github.com/kamailio/kamailio/commit/9ff2bb869dafca8521a0da7f112c384… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0e1ea4472d3..c68dada4f98 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -80,6 +80,7 @@ endif() # ----------------------- add_executable(kamailio ${CMAKE_CURRENT_SOURCE_DIR}/main.c) +add_dependencies(kamailio GenerateParser) # Enable ENABLE_EXPORTS property so modules can link from symbols # found in kamailio executable. set_target_properties(

1 0

[kamailio/kamailio] http_async_client: fixed crash on curl callback (PR #4020)
by Ivanuschak Nikolay 10 Dec '24

10 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 #4019 #### Description I assume that the crash #4019 happens, because of an issue in libcurl, namely in the `event_cb` function ([in this line](https://github.com/kamailio/kamailio/blob/master/src/modules/http_asy…) kamailio removes the pointer to the `cell` object (which was attached to this `g->multi` curl descriptor earlier), and the `cell` object memory is released [at this line](https://github.com/kamailio/kamailio/blob/master/src/modules/http_asy…. However, the crash happens when `event_cb` is called when `curl_multi_remove_handle` is called [at this line](https://github.com/kamailio/kamailio/blob/master/src/modules/http_asy…. In this fix `cell` object is retrieved from the corresponding CURL descriptor and then it's compared with the `cell` object passed to this callback. With this change when this issue happens the `cell` object, which is retrieved from the corresponding CURL descriptor, is NULL pointer, because it was removed earlier [in this line](https://github.com/kamailio/kamailio/blob/master/src/modules/http_asy…, so the crash should not appear. However it might be fixed in other way, namely we may not to pass `cell` to the `event_cb` callback and always retrieve it from CURL descriptor. I would appreciate if developers comment that. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4020 -- Commit Summary -- * http_async_client: fixed crash on curl callback -- File Changes -- M src/modules/http_async_client/http_multi.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4020.patch https://github.com/kamailio/kamailio/pull/4020.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4020 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4020(a)github.com>

3 14

git:master:909e659d: http_async_client: fixed crash on curl callback
by Federico Cabiddu 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: 909e659dc33942a92e54bed37ee1387f121c63e6 URL: https://github.com/kamailio/kamailio/commit/909e659dc33942a92e54bed37ee1387… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-12-10T09:25:37+01:00 http_async_client: fixed crash on curl callback --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/909e659dc33942a92e54bed37ee1387… Patch: https://github.com/kamailio/kamailio/commit/909e659dc33942a92e54bed37ee1387… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index daceb932ec9..30ae016d720 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -157,10 +157,12 @@ void event_cb(int fd, short kind, void *userp) /* CURLMOPT_SOCKETFUNCTION */ int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp) { + struct http_m_cell *cell; struct http_m_global *g = (struct http_m_global *)cbp; - struct http_m_cell *cell = (struct http_m_cell *)sockp; const char *whatstr[] = {"none", "IN", "OUT", "INOUT", "REMOVE"}; + cell = http_m_cell_lookup(e); + LM_DBG("socket callback: s=%d e=%p what=%s\n", s, e, whatstr[what]); if(what == CURL_POLL_REMOVE) { /* if cell is NULL the handle has been removed by the event callback for timeout */

1 0

[kamailio/kamailio] github: [skip ci]: bump threeal/cmake-action from 2.0.0 to 2.1.0 (PR #4062)
by dependabot[bot] 10 Dec '24

10 Dec '24

Bumps [threeal/cmake-action](https://github.com/threeal/cmake-action) from 2.0.0 to 2.1.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/threeal/cmake-action/releases">threea… releases</a>.</em></p> <blockquote> <h2>Version 2.1.0</h2> <h2>What's Changed</h2> <ul> <li>Added support for specifying quotations for inputs with multiple values.</li> <li>Reduced bundled action script size by removing bloated dependencies.</li> <li>Enhanced development configurations and CI workflows.</li> <li>Updated development dependencies.</li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/threeal/cmake-action/compare/v2...v2.1.0&quot… </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/threeal/cmake-action/commit/725d1314ccf9ea922… chore: bump prettier from 3.4.1 to 3.4.2 (<a href="https://redirect.github.com/threeal/cmake-action/issues/543&quot… <li><a href="https://github.com/threeal/cmake-action/commit/6954eda1e8b7fec84… chore: bump typescript-eslint from 8.16.0 to 8.17.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/542&quot… <li><a href="https://github.com/threeal/cmake-action/commit/9b2633db99477647e… chore: bump <code>@eslint/js</code> from 9.15.0 to 9.16.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/541&quot… <li><a href="https://github.com/threeal/cmake-action/commit/d08d2651e1a4410b6… chore: bump eslint from 9.15.0 to 9.16.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/540&quot… <li><a href="https://github.com/threeal/cmake-action/commit/3f767d1e2b70aca09… chore: bump rollup from 4.27.4 to 4.28.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/539&quot… <li><a href="https://github.com/threeal/cmake-action/commit/b6fc2b4c091acd09e… chore: bump Yarn to version 4.5.3 (<a href="https://redirect.github.com/threeal/cmake-action/issues/538&quot… <li><a href="https://github.com/threeal/cmake-action/commit/639d8219e822101b6… chore: bump <code>@types/node</code> from 22.10.0 to 22.10.1 (<a href="https://redirect.github.com/threeal/cmake-action/issues/537&quot… <li><a href="https://github.com/threeal/cmake-action/commit/820fc064966f53b9e… chore: bump prettier from 3.3.3 to 3.4.1 (<a href="https://redirect.github.com/threeal/cmake-action/issues/536&quot… <li><a href="https://github.com/threeal/cmake-action/commit/38835ec642f1688f1… chore: bump typescript-eslint from 8.15.0 to 8.16.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/534&quot… <li><a href="https://github.com/threeal/cmake-action/commit/4a4b9a2bb1f850992… chore: bump <code>@types/node</code> from 22.9.1 to 22.10.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/533&quot… <li>Additional commits viewable in <a href="https://github.com/threeal/cmake-action/compare/v2.0.0...v2.1.0&… view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?d… Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4062 -- Commit Summary -- * github: [skip ci]: bump threeal/cmake-action from 2.0.0 to 2.1.0 -- File Changes -- M .github/workflows/cmake_build.yml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4062.patch https://github.com/kamailio/kamailio/pull/4062.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4062 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4062(a)github.com>

2 1

git:master:e71b02a3: github: [skip ci]: bump threeal/cmake-action from 2.0.0 to 2.1.0
by Victor Seva 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: e71b02a326e2ce54e4bf6c6c209f79af43c54278 URL: https://github.com/kamailio/kamailio/commit/e71b02a326e2ce54e4bf6c6c209f79a… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-10T07:59:12+01:00 github: [skip ci]: bump threeal/cmake-action from 2.0.0 to 2.1.0 Bumps [threeal/cmake-action](https://github.com/threeal/cmake-action) from 2.0.0 to 2.1.0. - [Release notes](https://github.com/threeal/cmake-action/releases) - [Commits](https://github.com/threeal/cmake-action/compare/v2.0.0...v2.1.0) --- updated-dependencies: - dependency-name: threeal/cmake-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/cmake_build.yml --- Diff: https://github.com/kamailio/kamailio/commit/e71b02a326e2ce54e4bf6c6c209f79a… Patch: https://github.com/kamailio/kamailio/commit/e71b02a326e2ce54e4bf6c6c209f79a… --- diff --git a/.github/workflows/cmake_build.yml b/.github/workflows/cmake_build.yml index 8bab75c65bb..73ab19ef5d7 100644 --- a/.github/workflows/cmake_build.yml +++ b/.github/workflows/cmake_build.yml @@ -49,7 +49,7 @@ jobs: sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - name: Build Project natively - uses: threeal/cmake-action(a)v2.0.0 + uses: threeal/cmake-action(a)v2.1.0 # Step runs for all except this combination if: matrix.os != 'ubuntu-latest' || matrix.target_arch != 'aarch64' with: @@ -62,7 +62,7 @@ jobs: - name: Build Project with cross-compiler if: matrix.os == 'ubuntu-latest' && matrix.target_arch == 'aarch64' - uses: threeal/cmake-action(a)v2.0.0 + uses: threeal/cmake-action(a)v2.1.0 with: build-dir: ${{github.workspace}}/build build-args: -j8

1 0

git:master:8e398b86: lib/srdb1: new and free connection callbacks expect one parameter
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: 8e398b8675079e1baac7c7575e70283175cdebe2 URL: https://github.com/kamailio/kamailio/commit/8e398b8675079e1baac7c7575e70283… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-09T19:04:25+01:00 lib/srdb1: new and free connection callbacks expect one parameter - new connection is executetd with a database id and free connection with a pool con - compiler warnings: src/lib/srdb1/db.c:322:23: warning: passing arguments to a function without a prototype is deprecated in all versions of C and is not supported in C2x [-Wdeprecated-non-prototype] 322 | con = new_connection(id); src/lib/srdb1/db.c:361:18: warning: passing arguments to a function without a prototype is deprecated in all versions of C and is not supported in C2x [-Wdeprecated-non-prototype] 361 | free_connection(con); --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db.h --- Diff: https://github.com/kamailio/kamailio/commit/8e398b8675079e1baac7c7575e70283… Patch: https://github.com/kamailio/kamailio/commit/8e398b8675079e1baac7c7575e70283… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index b13d87c692b..77dea84df52 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -270,7 +270,7 @@ int db_bind_mod(const str *mod, db_func_t *mydbf) * Initialize database module * \note No function should be called before this */ -db1_con_t *db_do_init(const str *url, void *(*new_connection)()) +db1_con_t *db_do_init(const str *url, void *(*new_connection)(struct db_id *)) { return db_do_init2(url, *new_connection, DB_POOLING_PERMITTED); } @@ -280,8 +280,8 @@ db1_con_t *db_do_init(const str *url, void *(*new_connection)()) * Initialize database module * \note No function should be called before this */ -db1_con_t *db_do_init2( - const str *url, void *(*new_connection)(), db_pooling_t pooling) +db1_con_t *db_do_init2(const str *url, void *(*new_connection)(struct db_id *), + db_pooling_t pooling) { struct db_id *id; void *con; @@ -347,7 +347,7 @@ db1_con_t *db_do_init2( * Shut down database module * \note No function should be called after this */ -void db_do_close(db1_con_t *_h, void (*free_connection)()) +void db_do_close(db1_con_t *_h, void (*free_connection)(struct pool_con *)) { struct pool_con *con; diff --git a/src/lib/srdb1/db.h b/src/lib/srdb1/db.h index 248647ecd07..a9538f6b9ca 100644 --- a/src/lib/srdb1/db.h +++ b/src/lib/srdb1/db.h @@ -48,6 +48,8 @@ #include "db_cap.h" #include "db_con.h" #include "db_row.h" +#include "db_id.h" +#include "db_pool.h" #include "db_pooling.h" #include "db_locking.h" @@ -464,7 +466,7 @@ int db_bind_mod(const str *mod, db_func_t *dbf); * \return returns a pointer to the db1_con_t representing the connection if it was successful, otherwise 0 is returned. */ -db1_con_t *db_do_init(const str *url, void *(*new_connection)()); +db1_con_t *db_do_init(const str *url, void *(*new_connection)(struct db_id *)); /** @@ -478,8 +480,8 @@ db1_con_t *db_do_init(const str *url, void *(*new_connection)()); * \return returns a pointer to the db1_con_t representing the connection if it was successful, otherwise 0 is returned. */ -db1_con_t *db_do_init2( - const str *url, void *(*new_connection)(), db_pooling_t pooling); +db1_con_t *db_do_init2(const str *url, void *(*new_connection)(struct db_id *), + db_pooling_t pooling); /** @@ -490,7 +492,7 @@ db1_con_t *db_do_init2( * \param _h database connection handle * \param (*free_connection) Pointer to the db specific free_connection method */ -void db_do_close(db1_con_t *_h, void (*free_connection)()); +void db_do_close(db1_con_t *_h, void (*free_connection)(struct pool_con *)); /**

1 0

Updated: Online devel meeting on matrix - 15:00 UTC, Dec 9, 2024
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Hello, we should consider an online devel meeting sometime soon to summarize what was done at (and still needs to be done after) devel meeting in Dusseldorf and plan a bit the targets for next major release 6.0. If considered useful, I propose Dec 9, 2024 (Monday) at 15:00UTC (16:00 Berlin/Paris/Madrid/Rome), but we can also look for other dates as well. Topics to be discussed can be added at: - https://github.com/kamailio/kamailio-wiki/blob/main/docs/devel/irc-meetings… Pull requests can be made by users without git access. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 2

git:master:83e9cc03: cmake: Link internal libraries to core and remove them from modules
by Xenofon Karamanos 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: 83e9cc036147b071281ad5c444a473ece83f618e URL: https://github.com/kamailio/kamailio/commit/83e9cc036147b071281ad5c444a473e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-12-09T15:19:57+02:00 cmake: Link internal libraries to core and remove them from modules --- Modified: src/CMakeLists.txt Modified: src/core/CMakeLists.txt Modified: src/lib/CMakeLists.txt Modified: src/lib/ims/CMakeLists.txt Modified: src/lib/srdb1/CMakeLists.txt Modified: src/lib/srdb2/CMakeLists.txt Modified: src/lib/trie/CMakeLists.txt Modified: src/modules/acc/CMakeLists.txt Modified: src/modules/alias_db/CMakeLists.txt Modified: src/modules/auth_db/CMakeLists.txt Modified: src/modules/avpops/CMakeLists.txt Modified: src/modules/carrierroute/CMakeLists.txt Modified: src/modules/cfg_db/CMakeLists.txt Modified: src/modules/cnxcc/CMakeLists.txt Modified: src/modules/cplc/CMakeLists.txt Modified: src/modules/db2_ldap/CMakeLists.txt Modified: src/modules/db2_ops/CMakeLists.txt Modified: src/modules/db_berkeley/CMakeLists.txt Modified: src/modules/db_cluster/CMakeLists.txt Modified: src/modules/db_flatstore/CMakeLists.txt Modified: src/modules/db_mongodb/CMakeLists.txt Modified: src/modules/db_oracle/CMakeLists.txt Modified: src/modules/db_perlvdb/CMakeLists.txt Modified: src/modules/db_postgres/CMakeLists.txt Modified: src/modules/db_redis/CMakeLists.txt Modified: src/modules/db_sqlite/CMakeLists.txt Modified: src/modules/db_text/CMakeLists.txt Modified: src/modules/db_unixodbc/CMakeLists.txt Modified: src/modules/dialog/CMakeLists.txt Modified: src/modules/dialplan/CMakeLists.txt Modified: src/modules/dispatcher/CMakeLists.txt Modified: src/modules/dmq/CMakeLists.txt Modified: src/modules/domain/CMakeLists.txt Modified: src/modules/domainpolicy/CMakeLists.txt Modified: src/modules/drouting/CMakeLists.txt Modified: src/modules/group/CMakeLists.txt Modified: src/modules/htable/CMakeLists.txt Modified: src/modules/imc/CMakeLists.txt Modified: src/modules/ims_auth/CMakeLists.txt Modified: src/modules/ims_charging/CMakeLists.txt Modified: src/modules/ims_dialog/CMakeLists.txt Modified: src/modules/ims_diameter_server/CMakeLists.txt Modified: src/modules/ims_icscf/CMakeLists.txt Modified: src/modules/ims_ipsec_pcscf/CMakeLists.txt Modified: src/modules/ims_isc/CMakeLists.txt Modified: src/modules/ims_ocs/CMakeLists.txt Modified: src/modules/ims_qos/CMakeLists.txt Modified: src/modules/ims_qos_npn/CMakeLists.txt Modified: src/modules/ims_usrloc_pcscf/CMakeLists.txt Modified: src/modules/ims_usrloc_scscf/CMakeLists.txt Modified: src/modules/kazoo/CMakeLists.txt Modified: src/modules/keepalive/CMakeLists.txt Modified: src/modules/lcr/CMakeLists.txt Modified: src/modules/matrix/CMakeLists.txt Modified: src/modules/mohqueue/CMakeLists.txt Modified: src/modules/mqueue/CMakeLists.txt Modified: src/modules/msilo/CMakeLists.txt Modified: src/modules/mtree/CMakeLists.txt Modified: src/modules/p_usrloc/CMakeLists.txt Modified: src/modules/pdt/CMakeLists.txt Modified: src/modules/permissions/CMakeLists.txt Modified: src/modules/pipelimit/CMakeLists.txt Modified: src/modules/prefix_route/CMakeLists.txt Modified: src/modules/presence/CMakeLists.txt Modified: src/modules/presence_xml/CMakeLists.txt Modified: src/modules/pua/CMakeLists.txt Modified: src/modules/rls/CMakeLists.txt Modified: src/modules/rtpengine/CMakeLists.txt Modified: src/modules/rtpproxy/CMakeLists.txt Modified: src/modules/sca/CMakeLists.txt Modified: src/modules/secfilter/CMakeLists.txt Modified: src/modules/sipcapture/CMakeLists.txt Modified: src/modules/siptrace/CMakeLists.txt Modified: src/modules/siputils/CMakeLists.txt Modified: src/modules/speeddial/CMakeLists.txt Modified: src/modules/sqlops/CMakeLists.txt Modified: src/modules/topos/CMakeLists.txt Modified: src/modules/uac/CMakeLists.txt Modified: src/modules/uid_auth_db/CMakeLists.txt Modified: src/modules/uid_avp_db/CMakeLists.txt Modified: src/modules/uid_domain/CMakeLists.txt Modified: src/modules/uid_gflags/CMakeLists.txt Modified: src/modules/uid_uri_db/CMakeLists.txt Modified: src/modules/uri_db/CMakeLists.txt Modified: src/modules/userblocklist/CMakeLists.txt Modified: src/modules/usrloc/CMakeLists.txt Modified: src/modules/utils/CMakeLists.txt Modified: src/modules/xcap_client/CMakeLists.txt Modified: src/modules/xcap_server/CMakeLists.txt Modified: src/modules/xhttp/CMakeLists.txt Modified: src/modules/xhttp_pi/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/83e9cc036147b071281ad5c444a473e… Patch: https://github.com/kamailio/kamailio/commit/83e9cc036147b071281ad5c444a473e…

1 0

[kamailio/kamailio] Python exception handling fixes (PR #4044)
by Matthias Urlichs 09 Dec '24

09 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Python's C interface contract states that C code must *either* raise an exception and return NULL, *or* return a Python object. Doing both will raise a `SystemError` exception which obscures the original problem. It may also cause a memory leak. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4044 -- Commit Summary -- * app_python3: fix exception handling -- File Changes -- M src/modules/app_python3/apy_kemi.c (4) M src/modules/app_python3s/apy3s_kemi.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4044.patch https://github.com/kamailio/kamailio/pull/4044.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4044 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4044(a)github.com>

3 9

git:master:ef73fb87: app_python3s: fix exception handling
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: ef73fb876f527c3bde4b425e3ec70d3f613fcb87 URL: https://github.com/kamailio/kamailio/commit/ef73fb876f527c3bde4b425e3ec70d3… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-09T12:13:54+01:00 app_python3s: fix exception handling Python's C interface contract states that C code must *either* raise an exception and return NULL, *or* return a Python object. --- Modified: src/modules/app_python3s/apy3s_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/ef73fb876f527c3bde4b425e3ec70d3… Patch: https://github.com/kamailio/kamailio/commit/ef73fb876f527c3bde4b425e3ec70d3… --- diff --git a/src/modules/app_python3s/apy3s_kemi.c b/src/modules/app_python3s/apy3s_kemi.c index f28354909b7..dd23bd0f2d7 100644 --- a/src/modules/app_python3s/apy3s_kemi.c +++ b/src/modules/app_python3s/apy3s_kemi.c @@ -409,7 +409,7 @@ PyObject *sr_apy_kemi_exec_func_ex( if(pobj == NULL) { LM_ERR("null parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen); - return sr_kemi_apy_return_false(); + return NULL; } if(ket->ptypes[i] == SR_KEMIP_STR) { if(!PyUnicode_Check(pobj)) { @@ -421,7 +421,7 @@ PyObject *sr_apy_kemi_exec_func_ex( if(vps[i].v.s.s == NULL) { LM_ERR("null-string parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen); - return sr_kemi_apy_return_false(); + return NULL; } vps[i].v.s.len = (int)slen; vps[i].vtype = SR_KEMIP_STR;

1 0

git:master:91dc75e6: app_python3: fix exception handling
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: 91dc75e65bb2a6643b8b322024416c420caf5d64 URL: https://github.com/kamailio/kamailio/commit/91dc75e65bb2a6643b8b322024416c4… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-09T12:13:54+01:00 app_python3: fix exception handling Python's C interface contract states that C code must *either* raise an exception and return NULL, *or* return a Python object. --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/91dc75e65bb2a6643b8b322024416c4… Patch: https://github.com/kamailio/kamailio/commit/91dc75e65bb2a6643b8b322024416c4… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 213a19e4703..ddc987168b6 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -281,7 +281,7 @@ PyObject *sr_apy_kemi_exec_func_ex( if(pobj == NULL) { LM_ERR("null parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen); - return sr_kemi_apy_return_false(); + return NULL; } if(ket->ptypes[i] == SR_KEMIP_STR) { if(!PyUnicode_Check(pobj)) { @@ -293,7 +293,7 @@ PyObject *sr_apy_kemi_exec_func_ex( if(vps[i].v.s.s == NULL) { LM_ERR("null-string parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen); - return sr_kemi_apy_return_false(); + return NULL; } vps[i].v.s.len = (int)slen; vps[i].vtype = SR_KEMIP_STR;

1 0

t_relay() ignores destination uri ($du) set by dispatcher module
by molodtsov＠ajax.systems 09 Dec '24

09 Dec '24

Help me, kamailio step-bros, i'm stuck! Im trying to build logic, where if target client was not located on this node - message is forwarded to the next node, until sip message make full circle, and it will be handled by its 'X-Visited-Nodes' header and fire 404 if no one consumed it. (I can see that check is buggy, but i will fix this later so don't pay much attention to it) Im blocked by t_relay() behaviour, which is ignore destination selected by ds_select_dst; Instead of forwarding message, it comes on the same node again and again >>>> my dispatcher config 927 route[DISPATCH] { 928 $var(destination_found) = 0; 929 $var(checked_nodes) = ""; # Keep track of locally checked nodes 930 $var(loop_behaviour) = 0; 931 932 # Initialize X-Visited-Nodes if it doesn't exist 933 if ($hdrc(X-Visited-Nodes) == 0) { 934 append_hf_value("X-Visited-Nodes", ""); # Initialize the header in the message 935 } 936 937 xlog("X-Visited-Nodes: $hdr(X-Visited-Nodes)"); 938 append_hf_value("X-Visited-Nodes", "$du"); 939 # Round-robin dispatching on gateways group '1' 940 while (ds_select_dst("1", "4") && $var(loop_behaviour) != 2) { 941 $var(loop_behaviour) = 0; 942 # Get the current proposed destination 943 $var(current_dest) = $du; 944 945 # 1. Skip if the proposed destination is self 946 if ($var(loop_behaviour) == 0 && $var(current_dest) =~ ".*" + $Ri + ".*") { 947 xlog("Skipping self destination <$var(current_dest)>\n"); 948 ds_mark_dst(); # Mark this node globally only because it's "self" 949 $var(loop_behaviour) = 1; #continue 950 } 951 952 # 2. Check if we've made a full circle 953 if ($var(loop_behaviour) == 0 && $var(checked_nodes) =~ "^" + $var(current_dest) + ".*") { 954 xlog("All nodes checked, no valid destination found\n"); 955 send_reply("404", "No user found, no new destination available"); 956 exit; 957 } 958 959 # 3. Check if the node is already in X-Visited-Nodes 960 if ($var(loop_behaviour) == 0 && $hdr(X-Visited-Nodes) =~ ".*" + $var(current_dest) + ".*") { 961 xlog("Node <$var(current_dest)> already in X-Visited-Nodes\n"); 962 $var(checked_nodes) = $var(checked_nodes) + "," + $var(current_dest); 963 $var(loop_behaviour) = 1; #continue 964 } 965 966 if($var(loop_behaviour) == 0){ 974 xlog("DISPATCHER: selected reqURI: <$ru> ; destURI: <$du> via <$var(current_dest)> (attrs: $xavp(_dsdst_=>attrs))\n"); 975 $var(destination_found) = 1; 976 $var(loop_behaviour) = 2; # Exit the loop as a valid destination is found 977 } 978 } 979 980 # If a destination is found, relay the message 981 if ($var(destination_found)) { 987 if (!t_relay()) { 988 sl_reply_error(); 989 } 990 exit; 991 } else { 992 return(-1); 993 } 994 } >>>> INVITE message trace (every line was trimmed to not garbage this message with irrelevant info like process name or timestamp) i have enabled config trace mode, so my invite message inside dispatcher route looks like this. And on my other node, there is not a trace of invite message {1 22 INV CmLZ} <script>: Lookup for 02222 failed - no such client on this node <--- Trying to call user, which is not registered on this node, so location route returns fail and message should go on another node {1 22 INV CmLZ} trace(): request_route=[LOCATION] c=[/etc/kamailio/kamailio.cfg] l=845 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[LOCATION] c=[/etc/kamailio/kamailio.cfg] l=842 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[LOCATION] c=[/etc/kamailio/kamailio.cfg] l=843 a=2 n=return {1 22 INV CmLZ} trace(): request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=653 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=650 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=645 a=5 n=route {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=928 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=929 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=930 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=937 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=934 a=26 n=append_hf_value {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=937 a=25 n=xlog {1 22 INV CmLZ} <script>: X-Visited-Nodes: <null> {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=938 a=26 n=append_hf_value {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=978 a=23 n=while {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=940 a=26 n=ds_select_dst {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=941 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=943 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=953 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=960 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=966 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=978 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=974 a=25 n=xlog {1 22 INV CmLZ} <script>: DISPATCHER: selected reqURI: <sip:02222@kamailio-nlb-test-40f4f509064551a6.elb.eu-west-1.amazonaws.com> ; destURI: <sip:10.197.200.228:5060> via <sip:10.197.200.228:5060> (attrs: <null>) <--- destination uri is correct, message should be sent to next kamailio node isn't it? {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=975 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=976 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=940 a=26 n=ds_select_dst {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=993 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=990 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=987 a=24 n=t_relay <-- should relay to $dU destination {1 22 INV CmLZ} tm [t_lookup.c:1868]: t_newtran(): msg (0x7d0ad3775368) id=28/25950 global id=28/25950 T start=(nil) {1 22 INV CmLZ} tm [t_lookup.c:781]: t_lookup_request(): start searching: hash=9408, isACK=0 {1 22 INV CmLZ} tm [t_lookup.c:499]: matching_3261(): RFC3261 transaction matching failed - via branch [z9hG4bK.YP1EiC6qX] {1 22 INV CmLZ} tm [t_lookup.c:981]: t_lookup_request(): no transaction found {1 22 INV CmLZ} tm [h_table.c:532]: tm_xdata_swap(): copy X/AVPs from msg context to txdata {1 22 INV CmLZ} tm [t_hooks.c:301]: run_reqin_callbacks_internal(): trans=0x7d0acdbf1168, callback type 1, id 0 entered {1 22 INV CmLZ} tm [h_table.c:551]: tm_xdata_swap(): restore X/AVPs msg context from txdata {1 22 INV CmLZ} tm [h_table.c:415]: build_cell(): created new cell 0x7d0acdbf1168 {1 22 INV CmLZ} tm [t_funcs.c:339]: t_relay_to(): new INVITE {1 22 INV CmLZ} tm [t_reply.c:634]: _reply_light(): reply sent out - buf=0x7d0ad3755d98: SIP/2.0 100 trying -... shmem=0x7d0acdbf4b10: SIP/2.0 100 trying - {1 22 INV CmLZ} tm [t_reply.c:645]: _reply_light(): finished {1 22 INV CmLZ} tm [t_funcs.c:386]: t_relay_to(): new transaction forwarded {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=990 a=2 n=exit <--- same invite appears on this node instead of being forwarded to next kamailio node {1 22 INV CmLZ} trace(): request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=585 a=5 n=route {1 22 INV CmLZ} trace(): request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=699 a=67 n=set_rpl_no_connect {1 22 INV CmLZ} trace(): request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=702 a=55 n=force_rport {1 22 INV CmLZ} trace(): request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=727 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=732 a=16 n=if

1 0

git:master:ba0c570c: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: ba0c570ca95bff06c8ce04779371567d88a4e9f8 URL: https://github.com/kamailio/kamailio/commit/ba0c570ca95bff06c8ce04779371567… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-12-09T09:46:10+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/ba0c570ca95bff06c8ce04779371567… Patch: https://github.com/kamailio/kamailio/commit/ba0c570ca95bff06c8ce04779371567… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 06ee1beb53b..12a030cc19d 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1294,16 +1294,17 @@ Note See also: t_set_fr(), fr_timer. - In Kamailio compatibility mode (defined by #!KAMAILIO), the value of - the parameter must be the name of an AVP in pseudo-variable format: - $avp(name). In SER compatibility mode it must be just AVP name. + In Kamailio compatibility mode (defined by #!KAMAILIO, which is + default), the value of the parameter must be the name of an AVP in + pseudo-variable format: $avp(name). In SER compatibility mode (defined + by #!SER) it must be just AVP name. Example 1.28. Set fr_timer_avp parameter ... -# Kamailio mode -modparam("tm", "fr_timer_avp", "$avp(i:708)") -# Old SER mode -modparam("tm", "fr_timer_avp", "i:708") +# default Kamailio compatibility mode +modparam("tm", "fr_timer_avp", "$avp(frtimer)") +# old SER compatibility mode +modparam("tm", "fr_timer_avp", "frtimer") ... 3.28. fr_inv_timer_avp (string) @@ -1328,15 +1329,16 @@ Note See also: t_set_fr(), fr_inv_timer. - In Kamailio compatibility mode (defined by #!KAMAILIO), the value of - the parameter must be the name of an AVP in pseudo-variable format: - $avp(name). In SER compatibility mode it must by just AVP name. + In Kamailio compatibility mode (defined by #!KAMAILIO, which is + default), the value of the parameter must be the name of an AVP in + pseudo-variable format: $avp(name). In SER compatibility mode (defined + by #!SER) it must by just AVP name. Example 1.29. Set fr_inv_timer_avp parameter ... -# Kamailio mode +# Kamailio compatibility mode modparam("tm", "fr_inv_timer_avp", "$avp(my_fr_inv_timer)") -# Old SER mode +# old SER compatibility mode modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") ...

1 0

git:master:5e0bc1a5: tm: small updates about timer avp params and compatibility modes
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: 5e0bc1a5c9764ce472354a0aa242b7469d79eb7f URL: https://github.com/kamailio/kamailio/commit/5e0bc1a5c9764ce472354a0aa242b74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-09T09:28:50+01:00 tm: small updates about timer avp params and compatibility modes --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/5e0bc1a5c9764ce472354a0aa242b74… Patch: https://github.com/kamailio/kamailio/commit/5e0bc1a5c9764ce472354a0aa242b74… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index ecff467fa06..ad1f55e2061 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -825,19 +825,19 @@ modparam("tm", "contact_flows_avp", "tm_contact_flows") <varname>fr_timer</varname>. </para> <para> - In Kamailio compatibility mode (defined by #!KAMAILIO), the value - of the parameter must be the name of an AVP in pseudo-variable - format: $avp(name). In SER compatibility mode it must be just - AVP name. + In Kamailio compatibility mode (defined by #!KAMAILIO, which is + default), the value of the parameter must be the name of an AVP + in pseudo-variable format: $avp(name). In SER compatibility mode + (defined by #!SER) it must be just AVP name. </para> <example> <title>Set <varname>fr_timer_avp</varname> parameter</title> <programlisting> ... -# Kamailio mode -modparam("tm", "fr_timer_avp", "$avp(i:708)") -# Old SER mode -modparam("tm", "fr_timer_avp", "i:708") +# default Kamailio compatibility mode +modparam("tm", "fr_timer_avp", "$avp(frtimer)") +# old SER compatibility mode +modparam("tm", "fr_timer_avp", "frtimer") ... </programlisting> </example> @@ -871,18 +871,18 @@ modparam("tm", "fr_timer_avp", "i:708") <varname>fr_inv_timer</varname>. </para> <para> - In Kamailio compatibility mode (defined by #!KAMAILIO), the value - of the parameter must be the name of an AVP in pseudo-variable - format: $avp(name). In SER compatibility mode it must by just - AVP name. + In Kamailio compatibility mode (defined by #!KAMAILIO, which is + default), the value of the parameter must be the name of an AVP + in pseudo-variable format: $avp(name). In SER compatibility mode + (defined by #!SER) it must by just AVP name. </para> <example> <title>Set <varname>fr_inv_timer_avp</varname> parameter</title> <programlisting> ... -# Kamailio mode +# Kamailio compatibility mode modparam("tm", "fr_inv_timer_avp", "$avp(my_fr_inv_timer)") -# Old SER mode +# old SER compatibility mode modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") ... </programlisting>

1 0

[kamailio/kamailio] general protection fault in kamailio 5.5 on RHEL 8 (Issue #4057)
by pgravet 06 Dec '24

06 Dec '24

### Description Hi, I am migrating a kamailio application from RHEL 7 / KAM 5.0 to RHEL 8 / KAM 5.5 kamailio installed from repo baseurl=https://rpm.kamailio.org/centos/... Thanks for your return ### Troubleshooting general protection fault #### Reproduction Each time an INVITE is received #### Debugging Data Core was generated by `/usr/sbin/kamailio --atexit=no -DD -P /run/kamailio/kamailio.pid -f /etc/kamail'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00000000006e2be9 in qm_debug_check_frag () Missing separate debuginfos, use: yum debuginfo-install glibc-2.28-225.el8_8.6.x86_64 libblkid-2.32.1-42.el8_8.x86_64 libgcc-8.5.0-18.el8.x86_64 libmount-2.32.1-42.el8_8.x86_64 libselinux-2.9-8.el8.x86_64 libxcrypt-4.1.1-6.el8.x86_64 mariadb-connector-c-3.1.11-2.el8_3.x86_64 openssl-libs-1.1.1k-9.el8_7.x86_64 pcre2-10.32-3.el8_6.x86_64 perl-libs-5.26.3-422.el8.x86_64 systemd-libs-239-74.el8_8.5.x86_64 zlib-1.2.11-21.el8_7.x86_64 (gdb) bt #0 0x00000000006e2be9 in qm_debug_check_frag () #1 0x00000000006e6dba in qm_free () #2 0x00000000006f13c9 in qm_shm_free () #3 0x00000000005e8a2f in xavp_free () #4 0x00000000005e9ed8 in xavp_destroy_list () #5 0x00000000005e9f4f in xavp_reset_list () #6 0x00000000005ff6a1 in ksr_msg_env_reset () #7 0x00000000005fefb4 in receive_msg () #8 0x00000000004ddb1a in udp_rcv_loop () #9 0x000000000042bf00 in main_loop () #10 0x0000000000437c69 in main () (gdb) info locals No symbol table info available. (gdb) list 1 dl-call-libc-early-init.c: No such file or directory. #### Log Messages Nothing in Syslog #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information version: kamailio 5.5.7 (x86_64/linux) 43eb13 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 43eb13 compiled on 13:39:01 Jul 19 2023 with gcc 8.5.0 * **Operating System**: RHEL 8.8 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4057 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4057(a)github.com>

2 3

[kamailio/kamailio] WARNING: <script>: No transaction found for CANCEL - 54-261285 (Issue #4060)
by Muhammad Jawad Ud Din 06 Dec '24

06 Dec '24

if (is_method("CANCEL")) { xlog("L_INFO", "Received CANCEL request for $ci - Method: $rm - R-URI: $ru\n"); if (!t_check_trans()) { xlog("L_INFO", "No transaction found with t_check_trans(), trying t_lookup_cancel()\n"); # Try to find the transaction using branch and Call-ID $var(branch) = $(hdr(Via){param.value,branch}); if (!t_lookup_cancel()) { xlog("L_WARN", "No transaction found for CANCEL - $ci with branch $var(branch)\n"); sl_reply("481", "Call Leg/Transaction Does Not Exist"); exit; } xlog("L_INFO", "Found transaction using t_lookup_cancel()\n"); } # Extract destination from original request if ($ru != "") { $du = $ru; xlog("L_INFO", "Setting destination from R-URI: $du\n"); } else { xlog("L_WARN", "No R-URI found for CANCEL\n"); } # Add debugging xlog("L_INFO", "Forwarding CANCEL to $du for call $ci\n"); if (ds_is_from_list()) { ds_load_unset(); xlog("L_INFO", "Unset dispatcher load for destination\n"); } # Handle the client ID and call counting if (is_present_hf("X-VICIdial-Client-Id")) { $var(client_id) = $(hdr(X-VICIdial-Client-Id)); if ($var(client_id) =~ "^(CID_[0-9]+)-[a-z]$") { $var(parent_id) = $(var(client_id){re.subst,/^(CID_[0-9]+)-[a-z]$/\1/}); } else { $var(parent_id) = $var(client_id); } if($var(parent_id) != $null) { lock("calls_$var(parent_id)"); if($sht(clientCalls=>$var(parent_id)) > 0) { $sht(clientCalls=>$var(parent_id)) = $sht(clientCalls=>$var(parent_id)) - 1; xlog("L_INFO", "CANCEL: Decremented call count for $var(parent_id) to $sht(clientCalls=>$var(parent_id))\n"); } unlock("calls_$var(parent_id)"); } } # Send 200 OK response for the CANCEL t_reply("200", "OK"); # Force the relay of CANCEL to the destination t_relay(); exit; } "This is my cancel route. It either forwards or relays the cancel message to the destination and also provides an error." -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4060 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4060(a)github.com>

2 2

git:5.8:d01fbe59: pkg/kamailio/obs: added systemd template to start multiple kamailio services
by Sergey Safarov 06 Dec '24

06 Dec '24

Module: kamailio Branch: 5.8 Commit: d01fbe59b386ad025466bd13d71495f4c765f85d URL: https://github.com/kamailio/kamailio/commit/d01fbe59b386ad025466bd13d71495f… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2024-12-06T18:14:00+02:00 pkg/kamailio/obs: added systemd template to start multiple kamailio services GH#3904 (cherry picked from commit b4ec854c0822a61790ea4fa1bc6387cddce4cf35) --- Added: pkg/kamailio/obs/kamailio@.service Modified: pkg/kamailio/obs/kamailio.service Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d01fbe59b386ad025466bd13d71495f… Patch: https://github.com/kamailio/kamailio/commit/d01fbe59b386ad025466bd13d71495f… --- diff --git a/pkg/kamailio/obs/kamailio.service b/pkg/kamailio/obs/kamailio.service index 14a2e580890..0c4fbc49caf 100644 --- a/pkg/kamailio/obs/kamailio.service +++ b/pkg/kamailio/obs/kamailio.service @@ -1,5 +1,6 @@ [Unit] Description=Kamailio - the Open Source SIP Server +Documentation=man:kamailio(8) Wants=network-online.target After=network-online.target diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 423f7f9f3de..e889b0df375 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1200,6 +1200,7 @@ sed -i -e 's/python3/python2/' utils/kamctl/dbtextdb/dbtextdb.py # on latest dist need to add --atexit=no for Kamailio options. More details GH #2616 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 sed -i -e 's|/usr/sbin/kamailio|/usr/sbin/kamailio --atexit=no|' pkg/kamailio/obs/kamailio.service +sed -i -e 's|/usr/sbin/kamailio|/usr/sbin/kamailio --atexit=no|' pkg/kamailio/obs/kamailio@.service %endif @@ -1449,6 +1450,7 @@ install -m755 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.init \ # systemd install -d %{buildroot}%{_unitdir} install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.service %{buildroot}%{_unitdir}/kamailio.service +install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf @@ -1680,6 +1682,7 @@ fi %dir %attr(-,kamailio,kamailio) %{_var}/run/kamailio %else %{_unitdir}/kamailio.service +%{_unitdir}/kamailio@.service %{_tmpfilesdir}/kamailio.conf %endif diff --git a/pkg/kamailio/obs/kamailio@.service b/pkg/kamailio/obs/kamailio@.service new file mode 100644 index 00000000000..44a4c02a5a1 --- /dev/null +++ b/pkg/kamailio/obs/kamailio@.service @@ -0,0 +1,28 @@ +[Unit] +Description=Kamailio - the Open Source SIP Server (instance %i) +Documentation=man:kamailio(8) +Wants=network-online.target +After=network-online.target + +[Service] +Type=simple +User=kamailio +Group=kamailio +Environment='CFGFILE=/etc/kamailio/kamailio-%i.cfg' +Environment='SHM_MEMORY=64' +Environment='PKG_MEMORY=8' +EnvironmentFile=-/etc/sysconfig/kamailio-%i +EnvironmentFile=-/etc/sysconfig/kamailio-%i.d/* +# PIDFile requires a full absolute path +PIDFile=/run/kamailio-%i/kamailio.pid +# ExecStart requires a full absolute path +ExecStart=/usr/sbin/kamailio -DD -P /run/kamailio-%i/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -Y /run/kamailio-%i +Restart=on-failure +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN +# /run/kamailio in tmpfs +RuntimeDirectory=kamailio-%i +RuntimeDirectoryMode=0770 + +[Install] +WantedBy=multi-user.target

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev