sr-dev

sr-dev@lists.kamailio.org

17 participants
45418 discussions

git:master:898f680d: cmake: Remove unnessecary components to be consistent
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 898f680d85b3e558038b41a14fa6f2ebca05bc94 URL: https://github.com/kamailio/kamailio/commit/898f680d85b3e558038b41a14fa6f2e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T10:48:24Z cmake: Remove unnessecary components to be consistent --- Modified: src/modules/crypto/CMakeLists.txt Modified: src/modules/dnssec/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/898f680d85b3e558038b41a14fa6f2e… Patch: https://github.com/kamailio/kamailio/commit/898f680d85b3e558038b41a14fa6f2e… --- diff --git a/src/modules/crypto/CMakeLists.txt b/src/modules/crypto/CMakeLists.txt index 63d56fb6a8e..a111e1f2799 100644 --- a/src/modules/crypto/CMakeLists.txt +++ b/src/modules/crypto/CMakeLists.txt @@ -2,6 +2,6 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto) +find_package(OpenSSL REQUIRED) target_link_libraries(${module_name} PRIVATE OpenSSL::SSL OpenSSL::Crypto) diff --git a/src/modules/dnssec/CMakeLists.txt b/src/modules/dnssec/CMakeLists.txt index 82abef707b1..3177aff9a2f 100644 --- a/src/modules/dnssec/CMakeLists.txt +++ b/src/modules/dnssec/CMakeLists.txt @@ -2,7 +2,7 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto) +find_package(OpenSSL REQUIRED) find_package(Threads REQUIRED) # TODO: library libval not foud on recent distributions: whichi library is sres?

1 0

git:master:85b821b4: cmake: Remove unused groups
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 85b821b4b6e6cfaa5495d39bcd3ef2e1b939b499 URL: https://github.com/kamailio/kamailio/commit/85b821b4b6e6cfaa5495d39bcd3ef2e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T10:47:54Z cmake: Remove unused groups --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/85b821b4b6e6cfaa5495d39bcd3ef2e… Patch: https://github.com/kamailio/kamailio/commit/85b821b4b6e6cfaa5495d39bcd3ef2e… --- diff --git a/cmake/groups.cmake b/cmake/groups.cmake index 96a16979de8..d71e60318a0 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -483,37 +483,6 @@ set(MODULE_GROUP_COMMON ${MOD_LIST_TLSDEPS} ) -# For db use (db modules, excluding drivers) module_group_db=$(mod_list_db) -set(MODULE_GROUP_DB ${MOD_LIST_DB}) - -# For mysql module_group_mysql_driver=$(mod_list_mysql) -# module_group_mysql=$(module_group_mysql_driver) $(module_group_db) -set(MODULE_GROUP_MYSQL_DRIVER ${MOD_LIST_MYSQL}) -set(MODULE_GROUP_MYSQL ${MODULE_GROUP_MYSQL_DRIVER} ${MODULE_GROUP_DB}) - -# For postgress module_group_postgres_driver=$(mod_list_postgres) -# module_group_postgres=$(module_group_postgres_driver) $(module_group_db) -set(MODULE_GROUP_POSTGRES_DRIVER ${MOD_LIST_POSTGRES}) -set(MODULE_GROUP_POSTGRES ${MODULE_GROUP_POSTGRES_DRIVER} ${MODULE_GROUP_DB}) - -# For sqlite module_group_sqlite_driver=$(mod_list_sqlite) -# module_group_sqlite=$(module_group_sqlite_driver) $(module_group_db) -set(MODULE_GROUP_SQLITE_DRIVER ${MOD_LIST_SQLITE}) -set(MODULE_GROUP_SQLITE ${MODULE_GROUP_SQLITE_DRIVER} ${MODULE_GROUP_DB}) - -# For radius -set(MODULE_GROUP_RADIUS ${MODULE_LIST_RADIUS}) - -# For presence kamailio modules -set(MODULE_GROUP_PRESENCE ${MOD_LIST_PRESENCE}) - -# For cassandra -set(MODULE_GROUP_CASSANDRA_DRIVER ${MODULE_LIST_CASSANDRA}) -set(MODULE_GROUP_CASSANDRA ${MODULE_GROUP_CASSANDRA_DRIVER} ${MODULE_GROUP_DB}) - -# For all modules not compiled by default -# list(FILTER MOD_LIST_ALL EXCLUDE REGEX "${MODULE_GROUP_DEFAULT}") - # for all protocols (excl. local ones such as unix, tcp, etc.) set(AVAILABLE_GROUPS ALL DEFAULT STANDARD COMMON)

