- sr-dev - kamailio.org

[kamailio/kamailio] github: [skip ci]: bump tj-actions/changed-files from 42 to 43 (PR #3789)
by dependabot[bot] 18 Mar '24

18 Mar '24

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 42 to 43. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/releases">tj… releases</a>.</em></p> <blockquote> <h2>v43</h2> <h1>Changes in v43.0.0</h1> <h2>🔥🔥 BREAKING CHANGE 🔥🔥</h2> <ul> <li><code>any_{changed, modified, deleted}</code> outputs now return <code>true</code> when no file/directory patterns are specified.</li> </ul> <h2>What's Changed</h2> <ul> <li>Upgraded to v42.1.0 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1977&q… <li>chore(deps): lock file maintenance by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1979&q… <li>chore(deps): update dependency <code>@typescript-eslint/parser</code> to v7.2.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1980&q… <li>chore(deps): update dependency <code>@types/node</code> to v20.11.26 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1981&q… <li>chore(deps): update dependency <code>@typescript-eslint/eslint-plugin</code> to v7.2.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1982&q… <li>chore(deps): update dependency <code>@types/lodash</code> to v4.17.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1983&q… <li>chore(deps): update peter-evans/create-pull-request action to v6.0.2 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1984&q… <li>chore(deps): update dependency <code>@types/node</code> to v20.11.27 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1987&q… <li>feat: add support for returning true for <code>any_{changed, modified, deleted}</code> outputs when no patterns are specified by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1988&q… <li>Updated README.md by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1989&q… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/tj-actions/changed-files/compare/v42...v43.0.… <hr /> <h2>v43.0.0</h2> <h2>🔥🔥 BREAKING CHANGE 🔥🔥</h2> <ul> <li><code>any_{changed, modified, deleted}</code> outputs now return <code>true</code> when no file/directory patterns are specified.</li> </ul> <h2>What's Changed</h2> <ul> <li>Upgraded to v42.1.0 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1977&q… <li>chore(deps): lock file maintenance by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1979&q… <li>chore(deps): update dependency <code>@typescript-eslint/parser</code> to v7.2.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1980&q… <li>chore(deps): update dependency <code>@types/node</code> to v20.11.26 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1981&q… <li>chore(deps): update dependency <code>@typescript-eslint/eslint-plugin</code> to v7.2.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1982&q… <li>chore(deps): update dependency <code>@types/lodash</code> to v4.17.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1983&q… <li>chore(deps): update peter-evans/create-pull-request action to v6.0.2 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1984&q… <li>chore(deps): update dependency <code>@types/node</code> to v20.11.27 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1987&q… <li>feat: add support for returning true for <code>any_{changed, modified, deleted}</code> outputs when no patterns are specified by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1988&q… <li>Updated README.md by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1989&q… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/tj-actions/changed-files/compare/v42...v43.0.… <h2>v42.1.0</h2> <p>🚀 🚀 New Feature 🚀 🚀</p> <ul> <li>Use changed-files output to run matrix jobs by simply setting the new <code>matrix</code> input to <code>true</code>.</li> </ul> <p>This serves as an alias for setting the <code>json</code> input to <code>true</code> and the <code>escape_json</code> input to <code>false</code></p> <pre lang="yml"><code>&lt;/tr&gt;&lt;/table&gt; </code></pre> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/blob/main/HISTORY.md… changelog</a>.</em></p> <blockquote> <h1>Changelog</h1> <h1><a href="https://github.com/tj-actions/changed-files/compare/v42.1.0...v4… - (2024-03-13)</h1> <h2>🚀 Features</h2> <ul> <li>Add support for returning true for <code>any_{changed, modified, deleted}</code> outputs when no patterns are specified (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1988…) (<a href="https://github.com/tj-actions/changed-files/commit/a5cf6aa30cfbe…) - (Tonye Jack)</li> </ul> <h2>🔄 Update</h2> <ul> <li>Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1989… </ul> <p>Co-authored-by: repo-ranger[bot]  (<a href="https://github.com/tj-actions/changed-files/commit/77af4bed28674…) - (tj-actions[bot])</p> <h2>⚙️ Miscellaneous Tasks</h2> <ul> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v20.11.27 (<a href="https://github.com/tj-actions/changed-files/commit/15807c9c84ec7…) - (renovate[bot])</li> <li><strong>deps:</strong> Update peter-evans/create-pull-request action to v6.0.2 (<a href="https://github.com/tj-actions/changed-files/commit/dc458cf7531fd…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/lodash</code> to v4.17.0 (<a href="https://github.com/tj-actions/changed-files/commit/92ca3eebd01cb…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@typescript-eslint/eslint-plugin</code> to v7.2.0 (<a href="https://github.com/tj-actions/changed-files/commit/f591d0c7f0b79…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v20.11.26 (<a href="https://github.com/tj-actions/changed-files/commit/35023362e2b0f…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@typescript-eslint/parser</code> to v7.2.0 (<a href="https://github.com/tj-actions/changed-files/commit/e436cb6d85bcd…) - (renovate[bot])</li> <li><strong>deps:</strong> Lock file maintenance (<a href="https://github.com/tj-actions/changed-files/commit/257d47dfba22b…) - (renovate[bot])</li> </ul> <h2>⬆️ Upgrades</h2> <ul> <li>Upgraded to v42.1.0 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1977… </ul> <p>Co-authored-by: jackton1 <a href="mailto:17484350+jackton1@users.noreply.github.com">17484350+jackton1@users.noreply.github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/4918e1183080b…) - (tj-actions[bot])</p> <h1><a href="https://github.com/tj-actions/changed-files/compare/v42.0.7...v4… - (2024-03-09)</h1> <h2>🚀 Features</h2> <ul> <li>Add matrix alias to simplify using outputs for matrix jobs (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1975…) (<a href="https://github.com/tj-actions/changed-files/commit/008ba8ceec9f1…) - (Tonye Jack)</li> </ul> <h2>🔄 Update</h2> <ul> <li>Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1976… </ul> <p>Co-authored-by: repo-ranger[bot]  (<a href="https://github.com/tj-actions/changed-files/commit/aa08304bd477b…) - (tj-actions[bot])</p> <h2>⬆️ Upgrades</h2> <ul> <li>Upgraded to v42.0.7 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1974… </ul> <p>Co-authored-by: jackton1 <a href="mailto:17484350+jackton1@users.noreply.github.com">17484350+jackton1@users.noreply.github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/fe6c3ea0ca88f…) - (tj-actions[bot])</p> <h1><a href="https://github.com/tj-actions/changed-files/compare/v42.0.6...v4… - (2024-03-07)</h1>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/tj-actions/changed-files/commit/77af4bed28674… Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1989… <li><a href="https://github.com/tj-actions/changed-files/commit/a5cf6aa30cfbe… feat: add support for returning true for <code>any_{changed, modified, deleted}</code> o...</li> <li><a href="https://github.com/tj-actions/changed-files/commit/15807c9c84ec7… chore(deps): update dependency <code>@types/node</code> to v20.11.27</li> <li><a href="https://github.com/tj-actions/changed-files/commit/dc458cf7531fd… chore(deps): update peter-evans/create-pull-request action to v6.0.2</li> <li><a href="https://github.com/tj-actions/changed-files/commit/92ca3eebd01cb… chore(deps): update dependency <code>@types/lodash</code> to v4.17.0</li> <li><a href="https://github.com/tj-actions/changed-files/commit/f591d0c7f0b79… chore(deps): update dependency <code>@typescript-eslint/eslint-plugin</code> to v7.2.0</li> <li><a href="https://github.com/tj-actions/changed-files/commit/35023362e2b0f… chore(deps): update dependency <code>@types/node</code> to v20.11.26</li> <li><a href="https://github.com/tj-actions/changed-files/commit/e436cb6d85bcd… chore(deps): update dependency <code>@typescript-eslint/parser</code> to v7.2.0</li> <li><a href="https://github.com/tj-actions/changed-files/commit/257d47dfba22b… chore(deps): lock file maintenance</li> <li><a href="https://github.com/tj-actions/changed-files/commit/4918e1183080b… Upgraded to v42.1.0 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1977… <li>See full diff in <a href="https://github.com/tj-actions/changed-files/compare/v42...v43&qu… 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/3789 -- Commit Summary -- * github: [skip ci]: bump tj-actions/changed-files from 42 to 43 -- File Changes -- M .github/workflows/devcontainer.yaml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3789.patch https://github.com/kamailio/kamailio/pull/3789.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3789 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3789(a)github.com>

2 1

git:master:9ae99b3d: github: [skip ci]: bump tj-actions/changed-files from 42 to 43
by Victor Seva 18 Mar '24

18 Mar '24

Module: kamailio Branch: master Commit: 9ae99b3dfc6eb538ea93d6775a283096fe17384c URL: https://github.com/kamailio/kamailio/commit/9ae99b3dfc6eb538ea93d6775a28309… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-18T22:47:14+01:00 github: [skip ci]: bump tj-actions/changed-files from 42 to 43 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 42 to 43. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v42...v43) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/devcontainer.yaml --- Diff: https://github.com/kamailio/kamailio/commit/9ae99b3dfc6eb538ea93d6775a28309… Patch: https://github.com/kamailio/kamailio/commit/9ae99b3dfc6eb538ea93d6775a28309… --- diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml index 2da1e56c742..a237e2a0338 100644 --- a/.github/workflows/devcontainer.yaml +++ b/.github/workflows/devcontainer.yaml @@ -33,14 +33,14 @@ jobs: - name: Get changed files if: ${{ ! inputs.force }} id: changed-files - uses: tj-actions/changed-files@v42 + uses: tj-actions/changed-files@v43 with: since_last_remote_commit: true - name: changes in relevant files if: ${{ ! inputs.force }} id: changed-files-builder - uses: tj-actions/changed-files@v42 + uses: tj-actions/changed-files@v43 with: files: | .devcontainer/**

1 0

[kamailio/kamailio] Discrepancies in migration of commits from herlesupreeth/kamailio to upstream (Issue #3772)
by Axel Sommerfeldt 18 Mar '24

18 Mar '24

AFAIK the commits from Herle Supreeth from its fork https://github.com/herlesupreeth/kamailio were migrated manually (not via PR) to upstream at the end of last year. While reviewing the migration I have found two discrepancies: 1. https://github.com/kamailio/kamailio/commit/8b9a2977e111d9adb8595d98ab59f8c… vs. https://github.com/kamailio/kamailio/commit/a6a3bd088368fbf65c283ae27e999d3… ``` herlesupreeth/kamailio (fork) commit 8b9a2977e111d9adb8595d98ab59f8c8eb033120 Author: herlesupreeth <herlesupreeth(a)gmail.com> Date: Mon Jun 7 14:01:54 2021 +0200 IPSec fixes diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 8e0cabcb80..9de3cf7331 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -937,7 +939,14 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d) dst_port = s->port_us; } - int buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, ci.via_host.s, dst_port); + int buf_len = 0; + if (dst_proto == PROTO_TCP) { + buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tcp", ci.via_host.len, ci.via_host.s, dst_port); + } else if (dst_proto == PROTO_TLS) { + buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tls", ci.via_host.len, ci.via_host.s, dst_port); + } else { + buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, ci.via_host.s, dst_port); + } if((m->dst_uri.s = pkg_malloc(buf_len + 1)) == NULL) { LM_ERR("Error allocating memory for dst_uri\n"); ``` vs. ``` kamailio/kamailio (upstream) commit a6a3bd088368fbf65c283ae27e999d315db0844b Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 1 18:11:22 2022 +0200 ims_ipsec_pcscf: new option for ipsec_forward() to set trasport for tcp dst uri diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 5aa208d334..6f6c15e21b 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -947,8 +949,14 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) if(!(_cflags & IPSEC_NODSTURI_RESET)) { char buf[1024]; - int buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, - ci.via_host.s, dst_port); + int buf_len; + if((_cflags & IPSEC_SETDSTURI_FULL) && (dst_proto == PROTO_TCP)) { + buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tcp", + ci.via_host.len, ci.via_host.s, dst_port); + } else { + buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, + ci.via_host.s, dst_port); + } if((m->dst_uri.s = pkg_malloc(buf_len + 1)) == NULL) { LM_ERR("Error allocating memory for dst_uri\n"); ``` To me it seems the handling of the case `dst_proto == PROTO_TLS` is missing upstream. 2. The commit https://github.com/kamailio/kamailio/commit/bfb0a17f3998d26991b4da7a8e83b8c… seems to be absent in upstream. (From my point of view all the other commits are migrated fine, thanks for the good work!) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3772 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3772(a)github.com>

4 7

git:5.8:0af55b0e: pdb server: Return negative carrierid for failures. Clang format
by Stefan-Cristian Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: 5.8 Commit: 0af55b0eac8c3457db859a9c37fea211ece91b8a URL: https://github.com/kamailio/kamailio/commit/0af55b0eac8c3457db859a9c37fea21… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-03-18T13:36:10+02:00 pdb server: Return negative carrierid for failures. Clang format (cherry-picked from commit 88b698e0f62c39ed60af9f0a4fb3ca2dc6867d8f) --- Modified: utils/pdbt/pdb_server.c Modified: utils/pdbt/pdb_server_backend.c --- Diff: https://github.com/kamailio/kamailio/commit/0af55b0eac8c3457db859a9c37fea21… Patch: https://github.com/kamailio/kamailio/commit/0af55b0eac8c3457db859a9c37fea21…

1 0

git:5.8:6410f375: pdb: Return negative carrierid for failures
by Stefan-Cristian Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: 5.8 Commit: 6410f375cd6d1e357afeb9e100bd3a3c51321280 URL: https://github.com/kamailio/kamailio/commit/6410f375cd6d1e357afeb9e100bd3a3… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-03-18T13:35:05+02:00 pdb: Return negative carrierid for failures (cherry-picked from commit bf78b619ae28924361fb2c757a4d09eb1a39f5cd) --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/6410f375cd6d1e357afeb9e100bd3a3… Patch: https://github.com/kamailio/kamailio/commit/6410f375cd6d1e357afeb9e100bd3a3… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 6889e63b915..1398f7574f8 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -393,20 +393,20 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, goto found; } break; - case PDB_CODE_NOT_NUMBER: - LM_NOTICE("Number %s has letters in it\n", - number.s); - carrierid = 0; - goto found; case PDB_CODE_NOT_FOUND: LM_NOTICE("Number %s pdb_id not found\n", number.s); - carrierid = 0; + carrierid = -1; + goto found; + case PDB_CODE_NOT_NUMBER: + LM_NOTICE("Number %s has letters in it\n", + number.s); + carrierid = -2; goto found; default: LM_NOTICE("Invalid code %d received\n", msg.hdr.code); - carrierid = 0; + carrierid = -3; goto found; }

1 0

git:5.7:c717c016: pdb server: Return negative carrierid for failures. Clang format
by Stefan-Cristian Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: 5.7 Commit: c717c016b70a82566dfc58d8d9dee3d3f51ddb01 URL: https://github.com/kamailio/kamailio/commit/c717c016b70a82566dfc58d8d9dee3d… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-03-18T13:25:21+02:00 pdb server: Return negative carrierid for failures. Clang format (cherry-picked from commit 88b698e0f62c39ed60af9f0a4fb3ca2dc6867d8f) --- Modified: utils/pdbt/pdb_server.c Modified: utils/pdbt/pdb_server_backend.c --- Diff: https://github.com/kamailio/kamailio/commit/c717c016b70a82566dfc58d8d9dee3d… Patch: https://github.com/kamailio/kamailio/commit/c717c016b70a82566dfc58d8d9dee3d… --- diff --git a/utils/pdbt/pdb_server.c b/utils/pdbt/pdb_server.c index 6ce32557cc7..2de2ba789d7 100644 --- a/utils/pdbt/pdb_server.c +++ b/utils/pdbt/pdb_server.c @@ -151,7 +151,7 @@ int udp_server(int so) carrierid = lookup_number(msg.bdy.payload); /* check if not found pdb_id */ - if(carrierid == 0) { + if(carrierid == -1) { pdb_msg_format_send(&msg, PDB_VERSION_1, PDB_TYPE_REPLY_ID, PDB_CODE_NOT_FOUND, htons(msg.hdr.id), NULL, 0); goto msg_send; diff --git a/utils/pdbt/pdb_server_backend.c b/utils/pdbt/pdb_server_backend.c index dc4028bee19..931e28d7603 100644 --- a/utils/pdbt/pdb_server_backend.c +++ b/utils/pdbt/pdb_server_backend.c @@ -44,8 +44,8 @@ carrier_t lookup_number(char *number) carrier_t carrierid; int nmatch = dtm_longest_match(mroot, number, strlen(number), &carrierid); if(nmatch <= 0) { - /* nothing found - return id 0 */ - carrierid = 0; + /* nothing found - return id -1 */ + carrierid = -1; } LINFO("request='%s', nmatch=%ld, carrier=%ld\n", number, (long int)nmatch, (long int)carrierid);

1 0

git:5.7:e8150f78: pdb: Return negative carrierid for failures
by Stefan-Cristian Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: 5.7 Commit: e8150f78630f7991ea31a385c899c32c0e330a26 URL: https://github.com/kamailio/kamailio/commit/e8150f78630f7991ea31a385c899c32… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-03-18T13:23:29+02:00 pdb: Return negative carrierid for failures (cherry picked from commit bf78b619ae28924361fb2c757a4d09eb1a39f5cd) --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/e8150f78630f7991ea31a385c899c32… Patch: https://github.com/kamailio/kamailio/commit/e8150f78630f7991ea31a385c899c32… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 75013cccb7a..3c37e5971ea 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -386,20 +386,20 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, goto found; } break; - case PDB_CODE_NOT_NUMBER: - LM_NOTICE("Number %s has letters in it\n", - number.s); - carrierid = 0; - goto found; case PDB_CODE_NOT_FOUND: LM_NOTICE("Number %s pdb_id not found\n", number.s); - carrierid = 0; + carrierid = -1; + goto found; + case PDB_CODE_NOT_NUMBER: + LM_NOTICE("Number %s has letters in it\n", + number.s); + carrierid = -2; goto found; default: LM_NOTICE("Invalid code %d received\n", msg.hdr.code); - carrierid = 0; + carrierid = -3; goto found; }

1 0

git:5.6:16f053f5: pdb server: Return negative carrierid for failures. Clang format
by Stefan-Cristian Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: 5.6 Commit: 16f053f5eb3a36992225c1a72db3575165bb68a8 URL: https://github.com/kamailio/kamailio/commit/16f053f5eb3a36992225c1a72db3575… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-03-18T13:21:18+02:00 pdb server: Return negative carrierid for failures. Clang format (cherry picked from commit 88b698e0f62c39ed60af9f0a4fb3ca2dc6867d8f) --- Modified: utils/pdbt/pdb_server.c Modified: utils/pdbt/pdb_server_backend.c --- Diff: https://github.com/kamailio/kamailio/commit/16f053f5eb3a36992225c1a72db3575… Patch: https://github.com/kamailio/kamailio/commit/16f053f5eb3a36992225c1a72db3575… --- diff --git a/utils/pdbt/pdb_server.c b/utils/pdbt/pdb_server.c index 6ce32557cc7..2de2ba789d7 100644 --- a/utils/pdbt/pdb_server.c +++ b/utils/pdbt/pdb_server.c @@ -151,7 +151,7 @@ int udp_server(int so) carrierid = lookup_number(msg.bdy.payload); /* check if not found pdb_id */ - if(carrierid == 0) { + if(carrierid == -1) { pdb_msg_format_send(&msg, PDB_VERSION_1, PDB_TYPE_REPLY_ID, PDB_CODE_NOT_FOUND, htons(msg.hdr.id), NULL, 0); goto msg_send; diff --git a/utils/pdbt/pdb_server_backend.c b/utils/pdbt/pdb_server_backend.c index dc4028bee19..931e28d7603 100644 --- a/utils/pdbt/pdb_server_backend.c +++ b/utils/pdbt/pdb_server_backend.c @@ -44,8 +44,8 @@ carrier_t lookup_number(char *number) carrier_t carrierid; int nmatch = dtm_longest_match(mroot, number, strlen(number), &carrierid); if(nmatch <= 0) { - /* nothing found - return id 0 */ - carrierid = 0; + /* nothing found - return id -1 */ + carrierid = -1; } LINFO("request='%s', nmatch=%ld, carrier=%ld\n", number, (long int)nmatch, (long int)carrierid);

1 0

git:5.6:831b8329: pdb: Return negative carrierid for failures
by Stefan-Cristian Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: 5.6 Commit: 831b832916083900d1426e53518f34ed77aa28ad URL: https://github.com/kamailio/kamailio/commit/831b832916083900d1426e53518f34e… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-03-18T13:20:09+02:00 pdb: Return negative carrierid for failures (cherry picked from commit bf78b619ae28924361fb2c757a4d09eb1a39f5cd) --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/831b832916083900d1426e53518f34e… Patch: https://github.com/kamailio/kamailio/commit/831b832916083900d1426e53518f34e… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index bfe31b4e8eb..e310d43acae 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -386,20 +386,20 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, goto found; } break; - case PDB_CODE_NOT_NUMBER: - LM_NOTICE("Number %s has letters in it\n", - number.s); - carrierid = 0; - goto found; case PDB_CODE_NOT_FOUND: LM_NOTICE("Number %s pdb_id not found\n", number.s); - carrierid = 0; + carrierid = -1; + goto found; + case PDB_CODE_NOT_NUMBER: + LM_NOTICE("Number %s has letters in it\n", + number.s); + carrierid = -2; goto found; default: LM_NOTICE("Invalid code %d received\n", msg.hdr.code); - carrierid = 0; + carrierid = -3; goto found; }

1 0

git:master:04a73ace: acc: more log messages of failure arsing extra acc string
by Daniel-Constantin Mierla 18 Mar '24

18 Mar '24

Module: kamailio Branch: master Commit: 04a73ace6572dd5c95a8f50b39b2ce712f7ebe84 URL: https://github.com/kamailio/kamailio/commit/04a73ace6572dd5c95a8f50b39b2ce7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-18T11:02:07+01:00 acc: more log messages of failure arsing extra acc string --- Modified: src/modules/acc/acc_extra.c --- Diff: https://github.com/kamailio/kamailio/commit/04a73ace6572dd5c95a8f50b39b2ce7… Patch: https://github.com/kamailio/kamailio/commit/04a73ace6572dd5c95a8f50b39b2ce7… --- diff --git a/src/modules/acc/acc_extra.c b/src/modules/acc/acc_extra.c index 255057a99c4..a84f02bbe02 100644 --- a/src/modules/acc/acc_extra.c +++ b/src/modules/acc/acc_extra.c @@ -127,8 +127,10 @@ struct acc_extra *parse_acc_extra(char *extra_str) foo = s; while(*s && !isspace((int)*s) && EQUAL != *s) s++; - if(*s == 0) + if(*s == 0) { + LM_ERR("unexpected end of string\n"); goto parse_error; + } if(*s == EQUAL) { extra->name.len = (s++) - foo; } else { @@ -136,8 +138,10 @@ struct acc_extra *parse_acc_extra(char *extra_str) /* skip spaces */ while(*s && isspace((int)*s)) s++; - if(*s != EQUAL) + if(*s != EQUAL) { + LM_ERR("unexpected char '%c' instead of '='\n", *s); goto parse_error; + } s++; } extra->name.s = foo; @@ -149,15 +153,19 @@ struct acc_extra *parse_acc_extra(char *extra_str) /* get value type */ stmp.s = s; stmp.len = strlen(s); - if((foo = pv_parse_spec(&stmp, &extra->spec)) == 0) + if((foo = pv_parse_spec(&stmp, &extra->spec)) == 0) { + LM_ERR("failed to parse variable name\n"); goto parse_error; + } s = foo; /* skip spaces */ while(*s && isspace((int)*s)) s++; - if(*s && (*(s++) != SEPARATOR || *s == 0)) + if(*s && (*(s++) != SEPARATOR || *s == 0)) { + LM_ERR("unexpected char at end of name=var group\n"); goto parse_error; + } } /* go throught all extras and make the names null terminated */

1 0

[kamailio/kamailio] pdb: Return negative carrierid for failures (PR #3775)
by Stefan Mititelu 18 Mar '24

18 Mar '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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Carrier id 0 might be a valid carrier number(e.g. for Germany D000-D999 are valid). Return negative carrier id in case of failures. If all ok, I'd like to backport this to 5.8, 5.7 and 5.6 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3775 -- Commit Summary -- * pdb: Return negative carrierid for failures -- File Changes -- M src/modules/pdb/pdb.c (14) M utils/pdbt/pdb_server.c (2) M utils/pdbt/pdb_server_backend.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3775.patch https://github.com/kamailio/kamailio/pull/3775.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3775 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3775(a)github.com>

2 6

git:master:8cf5892c: pdb server: Return negative carrierid for failures. Clang format
by Stefan Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: master Commit: 8cf5892cb34248cea2deea606a0f7d46d574404b URL: https://github.com/kamailio/kamailio/commit/8cf5892cb34248cea2deea606a0f7d4… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2024-03-18T10:55:24+02:00 pdb server: Return negative carrierid for failures. Clang format --- Modified: utils/pdbt/pdb_server.c Modified: utils/pdbt/pdb_server_backend.c --- Diff: https://github.com/kamailio/kamailio/commit/8cf5892cb34248cea2deea606a0f7d4… Patch: https://github.com/kamailio/kamailio/commit/8cf5892cb34248cea2deea606a0f7d4…

1 0

git:master:0fd1516b: pdb: Return negative carrierid for failures
by Stefan Mititelu 18 Mar '24

18 Mar '24

Module: kamailio Branch: master Commit: 0fd1516b9519f84a0f24b3c9a2c643e74f1dc527 URL: https://github.com/kamailio/kamailio/commit/0fd1516b9519f84a0f24b3c9a2c643e… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2024-03-18T10:55:24+02:00 pdb: Return negative carrierid for failures --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/0fd1516b9519f84a0f24b3c9a2c643e… Patch: https://github.com/kamailio/kamailio/commit/0fd1516b9519f84a0f24b3c9a2c643e… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 6889e63b915..1398f7574f8 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -393,20 +393,20 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, goto found; } break; - case PDB_CODE_NOT_NUMBER: - LM_NOTICE("Number %s has letters in it\n", - number.s); - carrierid = 0; - goto found; case PDB_CODE_NOT_FOUND: LM_NOTICE("Number %s pdb_id not found\n", number.s); - carrierid = 0; + carrierid = -1; + goto found; + case PDB_CODE_NOT_NUMBER: + LM_NOTICE("Number %s has letters in it\n", + number.s); + carrierid = -2; goto found; default: LM_NOTICE("Invalid code %d received\n", msg.hdr.code); - carrierid = 0; + carrierid = -3; goto found; }

1 0

git:master:1380a4a0: ctl: handle int input for double storage
by Daniel-Constantin Mierla 18 Mar '24

18 Mar '24

Module: kamailio Branch: master Commit: 1380a4a0d18159c7130b70c0216134a253ad83f7 URL: https://github.com/kamailio/kamailio/commit/1380a4a0d18159c7130b70c0216134a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-18T08:16:44+01:00 ctl: handle int input for double storage --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/1380a4a0d18159c7130b70c0216134a… Patch: https://github.com/kamailio/kamailio/commit/1380a4a0d18159c7130b70c0216134a… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index fd247bc603a..7909bc930d4 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -719,10 +719,12 @@ inline static unsigned char *binrpc_read_record(struct binrpc_parse_ctx *ctx, *err = E_BINRPC_MORE_DATA; goto error; } - if((v->type != type) && (v->type != BINRPC_T_ALL)) { - goto error_type; + if(!(v->type == BINRPC_T_DOUBLE && type == BINRPC_T_INT)) { + if((v->type != type) && (v->type != BINRPC_T_ALL)) { + goto error_type; + } + v->type = type; } - v->type = type; switch(type) { case BINRPC_T_STRUCT: if(ctx->in_struct) { @@ -779,7 +781,12 @@ inline static unsigned char *binrpc_read_record(struct binrpc_parse_ctx *ctx, case BINRPC_T_INT: if(ctx->in_struct && smode == 0) goto error_record; - p = binrpc_read_int(&v->u.intval, len, p, end, err); + if(v->type == BINRPC_T_DOUBLE) { + p = binrpc_read_int(&tmp, len, p, end, err); + v->u.fval = tmp; + } else { + p = binrpc_read_int(&v->u.intval, len, p, end, err); + } break; case BINRPC_T_STR: if(ctx->in_struct && smode == 0)

1 0

[kamailio/kamailio] ims_ipsec_pcscf: TLS support in ipsec_forward() improved (PR #3780)
by Axel Sommerfeldt 18 Mar '24

18 Mar '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 - [ ] Tested changes locally - [x] Related to issue #3772 #### Description  This patch was initially done by Herle Supreeth in his fork but isn't present upstream yet: https://github.com/kamailio/kamailio/commit/8b9a2977e111d9adb8595d98ab59f8c… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3780 -- Commit Summary -- * ims_ipsec_pcscf: TLS support in ipsec_forward() improved -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3780.patch https://github.com/kamailio/kamailio/pull/3780.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3780 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3780(a)github.com>

2 2

git:master:3154a0ab: ims_ipsec_pcscf: TLS support in ipsec_forward() improved
by Daniel-Constantin Mierla 18 Mar '24

18 Mar '24

Module: kamailio Branch: master Commit: 3154a0aba5543cab75153429bc8ec617c3484f71 URL: https://github.com/kamailio/kamailio/commit/3154a0aba5543cab75153429bc8ec61… Author: Axel Sommerfeldt <axel.sommerfeldt(a)fastmail.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-18T08:03:56+01:00 ims_ipsec_pcscf: TLS support in ipsec_forward() improved This patch was initially done by Herle Supreeth in his fork but isn't present upstream yet: https://github.com/kamailio/kamailio/commit/8b9a2977e111d9adb8595d98ab59f8c… See also: https://github.com/kamailio/kamailio/issues/3772 --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/3154a0aba5543cab75153429bc8ec61… Patch: https://github.com/kamailio/kamailio/commit/3154a0aba5543cab75153429bc8ec61… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 47f9e401702..4f7301b56c1 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -1126,6 +1126,10 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tcp", ci.via_host.len, ci.via_host.s, dst_port); + } else if((_cflags & IPSEC_SETDSTURI_FULL) && (dst_proto == PROTO_TLS)) { + buf_len = + snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tls", + ci.via_host.len, ci.via_host.s, dst_port); } else { buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, ci.via_host.s, dst_port);

1 0

[kamailio/kamailio] Docs: TLS module known limitation needs clarifications (Issue #3717)
by Thierno IB. BARRY 15 Mar '24

15 Mar '24

### Description We recently deployed successfully Kamailio with TLS certificates. Now we would like to use let's encrypt certificate which expire after 3 months. Means we need to renew certificate approximatively every 2 months. But while reading docs, in [known limitations](https://kamailio.org/docs/modules/devel/modules/tls.html#tls.k… it says : > TLS specific config reloading is not safe, so for now better don't use it, especially under heavy traffic. We struggle to understand if this behaviour is risky and not recommended under heavy traffic for certificate renewal. The doc has been added initially by @poandrei 18 years ago in Feb 21 2007 (see [commit](https://github.com/kamailio/kamailio/commit/32e4977cdb9c1c9ca24c140…) While digging we came across few discussions Kamailio user groups which are saying "the opposite" (kind of): - [Comments by a co-founder of Kamailio ](https://www.mail-archive.com/sr-users@lists.kamailio.org/msg16014.html)stating that the old connections shouldn’t be affected by reload. - Comments by a Kamailio core developer stating that certificate reload is fine with the “reload” cmd ([link1](https://lists.kamailio.org/pipermail/sr-users/2022-February/114296.h…, [link2](https://github.com/kamailio/kamailio/issues/3305)) Plus in another section in docs: - [By definition :](https://kamailio.org/docs/modules/devel/modules/tls.html#tls.r.tls.reload) (the) existing active TLS connections are not terminated and they continue to use the old certificates. The new configuration will be used for new connections. So 18 years after, Is it safe to use `tls.reload` command in production and in heavy traffic for **TLS certificate renewal** ? Because it sounds scary and confusing. So the documentation as it is, really needs clarifications to let users know which risk they're taking when running the `tls.reload` command.  ### Expected behavior The document should clearly documents risks, at least for certificate renewal. #### Actual observed behavior Docs and Kamailio user/dev groups are confusing. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3717 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3717(a)github.com>

3 6

git:5.8:d6cd0859: file_out: Fix var position and initialize
by Xenofon Karamanos 14 Mar '24

14 Mar '24

Module: kamailio Branch: 5.8 Commit: d6cd0859158a8013e998ec779e956a550b493934 URL: https://github.com/kamailio/kamailio/commit/d6cd0859158a8013e998ec779e956a5… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-14T16:49:27Z file_out: Fix var position and initialize (cherry picked from commit e36b2232e9b097794845659f71543bc57ef58a35) --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/d6cd0859158a8013e998ec779e956a5… Patch: https://github.com/kamailio/kamailio/commit/d6cd0859158a8013e998ec779e956a5… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index ad055f1852c..549eaa6e48f 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -545,7 +545,10 @@ static int fo_get_full_path(const int index, char *full_path) static int fo_write_to_file(sip_msg_t *msg, char *index, char *log_message) { int result, file_index; - str fo_prefix_str, fo_prefix_val; + str fo_prefix_str = str_init(""); + str fo_prefix_val = str_init(""); + str value = str_init(""); + fo_log_message_t logMessage = {0, 0, 0}; if(index == NULL || log_message == NULL) { LM_ERR("filename or log_messsage is NULL\n"); @@ -558,7 +561,6 @@ static int fo_write_to_file(sip_msg_t *msg, char *index, char *log_message) return -1; } - str value = str_init(""); result = get_str_fparam(&value, msg, (fparam_t *)log_message); if(result < 0) { LM_ERR("Failed to get string from param 1: %d\n", result); @@ -576,7 +578,6 @@ static int fo_write_to_file(sip_msg_t *msg, char *index, char *log_message) } /* Add the logging string to the global gueue */ - fo_log_message_t logMessage = {0, 0, 0}; logMessage.prefix = &fo_prefix_val; logMessage.message = &value; logMessage.dest_file = file_index;

1 0

git:master:e36b2232: file_out: Fix var position and initialize
by Xenofon Karamanos 14 Mar '24

14 Mar '24

Module: kamailio Branch: master Commit: e36b2232e9b097794845659f71543bc57ef58a35 URL: https://github.com/kamailio/kamailio/commit/e36b2232e9b097794845659f71543bc… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-14T16:47:28Z file_out: Fix var position and initialize --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/e36b2232e9b097794845659f71543bc… Patch: https://github.com/kamailio/kamailio/commit/e36b2232e9b097794845659f71543bc… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index f3dcfb831d9..7e035f13359 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -552,7 +552,10 @@ static int fo_get_full_path(const int index, char *full_path) static int fo_write_to_file(sip_msg_t *msg, char *index, char *log_message) { int result, file_index; - str fo_prefix_str, fo_prefix_val; + str fo_prefix_str = str_init(""); + str fo_prefix_val = str_init(""); + str value = str_init(""); + fo_log_message_t logMessage = {0, 0, 0}; if(index == NULL || log_message == NULL) { LM_ERR("filename or log_messsage is NULL\n"); @@ -565,7 +568,6 @@ static int fo_write_to_file(sip_msg_t *msg, char *index, char *log_message) return -1; } - str value = str_init(""); result = get_str_fparam(&value, msg, (fparam_t *)log_message); if(result < 0) { LM_ERR("Failed to get string from param 1: %d\n", result); @@ -583,7 +585,6 @@ static int fo_write_to_file(sip_msg_t *msg, char *index, char *log_message) } /* Add the logging string to the global gueue */ - fo_log_message_t logMessage = {0, 0, 0}; logMessage.prefix = &fo_prefix_val; logMessage.message = &value; logMessage.dest_file = file_index;

1 0

git:master:5f6c8d6b: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 14 Mar '24

14 Mar '24

Module: kamailio Branch: master Commit: 5f6c8d6b74bb792eb9c5a6fba7a1fc149e838121 URL: https://github.com/kamailio/kamailio/commit/5f6c8d6b74bb792eb9c5a6fba7a1fc1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-14T12:16:16+01:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/5f6c8d6b74bb792eb9c5a6fba7a1fc1… Patch: https://github.com/kamailio/kamailio/commit/5f6c8d6b74bb792eb9c5a6fba7a1fc1…

1 0

git:master:dd1ddf0a: secsipid: docs for secsipid_verify(...)
by Daniel-Constantin Mierla 14 Mar '24

14 Mar '24

Module: kamailio Branch: master Commit: dd1ddf0a5ad57395bc6aa7c71b47e43d1c7c5542 URL: https://github.com/kamailio/kamailio/commit/dd1ddf0a5ad57395bc6aa7c71b47e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-14T12:15:16+01:00 secsipid: docs for secsipid_verify(...) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dd1ddf0a5ad57395bc6aa7c71b47e43… Patch: https://github.com/kamailio/kamailio/commit/dd1ddf0a5ad57395bc6aa7c71b47e43… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 7ea74f525a0..c43ccf3c637 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -297,6 +297,52 @@ request_route { ... } ... +</programlisting> + </example> + <para> + Further checks can be done with config operations, decoding the JWT header + and payload using {s.select} and {s.decode.base64t} transformations + together with jansson module. + </para> + </section> + <section id="secsipid.f.secsipid_verify"> + <title> + <function moreinfo="none">secsipid_verify(sIdentity, keyVal, opts)</function> + </title> + <para> + Check the validity of the "sIdentity" parameter using the key value + given in the parameter "keyVal". The validity of the JWT + in the sIdentity value is also checked against the "expire" + parameter. + </para> + <para> + The "opts" parameter provides the verify options: + <itemizedlist> + <listitem> + <para> + <emphasis>A</emphasis> (uppercase) - skip verifying the attributes + in the JWT header. + </para> + </listitem> + </itemizedlist> + </para> + <para> + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>secsipid_verify</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + http_client_query("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)"); + if(secsipid_verify("$hdr(Identity)", "$var(pubkey)", "A")) { ... } + ... +} +... </programlisting> </example> <para> @@ -541,4 +587,3 @@ make install </section> </chapter> -

1 0

git:master:3dcebaed: secsipid: new function to verify identity value with options
by Daniel-Constantin Mierla 14 Mar '24

14 Mar '24

Module: kamailio Branch: master Commit: 3dcebaed01a75e2666345412713c391b6186cc69 URL: https://github.com/kamailio/kamailio/commit/3dcebaed01a75e2666345412713c391… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-14T12:15:16+01:00 secsipid: new function to verify identity value with options - secsipid_verify(identity, keyval, opts) - the options can be: - A - do not verify the header attributes --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3dcebaed01a75e2666345412713c391… Patch: https://github.com/kamailio/kamailio/commit/3dcebaed01a75e2666345412713c391… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index b8c80382ac1..d0615d3d058 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -56,6 +56,8 @@ static int w_secsipid_check_identity( static int w_secsipid_check(sip_msg_t *msg, char *pidentity, char *pkeypath); static int w_secsipid_check_identity_pubkey( sip_msg_t *msg, char *pkeyval, char *str2); +static int w_secsipid_verify( + sip_msg_t *msg, char *pidentity, char *pkeyval, char *popts); static int w_secsipid_add_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, char *pattest, char *porigid, char *px5u, char *pkeypath); static int w_secsipid_build_identity(sip_msg_t *msg, char *porigtn, @@ -96,6 +98,8 @@ static cmd_export_t cmds[]={ fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"secsipid_check", (cmd_function)w_secsipid_check, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, + {"secsipid_verify", (cmd_function)w_secsipid_verify, 3, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"secsipid_add_identity", (cmd_function)w_secsipid_add_identity, 6, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"secsipid_build_identity", (cmd_function)w_secsipid_build_identity, 6, @@ -405,6 +409,73 @@ static int w_secsipid_check(sip_msg_t *msg, char *pidentity, char *pkeypath) return ki_secsipid_check(msg, &sidentity, &keypath); } +/** + * + */ +static int ki_secsipid_verify( + sip_msg_t *msg, str *sidentity, str *keyval, str *opts) +{ + int ret = 1; + + if(secsipid_cache_dir.len > 0) { + _secsipid_papi.SecSIPIDSetFileCacheOptions( + secsipid_cache_dir.s, secsipid_cache_expire); + } + if(secsipid_libopt_list_used == 0) { + str_list_t *sit; + for(sit = secsipid_libopt_list; sit != NULL; sit = sit->next) { + _secsipid_papi.SecSIPIDOptSetV(sit->s.s); + } + secsipid_libopt_list_used = 1; + } + if(opts != NULL && opts->s[0] == 'A') { + _secsipid_papi.SecSIPIDOptSetN("AttrsVerify", 0); + } + + ret = _secsipid_papi.SecSIPIDCheckFullPubKey(sidentity->s, sidentity->len, + secsipid_expire, keyval->s, keyval->len); + + if(opts != NULL && opts->s[0] == 'A') { + _secsipid_papi.SecSIPIDOptSetN("AttrsVerify", 1); + } + + if(ret == 0) { + LM_DBG("identity verify: ok\n"); + return 1; + } + + LM_DBG("identity verify: failed\n"); + return ret; +} + +/** + * + */ +static int w_secsipid_verify( + sip_msg_t *msg, char *pidentity, char *pkeyval, char *popts) +{ + str sidentity = STR_NULL; + str keyval = STR_NULL; + str opts = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t *)pidentity, &sidentity) < 0) { + LM_ERR("failed to get identity value parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t *)pkeyval, &keyval) < 0) { + LM_ERR("failed to get keyval parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t *)popts, &opts) < 0) { + LM_ERR("failed to get opts parameter\n"); + return -1; + } + + return ki_secsipid_verify(msg, &sidentity, &keyval, &opts); +} + #define SECSIPID_MODE_VALHDR (1 << 0) #define SECSIPID_MODE_VALVAR (1 << 1) #define SECSIPID_MODE_KEYPATH (1 << 2) @@ -1025,6 +1096,11 @@ static sr_kemi_t sr_kemi_secsipid_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("secsipid"), str_init("secsipid_verify"), + SR_KEMIP_INT, ki_secsipid_verify, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("secsipid"), str_init("secsipid_add_identity"), SR_KEMIP_INT, ki_secsipid_add_identity, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

1 0

git:5.7:1666d4bc: topos: properly handle cases of no user in contact for mode 1
by Daniel-Constantin Mierla 14 Mar '24

14 Mar '24

Module: kamailio Branch: 5.7 Commit: 1666d4bce924b8c0d44119491199a164c9642469 URL: https://github.com/kamailio/kamailio/commit/1666d4bce924b8c0d44119491199a16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-14T10:12:11+01:00 topos: properly handle cases of no user in contact for mode 1 - contact mode 1 accepted cases with no-user in contact uri but not in r-uri, however, requests within dialog can have one's contact in r-uri and then processing failed (cherry picked from commit 24e410f9a20d004f55bcc79cd10fb35cb26e4570) (cherry picked from commit 45ee72fcf0ae8aeb135196ef8729fe0cea14048e) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/1666d4bce924b8c0d44119491199a16… Patch: https://github.com/kamailio/kamailio/commit/1666d4bce924b8c0d44119491199a16… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 1399017cf77..a7b331ca7f4 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -223,6 +223,7 @@ int tps_storage_fill_contact( int i; int contact_len; int cparam_len; + int cuser_len = 0; sr_xavp_t *vavu = NULL; if(dir == TPS_DIR_DOWNSTREAM) { @@ -315,21 +316,27 @@ int tps_storage_fill_contact( LM_ERR("failed to parse the contact uri\n"); return -1; } - memcpy(td->cp, curi.user.s, curi.user.len); - td->cp += curi.user.len; + if(curi.user.len > 0) { + memcpy(td->cp, curi.user.s, curi.user.len); + td->cp += curi.user.len; + cuser_len = curi.user.len; + } else { + LM_DBG("no contact user - skipping it\n"); + } } else { /* extract the ruri */ if(parse_sip_msg_uri(msg) < 0) { LM_ERR("failed to parse r-uri\n"); return -1; } - if(msg->parsed_uri.user.len == 0) { - LM_ERR("no r-uri user\n"); - return -1; + if(msg->parsed_uri.user.len > 0) { + memcpy(td->cp, msg->parsed_uri.user.s, + msg->parsed_uri.user.len); + td->cp += msg->parsed_uri.user.len; + cuser_len = msg->parsed_uri.user.len; + } else { + LM_DBG("no r-uri user - skipping it\n"); } - memcpy(td->cp, msg->parsed_uri.user.s, - msg->parsed_uri.user.len); - td->cp += msg->parsed_uri.user.len; } } else if(ctmode == 2) { if(dir == TPS_DIR_DOWNSTREAM) { @@ -342,6 +349,7 @@ int tps_storage_fill_contact( } memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); td->cp += vavu->val.v.s.len; + cuser_len = vavu->val.v.s.len; } else { /* extract the b contact */ vavu = xavu_get_child_with_sval( @@ -352,11 +360,11 @@ int tps_storage_fill_contact( } memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); td->cp += vavu->val.v.s.len; + cuser_len = vavu->val.v.s.len; } } - if(!((ctmode == 1) && (dir == TPS_DIR_DOWNSTREAM) - && (curi.user.len <= 0))) { + if(cuser_len > 0) { *td->cp = '@'; td->cp++; }

1 0

git:5.7:0f31190e: topos: small rearangement by removing else after return in the true block
by Daniel-Constantin Mierla 14 Mar '24

14 Mar '24

Module: kamailio Branch: 5.7 Commit: 0f31190eb15b1e1244f478cc9538bf071317cb35 URL: https://github.com/kamailio/kamailio/commit/0f31190eb15b1e1244f478cc9538bf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-14T10:02:24+01:00 topos: small rearangement by removing else after return in the true block - reduce level of indentation - a few wraps in curly braces for clearer view of the if block (cherry picked from commit b6fccea258e56b7d3195659245713a6d44acb013) (cherry picked from commit 772b464552cff0b9ebb769e57fae718c0357ba11) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/0f31190eb15b1e1244f478cc9538bf0… Patch: https://github.com/kamailio/kamailio/commit/0f31190eb15b1e1244f478cc9538bf0… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 70c003c944c..1399017cf77 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -241,8 +241,9 @@ int tps_storage_fill_contact( } contact_len = sv.len; - if(_tps_contact_host.len) + if(_tps_contact_host.len) { contact_len = sv.len - puri.host.len + _tps_contact_host.len; + } if(ctmode == 1 || ctmode == 2) { cparam_len = _tps_cparam_name.len; @@ -282,8 +283,9 @@ int tps_storage_fill_contact( for(i = 0; i < sv.len; i++) { *td->cp = sv.s[i]; td->cp++; - if(sv.s[i] == ':') + if(sv.s[i] == ':') { break; + } } if(ctmode == 1 || ctmode == 2) { /* create new URI parameter for Contact header */ @@ -294,27 +296,24 @@ int tps_storage_fill_contact( || msg->contact == NULL) { LM_WARN("bad sip message or missing Contact hdr\n"); return -1; - } else { - if(parse_contact(msg->contact) < 0 - || ((contact_body_t *)msg->contact->parsed) - ->contacts - == NULL - || ((contact_body_t *)msg->contact->parsed) - ->contacts->next - != NULL) { - LM_ERR("bad Contact header\n"); - return -1; - } else { - if(parse_uri(((contact_body_t *)msg->contact->parsed) - ->contacts->uri.s, - ((contact_body_t *)msg->contact->parsed) - ->contacts->uri.len, - &curi) - < 0) { - LM_ERR("failed to parse the contact uri\n"); - return -1; - } - } + } + if(parse_contact(msg->contact) < 0 + || ((contact_body_t *)msg->contact->parsed)->contacts + == NULL + || ((contact_body_t *)msg->contact->parsed) + ->contacts->next + != NULL) { + LM_ERR("bad Contact header\n"); + return -1; + } + if(parse_uri(((contact_body_t *)msg->contact->parsed) + ->contacts->uri.s, + ((contact_body_t *)msg->contact->parsed) + ->contacts->uri.len, + &curi) + < 0) { + LM_ERR("failed to parse the contact uri\n"); + return -1; } memcpy(td->cp, curi.user.s, curi.user.len); td->cp += curi.user.len;

1 0

git:5.8:f9b1cca3: pkg/kamailio/obs: Allow builders to disable wolfssl module [skip ci]
by Victor Seva 14 Mar '24

14 Mar '24

Module: kamailio Branch: 5.8 Commit: f9b1cca33a45560f06b2708975c624da9728b6f5 URL: https://github.com/kamailio/kamailio/commit/f9b1cca33a45560f06b2708975c624d… Author: Oded Arbel <oded(a)geek.co.il> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-14T11:04:48+01:00 pkg/kamailio/obs: Allow builders to disable wolfssl module [skip ci] Building the WolfSSL module should be optional, even if it is on by default, builders should be able to choose to not need to install 4th party repositories. fixes #3781 (cherry picked from commit 5392dbf8070abf36734d9c857924df91186bc2dd) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/f9b1cca33a45560f06b2708975c624d… Patch: https://github.com/kamailio/kamailio/commit/f9b1cca33a45560f06b2708975c624d… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 3d83430e9dc..d8811a2d1f9 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -29,6 +29,7 @@ %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc +%bcond_without wolfssl %endif %if 0%{?rhel} == 7 @@ -65,6 +66,7 @@ %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc +%bcond_without wolfssl %endif %if 0%{?rhel} == 8 @@ -111,6 +113,7 @@ %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc +%bcond_without wolfssl %endif %if 0%{?rhel} == 9 @@ -157,6 +160,7 @@ %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc +%bcond_without wolfssl %endif %if 0%{?suse_version} @@ -186,6 +190,7 @@ %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc +%bcond_without wolfssl %endif # build with openssl 1.1.1 on RHEL 7 based dists @@ -1037,6 +1042,7 @@ BuildRequires: openssl-devel TLS transport for Kamailio. +%if %{with wolfssl} %package tls_wolfssl Summary: TLS transport for Kamailio based on wolfSSL Group: %{PKGGROUP} @@ -1044,6 +1050,7 @@ BuildRequires: pkgconfig(wolfssl) %description tls_wolfssl TLS transport for Kamailio based on wolfSSL +%endif %package tcpops @@ -1291,7 +1298,11 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if "%{?_unitdir}" != "" ksystemd \ %endif - ktls ktls_wolfssl kunixodbc kutils \ + ktls \ +%if %{with wolfssl} + ktls_wolfssl \ +%endif + kunixodbc kutils \ %if %{with websocket} kwebsocket \ %endif @@ -1400,7 +1411,11 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if "%{?_unitdir}" != "" ksystemd \ %endif - ktls ktls_wolfssl kunixodbc kutils \ + ktls \ +%if %{with wolfssl} + ktls_wolfssl \ +%endif + kunixodbc kutils \ %if %{with websocket} kwebsocket \ %endif @@ -2337,10 +2352,12 @@ fi %{_libdir}/kamailio/modules/tls.so +%if %{with wolfssl} %files tls_wolfssl %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.tls_wolfssl %{_libdir}/kamailio/modules/tls_wolfssl.so +%endif %files tcpops

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev