sr-dev

sr-dev@lists.kamailio.org

4 participants
45456 discussions

git:master:d049b58b: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 23 Jun '25

23 Jun '25

Module: kamailio Branch: master Commit: d049b58b4e528e7ec8420465abfa7558b17a499c URL: https://github.com/kamailio/kamailio/commit/d049b58b4e528e7ec8420465abfa755… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-06-23T12:31:09+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/d049b58b4e528e7ec8420465abfa755… Patch: https://github.com/kamailio/kamailio/commit/d049b58b4e528e7ec8420465abfa755… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index fea39e0a62e..aeb0b5414fe 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -1134,6 +1134,7 @@ lookup_branches("location"); * uri - the URI to be searched in location table. * rxname - name of the XAVP to store record attributes. These are: + aor - the address of record. + + count - the number of contacts. * cxname - name of the XAVP to store content attributes, name mapping is done from the perspective of using them to send out SIP requests. These are: @@ -1148,9 +1149,9 @@ lookup_branches("location"); ... lookup_xavp("location", "$fu", "rul", "cul"); xinfo("aor: $xavp(rul=>aor)\n"); -xinfo("number of contacts: $xavp(rul>count)\n"); -xinfo("first contact record - uri: $xavp(cul>uri)\n"); -xinfo("first contact record - socket: $xavp(cul>socket)\n"); +xinfo("number of contacts: $xavp(rul=>count)\n"); +xinfo("first contact record - uri: $xavp(cul=>uri)\n"); +xinfo("first contact record - socket: $xavp(cul=>socket)\n"); ... 4.6. registered(domain [, uri [, match_option [, match_action]]])

1 0

git:master:25067526: registrar: docs: Add count attribute docs
by Xenofon Karamanos 23 Jun '25

23 Jun '25

Module: kamailio Branch: master Commit: 25067526ab659a336067e54a84b7a7b71e597dd3 URL: https://github.com/kamailio/kamailio/commit/25067526ab659a336067e54a84b7a7b… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-06-23T10:20:39Z registrar: docs: Add count attribute docs - Fix spelling mistake for accesing xavp --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/25067526ab659a336067e54a84b7a7b… Patch: https://github.com/kamailio/kamailio/commit/25067526ab659a336067e54a84b7a7b… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 848e5ae40e1..fc1e5a0fc03 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1496,6 +1496,11 @@ lookup_branches("location"); <emphasis>aor</emphasis> - the address of record. </para> </listitem> + <listitem> + <para> + <emphasis>count</emphasis> - the number of contacts. + </para> + </listitem> </itemizedlist> </listitem> <listitem> @@ -1533,9 +1538,9 @@ lookup_branches("location"); ... lookup_xavp("location", "$fu", "rul", "cul"); xinfo("aor: $xavp(rul=>aor)\n"); -xinfo("number of contacts: $xavp(rul>count)\n"); -xinfo("first contact record - uri: $xavp(cul>uri)\n"); -xinfo("first contact record - socket: $xavp(cul>socket)\n"); +xinfo("number of contacts: $xavp(rul=>count)\n"); +xinfo("first contact record - uri: $xavp(cul=>uri)\n"); +xinfo("first contact record - socket: $xavp(cul=>socket)\n"); ... </programlisting> </example> @@ -2086,4 +2091,3 @@ if(reg_fetch_contacts("location", "$fu", "caller")) </section> </chapter> -

1 0