1 0

git:master:165f2cd3: cmake: Add missing defintion
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 165f2cd3c2e1197b8d1986cbc2784a24c02e06e9 URL: https://github.com/kamailio/kamailio/commit/165f2cd3c2e1197b8d1986cbc2784a2… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T10:47:24Z cmake: Add missing defintion --- Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/165f2cd3c2e1197b8d1986cbc2784a2… Patch: https://github.com/kamailio/kamailio/commit/165f2cd3c2e1197b8d1986cbc2784a2… --- diff --git a/cmake/defs.cmake b/cmake/defs.cmake index 6ec6ac59b72..7fa11e89093 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -108,6 +108,7 @@ option(CORE_TLS "CORE_TLS" OFF) if(${CORE_TLS}) set(RELEASE "${RELEASE}-tls") set(TLS_HOOKS OFF) + target_compile_definitions(common INTERFACE CORE_TLS) else() set(TLS_HOOKS ON) endif()

1 0

git:master:549643ec: cmake: Remove warning message
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 549643ec1e283b07e9fae274b6ed923065ba46e0 URL: https://github.com/kamailio/kamailio/commit/549643ec1e283b07e9fae274b6ed923… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T10:44:40Z cmake: Remove warning message --- Modified: src/modules/snmpstats/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/549643ec1e283b07e9fae274b6ed923… Patch: https://github.com/kamailio/kamailio/commit/549643ec1e283b07e9fae274b6ed923… --- diff --git a/src/modules/snmpstats/CMakeLists.txt b/src/modules/snmpstats/CMakeLists.txt index 0fc68b2c8df..fdcbe151d41 100644 --- a/src/modules/snmpstats/CMakeLists.txt +++ b/src/modules/snmpstats/CMakeLists.txt @@ -10,6 +10,6 @@ target_link_libraries(${module_name} PRIVATE NETSNMP::NETSNMP) install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mibs - DESTINATION ${CMAKE_INSTALL_DATADIR}/snmp/ + DESTINATION ${CMAKE_INSTALL_DATADIR}/snmp OPTIONAL )

1 0

git:master:cf8cdb99: cmake: Warning if no modules/group were selected
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: cf8cdb99355e19a30460229633eaf087717ee44d URL: https://github.com/kamailio/kamailio/commit/cf8cdb99355e19a30460229633eaf08… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T08:15:11Z cmake: Warning if no modules/group were selected --- Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/cf8cdb99355e19a30460229633eaf08… Patch: https://github.com/kamailio/kamailio/commit/cf8cdb99355e19a30460229633eaf08… --- diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index cc303f0bb88..0decc1865ab 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -149,8 +149,14 @@ message(STATUS "Modules to be built: ${ADDED_MODULES_LIST}") # TODO: Comment is not showing. probably a bug in CMAKE # https://gitlab.kitware.com/cmake/cmake/-/issues/26571 add_custom_target(modules COMMENT "Building modules") -add_dependencies(modules ${ADDED_MODULES_LIST}) - +if(NOT ADDED_MODULES_LIST) + message( + WARNING + "No modules to build. Did you forget to add a module group or include module?" + ) +else() + add_dependencies(modules ${ADDED_MODULES_LIST}) +endif() get_property(ALL_MODULE_DOC_TARGETS GLOBAL PROPERTY ALL_MODULE_DOC_TARGETS) # message(STATUS "ALL_MODULE_DOC_TARGETS: ${ALL_MODULE_DOC_TARGETS}")

1 0