[kamailio/kamailio] dialplan: improve performance by reusing PCRE structure (PR #4289)
by Lucian Balaceanu 23 Jun '25

23 Jun '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) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  By reusing the pcre_md structure needed by pcre2_match function we see improvements of 10x in the time of dp_translate() function call (via benchmark module). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4289 -- Commit Summary -- * dialplan: improve performance by reusing PCRE structure -- File Changes -- M src/modules/dialplan/dp_repl.c (36) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4289.patch https://github.com/kamailio/kamailio/pull/4289.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4289 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4289(a)github.com>

3 6

git:master:6d1f59df: dialplan: improve performance by reusing PCRE structure
by Victor Seva 23 Jun '25

23 Jun '25

Module: kamailio Branch: master Commit: 6d1f59df690ace49752be7b6abe6ab5f50aa5e72 URL: https://github.com/kamailio/kamailio/commit/6d1f59df690ace49752be7b6abe6ab5… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-06-23T10:31:38+02:00 dialplan: improve performance by reusing PCRE structure --- Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/6d1f59df690ace49752be7b6abe6ab5… Patch: https://github.com/kamailio/kamailio/commit/6d1f59df690ace49752be7b6abe6ab5… --- diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index d78db14eb68..82f7e32584d 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -409,7 +409,7 @@ int rule_translate(sip_msg_t *msg, str *instr, dpl_node_t *rule, int repl_nb, offset, match_nb, rc, cap_cnt; struct replace_with token; struct subst_expr *repl_comp; - pcre2_match_data *pcre_md = NULL; + static pcre2_match_data *pcre_md = NULL; str match; pv_value_t sv; str *uri; @@ -427,6 +427,14 @@ int rule_translate(sip_msg_t *msg, str *instr, dpl_node_t *rule, return 0; } + if(pcre_md == NULL) { + pcre_md = pcre2_match_data_create(MAX_REPLACE_WITH, NULL); + if(pcre_md == NULL) { + LM_ERR("failed to allocate pcre2_match_data\n"); + return -1; + } + } + if(subst_comp) { /*just in case something went wrong at load time*/ rc = pcre2_pattern_info(subst_comp, PCRE2_INFO_CAPTURECOUNT, &cap_cnt); @@ -446,7 +454,6 @@ int rule_translate(sip_msg_t *msg, str *instr, dpl_node_t *rule, } /*search for the pattern from the compiled subst_exp*/ - pcre_md = pcre2_match_data_create_from_pattern(subst_comp, NULL); if(pcre2_match(subst_comp, (PCRE2_SPTR)instr->s, (PCRE2_SIZE)instr->len, 0, 0, pcre_md, NULL) <= 0) { @@ -454,8 +461,6 @@ int rule_translate(sip_msg_t *msg, str *instr, dpl_node_t *rule, "the match_exp %.*s but not the subst_exp %.*s!\n", instr->len, instr->s, rule->match_exp.len, rule->match_exp.s, rule->subst_exp.len, rule->subst_exp.s); - if(pcre_md) - pcre2_match_data_free(pcre_md); return -1; } ovector = pcre2_get_ovector_pointer(pcre_md); @@ -472,8 +477,6 @@ int rule_translate(sip_msg_t *msg, str *instr, dpl_node_t *rule, memcpy(result->s, repl_comp->replacement.s, repl_comp->replacement.len); result->len = repl_comp->replacement.len; result->s[result->len] = '\0'; - if(pcre_md) - pcre2_match_data_free(pcre_md); return 0; } @@ -582,15 +585,11 @@ int rule_translate(sip_msg_t *msg, str *instr, dpl_node_t *rule, } result->s[result->len] = '\0'; - if(pcre_md) - pcre2_match_data_free(pcre_md); return 0; error: result->s = 0; result->len = 0; - if(pcre_md) - pcre2_match_data_free(pcre_md); return -1; } @@ -599,7 +598,7 @@ static char dp_attrs_buf[DP_MAX_ATTRS_LEN + 1]; int dp_translate_helper( sip_msg_t *msg, str *input, str *output, dpl_id_p idp, str *attrs) { - pcre2_match_data *pcre_md = NULL; + static pcre2_match_data *pcre_md = NULL; dpl_node_p rulep; dpl_index_p indexp; int user_len, rez; @@ -622,6 +621,14 @@ int dp_translate_helper( return -1; } + if(pcre_md == NULL) { + pcre_md = pcre2_match_data_create(MAX_REPLACE_WITH, NULL); + if(pcre_md == NULL) { + LM_ERR("failed to allocate pcre2_match_data\n"); + return -1; + } + } + search_rule: for(rulep = indexp->first_rule; rulep != NULL; rulep = rulep->next) { switch(rulep->matchop) { @@ -640,8 +647,6 @@ int dp_translate_helper( rez = -1; do { if(rez < 0) { - pcre_md = pcre2_match_data_create_from_pattern( - re_list->re, NULL); rez = pcre2_match(re_list->re, (PCRE2_SPTR)input->s, (PCRE2_SIZE)input->len, 0, 0, pcre_md, NULL); @@ -651,18 +656,13 @@ int dp_translate_helper( LM_DBG("match check skipped: [%.*s] %d\n", re_list->expr.len, re_list->expr.s, rez); rt = re_list->next; - if(pcre_md) - pcre2_match_data_free(pcre_md); pcre2_code_free(re_list->re); pkg_free(re_list); re_list = rt; } while(re_list); } else { - pcre_md = pcre2_match_data_create_from_pattern( - rulep->match_comp, NULL); rez = pcre2_match(rulep->match_comp, (PCRE2_SPTR)input->s, (PCRE2_SIZE)input->len, 0, 0, pcre_md, 0); - pcre2_match_data_free(pcre_md); } break;

1 0

[kamailio/kamailio] Handling Duplicate Values in secfilter Module's kamcmd Commands (Issue #4091)
by AsedMorteza 23 Jun '25

23 Jun '25

**Description** The `secfilter` module in `kamcmd` currently allows duplicate entries when adding values to certain lists (e.g., blacklists, whitelists). This can lead to unexpected behavior and potential inconsistencies. Could you clarify the reason behind accepting duplicate values? Recently, I submitted a pull request to add delete commands to the `secfilter` module #4089. When a user, for example, executes: `kamcmd secfilter.del_bl user 1005` I iterate through the entire list to ensure all occurrences of `1005` are removed, as I realized duplicates might exist. This is inefficient and could be avoided by preventing duplicates in the first place. **Proposed Solutions** 1. **Prevent Duplicates in Existing `add` Commands:** * I can modify existing `add` commands to directly prevent the addition of duplicate values. This would simplify future operations and improve performance. 2. **Introduce New `add_unique` Commands:** * I can maintain the current `add` commands for backward compatibility. * I can introduce new `add_unique` commands (e.g., `secfilter.add_bl_unique`) that explicitly reject duplicate entries. **Recommendation** I recommend implementing the first solution (preventing duplicates in existing `add` commands) as it provides the most straightforward and efficient approach. **Further Considerations** * Consider adding a check for duplicates during the `add` operation and returning an appropriate error message if a duplicate is encountered. * Document the behavior of duplicate values in the `secfilter` module's documentation. **I would appreciate your feedback and guidance on the best course of action.** -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4091 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4091(a)github.com>

6 12

git:6.0:1c2ed9b6: github: added multiarch support for rpm generation [skip ci]
by Sergey Safarov 22 Jun '25

22 Jun '25

Module: kamailio Branch: 6.0 Commit: 1c2ed9b6c1a4c82bb9fe8a98271bae3db3acee5b URL: https://github.com/kamailio/kamailio/commit/1c2ed9b6c1a4c82bb9fe8a98271bae3… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-06-22T20:53:06+03:00 github: added multiarch support for rpm generation [skip ci] (cherry picked from commit 76b6e3b9733d0382348da1a80c3cdeecec44415e) --- Modified: .github/workflows/rpm.yml --- Diff: https://github.com/kamailio/kamailio/commit/1c2ed9b6c1a4c82bb9fe8a98271bae3… Patch: https://github.com/kamailio/kamailio/commit/1c2ed9b6c1a4c82bb9fe8a98271bae3…

1 0

git:6.0:1f305801: github: generate rpm packages
by Sergey Safarov 22 Jun '25

22 Jun '25

Module: kamailio Branch: 6.0 Commit: 1f3058011f8f45f8d7ad2eb68294a9b9c6e82bcd URL: https://github.com/kamailio/kamailio/commit/1f3058011f8f45f8d7ad2eb68294a9b… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-06-22T20:28:27+03:00 github: generate rpm packages (cherry picked from commit afa2d017e3b5a1f5a776935767e485c1158be461) --- Added: .github/workflows/rpm.yml --- Diff: https://github.com/kamailio/kamailio/commit/1f3058011f8f45f8d7ad2eb68294a9b… Patch: https://github.com/kamailio/kamailio/commit/1f3058011f8f45f8d7ad2eb68294a9b… --- 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

git:6.0:3bb3b4ef: pkg/kamailio: use radcli on RHEL based dist [skip ci]
by Sergey Safarov 22 Jun '25

22 Jun '25

Module: kamailio Branch: 6.0 Commit: 3bb3b4ef8f38e944bbae94ccc51c25b3330d2faa URL: https://github.com/kamailio/kamailio/commit/3bb3b4ef8f38e944bbae94ccc51c25b… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-06-22T19:31:02+03:00 pkg/kamailio: use radcli on RHEL based dist [skip ci] (cherry picked from commit c2fc809059e0c70aa4324f5727666989ee8aff05) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3bb3b4ef8f38e944bbae94ccc51c25b… Patch: https://github.com/kamailio/kamailio/commit/3bb3b4ef8f38e944bbae94ccc51c25b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index c6e2f5929ab..68b7c46b90f 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -746,8 +746,8 @@ Summary: RADIUS modules for Kamailio Group: %{PKGGROUP} Requires: kamailio = %ver %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -Requires: freeradius-client -BuildRequires: freeradius-client-devel +Requires: radcli +BuildRequires: radcli-devel %else Requires: radiusclient-ng BuildRequires: radiusclient-ng-devel @@ -1072,7 +1072,7 @@ rm -f misc/examples/pkg/sipcapture.cfg %build %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 -export FREERADIUS=1 +export RADCLI=1 %endif make cfg prefix=/usr \ basedir=%{buildroot} \ @@ -1084,7 +1084,7 @@ make make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ jabber ndb_cassandra osp" \ %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 - FREERADIUS=1 \ + RADCLI=1 \ %endif %if 0%{?rhel} >= 8 PYTHON3=python3.12 \ @@ -1192,7 +1192,7 @@ make install make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ iptrtpproxy jabber osp" \ %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 - FREERADIUS=1 \ + RADCLI=1 \ %endif %if 0%{?rhel} >= 8 PYTHON3=python3.12 \

1 0

git:6.0:b80dd574: pkg/kamailio: removed RHEL 6 and 7 if macros from RPM spec file
by Sergey Safarov 22 Jun '25

22 Jun '25

Module: kamailio Branch: 6.0 Commit: b80dd57418fa1dad8a333f11f64f5a9df3e65332 URL: https://github.com/kamailio/kamailio/commit/b80dd57418fa1dad8a333f11f64f5a9… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-06-22T19:30:46+03:00 pkg/kamailio: removed RHEL 6 and 7 if macros from RPM spec file (cherry picked from commit 701d07df14d0d66125ff0ff3adec3ce424929472) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b80dd57418fa1dad8a333f11f64f5a9… Patch: https://github.com/kamailio/kamailio/commit/b80dd57418fa1dad8a333f11f64f5a9…

1 0

git:6.0:6d0c691c: pkg/kamailio: sipcapture remove
by Sergey Safarov 22 Jun '25

22 Jun '25

Module: kamailio Branch: 6.0 Commit: 6d0c691c379a8798822c5672d3fd515eb01f5394 URL: https://github.com/kamailio/kamailio/commit/6d0c691c379a8798822c5672d3fd515… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-06-22T19:30:15+03:00 pkg/kamailio: sipcapture remove (cherry picked from commit a7c4d4003dced50b3f6cbc7c9c6235e6bf894334) --- Modified: pkg/kamailio/obs/kamailio.spec Removed: pkg/kamailio/obs/sipcapture.service Removed: pkg/kamailio/obs/sipcapture.sysconfig Removed: pkg/kamailio/obs/sipcapture.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/6d0c691c379a8798822c5672d3fd515… Patch: https://github.com/kamailio/kamailio/commit/6d0c691c379a8798822c5672d3fd515…

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