git:master:0afea1fd: cmake: Forbid in-source builds
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 0afea1fd170a79d3f260c18a293bac1ce8fd8527 URL: https://github.com/kamailio/kamailio/commit/0afea1fd170a79d3f260c18a293bac1… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T08:14:54Z cmake: Forbid in-source builds --- Modified: CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/0afea1fd170a79d3f260c18a293bac1… Patch: https://github.com/kamailio/kamailio/commit/0afea1fd170a79d3f260c18a293bac1… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d68b5da980..22ee9a8e3a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,17 @@ project( HOMEPAGE_URL "https://www.kamailio.org" ) +# ---- Include guards ---- + +if(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR) + message( + FATAL_ERROR + "In-source builds not allowed. Please make a new directory (called a build directory) \ +and run CMake again accordingly.") +endif() + +# ---- Project settings ---- + # Set the version number set(EXTRAVERSION "-dev1") set(RELEASE "${PROJECT_VERSION}${EXTRAVERSION}")

1 0

[kamailio/kamailio] generate rpm packages using github actions (PR #4194)
by sergey-safarov 17 May '25

17 May '25

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] 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 I have refactored the rpm packaging and am now using the GitHub actions. Now `tar.gz` archive with rpm packages, source rpm and deps rpm files attached to the release message like. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4194 -- Commit Summary -- * generate rpm packages using github actions -- File Changes -- A .github/workflows/rpm.yml (57) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4194.patch https://github.com/kamailio/kamailio/pull/4194.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4194 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4194(a)github.com>

2 5

git:master:afa2d017: github: generate rpm packages
by Victor Seva 17 May '25

17 May '25

Module: kamailio Branch: master Commit: afa2d017e3b5a1f5a776935767e485c1158be461 URL: https://github.com/kamailio/kamailio/commit/afa2d017e3b5a1f5a776935767e485c… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-05-17T20:41:05+02:00 github: generate rpm packages --- Added: .github/workflows/rpm.yml --- Diff: https://github.com/kamailio/kamailio/commit/afa2d017e3b5a1f5a776935767e485c… Patch: https://github.com/kamailio/kamailio/commit/afa2d017e3b5a1f5a776935767e485c… --- diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml new file mode 100644 index 00000000000..0d890b63a8c --- /dev/null +++ b/.github/workflows/rpm.yml @@ -0,0 +1,89 @@ +--- +name: build_rpm +'on': + schedule: + - cron: '41 6 * * 0' + push: + tags: + - '[0-9]+.[0-9]+.[0-9]+' +jobs: + # is required nightly build? + # More info at https://stackoverflow.com/questions/63014786/how-to-schedule-a-github-actio… + # looking commit_id of the last successful daily build + check: + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - uses: octokit/request-action(a)v2.x + id: check_last_run + with: + route: GET /repos/{owner}/{repo}/actions/workflows/rpm.yml/runs?per_page=1&status=success + owner: ${{ github.repository_owner }} + repo: kamailio + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Show last execution info + run: | + echo "Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }}" + + outputs: + last_sha: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} + + native: + needs: [check] + if: needs.check.outputs.last_sha != github.sha + strategy: + matrix: + os: + - centos-10 + - rhel-10 + - centos-9 + - rhel-9 + - centos-8 + - rhel-8 + runner: + - ubuntu-latest + - ubuntu-24.04-arm + runs-on: ${{ matrix.runner }} + permissions: + contents: write + steps: + - name: checkout sources + uses: actions/checkout@v4 + + - name: print commit info and init hosttype var + id: init + run: | + echo ${{ github.sha }} + echo "hosttype=${HOSTTYPE}" >> $GITHUB_OUTPUT + + - name: build rpm files + uses: addnab/docker-run-action@v3 + with: + image: safarov/kamailio-builder:${{ matrix.os }} + options: -v ${{ github.workspace }}:/usr/src/kamailio + run: | + cd /usr/src/kamailio + make cfg + make -C pkg/kamailio src.rpm + rpmbuild -ra /usr/src/kamailio/kamailio*.src.rpm + cp -R /deps ~/rpmbuild/RPMS + mv ~/rpmbuild/SRPMS/* ~/rpmbuild/RPMS + mv ~/rpmbuild/RPMS . + tar czf kamailio-${{ github.ref_name }}-${{ matrix.os }}-${{ steps.init.outputs.hosttype }}.rpm.tar.gz RPMS + + - name: Push artifacts + uses: actions/upload-artifact@v4 + if: "! startsWith(github.ref, 'refs/tags/')" + with: + name: kamailio-${{ github.ref_name }}-${{ matrix.os }}-${{ steps.init.outputs.hosttype }}.rpm + path: | + RPMS/* + + - name: Release + uses: softprops/action-gh-release@v2 + if: "startsWith(github.ref, 'refs/tags/')" + with: + files: | + kamailio-${{ github.ref_name }}-${{ matrix.os }}-${{ steps.init.outputs.hosttype }}.rpm.tar.gz

1 0

[kamailio/kamailio] ims_auth: replaced t_continue_skip_timer with t_continue in cxdx_mar.c (PR #4206)
by Amin Nazari 17 May '25

17 May '25

- fixed log message in MAR Async CDP callback - fixed executing cfg_action after sending MAR Diameter request - cfg_action is the callback parameter of the ims_www_challenge function   #### 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) - [ ] 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 #4205 (replace XXXX with an open issue number) #### Description Based on the description in issue #4205, this PR will fix a bug in ims_auth module related to MAR Diameter request callbacks, by replacing the call to t_continue function with t_continue_skip_timer, after the MAR request is sent, the control will successfully move to the cfg action in Kamailio scripts. Just like what we already have in ims_registrar_scscf module, using t_continue_skip_timer instead of t_continue cause the transaction to be found and resumed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4206 -- Commit Summary -- * ims_auth: replaced t_continue_skip_timer with t_continue in cxdx_mar.c -- File Changes -- M src/modules/ims_auth/cxdx_mar.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4206.patch https://github.com/kamailio/kamailio/pull/4206.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4206 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4206(a)github.com>

2 1

git:master:74709677: ims_auth: replaced t_continue_skip_timer with t_continue in cxdx_mar.c
by Victor Seva 17 May '25

17 May '25

Module: kamailio Branch: master Commit: 7470967790a78ba67ef7acb7c87d94482fbea0cb URL: https://github.com/kamailio/kamailio/commit/7470967790a78ba67ef7acb7c87d944… Author: amnapa <marvelousvip(a)live.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-05-17T20:34:43+02:00 ims_auth: replaced t_continue_skip_timer with t_continue in cxdx_mar.c - fixed log message in MAR Async CDP callback - fixed executing cfg_action after sending MAR Diameter request - cfg_action is the callback parameter of the ims_www_challenge function --- Modified: src/modules/ims_auth/cxdx_mar.c --- Diff: https://github.com/kamailio/kamailio/commit/7470967790a78ba67ef7acb7c87d944… Patch: https://github.com/kamailio/kamailio/commit/7470967790a78ba67ef7acb7c87d944… --- diff --git a/src/modules/ims_auth/cxdx_mar.c b/src/modules/ims_auth/cxdx_mar.c index 51e05ce7a27..3868dee4f60 100644 --- a/src/modules/ims_auth/cxdx_mar.c +++ b/src/modules/ims_auth/cxdx_mar.c @@ -479,7 +479,7 @@ void async_cdp_callback( adi_list = 0; } - LM_DBG("DBG:UAR Async CDP callback: ... Done resuming transaction\n"); + LM_DBG("DBG:MAR Async CDP callback: ... Done resuming transaction\n"); set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); @@ -493,7 +493,7 @@ void async_cdp_callback( //del_nonshm_lump_rpl(&req->reply_lump); tmb.unref_cell(t); } - tmb.t_continue(data->tindex, data->tlabel, data->act); + tmb.t_continue_skip_timer(data->tindex, data->tlabel, data->act); free_saved_transaction_data(data); return; @@ -504,7 +504,7 @@ void async_cdp_callback( //del_nonshm_lump_rpl(&t->uas.request->reply_lump); tmb.unref_cell(t); } - tmb.t_continue(data->tindex, data->tlabel, data->act); + tmb.t_continue_skip_timer(data->tindex, data->tlabel, data->act); error1: free_saved_transaction_data(data);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev