- sr-dev - kamailio.org

git:master:dde74dc1: tm: remove redundant check in if condition
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: dde74dc1d3413bc677813502aa71d727cbe1e981 URL: https://github.com/kamailio/kamailio/commit/dde74dc1d3413bc677813502aa71d72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 tm: remove redundant check in if condition - else branch is already for >= 200 --- Modified: src/modules/tm/dlg.c --- Diff: https://github.com/kamailio/kamailio/commit/dde74dc1d3413bc677813502aa71d72… Patch: https://github.com/kamailio/kamailio/commit/dde74dc1d3413bc677813502aa71d72… --- diff --git a/src/modules/tm/dlg.c b/src/modules/tm/dlg.c index 29b8d50769f..96483259c8c 100644 --- a/src/modules/tm/dlg.c +++ b/src/modules/tm/dlg.c @@ -712,8 +712,9 @@ static inline int dlg_early_resp_uac(dlg_t *_d, struct sip_msg *_m) if(code < 200) { /* We are in early state already, do nothing */ - } else if((code >= 200) && (code <= 299)) { - /* Warning - we can handle here response for non-initial request (for + } else if(code <= 299) { + /* (200-299) + * Warning - we can handle here response for non-initial request (for * example UPDATE within early INVITE/BYE dialog) and move into * confirmed state may be error! But this depends on dialog type... */

1 0

git:master:09318b6d: seas: if expression on else not needed
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 09318b6d0f224cace31d7db925f792b66cefd469 URL: https://github.com/kamailio/kamailio/commit/09318b6d0f224cace31d7db925f792b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 seas: if expression on else not needed - evaluation of it is true on else branch --- Modified: src/modules/seas/event_dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/09318b6d0f224cace31d7db925f792b… Patch: https://github.com/kamailio/kamailio/commit/09318b6d0f224cace31d7db925f792b… --- diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index 57483212686..e827629e53f 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -312,9 +312,7 @@ int dispatcher_main_loop(void) poll_fds[3 + as_nr].revents = 0; as_nr++; /*not very sure if this is thread-safe*/ unc_as_nr--; - } else if( - fd - <= 0) { /* pull the upper set of incomplete AS down and take this one out*/ + } else { /* pull the upper set of incomplete AS down and take this one out*/ poll_tmp->revents = 0; for(k = i; k < (unc_as_nr - 1); k++) { j = 3 + as_nr + k;

1 0

git:master:440a9955: ss7ops: adapt if expression for uint
by Daniel-Constantin Mierla 27 Dec '23

27 Dec '23

Module: kamailio Branch: master Commit: 440a9955b4ce21b8c3dae9d6159d24a92ec28e7c URL: https://github.com/kamailio/kamailio/commit/440a9955b4ce21b8c3dae9d6159d24a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-27T09:24:33+01:00 ss7ops: adapt if expression for uint - equal 0 or less than 1 is same in this case --- Modified: src/modules/ss7ops/ss7ops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/440a9955b4ce21b8c3dae9d6159d24a… Patch: https://github.com/kamailio/kamailio/commit/440a9955b4ce21b8c3dae9d6159d24a… --- diff --git a/src/modules/ss7ops/ss7ops_mod.c b/src/modules/ss7ops/ss7ops_mod.c index b0f84694658..8772ff56b6b 100644 --- a/src/modules/ss7ops/ss7ops_mod.c +++ b/src/modules/ss7ops/ss7ops_mod.c @@ -221,9 +221,7 @@ static const uint8_t *extract_from_m2pa(const uint8_t *data, size_t *len) } data += 8; data_len -= 8; - if(data_len == 0) - return NULL; - else if(data_len < 1) { + if(data_len < 1) { LM_ERR("M2PA no space for prio %u\n", data_len); return NULL; }

1 0

git:master:439d451a: github: [skip ci]: bump tj-actions/changed-files from 40 to 41
by Victor Seva 26 Dec '23

26 Dec '23

Module: kamailio Branch: master Commit: 439d451ab3172c1a22f88fd4ba0756ede2318191 URL: https://github.com/kamailio/kamailio/commit/439d451ab3172c1a22f88fd4ba0756e… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-26T08:44:50+01:00 github: [skip ci]: bump tj-actions/changed-files from 40 to 41 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 40 to 41. - [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/v40...v41) --- 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/439d451ab3172c1a22f88fd4ba0756e… Patch: https://github.com/kamailio/kamailio/commit/439d451ab3172c1a22f88fd4ba0756e… --- diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml index bfecd095f55..1c2a584ed84 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@v40 + uses: tj-actions/changed-files@v41 with: since_last_remote_commit: true - name: changes in relevant files if: ${{ ! inputs.force }} id: changed-files-builder - uses: tj-actions/changed-files@v40 + uses: tj-actions/changed-files@v41 with: files: | .devcontainer/**

1 0

[kamailio/kamailio] github: [skip ci]: bump tj-actions/changed-files from 40 to 41 (PR #3693)
by dependabot[bot] 26 Dec '23

26 Dec '23

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 40 to 41. <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>v41</h2> <h1>Changes in v41.0.1</h1> <h2>What's Changed</h2> <ul> <li>Upgraded to v41 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1811&q… <li>chore(deps): update dependency eslint-plugin-prettier to v5.1.2 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1813&q… <li>fix: update characters escaped by safe output by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1815&q… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/tj-actions/changed-files/compare/v41...v41.0.… <hr /> <h1>Changes in v41.0.0</h1> <h2>🔥 🔥 BREAKING CHANGE 🔥 🔥</h2> <p>A new <code>safe_output</code> input is now available to prevent outputting unsafe filename characters (Enabled by default). This would escape characters in the filename that could be used for command injection.</p> <blockquote> <p>[!NOTE] This can be disabled by setting the <code>safe_output</code> to false this comes with a recommendation to store all outputs generated in an environment variable first before using them.</p> </blockquote> <h4>Example</h4> <pre lang="yaml"><code>... - name: Get changed files id: changed-files uses: tj-actions/changed-files@v40 with: safe_output: false # set to false because we are using an environment variable to store the output and avoid command injection. <pre><code>- name: List all added files env: ADDED_FILES: ${{ steps.changed-files.outputs.added_files }} run: | for file in &amp;quot;$ADDED_FILES&amp;quot;; do echo &amp;quot;$file was added&amp;quot; done </code></pre> <p>... </code></pre></p> <h2>What's Changed</h2> <ul> <li>chore(deps): update typescript-eslint monorepo to v6.15.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1801&q… <li>Upgraded to v40.2.3 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1800&q… <li>chore(deps): update dependency eslint-plugin-prettier to v5.1.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1802&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/1803&q… <li>chore(deps): update dependency eslint-plugin-prettier to v5.1.1 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1804&q… <li>fix: update safe output regex and the docs by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1805&q… <li>Revert &quot;chore(deps): update actions/download-artifact action to v4&quot; by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1806&q… <li>Update README.md by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1808&q… </ul>  </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/v41.0.0...v4… - (2023-12-24)</h1> <h2>🐛 Bug Fixes</h2> <ul> <li>Update characters escaped by safe output (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1815…) (<a href="https://github.com/tj-actions/changed-files/commit/716b1e1304286…) - (Tonye Jack)</li> </ul> <h2>⚙️ Miscellaneous Tasks</h2> <ul> <li><strong>deps:</strong> Update dependency eslint-plugin-prettier to v5.1.2 (<a href="https://github.com/tj-actions/changed-files/commit/7aaf10d9eef19…) - (renovate[bot])</li> </ul> <h2>⬆️ Upgrades</h2> <ul> <li>Upgraded to v41 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1811… </ul> <p>Co-authored-by: jackton1 <a href="mailto:jackton1@users.noreply.github.com">jackton1@users.noreply.github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/cc08e170f4447…) - (tj-actions[bot])</p> <h1><a href="https://github.com/tj-actions/changed-files/compare/v40.2.3...v4… - (2023-12-23)</h1> <h2>🐛 Bug Fixes</h2> <ul> <li>Update safe output regex and the docs (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1805…) (<a href="https://github.com/tj-actions/changed-files/commit/ff2f6e6b91913…) - (tj-actions[bot])</li> </ul> <h2>⏪ Reverts</h2> <ul> <li>Revert &quot;chore(deps): update actions/download-artifact action to v4&quot; (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1806… </ul> <p>(<a href="https://github.com/tj-actions/changed-files/commit/4f573fed06c9a…) - (Tonye Jack)</p> <h2>🔄 Update</h2> <ul> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/6e79d6e3dbe48…) - (Tonye Jack)</li> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/d13ac1942fb3c…) - (Tonye Jack)</li> <li>Update README.md (<a href="https://github.com/tj-actions/changed-files/commit/bb89f97963be9…) - (Tonye Jack)</li> <li>Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1810… </ul> <p>Co-authored-by: renovate[bot]  (<a href="https://github.com/tj-actions/changed-files/commit/1864078d0afad…) - (tj-actions[bot])</p> <ul> <li>Update README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1808… </ul> <p>(<a href="https://github.com/tj-actions/changed-files/commit/47371c50e97c0…) - (Tonye Jack)</p> <h2>📝 Other</h2> <ul> <li>Merge pull request from GHSA-mcph-m25j-8j63</li> </ul> <ul> <li> <p>feat: add <code>safe_output</code> input enabled by default</p> </li> <li> <p>fix: migrate README to safe uses of interpolation</p> </li> </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/tj-actions/changed-files/commit/716b1e1304286… fix: update characters escaped by safe output (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1815… <li><a href="https://github.com/tj-actions/changed-files/commit/7aaf10d9eef19… chore(deps): update dependency eslint-plugin-prettier to v5.1.2</li> <li><a href="https://github.com/tj-actions/changed-files/commit/cc08e170f4447… Upgraded to v41 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1811… <li><a href="https://github.com/tj-actions/changed-files/commit/6e79d6e3dbe48… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/d13ac1942fb3c… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/bb89f97963be9… Update README.md</li> <li><a href="https://github.com/tj-actions/changed-files/commit/1864078d0afad… Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1810… <li><a href="https://github.com/tj-actions/changed-files/commit/f495a0321d3ff… chore(deps): lock file maintenance</li> <li><a href="https://github.com/tj-actions/changed-files/commit/47371c50e97c0… Update README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1808… <li><a href="https://github.com/tj-actions/changed-files/commit/4f573fed06c9a… Revert &quot;chore(deps): update actions/download-artifact action to v4&quot; (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1806… <li>Additional commits viewable in <a href="https://github.com/tj-actions/changed-files/compare/v40...v41&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/3693 -- Commit Summary -- * github: [skip ci]: bump tj-actions/changed-files from 40 to 41 -- File Changes -- M .github/workflows/devcontainer.yaml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3693.patch https://github.com/kamailio/kamailio/pull/3693.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3693 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3693(a)github.com>

2 1

Merry Christmas and Happy Holidays 2023-2024!
by Daniel-Constantin Mierla 25 Dec '23

25 Dec '23

Kamailio project continued to evolve steadily, a new major release was out during this year, next one planned in a few months, relying on an amazing community of developers and users. We hope it kept helping people and companies world wide to connect with the dear ones and build a better way of living. The season holidays are ahead, time to relax, spend time with family and friends! I take again this chance to express my thanks and greetings to all the friends, developers, supporting companies and community members that made 2023 another fantastic year for Kamailio project. Enjoy the holidays! Merry Christmas! Daniel * Santa is flying Kamailio! * -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services Kamailio World Conference - April 18-19, 2024, Berlin

2 1

git:master:973803b0: pkg/obs: removed auth_identity modules
by Daniel-Constantin Mierla 24 Dec '23

24 Dec '23

Module: kamailio Branch: master Commit: 973803b0a3944b9de7ebdc4366b23e933e66ffbe URL: https://github.com/kamailio/kamailio/commit/973803b0a3944b9de7ebdc4366b23e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-24T19:59:52+01:00 pkg/obs: removed auth_identity modules --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/973803b0a3944b9de7ebdc4366b23e9… Patch: https://github.com/kamailio/kamailio/commit/973803b0a3944b9de7ebdc4366b23e9… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 978c1073ac8..1dc6687e645 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2336,9 +2336,7 @@ fi %files tls %defattr(-,root,root) -%doc %{_docdir}/kamailio/modules/README.auth_identity %doc %{_docdir}/kamailio/modules/README.tls -%{_libdir}/kamailio/modules/auth_identity.so %{_libdir}/kamailio/modules/tls.so

1 0

git:master:8a07c21b: pkg/alpine: removed auth_identity module
by Daniel-Constantin Mierla 24 Dec '23

24 Dec '23

Module: kamailio Branch: master Commit: 8a07c21b45d8afd0a0b84c09bbac6361a0f979d3 URL: https://github.com/kamailio/kamailio/commit/8a07c21b45d8afd0a0b84c09bbac636… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-24T17:23:55+01:00 pkg/alpine: removed auth_identity module --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/8a07c21b45d8afd0a0b84c09bbac636… Patch: https://github.com/kamailio/kamailio/commit/8a07c21b45d8afd0a0b84c09bbac636… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index b3d5c4d64bd..0696216564a 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -131,7 +131,7 @@ _mod_list_purple="purple" _mod_list_memcached="memcached" # - modules depending on openssl library -_mod_list_tls="auth_identity crypto tls" +_mod_list_tls="crypto tls" # - modules depending on openssl library _mod_list_outbound="outbound"

1 0

git:master:3bdc5665: Makefile.groups: removed auth_identity module
by Daniel-Constantin Mierla 24 Dec '23

24 Dec '23

Module: kamailio Branch: master Commit: 3bdc56654874b7e94e7052823714440b6457a100 URL: https://github.com/kamailio/kamailio/commit/3bdc56654874b7e94e7052823714440… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-24T17:21:57+01:00 Makefile.groups: removed auth_identity module - relocated to kamailio-archive repository --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/3bdc56654874b7e94e7052823714440… Patch: https://github.com/kamailio/kamailio/commit/3bdc56654874b7e94e7052823714440… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 8d15b198cc3..d730a7eb51b 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -91,9 +91,6 @@ mod_list_tlsdeps=crypto tls # - modules depending on static openssl library mod_list_tlsa=tlsa -# - modules depending on openssl (+curl) library -mod_list_tlsdeps_curl=auth_identity - # - modules depending on static wolfssl library mod_list_tls_wolfssl=tls_wolfssl @@ -255,7 +252,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_xmpp) \ $(mod_list_berkeley) $(mod_list_utils) \ $(mod_list_memcached) \ - $(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) \ + $(mod_list_tlsdeps) \ $(mod_list_websocket) \ $(mod_list_snmpstats) $(mod_list_presence) \ $(mod_list_lua) $(mod_list_python) \ @@ -314,7 +311,7 @@ module_group_standard=$(mod_list_basic) $(mod_list_extra) \ module_group_common=$(mod_list_db) $(mod_list_dbuid) \ $(mod_list_pcre) $(mod_list_radius) \ $(mod_list_xmldeps) $(mod_list_presence) \ - $(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) + $(mod_list_tlsdeps) # For db use (db modules, excluding drivers) module_group_db=$(mod_list_db) @@ -409,10 +406,10 @@ module_group_ktls_basic=$(mod_list_tlsdeps) ifeq ($(KTLS_INCLUDE_TLSA),yes) # pkg tls module with curl -module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) $(mod_list_tlsa) +module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsa) else # pkg tls module with curl -module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) +module_group_ktls=$(mod_list_tlsdeps) # pkg tlsa module module_group_ktlsa=$(mod_list_tlsa)

1 0

git:master:5192e5d2: tmx: rework cleaning up on init failure
by Daniel-Constantin Mierla 24 Dec '23

24 Dec '23

Module: kamailio Branch: master Commit: 5192e5d275761ccd1af49d4bf9dd12e1438947b7 URL: https://github.com/kamailio/kamailio/commit/5192e5d275761ccd1af49d4bf9dd12e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-24T12:20:57+01:00 tmx: rework cleaning up on init failure --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/5192e5d275761ccd1af49d4bf9dd12e… Patch: https://github.com/kamailio/kamailio/commit/5192e5d275761ccd1af49d4bf9dd12e… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 7600a3c7b4b..a7c7d52df87 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -103,10 +103,11 @@ int tmx_init_pretran_table(void) for(n = 0; n < _tmx_ptran_size; n++) { if(lock_init(&_tmx_ptran_table[n].lock) == NULL) { LM_ERR("cannot init the lock %d\n", n); - n--; - while(n >= 0) { - lock_destroy(&_tmx_ptran_table[n].lock); - n--; + if(n > 0) { + do { + n--; + lock_destroy(&_tmx_ptran_table[n].lock); + } while(n > 0); } shm_free(_tmx_ptran_table); _tmx_ptran_table = 0;

1 0

[kamailio/kamailio] JSONRPC-S does not support batch requests (Issue #3677)
by Matthias van der Vlies 23 Dec '23

23 Dec '23

### Description It would be nice if the JSONRPC-S module would support batch requests. For example if you want to set multiple values in htable simultaneously. ### Expected behavior That the implementation is in line with JSON-RPC 2.0 specification and support batching. For example: `[ {"jsonrpc": "2.0", "method": "htable.stats", "id": 22}, {"jsonrpc": "2.0", "method": "htable.listTables", "id": 23} ]` #### Actual observed behavior Get an empty result with no error code (see Debugging data) Only the first message is parsed when discarding the brackets (which should give a json format error anyway, but doesn't) ` {"jsonrpc": "2.0", "method": "htable.stats", "id": 22}, {"jsonrpc": "2.0", "method": "htable.listTables", "id": 23} ` Then I get an answer to only the first request instead of expected JSON validation error. #### Debugging Data `curl -X POST -H "Content-Type: application/json" -d '[{"jsonrpc": "2.0", "method": "htable.stats", "id": 22},{"jsonrpc": "2.0", "method": "htable.listTables", "id": 23}]' http://10.0.0.1:5060/RPC { "jsonrpc": "2.0", "result": { } }` #### Log Messages `254(260) ERROR: jsonrpcs [jsonrpcs_mod.c:1263]: jsonrpc_dispatch(): missing or invalid jsonrpc field in request` #### SIP Traffic N/A ### Possible Solutions Needs a code fix ### Additional Information https://www.jsonrpc.org/specification -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3677 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3677(a)github.com>

2 2

[kamailio/kamailio] OpenSSL 3.0 deprecated warnings (Issue #3636)
by sergey-safarov 23 Dec '23

23 Dec '23

``` CC (gcc) [M auth_identity.so] auth_crypt.o auth_crypt.c: In function 'rsa_sha1_enc': auth_crypt.c:215:9: warning: 'RSA_sign' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 215 | if (RSA_sign(NID_sha1, | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23, from auth_crypt.c:33: /usr/include/openssl/rsa.h:353:27: note: declared here 353 | OSSL_DEPRECATEDIN_3_0 int RSA_sign(int type, const unsigned char *m, | ^~~~~~~~ auth_crypt.c: In function 'rsa_sha1_dec': auth_crypt.c:261:9: warning: 'EVP_PKEY_get1_RSA' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 261 | hpubkey = EVP_PKEY_get1_RSA(pkey); | ^~~~~~~ In file included from /usr/include/openssl/pem.h:22: /usr/include/openssl/evp.h:1348:16: note: declared here 1348 | struct rsa_st *EVP_PKEY_get1_RSA(EVP_PKEY *pkey); | ^~~~~~~~~~~~~~~~~ auth_crypt.c:269:9: warning: 'RSA_verify' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 269 | if (RSA_verify(NID_sha1, | ^~ /usr/include/openssl/rsa.h:356:27: note: declared here 356 | OSSL_DEPRECATEDIN_3_0 int RSA_verify(int type, const unsigned char *m, | ^~~~~~~~~~ auth_crypt.c:275:17: warning: 'RSA_free' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 275 | RSA_free(hpubkey); | ^~~~~~~~ /usr/include/openssl/rsa.h:298:28: note: declared here 298 | OSSL_DEPRECATEDIN_3_0 void RSA_free(RSA *r); | ^~~~~~~~ auth_crypt.c:298:9: warning: 'RSA_free' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 298 | RSA_free(hpubkey); | ^~~~~~~~ /usr/include/openssl/rsa.h:298:28: note: declared here 298 | OSSL_DEPRECATEDIN_3_0 void RSA_free(RSA *r); | ^~~~~~~~ CC (gcc) [M auth_identity.so] auth_dynstr.o CC (gcc) [M auth_identity.so] auth_hdrs.o CC (gcc) [M auth_identity.so] auth_http.o CC (gcc) [M auth_identity.so] auth_identity.o auth_identity.c: In function 'mod_init': auth_identity.c:396:9: warning: 'PEM_read_RSAPrivateKey' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 396 | glb_hmyprivkey=PEM_read_RSAPrivateKey(hpemfile, NULL, NULL, NULL); | ^~~~~~~~~~~~~~ In file included from auth_identity.c:43: /usr/include/openssl/pem.h:447:1: note: declared here 447 | DECLARE_PEM_rw_cb_attr(OSSL_DEPRECATEDIN_3_0, RSAPrivateKey, RSA) | ^~~~~~~~~~~~~~~~~~~~~~ auth_identity.c:408:9: warning: 'RSA_size' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 408 | if (initdynstr(&glb_encedmsg, RSA_size(glb_hmyprivkey))) | ^~ In file included from /usr/include/openssl/x509.h:36, from /usr/include/openssl/pem.h:23: /usr/include/openssl/rsa.h:209:27: note: declared here 209 | OSSL_DEPRECATEDIN_3_0 int RSA_size(const RSA *rsa); | ^~~~~~~~ auth_identity.c:412:9: warning: 'RSA_size' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] 412 | if (initdynstr(&glb_b64encedmsg, (RSA_size(glb_hmyprivkey)/3+1)*4)) | ^~ /usr/include/openssl/rsa.h:209:27: note: declared here 209 | OSSL_DEPRECATEDIN_3_0 int RSA_size(const RSA *rsa); | ^~~~~~~~ CC (gcc) [M auth_identity.so] auth_tables.o LD (gcc) [M auth_identity.so] auth_identity.so ``` This warning on Fedora 38 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3636 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3636(a)github.com>

3 5

git:master:1b959ead: auth_identity: module relocated to kamailio-archive repository
by Daniel-Constantin Mierla 23 Dec '23

23 Dec '23

Module: kamailio Branch: master Commit: 1b959ead18fc8d7d55b1abe6f03fa3f849b57385 URL: https://github.com/kamailio/kamailio/commit/1b959ead18fc8d7d55b1abe6f03fa3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-23T17:20:40+01:00 auth_identity: module relocated to kamailio-archive repository - module is considered obsolete, not maintained - based on precursor specs of stir/shaken, not actually deployed in production by carriers - located now at: https://github.com/kamailio/kamailio-archive/tree/main/src/modules/auth_ide… --- Removed: src/modules/auth_identity/Makefile Removed: src/modules/auth_identity/README Removed: src/modules/auth_identity/auth_crypt.c Removed: src/modules/auth_identity/auth_dynstr.c Removed: src/modules/auth_identity/auth_hdrs.c Removed: src/modules/auth_identity/auth_http.c Removed: src/modules/auth_identity/auth_identity.c Removed: src/modules/auth_identity/auth_identity.h Removed: src/modules/auth_identity/auth_tables.c Removed: src/modules/auth_identity/doc/Makefile Removed: src/modules/auth_identity/doc/auth_identity.xml Removed: src/modules/auth_identity/doc/auth_identity_functions.xml Removed: src/modules/auth_identity/doc/auth_identity_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/1b959ead18fc8d7d55b1abe6f03fa3f… Patch: https://github.com/kamailio/kamailio/commit/1b959ead18fc8d7d55b1abe6f03fa3f…

1 0

git:master:904a718d: sms: define size and check lenght for sender and ascii fields
by Daniel-Constantin Mierla 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 904a718d15e4a83d752b6d2f0fa692fb10cda4b4 URL: https://github.com/kamailio/kamailio/commit/904a718d15e4a83d752b6d2f0fa692f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-22T15:10:51+01:00 sms: define size and check lenght for sender and ascii fields --- Modified: src/modules/sms/libsms_getsms.c Modified: src/modules/sms/sms_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/904a718d15e4a83d752b6d2f0fa692f… Patch: https://github.com/kamailio/kamailio/commit/904a718d15e4a83d752b6d2f0fa692f… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index ea258ccf673..4181560490e 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -287,7 +287,13 @@ static int splitascii(struct modem *mdm, char *source, struct incame_sms *sms) if(!*start) return 1; start++; - strcpy(sms->ascii, start); + l1 = strlen(start); + if(l1 >= SMS_ASCII_LEN) { + /* truncate */ + l1 = SMS_ASCII_LEN - 1; + } + memcpy(sms->ascii, start, l1); + sms->ascii[l1] = '\0'; /* get the senders MSISDN */ start = strstr(source, "\",\""); if(start == 0) { @@ -301,7 +307,14 @@ static int splitascii(struct modem *mdm, char *source, struct incame_sms *sms) return 1; } *end = 0; - strcpy(sms->sender, start); + l1 = strlen(start); + if(l1 >= SMS_SENDER_LEN) { + /* truncate */ + l1 = SMS_SENDER_LEN - 1; + } + memcpy(sms->sender, start, l1); + sms->sender[l1] = '\0'; + /* Siemens M20 inserts the senders name between MSISDN and date */ start = end + 3; // Workaround for Thomas Stoeckel // diff --git a/src/modules/sms/sms_funcs.h b/src/modules/sms/sms_funcs.h index 4123b92c514..84c35c2f3a4 100644 --- a/src/modules/sms/sms_funcs.h +++ b/src/modules/sms/sms_funcs.h @@ -92,14 +92,18 @@ struct sms_msg }; #define SMS_NAME_LEN 64 +#define SMS_SENDER_LEN 32 +#define SMS_ASCII_LEN 500 +#define SMS_SMSC_LEN 32 + struct incame_sms { - char sender[31]; + char sender[SMS_SENDER_LEN]; char name[SMS_NAME_LEN]; char date[DATE_LEN]; char time[TIME_LEN]; - char ascii[500]; - char smsc[31]; + char ascii[SMS_ASCII_LEN]; + char smsc[SMS_SMSC_LEN]; int userdatalength; int is_statusreport; int sms_id;

1 0

git:master:1f5444fd: tm: make lookup event_route[tm:local-response] only once
by Daniel-Constantin Mierla 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 1f5444fd2e25d227ffd70f1087d057a3b8002558 URL: https://github.com/kamailio/kamailio/commit/1f5444fd2e25d227ffd70f1087d057a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-22T14:50:59+01:00 tm: make lookup event_route[tm:local-response] only once - related to issue #3064 and PR #3687 --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/1f5444fd2e25d227ffd70f1087d057a… Patch: https://github.com/kamailio/kamailio/commit/1f5444fd2e25d227ffd70f1087d057a… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index c5a58bba8ab..f52ecc7d3ad 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -443,7 +443,7 @@ inline static void start_final_repl_retr(struct cell *t) } -static int _tm_local_response_sent_lookup = 0; +static int _tm_local_response_sent_evrt = -2; static int _reply_light(struct cell *trans, char *buf, unsigned int len, unsigned int code, char *to_tag, unsigned int to_tag_len, int lock, @@ -573,9 +573,15 @@ static int _reply_light(struct cell *trans, char *buf, unsigned int len, } rt = -1; if(likely(keng == NULL)) { - if(_tm_local_response_sent_lookup == 0) { + if(_tm_local_response_sent_evrt == -2) { rt = route_lookup(&event_rt, "tm:local-response"); - _tm_local_response_sent_lookup = 1; + if(rt < 0) { + _tm_local_response_sent_evrt = -1; + } else { + _tm_local_response_sent_evrt = rt; + } + } else { + rt = _tm_local_response_sent_evrt; } } if((rt >= 0 && event_rt.rlist[rt] != NULL) || (keng != NULL)

1 0

git:master:61efad28: seas: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 61efad28eeb84d8b8f80fe7fd38d7bbb634717f4 URL: https://github.com/kamailio/kamailio/commit/61efad28eeb84d8b8f80fe7fd38d7bb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T10:06:29+01:00 seas: fix build warning > CC (gcc) [M seas.so] encode_contact.o > encode_allow.c:40: warning: "_GNU_SOURCE" redefined > 40 | #define _GNU_SOURCE > | > <command-line>: note: this is the location of the previous definition --- Modified: src/modules/seas/encode_allow.c Modified: src/modules/seas/encode_contact.c Modified: src/modules/seas/encode_content_disposition.c Modified: src/modules/seas/encode_content_length.c Modified: src/modules/seas/encode_content_type.c Modified: src/modules/seas/encode_cseq.c Modified: src/modules/seas/encode_digest.c Modified: src/modules/seas/encode_expires.c Modified: src/modules/seas/encode_header.c Modified: src/modules/seas/encode_msg.c Modified: src/modules/seas/encode_parameters.c Modified: src/modules/seas/encode_route.c Modified: src/modules/seas/encode_to_body.c Modified: src/modules/seas/encode_uri.c Modified: src/modules/seas/encode_via.c Modified: src/modules/seas/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/61efad28eeb84d8b8f80fe7fd38d7bb… Patch: https://github.com/kamailio/kamailio/commit/61efad28eeb84d8b8f80fe7fd38d7bb…

1 0

git:master:90df7449: pv: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 90df744978ee2a83700d36ef88161f00b2220acb URL: https://github.com/kamailio/kamailio/commit/90df744978ee2a83700d36ef88161f0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T10:00:32+01:00 pv: fix build warning > CC (gcc) [M pv.so] pv_xavp.o > pv_core.c: In function 'pv_get_cnt': > pv_core.c:2841:61: warning: 'ravp' may be used uninitialized [-Wmaybe-uninitialized] > 2841 | if(ravp && ravp->val.type == SR_XTYPE_XAVP) { > | ~~~~~~~~~^~~~~ > pv_core.c:2776:36: note: 'ravp' was declared here > 2776 | sr_xavp_t *ravp, *sub_avp; > | ^~~~ --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/90df744978ee2a83700d36ef88161f0… Patch: https://github.com/kamailio/kamailio/commit/90df744978ee2a83700d36ef88161f0… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 03d025bba2f..d98abbf975d 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2773,7 +2773,7 @@ int pv_get_cnt(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) * But this would be less intuitive in our case for counting. */ pv_xavp_name_t *xname, *xname_sub; - sr_xavp_t *ravp, *sub_avp; + sr_xavp_t *ravp = NULL, *sub_avp = NULL; int root_idxf, root_idx_spec, root_idx; int sub_idxf, sub_idx_spec, sub_idx; int count;

1 0

git:master:86c57ef7: db_text: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 86c57ef77848513e3224c73a6d2889e8a2bd6fc3 URL: https://github.com/kamailio/kamailio/commit/86c57ef77848513e3224c73a6d2889e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T09:58:39+01:00 db_text: fix build warning > CC (gcc) [M db_text.so] dbt_raw_query.o > dbt_raw_query.c:23: warning: "_GNU_SOURCE" redefined > 23 | #define _GNU_SOURCE > | > <command-line>: note: this is the location of the previous definition --- Modified: src/modules/db_text/dbt_raw_query.c --- Diff: https://github.com/kamailio/kamailio/commit/86c57ef77848513e3224c73a6d2889e… Patch: https://github.com/kamailio/kamailio/commit/86c57ef77848513e3224c73a6d2889e… --- diff --git a/src/modules/db_text/dbt_raw_query.c b/src/modules/db_text/dbt_raw_query.c index a6dc37a69b7..ede61fe3525 100644 --- a/src/modules/db_text/dbt_raw_query.c +++ b/src/modules/db_text/dbt_raw_query.c @@ -19,8 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <string.h> #include "../../core/str.h"

1 0

git:master:8bfd6580: cfgt: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 8bfd6580533b6d6005cd257632a5c0e575f75e39 URL: https://github.com/kamailio/kamailio/commit/8bfd6580533b6d6005cd257632a5c0e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T09:57:25+01:00 cfgt: fix build warning > CC (gcc) [M cfgt.so] cfgt_mod.o > cfgt_int.c:22: warning: "_GNU_SOURCE" redefined > 22 | #define _GNU_SOURCE > | > <command-line>: note: this is the location of the previous definition --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/8bfd6580533b6d6005cd257632a5c0e… Patch: https://github.com/kamailio/kamailio/commit/8bfd6580533b6d6005cd257632a5c0e… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index f1357bb87aa..f74c044b83b 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -19,7 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <stdio.h> #include <sys/stat.h> #include <sys/time.h>

1 0

git:master:7562aed2: benchmark: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 7562aed2b1c33942b508c6cae9aa7db5ab75196e URL: https://github.com/kamailio/kamailio/commit/7562aed2b1c33942b508c6cae9aa7db… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T09:56:08+01:00 benchmark: fix build warning > CC (gcc) [M benchmark.so] benchmark.o > benchmark.c:41: warning: "_GNU_SOURCE" redefined > 41 | #define _GNU_SOURCE > | > <command-line>: note: this is the location of the previous definition --- Modified: src/modules/benchmark/benchmark.c --- Diff: https://github.com/kamailio/kamailio/commit/7562aed2b1c33942b508c6cae9aa7db… Patch: https://github.com/kamailio/kamailio/commit/7562aed2b1c33942b508c6cae9aa7db… --- diff --git a/src/modules/benchmark/benchmark.c b/src/modules/benchmark/benchmark.c index d28f8ea38a8..45cbe38c329 100644 --- a/src/modules/benchmark/benchmark.c +++ b/src/modules/benchmark/benchmark.c @@ -37,8 +37,9 @@ * configuration sections. * */ - +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <string.h> #include <sys/time.h> #include <stdlib.h>

1 0

git:master:c413392a: jansson: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: c413392a3bae1efdc40671b11da83bec173caff5 URL: https://github.com/kamailio/kamailio/commit/c413392a3bae1efdc40671b11da83be… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T09:53:16+01:00 jansson: fix build warning > CC (gcc) [M jansson.so] jansson_utils.o > jansson_utils.c:23: warning: "_GNU_SOURCE" redefined > 23 | #define _GNU_SOURCE > | > <command-line>: note: this is the location of the previous definition --- Modified: src/modules/jansson/jansson_utils.c --- Diff: https://github.com/kamailio/kamailio/commit/c413392a3bae1efdc40671b11da83be… Patch: https://github.com/kamailio/kamailio/commit/c413392a3bae1efdc40671b11da83be… --- diff --git a/src/modules/jansson/jansson_utils.c b/src/modules/jansson/jansson_utils.c index c5e9a1560c2..61a9377c474 100644 --- a/src/modules/jansson/jansson_utils.c +++ b/src/modules/jansson/jansson_utils.c @@ -19,8 +19,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ - +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <stdio.h> #include <jansson.h> #include <limits.h>

1 0

git:master:9d4d9c0a: auth_identity: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 9d4d9c0afce10d00f65eccb3c9bfd3c508bac336 URL: https://github.com/kamailio/kamailio/commit/9d4d9c0afce10d00f65eccb3c9bfd3c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T09:51:28+01:00 auth_identity: fix build warning > CC (gcc) [M auth_identity.so] auth_dynstr.o > auth_crypt.c:29: warning: "_GNU_SOURCE" redefined > 29 | #define _GNU_SOURCE > | > <command-line>: note: this is the location of the previous definition --- Modified: src/modules/auth_identity/auth_crypt.c --- Diff: https://github.com/kamailio/kamailio/commit/9d4d9c0afce10d00f65eccb3c9bfd3c… Patch: https://github.com/kamailio/kamailio/commit/9d4d9c0afce10d00f65eccb3c9bfd3c… --- diff --git a/src/modules/auth_identity/auth_crypt.c b/src/modules/auth_identity/auth_crypt.c index 934c9cca347..4cc55a38fda 100644 --- a/src/modules/auth_identity/auth_crypt.c +++ b/src/modules/auth_identity/auth_crypt.c @@ -25,8 +25,9 @@ * Module: \ref auth-identity */ - +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <stdio.h> #include <stdlib.h> #include <string.h>

1 0

git:master:84f6ca9b: main: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 84f6ca9b453b33dba321c11e12a0ebc0b9b8dab4 URL: https://github.com/kamailio/kamailio/commit/84f6ca9b453b33dba321c11e12a0ebc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T09:49:43+01:00 main: fix build warning > CC (gcc) [kamailio] core/atomic_ops.o > main.c:34: warning: "_GNU_SOURCE" redefined > 34 | #define _GNU_SOURCE > | > <command-line>: note: this is the location of the previous definition --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/84f6ca9b453b33dba321c11e12a0ebc… Patch: https://github.com/kamailio/kamailio/commit/84f6ca9b453b33dba321c11e12a0ebc… --- diff --git a/src/main.c b/src/main.c index 3aa79b73d91..c107f354672 100644 --- a/src/main.c +++ b/src/main.c @@ -31,7 +31,9 @@ */ #ifdef KSR_PTHREAD_MUTEX_SHARED +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <pthread.h> #include <dlfcn.h> #endif

1 0

git:master:5ebe1758: ims_qos: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 5ebe1758fb3ff03e3a035e7121f40e2539eb2c9c URL: https://github.com/kamailio/kamailio/commit/5ebe1758fb3ff03e3a035e7121f40e2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T09:32:10+01:00 ims_qos: fix build warning > CC (gcc) [M ims_qos.so] rx_avp.o > [...] > /usr/include/fortify/stdio.h:122:16: warning: 'int_port_rctp_a' may be used uninitialized [-Wmaybe-uninitialized] > [...] > /usr/include/fortify/stdio.h:122:16: warning: 'int_port_rctp_b' may be used uninitialized [-Wmaybe-uninitialized] --- Modified: src/modules/ims_qos/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/5ebe1758fb3ff03e3a035e7121f40e2… Patch: https://github.com/kamailio/kamailio/commit/5ebe1758fb3ff03e3a035e7121f40e2… --- diff --git a/src/modules/ims_qos/rx_avp.c b/src/modules/ims_qos/rx_avp.c index d7d6abd9bc2..7a64d5e9713 100644 --- a/src/modules/ims_qos/rx_avp.c +++ b/src/modules/ims_qos/rx_avp.c @@ -670,7 +670,7 @@ AAA_AVP *rx_create_media_subcomponent_avp(int number, str *proto, str *ipA, str data; int len, len2; - int int_port_rctp_a, int_port_rctp_b; + int int_port_rctp_a = 0, int_port_rctp_b = 0; str port_rtcp_a = STR_NULL, port_rtcp_b = STR_NULL; AAA_AVP *flow_description1 = 0, *flow_description2 = 0, *flow_description3 = 0, *flow_description4 = 0, *flow_number = 0;

1 0

git:master:59dc9b1b: core: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 59dc9b1ba93d4e6a06f87deabf136787a3ab1cf1 URL: https://github.com/kamailio/kamailio/commit/59dc9b1ba93d4e6a06f87deabf13678… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T09:27:01+01:00 core: fix build warning > core/parser/parse_diversion.c: In function 'parse_diversion_body': core/parser/parse_diversion.c:60:18: warning: the comparison will always evaluate as 'false' for the address of 'uri_b' will never be NULL [-Waddress] > 60 | if(uri_b == NULL) { > | ^~ > core/parser/parse_diversion.c:51:26: note: 'uri_b' declared here > 51 | static to_body_t uri_b[NUM_DIVERSION_BODIES]; /* > Temporary storage */ > | --- Modified: src/core/parser/parse_diversion.c --- Diff: https://github.com/kamailio/kamailio/commit/59dc9b1ba93d4e6a06f87deabf13678… Patch: https://github.com/kamailio/kamailio/commit/59dc9b1ba93d4e6a06f87deabf13678… --- diff --git a/src/core/parser/parse_diversion.c b/src/core/parser/parse_diversion.c index 539f6a7bc44..d60d0cbdd1f 100644 --- a/src/core/parser/parse_diversion.c +++ b/src/core/parser/parse_diversion.c @@ -55,12 +55,7 @@ int parse_diversion_body(char *buf, int len, diversion_body_t **body) int i; to_param_t *params; - /* Reserves memory max NUM_DIVERSION_BODIES times */ memset(uri_b, 0, NUM_DIVERSION_BODIES * sizeof(to_body_t)); - if(uri_b == NULL) { - LM_ERR("Error allocating memory for uri_b\n"); - return -1; - } tmp = parse_addr_spec(buf, buf + len, &uri_b[num_uri], 1); if(uri_b[num_uri].error == PARSE_ERROR) {

1 0

git:master:ed0f2e77: pkg/kamailio/alpine: remove app_sqlang module [skip ci]
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: ed0f2e77b80a2719957b1ac43a96dfc57b88f98e URL: https://github.com/kamailio/kamailio/commit/ed0f2e77b80a2719957b1ac43a96dfc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T09:13:28+01:00 pkg/kamailio/alpine: remove app_sqlang module [skip ci] module was moved to kamailio-archive repository --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/ed0f2e77b80a2719957b1ac43a96dfc… Patch: https://github.com/kamailio/kamailio/commit/ed0f2e77b80a2719957b1ac43a96dfc… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index c69e4dca7fe..b3d5c4d64bd 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -227,9 +227,6 @@ _mod_list_jansson="acc_json jansson janssonrpcc" # - modules depending on libm _mod_list_jsdt="app_jsdt" -# - modules depending on sqlang -_mod_list_sqlang="app_sqlang" - # - modules depending on rabbitmq _mod_list_rabbitmq="rabbitmq" @@ -251,7 +248,7 @@ for _i in db postgres sqlite dbtext mysql \ cpl xml unixodbc snmpstats xmpp carrierroute \ ldap utils tls presence lua ims outbound debugger \ extras json websocket authephemeral mongodb\ - uuid ev memcached redis geoip2 jansson sqlang sipdump \ + uuid ev memcached redis geoip2 jansson sipdump \ jsdt http_async kazoo rabbitmq sctp radius perl \ python3 ruby; do @@ -557,11 +554,6 @@ ruby() { "$_mod_list_ruby" } -sqlang() { - _generic_pkg "Squirrel Language (SQLang) for Kamailio" \ - "$_mod_list_sqlang" -} - rabbitmq() { _generic_pkg "RabbitMQ related modules for Kamailio" \ "$_mod_list_rabbitmq"

1 0

git:master:268147a7: core: fix build warning
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 268147a7a7bcf68689a913a94faecc87128187fb URL: https://github.com/kamailio/kamailio/commit/268147a7a7bcf68689a913a94faecc8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T09:00:08+01:00 core: fix build warning > CC (gcc) [M jansson.so] jansson_utils.o > jansson_utils.c:23: warning: "_GNU_SOURCE" redefined > 23 | #define _GNU_SOURCE > | > <command-line>: note: this is the location of the previous definition --- Modified: src/core/io_wait.h --- Diff: https://github.com/kamailio/kamailio/commit/268147a7a7bcf68689a913a94faecc8… Patch: https://github.com/kamailio/kamailio/commit/268147a7a7bcf68689a913a94faecc8… --- diff --git a/src/core/io_wait.h b/src/core/io_wait.h index 8a60ae280fa..14d93f5937f 100644 --- a/src/core/io_wait.h +++ b/src/core/io_wait.h @@ -47,7 +47,9 @@ #include <signal.h> /* sigprocmask, sigwait a.s.o */ #endif +#ifndef _GNU_SOURCE #define _GNU_SOURCE /* for POLLRDHUP on linux */ +#endif #include <poll.h> #include <fcntl.h>

1 0

[kamailio/kamailio] build error on Alpine: grep -P not supported in BusyBox anymore (Issue #3686)
by Victor Seva 22 Dec '23

22 Dec '23

### Description It seems PCRE is not supported anymore ``` make[2]: --libs: No such file or directory grep: unrecognized option: P BusyBox v1.36.1 (2023-12-20 14:59:51 UTC) multi-call binary. ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3686 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3686(a)github.com>

1 1

git:master:ca450901: ndb_redis: replace use of grep -P
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: ca4509013a123f02d6d9c09d016fce3fea3e3dbe URL: https://github.com/kamailio/kamailio/commit/ca4509013a123f02d6d9c09d016fce3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T08:53:45+01:00 ndb_redis: replace use of grep -P PCRE option is been removed in BusyBox #3686 --- Modified: src/modules/ndb_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/ca4509013a123f02d6d9c09d016fce3… Patch: https://github.com/kamailio/kamailio/commit/ca4509013a123f02d6d9c09d016fce3… --- diff --git a/src/modules/ndb_redis/Makefile b/src/modules/ndb_redis/Makefile index ba085ca2735..429b69d6ea3 100644 --- a/src/modules/ndb_redis/Makefile +++ b/src/modules/ndb_redis/Makefile @@ -24,7 +24,7 @@ else HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) HIREDISLIBSPATH = $(shell $(HIREDIS_BUILDER) --libs-only-L | cut -c 3-) ifeq ($(HIREDISLIBSPATH),) - GCCSEARCHDIRS = $(shell $(CC) -print-search-dirs | grep -Po '^.*libraries: =.*' | cut -d "=" -f2- | tr : ' ') + GCCSEARCHDIRS = $(shell $(CC) -print-search-dirs | grep -Eo '^.*libraries: =.*' | cut -d "=" -f2- | tr : ' ') ifneq ($(shell find $(GCCSEARCHDIRS) -name libhiredis_ssl.so 2>/dev/null),) HIREDISDEFS += -DWITH_SSL HIREDISLIBS += -lhiredis_ssl

1 0

git:master:16302854: db_redis: replace use of grep -P
by Victor Seva 22 Dec '23

22 Dec '23

Module: kamailio Branch: master Commit: 163028549df3abd3173a7c0ac8a9dc666c0e4879 URL: https://github.com/kamailio/kamailio/commit/163028549df3abd3173a7c0ac8a9dc6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-22T08:53:32+01:00 db_redis: replace use of grep -P PCRE option is been removed in BusyBox #3686 --- Modified: src/modules/db_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/163028549df3abd3173a7c0ac8a9dc6… Patch: https://github.com/kamailio/kamailio/commit/163028549df3abd3173a7c0ac8a9dc6… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index 815cd056b9d..85d9b9a956f 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -30,7 +30,7 @@ else HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) HIREDISLIBSPATH = $(shell $(HIREDIS_BUILDER) --libs-only-L | cut -c 3-) ifeq ($(HIREDISLIBSPATH),) - GCCSEARCHDIRS = $(shell $(CC) -print-search-dirs | grep -Po '^.*libraries: =.*' | cut -d "=" -f2- | tr : ' ') + GCCSEARCHDIRS = $(shell $(CC) -print-search-dirs | grep -Eo '^.*libraries: =.*' | cut -d "=" -f2- | tr : ' ') ifneq ($(shell find $(GCCSEARCHDIRS) -name libhiredis_ssl.so 2>/dev/null),) HIREDISDEFS += -DWITH_SSL HIREDISLIBS += -lhiredis_ssl

1 0

git:master:4c939854: pua: fix possible copy/paste error, we should use reginfo_increase_version for reginfo events (GH #3234)
by Henning Westerholt 21 Dec '23

21 Dec '23

Module: kamailio Branch: master Commit: 4c93985437122706bc68143b2f96a9d7f35be16d URL: https://github.com/kamailio/kamailio/commit/4c93985437122706bc68143b2f96a9d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-12-21T16:10:25Z pua: fix possible copy/paste error, we should use reginfo_increase_version for reginfo events (GH #3234) --- Modified: src/modules/pua/add_events.c --- Diff: https://github.com/kamailio/kamailio/commit/4c93985437122706bc68143b2f96a9d… Patch: https://github.com/kamailio/kamailio/commit/4c93985437122706bc68143b2f96a9d… --- diff --git a/src/modules/pua/add_events.c b/src/modules/pua/add_events.c index e2fc78be3ee..bf4a437e4b4 100644 --- a/src/modules/pua/add_events.c +++ b/src/modules/pua/add_events.c @@ -82,7 +82,7 @@ int pua_add_events(void) } /* add application/reginfo+xml */ - if(dlginfo_increase_version) { + if(reginfo_increase_version) { if(add_pua_event(REGINFO_EVENT, "reg", "application/reginfo+xml", reginfo_process_body) < 0) {

1 0

git:master:ac4fa112: tmx: use unsigned for bitwise operations
by Daniel-Constantin Mierla 21 Dec '23

21 Dec '23

Module: kamailio Branch: master Commit: ac4fa1129f5fbd1a48aad1b7dc21a2c130ecd164 URL: https://github.com/kamailio/kamailio/commit/ac4fa1129f5fbd1a48aad1b7dc21a2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-21T16:05:04+01:00 tmx: use unsigned for bitwise operations --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/ac4fa1129f5fbd1a48aad1b7dc21a2c… Patch: https://github.com/kamailio/kamailio/commit/ac4fa1129f5fbd1a48aad1b7dc21a2c… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index dcaebd1f41b..7600a3c7b4b 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -72,19 +72,20 @@ static int _tmx_ptran_size = 0; */ int tmx_init_pretran_table(void) { - int n; - int pn; + unsigned int n; + unsigned int pn; - pn = get_max_procs(); + pn = (unsigned int)get_max_procs(); - if(pn <= 0) + if(pn == 0) return -1; if(_tmx_ptran_table != NULL) return -1; + n = 1; /* get the highest power of two less than number of processes */ - n = -1; - while(pn >> ++n > 0) - ; + while((pn >> n) > 0) { + n++; + } n--; if(n <= 1) n = 2;

1 0

git:master:4399fe39: sms: define buffer size for name field
by Daniel-Constantin Mierla 21 Dec '23

21 Dec '23

Module: kamailio Branch: master Commit: 4399fe3966f6774b18e02ea6e54a5ba132c7c4ab URL: https://github.com/kamailio/kamailio/commit/4399fe3966f6774b18e02ea6e54a5ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-21T13:56:28+01:00 sms: define buffer size for name field - check size before copy and trucate large messages --- Modified: src/modules/sms/libsms_getsms.c Modified: src/modules/sms/sms_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/4399fe3966f6774b18e02ea6e54a5ba… Patch: https://github.com/kamailio/kamailio/commit/4399fe3966f6774b18e02ea6e54a5ba… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index 0f6df6b7341..ea258ccf673 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -279,6 +279,7 @@ static int splitascii(struct modem *mdm, char *source, struct incame_sms *sms) char *end; char tbuf[TIME_LEN + 1]; char dbuf[DATE_LEN + 1]; + int l1 = 0; /* the text is after the \r */ for(start = source; *start && *start != '\r'; start++) @@ -313,7 +314,13 @@ static int splitascii(struct modem *mdm, char *source, struct incame_sms *sms) return 1; } *end = 0; - strcpy(sms->name, start); + l1 = strlen(start); + if(l1 >= SMS_NAME_LEN) { + /* truncate */ + l1 = SMS_NAME_LEN - 1; + } + memcpy(sms->name, start, l1); + sms->name[l1] = '\0'; } /* Get the date */ start = end + 3; diff --git a/src/modules/sms/sms_funcs.h b/src/modules/sms/sms_funcs.h index e49427c91b7..4123b92c514 100644 --- a/src/modules/sms/sms_funcs.h +++ b/src/modules/sms/sms_funcs.h @@ -91,10 +91,11 @@ struct sms_msg int ref; }; +#define SMS_NAME_LEN 64 struct incame_sms { char sender[31]; - char name[64]; + char name[SMS_NAME_LEN]; char date[DATE_LEN]; char time[TIME_LEN]; char ascii[500];

1 0

git:master:b2045d55: pv: remove another redunant variable definition related commit 8ed4165fd3b0a33
by Henning Westerholt 21 Dec '23

21 Dec '23

Module: kamailio Branch: master Commit: b2045d559ed720789df80f543fc00923a07ada83 URL: https://github.com/kamailio/kamailio/commit/b2045d559ed720789df80f543fc0092… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-12-21T11:54:52Z pv: remove another redunant variable definition related commit 8ed4165fd3b0a33 --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/b2045d559ed720789df80f543fc0092… Patch: https://github.com/kamailio/kamailio/commit/b2045d559ed720789df80f543fc0092… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 1c822d014fa..03d025bba2f 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2479,7 +2479,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) while(paib != NULL) { if(n + paib->num_ids > idx) { /* Calculate the index within this specific list */ - int innerIndex = idx - n; + innerIndex = idx - n; /* Access the desired element within this list */ sval.s = paib->id[innerIndex].body.s;

1 0

git:master:0547a4be: pv: remove another redunant variable definition (warning: unused variable âinnerIndexâ)
by Henning Westerholt 21 Dec '23

21 Dec '23

Module: kamailio Branch: master Commit: 0547a4becbc6a48fdc473cfd26cdeedfa2a9317d URL: https://github.com/kamailio/kamailio/commit/0547a4becbc6a48fdc473cfd26cdeed… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-12-21T11:34:14Z pv: remove another redunant variable definition (warning: unused variable ��innerIndex��) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/0547a4becbc6a48fdc473cfd26cdeed… Patch: https://github.com/kamailio/kamailio/commit/0547a4becbc6a48fdc473cfd26cdeed… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 5375e95c418..1c822d014fa 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2427,7 +2427,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) while(ppib != NULL) { if(n + ppib->num_ids > idx) { /* Calculate the index within this specific list */ - int innerIndex = idx - n; + innerIndex = idx - n; /* Access the desired element within this list */ sval.s = ppib->id[innerIndex].body.s;

1 0

git:master:8ed4165f: pv: remove redunant variable definition (warning: unused variable âinnerIndexâ)
by Henning Westerholt 21 Dec '23

21 Dec '23

Module: kamailio Branch: master Commit: 8ed4165fd3b0a331a4580894e2e7f83456b474fa URL: https://github.com/kamailio/kamailio/commit/8ed4165fd3b0a331a4580894e2e7f83… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-12-21T11:23:51Z pv: remove redunant variable definition (warning: unused variable ��innerIndex��) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/8ed4165fd3b0a331a4580894e2e7f83… Patch: https://github.com/kamailio/kamailio/commit/8ed4165fd3b0a331a4580894e2e7f83… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 4b8f98bcfd3..5375e95c418 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2375,7 +2375,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) while(db != NULL) { if(n + db->num_ids > idx) { /* Calculate the index within this specific list */ - int innerIndex = idx - n; + innerIndex = idx - n; /* Access the desired element within this list */ sval.s = db->id[innerIndex].body.s;

1 0

git:master:64e42882: Makefile.groups: add dlgs and sworker to extra modules
by Daniel-Constantin Mierla 20 Dec '23

20 Dec '23

Module: kamailio Branch: master Commit: 64e4288217d4a9dd2441687b56f5dbd02b8549f4 URL: https://github.com/kamailio/kamailio/commit/64e4288217d4a9dd2441687b56f5dbd… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-20T13:07:34+01:00 Makefile.groups: add dlgs and sworker to extra modules --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/64e4288217d4a9dd2441687b56f5dbd… Patch: https://github.com/kamailio/kamailio/commit/64e4288217d4a9dd2441687b56f5dbd… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index bc56672e56d..8d15b198cc3 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -23,7 +23,7 @@ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect \ xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ log_custom keepalive ss7ops acc_diameter evrexec \ - sipjson lrkproxy math posops xhttp_prom + sipjson lrkproxy math posops xhttp_prom dlgs sworker # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

[kamailio/kamailio] Makefile.groups: add dlgs and sworker to extra modules (PR #3684)
by Federico Cabiddu 20 Dec '23

20 Dec '23

#### 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 Currently dlgs and sworker modules are not packaged. We propose with this PR to add them to the extra modules list. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3684 -- Commit Summary -- * Makefile.groups: add dlgs and sworker to extra modules -- File Changes -- M src/Makefile.groups (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3684.patch https://github.com/kamailio/kamailio/pull/3684.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3684 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3684(a)github.com>

2 2

git:master:9bb1976b: Makefile.groups: removed app_sqlang from modules list
by Daniel-Constantin Mierla 20 Dec '23

20 Dec '23

Module: kamailio Branch: master Commit: 9bb1976b4b7d52542a4de37144194bfc24649222 URL: https://github.com/kamailio/kamailio/commit/9bb1976b4b7d52542a4de37144194bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-20T10:06:59+01:00 Makefile.groups: removed app_sqlang from modules list --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/9bb1976b4b7d52542a4de37144194bf… Patch: https://github.com/kamailio/kamailio/commit/9bb1976b4b7d52542a4de37144194bf… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 48e06e0646c..bc56672e56d 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -22,7 +22,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect \ xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ - log_custom keepalive ss7ops app_sqlang acc_diameter evrexec \ + log_custom keepalive ss7ops acc_diameter evrexec \ sipjson lrkproxy math posops xhttp_prom # - common modules depending on database

1 0

git:master:bab926d0: app_sqlang: module relocated to kamailio-archive repository
by Daniel-Constantin Mierla 20 Dec '23

20 Dec '23

Module: kamailio Branch: master Commit: bab926d0b3eb69b5f15e9a49fdc52c937e164612 URL: https://github.com/kamailio/kamailio/commit/bab926d0b3eb69b5f15e9a49fdc52c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-20T10:04:24+01:00 app_sqlang: module relocated to kamailio-archive repository - module is considered obsolete, not maintained - app_jsdt should be considered a better alternative, or app_lua, app_python3/s - located now at: https://github.com/kamailio/kamailio-archive/tree/main/src/modules/app_sqla… --- Removed: src/modules/app_sqlang/Makefile Removed: src/modules/app_sqlang/README Removed: src/modules/app_sqlang/app_sqlang_api.c Removed: src/modules/app_sqlang/app_sqlang_api.h Removed: src/modules/app_sqlang/app_sqlang_kemi_export.c Removed: src/modules/app_sqlang/app_sqlang_kemi_export.h Removed: src/modules/app_sqlang/app_sqlang_mod.c Removed: src/modules/app_sqlang/doc/Makefile Removed: src/modules/app_sqlang/doc/app_sqlang.xml Removed: src/modules/app_sqlang/doc/app_sqlang_admin.xml Removed: src/modules/app_sqlang/squirrel/include/sqconfig.h Removed: src/modules/app_sqlang/squirrel/include/sqstdaux.h Removed: src/modules/app_sqlang/squirrel/include/sqstdblob.h Removed: src/modules/app_sqlang/squirrel/include/sqstdio.h Removed: src/modules/app_sqlang/squirrel/include/sqstdmath.h Removed: src/modules/app_sqlang/squirrel/include/sqstdstring.h Removed: src/modules/app_sqlang/squirrel/include/sqstdsystem.h Removed: src/modules/app_sqlang/squirrel/include/squirrel.h Removed: src/modules/app_sqlang/squirrel/sqstdlib/Makefile Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdaux.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdblob.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdblobimpl.h Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdio.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdlib.dsp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdmath.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdrex.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstream.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstream.h Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp Removed: src/modules/app_sqlang/squirrel/sqstdlib/sqstdsystem.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/Makefile Removed: src/modules/app_sqlang/squirrel/squirrel/sqapi.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqarray.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqclass.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqclass.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqclosure.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqcompiler.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqcompiler.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqdebug.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqfuncproto.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqfuncstate.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqfuncstate.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqlexer.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqlexer.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqmem.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqobject.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqobject.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqopcodes.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqpcheader.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqstate.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqstate.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqstring.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqtable.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqtable.h Removed: src/modules/app_sqlang/squirrel/squirrel/squirrel.dsp Removed: src/modules/app_sqlang/squirrel/squirrel/squserdata.h Removed: src/modules/app_sqlang/squirrel/squirrel/squtils.h Removed: src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp Removed: src/modules/app_sqlang/squirrel/squirrel/sqvm.h Removed: src/modules/app_sqlang/utils/app_sqlang_ctl --- Diff: https://github.com/kamailio/kamailio/commit/bab926d0b3eb69b5f15e9a49fdc52c9… Patch: https://github.com/kamailio/kamailio/commit/bab926d0b3eb69b5f15e9a49fdc52c9…

1 0

git:master:943ff442: pipelimit: reformat exported structures
by Daniel-Constantin Mierla 20 Dec '23

20 Dec '23

Module: kamailio Branch: master Commit: 943ff442d85a041ba0285cc494ce0697f4dbae59 URL: https://github.com/kamailio/kamailio/commit/943ff442d85a041ba0285cc494ce069… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-20T09:36:57+01:00 pipelimit: reformat exported structures --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/943ff442d85a041ba0285cc494ce069… Patch: https://github.com/kamailio/kamailio/commit/943ff442d85a041ba0285cc494ce069…

1 0

git:master:5e1f8e6c: pipelimit: renamed global variable with module prefix
by Daniel-Constantin Mierla 20 Dec '23

20 Dec '23

Module: kamailio Branch: master Commit: 5e1f8e6c93dae914665b2e97b38e8a3a0673d1f2 URL: https://github.com/kamailio/kamailio/commit/5e1f8e6c93dae914665b2e97b38e8a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-20T09:33:17+01:00 pipelimit: renamed global variable with module prefix - avoid overlapping global symbols --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/5e1f8e6c93dae914665b2e97b38e8a3… Patch: https://github.com/kamailio/kamailio/commit/5e1f8e6c93dae914665b2e97b38e8a3… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index 625da0e50dd..a3412866eb3 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -68,7 +68,7 @@ MODULE_VERSION #define PL_TIMER_INTERVAL_DEFAULT 10 /** SL API structure */ -sl_api_t slb; +static sl_api_t _pl_slb; enum { @@ -368,7 +368,7 @@ static int mod_init(void) } /* bind the SL API */ - if(sl_load_api(&slb) != 0) { + if(sl_load_api(&_pl_slb) != 0) { LM_ERR("cannot bind to SL API\n"); return -1; } @@ -479,7 +479,7 @@ static int pl_drop(struct sip_msg *msg, unsigned int low, unsigned int high) LM_DBG("(%d, %d)\n", low, high); - if(slb.freply != 0) { + if(_pl_slb.freply != 0) { if(low != 0 && high != 0) { hdr.s = (char *)pkg_malloc(64); if(hdr.s == 0) { @@ -505,11 +505,11 @@ static int pl_drop(struct sip_msg *msg, unsigned int low, unsigned int high) return 0; } - ret = slb.freply(msg, pl_drop_code, &pl_drop_reason); + ret = _pl_slb.freply(msg, pl_drop_code, &pl_drop_reason); pkg_free(hdr.s); } else { - ret = slb.freply(msg, pl_drop_code, &pl_drop_reason); + ret = _pl_slb.freply(msg, pl_drop_code, &pl_drop_reason); } } else { LM_ERR("Can't send reply\n");

1 0

git:master:17e9e3f4: sipcapture: removed unused global variable
by Daniel-Constantin Mierla 20 Dec '23

20 Dec '23

Module: kamailio Branch: master Commit: 17e9e3f447867e34b8f320b8b93189f01fbc3f77 URL: https://github.com/kamailio/kamailio/commit/17e9e3f447867e34b8f320b8b93189f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-20T09:30:01+01:00 sipcapture: removed unused global variable - renamed local function variable that was conflicting --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/17e9e3f447867e34b8f320b8b93189f… Patch: https://github.com/kamailio/kamailio/commit/17e9e3f447867e34b8f320b8b93189f… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index d39ee1fa7c4..320e351a371 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -298,8 +298,6 @@ static struct sock_filter BPF_code[] = { //str* table_names = NULL; -unsigned int no_tables = 0; - enum e_mt_mode mtmode = mode_random; enum hash_source source = hs_error; @@ -481,12 +479,12 @@ int parse_table_names(str table_name, str **table_names) { char *p = NULL; - unsigned int no_tables; + unsigned int l_no_tables; char *table_name_cpy; int i; /*parse and save table names*/ - no_tables = 1; + l_no_tables = 1; i = 0; str *names; @@ -503,12 +501,12 @@ int parse_table_names(str table_name, str **table_names) while(*p) { if(*p == '|') { - no_tables++; + l_no_tables++; } p++; } - names = (str *)pkg_malloc(sizeof(str) * no_tables); + names = (str *)pkg_malloc(sizeof(str) * l_no_tables); if(names == NULL) { PKG_MEM_ERROR; pkg_free(table_name_cpy); @@ -539,7 +537,7 @@ int parse_table_names(str table_name, str **table_names) *table_names = names; - return no_tables; + return l_no_tables; } /* checks for some missing fields*/

1 0

ERROR: ctl [init_socks.c:114]: init_unix_sock(): ERROR: init_unix_sock: bind: Permission denied [13]
by nguyenquocchinhdev＠gmail.com 19 Dec '23

19 Dec '23

Hi guys, When I ran below the command, an error appeared, how do I fix this? /etc/kamailio$ kamailio -E -e loading modules under config path: /usr/lib/x86_64-linux-gnu/kamailio/modules/ Listening on udp: 192.168.0.158:5090 tcp: 192.168.0.158:5090 tcp: 192.168.0.158:10080 sctp: 192.168.0.158:5090 Aliases: sctp: vizoai1:5090 tcp: vizoai1:10080 tcp: vizoai1:5090 udp: vizoai1:5090 0(564421) INFO: <core> [core/tcp_main.c:4999]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(564423) INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded 0(564423) INFO: rr [rr_mod.c:188]: mod_init(): outbound module not available 0(564423) ERROR: ctl [init_socks.c:114]: init_unix_sock(): ERROR: init_unix_sock: bind: Permission denied [13] 0(564423) ERROR: ctl [ctl.c:291]: mod_init(): ERROR: ctl: mod_init: init ctrl. sockets failed 0(564423) ERROR: <core> [core/sr_module.c:945]: init_mod(): Error while initializing module ctl (/usr/lib/x86_64-linux-gnu/kamailio/modules/ctl.so) ERROR: error while initializing modules 0(564423) ERROR: jsonrpcs [jsonrpcs_fifo.c:599]: jsonrpc_fifo_destroy(): FIFO stat failed: Permission denied ============================================= grep loadmodule modules.cfg loadmodule "db_mysql.so" loadmodule "textopsx.so" loadmodule "websocket.so" loadmodule "xhttp.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "sdpops.so" loadmodule "jsonrpcs.so" loadmodule "auth.so" loadmodule "auth_db.so" loadmodule "nathelper.so" loadmodule "rtpengine.so" loadmodule "tls.so" loadmodule "debugger.so" loadmodule "sctp.so"

4 5

git:master:1068bbbf: README.md: remove irc reference
by GitHub 19 Dec '23

19 Dec '23

Module: kamailio Branch: master Commit: 1068bbbf9a7f2bf96d9ee2cefa1b81fbabac9805 URL: https://github.com/kamailio/kamailio/commit/1068bbbf9a7f2bf96d9ee2cefa1b81f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2023-12-19T21:18:03+01:00 README.md: remove irc reference --- Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/1068bbbf9a7f2bf96d9ee2cefa1b81f… Patch: https://github.com/kamailio/kamailio/commit/1068bbbf9a7f2bf96d9ee2cefa1b81f… --- diff --git a/README.md b/README.md index a4616f9d66c..d06dd7a7822 100644 --- a/README.md +++ b/README.md @@ -101,13 +101,6 @@ For more information about the mailing lists, please see: * https://www.kamailio.org/w/mailing-lists/ -### IRC Channel - -An open IRC discussion channel is managed by the community: - - * irc server: irc.freenode.net - * irc channel: #kamailio - ### Matrix Channel An open Matrix discussion channel is managed by the community:

1 0

git:master:f036333b: ims_dialog: refactored kemi get/set profile functions
by Daniel-Constantin Mierla 19 Dec '23

19 Dec '23

Module: kamailio Branch: master Commit: f036333b756c1021545e70871024561089954a56 URL: https://github.com/kamailio/kamailio/commit/f036333b756c1021545e70871024561… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-19T10:57:40+01:00 ims_dialog: refactored kemi get/set profile functions - expect final string values in the parameters, not with kamailio-specific variables, they can conflict in the external scripting languages and also leak pkg memory --- Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/f036333b756c1021545e70871024561… Patch: https://github.com/kamailio/kamailio/commit/f036333b756c1021545e70871024561… --- diff --git a/src/modules/ims_dialog/ims_dialog.c b/src/modules/ims_dialog/ims_dialog.c index 3c0454e5045..16a76a8cbe1 100644 --- a/src/modules/ims_dialog/ims_dialog.c +++ b/src/modules/ims_dialog/ims_dialog.c @@ -1068,7 +1068,6 @@ static int ki_is_known_dlg(sip_msg_t *msg) static int ki_set_dlg_profile(sip_msg_t *msg, str *sprofile, str *svalue) { struct dlg_profile_table *profile = NULL; - pv_elem_t *pvvalue = NULL; if(sprofile == NULL || sprofile->s == NULL || sprofile->len <= 0) { LM_ERR("invalid profile identifier\n"); @@ -1080,14 +1079,18 @@ static int ki_set_dlg_profile(sip_msg_t *msg, str *sprofile, str *svalue) LM_CRIT("profile <%.*s> not defined\n", sprofile->len, sprofile->s); return -1; } - - if(pv_parse_format(svalue, &pvvalue) || pvvalue == NULL) { - LM_ERR("wrong format [%.*s] for value param!\n", svalue->len, - svalue->s); - return -1; + if(svalue != NULL && svalue->len > 0) { + if(set_dlg_profile(msg, svalue, profile) < 0) { + LM_ERR("failed to set profile with value\n"); + return -1; + } + } else { + if(set_dlg_profile(msg, NULL, profile) < 0) { + LM_ERR("failed to set profile\n"); + return -1; + } } - - return w_set_dlg_profile(msg, (char *)profile, (char *)pvvalue); + return 1; } static int ki_get_profile_size( @@ -1095,8 +1098,9 @@ static int ki_get_profile_size( { struct dlg_profile_table *profile = NULL; - pv_elem_t *pvvalue = NULL; pv_spec_t *pvs = NULL; + unsigned int size; + pv_value_t val; if(sprofile == NULL || sprofile->s == NULL || sprofile->len <= 0) { LM_ERR("invalid profile identifier\n"); @@ -1111,11 +1115,6 @@ static int ki_get_profile_size( LM_CRIT("profile <%.*s> not defined\n", sprofile->len, sprofile->s); return -1; } - if(pv_parse_format(svalue, &pvvalue) || pvvalue == NULL) { - LM_ERR("wrong format [%.*s] for value param!\n", svalue->len, - svalue->s); - return -1; - } pvs = pv_cache_get(spv); if(pvs == NULL) { LM_ERR("cannot get pv spec for [%.*s]\n", spv->len, spv->s); @@ -1125,9 +1124,22 @@ static int ki_get_profile_size( LM_ERR("return must be an AVP or SCRIPT VAR!\n"); return -1; } + if(svalue != NULL && svalue->len > 0 && profile->has_value != 0) { + size = get_profile_size(profile, svalue); + } else { + size = get_profile_size(profile, NULL); + } + + memset(&val, 0, sizeof(pv_value_t)); + val.flags = PV_VAL_INT | PV_TYPE_INT; + val.ri = (long)size; + + if(pvs->setf(msg, &pvs->pvp, (int)EQ_T, &val) < 0) { + LM_ERR("setting profile PV failed\n"); + return -1; + } - return w_get_profile_size3( - msg, (char *)profile, (char *)pvvalue, (char *)pvs); + return 1; } /* clang-format off */

1 0

git:master:19152caf: ims_dialog: reformat exported structures
by Daniel-Constantin Mierla 19 Dec '23

19 Dec '23

Module: kamailio Branch: master Commit: 19152caf44360eae533508ecd6f3f9e33af14fb7 URL: https://github.com/kamailio/kamailio/commit/19152caf44360eae533508ecd6f3f9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-19T10:57:40+01:00 ims_dialog: reformat exported structures --- Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/19152caf44360eae533508ecd6f3f9e… Patch: https://github.com/kamailio/kamailio/commit/19152caf44360eae533508ecd6f3f9e…

1 0

git:master:19572a82: tm: clearer reply code handling for uac dlg
by Daniel-Constantin Mierla 19 Dec '23

19 Dec '23

Module: kamailio Branch: master Commit: 19572a828ffeb08b190dab5ae4aee93f03d9a7f2 URL: https://github.com/kamailio/kamailio/commit/19572a828ffeb08b190dab5ae4aee93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-19T10:57:40+01:00 tm: clearer reply code handling for uac dlg --- Modified: src/modules/tm/dlg.c --- Diff: https://github.com/kamailio/kamailio/commit/19572a828ffeb08b190dab5ae4aee93… Patch: https://github.com/kamailio/kamailio/commit/19572a828ffeb08b190dab5ae4aee93… --- diff --git a/src/modules/tm/dlg.c b/src/modules/tm/dlg.c index 420f95a98d2..29b8d50769f 100644 --- a/src/modules/tm/dlg.c +++ b/src/modules/tm/dlg.c @@ -666,7 +666,7 @@ static inline int dlg_new_resp_uac(dlg_t *_d, struct sip_msg *_m) code = _m->first_line.u.reply.statuscode; if(code < 200) { - /* A provisional response, do nothing, we could + /* 100-199: a provisional response, do nothing, we could * update remote tag and route set but we will do that * for a positive final response anyway and I don't want * bet on presence of these fields in provisional responses @@ -674,8 +674,8 @@ static inline int dlg_new_resp_uac(dlg_t *_d, struct sip_msg *_m) * Send a request to jan(a)iptel.org if you need to update * the structures here */ - } else if((code >= 200) && (code < 299)) { - /* A final response, update the structures and transit + } else if(code < 299) { + /* 200-299: a final response, update the structures and transit * into DLG_CONFIRMED */ if(response2dlg(_m, _d) < 0) @@ -687,7 +687,7 @@ static inline int dlg_new_resp_uac(dlg_t *_d, struct sip_msg *_m) return -2; } } else { - /* A negative final response, mark the dialog as destroyed + /* 300-699: a negative final response, mark the dialog as destroyed * Again, I do not update the structures here because it * makes no sense to me, a dialog shouldn't be used after * it is destroyed

1 0

[kamailio/kamailio] github: [skip ci]: bump actions/upload-artifact from 3 to 4 (PR #3681)
by dependabot[bot] 19 Dec '23

19 Dec '23

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/actions/upload-artifact/releases">act… releases</a>.</em></p> <blockquote> <h2>v4.0.0</h2> <h2>What's Changed</h2> <p>The release of upload-artifact@v4 and download-artifact@v4 are major changes to the backend architecture of Artifacts. They have numerous performance and behavioral improvements.</p> <p>For more information, see the <a href="https://github.com/actions/toolkit/tree/main/packages/artifact&q… documentation.</p> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/vmjoseph"><code>@vmjoseph</… made their first contribution in <a href="https://redirect.github.com/actions/upload-artifact/pull/464&quo… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/upload-artifact/compare/v3...v4.0.0&q… <h2>v3.1.3</h2> <h2>What's Changed</h2> <ul> <li>chore(github): remove trailing whitespaces by <a href="https://github.com/ljmf00"><code>@ljmf00</code… in <a href="https://redirect.github.com/actions/upload-artifact/pull/313&quo… <li>Bump <code>@actions/artifact</code> version to v1.1.2 by <a href="https://github.com/bethanyj28"><code>@bethanyj28&… in <a href="https://redirect.github.com/actions/upload-artifact/pull/436&quo… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/upload-artifact/compare/v3...v3.1.3&q… <h2>v3.1.2</h2> <ul> <li>Update all <code>@actions/*</code> NPM packages to their latest versions- <a href="https://redirect.github.com/actions/upload-artifact/issues/374&q… <li>Update all dev dependencies to their most recent versions - <a href="https://redirect.github.com/actions/upload-artifact/issues/375&q… </ul> <h2>v3.1.1</h2> <ul> <li>Update actions/core package to latest version to remove <code>set-output</code> deprecation warning <a href="https://redirect.github.com/actions/upload-artifact/issues/351&q… </ul> <h2>v3.1.0</h2> <h2>What's Changed</h2> <ul> <li>Bump <code>@actions/artifact</code> to v1.1.0 (<a href="https://redirect.github.com/actions/upload-artifact/pull/327&quo…) <ul> <li>Adds checksum headers on artifact upload (<a href="https://redirect.github.com/actions/toolkit/pull/1095">a…) (<a href="https://redirect.github.com/actions/toolkit/pull/1063">a… </ul> </li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/actions/upload-artifact/commit/c7d193f32edcb7… Merge pull request <a href="https://redirect.github.com/actions/upload-artifact/issues/466&q… from actions/v4-beta</li> <li><a href="https://github.com/actions/upload-artifact/commit/13131bb095770b… licensed cache</li> <li><a href="https://github.com/actions/upload-artifact/commit/4a6c273b9834f6… Merge branch 'main' into v4-beta</li> <li><a href="https://github.com/actions/upload-artifact/commit/f391bb91a3d311… Merge pull request <a href="https://redirect.github.com/actions/upload-artifact/issues/465&q… from actions/robherley/v4-documentation</li> <li><a href="https://github.com/actions/upload-artifact/commit/9653d03c4b74c3… Apply suggestions from code review</li> <li><a href="https://github.com/actions/upload-artifact/commit/875b63076402f2… add limitations section</li> <li><a href="https://github.com/actions/upload-artifact/commit/ecb21463e93740… add compression example</li> <li><a href="https://github.com/actions/upload-artifact/commit/5e7604f84a0558… trim some repeated info</li> <li><a href="https://github.com/actions/upload-artifact/commit/d6437d07581fe3… naming</li> <li><a href="https://github.com/actions/upload-artifact/commit/1b561557037b49… s/v4-beta/v4/g</li> <li>Additional commits viewable in <a href="https://github.com/actions/upload-artifact/compare/v3...v4"… 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/3681 -- Commit Summary -- * github: [skip ci]: bump actions/upload-artifact from 3 to 4 -- File Changes -- M .github/workflows/cifuzz.yml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3681.patch https://github.com/kamailio/kamailio/pull/3681.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3681 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3681(a)github.com>

2 1

git:master:68f653bf: github: [skip ci]: bump actions/upload-artifact from 3 to 4
by Victor Seva 19 Dec '23

19 Dec '23

Module: kamailio Branch: master Commit: 68f653bfc66d8f4ff2e11f5fc9348f4d2632fe8b URL: https://github.com/kamailio/kamailio/commit/68f653bfc66d8f4ff2e11f5fc9348f4… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-19T07:43:10+01:00 github: [skip ci]: bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/cifuzz.yml --- Diff: https://github.com/kamailio/kamailio/commit/68f653bfc66d8f4ff2e11f5fc9348f4… Patch: https://github.com/kamailio/kamailio/commit/68f653bfc66d8f4ff2e11f5fc9348f4… --- diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index bb1b712cb5b..3ee2f6ef37f 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -27,7 +27,7 @@ jobs: dry-run: false language: c - name: Upload Crash - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() && steps.build.outcome == 'success' with: name: artifacts

1 0

git:master:b2f1cd6e: github: [skip ci]: bump github/codeql-action from 2 to 3
by Victor Seva 19 Dec '23

19 Dec '23

Module: kamailio Branch: master Commit: b2f1cd6ed2cd5da84fe8ff48db688fc41f129ccb URL: https://github.com/kamailio/kamailio/commit/b2f1cd6ed2cd5da84fe8ff48db688fc… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-19T07:42:08+01:00 github: [skip ci]: bump github/codeql-action from 2 to 3 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/b2f1cd6ed2cd5da84fe8ff48db688fc… Patch: https://github.com/kamailio/kamailio/commit/b2f1cd6ed2cd5da84fe8ff48db688fc… --- diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 62fe2dc5c04..aa6d9194b07 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -41,13 +41,13 @@ jobs: run: export PKG_CONFIG_PATH=$RUNNER_TEMP/usr/lib/pkgconfig:$PKG_CONFIG_PATH && echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} queries: +security-and-quality - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 if: ${{ matrix.language == 'javascript' || matrix.language == 'python' }} - name: Build cpp @@ -55,6 +55,6 @@ jobs: run: make all - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{ matrix.language }}"

1 0

[kamailio/kamailio] github: [skip ci]: bump github/codeql-action from 2 to 3 (PR #3680)
by dependabot[bot] 19 Dec '23

19 Dec '23

2 1

git:master:0e5b8178: msilo: remove redundant condition
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: 0e5b8178de281db5ddfe30af28244a1ebaf12382 URL: https://github.com/kamailio/kamailio/commit/0e5b8178de281db5ddfe30af28244a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T14:06:49+01:00 msilo: remove redundant condition --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/0e5b8178de281db5ddfe30af28244a1… Patch: https://github.com/kamailio/kamailio/commit/0e5b8178de281db5ddfe30af28244a1… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 2be3bdd09cd..78e238437a2 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -448,7 +448,7 @@ int lua_sr_reload_script(int pos) lock_set_release(sr_lua_locks, i); } } else { - if(pos >= 0 && pos < len) { + if(pos < len) { lock_set_get(sr_lua_locks, pos); sr_lua_script_ver->version[pos] += 1; lock_set_release(sr_lua_locks, pos);

1 0

event_route names with underscore before the semicolon
by Luca Nardin 18 Dec '23

18 Dec '23

Hello, In the kamailio core cookbook (https://www.kamailio.org/wiki/cookbooks/5.5.x/core#event_route) I read that the name of an event_route should be like this: event_route[groupid:eventid] Where: groupid - should be the name of the module that triggers the event eventid - some meaningful short text describing the event Some modules of kamailio have underscores in the name, for example: http_async_client Years ago a fix have been committed in order to allow underscores in the second part of the name, after the semicolon: https://github.com/kamailio/kamailio/commit/5806703c1ff72243457ff55758f41c3… But it seems that an underscore is still not allowed in the first part of the name: https://github.com/kamailio/kamailio/blob/master/src/core/cfg.lex EVENT_RT_NAME [a-zA-Z][0-9a-zA-Z-]*(":"[a-zA-Z][0-9a-zA-Z_-]*)+ So I wonder if this is a bug in the code or a mistake in the cookbook. Thanks, Luca

1 1

Info: Next Kamailio World Conference - April 18-19, 2024, Berlin, Germany
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Hello, a short announcement to inform that the dates for next Kamailio World Conference have been set to April 18-19, 2024, the event to take place again in Berlin, Germany. It will be a different venue than the past editions, that one not being available. A pre-conference day is considered on April 17, 2024, but it is not yet known in what form and where. The conference is scheduled a bit earlier than the usual in the year because Germany hosts the Euro 2024 football championship during June-July 2024, making May very busy and harder to find adequate conferencing space in Berlin. The website and more details will be published soon. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy and Development Services Kamailio Advanced Training -- asipto.com

1 0

git:master:2f43510b: pv: removed unnecessary condition
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: 2f43510be37c157f800389dfb432b6c52d7435a7 URL: https://github.com/kamailio/kamailio/commit/2f43510be37c157f800389dfb432b6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:31:34+01:00 pv: removed unnecessary condition --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/2f43510be37c157f800389dfb432b6c… Patch: https://github.com/kamailio/kamailio/commit/2f43510be37c157f800389dfb432b6c… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 7eb50ee9a2b..84c3a0c703f 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1439,7 +1439,7 @@ int tr_eval_string( get_cfg_crt_line()); return -1; } - if(n == 0 || m >= val->rs.len) { + if(m >= val->rs.len) { if(val->rs.len > TR_BUFFER_SIZE - 2) { LM_ERR("value too large: %d\n", val->rs.len); return -1;

1 0

git:master:ca2a9479: pv: typo in transformation log message
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: ca2a9479adf720e67bf50c9d2795cc8937e223dc URL: https://github.com/kamailio/kamailio/commit/ca2a9479adf720e67bf50c9d2795cc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:22:25+01:00 pv: typo in transformation log message --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/ca2a9479adf720e67bf50c9d2795cc8… Patch: https://github.com/kamailio/kamailio/commit/ca2a9479adf720e67bf50c9d2795cc8… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 3c51be15f74..7eb50ee9a2b 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1406,7 +1406,7 @@ int tr_eval_string( case TR_S_FMTLINES: case TR_S_FMTLINET: if(tp == NULL || tp->next == NULL) { - LM_ERR("substr invalid parameters (cfg line: %d)\n", + LM_ERR("fmtline invalid parameters (cfg line: %d)\n", get_cfg_crt_line()); return -1; }

1 0

git:master:f128db2b: tm: use coherent type int for tm route blocks indexes
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: f128db2b85a525ff82c28faffbeec3203f9560c3 URL: https://github.com/kamailio/kamailio/commit/f128db2b85a525ff82c28faffbeec32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:16:08+01:00 tm: use coherent type int for tm route blocks indexes --- Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_reply.h --- Diff: https://github.com/kamailio/kamailio/commit/f128db2b85a525ff82c28faffbeec32… Patch: https://github.com/kamailio/kamailio/commit/f128db2b85a525ff82c28faffbeec32… --- diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index 8481ccde29e..d95cb7d717c 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -225,13 +225,11 @@ typedef struct ua_client */ struct retr_buf *local_ack; /* the route to take if no final positive reply arrived */ - unsigned short on_failure; + int on_failure; /* the route to take for all failure replies */ - unsigned short on_branch_failure; + int on_branch_failure; /* the onreply_route to be processed if registered to do so */ - unsigned short on_reply; - /* unused - keep the structure aligned to 32b */ - unsigned short on_unused; + int on_reply; } tm_ua_client_t; @@ -429,18 +427,18 @@ typedef struct cell /* nr of replied branch; 0..sr_dst_max_branches=branch value, * -1 no reply, -2 local reply */ - short relayed_reply_branch; + int relayed_reply_branch; /* the route to take if no final positive reply arrived */ - unsigned short on_failure; + int on_failure; /* the route to take for all failure replies */ - unsigned short on_branch_failure; + int on_branch_failure; /* the onreply_route to be processed if registered to do so */ - unsigned short on_reply; + int on_reply; /* The route to take for each downstream branch separately */ - unsigned short on_branch; + int on_branch; /* branch route backup for late branch add (t_append_branch) */ - unsigned short on_branch_delayed; + int on_branch_delayed; /* place holder for MD5checksum, MD5_LEN bytes are extra alloc'ed */ char md5[0]; diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index e9b9df434a5..c5a58bba8ab 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -224,17 +224,17 @@ void t_on_reply(unsigned int go_to) } -unsigned int get_on_failure() +int get_on_failure() { return goto_on_failure; } -unsigned int get_on_branch_failure() +int get_on_branch_failure() { return goto_on_branch_failure; } -unsigned int get_on_reply() +int get_on_reply() { return goto_on_reply; } diff --git a/src/modules/tm/t_reply.h b/src/modules/tm/t_reply.h index 709b70454ed..18ce47f457c 100644 --- a/src/modules/tm/t_reply.h +++ b/src/modules/tm/t_reply.h @@ -199,11 +199,11 @@ void on_failure_reply( replies arrive */ void t_on_failure(unsigned int go_to); -unsigned int get_on_failure(void); +int get_on_failure(void); void t_on_branch_failure(unsigned int go_to); -unsigned int get_on_branch_failure(void); +int get_on_branch_failure(void); void t_on_reply(unsigned int go_to); -unsigned int get_on_reply(void); +int get_on_reply(void); int t_retransmit_reply(struct cell *t);

1 0

git:master:678b1a68: core: srjson - init vars and check scanned values
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: 678b1a68de86d9539adeaf0262d9735b8d435077 URL: https://github.com/kamailio/kamailio/commit/678b1a68de86d9539adeaf0262d9735… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:04:10+01:00 core: srjson - init vars and check scanned values --- Modified: src/core/utils/srjson.c --- Diff: https://github.com/kamailio/kamailio/commit/678b1a68de86d9539adeaf0262d9735… Patch: https://github.com/kamailio/kamailio/commit/678b1a68de86d9539adeaf0262d9735… --- diff --git a/src/core/utils/srjson.c b/src/core/utils/srjson.c index 5960932f545..f339230232a 100644 --- a/src/core/utils/srjson.c +++ b/src/core/utils/srjson.c @@ -272,7 +272,10 @@ static const char *parse_string( *ptr2++ = '\t'; break; case 'u': /* transcode utf16 to utf8. */ - sscanf(ptr + 1, "%4x", &uc); + uc = 0; + if(sscanf(ptr + 1, "%4x", &uc) < 1) { + break; + } ptr += 4; /* get the unicode char. */ if((uc >= 0xDC00 && uc <= 0xDFFF) || uc == 0) @@ -283,8 +286,11 @@ static const char *parse_string( { if(ptr[1] != '\\' || ptr[2] != 'u') break; + uc2 = 0; //missing second - half of surrogate. - sscanf(ptr + 3, "%4x", &uc2); + if(sscanf(ptr + 3, "%4x", &uc2) < 1) { + break; + } ptr += 6; if(uc2 < 0xDC00 || uc2 > 0xDFFF) break;

1 0

git:master:586ddc6e: presence_xml: check for number of read values
by Daniel-Constantin Mierla 18 Dec '23

18 Dec '23

Module: kamailio Branch: master Commit: 586ddc6ed3a2b757ad55fb9eb859945b279c415c URL: https://github.com/kamailio/kamailio/commit/586ddc6ed3a2b757ad55fb9eb859945… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T11:18:21+01:00 presence_xml: check for number of read values --- Modified: src/modules/presence_xml/pidf.c --- Diff: https://github.com/kamailio/kamailio/commit/586ddc6ed3a2b757ad55fb9eb859945… Patch: https://github.com/kamailio/kamailio/commit/586ddc6ed3a2b757ad55fb9eb859945… --- diff --git a/src/modules/presence_xml/pidf.c b/src/modules/presence_xml/pidf.c index 09d11438a0a..b9c85c65466 100644 --- a/src/modules/presence_xml/pidf.c +++ b/src/modules/presence_xml/pidf.c @@ -181,7 +181,7 @@ time_t xml_parse_dateTime(char *xml_time_str) p++; - if(sscanf(p, "%c%c:%c%c", &h1, &h2, &m1, &m2) < 0) { + if(sscanf(p, "%c%c:%c%c", &h1, &h2, &m1, &m2) < 4) { printf("error: failed to parse time\n"); return 0; }

1 0

Jenkins build is back to stable : kamailio57-nightly-binaries » amd64,stretch #41
by kamailio＠sipwise.com 17 Dec '23

17 Dec '23

See <https://kamailio.sipwise.com/job/kamailio57-nightly-binaries/architecture=a…>

1 0

git:5.7:bfc63986: pkg/kamailio/deb: override lintian error on stretch [skip ci]
by Victor Seva 16 Dec '23

16 Dec '23

Module: kamailio Branch: 5.7 Commit: bfc63986ae7239a64803b8f20f634522bc584948 URL: https://github.com/kamailio/kamailio/commit/bfc63986ae7239a64803b8f20f63452… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-16T20:30:10+01:00 pkg/kamailio/deb: override lintian error on stretch [skip ci] (cherry picked from commit aaeb54c8b630b4aac50df75ff430ad5baea6746c) --- Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jammy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/bfc63986ae7239a64803b8f20f63452… Patch: https://github.com/kamailio/kamailio/commit/bfc63986ae7239a64803b8f20f63452…

1 0

[kamailio/kamailio] max_branches settings are not effective (Issue #3678)
by QWERTY 16 Dec '23

16 Dec '23

![image](https://github.com/kamailio/kamailio/assets/88914706/c325af99-f556-497c-9bbb-47d6bfe61742) max_branches=30 Following this route, the branch value will be doubled，only 15 branches can be created -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3678 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3678(a)github.com>

2 3

[kamailio/kamailio] Kamailio TLS sni: unknown) (Issue #3675)
by faisalahmadkhan 15 Dec '23

15 Dec '23

I am using kamailio (5.6.5 (x86_64/linux)) i am trying to establish direct routing with MS-Teams getting this issue upon sending option packets. I tried with including server_name as well but not able to resolve the issue. may be some tech gurus can help me out. Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23837]: INFO: <script>: Sent out tm request: OPTIONS sip:sip.pstnhub.microsoft.com;transport=tls SIP/2.0 Via: SIP/2.0/TLS abcsbc.com:5061;branch=z9hG4bK7c5b.7ad63320000000000000000000000000.0 To: <sip:sip.pstnhub.microsoft.com;transport=tls> From: <sip:abcsbc.com>;tag=64ff6b492a7d9ab14de1f0b7c15c9c17-25003c71 CSeq: 10 OPTIONS Call-ID: 25555f22142f22f4-23837(a)0.0.0.0 Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (5.6.5 (x86_64/linux)) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23837]: INFO: <script>: Sent out tm request: OPTIONS sip:sip2.pstnhub.microsoft.com;transport=tls SIP/2.0 Via: SIP/2.0/TLS abcsbc.com:5061;branch=z9hG4bK8c5b.b0cf0513000000000000000000000000.0 To: <sip:sip2.pstnhub.microsoft.com;transport=tls> From: <sip:abcsbc.com>;tag=64ff6b492a7d9ab14de1f0b7c15c9c17-8784af70 CSeq: 10 OPTIONS Call-ID: 25555f22142f22f5-23837(a)0.0.0.0 Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (5.6.5 (x86_64/linux)) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23837]: INFO: <script>: Sent out tm request: OPTIONS sip:sip3.pstnhub.microsoft.com;transport=tls SIP/2.0 Via: SIP/2.0/TLS abcsbc.com:5061;branch=z9hG4bK5c5b.a165cf12000000000000000000000000.0 To: <sip:sip3.pstnhub.microsoft.com;transport=tls> From: <sip:abcsbc.com>;tag=64ff6b492a7d9ab14de1f0b7c15c9c17-60095adb CSeq: 10 OPTIONS Call-ID: 25555f22142f22f6-23837(a)0.0.0.0 Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (5.6.5 (x86_64/linux)) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23855]: ERROR: tls [tls_server.c:1319]: tls_h_read_f(): protocol level error Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23855]: ERROR: tls [tls_util.h:49]: tls_err_ret(): TLS write:error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed (sni: unknown) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23855]: ERROR: tls [tls_server.c:1323]: tls_h_read_f(): src addr: 52.114.132.46:5061 Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23855]: ERROR: tls [tls_server.c:1326]: tls_h_read_f(): dst addr: 172.31.19.8:0 Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23855]: ERROR: <core> [core/tcp_read.c:1499]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f8f327181f0 r: 0x7f8f32718318 (-1) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23857]: ERROR: tls [tls_server.c:1319]: tls_h_read_f(): protocol level error Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23857]: ERROR: tls [tls_util.h:49]: tls_err_ret(): TLS write:error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed (sni: unknown) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23857]: ERROR: tls [tls_server.c:1323]: tls_h_read_f(): src addr: 52.114.32.169:5061 Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23857]: ERROR: tls [tls_server.c:1326]: tls_h_read_f(): dst addr: 172.31.19.8:0 Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23857]: ERROR: <core> [core/tcp_read.c:1499]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f8f32741588 r: 0x7f8f327416b0 (-1) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23865]: ERROR: tls [tls_server.c:1319]: tls_h_read_f(): protocol level error Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23865]: ERROR: tls [tls_util.h:49]: tls_err_ret(): TLS write:error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed (sni: unknown) Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23865]: ERROR: tls [tls_server.c:1323]: tls_h_read_f(): src addr: 52.114.76.76:5061 Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23865]: ERROR: tls [tls_server.c:1326]: tls_h_read_f(): dst addr: 172.31.19.8:0 Dec 12 19:32:55 abcsbc.com /usr/sbin/kamailio[23865]: ERROR: <core> [core/tcp_read.c:1499]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f8f32726108 r: 0x7f8f32726230 (-1) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3675 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3675(a)github.com>

5 12

git:master:68940cc0: seas: use same type iterator to avoid risk of overflow
by Daniel-Constantin Mierla 15 Dec '23

15 Dec '23

Module: kamailio Branch: master Commit: 68940cc09c999621b1f9a765e190b3207728106e URL: https://github.com/kamailio/kamailio/commit/68940cc09c999621b1f9a765e190b32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-15T12:19:25+01:00 seas: use same type iterator to avoid risk of overflow --- Modified: src/modules/seas/encode_header.c --- Diff: https://github.com/kamailio/kamailio/commit/68940cc09c999621b1f9a765e190b32… Patch: https://github.com/kamailio/kamailio/commit/68940cc09c999621b1f9a765e190b32… --- diff --git a/src/modules/seas/encode_header.c b/src/modules/seas/encode_header.c index 055821d37d5..e59d422861c 100644 --- a/src/modules/seas/encode_header.c +++ b/src/modules/seas/encode_header.c @@ -366,6 +366,7 @@ int print_encoded_header(FILE *fd, char *msg, int msglen, { char *hdr_start_ptr; short int start_idx, i; + int j; memcpy(&start_idx, payload, 2); start_idx = ntohs(start_idx); @@ -378,9 +379,9 @@ int print_encoded_header(FILE *fd, char *msg, int msglen, hdr_start_ptr); fprintf(fd, "%sHEADER:[%.*s]\n", prefix, i - 2, hdr_start_ptr); fprintf(fd, "%sHEADER CODE=", prefix); - for(i = 0; i < len; i++) - fprintf(fd, "%s%d%s", i == 0 ? "[" : ":", payload[i], - i == len - 1 ? "]\n" : ""); + for(j = 0; j < len; j++) + fprintf(fd, "%s%d%s", j == 0 ? "[" : ":", payload[j], + j == len - 1 ? "]\n" : ""); if(len == 4) return 1; switch(type) {

1 0

git:master:2bebff2b: sms: rework truncating long messages
by Daniel-Constantin Mierla 15 Dec '23

15 Dec '23

Module: kamailio Branch: master Commit: 2bebff2b27acd8ffa9f9d22409c197b0f0bc168e URL: https://github.com/kamailio/kamailio/commit/2bebff2b27acd8ffa9f9d22409c197b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-15T11:17:11+01:00 sms: rework truncating long messages --- Modified: src/modules/sms/libsms_getsms.c --- Diff: https://github.com/kamailio/kamailio/commit/2bebff2b27acd8ffa9f9d22409c197b… Patch: https://github.com/kamailio/kamailio/commit/2bebff2b27acd8ffa9f9d22409c197b… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index 959d44f0333..0f6df6b7341 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -187,8 +187,10 @@ static int fetchsms(struct modem *mdm, int sim, char *pdu) return 0; /* Now we have the end of the PDU or ASCII string */ *end = 0; - if(strlen(beginning) < SMS_BUF_SIZE) { - strcpy(pdu, beginning); + clen = strlen(beginning); + if(clen < SMS_BUF_SIZE) { + memcpy(pdu, beginning, clen); + pdu[clen] = '\0'; } else { /* truncate */ memcpy(pdu, beginning, SMS_BUF_SIZE - 1);

1 0

git:master:431b80a1: sms: define size for buffers and check the length on copy
by Daniel-Constantin Mierla 14 Dec '23

14 Dec '23

Module: kamailio Branch: master Commit: 431b80a1b8313d7457d4bf5fa1770f9465820d39 URL: https://github.com/kamailio/kamailio/commit/431b80a1b8313d7457d4bf5fa1770f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-14T19:52:23+01:00 sms: define size for buffers and check the length on copy --- Modified: src/modules/sms/libsms_getsms.c --- Diff: https://github.com/kamailio/kamailio/commit/431b80a1b8313d7457d4bf5fa1770f9… Patch: https://github.com/kamailio/kamailio/commit/431b80a1b8313d7457d4bf5fa1770f9… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index e4ff2296707..959d44f0333 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -26,6 +26,7 @@ mailto:s.frings@mail.isis.de #include "libsms_sms.h" #include "sms_funcs.h" +#define SMS_BUF_SIZE 512 #define set_date(_date, _Pointer) \ { \ @@ -131,7 +132,7 @@ static int pdu2binary(char *pdu, char *binary) static int fetchsms(struct modem *mdm, int sim, char *pdu) { char command[16]; - char answer[512]; + char answer[SMS_BUF_SIZE]; char *position; char *beginning; char *end; @@ -186,7 +187,13 @@ static int fetchsms(struct modem *mdm, int sim, char *pdu) return 0; /* Now we have the end of the PDU or ASCII string */ *end = 0; - strcpy(pdu, beginning); + if(strlen(beginning) < SMS_BUF_SIZE) { + strcpy(pdu, beginning); + } else { + /* truncate */ + memcpy(pdu, beginning, SMS_BUF_SIZE - 1); + pdu[SMS_BUF_SIZE - 1] = '\0'; + } return sim; } @@ -480,7 +487,7 @@ static inline int decode_pdu( int getsms(struct incame_sms *sms, struct modem *mdm, int sim) { - char pdu[512]; + char pdu[SMS_BUF_SIZE]; int found; int ret;

1 0

git:master:a78aeebd: smsops: check returned value
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: a78aeebd66ec63810987555d5bb492fec1979fc8 URL: https://github.com/kamailio/kamailio/commit/a78aeebd66ec63810987555d5bb492f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T12:52:40+01:00 smsops: check returned value --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/a78aeebd66ec63810987555d5bb492f… Patch: https://github.com/kamailio/kamailio/commit/a78aeebd66ec63810987555d5bb492f… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index c8ccc2df4e1..703092542b0 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -1249,6 +1249,10 @@ int pv_sms_body(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) // Check for UDH concat = GetConcatShortMsg8bitRefIE(rp_send_data); + if(concat == NULL) { + LM_ERR("message building failure\n"); + return -1; + } if(concat->max_num_sm && concat->seq) { sms_body.s[sms_body.len++] = 5; // always 5 for TP_UDH_IE_CONCAT_SM_8BIT_REF

1 0

git:master:49b3b90c: app_python3: check allocated pointer
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: 49b3b90cd229b7c4da06b61cdfd782450d383cc9 URL: https://github.com/kamailio/kamailio/commit/49b3b90cd229b7c4da06b61cdfd7824… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T12:23:23+01:00 app_python3: check allocated pointer --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/49b3b90cd229b7c4da06b61cdfd7824… Patch: https://github.com/kamailio/kamailio/commit/49b3b90cd229b7c4da06b61cdfd7824… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 2d271b2e271..718d8ecedaf 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -567,6 +567,12 @@ static PyObject *init_KSR(void) emods[k].kexp[0].mname.s); PyModuleDef *mmodule = malloc(sizeof(PyModuleDef)); + if(mmodule == NULL) { + LM_ERR("failed to allocate system memory\n"); + free(_sr_KSRMethods); + _sr_KSRMethods = NULL; + return NULL; + } memset(mmodule, 0, sizeof(PyModuleDef)); mmodule->m_name = strndup(mname, 127); mmodule->m_methods = _sr_crt_KSRMethods;

1 0

git:master:077651fa: core: check if conversion could not be done
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: 077651fa3bfd50e0f654c907f3783b1421497bd5 URL: https://github.com/kamailio/kamailio/commit/077651fa3bfd50e0f654c907f3783b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T12:15:28+01:00 core: check if conversion could not be done --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/077651fa3bfd50e0f654c907f3783b1… Patch: https://github.com/kamailio/kamailio/commit/077651fa3bfd50e0f654c907f3783b1… --- diff --git a/src/core/route.c b/src/core/route.c index a03330b6c04..69443e37b37 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -1559,6 +1559,11 @@ inline static int comp_rve(int op, struct rval_expr *rve, int rtype, if(unlikely(rv)) { /* no int => str */ rv1 = rval_convert(h, msg, RV_STR, rv, &c1); + if(rv1 == NULL) { + LM_ERR("failure converting expression\n"); + i = 0; /* false */ + goto int_expr; + } i = comp_str(op, &rv1->v.s, rtype, r, msg, h); rval_destroy(rv1); rval_destroy(rv);

1 0

git:master:5d641f56: registrar: check returned branch pointer
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: 5d641f56fc1bc342d9be008ecd96959e114fef66 URL: https://github.com/kamailio/kamailio/commit/5d641f56fc1bc342d9be008ecd96959… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T12:08:56+01:00 registrar: check returned branch pointer --- Modified: src/modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/5d641f56fc1bc342d9be008ecd96959… Patch: https://github.com/kamailio/kamailio/commit/5d641f56fc1bc342d9be008ecd96959… --- diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index fec1efe2e90..c0d1404a9e5 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -703,8 +703,9 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) for(i = 0; i < nr_branches_start; i++) { crt = get_sip_branch(i); /* it has to be a clean branch to do lookup for it */ - if(crt->len <= 0 || crt->dst_uri_len > 0 || crt->path_len > 0 - || crt->force_send_socket != NULL || crt->flags != 0) + if(crt == NULL || crt->len <= 0 || crt->dst_uri_len > 0 + || crt->path_len > 0 || crt->force_send_socket != NULL + || crt->flags != 0) continue; /* set the new uri from branch and lookup */ new_uri.s = crt->uri;

1 0

git:master:1191ab4e: tm: check get_t() result for consistency
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: 1191ab4e5e03b35714ec1ad9d9bf2dd9665c71fd URL: https://github.com/kamailio/kamailio/commit/1191ab4e5e03b35714ec1ad9d9bf2dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T12:02:01+01:00 tm: check get_t() result for consistency --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/1191ab4e5e03b35714ec1ad9d9bf2dd… Patch: https://github.com/kamailio/kamailio/commit/1191ab4e5e03b35714ec1ad9d9bf2dd… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 67b954b03c8..b2866a685cc 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2565,6 +2565,10 @@ int t_check_trans(struct sip_msg *msg) return 1; case 1: /* found */ t = get_t(); + if(t == NULL || t == T_UNDEFINED) { + LM_WARN("unexpected transaction value\n"); + return -1; + } if(msg->REQ_METHOD == METHOD_ACK) { /* ack to neg. reply or ack to local trans. * => process it and end the script */

1 0

git:master:4e2edcb0: sipcapture: signed iterator to cover negative condition
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: 4e2edcb0acdac56a9c5946525e427cdd44d0289e URL: https://github.com/kamailio/kamailio/commit/4e2edcb0acdac56a9c5946525e427cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T11:38:48+01:00 sipcapture: signed iterator to cover negative condition --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/4e2edcb0acdac56a9c5946525e427cd… Patch: https://github.com/kamailio/kamailio/commit/4e2edcb0acdac56a9c5946525e427cd… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 8958e39d9f0..d39ee1fa7c4 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -483,7 +483,7 @@ int parse_table_names(str table_name, str **table_names) char *p = NULL; unsigned int no_tables; char *table_name_cpy; - unsigned int i; + int i; /*parse and save table names*/ no_tables = 1;

1 0

git:master:cae0f9a1: ratelimit: reorder for safer storage size
by Daniel-Constantin Mierla 13 Dec '23

13 Dec '23

Module: kamailio Branch: master Commit: cae0f9a1302a79d748155401117e934a5a8e272f URL: https://github.com/kamailio/kamailio/commit/cae0f9a1302a79d748155401117e934… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-13T11:24:24+01:00 ratelimit: reorder for safer storage size --- Modified: src/modules/ratelimit/rl_statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/cae0f9a1302a79d748155401117e934… Patch: https://github.com/kamailio/kamailio/commit/cae0f9a1302a79d748155401117e934… --- diff --git a/src/modules/ratelimit/rl_statistics.c b/src/modules/ratelimit/rl_statistics.c index 237c7acd9a2..4e00dbeda38 100644 --- a/src/modules/ratelimit/rl_statistics.c +++ b/src/modules/ratelimit/rl_statistics.c @@ -182,7 +182,7 @@ int get_socket_list_from_proto_and_family( return 0; } - *ipList = pkg_malloc(numberOfSockets * (num_ip_octets + 1) * sizeof(int)); + *ipList = pkg_malloc(sizeof(int) * numberOfSockets * (num_ip_octets + 1)); /* We couldn't allocate memory for the IP List. So all we can do is * fail. */

1 0

[kamailio/kamailio] tm: Update doc for t_check_trans() (PR #3673)
by Stefan Mititelu 13 Dec '23

13 Dec '23

#### 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  I was looking in code at how t_check_trans() works and updated doc. Please let me know if I understood correctly how it behaves for non-acks and non-cancel, when transaction is found. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3673 -- Commit Summary -- * tm: Update doc for t_check_trans() -- File Changes -- M src/modules/tm/doc/functions.xml (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3673.patch https://github.com/kamailio/kamailio/pull/3673.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3673 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3673(a)github.com>

2 5

Jenkins build is still unstable: kamailiodev-nightly-binaries » amd64,stretch #2548
by kamailio＠sipwise.com 13 Dec '23

13 Dec '23

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 2

git:master:aaeb54c8: pkg/kamailio/deb: override lintian error on stretch [skip ci]
by Victor Seva 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: aaeb54c8b630b4aac50df75ff430ad5baea6746c URL: https://github.com/kamailio/kamailio/commit/aaeb54c8b630b4aac50df75ff430ad5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-12T15:38:33+01:00 pkg/kamailio/deb: override lintian error on stretch [skip ci] --- Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jammy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/aaeb54c8b630b4aac50df75ff430ad5… Patch: https://github.com/kamailio/kamailio/commit/aaeb54c8b630b4aac50df75ff430ad5…

1 0

git:5.7:75aecd3f: pv: remove extra len increment for some uri transformations
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: 5.7 Commit: 75aecd3f2e10509d5ed71cc5e89ae6f5c3bd0fea URL: https://github.com/kamailio/kamailio/commit/75aecd3f2e10509d5ed71cc5e89ae6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T13:10:29+01:00 pv: remove extra len increment for some uri transformations (cherry picked from commit 3fe9a279abecf6f367ce9fd2d4b085c41c87ad77) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/75aecd3f2e10509d5ed71cc5e89ae6f… Patch: https://github.com/kamailio/kamailio/commit/75aecd3f2e10509d5ed71cc5e89ae6f… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 5204c8fa22c..67c43d83b46 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1595,7 +1595,6 @@ int tr_eval_uri( sv.len++; memcpy(_tr_buffer, sv.s, sv.len); sv.s = _tr_buffer; - sv.len++; if((_tr_parsed_uri.user.len > 0) && (subtype != TR_URI_DURI)) { memcpy(sv.s + sv.len, _tr_parsed_uri.user.s, _tr_parsed_uri.user.len);

1 0

git:master:3fe9a279: pv: remove extra len increment for some uri transformations
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 3fe9a279abecf6f367ce9fd2d4b085c41c87ad77 URL: https://github.com/kamailio/kamailio/commit/3fe9a279abecf6f367ce9fd2d4b085c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T13:09:54+01:00 pv: remove extra len increment for some uri transformations --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/3fe9a279abecf6f367ce9fd2d4b085c… Patch: https://github.com/kamailio/kamailio/commit/3fe9a279abecf6f367ce9fd2d4b085c… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 2c60cc7e656..3c51be15f74 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1595,7 +1595,6 @@ int tr_eval_uri( sv.len++; memcpy(_tr_buffer, sv.s, sv.len); sv.s = _tr_buffer; - sv.len++; if((_tr_parsed_uri.user.len > 0) && (subtype != TR_URI_DURI)) { memcpy(sv.s + sv.len, _tr_parsed_uri.user.s, _tr_parsed_uri.user.len);

1 0

[kamailio/kamailio] `xavp_params_implode()` drops data from BIGINT datatype (Issue #3663)
by Ben Kaufman 12 Dec '23

12 Dec '23

### Description I came across the following while trying to serialize SQL data to xavp (`sql_xquery()`) and then serializing the result to htable using `xavp_params_implode()`. One of the data columns has a type of `BIGINT`. The resulting string had neither the key nor value. I recognize that Kamailio does not currently have support for 64 bit integers and that adding support for it is probably not a trivial matter. My request here is really that if the value is going to be dropped it would be good if `pv` would omit a warning. #### Reproduction MySQL table: ```sql CREATE TABLE dids ( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, did varchar(11) NOT NULL, route_id BIGINT NOT NULL, failure_route_id INT NOT NULL, description VARCHAR(255) ); ``` With data like this: ```sql INSERT INTO dids ( did, route_id, failure_route_id, description ) VALUES ( '15555551000', 101, 1006, 'Alice' ); ``` And the following Kamailio code: ``` $var(query) = "SELECT * " + "FROM dids " + "WHERE did = " + $(rU{sql.val.str}); sql_xquery("db", "$var(query)", "did_data"); xavp_params_implode("did_data", "$sht(did=>$rU)"); xinfo("Serialized query result: [$sht(did=>$rU)]\n"); ``` The following log line results - the `route_id` is missing all together: ``` 1(7) INFO: <script>: Serialized query result: [id=1;did=15555551000;failure_route_id=1006;description=Alice;] ``` ### Possible Solutions It's worth noting that the value is usable out of the XAVP. `$xavp(did=>route_id)` is retrievable, and the problem seems to be only when running `xavp_params_implode()`. In a perfect world, the key and value would be retained and put into the serialized data, however I'm not sure of the complexity of this (what if the the value exceeds a 32 bit int?, etc). With that said, my only real request would be that if a value is dropped that a warning is omitted with a rough explanation of the reason ("omitting _keyName_ unknown_ data type", etc). ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.7.3 ``` * **Operating System**: Alpine 3.18 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3663 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3663(a)github.com>

2 3

git:master:185e7f64: kazoo: fixed rabbitmq-c deprecation warning
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 185e7f64668cf4e8de3fa83d482e02e90b4fd3e5 URL: https://github.com/kamailio/kamailio/commit/185e7f64668cf4e8de3fa83d482e02e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T12:50:18+01:00 kazoo: fixed rabbitmq-c deprecation warning --- Modified: src/modules/kazoo/Makefile Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/185e7f64668cf4e8de3fa83d482e02e… Patch: https://github.com/kamailio/kamailio/commit/185e7f64668cf4e8de3fa83d482e02e… --- diff --git a/src/modules/kazoo/Makefile b/src/modules/kazoo/Makefile index b7b1e1615cd..c0c7e9d3d22 100644 --- a/src/modules/kazoo/Makefile +++ b/src/modules/kazoo/Makefile @@ -11,6 +11,10 @@ ifeq ($(BUILDER),) JSONC=$(shell ls $(SYSBASE)/include/lib/libjson*.so $(LOCALBASE)/lib/libjson*.so 2>/dev/null | grep json-c) else JSONC=$(shell pkg-config --libs json-c 2>/dev/null | grep json-c) + + ifeq ($(shell pkg-config --atleast-version=0.13.0 librabbitmq; echo $$?),0) + DEFS += -DRABBITMQ_DEPRECATION + endif endif ifneq ($(JSONC),) diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index a5cb429270a..ed696116514 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -29,10 +29,19 @@ #include <stdio.h> #include <stdlib.h> #include <stdint.h> + +#if RABBITMQ_DEPRECATION +#include <rabbitmq-c/amqp.h> +#include <rabbitmq-c/framing.h> +#include <rabbitmq-c/tcp_socket.h> +#include <rabbitmq-c/ssl_socket.h> +#else #include <amqp.h> #include <amqp_framing.h> #include <amqp_tcp_socket.h> #include <amqp_ssl_socket.h> +#endif + #include <json.h> #include <uuid/uuid.h> #include "../../core/mem/mem.h" diff --git a/src/modules/kazoo/kz_amqp.h b/src/modules/kazoo/kz_amqp.h index 6cfddbed8ac..faca990f166 100644 --- a/src/modules/kazoo/kz_amqp.h +++ b/src/modules/kazoo/kz_amqp.h @@ -32,7 +32,12 @@ #include <fcntl.h> #include <event.h> #include <sys/timerfd.h> + +#if RABBITMQ_DEPRECATION +#include <rabbitmq-c/amqp.h> +#else #include <amqp.h> +#endif #include "../../core/sr_module.h" #include "../../core/str.h"

1 0

git:master:1b589c20: rabbitmq: fixed rabbitmq-c deprecation warning
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 1b589c2070973ace082205dc0985363570c5b7f6 URL: https://github.com/kamailio/kamailio/commit/1b589c2070973ace082205dc0985363… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T12:50:18+01:00 rabbitmq: fixed rabbitmq-c deprecation warning --- Modified: src/modules/rabbitmq/Makefile Modified: src/modules/rabbitmq/rabbitmq.c Modified: src/modules/rabbitmq/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/1b589c2070973ace082205dc0985363… Patch: https://github.com/kamailio/kamailio/commit/1b589c2070973ace082205dc0985363… --- diff --git a/src/modules/rabbitmq/Makefile b/src/modules/rabbitmq/Makefile index 72633cc9c29..09023aaf827 100644 --- a/src/modules/rabbitmq/Makefile +++ b/src/modules/rabbitmq/Makefile @@ -10,6 +10,10 @@ RMQ_BUILDER=$(shell \ if pkg-config --exists librabbitmq && pkg-config --exists uuid; then \ echo 'pkg-config librabbitmq uuid'; \ fi) + + ifeq ($(shell pkg-config --atleast-version=0.13.0 librabbitmq; echo $$?),0) + DEFS += -DRABBITMQ_DEPRECATION + endif endif ifneq ($(RMQ_BUILDER),) diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index b426ffb9d0b..8547bacac79 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -51,10 +51,18 @@ #include <uuid/uuid.h> #include <stdint.h> + +#if RABBITMQ_DEPRECATION +#include <rabbitmq-c/tcp_socket.h> +#include <rabbitmq-c/amqp.h> +#include <rabbitmq-c/framing.h> +#include <rabbitmq-c/ssl_socket.h> +#else #include <amqp_tcp_socket.h> #include <amqp_ssl_socket.h> #include <amqp.h> #include <amqp_framing.h> +#endif #include <assert.h> diff --git a/src/modules/rabbitmq/utils.c b/src/modules/rabbitmq/utils.c index 6edbc22ea1d..e40492a3cc8 100644 --- a/src/modules/rabbitmq/utils.c +++ b/src/modules/rabbitmq/utils.c @@ -44,8 +44,14 @@ #include <ctype.h> #include <stdint.h> + +#if RABBITMQ_DEPRECATION +#include <rabbitmq-c/amqp.h> +#include <rabbitmq-c/framing.h> +#else #include <amqp.h> #include <amqp_framing.h> +#endif #include "utils.h"

1 0

[kamailio/kamailio] fixed rabbitmq-c deprecation warning (PR #3670)
by sergey-safarov 12 Dec '23

12 Dec '23

#### 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 - [x] Related to issue #3464 #### Description fixed rabbitmq-c deprecation warning You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3670 -- Commit Summary -- * rabbitmq: fixed rabbitmq-c deprecation warning * kazoo: fixed rabbitmq-c deprecation warning -- File Changes -- M src/modules/kazoo/Makefile (4) M src/modules/kazoo/kz_amqp.c (9) M src/modules/kazoo/kz_amqp.h (5) M src/modules/rabbitmq/Makefile (4) M src/modules/rabbitmq/rabbitmq.c (7) M src/modules/rabbitmq/utils.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3670.patch https://github.com/kamailio/kamailio/pull/3670.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3670 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3670(a)github.com>

2 5

git:master:071f3f8f: ratelimit: init variables and check return of fscanf()
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 071f3f8fd1ffd85d872f6048db4750bbf6441cf3 URL: https://github.com/kamailio/kamailio/commit/071f3f8fd1ffd85d872f6048db4750b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T12:33:10+01:00 ratelimit: init variables and check return of fscanf() --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/071f3f8fd1ffd85d872f6048db4750b… Patch: https://github.com/kamailio/kamailio/commit/071f3f8fd1ffd85d872f6048db4750b… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index 3ac8e7dacea..d993bbd6e98 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -331,11 +331,13 @@ int get_num_cpus() /* not using /proc/loadavg because it only works when our_timer_interval == theirs */ static int get_cpuload(double *load) { - static long long o_user, o_nice, o_sys, o_idle, o_iow, o_irq, o_sirq, o_stl; - long long n_user, n_nice, n_sys, n_idle, n_iow, n_irq, n_sirq, n_stl; + static long long o_user = 0, o_nice = 0, o_sys = 0, o_idle = 0, o_iow = 0, + o_irq = 0, o_sirq = 0, o_stl = 0; + long long n_user = 0, n_nice = 0, n_sys = 0, n_idle = 0, n_iow = 0, + n_irq = 0, n_sirq = 0, n_stl = 0; static int first_time = 1; FILE *f = fopen("/proc/stat", "r"); - double vload; + double vload = 0.0; static int errormsg = 0; if(!f) { @@ -348,7 +350,7 @@ static int get_cpuload(double *load) } if(fscanf(f, "cpu %lld%lld%lld%lld%lld%lld%lld%lld", &n_user, &n_nice, &n_sys, &n_idle, &n_iow, &n_irq, &n_sirq, &n_stl) - < 0) { + < 8) { LM_ERR("could not parse load information\n"); fclose(f); return -1;

1 0

git:master:ecf5ce88: nat_traversal: init variables read from string
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: ecf5ce88a2de9a2f28b87e1f9a0303e59870c1f7 URL: https://github.com/kamailio/kamailio/commit/ecf5ce88a2de9a2f28b87e1f9a0303e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T11:41:23+01:00 nat_traversal: init variables read from string --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/ecf5ce88a2de9a2f28b87e1f9a0303e… Patch: https://github.com/kamailio/kamailio/commit/ecf5ce88a2de9a2f28b87e1f9a0303e… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index b433cf234e4..4a27945a3e2 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1724,10 +1724,12 @@ static void restore_keepalive_state(void) res = fscanf(f, STATE_FILE_HEADER); // skip header while(true) { + ll_1 = 0; + ll_2 = 0; + uri[0] = '\0'; + socket[0] = '\0'; res = fscanf(f, "%63s %63s %" TIME_T_FMT " %" TIME_T_FMT, uri, socket, &ll_1, &ll_2); - rtime = ll_1; - stime = ll_2; if(res == EOF) { if(ferror(f)) LM_ERR("error while reading keepalive state file: %s\n", @@ -1738,6 +1740,8 @@ static void restore_keepalive_state(void) "entries.\n"); break; } else { + rtime = ll_1; + stime = ll_2; if(now > rtime && now > stime) continue; // expired entry

1 0

git:master:9cd07110: presence_dialoginfo: check return for sscanf()
by Daniel-Constantin Mierla 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 9cd07110ed59058de27c077574e4a740df068485 URL: https://github.com/kamailio/kamailio/commit/9cd07110ed59058de27c077574e4a74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-12T11:41:23+01:00 presence_dialoginfo: check return for sscanf() --- Modified: src/modules/presence_dialoginfo/pidf.c --- Diff: https://github.com/kamailio/kamailio/commit/9cd07110ed59058de27c077574e4a74… Patch: https://github.com/kamailio/kamailio/commit/9cd07110ed59058de27c077574e4a74… --- diff --git a/src/modules/presence_dialoginfo/pidf.c b/src/modules/presence_dialoginfo/pidf.c index 95852379455..382045eab83 100644 --- a/src/modules/presence_dialoginfo/pidf.c +++ b/src/modules/presence_dialoginfo/pidf.c @@ -141,6 +141,7 @@ time_t xml_parse_dateTime(char *xml_time_str) char h1, h2, m1, m2; int sign = 1; signed int timezone_diff = 0; + int rv = 0; p = strptime(xml_time_str, "%F", &tm); if(p == NULL) { @@ -178,7 +179,8 @@ time_t xml_parse_dateTime(char *xml_time_str) p++; - if(sscanf(p, "%c%c:%c%c", &h1, &h2, &m1, &m2) < 0) { + rv = sscanf(p, "%c%c:%c%c", &h1, &h2, &m1, &m2); + if(rv == EOF || rv < 4) { printf("error: failed to parse time\n"); return 0; }

1 0

[kamailio/kamailio] utils: Prefer `printf` over `echo -e`. (PR #3671)
by Sean Bright 12 Dec '23

12 Dec '23

On Ubuntu, `/bin/sh` defaults to `dash` whose built-in `echo` command does not support the `-e` flag. `printf`, on the other hand, supports backslash escapes by default so we use that instead. In passing, also clean up some messy ANSI escape codes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3671 -- Commit Summary -- * utils: Prefer `printf` over `echo -e`. -- File Changes -- M pkg/kamailio/obs/kamailio.init (2) M utils/kamctl/kamctl (2) M utils/kamctl/kamctl.base (10) M utils/kamctl/kamdbctl (6) M utils/kamctl/kamdbctl.base (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3671.patch https://github.com/kamailio/kamailio/pull/3671.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3671 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3671(a)github.com>

2 3

git:master:8d3d53f5: utils: Prefer `printf` over `echo -e`.
by Victor Seva 12 Dec '23

12 Dec '23

Module: kamailio Branch: master Commit: 8d3d53f5f698da1357c3475ae136677099b2f702 URL: https://github.com/kamailio/kamailio/commit/8d3d53f5f698da1357c3475ae136677… Author: Sean Bright <sean(a)seanbright.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-12T10:38:06+01:00 utils: Prefer `printf` over `echo -e`. On Ubuntu, `/bin/sh` defaults to `dash` whose built-in `echo` command does not support the `-e` flag. `printf`, on the other hand, supports backslash escapes by default so we use that instead. In passing, also clean up some messy ANSI escape codes. --- Modified: pkg/kamailio/obs/kamailio.init Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base Modified: utils/kamctl/kamdbctl Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/8d3d53f5f698da1357c3475ae136677… Patch: https://github.com/kamailio/kamailio/commit/8d3d53f5f698da1357c3475ae136677…

1 0

[kamailio/kamailio] github: [skip ci]: bump actions/stale from 8 to 9 (PR #3672)
by dependabot[bot] 11 Dec '23

11 Dec '23

Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/actions/stale/releases">actions/stale… releases</a>.</em></p> <blockquote> <h2>v9.0.0</h2> <h2>Breaking Changes</h2> <ol> <li>Action is now stateful: If the action ends because of <a href="https://github.com/actions/stale#operations-per-run">ope… then the next run will start from the first unprocessed issue skipping the issues processed during the previous run(s). The state is reset when all the issues are processed. This should be considered for scheduling workflow runs.</li> <li>Version 9 of this action updated the runtime to Node.js 20. All scripts are now run with Node.js 20 instead of Node.js 16 and are affected by any breaking changes between Node.js 16 and 20.</li> </ol> <h2>What Else Changed</h2> <ol> <li>Performance optimization that removes unnecessary API calls by <a href="https://github.com/dsame"><code>@dsame</code&g… <a href="https://redirect.github.com/actions/stale/pull/1033/">#1… fixes <a href="https://redirect.github.com/actions/stale/issues/792">#7… <li>Logs displaying current github API rate limit by <a href="https://github.com/dsame"><code>@dsame</code&g… <a href="https://redirect.github.com/actions/stale/pull/1032">#10… addresses <a href="https://redirect.github.com/actions/stale/issues/1029">#… </ol> <p>For more information, please read the <a href="https://github.com/actions/stale#readme">action documentation</a> and its <a href="https://github.com/actions/stale#statefulness">section about statefulness</a></p> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/jmeridth"><code>@jmeridth</… made their first contribution in <a href="https://redirect.github.com/actions/stale/pull/984">acti… <li><a href="https://github.com/nikolai-laevskii"><code>@nikol… made their first contribution in <a href="https://redirect.github.com/actions/stale/pull/1020">act… <li><a href="https://github.com/dusan-trickovic"><code>@dusan-… made their first contribution in <a href="https://redirect.github.com/actions/stale/pull/1056">act… <li><a href="https://github.com/aparnajyothi-y"><code>@aparnaj… made their first contribution in <a href="https://redirect.github.com/actions/stale/pull/1110">act… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/stale/compare/v8...v9.0.0">ht… </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/actions/stale/blob/main/CHANGELOG.md"&gt… changelog</a>.</em></p> <blockquote> <h1>Changelog</h1> <h1>[7.0.0]</h1> <p>:warning: Breaking change :warning:</p> <ul> <li>Allow daysBeforeStale options to be float by <a href="https://github.com/irega"><code>@irega</code&g… in <a href="https://redirect.github.com/actions/stale/pull/841">acti… <li>Use cache in check-dist.yml by <a href="https://github.com/jongwooo"><code>@jongwooo</… in <a href="https://redirect.github.com/actions/stale/pull/876">acti… <li>fix print outputs step in existing workflows by <a href="https://github.com/irega"><code>@irega</code&g… in <a href="https://redirect.github.com/actions/stale/pull/859">acti… <li>Update issue and PR templates, add/delete workflow files by <a href="https://github.com/IvanZosimov"><code>@IvanZosimo… in <a href="https://redirect.github.com/actions/stale/pull/880">acti… <li>Update how stale handles exempt items by <a href="https://github.com/johnsudol"><code>@johnsudol&lt… in <a href="https://redirect.github.com/actions/stale/pull/874">acti… </ul> <h1>[6.0.1]</h1> <p>Update <code>@actions/core</code> to v1.10.0 (<a href="https://redirect.github.com/actions/stale/pull/839">#839… <h1>[6.0.0]</h1> <p>:warning: Breaking change :warning:</p> <p>Issues/PRs default <code>close-issue-reason</code> is now <code>not_planned</code>(<a href="https://redirect.github.com/actions/stale/issues/789">#7… <h1>[5.1.0]</h1> <p><a href="https://redirect.github.com/actions/stale/issues/696">Do… process stale issues right after they're marked stale</a> [Add close-issue-reason option]<a href="https://redirect.github.com/actions/stale/pull/764">#764… href="https://redirect.github.com/actions/stale/pull/772">#772… Various dependabot/dependency updates</p> <h2><a href="https://github.com/actions/stale/compare/v3.0.19...v4.1.0"&… (2021-07-14)</h2> <h2>Features</h2> <ul> <li><a href="https://github.com/actions/stale/commit/9912fa74d1c01b5d6187793d… to exempt draft PRs</a></li> </ul> <h2><a href="https://github.com/actions/stale/compare/v3.0.19...v4.0.0"&… (2021-07-14)</h2> <h3>Features</h3> <ul> <li><strong>options:</strong> simplify config by removing skip stale message options (<a href="https://redirect.github.com/actions/stale/issues/457">#4…) (<a href="https://github.com/actions/stale/commit/6ec637d238067ab8cc96c928…);6ec637d</a>), closes <a href="https://redirect.github.com/actions/stale/issues/405">#4… <a href="https://redirect.github.com/actions/stale/issues/455">#4… <li><strong>output:</strong> print output parameters (<a href="https://redirect.github.com/actions/stale/issues/458">#4…) (<a href="https://github.com/actions/stale/commit/3e6d35b685f0b2fa1a69be89… </ul> <h3>Bug Fixes</h3> <ul> <li><strong>dry-run:</strong> forbid mutations in dry-run (<a href="https://redirect.github.com/actions/stale/issues/500">#5…) (<a href="https://github.com/actions/stale/commit/f1017f33dd159ea513663751…);f1017f3</a>), closes <a href="https://redirect.github.com/actions/stale/issues/499">#4… <li><strong>logs:</strong> coloured logs (<a href="https://redirect.github.com/actions/stale/issues/465">#4…) (<a href="https://github.com/actions/stale/commit/5fbbfba142860ea6512549e9… <li><strong>operations:</strong> fail fast the current batch to respect the operations limit (<a href="https://redirect.github.com/actions/stale/issues/474">#4…) (<a href="https://github.com/actions/stale/commit/5f6f311ca6aa75babadfc7ba…);5f6f311</a>), closes <a href="https://redirect.github.com/actions/stale/issues/466">#4… <li><strong>label comparison</strong>: make label comparison case insensitive <a href="https://redirect.github.com/actions/stale/pull/517">#517…;>#517</a>, closes <a href="https://redirect.github.com/actions/stale/pull/516">#516… <li><strong>filtering comments by actor could have strange behavior</strong>: &quot;stale&quot; comments are now detected based on if the message is the stale message not <em>who</em> made the comment(<a href="https://redirect.github.com/actions/stale/pull/519">#519…)>#519</a>), fixes <a href="https://redirect.github.com/actions/stale/pull/441">#441…;>#441</a>, <a href="https://redirect.github.com/actions/stale/pull/509">#509…;>#509</a>, <a href="https://redirect.github.com/actions/stale/pull/518">#518… </ul> <h3>Breaking Changes</h3>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/actions/stale/commit/28ca1036281a5e5922ead518… Upgrade Node to v20 (<a href="https://redirect.github.com/actions/stale/issues/1110">#… <li><a href="https://github.com/actions/stale/commit/b69b346013879cedbf50c69f… build(deps-dev): bump <code>@types/node</code> from 18.16.18 to 20.5.1 (<a href="https://redirect.github.com/actions/stale/issues/1079">#… <li><a href="https://github.com/actions/stale/commit/88a6f4f6cbe6984b66da80d3… build(deps-dev): bump typescript from 5.1.3 to 5.2.2 (<a href="https://redirect.github.com/actions/stale/issues/1083">#… <li><a href="https://github.com/actions/stale/commit/796531a7b39835671cd9f436… Merge pull request <a href="https://redirect.github.com/actions/stale/issues/1080">#… from akv-platform/fix-delete-cache</li> <li><a href="https://github.com/actions/stale/commit/8986f6218b4935e254d5b844… Don not try to delete cache if it does not exists</li> <li><a href="https://github.com/actions/stale/commit/cab99b362baa5afbbd8c7c78… fix typo proceeded/processed</li> <li><a href="https://github.com/actions/stale/commit/184e7afe930f6b5c7ce52c4b… Merge pull request <a href="https://redirect.github.com/actions/stale/issues/1064">#… from actions/dependabot/npm_and_yarn/typescript-esli...</li> <li><a href="https://github.com/actions/stale/commit/523885cf3c115dcdcbed573c… chore: update eslint-plugin, parser and eslint-plugin-jest</li> <li><a href="https://github.com/actions/stale/commit/2487a1dc2b501176ca975d2d… build(deps-dev): bump <code>@typescript-eslint/eslint-plugin</code></li> <li><a href="https://github.com/actions/stale/commit/60c722ee97faafece819a7c4… Merge pull request <a href="https://redirect.github.com/actions/stale/issues/1063">#… from actions/dependabot/npm_and_yarn/jest-29.6.2</li> <li>Additional commits viewable in <a href="https://github.com/actions/stale/compare/v8...v9">compare 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/3672 -- Commit Summary -- * github: [skip ci]: bump actions/stale from 8 to 9 -- File Changes -- M .github/workflows/issue_management.yml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3672.patch https://github.com/kamailio/kamailio/pull/3672.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3672 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3672(a)github.com>

2 1

git:master:14e763fd: github: [skip ci]: bump actions/stale from 8 to 9
by Victor Seva 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 14e763fd15a846d4377214521cac06113ba6888d URL: https://github.com/kamailio/kamailio/commit/14e763fd15a846d4377214521cac061… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-12T00:24:42+01:00 github: [skip ci]: bump actions/stale from 8 to 9 Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v8...v9) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/issue_management.yml --- Diff: https://github.com/kamailio/kamailio/commit/14e763fd15a846d4377214521cac061… Patch: https://github.com/kamailio/kamailio/commit/14e763fd15a846d4377214521cac061… --- diff --git a/.github/workflows/issue_management.yml b/.github/workflows/issue_management.yml index 0d0b2ef9aa5..ce4d061d033 100644 --- a/.github/workflows/issue_management.yml +++ b/.github/workflows/issue_management.yml @@ -11,7 +11,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v8 + - uses: actions/stale@v9 with: stale-issue-message: 'This issue is stale because it has been open 6 weeks with no activity. Remove stale label or comment or this will be closed in 2 weeks.' stale-pr-message: 'This PR is stale because it has been open 6 weeks with no activity. Remove stale label or comment or this will be closed in 2 weeks.'

1 0

git:master:ee2ad77a: modules: readme files regenerated - jsonrpcs ... [skip ci]
by Kamailio Dev 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: ee2ad77aa71326d355e299625ebbd31f67f8ed20 URL: https://github.com/kamailio/kamailio/commit/ee2ad77aa71326d355e299625ebbd31… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-12-11T17:17:05+01:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/ee2ad77aa71326d355e299625ebbd31… Patch: https://github.com/kamailio/kamailio/commit/ee2ad77aa71326d355e299625ebbd31… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index b1be2506b26..d4aa520a5ea 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -354,7 +354,7 @@ modparam("jsonrpcs", "dgram_timeout", 2000) Example 1.14. Set tcp_socket parameter ... -modparam("jsonrpcs", "tcp_socket", "udp:1.2.3.4:5042") +modparam("jsonrpcs", "tcp_socket", "tcp:1.2.3.4:5042") ... 5. Functions

1 0

git:master:af49deac: jsonrpcs: doc - fix example for tcp_socket parameter
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: af49deacad22b9f2d6502649002d51ad2423f005 URL: https://github.com/kamailio/kamailio/commit/af49deacad22b9f2d6502649002d51a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T17:08:08+01:00 jsonrpcs: doc - fix example for tcp_socket parameter --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/af49deacad22b9f2d6502649002d51a… Patch: https://github.com/kamailio/kamailio/commit/af49deacad22b9f2d6502649002d51a… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index 0e39676edd7..ab8aee4fcd0 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -413,7 +413,7 @@ modparam("jsonrpcs", "dgram_timeout", 2000) <title>Set <varname>tcp_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("jsonrpcs", "tcp_socket", "udp:1.2.3.4:5042") +modparam("jsonrpcs", "tcp_socket", "tcp:1.2.3.4:5042") ... </programlisting> </example> @@ -638,4 +638,3 @@ rm /tmp/kamailio_jsonrpc_reply_fifo </section> </chapter> -

1 0

git:master:7eb96925: siptrace: check sscan() return value
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 7eb96925c4bb4664cce589050dff3e1c8b98b6f0 URL: https://github.com/kamailio/kamailio/commit/7eb96925c4bb4664cce589050dff3e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T15:51:01+01:00 siptrace: check sscan() return value --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/7eb96925c4bb4664cce589050dff3e1… Patch: https://github.com/kamailio/kamailio/commit/7eb96925c4bb4664cce589050dff3e1… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index bac4ad04779..d8a5f974bb3 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -158,7 +158,8 @@ int sip_trace_xheaders_read(struct _siptrace_data *sto) char *searchend = NULL; char *eoh = NULL; char *xheaders = NULL; - long long unsigned int tv_sec, tv_usec; + long long unsigned int tv_sec = 0, tv_usec = 0; + int rv = 0; if(trace_xheaders_read == 0) { return 0; @@ -202,16 +203,17 @@ int sip_trace_xheaders_read(struct _siptrace_data *sto) } // Parse the x-headers: scanf() - if(sscanf(xheaders, - "\r\n" - "X-Siptrace-Fromip: %50s\r\n" - "X-Siptrace-Toip: %50s\r\n" - "X-Siptrace-Time: %llu %llu\r\n" - "X-Siptrace-Method: %50s\r\n" - "X-Siptrace-Dir: %3s", - sto->fromip.s, sto->toip.s, &tv_sec, &tv_usec, sto->method.s, - sto->dir) - == EOF) { + rv = sscanf(xheaders, + "\r\n" + "X-Siptrace-Fromip: %50s\r\n" + "X-Siptrace-Toip: %50s\r\n" + "X-Siptrace-Time: %llu %llu\r\n" + "X-Siptrace-Method: %50s\r\n" + "X-Siptrace-Dir: %3s", + sto->fromip.s, sto->toip.s, &tv_sec, &tv_usec, sto->method.s, + sto->dir); + + if(rv == EOF || rv < 6) { LM_ERR("malformed x-headers\n"); goto erroraftermalloc; }

1 0

git:master:1b7ea63d: core: main - check limit for values of -m and -M
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 1b7ea63df655246b5b6ca123d9ed25d1764d9402 URL: https://github.com/kamailio/kamailio/commit/1b7ea63df655246b5b6ca123d9ed25d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T15:37:26+01:00 core: main - check limit for values of -m and -M --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1b7ea63df655246b5b6ca123d9ed25d… Patch: https://github.com/kamailio/kamailio/commit/1b7ea63df655246b5b6ca123d9ed25d… --- diff --git a/src/main.c b/src/main.c index db694381421..3aa79b73d91 100644 --- a/src/main.c +++ b/src/main.c @@ -2094,6 +2094,7 @@ int main(int argc, char **argv) struct name_lst *n_lst; char *p; struct stat st = {0}; + long l1 = 0; #define KSR_TBUF_SIZE 512 char tbuf[KSR_TBUF_SIZE]; @@ -2181,12 +2182,20 @@ int main(int argc, char **argv) fprintf(stderr, "bad private mem size\n"); goto error; } - pkg_mem_size = strtol(optarg, &tmp, 10) * 1024 * 1024; + l1 = strtol(optarg, &tmp, 10); if(tmp && (*tmp)) { fprintf(stderr, "bad private mem size number: -M %s\n", optarg); goto error; - }; + } + /* safety check for upper limit of 1TB */ + if(l1 <= 0 || l1 > 1024L * 1024) { + fprintf(stderr, + "our of limits private mem size number: -M %s\n", + optarg); + goto error; + } + pkg_mem_size = 1024UL * 1024 * l1; break; case 'x': sr_memmng_shm = optarg; @@ -2315,11 +2324,18 @@ int main(int argc, char **argv) fprintf(stderr, "bad shared mem size\n"); goto error; } - shm_mem_size = strtol(optarg, &tmp, 10) * 1024 * 1024; + l1 = strtol(optarg, &tmp, 10); if(tmp && (*tmp)) { fprintf(stderr, "bad shmem size number: -m %s\n", optarg); goto error; - }; + } + /* safety check for upper limit of 16TB */ + if(l1 <= 0 || l1 > 16L * 1024 * 1024) { + fprintf(stderr, "our of limits shmem size number: -m %s\n", + optarg); + goto error; + } + shm_mem_size = 1024UL * 1024 * l1; LM_INFO("shared memory: %ld bytes\n", shm_mem_size); break; case 'd':

1 0

git:master:75a7d0d8: core: route struct - use helper macro to get action address
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 75a7d0d8b1340d292aba9b589263619f5a6e11c1 URL: https://github.com/kamailio/kamailio/commit/75a7d0d8b1340d292aba9b589263619… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T14:19:04+01:00 core: route struct - use helper macro to get action address --- Modified: src/core/route_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/75a7d0d8b1340d292aba9b589263619… Patch: https://github.com/kamailio/kamailio/commit/75a7d0d8b1340d292aba9b589263619… --- diff --git a/src/core/route_struct.c b/src/core/route_struct.c index 654e588beb3..fa43b498e75 100644 --- a/src/core/route_struct.c +++ b/src/core/route_struct.c @@ -561,11 +561,12 @@ void print_actions(struct action *a) */ struct action *get_action_from_param(void **param, int param_no) { - struct action *ac, ac2; - action_u_t *au, au2; + cfg_action_t *ac; + action_u_t *au; /* param points to au->u.string, get pointer to au */ - au = (void *)((char *)param - ((char *)&au2.u.string - (char *)&au2)); + au = ksr_container_of(param, action_u_t, u.string); au = au - 1 - param_no; - ac = (void *)((char *)au - ((char *)&ac2.val - (char *)&ac2)); + /* au points to ac->val, get pointer to ac */ + ac = ksr_container_of(au, cfg_action_t, val); return ac; }

1 0

git:master:9c336764: core: cast to variable type action_u_t*
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 9c336764f567c873e25792efd813be1806d215d3 URL: https://github.com/kamailio/kamailio/commit/9c336764f567c873e25792efd813be1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T13:01:18+01:00 core: cast to variable type action_u_t* --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/9c336764f567c873e25792efd813be1… Patch: https://github.com/kamailio/kamailio/commit/9c336764f567c873e25792efd813be1… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 9660afce320..d67e7e44af3 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -1092,7 +1092,7 @@ action_u_t *fixup_get_param( { action_u_t *a; /* cur_param points to a->u.string, get pointer to a */ - a = (void *)((char *)cur_param - offsetof(action_u_t, u.string)); + a = (action_u_t *)((char *)cur_param - offsetof(action_u_t, u.string)); return a + required_param_no - cur_param_no; } @@ -1114,7 +1114,7 @@ int fixup_get_param_count(void **cur_param, int cur_param_no) action_param_type *fixup_get_param_ptype(void **param) { action_u_t *a; - a = (void *)((char *)param - offsetof(action_u_t, u.string)); + a = (action_u_t *)((char *)param - offsetof(action_u_t, u.string)); return &a->type; }

1 0

git:master:6aa967eb: debugger: updated dbg_fixup_get_action() to use helper macro for structure address
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 6aa967eb82fa9092f0a32101e44798e4d66fc708 URL: https://github.com/kamailio/kamailio/commit/6aa967eb82fa9092f0a32101e44798e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T12:54:25+01:00 debugger: updated dbg_fixup_get_action() to use helper macro for structure address --- Modified: src/modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6aa967eb82fa9092f0a32101e44798e… Patch: https://github.com/kamailio/kamailio/commit/6aa967eb82fa9092f0a32101e44798e… --- diff --git a/src/modules/debugger/debugger_mod.c b/src/modules/debugger/debugger_mod.c index 3b3b7922dd2..b6248644d65 100644 --- a/src/modules/debugger/debugger_mod.c +++ b/src/modules/debugger/debugger_mod.c @@ -320,12 +320,13 @@ static int w_dbg_dump(struct sip_msg *msg, char *mask, char *level) */ static struct action *dbg_fixup_get_action(void **param, int param_no) { - struct action *ac, ac2; - action_u_t *au, au2; + cfg_action_t *ac; + action_u_t *au; /* param points to au->u.string, get pointer to au */ - au = (void *)((char *)param - ((char *)&au2.u.string - (char *)&au2)); + au = ksr_container_of(param, action_u_t, u.string); au = au - 1 - param_no; - ac = (void *)((char *)au - ((char *)&ac2.val - (char *)&ac2)); + /* au points to ac->val, get pointer to ac */ + ac = ksr_container_of(au, cfg_action_t, val); return ac; }

1 0

git:master:1b81cbc9: tm: use helper macro to get structure address from member
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 1b81cbc9f79354aae604e33ac978dece95c0326c URL: https://github.com/kamailio/kamailio/commit/1b81cbc9f79354aae604e33ac978dec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T12:25:56+01:00 tm: use helper macro to get structure address from member --- Modified: src/modules/tm/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/1b81cbc9f79354aae604e33ac978dec… Patch: https://github.com/kamailio/kamailio/commit/1b81cbc9f79354aae604e33ac978dec… --- diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index a2ebb434ccb..c0cbade59d6 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -486,8 +486,8 @@ ticks_t retr_buf_handler(ticks_t ticks, struct timer_ln *tl, void *p) unsigned long crt_retr_interval_ms; struct cell *t; - rbuf = (struct retr_buf *)((void *)tl - - (void *)(&((struct retr_buf *)0)->timer)); + rbuf = ksr_container_of(tl, struct retr_buf, timer); + membar_depends(); /* to be on the safe side */ t = rbuf->my_T;

1 0

git:master:ad2e976d: core: helper macro to get enclosing struture from a member address
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: ad2e976d9200bd68c88e4a78edc0d250ba4045ba URL: https://github.com/kamailio/kamailio/commit/ad2e976d9200bd68c88e4a78edc0d25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T11:31:56+01:00 core: helper macro to get enclosing struture from a member address --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/ad2e976d9200bd68c88e4a78edc0d25… Patch: https://github.com/kamailio/kamailio/commit/ad2e976d9200bd68c88e4a78edc0d25… --- diff --git a/src/core/ut.h b/src/core/ut.h index 8e2e4f0d8f0..ff8d964e559 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -33,6 +33,7 @@ #include <limits.h> #include <time.h> #include <unistd.h> +#include <stddef.h> #include <ctype.h> #include <string.h> #include <strings.h> @@ -143,6 +144,8 @@ #define is_in_str(p, in) (p < in->s + in->len && *p) +#define ksr_container_of(ptr, type, member) \ + ((type *)((char *)(ptr)-offsetof(type, member))) /* links a value to a msgid */ struct msgid_var

1 0

git:master:9db18bc4: dialog: check first the size
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: 9db18bc48bff0d230e66973a45c8e72e1b7744e8 URL: https://github.com/kamailio/kamailio/commit/9db18bc48bff0d230e66973a45c8e72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T10:07:39+01:00 dialog: check first the size --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/9db18bc48bff0d230e66973a45c8e72… Patch: https://github.com/kamailio/kamailio/commit/9db18bc48bff0d230e66973a45c8e72… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 10df9e90c3e..db5f61c4e05 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -667,8 +667,8 @@ int pv_set_dlg_ctx( break; case 4: if(val && val->flags & PV_VAL_STR) { - if(val->rs.s[val->rs.len] == '\0' - && val->rs.len < DLG_TOROUTE_SIZE) { + if(val->rs.len < DLG_TOROUTE_SIZE + && val->rs.s[val->rs.len] == '\0') { _dlg_ctx.to_route = route_lookup(&main_rt, val->rs.s); strcpy(_dlg_ctx.to_route_name, val->rs.s); } else {

1 0

git:master:e614575d: sca: check return for snprintf()
by Daniel-Constantin Mierla 11 Dec '23

11 Dec '23

Module: kamailio Branch: master Commit: e614575d53f5e3b7d3a4796a445728f862e60916 URL: https://github.com/kamailio/kamailio/commit/e614575d53f5e3b7d3a4796a445728f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-11T09:53:48+01:00 sca: check return for snprintf() --- Modified: src/modules/sca/sca_call_info.c --- Diff: https://github.com/kamailio/kamailio/commit/e614575d53f5e3b7d3a4796a445728f… Patch: https://github.com/kamailio/kamailio/commit/e614575d53f5e3b7d3a4796a445728f… --- diff --git a/src/modules/sca/sca_call_info.c b/src/modules/sca/sca_call_info.c index a1af143c017..2694239cb9f 100644 --- a/src/modules/sca/sca_call_info.c +++ b/src/modules/sca/sca_call_info.c @@ -112,6 +112,7 @@ static int sca_call_info_header_append_appearances( str state_str; int slot_idx; int len = -1; + int l1 = -1; int usedlen = -1; slot_idx = @@ -153,9 +154,14 @@ static int sca_call_info_header_append_appearances( sca_appearance_state_to_str(app->state, &state_str); // state_str.s is a nul-terminated string literal - len += snprintf(hdrbuf + len, maxlen - len, + l1 = snprintf(hdrbuf + len, maxlen - len, ">;appearance-index=%d;appearance-state=%s", app->index, state_str.s); + if(l1 < 0 || l1 >= maxlen - len) { + LM_ERR("failed to print the header\n"); + return -1; + } + len += l1; if(!SCA_STR_EMPTY(&app->uri)) { hdrbuf[len] = ';';

1 0

[kamailio/kamailio] Add support for Linux kernel anyIP feature (Issue #3394)
by mohsen 09 Dec '23

09 Dec '23

Hi I have a kimailio box that receives messages from one interface and send it from another interface and I use dispatcher module successfully. Now I assigned an I range to Linux loopback interface through Linux kernel anyip feature. And I can ping the range. ip -4 route add local 192.168.0.0/24 dev lo I want to send messages from source of the ip in this range but kamailio cant do this in the right way. I added this two directives to kamailio.cfg: mhomed=yes ip_free_bind = 1 and when I want to use an ip from the list I use $fs=”udp:192.168.0.120:5060”; With no luck If I use force_send_socket(udp:192.168.0.120:5060); kamailio returns an error bad force_send_socket argument: 192.168.0.120:5060 (kamailio doesn't listen on it) and if I add listen directive for one ip like: listen=udp:192.168.0.120:5060 everything works fine but I want to be able to use any ip from list not just one ip. Thanks. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3394 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3394(a)github.com>

6 10

Jenkins build is still unstable: kamailio57-nightly-binaries » amd64,stretch #39
by kamailio＠sipwise.com 09 Dec '23

09 Dec '23

See <https://kamailio.sipwise.com/job/kamailio57-nightly-binaries/architecture=a…>

1 0

git:5.7:8674b333: core: parse privacy recompute lenght of rest to parse
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: 5.7 Commit: 8674b333300d5829bff9cb4993886bcf7bea249b URL: https://github.com/kamailio/kamailio/commit/8674b333300d5829bff9cb4993886bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T22:12:01+01:00 core: parse privacy recompute lenght of rest to parse (cherry picked from commit 804ee651b45498727196886c97cb55d20b254c4a) --- Modified: src/core/parser/parse_privacy.c --- Diff: https://github.com/kamailio/kamailio/commit/8674b333300d5829bff9cb4993886bc… Patch: https://github.com/kamailio/kamailio/commit/8674b333300d5829bff9cb4993886bc… --- diff --git a/src/core/parser/parse_privacy.c b/src/core/parser/parse_privacy.c index 64431468675..89423c1dffa 100644 --- a/src/core/parser/parse_privacy.c +++ b/src/core/parser/parse_privacy.c @@ -178,14 +178,13 @@ int parse_privacy(struct sip_msg *msg) values = 0; p = next.s; - len = next.len; - beyond = p + len; + beyond = next.s + next.len; while(p < beyond) { + len = beyond - p; if((val_len = parse_priv_value(p, len, &value)) != 0) { values |= value; p = p + val_len; - len = len - val_len; } else { LM_ERR("invalid privacy value\n"); return -1;

1 0

git:master:804ee651: core: parse privacy recompute lenght of rest to parse
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 804ee651b45498727196886c97cb55d20b254c4a URL: https://github.com/kamailio/kamailio/commit/804ee651b45498727196886c97cb55d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T22:10:36+01:00 core: parse privacy recompute lenght of rest to parse --- Modified: src/core/parser/parse_privacy.c --- Diff: https://github.com/kamailio/kamailio/commit/804ee651b45498727196886c97cb55d… Patch: https://github.com/kamailio/kamailio/commit/804ee651b45498727196886c97cb55d… --- diff --git a/src/core/parser/parse_privacy.c b/src/core/parser/parse_privacy.c index 64431468675..89423c1dffa 100644 --- a/src/core/parser/parse_privacy.c +++ b/src/core/parser/parse_privacy.c @@ -178,14 +178,13 @@ int parse_privacy(struct sip_msg *msg) values = 0; p = next.s; - len = next.len; - beyond = p + len; + beyond = next.s + next.len; while(p < beyond) { + len = beyond - p; if((val_len = parse_priv_value(p, len, &value)) != 0) { values |= value; p = p + val_len; - len = len - val_len; } else { LM_ERR("invalid privacy value\n"); return -1;

1 0

[kamailio/kamailio] siptrace: add haproxy protocol support (Issue #3665)
by sergey-safarov 08 Dec '23

08 Dec '23

When used `tcp_accept_haproxy=yes` and inbound connection from load-balancer received via IPv6 protocol and client real IPv4 then i can see error in the kamailio log ``` 28(723055) ERROR: {1 27 REGISTER 4fkReTbLC-} siptrace [siptrace_hep.c:94]: trace_send_hep3_duplicate(): interworking detected ? ``` Looks like requried add haproxy protocol support into siptrace module -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3665 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3665(a)github.com>

2 2

[kamailio/kamailio] Redefine Advertised socket URI when used haproxy protocol (Issue #3667)
by sergey-safarov 08 Dec '23

08 Dec '23

### Description When used haproxy protocol then from client perspetive TCP connection established to loadbalancer IP address. Real Kamailio listener may be IPv6 and expected to see `$RAut` value with IP of load balancer IP. Really I can see for first message from the client ``` sip:2600::6:45060;transport=tcp ``` For second message ``` Advertised socket URI: sip:[2600::6]:5060 ``` For first case missed `[]` in the IP and expected to see loadbalancer IPv4 because client use IPv4 to establish connection to Kamailio. ### Expected behavior Used loadbalancerserver IP from haproxy protocol for `$RAut` value and for `Record-Route` headers generation. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3667 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3667(a)github.com>

2 2

git:master:5d97afef: core: xavp - info long when skipping serializing a field
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 5d97afefd2a8f53072a36b6eb8927c180fb984c9 URL: https://github.com/kamailio/kamailio/commit/5d97afefd2a8f53072a36b6eb8927c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T16:23:03+01:00 core: xavp - info long when skipping serializing a field --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/5d97afefd2a8f53072a36b6eb8927c1… Patch: https://github.com/kamailio/kamailio/commit/5d97afefd2a8f53072a36b6eb8927c1… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 58f3a567611..128ea631013 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1184,7 +1184,8 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) } break; default: - LM_DBG("skipping value type: %d\n", avp->val.type); + LM_INFO("skipping field [%.*s] value type: %d\n", avp->name.len, + avp->name.s, avp->val.type); ostr.len = 0; } if(ostr.len > 0) { @@ -1678,7 +1679,8 @@ int xavu_serialize_fields(str *rname, char *obuf, int olen) } break; default: - LM_DBG("skipping value type: %d\n", avu->val.type); + LM_INFO("skipping field [%.*s] value type: %d\n", avu->name.len, + avu->name.s, avu->val.type); ostr.len = 0; } if(ostr.len > 0) { @@ -2652,7 +2654,8 @@ int xavi_serialize_fields(str *rname, char *obuf, int olen) } break; default: - LM_DBG("skipping value type: %d\n", avi->val.type); + LM_INFO("skipping field [%.*s] value type: %d\n", avi->name.len, + avi->name.s, avi->val.type); ostr.len = 0; } if(ostr.len > 0) {

1 0

[kamailio/kamailio] TOPOS callid masking (Issue #3606)
by Dennis 08 Dec '23

08 Dec '23

### Description PKG memory errors when configured mask_callid in TOPOS. ### Troubleshooting The poblem in detail desribed in mailing lists: https://www.mail-archive.com/sr-users@lists.kamailio.org/msg19997.html ### Possible Solutions Right way to configure topos for callid masking is: modparam("topoh", "use_mode", 1) modparam("topos", "mask_callid", 1) modparam("topoh", "mask_callid", 1) We need to set mask_callid module parameter for topoh also. There is not a word about this in the documentation, so docs correction needed. ### Additional Information * **Kamailio Version** - 5.7.X -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3606 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3606(a)github.com>

3 5

[kamailio/kamailio] pv: Add support to $hfl $hflc for Diversion header (PR #3651)
by Xenofon Karamanos 08 Dec '23

08 Dec '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This PR adds support for $hfl(Diversion)[] and $hflc(Diversion). This parse_diversion.c was inspired by [parse_pai_ppi.c](https://github.com/kamailio/kamailio/blob/master/src/core/…. I am not sure if it's breaking the existing implementation and usage. Any feedback and review is welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3651 -- Commit Summary -- * parser: Extend diversion for multiple bodies * pv: Add hfl and hflc support for Diversion header -- File Changes -- M src/core/parser/parse_diversion.c (152) M src/core/parser/parse_diversion.h (11) M src/modules/pv/pv_core.c (71) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3651.patch https://github.com/kamailio/kamailio/pull/3651.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3651 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3651(a)github.com>

3 10

[kamailio/kamailio] pv: Add support in $hfl and $hflc pv for PPI and PAI headers (PR #3652)
by Xenofon Karamanos 08 Dec '23

08 Dec '23

#### 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) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This PR adds support for $hfl(name)[] and $hflc(name) for P-Preferred-Identity and P-Asserted-Identity. Should probably also be documented in https://www.kamailio.org/wikidocs/cookbooks/devel/pseudovariables/#hflname-… Any feedback welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3652 -- Commit Summary -- * pv: Add PPI and PAI support to hfl and hflc -- File Changes -- M src/modules/pv/pv_core.c (104) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3652.patch https://github.com/kamailio/kamailio/pull/3652.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3652 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3652(a)github.com>

2 11

[kamailio/kamailio] Segfault with tls init_mode 1 (Issue #3668)
by Bastian Triller 08 Dec '23

08 Dec '23

### Description Kamailio chrashes on startup when set init_mode to 1. Seems to be introduced with 4b068f49b618dca5fa85a1687bd9054c1d98ae6a  ### Troubleshooting #### Reproduction modparam("tls", "init_mode", 1)  #### Debugging Data  ``` #0 ___pthread_mutex_lock (mutex=0x0) at ./nptl/pthread_mutex_lock.c:80 #1 0x00007f9e93510614 in ser_malloc (size=56, fname=<optimized out>, fline=<optimized out>) at ./src/modules/tls/tls_init.c:388 #2 0x00007f9e93031b59 in CRYPTO_zalloc (num=num@entry=56, file=file@entry=0x7f9e9317563d "../crypto/threads_pthread.c", line=line@entry=50) at ../crypto/mem.c:197 #3 0x00007f9e9303dedf in CRYPTO_THREAD_lock_new () at ../crypto/threads_pthread.c:50 #4 0x00007f9e93030ad9 in ossl_init_base () at ../crypto/init.c:64 #5 ossl_init_base_ossl_ () at ../crypto/init.c:55 #6 0x00007f9e97affea7 in __pthread_once_slow (once_control=0x7f9e9327edcc <base>, init_routine=0x7f9e93030ad0 <ossl_init_base_ossl_>) at ./nptl/pthread_once.c:116 #7 0x00007f9e97afff85 in ___pthread_once (once_control=<optimized out>, init_routine=<optimized out>) at ./nptl/pthread_once.c:143 #8 0x00007f9e9303dfc9 in CRYPTO_THREAD_run_once (once=once@entry=0x7f9e9327edcc <base>, init=init@entry=0x7f9e93030ad0 <ossl_init_base_ossl_>) at ../crypto/threads_pthread.c:154 #9 0x00007f9e93030d48 in OPENSSL_init_crypto (opts=opts@entry=131148, settings=settings@entry=0x0) at ../crypto/init.c:507 #10 0x00007f9e93473a21 in OPENSSL_init_ssl (opts=131148, opts@entry=131072, settings=settings@entry=0x0) at ../ssl/ssl_init.c:115 #11 0x00007f9e93511f44 in tls_h_mod_pre_init_f () at ./src/modules/tls/tls_init.c:779 #12 0x000055c792122571 in main (argc=<optimized out>, argv=0x7ffd43d1a338) at ./src/main.c:3174 ``` #### Log Messages  ``` [ 1803.304680] kamailio[7700]: segfault at 10 ip 00007fe7b62c91c0 sp 00007ffd499a0db8 error 4 in libc.so.6[7fe7b6263000+155000] likely on CPU 1 (core 0, socket 1) [ 1803.304698] Code: 30 11 00 ba c2 01 00 00 48 8d 35 47 ad 10 00 48 8d 3d 55 ad 10 00 e8 3f 8c fa ff e8 4a bd 08 00 66 2e 0f 1f 84 00 00 00 00 00 <8b> 47 10 89 c2 81 e2 7f 01 00 00 83 e0 7c 0f 85 ac 00 00 00 53 48 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 12.2.0 ``` ``` version: kamailio 5.8.0-dev2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 12.2.0 ``` * **Operating System**:  ``` % cat /etc/os-release PRETTY_NAME="Debian GNU/Linux 12 (bookworm)" NAME="Debian GNU/Linux" VERSION_ID="12" VERSION="12 (bookworm)" VERSION_CODENAME=bookworm ID=debian HOME_URL="https://www.debian.org/" SUPPORT_URL="https://www.debian.org/support" BUG_REPORT_URL="https://bugs.debian.org/" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3668 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3668(a)github.com>

2 2

git:5.7:b634dc7f: tls: init early the local lock for memory
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: 5.7 Commit: b634dc7f4d8f1653502328488f0dded134547b54 URL: https://github.com/kamailio/kamailio/commit/b634dc7f4d8f1653502328488f0dded… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T12:37:26+01:00 tls: init early the local lock for memory - needed to done before mod param init_mode is set - runtime uses the modparam to do lock/unlock - #3668 (cherry picked from commit 1a9b0b63617afebcee2aecb3b2240d7684ecabc2) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/b634dc7f4d8f1653502328488f0dded… Patch: https://github.com/kamailio/kamailio/commit/b634dc7f4d8f1653502328488f0dded… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 6106cc7f884..57be9cad814 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -78,7 +78,7 @@ int ksr_tls_lock_init(void) { pthread_mutexattr_t attr; - if(!(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM)) { + if(ksr_tls_lock_shm != NULL) { return 0; } ksr_tls_lock_shm = (pthread_mutex_t *)shm_mallocxz(sizeof(pthread_mutex_t)); @@ -723,6 +723,11 @@ int tls_pre_init(void) LM_INFO("libssl linked mode: static\n"); #endif + if(ksr_tls_lock_init() < 0) { + LM_ERR("failed to init local lock\n"); + return -1; + } + /* * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0 @@ -770,6 +775,10 @@ int tls_h_mod_pre_init_f(void) LM_DBG("already mod pre-initialized\n"); return 0; } + if(ksr_tls_lock_init() < 0) { + LM_ERR("failed to init local lock\n"); + return -1; + } LM_DBG("preparing tls env for modules initialization\n"); #if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n");

1 0

git:master:1a9b0b63: tls: init early the local lock for memory
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 1a9b0b63617afebcee2aecb3b2240d7684ecabc2 URL: https://github.com/kamailio/kamailio/commit/1a9b0b63617afebcee2aecb3b2240d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T12:34:56+01:00 tls: init early the local lock for memory - needed to done before mod param init_mode is set - runtime uses the modparam to do lock/unlock - #3668 --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/1a9b0b63617afebcee2aecb3b2240d7… Patch: https://github.com/kamailio/kamailio/commit/1a9b0b63617afebcee2aecb3b2240d7… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 7824245813b..9be5e1d4fab 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -78,7 +78,7 @@ int ksr_tls_lock_init(void) { pthread_mutexattr_t attr; - if(!(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM)) { + if(ksr_tls_lock_shm != NULL) { return 0; } ksr_tls_lock_shm = (pthread_mutex_t *)shm_mallocxz(sizeof(pthread_mutex_t)); @@ -721,6 +721,11 @@ int tls_pre_init(void) LM_INFO("libssl linked mode: static\n"); #endif + if(ksr_tls_lock_init() < 0) { + LM_ERR("failed to init local lock\n"); + return -1; + } + /* * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0 @@ -772,6 +777,10 @@ int tls_h_mod_pre_init_f(void) LM_DBG("already mod pre-initialized\n"); return 0; } + if(ksr_tls_lock_init() < 0) { + LM_ERR("failed to init local lock\n"); + return -1; + } LM_DBG("preparing tls env for modules initialization\n"); #if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n");

1 0

git:master:73536c5f: core: msg translator - consider af from advertise structure
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 73536c5fe93f6f4e41eb92de29d054a0ac38536b URL: https://github.com/kamailio/kamailio/commit/73536c5fe93f6f4e41eb92de29d054a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T12:21:40+01:00 core: msg translator - consider af from advertise structure --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/73536c5fe93f6f4e41eb92de29d054a… Patch: https://github.com/kamailio/kamailio/commit/73536c5fe93f6f4e41eb92de29d054a…

1 0

git:master:59592e04: core: consider af from advertise structure to build recv socket uri
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 59592e0499fbb61ec701a1d7901c357ff5ebc4a4 URL: https://github.com/kamailio/kamailio/commit/59592e0499fbb61ec701a1d7901c357… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:53:45+01:00 core: consider af from advertise structure to build recv socket uri --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/59592e0499fbb61ec701a1d7901c357… Patch: https://github.com/kamailio/kamailio/commit/59592e0499fbb61ec701a1d7901c357… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index c0a06b6af1a..a8504873073 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1341,6 +1341,7 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) char *p; str ip, port; int len; + int af; str proto = STR_NULL; if(!uri || !m || !m->rcv.bind_address) { @@ -1385,8 +1386,13 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) port.s = m->rcv.bind_address->useinfo.port_no_str.s; port.len = m->rcv.bind_address->useinfo.port_no_str.len; } + if(atype == 1 && m->rcv.bind_address->useinfo.address_str.len > 0) { + af = m->rcv.bind_address->useinfo.af; + } else { + af = m->rcv.src_ip.af; + } - len = 4 + ip.len + 2 * (m->rcv.src_ip.af == AF_INET6) + 1 + port.len; + len = 4 + ip.len + 2 * (af == AF_INET6) + 1 + port.len; if(proto.s) { len += TRANSPORT_PARAM_LEN; len += proto.len; @@ -1401,11 +1407,11 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) memcpy(p, "sip:", 4); p += 4; - if(m->rcv.src_ip.af == AF_INET6) + if(af == AF_INET6) *p++ = '['; memcpy(p, ip.s, ip.len); p += ip.len; - if(m->rcv.src_ip.af == AF_INET6) + if(af == AF_INET6) *p++ = ']'; *p++ = ':';

1 0

git:master:faf24134: core: keep address family indication in advertised structure
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: faf24134a00c1b15933f22e8e7702ec8e0dba35d URL: https://github.com/kamailio/kamailio/commit/faf24134a00c1b15933f22e8e7702ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:43:02+01:00 core: keep address family indication in advertised structure --- Modified: src/core/ip_addr.h Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/faf24134a00c1b15933f22e8e7702ec… Patch: https://github.com/kamailio/kamailio/commit/faf24134a00c1b15933f22e8e7702ec… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index cec63fc4fa9..a8f9660b9c6 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -122,6 +122,7 @@ typedef struct advertise_info { str name; /* name - eg.: foo.bar or 10.0.0.1 */ int proto; /* protocol id */ + int af; /* address family based on [ ] around name */ unsigned short port_no; /* port number */ short port_pad; /* padding field */ str port_no_str; /* port number converted to string -- optimization*/ diff --git a/src/core/socket_info.c b/src/core/socket_info.c index caad839ee8f..3f67f16981b 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -336,6 +336,7 @@ static inline struct socket_info *new_sock_info(char *name, if(usename[0] == '[' && usename[si->useinfo.name.len - 1] == ']') { si->useinfo.address_str.len = si->useinfo.name.len - 2; p = si->useinfo.name.s + 1; + si->useinfo.af = AF_INET6; } else { si->useinfo.address_str.len = si->useinfo.name.len; p = si->useinfo.name.s;

1 0

git:master:975bbde5: core: use advertise proto when building get_rcv_socket_uri()
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 975bbde5aa0fd4c2ef4063d906e125911d162ed6 URL: https://github.com/kamailio/kamailio/commit/975bbde5aa0fd4c2ef4063d906e1259… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:36:32+01:00 core: use advertise proto when building get_rcv_socket_uri() --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/975bbde5aa0fd4c2ef4063d906e1259… Patch: https://github.com/kamailio/kamailio/commit/975bbde5aa0fd4c2ef4063d906e1259… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 5d2e799d69d..c0a06b6af1a 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1341,31 +1341,32 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) char *p; str ip, port; int len; - str proto; + str proto = STR_NULL; if(!uri || !m || !m->rcv.bind_address) { ERR("invalid parameter value\n"); return -1; } - if(tmode == 0) { - switch(m->rcv.proto) { - case PROTO_NONE: - case PROTO_UDP: - proto.s = - 0; /* Do not add transport parameter, UDP is default */ - proto.len = 0; - break; - default: - if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto) < 0) { - ERR("unknown transport protocol\n"); - return -1; - } - } + if((tmode == 0) + && (m->rcv.proto == PROTO_NONE || m->rcv.proto == PROTO_UDP)) { + /* do not add transport parameter, UDP is default */ + proto.s = NULL; + proto.len = 0; } else { - if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto) < 0) { - ERR("unknown transport protocol\n"); - return -1; + if(atype == 0 || m->rcv.bind_address->useinfo.address_str.len <= 0 + || m->rcv.bind_address->useinfo.proto == PROTO_NONE) { + if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto) < 0) { + ERR("unknown transport protocol\n"); + return -1; + } + } else { + if(get_valid_proto_string( + m->rcv.bind_address->useinfo.proto, 1, 0, &proto) + < 0) { + ERR("unknown transport protocol\n"); + return -1; + } } }

1 0

git:master:b02a38e6: pv: support for Diversion header in $hfl() and $hflc()
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: b02a38e66d3bd198e75103727130906b2ff9786c URL: https://github.com/kamailio/kamailio/commit/b02a38e66d3bd198e75103727130906… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:04:27+01:00 pv: support for Diversion header in $hfl() and $hflc() --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/b02a38e66d3bd198e75103727130906… Patch: https://github.com/kamailio/kamailio/commit/b02a38e66d3bd198e75103727130906… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index ff6e23f811a..4b8f98bcfd3 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1100,7 +1100,7 @@ int pv_get_diversion(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) } if(param->pvn.u.isname.name.n == 1) { /* uri */ - return pv_get_strval(msg, param, res, &(get_diversion(msg)->uri)); + return pv_get_strval(msg, param, res, &(get_diversion(msg)->id->uri)); } if(param->pvn.u.isname.name.n == 2) { /* reason param */ @@ -2090,6 +2090,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) via_body_t *vb = NULL; rr_t *rrb = NULL; contact_t *cb = NULL; + diversion_body_t *db = NULL; p_id_body_t *ppib = NULL; p_id_body_t *paib = NULL; hdr_field_t *hf = NULL; @@ -2340,6 +2341,58 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } + if((tv.flags == 0) && (tv.ri == HDR_DIVERSION_T)) { + if(msg->diversion == NULL) { + LM_WARN("no Diversion header\n"); + return pv_get_null(msg, param, res); + } + + if(parse_diversion_header(msg) < 0) { + LM_WARN("failed to parse Diversion headers\n"); + return pv_get_null(msg, param, res); + } + + db = (diversion_body_t *)msg->diversion->parsed; + n = 0; + + while(db != NULL) { + n += db->num_ids; + db = db->next; + } + + if(idx < 0) { + idx = -idx; + if(idx > n) { + LM_WARN("index out of range\n"); + return pv_get_null(msg, param, res); + } + idx = n - idx; + } + + n = 0; + db = (diversion_body_t *)msg->diversion->parsed; + /* loop through all parsed Diversion headers lists */ + while(db != NULL) { + if(n + db->num_ids > idx) { + /* Calculate the index within this specific list */ + int innerIndex = idx - n; + + /* Access the desired element within this list */ + sval.s = db->id[innerIndex].body.s; + sval.len = db->id[innerIndex].body.len; + trim(&sval); + res->rs = sval; + return 0; + } + + /* Move to the next Diversion header list */ + n += db->num_ids; + db = db->next; + } + LM_DBG("unexpected diversion index out of range\n"); + return pv_get_null(msg, param, res); + } + if((tv.flags == 0) && (tv.ri == HDR_PPI_T)) { if(msg->ppi == NULL) { LM_DBG("no PPI header\n"); @@ -2563,6 +2616,25 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, n); } + if((tv.flags == 0) && (tv.ri == HDR_DIVERSION_T)) { + if(msg->diversion == NULL) { + LM_DBG("no Diversion header\n"); + return pv_get_sintval(msg, param, res, 0); + } + if(parse_diversion_header(msg) < 0) { + LM_DBG("failed to parse Diversion headers\n"); + return pv_get_sintval(msg, param, res, 0); + } + + diversion_body_t *db = (diversion_body_t *)msg->diversion->parsed; + int diversion_body_count = 0; + while(db != NULL) { + diversion_body_count += db->num_ids; + db = db->next; + } + return pv_get_sintval(msg, param, res, diversion_body_count); + } + if((tv.flags == 0) && (tv.ri == HDR_PPI_T)) { if(msg->ppi == NULL) { LM_DBG("no PPI header\n");

1 0

git:master:ced8d46e: core: parser extended to handle diversion with multiple bodies
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: ced8d46eddb2bda614eaace98437b7dab2d123e3 URL: https://github.com/kamailio/kamailio/commit/ced8d46eddb2bda614eaace98437b7d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:01:39+01:00 core: parser extended to handle diversion with multiple bodies - similar to PAI and PPI --- Modified: src/core/parser/hf.c Modified: src/core/parser/parse_diversion.c Modified: src/core/parser/parse_diversion.h --- Diff: https://github.com/kamailio/kamailio/commit/ced8d46eddb2bda614eaace98437b7d… Patch: https://github.com/kamailio/kamailio/commit/ced8d46eddb2bda614eaace98437b7d…

1 0

[kamailio/kamailio] lib: big integers should not be treated as negative ones (#2106)
by Ivan Murashko 08 Dec '23

08 Dec '23

0xffffffff00000000ULL mask does not take into consideration signed 32 bit integers and as result 2147483648 will be stored as -2147483648. Another mask should be used to correct the issue: 0xffffffff80000000ULL. It processes correctly the case of integers that are greater than 2147483647. There are several gdb tests below: (gdb) p ((unsigned long long)2147483648 & 0xffffffff80000000ULL) $1= 2147483648 (gdb) p ((unsigned long long)2147483647 & 0xffffffff80000000ULL) $2 = 0 (gdb) p ((unsigned long long)2147483646 & 0xffffffff80000000ULL) $3 = 0 (gdb) p ((unsigned long long)4147483646 & 0xffffffff80000000ULL) $4 = 2147483648   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2106 -- Commit Summary -- * lib: big integers should not be treated as negative ones -- File Changes -- M src/lib/srdb1/db_ut.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2106.patch https://github.com/kamailio/kamailio/pull/2106.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2106

4 6

git:master:6d14b4e4: lib/srdb1: rework store of long long values as number if value fits
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 6d14b4e439aec3d046addfa776a4be5f471a33f0 URL: https://github.com/kamailio/kamailio/commit/6d14b4e439aec3d046addfa776a4be5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T10:23:20+01:00 lib/srdb1: rework store of long long values as number if value fits - GH #2106 --- Modified: src/lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/6d14b4e439aec3d046addfa776a4be5… Patch: https://github.com/kamailio/kamailio/commit/6d14b4e439aec3d046addfa776a4be5… --- diff --git a/src/lib/srdb1/db_ut.c b/src/lib/srdb1/db_ut.c index c7a8887044e..9975672aeea 100644 --- a/src/lib/srdb1/db_ut.c +++ b/src/lib/srdb1/db_ut.c @@ -610,11 +610,16 @@ int db_val2pv_spec(struct sip_msg *msg, db_val_t *dbval, pv_spec_t *pvs) pv.rs.len = LL_LEN; db_longlong2str(dbval->val.ll_val, ll_buf, &pv.rs.len); pv.rs.s = ll_buf; - /* if it fits, also store as 32 bit integer*/ - if(!((unsigned long long)dbval->val.ll_val - & 0xffffffff00000000ULL)) { + /* if it fits, also store as long number */ + if(sizeof(long long) == sizeof(long)) { pv.flags |= PV_VAL_INT | PV_TYPE_INT; - pv.ri = (int)dbval->val.ll_val; + pv.ri = (long)dbval->val.ll_val; + } else { + if(dbval->val.ll_val >= LONG_MIN + && dbval->val.ll_val <= LONG_MAX) { + pv.flags |= PV_VAL_INT | PV_TYPE_INT; + pv.ri = (long)dbval->val.ll_val; + } } break; default:

1 0

git:master:c79f28b1: pv: Add PPI and PAI support to hfl and hflc
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: c79f28b11f2683d11aafa72427efb15c95196b8b URL: https://github.com/kamailio/kamailio/commit/c79f28b11f2683d11aafa72427efb15… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T09:46:56+01:00 pv: Add PPI and PAI support to hfl and hflc --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/c79f28b11f2683d11aafa72427efb15… Patch: https://github.com/kamailio/kamailio/commit/c79f28b11f2683d11aafa72427efb15…

1 0

[kamailio/kamailio] uac: fix socket length settings (PR #3664)
by Péter Barabás 08 Dec '23

08 Dec '23

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This PR fixes the setting of uac_req object's socket length. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3664 -- Commit Summary -- * uac: fix socket length settings -- File Changes -- M src/modules/uac/uac_send.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3664.patch https://github.com/kamailio/kamailio/pull/3664.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3664 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3664(a)github.com>

2 2

git:master:10519d19: uac: fix socket length settings
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 10519d199f6cac116399f4473bd82f2b08de72ba URL: https://github.com/kamailio/kamailio/commit/10519d199f6cac116399f4473bd82f2… Author: Pe��ter Baraba��s <peter.barabas(a)securesoft.hu> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T09:42:08+01:00 uac: fix socket length settings - set _uac_req.s_sock.len value to 0 in pv_set_uac_req() method in case of "all" case - change setting of _uac_req.s_apasswd.len to _uac_req.s_sock.len in pv_set_uac_req() method in case of "sock" case --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/10519d199f6cac116399f4473bd82f2… Patch: https://github.com/kamailio/kamailio/commit/10519d199f6cac116399f4473bd82f2… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index c098feacff2..b2cdaad9066 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -210,6 +210,7 @@ int pv_set_uac_req( _uac_req.s_body.len = 0; _uac_req.s_method.len = 0; _uac_req.s_callid.len = 0; + _uac_req.s_sock.len = 0; _uac_req.evroute = 0; _uac_req.evtype = 0; _uac_req.evcode = 0; @@ -399,7 +400,7 @@ int pv_set_uac_req( break; case 12: if(tval == NULL) { - _uac_req.s_apasswd.len = 0; + _uac_req.s_sock.len = 0; return 0; } if(!(tval->flags & PV_VAL_STR)) {

1 0

[kamailio/kamailio] sslv3 errors showing up with 'tls_method' set as 'TLSv1.2+' (Issue #3085)
by Vinicius K. Ruoso 07 Dec '23

07 Dec '23

### Description Some users are having issues connecting to kamailio websocket using TLS. The logs show SSLv3 errors. Cannot find why that error would show up if SSLv2/3 is not enabled. Double checked it via SSLLabs that only TLSv1.2 is allowed in the service. Any pointers would be appreciated. Also, let me know if more debug information is needed. ### Troubleshooting #### Debugging Data This is the TLS config: ``` modparam("tls", "tls_method", "TLSv1.2+") modparam("tls", "verify_certificate", 0) modparam("tls", "require_certificate", 0) modparam("tls", "low_mem_threshold1", 0) modparam("tls", "low_mem_threshold2", 0) modparam("tls", "private_key", "/etc/certs/tls.key") modparam("tls", "certificate", "/etc/certs/tls.crt") ``` This is the output from tls module in kamcmd: ``` kamcmd> tls.info { max_connections: 2048 opened_connections: 353 clear_text_write_queued_bytes: 0 } kamcmd> tls.options { force_run: 0 method: TLSv1.2+ verify_certificate: 0 verify_depth: 9 require_certificate: 0 private_key: /etc/certs/tls.key ca_list: <null string> certificate: /etc/certs/tls.crt cipher_list: <null string> session_cache: 0 session_id: kamailio-tls-5.x.y config: <null string> log: 3 debug: 3 connection_timeout: 600 disable_compression: 1 ssl_release_buffers: -1 ssl_freelist_max: -1 ssl_max_send_fragment: -1 ssl_read_ahead: 0 send_close_notify: 0 low_mem_threshold1: 0 low_mem_threshold2: 0 ct_wq_max: 10485760 con_ct_wq_max: 65536 ct_wq_blk_size: 4096 } ``` #### Log Messages I see this log messages related to SSLv3: ``` 15(36) ERROR: tls [tls_util.h:42]: tls_err_ret(): TLS accept:error:14094416:SSL routines:ssl3_read_bytes:sslv3 alert certificate unknown 15(36) ERROR: <core> [core/tcp_read.c:1512]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7fafc8768190 r: 0x7fafc8768278 (-1) ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.9 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 ``` * **Operating System**: Debian 9.13. ``` Linux 4.19.112+ #1 SMP Wed Sep 23 07:53:39 PDT 2020 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3085 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3085(a)github.com>

3 5

git:5.7:63e87491: tls: rework init mode 1 to set PTHREAD_PROCESS_SHARED
by Daniel-Constantin Mierla 07 Dec '23

07 Dec '23

Module: kamailio Branch: 5.7 Commit: 63e8749132257ef1f8c8d86ec78f6db2c699f1c8 URL: https://github.com/kamailio/kamailio/commit/63e8749132257ef1f8c8d86ec78f6db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-07T13:32:04+01:00 tls: rework init mode 1 to set PTHREAD_PROCESS_SHARED - pthread mutex set in shm - GH #3635 (cherry picked from commit 4b068f49b618dca5fa85a1687bd9054c1d98ae6a) --- Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/63e8749132257ef1f8c8d86ec78f6db… Patch: https://github.com/kamailio/kamailio/commit/63e8749132257ef1f8c8d86ec78f6db…

1 0

git:master:4b068f49: tls: rework init mode 1 to set PTHREAD_PROCESS_SHARED
by Daniel-Constantin Mierla 07 Dec '23

07 Dec '23

Module: kamailio Branch: master Commit: 4b068f49b618dca5fa85a1687bd9054c1d98ae6a URL: https://github.com/kamailio/kamailio/commit/4b068f49b618dca5fa85a1687bd9054… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-07T13:07:09+01:00 tls: rework init mode 1 to set PTHREAD_PROCESS_SHARED - pthread mutex set in shm - GH #3635 --- Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4b068f49b618dca5fa85a1687bd9054… Patch: https://github.com/kamailio/kamailio/commit/4b068f49b618dca5fa85a1687bd9054…

1 0

git:master:964c21e1: pv_headers: rearrange module parameters
by Victor Seva 07 Dec '23

07 Dec '23

Module: kamailio Branch: master Commit: 964c21e16ab4da96d989c230ea18d95872257394 URL: https://github.com/kamailio/kamailio/commit/964c21e16ab4da96d989c230ea18d95… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-07T12:28:02+01:00 pv_headers: rearrange module parameters * pvh_ prefix for global variables --- Modified: src/modules/pv_headers/pv_headers.c Modified: src/modules/pv_headers/pv_headers.h Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_func.h Modified: src/modules/pv_headers/pvh_hash.c Modified: src/modules/pv_headers/pvh_hash.h Modified: src/modules/pv_headers/pvh_hdr.c Modified: src/modules/pv_headers/pvh_hdr.h Modified: src/modules/pv_headers/pvh_str.c Modified: src/modules/pv_headers/pvh_str.h Modified: src/modules/pv_headers/pvh_xavp.c Modified: src/modules/pv_headers/pvh_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/964c21e16ab4da96d989c230ea18d95… Patch: https://github.com/kamailio/kamailio/commit/964c21e16ab4da96d989c230ea18d95…

1 0

Error during TLS handshake
by Markus Bönke 07 Dec '23

07 Dec '23

Hello ng, I currently face an issue to forward a call via tls to a destination. The check with "openssl client -connect …" to the destination is successful and it returns a valid certificate. However if I forward the call via kamailio I see an TLS error: Alert (Level: Fatal, Description: Unknown CA) I’ve compiled tls module with extra_defs="-DTLS_WR_DEBUG -DTLS_RD_DEBUG“ (with 5.4.9 and 5.5.7) and can see: Dec 7 10:46:40 mbo-debian-vm1 /usr/local/sbin/kamailio[170469]: DEBUG: TLS_TRACE: tls [tls_server.c:1141]: tls_h_read_f(): tls_h_read_f(0xffff898c8a88, 0xffffcc5fe320) tls write on read (WRITE_WANTS_READ): ct_wq_flush()=> 0 (ff=2 ssl_error=1)) Dec 7 10:46:40 mbo-debian-vm1 /usr/local/sbin/kamailio[170469]: DEBUG: TLS_TRACE: tls [tls_server.c:1268]: tls_h_read_f(): tls_h_read_f(0xffff898c8a88, 0xffffcc5fe320) tcpconn_send_unsafe 7 bytes Dec 7 10:46:40 mbo-debian-vm1 /usr/local/sbin/kamailio[170469]: ERROR: tls [tls_server.c:1329]: tls_h_read_f(): protocol level error Dec 7 10:46:40 mbo-debian-vm1 /usr/local/sbin/kamailio[170469]: ERROR: tls [tls_util.h:42]: tls_err_ret(): TLS write:error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed It looks like the error "Unknown CA“ is a subsequent error, but the main problem occurs while reading from the tls connection. I’m currently can also debug the issue in the tls module, is there anything which I can check? Maybe the certificate chain is too long? Thanks and regards Markus

1 0

git:master:890dc5f0: ims_charging: free local structure in case of errors
by Daniel-Constantin Mierla 07 Dec '23

07 Dec '23

Module: kamailio Branch: master Commit: 890dc5f017084481cd2b0f0d759939393fa115bc URL: https://github.com/kamailio/kamailio/commit/890dc5f017084481cd2b0f0d7599393… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-07T08:21:22+01:00 ims_charging: free local structure in case of errors --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/890dc5f017084481cd2b0f0d7599393… Patch: https://github.com/kamailio/kamailio/commit/890dc5f017084481cd2b0f0d7599393… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 6fe14ae3dd7..11c74169293 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -1721,6 +1721,7 @@ static void resume_on_initial_ccr( } Ro_free_CCA(ro_cca_data); + ro_cca_data = NULL; LM_DBG("Freeing CCA message\n"); cdpb.AAAFreeMessage(&cca); @@ -1757,9 +1758,11 @@ static void resume_on_initial_ccr( return; error1: - Ro_free_CCA(ro_cca_data); - error0: + if(ro_cca_data != NULL) { + Ro_free_CCA(ro_cca_data); + } + LM_DBG("Trying to reserve credit on initial INVITE failed on cdp " "callback\n"); // counter_add(ims_charging_cnts_h.active_ro_sessions, -1); /*we bumped active on the original initial ccr sent */

1 0

git:master:8794e509: core: tcp - set type for literals usef for time difference
by Daniel-Constantin Mierla 07 Dec '23

07 Dec '23

Module: kamailio Branch: master Commit: 8794e509b951658e055cc06374c0e2561debdde3 URL: https://github.com/kamailio/kamailio/commit/8794e509b951658e055cc06374c0e25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-07T07:02:42+01:00 core: tcp - set type for literals usef for time difference --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/8794e509b951658e055cc06374c0e25… Patch: https://github.com/kamailio/kamailio/commit/8794e509b951658e055cc06374c0e25… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 3d4a6a4e0b1..4972b7d20af 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -5489,11 +5489,11 @@ void tcp_timer_check_connections(unsigned int ticks, void *param) cidset = 0; if(con->state == S_CONN_OK) { if(con->req.tvrstart.tv_sec > 0) { - tvdiff = 1000000 + tvdiff = 1000000LL * (tvnow.tv_sec - con->req.tvrstart.tv_sec) + (tvnow.tv_usec - con->req.tvrstart.tv_usec); - if(tvdiff >= ksr_tcp_msg_read_timeout * 1000000) { + if(tvdiff >= 1000000LL * ksr_tcp_msg_read_timeout) { LM_DBG("n: %d - connection id: %d - message " "reading timeout: %lld\n", n, con->id, tvdiff);

1 0

Jenkins build is still unstable: kamailiodev-nightly-binaries » amd64,stretch #2546
by kamailio＠sipwise.com 07 Dec '23

07 Dec '23

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

git:master:8ca5d90a: cfgt: rearrange mod parameters
by Victor Seva 06 Dec '23

06 Dec '23

Module: kamailio Branch: master Commit: 8ca5d90a44166bf1a501680b2e01dfbbab5f5b94 URL: https://github.com/kamailio/kamailio/commit/8ca5d90a44166bf1a501680b2e01dfb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-06T13:00:11+01:00 cfgt: rearrange mod parameters * use _cfgt_ prefix for init_flag --- Modified: src/modules/cfgt/cfgt.c Modified: src/modules/cfgt/cfgt.h Modified: src/modules/cfgt/cfgt_int.c Modified: src/modules/cfgt/cfgt_int.h Modified: src/modules/cfgt/cfgt_mod.c Modified: src/modules/cfgt/cfgt_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/8ca5d90a44166bf1a501680b2e01dfb… Patch: https://github.com/kamailio/kamailio/commit/8ca5d90a44166bf1a501680b2e01dfb…

1 0

git:master:b7b3f94f: core: xavp - serialize long long values
by Daniel-Constantin Mierla 06 Dec '23

06 Dec '23

Module: kamailio Branch: master Commit: b7b3f94f949feed3cf9e2e3adf3b4596e6e20eac URL: https://github.com/kamailio/kamailio/commit/b7b3f94f949feed3cf9e2e3adf3b459… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-06T08:48:39+01:00 core: xavp - serialize long long values - they are printed as unsigned values, same as for long values --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/b7b3f94f949feed3cf9e2e3adf3b459… Patch: https://github.com/kamailio/kamailio/commit/b7b3f94f949feed3cf9e2e3adf3b459… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 32d1cef8391..58f3a567611 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1147,24 +1147,35 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) switch(avp->val.type) { case SR_XTYPE_LONG: LM_DBG(" XAVP long int value: %ld\n", avp->val.v.l); - ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s=%lu%s", - pr, avp->name.len, avp->name.s, - (unsigned long)avp->val.v.l, sf); + ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s=%lu%s", pr, + avp->name.len, avp->name.s, (unsigned long)avp->val.v.l, + sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, - olen - rlen); + LM_ERR("failed to serialize long int value (%d/%d\n", + ostr.len, olen - rlen); + return -1; + } + break; + case SR_XTYPE_LLONG: + LM_DBG(" XAVP long long int value: %lld\n", avp->val.v.ll); + ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s=%llu%s", pr, + avp->name.len, avp->name.s, + (unsigned long long)avp->val.v.ll, sf); + if(ostr.len <= 0 || ostr.len >= olen - rlen) { + LM_ERR("failed to serialize long long value (%d/%d\n", + ostr.len, olen - rlen); return -1; } break; case SR_XTYPE_STR: LM_DBG(" XAVP str value: %s\n", avp->val.v.s.s); if(avp->val.v.s.len == 0) { - ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s%s", - pr, avp->name.len, avp->name.s, sf); + ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s%s", pr, + avp->name.len, avp->name.s, sf); } else { - ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s=%s%.*s%s%s", - pr, avp->name.len, avp->name.s, qs, avp->val.v.s.len, - avp->val.v.s.s, qs, sf); + ostr.len = snprintf(ostr.s, olen - rlen, + "%s%.*s=%s%.*s%s%s", pr, avp->name.len, avp->name.s, + qs, avp->val.v.s.len, avp->val.v.s.s, qs, sf); } if(ostr.len <= 0 || ostr.len >= olen - rlen) { LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, @@ -1634,8 +1645,19 @@ int xavu_serialize_fields(str *rname, char *obuf, int olen) avu->name.len, avu->name.s, (unsigned long)avu->val.v.l); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, - olen - rlen); + LM_ERR("failed to serialize long int value (%d/%d\n", + ostr.len, olen - rlen); + return -1; + } + break; + case SR_XTYPE_LLONG: + LM_DBG(" XAVP long long int value: %lld\n", avu->val.v.ll); + ostr.len = snprintf(ostr.s, olen - rlen, "%.*s=%llu;", + avu->name.len, avu->name.s, + (unsigned long long)avu->val.v.ll); + if(ostr.len <= 0 || ostr.len >= olen - rlen) { + LM_ERR("failed to serialize long long value (%d/%d\n", + ostr.len, olen - rlen); return -1; } break; @@ -2597,8 +2619,19 @@ int xavi_serialize_fields(str *rname, char *obuf, int olen) avi->name.len, avi->name.s, (unsigned long)avi->val.v.l); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, - olen - rlen); + LM_ERR("failed to serialize long int value (%d/%d\n", + ostr.len, olen - rlen); + return -1; + } + break; + case SR_XTYPE_LLONG: + LM_DBG(" XAVP long long int value: %lld\n", avi->val.v.ll); + ostr.len = snprintf(ostr.s, olen - rlen, "%.*s=%llu;", + avi->name.len, avi->name.s, + (unsigned long long)avi->val.v.ll); + if(ostr.len <= 0 || ostr.len >= olen - rlen) { + LM_ERR("failed to serialize long long value (%d/%d\n", + ostr.len, olen - rlen); return -1; } break;

1 0

git:master:e0909ab1: topoh: init vars inside th_build_socket_strings()
by Daniel-Constantin Mierla 06 Dec '23

06 Dec '23

Module: kamailio Branch: master Commit: e0909ab1c890b11204dd38b26283cba5fad289c7 URL: https://github.com/kamailio/kamailio/commit/e0909ab1c890b11204dd38b26283cba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-06T08:48:39+01:00 topoh: init vars inside th_build_socket_strings() --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e0909ab1c890b11204dd38b26283cba… Patch: https://github.com/kamailio/kamailio/commit/e0909ab1c890b11204dd38b26283cba… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index d40f70fdd86..02098b1c1b0 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -312,9 +312,9 @@ int th_build_uri_prefix(str *uri_prefix, str *ip) */ int th_build_socket_strings(socket_info_t *socket) { - struct th_socket_strings *socket_strings; - struct str_hash_entry *table_entry; - str *socket_ip; + struct th_socket_strings *socket_strings = NULL; + struct str_hash_entry *table_entry = NULL; + str *socket_ip = NULL; if(str_hash_get( th_socket_hash_table, socket->sockname.s, socket->sockname.len)

1 0

git:master:a096684c: github: devcontainer support force build parameter [skip ci]
by Victor Seva 06 Dec '23

06 Dec '23

Module: kamailio Branch: master Commit: a096684c69bd121ba5e60f682e236f621f0e343b URL: https://github.com/kamailio/kamailio/commit/a096684c69bd121ba5e60f682e236f6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-06T01:57:51+01:00 github: devcontainer support force build parameter [skip ci] --- Modified: .github/workflows/devcontainer.yaml --- Diff: https://github.com/kamailio/kamailio/commit/a096684c69bd121ba5e60f682e236f6… Patch: https://github.com/kamailio/kamailio/commit/a096684c69bd121ba5e60f682e236f6… --- diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml index 3321b4feec4..bfecd095f55 100644 --- a/.github/workflows/devcontainer.yaml +++ b/.github/workflows/devcontainer.yaml @@ -7,6 +7,11 @@ name: build devcontainer image - master # Allows you to run this workflow manually from the Actions tab workflow_dispatch: + inputs: + force: + required: true + type: boolean + default: false env: DIST: bookworm @@ -26,12 +31,14 @@ jobs: run: echo ${{ github.sha }} - name: Get changed files + if: ${{ ! inputs.force }} id: changed-files uses: tj-actions/changed-files@v40 with: since_last_remote_commit: true - name: changes in relevant files + if: ${{ ! inputs.force }} id: changed-files-builder uses: tj-actions/changed-files@v40 with: @@ -40,7 +47,7 @@ jobs: pkg/kamailio/deb/${{ env.DIST }}/** - name: Login to GitHub Container Registry - if: steps.changed-files-builder.outputs.any_changed == 'true' + if: steps.changed-files-builder.outputs.any_changed == 'true' || inputs.force uses: docker/login-action@v3 with: registry: ghcr.io @@ -48,7 +55,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Pre-build dev container image - if: steps.changed-files-builder.outputs.any_changed == 'true' + if: steps.changed-files-builder.outputs.any_changed == 'true' || inputs.force uses: devcontainers/ci(a)v0.3 with: imageName: ghcr.io/${{ github.repository_owner }}/kamailio-${{ github.ref_name }}-devcontainer

1 0

[kamailio/kamailio] phonenum: cannot build on Fedora 39 (Issue #3659)
by sergey-safarov 05 Dec '23

05 Dec '23

``` LD (gcc) [M db_perlvdb.so] db_perlvdb.so CC (gcc) [M phonenum.so] phonenum_mod.o CC (gcc) [M phonenum.so] phonenum_pv.o Compiling cphonenumber.cpp g++ -std=c++11 -fPIC -DPIC -g -funroll-loops -Wcast-align -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing -fPIC -DPIC -g -funroll-loops -Wcast-align -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -DNAME='"kamailio"' -DVERSION='"5.7.2"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 13.2.1"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5007002 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/local/include -DMOD_NAME='"phonenum"' -c cphonenumber.cpp -o cphonenumber.o In file included from /usr/include/absl/base/config.h:86, from /usr/include/absl/base/const_init.h:25, from /usr/include/absl/synchronization/mutex.h:67, from /usr/include/phonenumbers/geocoding/phonenumber_offline_geocoder.h:24, from cphonenumber.cpp:24: /usr/include/absl/base/policy_checks.h:79:2: error: #error "C++ versions less than C++14 are not supported." 79 | #error "C++ versions less than C++14 are not supported." | ^~~~~ In file included from /usr/include/absl/time/time.h:89, from /usr/include/absl/time/clock.h:26, from /usr/include/absl/synchronization/internal/kernel_timeout.h:30, from /usr/include/absl/synchronization/mutex.h:74: /usr/include/absl/strings/string_view.h:52:26: error: ‘string_view’ in namespace ‘std’ does not name a type 52 | using string_view = std::string_view; | ^~~~~~~~~~~ /usr/include/absl/strings/string_view.h:52:21: note: ‘std::string_view’ is only available from C++17 onwards 52 | using string_view = std::string_view; | ^~~ /usr/include/absl/strings/string_view.h:686:8: error: ‘string_view’ does not name a type 686 | inline string_view ClippedSubstr(string_view s, size_t pos, | ^~~~~~~~~~~ /usr/include/absl/strings/string_view.h:697:11: error: ‘string_view’ does not name a type 697 | constexpr string_view NullSafeStringView(const char* p) { | ^~~~~~~~~~~ In file included from /usr/include/absl/time/time.h:90: /usr/include/absl/time/civil_time.h:489:27: error: ‘string_view’ is not a member of ‘absl’ 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:489:53: error: expected primary-expression before ‘*’ token 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^ /usr/include/absl/time/civil_time.h:489:55: error: ‘c’ was not declared in this scope 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^ /usr/include/absl/time/civil_time.h:489:56: error: expression list treated as compound expression in initializer [-fpermissive] 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^ /usr/include/absl/time/civil_time.h:490:6: error: redefinition of ‘bool absl::lts_20230802::ParseCivilTime’ 490 | bool ParseCivilTime(absl::string_view s, CivilMinute* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:489:6: note: ‘bool absl::lts_20230802::ParseCivilTime’ previously defined here 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:490:27: error: ‘string_view’ is not a member of ‘absl’ 490 | bool ParseCivilTime(absl::string_view s, CivilMinute* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:490:53: error: expected primary-expression before ‘*’ token 490 | bool ParseCivilTime(absl::string_view s, CivilMinute* c); | ^ /usr/include/absl/time/civil_time.h:490:55: error: ‘c’ was not declared in this scope 490 | bool ParseCivilTime(absl::string_view s, CivilMinute* c); | ^ /usr/include/absl/time/civil_time.h:491:6: error: redefinition of ‘bool absl::lts_20230802::ParseCivilTime’ 491 | bool ParseCivilTime(absl::string_view s, CivilHour* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:489:6: note: ‘bool absl::lts_20230802::ParseCivilTime’ previously defined here 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:491:27: error: ‘string_view’ is not a member of ‘absl’ 491 | bool ParseCivilTime(absl::string_view s, CivilHour* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:491:51: error: expected primary-expression before ‘*’ token 491 | bool ParseCivilTime(absl::string_view s, CivilHour* c); | ^ /usr/include/absl/time/civil_time.h:491:53: error: ‘c’ was not declared in this scope 491 | bool ParseCivilTime(absl::string_view s, CivilHour* c); | ^ /usr/include/absl/time/civil_time.h:492:6: error: redefinition of ‘bool absl::lts_20230802::ParseCivilTime’ 492 | bool ParseCivilTime(absl::string_view s, CivilDay* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:489:6: note: ‘bool absl::lts_20230802::ParseCivilTime’ previously defined here 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:492:27: error: ‘string_view’ is not a member of ‘absl’ 492 | bool ParseCivilTime(absl::string_view s, CivilDay* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:492:50: error: expected primary-expression before ‘*’ token 492 | bool ParseCivilTime(absl::string_view s, CivilDay* c); | ^ /usr/include/absl/time/civil_time.h:492:52: error: ‘c’ was not declared in this scope 492 | bool ParseCivilTime(absl::string_view s, CivilDay* c); | ^ /usr/include/absl/time/civil_time.h:493:6: error: redefinition of ‘bool absl::lts_20230802::ParseCivilTime’ 493 | bool ParseCivilTime(absl::string_view s, CivilMonth* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:489:6: note: ‘bool absl::lts_20230802::ParseCivilTime’ previously defined here 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:493:27: error: ‘string_view’ is not a member of ‘absl’ 493 | bool ParseCivilTime(absl::string_view s, CivilMonth* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:493:52: error: expected primary-expression before ‘*’ token 493 | bool ParseCivilTime(absl::string_view s, CivilMonth* c); | ^ /usr/include/absl/time/civil_time.h:493:54: error: ‘c’ was not declared in this scope 493 | bool ParseCivilTime(absl::string_view s, CivilMonth* c); | ^ /usr/include/absl/time/civil_time.h:494:6: error: redefinition of ‘bool absl::lts_20230802::ParseCivilTime’ 494 | bool ParseCivilTime(absl::string_view s, CivilYear* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:489:6: note: ‘bool absl::lts_20230802::ParseCivilTime’ previously defined here 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:494:27: error: ‘string_view’ is not a member of ‘absl’ 494 | bool ParseCivilTime(absl::string_view s, CivilYear* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:494:51: error: expected primary-expression before ‘*’ token 494 | bool ParseCivilTime(absl::string_view s, CivilYear* c); | ^ /usr/include/absl/time/civil_time.h:494:53: error: ‘c’ was not declared in this scope 494 | bool ParseCivilTime(absl::string_view s, CivilYear* c); | ^ /usr/include/absl/time/civil_time.h:509:34: error: ‘string_view’ is not a member of ‘absl’ 509 | bool ParseLenientCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:509:60: error: expected primary-expression before ‘*’ token 509 | bool ParseLenientCivilTime(absl::string_view s, CivilSecond* c); | ^ /usr/include/absl/time/civil_time.h:509:62: error: ‘c’ was not declared in this scope 509 | bool ParseLenientCivilTime(absl::string_view s, CivilSecond* c); | ^ /usr/include/absl/time/civil_time.h:509:63: error: expression list treated as compound expression in initializer [-fpermissive] 509 | bool ParseLenientCivilTime(absl::string_view s, CivilSecond* c); | ^ /usr/include/absl/time/civil_time.h:510:6: error: redefinition of ‘bool absl::lts_20230802::ParseLenientCivilTime’ 510 | bool ParseLenientCivilTime(absl::string_view s, CivilMinute* c); | ^~~~~~~~~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:509:6: note: ‘bool absl::lts_20230802::ParseLenientCivilTime’ previously defined here 509 | bool ParseLenientCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:510:34: error: ‘string_view’ is not a member of ‘absl’ 510 | bool ParseLenientCivilTime(absl::string_view s, CivilMinute* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:510:60: error: expected primary-expression before ‘*’ token 510 | bool ParseLenientCivilTime(absl::string_view s, CivilMinute* c); | ^ ``` Full log in the attached file [phonenum-build.log](https://github.com/kamailio/kamailio/files/13489193/pho… -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3659 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3659(a)github.com>

2 4

git:master:6dd5598f: phonenum: Makefile - option to set C standard version
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: 6dd5598fc043fe3d2582e643d7d4ef675c9e6480 URL: https://github.com/kamailio/kamailio/commit/6dd5598fc043fe3d2582e643d7d4ef6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-05T19:30:21+01:00 phonenum: Makefile - option to set C standard version - can be set via option CSTDVER - defaults now to c++17 - GH #3659 --- Modified: src/modules/phonenum/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/6dd5598fc043fe3d2582e643d7d4ef6… Patch: https://github.com/kamailio/kamailio/commit/6dd5598fc043fe3d2582e643d7d4ef6… --- diff --git a/src/modules/phonenum/Makefile b/src/modules/phonenum/Makefile index f465226a974..47780869232 100644 --- a/src/modules/phonenum/Makefile +++ b/src/modules/phonenum/Makefile @@ -7,6 +7,7 @@ NAME=phonenum.so CXX?=g++ LD?=g++ +CSTDVER?="c++17" LIBS+=-L$(LOCALBASE)/lib cphonenumber.o -lphonenumber -lgeocoding DEFS+=-I$(LOCALBASE)/include @@ -18,7 +19,7 @@ include ../../Makefile.modules cphonenumber.o: cphonenumber.cpp cphonenumber.h @echo "Compiling $<" - $(CXX) -std=c++11 $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ + $(CXX) -std=$(CSTDVER) $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ phonenum.so: cphonenumber.o

1 0

git:master:a9e02966: core: remove unnecessary condition on msg
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: a9e02966384cbcdf04aa16feb034b87e524352c9 URL: https://github.com/kamailio/kamailio/commit/a9e02966384cbcdf04aa16feb034b87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-05T15:08:50+01:00 core: remove unnecessary condition on msg - the structure is already used before --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/a9e02966384cbcdf04aa16feb034b87… Patch: https://github.com/kamailio/kamailio/commit/a9e02966384cbcdf04aa16feb034b87… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 51c3477c5ee..52307ce8ad8 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2517,7 +2517,7 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, } /* test and add xavp via reply params */ - if(msg && (msg->msg_flags & FL_ADD_XAVP_VIA_REPLY_PARAMS) + if((msg->msg_flags & FL_ADD_XAVP_VIA_REPLY_PARAMS) && _ksr_xavp_via_reply_params.len > 0) { xparams.s = pv_get_buffer(); xparams.len = xavp_serialize_fields_style(&_ksr_xavp_via_reply_params,

1 0

Updated: Online devel meeting on matrix - 15:00 UTC, Dec 5, 2023
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Hello, we should consider an online devel meeting sometime soon to summarize what was done at (and still needs to be done after) devel meeting in Dusseldorf and plan a bit the targets for next major release (5.8 or 6.0)? If considered useful, I propose Dec 5 at 15:00UTC (16:00 Berlin/Paris/Madrid/Rome), but we can also look for other dates as well. Topics to be discussed can be added at: - https://github.com/kamailio/kamailio-wiki/blob/main/docs/devel/irc-meetings… Pull requests can be made by users without git access. Cheers, Daniel PS: Previous announcement indicated the start time 14:30 UTC, this message changes it to 15:00 UTC - 30min later due to a constraint in availability of one of the Kamailio developers. -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 3

Kamailio + RTPEngine + TURN server to enable calling between WebRTC client and legacy SIP clients
by nguyenquocchinhdev＠gmail.com 05 Dec '23

05 Dec '23

Hi guys, Can anybody explain to me this flow. https://raw.githubusercontent.com/havfo/WEBRTC-to-SIP/master/images/webrtc-… And What will be done in 1,2,3,4,5. When a new connection the request flow is 1,2,3,4,5 order is created. 1: webRTC client -> SIp Server 2: SIP server -> SIP client 3: Kmailio -> RTPengine 4: SIP client -> RTPengine 5: RTPengine -> webRTC client

3 3

git:master:3a02bf42: ims_charging: log message on db updated error
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: 3a02bf42bc182e0eb809e63d8fe828e3ece5f1da URL: https://github.com/kamailio/kamailio/commit/3a02bf42bc182e0eb809e63d8fe828e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-05T12:26:22+01:00 ims_charging: log message on db updated error --- Modified: src/modules/ims_charging/ro_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/3a02bf42bc182e0eb809e63d8fe828e… Patch: https://github.com/kamailio/kamailio/commit/3a02bf42bc182e0eb809e63d8fe828e… --- diff --git a/src/modules/ims_charging/ro_db_handler.c b/src/modules/ims_charging/ro_db_handler.c index 7aaf6fb3a5d..d75126e33bc 100644 --- a/src/modules/ims_charging/ro_db_handler.c +++ b/src/modules/ims_charging/ro_db_handler.c @@ -717,7 +717,9 @@ void ro_update_db(unsigned int ticks, void *param) for(ro_session = ro_session_entry.first; ro_session != NULL; ro_session = ro_session->next) { - update_ro_dbinfo_unsafe(ro_session); + if(update_ro_dbinfo_unsafe(ro_session) != 0) { + LM_ERR("failed to update ro_session in DB\n"); + } } ro_session_unlock(ro_session_table, &ro_session_entry); }

1 0

git:master:4f6a2686: topoh: reorder conditions for safety of cleaning on error
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: 4f6a2686c01a65fe3a23e4d2057c7940eedcf12a URL: https://github.com/kamailio/kamailio/commit/4f6a2686c01a65fe3a23e4d2057c794… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-05T12:20:01+01:00 topoh: reorder conditions for safety of cleaning on error - in the part related to the new th_build_socket_strings() internal function --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4f6a2686c01a65fe3a23e4d2057c794… Patch: https://github.com/kamailio/kamailio/commit/4f6a2686c01a65fe3a23e4d2057c794… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index dbb08d83084..d40f70fdd86 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -357,14 +357,18 @@ int th_build_socket_strings(socket_info_t *socket) return 0; error: - if(socket_strings->ip.s != NULL) - pkg_free(socket_strings->ip.s); - if(table_entry->key.s != NULL) - pkg_free(table_entry->key.s); - if(table_entry != NULL) - pkg_free(table_entry); - if(socket_strings != NULL) + if(socket_strings != NULL) { + if(socket_strings->ip.s != NULL) { + pkg_free(socket_strings->ip.s); + } pkg_free(socket_strings); + } + if(table_entry != NULL) { + if(table_entry->key.s != NULL) { + pkg_free(table_entry->key.s); + } + pkg_free(table_entry); + } return -1; }

1 0

git:master:0d78a1ad: pkg/kamailio/deb: version set 5.8.0~dev2 [skip ci]
by Victor Seva 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: 0d78a1add4292ff1e10347c0199f0d70d31678ea URL: https://github.com/kamailio/kamailio/commit/0d78a1add4292ff1e10347c0199f0d7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-05T12:04:36+01:00 pkg/kamailio/deb: version set 5.8.0~dev2 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/0d78a1add4292ff1e10347c0199f0d7… Patch: https://github.com/kamailio/kamailio/commit/0d78a1add4292ff1e10347c0199f0d7…

1 0

git:master:6305adef: Makefile.defs: version set to 5.8.0-dev2
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: 6305adef50079891386a048b986fd27e9b6e7ca1 URL: https://github.com/kamailio/kamailio/commit/6305adef50079891386a048b986fd27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-05T12:00:00+01:00 Makefile.defs: version set to 5.8.0-dev2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/6305adef50079891386a048b986fd27… Patch: https://github.com/kamailio/kamailio/commit/6305adef50079891386a048b986fd27… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 075ac2041a6..68225943982 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 8 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:ca7e1e49: dialog: prevent duplicate of leg1 attributes in json for dmq
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: ca7e1e49aecd3e0f12cc783e3b97868980f1d3d2 URL: https://github.com/kamailio/kamailio/commit/ca7e1e49aecd3e0f12cc783e3b97868… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-05T10:27:32+01:00 dialog: prevent duplicate of leg1 attributes in json for dmq - reported by #3656 --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/ca7e1e49aecd3e0f12cc783e3b97868… Patch: https://github.com/kamailio/kamailio/commit/ca7e1e49aecd3e0f12cc783e3b97868… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 419fa50a29c..bb8a69cffd6 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -535,6 +535,7 @@ int dlg_dmq_replicate_action(dlg_dmq_action_t action, dlg_cell_t *dlg, &jdoc, jdoc.root, "to_uri", dlg->to_uri.s, dlg->to_uri.len); srjson_AddStrToObject(&jdoc, jdoc.root, "req_uri", dlg->req_uri.s, dlg->req_uri.len); + srjson_AddStrToObject( &jdoc, jdoc.root, "tag1", dlg->tag[0].s, dlg->tag[0].len); srjson_AddStrToObject(&jdoc, jdoc.root, "cseq1", dlg->cseq[0].s, @@ -578,14 +579,16 @@ int dlg_dmq_replicate_action(dlg_dmq_action_t action, dlg_cell_t *dlg, srjson_AddNumberToObject( &jdoc, jdoc.root, "lifetime", dlg->lifetime); - srjson_AddStrToObject(&jdoc, jdoc.root, "tag1", - dlg->tag[0].s, dlg->tag[0].len); - srjson_AddStrToObject(&jdoc, jdoc.root, "cseq1", - dlg->cseq[0].s, dlg->cseq[0].len); - srjson_AddStrToObject(&jdoc, jdoc.root, "route_set1", - dlg->route_set[0].s, dlg->route_set[0].len); - srjson_AddStrToObject(&jdoc, jdoc.root, "contact1", - dlg->contact[0].s, dlg->contact[0].len); + if(action != DLG_DMQ_UPDATE) { + srjson_AddStrToObject(&jdoc, jdoc.root, "tag1", + dlg->tag[0].s, dlg->tag[0].len); + srjson_AddStrToObject(&jdoc, jdoc.root, "cseq1", + dlg->cseq[0].s, dlg->cseq[0].len); + srjson_AddStrToObject(&jdoc, jdoc.root, "route_set1", + dlg->route_set[0].s, dlg->route_set[0].len); + srjson_AddStrToObject(&jdoc, jdoc.root, "contact1", + dlg->contact[0].s, dlg->contact[0].len); + } break; case DLG_STATE_CONFIRMED: srjson_AddNumberToObject( @@ -593,23 +596,24 @@ int dlg_dmq_replicate_action(dlg_dmq_action_t action, dlg_cell_t *dlg, srjson_AddNumberToObject( &jdoc, jdoc.root, "lifetime", dlg->lifetime); - srjson_AddStrToObject(&jdoc, jdoc.root, "tag1", - dlg->tag[0].s, dlg->tag[0].len); + if(action != DLG_DMQ_UPDATE) { + srjson_AddStrToObject(&jdoc, jdoc.root, "tag1", + dlg->tag[0].s, dlg->tag[0].len); + srjson_AddStrToObject(&jdoc, jdoc.root, "cseq1", + dlg->cseq[0].s, dlg->cseq[0].len); + srjson_AddStrToObject(&jdoc, jdoc.root, "route_set1", + dlg->route_set[0].s, dlg->route_set[0].len); + srjson_AddStrToObject(&jdoc, jdoc.root, "contact1", + dlg->contact[0].s, dlg->contact[0].len); + } srjson_AddStrToObject(&jdoc, jdoc.root, "tag2", dlg->tag[1].s, dlg->tag[1].len); - srjson_AddStrToObject(&jdoc, jdoc.root, "cseq1", - dlg->cseq[0].s, dlg->cseq[0].len); srjson_AddStrToObject(&jdoc, jdoc.root, "cseq2", dlg->cseq[1].s, dlg->cseq[1].len); - srjson_AddStrToObject(&jdoc, jdoc.root, "route_set1", - dlg->route_set[0].s, dlg->route_set[0].len); srjson_AddStrToObject(&jdoc, jdoc.root, "route_set2", dlg->route_set[1].s, dlg->route_set[1].len); - srjson_AddStrToObject(&jdoc, jdoc.root, "contact1", - dlg->contact[0].s, dlg->contact[0].len); srjson_AddStrToObject(&jdoc, jdoc.root, "contact2", dlg->contact[1].s, dlg->contact[1].len); - break; case DLG_STATE_DELETED: //dlg->iflags &= ~DLG_IFLAG_DMQ_SYNC;

1 0

Jenkins build is still unstable: kamailiodev-nightly-binaries » amd64,stretch #2544
by kamailio＠sipwise.com 05 Dec '23

05 Dec '23

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

git:master:2f98aaca: ims_ipsec_pcscf: declare vars at beginning of the block
by Daniel-Constantin Mierla 04 Dec '23

04 Dec '23

Module: kamailio Branch: master Commit: 2f98aaca9e4b71b8086abce4c2b41c215fb2a26f URL: https://github.com/kamailio/kamailio/commit/2f98aaca9e4b71b8086abce4c2b41c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-04T20:33:40+01:00 ims_ipsec_pcscf: declare vars at beginning of the block --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/2f98aaca9e4b71b8086abce4c2b41c2… Patch: https://github.com/kamailio/kamailio/commit/2f98aaca9e4b71b8086abce4c2b41c2… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 80a714559ba..de61ad7cf6b 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -806,6 +806,10 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) struct pcontact_info ci; int ret = IPSEC_CMD_FAIL; // FAIL by default tm_cell_t *t = NULL; + sip_msg_t *req = NULL; + security_t *req_sec_params = NULL; + ipsec_t *s = NULL; + ipsec_t *old_s = NULL; if(m->first_line.type == SIP_REPLY) { t = tmb.t_gett(); @@ -847,12 +851,10 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) goto cleanup; } - struct sip_msg *req = t->uas.request; + req = t->uas.request; // Parse security parameters from the REGISTER request and get some data for the new tunnels - security_t *req_sec_params = cscf_get_security(req); - ipsec_t *s; - ipsec_t *old_s = NULL; + req_sec_params = cscf_get_security(req); // Update contacts only for initial registration, for re-registration the existing contacts shouldn't be updated. if(ci.via_port == SIP_PORT

1 0

git:master:812df264: ims_ipsec_pcscf: handle IPSec registration case where first SIP REGISTER does not have VIA port as 5060
by Daniel-Constantin Mierla 04 Dec '23

04 Dec '23

Module: kamailio Branch: master Commit: 812df26470b50d626ce9ee03b9272373b231ce2a URL: https://github.com/kamailio/kamailio/commit/812df26470b50d626ce9ee03b927237… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-04T20:29:40+01:00 ims_ipsec_pcscf: handle IPSec registration case where first SIP REGISTER does not have VIA port as 5060 --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/812df26470b50d626ce9ee03b927237… Patch: https://github.com/kamailio/kamailio/commit/812df26470b50d626ce9ee03b927237… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index c863eff5407..80a714559ba 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -855,7 +855,9 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) ipsec_t *old_s = NULL; // Update contacts only for initial registration, for re-registration the existing contacts shouldn't be updated. - if(ci.via_port == SIP_PORT) { + if(ci.via_port == SIP_PORT + || (pcontact->security_temp->data.ipsec->port_ps == 0 + && pcontact->security_temp->data.ipsec->port_pc == 0)) { LM_DBG("Registration for contact with AOR [%.*s], VIA [%d://%.*s:%d], " "received_host [%d://%.*s:%d]\n", ci.aor.len, ci.aor.s, ci.via_prot, ci.via_host.len,

1 0

[kamailio/kamailio] Hi, could you provide me with a .cfg demo for using SEMS as Announcements in the IMS module? (Issue #3662)
by Helloworld1668 04 Dec '23

04 Dec '23

Hello Kamailio team, I am an enthusiast of the Kamailio project, interested in an IMS project. I am working on integrating Kamailio with SEMS and am keen to utilize SEMS's Announcements (Prompts, Ringbacktones, Pre-call-prompts) feature. However, in the current project's PCSCF module, SEMS is being used as an SBC. Could you possibly provide some .cfg demos for using SEMS specifically for Announcements? I would greatly appreciate your assistance. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3662 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3662(a)github.com>

2 2

[kamailio/kamailio] [Textops] replace_body_all does not apply for SDP which process from RTPEngine (Issue #3661)
by Jakihiko 01 Dec '23

01 Dec '23

the function replace_body_all place after rtpengine_offer(), I expect that it will change the SDP however actually It does not. pseudo code like: ``` rtpengine_offer(); replace_body_all("Asterisk", "NipponMedia"); ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3661 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3661(a)github.com>

3 3

git:master:9cb6dae1: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 01 Dec '23

01 Dec '23

Module: kamailio Branch: master Commit: 9cb6dae183c7295a3c9753a2747f6b3d92c3ffe8 URL: https://github.com/kamailio/kamailio/commit/9cb6dae183c7295a3c9753a2747f6b3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-12-01T13:46:54+01:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/9cb6dae183c7295a3c9753a2747f6b3… Patch: https://github.com/kamailio/kamailio/commit/9cb6dae183c7295a3c9753a2747f6b3… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index 3df520e95d1..8dd070ffe7d 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -321,6 +321,10 @@ ipsec_create("location", "1"); requests. + 0x80 (128) - set transport parameter in the new dst uri for TCP requests. + + 0x100 (256) - use Via attributes (port and protocol) for + routing UDP reply. + + 0x200 (512) - try TCP if corresponding UDP socket is not + found. This is an optional parameter, default value - 0. Example 1.12. ipsec_forward

1 0

git:master:c39cdcbf: ims_ipsec_pcscf: docs updated for ipsec_forward()
by Daniel-Constantin Mierla 01 Dec '23

01 Dec '23

Module: kamailio Branch: master Commit: c39cdcbf0d8a17bc8fc03656faeb80fe231c3499 URL: https://github.com/kamailio/kamailio/commit/c39cdcbf0d8a17bc8fc03656faeb80f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-01T13:43:25+01:00 ims_ipsec_pcscf: docs updated for ipsec_forward() --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c39cdcbf0d8a17bc8fc03656faeb80f… Patch: https://github.com/kamailio/kamailio/commit/c39cdcbf0d8a17bc8fc03656faeb80f… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index 24d77440d89..ff65668e6e1 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -324,6 +324,16 @@ ipsec_create("location", "1"); <emphasis>0x80</emphasis> (128) - set transport parameter in the new dst uri for TCP requests. </para> </listitem> + <listitem> + <para> + <emphasis>0x100</emphasis> (256) - use Via attributes (port and protocol) for routing UDP reply. + </para> + </listitem> + <listitem> + <para> + <emphasis>0x200</emphasis> (512) - try TCP if corresponding UDP socket is not found. + </para> + </listitem> </itemizedlist> </para> <para>

1 0

git:master:d2b5f34e: ims_ipsec_pcscf: options for ipsec_forward() to use Via or try TCP
by Daniel-Constantin Mierla 01 Dec '23

01 Dec '23

Module: kamailio Branch: master Commit: d2b5f34e36e862c6485294f54c87e7184faf00b0 URL: https://github.com/kamailio/kamailio/commit/d2b5f34e36e862c6485294f54c87e71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-01T13:34:00+01:00 ims_ipsec_pcscf: options for ipsec_forward() to use Via or try TCP - option to use Via attributes for routing reply - option to try over TCP if correxponding UDP socket is not found Co-authored-by: Supreeth Herle <herlesupreeth(a)gmail.com> --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/d2b5f34e36e862c6485294f54c87e71… Patch: https://github.com/kamailio/kamailio/commit/d2b5f34e36e862c6485294f54c87e71…

1 0

[kamailio/kamailio] Kamailio Fails to Release Connected WebSocket TCP Connections (Issue #3589)
by pklinus 01 Dec '23

01 Dec '23

### Description  Kamailio does not properly release connected WebSocket TCP connections, leading to a situation where the maximum number of allowable connections is reached and new connection requests are rejected. ### Troubleshooting When examining the logs, we identified an issue where Kamailio is failing to release connected WebSocket TCP connections, causing a backlog of TIME_WAIT connections. The logs show a warning message indicating that the maximum number of allowable sockets per IP has been reached, leading to the rejection of further WebSocket requests. #### Reproduction Establish WebSocket connections with Kamailio. Monitor the number of TIME_WAIT connections using netstat. Observe the warning message in Kamailio logs when the maximum allowable sockets per IP are reached.  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` 2023-10-03T13:19:33.699043+00:00 apps001 kamailio[23781]: WARNING: |<null>|websockets-role.cfg:224 (websocket_request) 223.233.86.93 is at the maximum 50 allowable sockets per IP, rejecting request for another websocket netstat -punta | grep 223.233.86.93 | grep 5065 tcp 0 0 45.79.166.214:5065 223.233.86.93:52158 TIME_WAIT - tcp 0 0 45.79.166.214:5065 223.233.86.93:52195 TIME_WAIT - tcp 0 0 45.79.166.214:5065 223.233.86.93:52292 TIME_WAIT - tcp 0 0 45.79.166.214:5065 223.233.86.93:52248 TIME_WAIT - tcp 0 0 45.79.166.214:5065 223.233.86.93:52108 TIME_WAIT - tcp 0 0 45.79.166.214:5065 223.233.86.93:52071 TIME_WAIT - ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  restarting kamailio solves the problem. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 14:39:54 Sep 27 2023 with gcc 7.3.1 ``` * **Operating System**:  ``` CentOS Linux release 7.9.2009 (Core) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3589 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3589(a)github.com>

3 3

git:master:580915ba: ims_ipsec_pcscf: reparse request buffer to get contact when handling reply
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 580915bade64db034a2ee25c616addc38220c183 URL: https://github.com/kamailio/kamailio/commit/580915bade64db034a2ee25c616addc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T21:01:45+01:00 ims_ipsec_pcscf: reparse request buffer to get contact when handling reply - clone aor in pkg to store the value - trim aor value when the parameters start Co-authored-by: Supreeth Herle <herlesupreeth(a)gmail.com> --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/580915bade64db034a2ee25c616addc… Patch: https://github.com/kamailio/kamailio/commit/580915bade64db034a2ee25c616addc…

1 0

git:master:57794cd1: ims_ipsec_pcscf: fill_contact() check for port size in alias
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 57794cd14205a16ed6c649fadb4efffca1561986 URL: https://github.com/kamailio/kamailio/commit/57794cd14205a16ed6c649fadb4efff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T19:01:52+01:00 ims_ipsec_pcscf: fill_contact() check for port size in alias --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/57794cd14205a16ed6c649fadb4efff… Patch: https://github.com/kamailio/kamailio/commit/57794cd14205a16ed6c649fadb4efff… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 906fc3eec53..164ded5e2c1 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -238,7 +238,7 @@ static int fill_contact( } if(alias_start != NULL && *(alias_start - 1) == ';') { char *p, *port_s, *proto_s; - char portbuf[5]; + char portbuf[6]; str alias_s; LM_DBG("contact has an alias [%.*s] - use that as the received\n", @@ -267,12 +267,16 @@ static int fill_contact( port_s = p + 1; p = _strnistr(port_s, "~", alias_s.len - ci->received_host.len); if(p != NULL) { - memset(portbuf, 0, 5); + if((p - port_s)>5) { + LM_ERR("invalid port value\n"); + return -1; + } + memset(portbuf, 0, 6); memcpy(portbuf, port_s, (p - port_s)); ci->received_port = atoi(portbuf); proto_s = p + 1; - memset(portbuf, 0, 5); + memset(portbuf, 0, 6); memcpy(portbuf, proto_s, 1); ci->received_proto = atoi(portbuf);

1 0

[kamailio/kamailio] jansson_get not work when the key contain dot [.] charater (Issue #3658)
by Jakihiko 30 Nov '23

30 Nov '23

Hi, I have sample json data as below: $var(mapjson) = {"1.1.1.1": "cloudflare", "2.2.2.2": "ANY"}; I add this line to kamailio script but it does NOT work, jansson_get("1.1.1.1", "$var(mapjson) ", “$var(domain)“); or jansson_get("1\.1\.1\.1", "$var(mapjson) ", “$var(domain)“); Seem kamailio thinks it is a **path** not **a single key**? Thanks -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3658 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3658(a)github.com>

2 3

git:master:2dc4a429: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 2dc4a4297b0c9e6a693a82f0fe95df4d1572d7df URL: https://github.com/kamailio/kamailio/commit/2dc4a4297b0c9e6a693a82f0fe95df4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-30T11:16:57+01:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README Modified: src/modules/ims_qos/README Modified: src/modules/ims_registrar_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/2dc4a4297b0c9e6a693a82f0fe95df4… Patch: https://github.com/kamailio/kamailio/commit/2dc4a4297b0c9e6a693a82f0fe95df4…

1 0

git:master:e4b4b95c: ims_ipsec_pcscf: add q value to Security-Server header for IPSec
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: e4b4b95c8933796b2cf8d5ad478e66347aa8ebf0 URL: https://github.com/kamailio/kamailio/commit/e4b4b95c8933796b2cf8d5ad478e663… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_ipsec_pcscf: add q value to Security-Server header for IPSec --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/e4b4b95c8933796b2cf8d5ad478e663… Patch: https://github.com/kamailio/kamailio/commit/e4b4b95c8933796b2cf8d5ad478e663… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 594d442710f..906fc3eec53 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -724,7 +724,7 @@ int add_security_server_header(struct sip_msg *m, ipsec_t *s) memset(sec_hdr_buf, 0, sizeof(sec_hdr_buf)); sec_header->len = snprintf(sec_hdr_buf, sizeof(sec_hdr_buf) - 1, "Security-Server: " - "ipsec-3gpp;prot=esp;mod=trans;spi-c=%d;spi-s=%d;port-c=%d;port-s=%" + "ipsec-3gpp;q=0.1;prot=esp;mod=trans;spi-c=%d;spi-s=%d;port-c=%d;port-s=%" "d;alg=%.*s;ealg=%.*s\r\n", s->spi_pc, s->spi_ps, s->port_pc, s->port_ps, s->r_alg.len, s->r_alg.s, s->r_ealg.len, s->r_ealg.s);

1 0

git:master:bb35e0aa: ims_ipsec_pcscf: cope better with some broken In-Dialog routing
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: bb35e0aa112f9c60779692c67f42b6ef2cb1b0c2 URL: https://github.com/kamailio/kamailio/commit/bb35e0aa112f9c60779692c67f42b6e… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_ipsec_pcscf: cope better with some broken In-Dialog routing --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/bb35e0aa112f9c60779692c67f42b6e… Patch: https://github.com/kamailio/kamailio/commit/bb35e0aa112f9c60779692c67f42b6e… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index dca5784c8a0..594d442710f 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -501,6 +501,35 @@ static int create_ipsec_tunnel(const struct ip_addr *remote_addr, ipsec_t *s) add_policy(sock, remote_addr, ipsec_addr, s->port_us, s->port_pc, s->spi_pc, IPSEC_POLICY_DIRECTION_IN); + /* cope with some broken In-Dialog routing */ + // SA5 UE client to P-CSCF client + // src adrr dst addr src port dst port + add_sa(sock, remote_addr, ipsec_addr, s->port_uc, s->port_pc, s->spi_ps, + s->ck, s->ik, s->r_alg, s->r_ealg); + add_policy(sock, remote_addr, ipsec_addr, s->port_uc, s->port_pc, s->spi_ps, + IPSEC_POLICY_DIRECTION_IN); + + // SA6 P-CSCF client to UE client + // src adrr dst addr src port dst port + add_sa(sock, ipsec_addr, remote_addr, s->port_pc, s->port_uc, s->spi_us, + s->ck, s->ik, s->r_alg, s->r_ealg); + add_policy(sock, ipsec_addr, remote_addr, s->port_pc, s->port_uc, s->spi_us, + IPSEC_POLICY_DIRECTION_OUT); + + // SA7 P-CSCF server to UE server + // src adrr dst addr src port dst port + add_sa(sock, ipsec_addr, remote_addr, s->port_ps, s->port_us, s->spi_uc, + s->ck, s->ik, s->r_alg, s->r_ealg); + add_policy(sock, ipsec_addr, remote_addr, s->port_ps, s->port_us, s->spi_uc, + IPSEC_POLICY_DIRECTION_OUT); + + // SA8 UE server to P-CSCF server + // src adrr dst addr src port dst port + add_sa(sock, remote_addr, ipsec_addr, s->port_us, s->port_ps, s->spi_pc, + s->ck, s->ik, s->r_alg, s->r_ealg); + add_policy(sock, remote_addr, ipsec_addr, s->port_us, s->port_ps, s->spi_pc, + IPSEC_POLICY_DIRECTION_IN); + close_mnl_socket(sock); return 0; @@ -562,6 +591,31 @@ static int destroy_ipsec_tunnel( remove_policy(sock, remote_addr, ipsec_addr, s->port_us, s->port_pc, s->spi_pc, ip_addr.af, IPSEC_POLICY_DIRECTION_IN); + /* cope with some broken In-Dialog routing */ + // SA5 UE client to P-CSCF client + remove_sa(sock, remote_addr, ipsec_addr, s->port_uc, s->port_pc, s->spi_ps, + ip_addr.af); + remove_policy(sock, remote_addr, ipsec_addr, s->port_uc, s->port_pc, + s->spi_ps, ip_addr.af, IPSEC_POLICY_DIRECTION_IN); + + // SA6 P-CSCF client to UE client + remove_sa(sock, ipsec_addr, remote_addr, s->port_pc, s->port_uc, s->spi_us, + ip_addr.af); + remove_policy(sock, ipsec_addr, remote_addr, s->port_pc, s->port_uc, + s->spi_us, ip_addr.af, IPSEC_POLICY_DIRECTION_OUT); + + // SA7 P-CSCF server to UE server + remove_sa(sock, ipsec_addr, remote_addr, s->port_ps, s->port_us, s->spi_uc, + ip_addr.af); + remove_policy(sock, ipsec_addr, remote_addr, s->port_ps, s->port_us, + s->spi_uc, ip_addr.af, IPSEC_POLICY_DIRECTION_OUT); + + // SA8 UE server to P-CSCF server + remove_sa(sock, remote_addr, ipsec_addr, s->port_us, s->port_ps, s->spi_pc, + ip_addr.af); + remove_policy(sock, remote_addr, ipsec_addr, s->port_us, s->port_ps, + s->spi_pc, ip_addr.af, IPSEC_POLICY_DIRECTION_IN); + // Release SPIs release_spi(s->spi_pc, s->spi_ps, s->port_pc, s->port_ps);

1 0

git:master:006cca91: ims_ipsec_pcscf: docs for ipsec_destroy_by_contact()
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 006cca915275f8ca3ea52a9d978961e0842f1dcd URL: https://github.com/kamailio/kamailio/commit/006cca915275f8ca3ea52a9d978961e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_ipsec_pcscf: docs for ipsec_destroy_by_contact() --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/006cca915275f8ca3ea52a9d978961e… Patch: https://github.com/kamailio/kamailio/commit/006cca915275f8ca3ea52a9d978961e… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index d50c66ed45a..24d77440d89 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -367,6 +367,40 @@ ipsec_forward("location", "1"); <programlisting format="linespecific"> ... ipsec_destroy("location"); +... + </programlisting> + </example> + </section> + <section> + <title><function moreinfo="none">ipsec_destroy_by_contact(domain, aor, recv_host, recv_port)</function></title> + <para>The function destroys IPSec tunnel, created with ipsec_create.</para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>domain</emphasis> - Logical domain within the registrar. + If a database is used then this must be name of the table which + stores the contacts. + </para> + <para> + <emphasis>aor</emphasis> - SIP URI to match the record. + </para> + <para> + <emphasis>recv_host</emphasis> - received host to match the record. + </para> + <para> + <emphasis>recv_port</emphasis> - received port to match the record. + </para> + </listitem> + </itemizedlist> + <para>The last three parameters have to be string valies and can contain + variables.</para> + <example> + <title>ipsec_destroy_by_contact()</title> + + <programlisting format="linespecific"> +... +ipsec_destroy_by_contact("location", "...", "...", "..."); ... </programlisting> </example>

1 0

git:master:0a6e742e: ims_ipsec_pcscf: use core fixup helper functions
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 0a6e742e7d189dbf1bc2a61cdb638458b49873f4 URL: https://github.com/kamailio/kamailio/commit/0a6e742e7d189dbf1bc2a61cdb63845… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_ipsec_pcscf: use core fixup helper functions - remove unused parameter for w_destroy_by_contact() --- Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0a6e742e7d189dbf1bc2a61cdb63845… Patch: https://github.com/kamailio/kamailio/commit/0a6e742e7d189dbf1bc2a61cdb63845… --- diff --git a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c index 8ab2d584643..223f8d1aab1 100644 --- a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c +++ b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c @@ -59,7 +59,7 @@ static int w_create(struct sip_msg *_m, char *_d, char *_cflags); static int w_forward(struct sip_msg *_m, char *_d, char *_cflags); static int w_destroy(struct sip_msg *_m, char *_d, char *_aor); static int w_destroy_by_contact(struct sip_msg *_m, char *_d, char *_aor, - char *_received_host, char *_received_port, char *_cflags); + char *_received_host, char *_received_port); /*! \brief Fixup functions */ static int domain_fixup(void **param, int param_no); @@ -90,7 +90,8 @@ static cmd_export_t cmds[] = { 0, REQUEST_ROUTE | ONREPLY_ROUTE }, {"ipsec_destroy", (cmd_function)w_destroy, 2, unregister_fixup, 0, ANY_ROUTE }, - {"ipsec_destroy_by_contact", (cmd_function)w_destroy_by_contact, 4, unregister2_fixup, 0, ANY_ROUTE}, + {"ipsec_destroy_by_contact", (cmd_function)w_destroy_by_contact, 4, + unregister2_fixup, 0, ANY_ROUTE}, {"bind_ims_ipsec_pcscf", (cmd_function)bind_ipsec_pcscf, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -474,26 +475,8 @@ static int unregister2_fixup(void **param, int param_no) if(param_no == 1) { return domain_fixup(param, param_no); } else { - pv_elem_t *model = NULL; - str s; - - /* convert to str */ - s.s = (char *)*param; - s.len = strlen(s.s); - - model = NULL; - if(s.len == 0) { - LM_ERR("no param!\n"); - return E_CFG; - } - if(pv_parse_format(&s, &model) < 0 || model == NULL) { - LM_ERR("wrong format [%s]!\n", s.s); - return E_CFG; - } - *param = (void *)model; - return 0; + return fixup_spve_all(param, param_no); } - return E_CFG; } /*! \brief @@ -532,9 +515,8 @@ static int w_destroy(struct sip_msg *_m, char *_d, char *_aor) } static int w_destroy_by_contact(struct sip_msg *_m, char *_d, char *_aor, - char *_received_host, char *_received_port, char *_cflags) + char *_received_host, char *_received_port) { - pv_elem_t *model; str aor; str received_host; str received_port; @@ -545,25 +527,21 @@ static int w_destroy_by_contact(struct sip_msg *_m, char *_d, char *_aor, return -1; } - model = (pv_elem_t *)_aor; - if(pv_printf_s(_m, model, &aor) < 0) { - LM_ERR("error - cannot print the format\n"); + if(fixup_get_svalue(_m, (gparam_t *)_aor, &aor) < 0) { + LM_ERR("failed to get aor parameter\n"); return -1; } - LM_DBG("URI: %.*s\n", aor.len, aor.s); - - model = (pv_elem_t *)_received_host; - if(pv_printf_s(_m, model, &received_host) < 0) { - LM_ERR("error - cannot print the format\n"); + if(fixup_get_svalue(_m, (gparam_t *)_received_host, &received_host) < 0) { + LM_ERR("failed to get received host parameter\n"); return -1; } - LM_DBG("Received-Host: %.*s\n", received_host.len, received_host.s); - - model = (pv_elem_t *)_received_port; - if(pv_printf_s(_m, model, &received_port) < 0) { - LM_ERR("error - cannot print the format\n"); + if(fixup_get_svalue(_m, (gparam_t *)_received_port, &received_port) < 0) { + LM_ERR("failed to get received host parameter\n"); return -1; } + + LM_DBG("URI: %.*s\n", aor.len, aor.s); + LM_DBG("Received-Host: %.*s\n", received_host.len, received_host.s); LM_DBG("Received-Port: %.*s\n", received_port.len, received_port.s); if(str2sint(&received_port, &port) != 0) { LM_ERR("error - cannot convert %.*s to an int!\n", received_port.len,

1 0

git:master:279454ff: ims_ipsec_pcscf: new function to destroy IPSec based on Contact and received IP and port
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 279454ff8d4e5804d92a8690c4de3a507efbc44f URL: https://github.com/kamailio/kamailio/commit/279454ff8d4e5804d92a8690c4de3a5… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_ipsec_pcscf: new function to destroy IPSec based on Contact and received IP and port - the default ipsec_destroy() cannot be used to used destroy IPSec in any route and needed to be used exactly after all the de-registration process was complete. But, as per the kamailio P-CSCF config script, ipsec_destroy() was used in reply route of NATPING, which didn't have any idea about SIP Register message used for de-registration. Thus, resulting in IPSec not being destroyed even after de-registration was complete. - the newly introduced function ipsec_destroy_by_contact() takes domain, contact, received host and received port in order to determine the exact UE's IPSec tunnel to destroy. --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/cmd.h Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/279454ff8d4e5804d92a8690c4de3a5… Patch: https://github.com/kamailio/kamailio/commit/279454ff8d4e5804d92a8690c4de3a5…

1 0

git:master:c10d50e1: cdp: fix for CER not containing Host-IP-Address AVP
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: c10d50e10bc5f2c3f6a73dc685f631b3367f2481 URL: https://github.com/kamailio/kamailio/commit/c10d50e10bc5f2c3f6a73dc685f631b… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 cdp: fix for CER not containing Host-IP-Address AVP --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/c10d50e10bc5f2c3f6a73dc685f631b… Patch: https://github.com/kamailio/kamailio/commit/c10d50e10bc5f2c3f6a73dc685f631b… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 74d119b70f2..0732822e0fa 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -132,8 +132,10 @@ int sm_process( case Wait_Conn_Ack: switch(event) { case I_Rcv_Conn_Ack: - I_Snd_CER(p); p->state = Wait_I_CEA; + I_Snd_CER(p); + if (p->state == Closed) + sm_process(p, Start, 0, 1, 0); break; case I_Rcv_Conn_NAck: Cleanup(p, p->I_sock); @@ -656,6 +658,7 @@ void I_Snd_CER(peer *p) } addr_u; socklen_t addrlen; char x[18]; + int ret = 0; cer = AAANewMessage(Code_CE, 0, 0, 0); if(!cer) @@ -663,10 +666,16 @@ void I_Snd_CER(peer *p) cer->hopbyhopId = next_hopbyhop(); cer->endtoendId = next_endtoend(); addrlen = sizeof(addr_u); - if(getsockname(p->I_sock, &(addr_u.addr), &addrlen) == -1) { + if((ret = getsockname(p->I_sock, &(addr_u.addr), &addrlen)) == -1) { LM_ERR("I_Snd_CER(): Error on finding local host address > %s\n", strerror(errno)); - } else { + Cleanup(p,p->I_sock); + p->state = Closed; + AAAFreeMessage(&cer); + return; + } + + if (ret != -1) { switch(addr_u.addr.sa_family) { case AF_INET: set_2bytes(x, 1);

1 0

git:master:663be945: ims_qos: docs for dialog_direction parameter
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 663be945f41d026c1a16f498544a12e2fb58c53c URL: https://github.com/kamailio/kamailio/commit/663be945f41d026c1a16f498544a12e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_qos: docs for dialog_direction parameter --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/663be945f41d026c1a16f498544a12e… Patch: https://github.com/kamailio/kamailio/commit/663be945f41d026c1a16f498544a12e… --- diff --git a/src/modules/ims_qos/doc/ims_qos_admin.xml b/src/modules/ims_qos/doc/ims_qos_admin.xml index 302e492b886..bbc75a1f1f0 100644 --- a/src/modules/ims_qos/doc/ims_qos_admin.xml +++ b/src/modules/ims_qos/doc/ims_qos_admin.xml @@ -553,6 +553,28 @@ modparam("ims_qos", "suspend_transaction", 0) <programlisting format="linespecific"> ... modparam("ims_qos", "recv_mode", 1) +... + </programlisting> + </example> + </section> + + <section> + <title><varname>dialog_direction</varname> integer</title> + + <para>If set to 1, DLG_MOBILE_ORIGINATING is set to + rx_add_media_component_description_avp() instead of DLG_MOBILE_REGISTER + (which corresponds to value 3). + </para> + + <para><emphasis> Default value is 3</emphasis></para> + + <example> + <title><varname>dialog_direction</varname> parameter + usage</title> + + <programlisting format="linespecific"> +... +modparam("ims_qos", "dialog_direction", 1) ... </programlisting> </example>

1 0

git:master:adbb2bc9: ims_qos: option to set DLG_MOBILE_ORIGINATING for rx_add_media_component_description_avp()
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: adbb2bc992d1582aece9d075da6329e0643fb5e3 URL: https://github.com/kamailio/kamailio/commit/adbb2bc992d1582aece9d075da6329e… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_qos: option to set DLG_MOBILE_ORIGINATING for rx_add_media_component_description_avp() - alternative to DLG_MOBILE_REGISTER that can be set with mod param dialog_direction --- Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/ims_qos_mod.h Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/adbb2bc992d1582aece9d075da6329e… Patch: https://github.com/kamailio/kamailio/commit/adbb2bc992d1582aece9d075da6329e… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index eaa323dcd5b..428a898df40 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -166,7 +166,8 @@ int omit_flow_ports = 0; int rs_default_bandwidth = 0; int rr_default_bandwidth = 0; -ims_qos_params_t _imsqos_params = {.recv_mode = 0}; +ims_qos_params_t _imsqos_params = { + .recv_mode = 0, .dlg_direction = DLG_MOBILE_REGISTER}; /* commands wrappers and fixups */ static int w_rx_aar(struct sip_msg *msg, char *route, char *dir, char *id, @@ -255,7 +256,9 @@ static param_export_t params[] = {{"rx_dest_realm", PARAM_STR, &rx_dest_realm}, &regex_sdp_ip_prefix_to_maintain_in_fd}, {"include_rtcp_fd", INT_PARAM, &include_rtcp_fd}, {"suspend_transaction", INT_PARAM, &_ims_qos_suspend_transaction}, - {"recv_mode", PARAM_INT, &_imsqos_params.recv_mode}, {0, 0, 0}}; + {"recv_mode", PARAM_INT, &_imsqos_params.recv_mode}, + {"dialog_direction", PARAM_INT, &_imsqos_params.dlg_direction}, + {0, 0, 0}}; /** module exports */ @@ -277,6 +280,10 @@ static int mod_init(void) callback_singleton = shm_malloc(sizeof(int)); *callback_singleton = 0; + if(_imsqos_params.dlg_direction != DLG_MOBILE_ORIGINATING) { + _imsqos_params.dlg_direction = DLG_MOBILE_REGISTER; + } + /*register space for event processor*/ register_procs(1); diff --git a/src/modules/ims_qos/ims_qos_mod.h b/src/modules/ims_qos/ims_qos_mod.h index fe061ec9a92..28d59d1d191 100644 --- a/src/modules/ims_qos/ims_qos_mod.h +++ b/src/modules/ims_qos/ims_qos_mod.h @@ -52,6 +52,7 @@ typedef struct ims_qos_params { int recv_mode; + int dlg_direction; } ims_qos_params_t; /** callback functions */ diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 19e66b8fe89..91ed4345a42 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -82,6 +82,7 @@ extern str af_signaling_ip; extern str af_signaling_ip6; extern str component_media_type; extern str flow_protocol; +extern ims_qos_params_t _imsqos_params; str IMS_Serv_AVP_val = {"IMS Services", 12}; str IMS_Em_Serv_AVP_val = {"Emergency IMS Call", 18}; @@ -613,7 +614,6 @@ int add_media_components(AAAMessage *aar, struct sip_msg *req, ipA = req_sdp_session->ip_addr; portA = req_sdp_stream->port; - ipB = rpl_sdp_session->ip_addr; portB = rpl_sdp_stream->port; } @@ -1130,7 +1130,7 @@ int rx_send_aar_register(struct sip_msg *msg, AAASession *auth, &via_host, &port_from, ip_version == AF_INET ? &af_signaling_ip : &af_signaling_ip6, &port_to, &flow_protocol, &raw_stream, &raw_stream, - DLG_MOBILE_REGISTER, AVP_EPC_Flow_Usage_AF_Signaling); + _imsqos_params.dlg_direction, AVP_EPC_Flow_Usage_AF_Signaling); /* Add specific action AVP's */ rx_add_specific_action_avp(aar, 1); // CHARGING_CORRELATION_EXCHANGE

1 0

git:master:aced7f10: ims_qos: docs for recv_mode parameter
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: aced7f10a13dc7c578191514c29b2c8e060e11d3 URL: https://github.com/kamailio/kamailio/commit/aced7f10a13dc7c578191514c29b2c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_qos: docs for recv_mode parameter --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aced7f10a13dc7c578191514c29b2c8… Patch: https://github.com/kamailio/kamailio/commit/aced7f10a13dc7c578191514c29b2c8… --- diff --git a/src/modules/ims_qos/doc/ims_qos_admin.xml b/src/modules/ims_qos/doc/ims_qos_admin.xml index 06350ae8e92..302e492b886 100644 --- a/src/modules/ims_qos/doc/ims_qos_admin.xml +++ b/src/modules/ims_qos/doc/ims_qos_admin.xml @@ -532,6 +532,27 @@ modparam("ims_qos", "rr_default_bandwidth", 2000) <programlisting format="linespecific"> ... modparam("ims_qos", "suspend_transaction", 0) +... + </programlisting> + </example> + </section> + + <section> + <title><varname>recv_mode</varname> integer</title> + + <para>If set to 0, rx_aar_register() takes the received-from address values + (IP, port, proto) from the IP frame. If set to 1, it takes them from + Via header. </para> + + <para><emphasis> Default value is 0</emphasis></para> + + <example> + <title><varname>recv_mode</varname> parameter + usage</title> + + <programlisting format="linespecific"> +... +modparam("ims_qos", "recv_mode", 1) ... </programlisting> </example>

1 0

git:master:b00190ff: ims_qos: option to use received ip, port and proto from via
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: b00190ff6927d5ddfcc0ed78a0eb701627eaadbb URL: https://github.com/kamailio/kamailio/commit/b00190ff6927d5ddfcc0ed78a0eb701… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_qos: option to use received ip, port and proto from via - can help with Rx_AAR_Register when EPC is behind a NAT - there could be an Rx AAR failure due to wrong IP address in Framed IP address field of Rx AAR message when EPC is behind a NAT --- Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/ims_qos_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/b00190ff6927d5ddfcc0ed78a0eb701… Patch: https://github.com/kamailio/kamailio/commit/b00190ff6927d5ddfcc0ed78a0eb701… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index 82057650274..eaa323dcd5b 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -166,6 +166,8 @@ int omit_flow_ports = 0; int rs_default_bandwidth = 0; int rr_default_bandwidth = 0; +ims_qos_params_t _imsqos_params = {.recv_mode = 0}; + /* commands wrappers and fixups */ static int w_rx_aar(struct sip_msg *msg, char *route, char *dir, char *id, int id_type, int cfg_type); @@ -253,7 +255,7 @@ static param_export_t params[] = {{"rx_dest_realm", PARAM_STR, &rx_dest_realm}, &regex_sdp_ip_prefix_to_maintain_in_fd}, {"include_rtcp_fd", INT_PARAM, &include_rtcp_fd}, {"suspend_transaction", INT_PARAM, &_ims_qos_suspend_transaction}, - {0, 0, 0}}; + {"recv_mode", PARAM_INT, &_imsqos_params.recv_mode}, {0, 0, 0}}; /** module exports */ @@ -1463,19 +1465,30 @@ static int w_rx_aar_register( goto error; } - //we use the received IP address for the framed_ip_address - recv_ip.s = ip_addr2a(&msg->rcv.src_ip); - recv_ip.len = strlen(ip_addr2a(&msg->rcv.src_ip)); + char buff[IP_ADDR_MAX_STR_SIZE]; + if(_imsqos_params.recv_mode == 0) { + //we use the received IP address for the framed_ip_address + recv_ip.s = ip_addr2a(&msg->rcv.src_ip); + recv_ip.len = strlen(ip_addr2a(&msg->rcv.src_ip)); + + recv_port = msg->rcv.src_port; + recv_proto = msg->rcv.proto; + } else { + memset(&recv_ip, 0, sizeof(str)); + memcpy(&buff, vb->host.s, vb->host.len); + buff[vb->host.len] = 0; + recv_ip.s = buff; + recv_ip.len = strlen(buff); + recv_port = via_port; + recv_proto = via_proto; + } ip_version = check_ip_version(recv_ip); if(!ip_version) { LM_ERR("check_ip_version returned 0 \n"); goto error; } - recv_port = msg->rcv.src_port; - recv_proto = msg->rcv.proto; - LM_DBG("Message received IP address is: [%.*s]\n", recv_ip.len, recv_ip.s); LM_DBG("Message via is [%d://%.*s:%d]\n", vb->proto, vb->host.len, vb->host.s, via_port); diff --git a/src/modules/ims_qos/ims_qos_mod.h b/src/modules/ims_qos/ims_qos_mod.h index 55a5a9bb356..fe061ec9a92 100644 --- a/src/modules/ims_qos/ims_qos_mod.h +++ b/src/modules/ims_qos/ims_qos_mod.h @@ -49,6 +49,11 @@ #define MOD_NAME "ims_qos" +typedef struct ims_qos_params +{ + int recv_mode; +} ims_qos_params_t; + /** callback functions */ struct AAAMessage;

1 0

git:master:9a552096: ims_registrar_pcscf: docs for delete_delay parameter
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 9a552096eea7e78baeb16d32278ebd4d586eef82 URL: https://github.com/kamailio/kamailio/commit/9a552096eea7e78baeb16d32278ebd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_registrar_pcscf: docs for delete_delay parameter --- Modified: src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9a552096eea7e78baeb16d32278ebd4… Patch: https://github.com/kamailio/kamailio/commit/9a552096eea7e78baeb16d32278ebd4… --- diff --git a/src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml b/src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml index 3f6b36d5c8b..85b532c08df 100644 --- a/src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml +++ b/src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml @@ -265,6 +265,25 @@ modparam("ims_registrar_pcscf", "force_icscf_uri", "sip:icscf.mnc001.mcc001.3gpp <programlisting format="linespecific"> ... modparam("ims_registrar_pcscf", "reginfo_queue_size_threshold", 42) +... + </programlisting> + </example> + </section> + + <section> + <title><varname>delete_delay</varname> (int)</title> + + <para>If set greater than 0, the delete of a pcontact record is delayed + with its value instead of being done immediately.</para> + + <para><emphasis>Default value is 0 (delete immediately).</emphasis></para> + + <example> + <title><varname>delete_delay</varname> parameter usage</title> + + <programlisting format="linespecific"> +... +modparam("ims_registrar_pcscf", "delete_delay", 10) ... </programlisting> </example>

1 0

git:master:3b2bffc9: ims_usrloc_scscf: improve contact lookup for an IMPU
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 3b2bffc92ab0f684f8731c02f080d8df4392de5d URL: https://github.com/kamailio/kamailio/commit/3b2bffc92ab0f684f8731c02f080d8d… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_usrloc_scscf: improve contact lookup for an IMPU - --- Modified: src/modules/ims_usrloc_scscf/contact_dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/3b2bffc92ab0f684f8731c02f080d8d… Patch: https://github.com/kamailio/kamailio/commit/3b2bffc92ab0f684f8731c02f080d8d… --- diff --git a/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c b/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c index ad166ea6557..c872fbef4dc 100644 --- a/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c +++ b/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c @@ -54,8 +54,10 @@ static inline int find_contact_from_impu( impurecord_t *impu, str *search_aor, ucontact_t **scontact) { impu_contact_t *impucontact; - short i_searchlen; + short i_searchlen, c_searchlen, alias_searchlen; char *s_term; + char *c_term; + char *alias_term; if(!search_aor) return 1; @@ -63,29 +65,57 @@ static inline int find_contact_from_impu( LM_DBG("Looking for contact [%.*s] for IMPU [%.*s]\n", search_aor->len, search_aor->s, impu->public_identity.len, impu->public_identity.s); - s_term = memchr(search_aor->s, '@', search_aor->len); + + /* Filter out sip: and anything before @ from search URI */ + s_term = strstr(search_aor->s, "@"); if(!s_term) { - LM_DBG("Malformed contact...bailing search\n"); - return 1; + s_term = strstr(search_aor->s, ":"); + } + s_term += 1; + if(s_term - search_aor->s >= search_aor->len) { + goto error; + } + i_searchlen = search_aor->len - (s_term - search_aor->s); + + /* Compare the entire contact including alias, if not until alias IP */ + alias_term = strstr(s_term, "~"); + if(!alias_term) { + alias_searchlen = i_searchlen; + } else { + alias_term += 1; + alias_searchlen = alias_term - s_term; } - i_searchlen = s_term - search_aor->s; impucontact = impu->linked_contacts.head; while(impucontact) { - if(impucontact->contact - && impucontact->contact->aor.s[i_searchlen] == '@' - && (memcmp(impucontact->contact->aor.s, search_aor->s, - i_searchlen) - == 0)) { - *scontact = impucontact->contact; - return 0; + if(impucontact->contact) { + + c_term = strstr(impucontact->contact->c.s, "@"); + if(!c_term) { + c_term = strstr(impucontact->contact->c.s, ":"); + } + c_term += 1; + c_searchlen = impucontact->contact->c.len + - (c_term - impucontact->contact->c.s); + + LM_DBG("Comparing [%.*s] and [%.*s]\n", i_searchlen, s_term, + c_searchlen, c_term); + LM_DBG("Comparing [%.*s] and [%.*s]\n", alias_searchlen, s_term, + c_searchlen, c_term); + if((strncmp(c_term, s_term, i_searchlen) == 0) + || (strncmp(c_term, s_term, alias_searchlen) == 0)) { + *scontact = impucontact->contact; + return 0; + } } if(impucontact->contact) - LM_DBG("Skipping %.*s\n", impucontact->contact->aor.len, - impucontact->contact->aor.s); + LM_DBG("Skipping %.*s\n", impucontact->contact->c.len, + impucontact->contact->c.s); impucontact = impucontact->next; } +error: + LM_INFO("malformed contact, bailing search\n"); return 1; }

1 0

git:master:bc3e758f: ims_registrar_pcscf: option to delay record expiration instead of immediate delete
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: bc3e758fb32285ba8d0f9f9e1a1489dd1894468d URL: https://github.com/kamailio/kamailio/commit/bc3e758fb32285ba8d0f9f9e1a1489d… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_registrar_pcscf: option to delay record expiration instead of immediate delete - new parameter delete_delay --- Modified: src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c Modified: src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.h Modified: src/modules/ims_registrar_pcscf/notify.c Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/bc3e758fb32285ba8d0f9f9e1a1489d… Patch: https://github.com/kamailio/kamailio/commit/bc3e758fb32285ba8d0f9f9e1a1489d…

1 0

git:master:e49469c0: kamctl: mysql/ims_usrloc_scscf-create.sql - support for larger record_route values
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: e49469c0ce534879a7d366c71374356e7883c6f2 URL: https://github.com/kamailio/kamailio/commit/e49469c0ce534879a7d366c71374356… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 kamctl: mysql/ims_usrloc_scscf-create.sql - support for larger record_route values --- Modified: utils/kamctl/mysql/ims_usrloc_scscf-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/e49469c0ce534879a7d366c71374356… Patch: https://github.com/kamailio/kamailio/commit/e49469c0ce534879a7d366c71374356… --- diff --git a/utils/kamctl/mysql/ims_usrloc_scscf-create.sql b/utils/kamctl/mysql/ims_usrloc_scscf-create.sql index ae7bd93a545..21c816c34e9 100644 --- a/utils/kamctl/mysql/ims_usrloc_scscf-create.sql +++ b/utils/kamctl/mysql/ims_usrloc_scscf-create.sql @@ -49,7 +49,7 @@ CREATE TABLE `subscriber` ( `call_id` varchar(50) NOT NULL, `from_tag` varchar(50) NOT NULL, `to_tag` varchar(50) NOT NULL, - `record_route` varchar(50) NOT NULL, + `record_route` TEXT NOT NULL, `sockinfo_str` varchar(50) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `watcher_uri` (`event`,`watcher_contact`,`presentity_uri`)

1 0

[kamailio/kamailio] nathelper: Add Max-Forwards to keep-alive (PR #3657)
by Kristian Høgh 30 Nov '23

30 Nov '23

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3657 -- Commit Summary -- * nathelper: Add Max-Forwards to keep-alive -- File Changes -- M src/modules/nathelper/sip_pinger.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3657.patch https://github.com/kamailio/kamailio/pull/3657.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3657 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3657(a)github.com>

2 2

git:master:e1d9bec0: nathelper: add Max-Forwards headers which is mandatory for OPTIONS according to RFC 3261 (GH 3657)
by Henning Westerholt 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: e1d9bec0e16727325330c822c21ae29237c7812a URL: https://github.com/kamailio/kamailio/commit/e1d9bec0e16727325330c822c21ae29… Author: Kristian Hogh <kfh(a)uni-tel.dk> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-30T06:21:25Z nathelper: add Max-Forwards headers which is mandatory for OPTIONS according to RFC 3261 (GH 3657) - add Max-Forwards headers which is mandatory for OPTIONS according to RFC 3261 - similar patch is used from several large customer installations since many years - GH #3657 with small formatting change --- Modified: src/modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/e1d9bec0e16727325330c822c21ae29… Patch: https://github.com/kamailio/kamailio/commit/e1d9bec0e16727325330c822c21ae29… --- diff --git a/src/modules/nathelper/sip_pinger.h b/src/modules/nathelper/sip_pinger.h index 733e38f21c3..b3ee4d39f3d 100644 --- a/src/modules/nathelper/sip_pinger.h +++ b/src/modules/nathelper/sip_pinger.h @@ -151,7 +151,7 @@ static inline char *build_sipping(str *curi, struct socket_info *s, str *path, + ruid->len + 1 + 8 + 1 + 8 + s_len(CRLF "To: ") + curi->len + s_len(CRLF "Call-ID: ") + sipping_callid.len + 1 + 8 + 1 + 8 + 1 + s->address_str.len + s_len(CRLF "CSeq: 1 ") - + sipping_method.len + + sipping_method.len + s_len(CRLF "Max-Forwards: 70") + s_len(CRLF "Content-Length: 0" CRLF CRLF) > MAX_SIPPING_SIZE) { LM_ERR("len exceeds %d\n", MAX_SIPPING_SIZE); @@ -205,6 +205,7 @@ static inline char *build_sipping(str *curi, struct socket_info *s, str *path, append_str(p, s->address_str.s, s->address_str.len); append_fix(p, CRLF "CSeq: 1 "); append_str(p, sipping_method.s, sipping_method.len); + append_fix(p, CRLF "Max-Forwards: 70"); append_fix(p, CRLF "Content-Length: 0" CRLF CRLF); *len_p = p - buf;

1 0

Jenkins build became unstable: kamailiodev-nightly-binaries » amd64,stretch #2536
by kamailio＠sipwise.com 30 Nov '23

30 Nov '23

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 5

Jenkins build became unstable: kamailio57-nightly-binaries » amd64,stretch #36
by kamailio＠sipwise.com 30 Nov '23

30 Nov '23

See <https://kamailio.sipwise.com/job/kamailio57-nightly-binaries/architecture=a…>

1 1

[kamailio/kamailio] group include ktls no longer works after 7f07a6ef9ae90baee4281394d0dcf505b30c8fcb (Issue #3660)
by Anthony Messina 29 Nov '23

29 Nov '23

After 7f07a6ef9ae90baee4281394d0dcf505b30c8fcb, building the ktls group doesn't work as it's not included in the #else statement. I don't have a need for ktlsa at this point. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3660 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3660(a)github.com>

2 4

git:5.7:b29d5808: Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set
by Victor Seva 29 Nov '23

29 Nov '23

Module: kamailio Branch: 5.7 Commit: b29d5808505aa072fd23b59adf7943fb13ea98a2 URL: https://github.com/kamailio/kamailio/commit/b29d5808505aa072fd23b59adf7943f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-29T17:25:05+01:00 Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set fix #3660 (cherry picked from commit aef29af56cabaf626e2ae552ae69c3cd2f692a27) --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/b29d5808505aa072fd23b59adf7943f… Patch: https://github.com/kamailio/kamailio/commit/b29d5808505aa072fd23b59adf7943f… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 028c34da711..ee4ec90e83f 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -407,6 +407,9 @@ ifeq ($(KTLS_INCLUDE_TLSA),yes) # pkg tls module with curl module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) $(mod_list_tlsa) else +# pkg tls module with curl +module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) + # pkg tlsa module module_group_ktlsa=$(mod_list_tlsa) endif @@ -540,4 +543,3 @@ module_group_krtp_media_server=$(mod_list_rtp_media_server) # list of static modules # static_modules:= -

1 0

git:master:aef29af5: Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set
by Victor Seva 29 Nov '23

29 Nov '23

Module: kamailio Branch: master Commit: aef29af56cabaf626e2ae552ae69c3cd2f692a27 URL: https://github.com/kamailio/kamailio/commit/aef29af56cabaf626e2ae552ae69c3c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-29T17:21:59+01:00 Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set fix #3660 --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/aef29af56cabaf626e2ae552ae69c3c… Patch: https://github.com/kamailio/kamailio/commit/aef29af56cabaf626e2ae552ae69c3c… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index b428394d31d..48e06e0646c 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -411,6 +411,9 @@ ifeq ($(KTLS_INCLUDE_TLSA),yes) # pkg tls module with curl module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) $(mod_list_tlsa) else +# pkg tls module with curl +module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) + # pkg tlsa module module_group_ktlsa=$(mod_list_tlsa) endif @@ -547,4 +550,3 @@ module_group_krtp_media_server=$(mod_list_rtp_media_server) # list of static modules # static_modules:= -

1 0

git:master:2b27aba7: topos: use defined values for internal contact mode
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 2b27aba7f4f396e4ebd894255abfa8ce20950313 URL: https://github.com/kamailio/kamailio/commit/2b27aba7f4f396e4ebd894255abfa8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T13:22:35+01:00 topos: use defined values for internal contact mode --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/2b27aba7f4f396e4ebd894255abfa8c… Patch: https://github.com/kamailio/kamailio/commit/2b27aba7f4f396e4ebd894255abfa8c… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 8ea8bb39c7e..7bcb2fea3c9 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -123,7 +123,7 @@ static int _tps_eventrt_receiving = -1; static str _tps_eventrt_receiving_name = str_init("topos:msg-receiving"); str _tps_contact_host = str_init(""); -int _tps_contact_mode = 0; +int _tps_contact_mode = TPS_CONTACT_MODE_SKEYUSER; str _tps_cparam_name = str_init("tps"); str _tps_xavu_cfg = STR_NULL; @@ -310,7 +310,7 @@ static int mod_init(void) if(sruid_init(&_tps_sruid, '-', "tpsh", SRUID_INC) < 0) return -1; - if(_tps_contact_mode == 2 + if(_tps_contact_mode == TPS_CONTACT_MODE_XAVPUSER && (_tps_xavu_cfg.len <= 0 || _tps_xavu_field_acontact.len <= 0 || _tps_xavu_field_bcontact.len <= 0)) { LM_ERR("contact_mode parameter is 2," diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 4d680e53f45..e0e1c211923 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -324,7 +324,8 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) return -1; } - if(ctmode == 1 || ctmode == 2) { + if(ctmode == TPS_CONTACT_MODE_RURIUSER + || ctmode == TPS_CONTACT_MODE_XAVPUSER) { if(msg->parsed_uri.sip_params.len < TPS_TUUID_MIN_LEN) { LM_DBG("not an expected param format\n"); return 1; @@ -962,7 +963,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) LM_DBG("use branch for routing information, request from direction " "%d\n", direction); - if(tps_reappend_route(msg, &stsd, &stsd.s_rr, (direction == TPS_DIR_UPSTREAM) ? 0 : 1) < 0) { + if(tps_reappend_route(msg, &stsd, &stsd.s_rr, + (direction == TPS_DIR_UPSTREAM) ? 0 : 1) + < 0) { LM_ERR("failed to reappend s-route\n"); return -1; } diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 63951386622..fc0c2835a33 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -244,7 +244,8 @@ int tps_storage_fill_contact( if(_tps_contact_host.len) contact_len = sv.len - puri.host.len + _tps_contact_host.len; - if(ctmode == 1 || ctmode == 2) { + if(ctmode == TPS_CONTACT_MODE_RURIUSER + || ctmode == TPS_CONTACT_MODE_XAVPUSER) { cparam_len = _tps_cparam_name.len; } else { cparam_len = 0; @@ -285,9 +286,10 @@ int tps_storage_fill_contact( if(sv.s[i] == ':') break; } - if(ctmode == 1 || ctmode == 2) { + if(ctmode == TPS_CONTACT_MODE_RURIUSER + || ctmode == TPS_CONTACT_MODE_XAVPUSER) { /* create new URI parameter for Contact header */ - if(ctmode == 1) { + if(ctmode == TPS_CONTACT_MODE_RURIUSER) { if(dir == TPS_DIR_DOWNSTREAM) { /* extract the contact address */ if(parse_headers(msg, HDR_CONTACT_F, 0) < 0 @@ -332,7 +334,7 @@ int tps_storage_fill_contact( msg->parsed_uri.user.len); td->cp += msg->parsed_uri.user.len; } - } else if(ctmode == 2) { + } else if(ctmode == TPS_CONTACT_MODE_XAVPUSER) { if(dir == TPS_DIR_DOWNSTREAM) { /* extract the a contact */ vavu = xavu_get_child_with_sval( @@ -356,8 +358,8 @@ int tps_storage_fill_contact( } } - if(!((ctmode == 1) && (dir == TPS_DIR_DOWNSTREAM) - && (curi.user.len <= 0))) { + if(!((ctmode == TPS_CONTACT_MODE_RURIUSER) + && (dir == TPS_DIR_DOWNSTREAM) && (curi.user.len <= 0))) { *td->cp = '@'; td->cp++; } diff --git a/src/modules/topos/tps_storage.h b/src/modules/topos/tps_storage.h index 4c2585a1ff6..245a1595652 100644 --- a/src/modules/topos/tps_storage.h +++ b/src/modules/topos/tps_storage.h @@ -37,6 +37,10 @@ #define TPS_IFLAG_INIT 1 #define TPS_IFLAG_DLGON 2 +#define TPS_CONTACT_MODE_SKEYUSER 0 +#define TPS_CONTACT_MODE_RURIUSER 1 +#define TPS_CONTACT_MODE_XAVPUSER 2 + #define TPS_DBU_CONTACT (1 << 0) #define TPS_DBU_RPLATTRS (1 << 1) #define TPS_DBU_ARR (1 << 2)

1 0

[kamailio/kamailio] core: timer_proc don't execute timers on destroy_modules_phase (PR #3649)
by Victor Seva 28 Nov '23

28 Nov '23

#### 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 - [ ] Tested changes locally #### Description If kamailio is in the shutdown phase proc timers should not be executed since memory objects are getting destroyed and cores could happen You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3649 -- Commit Summary -- * core: timer_proc don't execute timers on destroy_modules_phase -- File Changes -- M src/core/timer_proc.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3649.patch https://github.com/kamailio/kamailio/pull/3649.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3649 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3649(a)github.com>

2 6

git:master:1194f597: core: timer_proc don't execute timers on shutdown phase
by Victor Seva 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 1194f59738e87fcbf0d61c95d1d481e5fbb46784 URL: https://github.com/kamailio/kamailio/commit/1194f59738e87fcbf0d61c95d1d481e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-28T13:03:38+01:00 core: timer_proc don't execute timers on shutdown phase --- Modified: src/core/timer_proc.c --- Diff: https://github.com/kamailio/kamailio/commit/1194f59738e87fcbf0d61c95d1d481e… Patch: https://github.com/kamailio/kamailio/commit/1194f59738e87fcbf0d61c95d1d481e… --- diff --git a/src/core/timer_proc.c b/src/core/timer_proc.c index 0b04cf65131..55bd98dab9c 100644 --- a/src/core/timer_proc.c +++ b/src/core/timer_proc.c @@ -29,6 +29,7 @@ #include "pt.h" #include "ut.h" #include "mem/shm_mem.h" +#include "sr_module.h" #include <unistd.h> @@ -76,6 +77,9 @@ int fork_basic_timer(int child_id, char *desc, int make_sock, timer_function *f, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep(interval); cfg_update(); f(get_ticks(), param); /* ticks in s for compatibility with old @@ -99,6 +103,9 @@ int fork_basic_timer_w(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep(interval); cfg_update(); f(get_ticks(), worker, @@ -141,6 +148,9 @@ int fork_basic_utimer(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep_us(uinterval); cfg_update(); ts = get_ticks_raw(); @@ -165,6 +175,9 @@ int fork_basic_utimer_w(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep_us(uinterval); cfg_update(); ts = get_ticks_raw(); @@ -273,6 +286,9 @@ int fork_sync_timer(int child_id, char *desc, int make_sock, timer_function *f, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } if(ts2 > interval) sleep_us(1000); /* 1 millisecond sleep to catch up */ else @@ -324,6 +340,9 @@ int fork_sync_utimer(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } if(ts2 > uinterval) sleep_us(1); else

1 0

git:master:9117e5dd: modules: readme files regenerated - jansson ... [skip ci]
by Kamailio Dev 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 9117e5ddbffe2a202d24eb39a509835f14090486 URL: https://github.com/kamailio/kamailio/commit/9117e5ddbffe2a202d24eb39a509835… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-28T10:32:15+01:00 modules: readme files regenerated - jansson ... [skip ci] --- Modified: src/modules/jansson/README --- Diff: https://github.com/kamailio/kamailio/commit/9117e5ddbffe2a202d24eb39a509835… Patch: https://github.com/kamailio/kamailio/commit/9117e5ddbffe2a202d24eb39a509835…

1 0

git:master:3b47b566: jansson: rename parameter for janssonmod_get_field()
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 3b47b566477baedf687635b2b3f0e2525987e709 URL: https://github.com/kamailio/kamailio/commit/3b47b566477baedf687635b2b3f0e25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:41+01:00 jansson: rename parameter for janssonmod_get_field() - more suggestive relation with the meaning of the field name parameter --- Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/3b47b566477baedf687635b2b3f0e25… Patch: https://github.com/kamailio/kamailio/commit/3b47b566477baedf687635b2b3f0e25… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 58a698446ca..dab15d488f3 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -95,22 +95,22 @@ int janssonmod_get(struct sip_msg *msg, char *path_in, char *src_in, char *dst) } int janssonmod_get_field( - struct sip_msg *msg, char *path_in, char *src_in, char *dst) + struct sip_msg *msg, char *field_in, char *src_in, char *dst) { str src_s; - str path_s; + str field_s; - if(fixup_get_svalue(msg, (gparam_p)src_in, &src_s) != 0) { - ERR("cannot get json string value\n"); + if(fixup_get_svalue(msg, (gparam_p)field_in, &field_s) != 0) { + ERR("cannot get field name string value\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_p)path_in, &path_s) != 0) { - ERR("cannot get path string value\n"); + if(fixup_get_svalue(msg, (gparam_p)src_in, &src_s) != 0) { + ERR("cannot get json string value\n"); return -1; } - return janssonmod_get_helper(msg, &path_s, 1, &src_s, (pv_spec_t *)dst); + return janssonmod_get_helper(msg, &field_s, 1, &src_s, (pv_spec_t *)dst); } int janssonmod_pv_get( diff --git a/src/modules/jansson/jansson_funcs.h b/src/modules/jansson/jansson_funcs.h index ab1c029821f..829aa144c19 100644 --- a/src/modules/jansson/jansson_funcs.h +++ b/src/modules/jansson/jansson_funcs.h @@ -28,7 +28,7 @@ int janssonmod_get( struct sip_msg *msg, char *path_in, char *json_in, char *result); int janssonmod_get_field( - struct sip_msg *msg, char *path_in, char *src_in, char *dst); + struct sip_msg *msg, char *field_in, char *src_in, char *dst); int janssonmod_pv_get( struct sip_msg *msg, char *path_in, char *json_in, char *result); int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in,

1 0

git:master:9eeab439: jansson: docs updated for jansson_get_field()
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 9eeab4396d8ec57781244ab80c4a96539d7338ec URL: https://github.com/kamailio/kamailio/commit/9eeab4396d8ec57781244ab80c4a965… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:41+01:00 jansson: docs updated for jansson_get_field() --- Modified: src/modules/jansson/doc/jansson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9eeab4396d8ec57781244ab80c4a965… Patch: https://github.com/kamailio/kamailio/commit/9eeab4396d8ec57781244ab80c4a965… --- diff --git a/src/modules/jansson/doc/jansson_admin.xml b/src/modules/jansson/doc/jansson_admin.xml index debc9cc5a19..daa5e9ea51e 100644 --- a/src/modules/jansson/doc/jansson_admin.xml +++ b/src/modules/jansson/doc/jansson_admin.xml @@ -56,10 +56,16 @@ <title>Functions</title> <section id="jansson.f.jansson_get"> <title> - <function moreinfo="none">jansson_get(key/path, src, dst)</function> + <function moreinfo="none">jansson_get(path, src, dst)</function> </title> <para> - Copy the value at the location 'path' from the json object 'src' and store it in pvar 'dst'. + Copy the value at the location 'path' from the json object 'src' + and store it in variable 'dst'. The path can also be a simple field name + (a key), if it does not include any path separator. To retrieve the + value of a field that includes path separators in the name, use + jansson_get_field(). + </para> + <para> The 'src' can be a static string or a dynamic string with variables. </para> <para> @@ -71,7 +77,7 @@ </para> <para> The function can put a string, integer, null, or new json string into destination. - If the key/path can't be found in the JSON data structure, the pvar is not changed. + If the path can't be found in the JSON data structure, the pvar is not changed. If it had a previous value, that value remains unchanged. </para> @@ -280,22 +286,27 @@ jansson_xencode("a", "$var(js)"); </section> <section id="jansson.f.jansson_get_field"> <title> - <function moreinfo="none">jansson_get_field(src, field_name, dst)</function> + <function moreinfo="none">jansson_get_field(field_name, src, dst)</function> </title> <para> - Copy field 'field_name' from json object 'src' and store it in pvar 'dst'. + Copy the value of the field 'field_name' from json object 'src' + and store it in pvar 'dst'. The field name is not evaluated as JSON + path, therefore it has a different behaviour than jansson_get() and + can be used when the field name contains path delimiters. </para> <para> - <emphasis>This function is deprecated</emphasis> but kept for backwards compatibility. - Right now it is just a wrapper around <function>jansson_get</function>, and its - functionality is the same. + Note that till version 5.7.x, this function was similar to jansson_get(), + after that its behaviour changed to work as described above. Also, + the order of parameters changed. </para> <example> <title><function>jansson_get_field</function> usage</title> <programlisting format="linespecific"> ... -jansson_get_field("{'foo':'bar'}", "foo", "$var(foo)"); +jansson_get_field("foo", "{'foo':'bar'}", "$var(foo)"); xlog("foo is $var(foo)"); +jansson_get_field("foo.foz", "{'foo.foz':'bar.buz'}", "$var(foofoz)"); +xlog("foo.foz is $var(foofoz)"); ... </programlisting> </example>

1 0

git:master:d7b76608: jansson: use key as field name for jansson_get_field()
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: d7b76608595046001cab3ced06d29c1e9a84cb99 URL: https://github.com/kamailio/kamailio/commit/d7b76608595046001cab3ced06d29c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:40+01:00 jansson: use key as field name for jansson_get_field() - do no try to evaluate it as json path --- Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_funcs.h Modified: src/modules/jansson/jansson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d7b76608595046001cab3ced06d29c1… Patch: https://github.com/kamailio/kamailio/commit/d7b76608595046001cab3ced06d29c1… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 8e154e7bff4..58a698446ca 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -34,7 +34,7 @@ #include "jansson_utils.h" int janssonmod_get_helper( - sip_msg_t *msg, str *path_s, str *src_s, pv_spec_t *dst_pv) + sip_msg_t *msg, str *path_s, int pmode, str *src_s, pv_spec_t *dst_pv) { char c; pv_value_t dst_val; @@ -52,7 +52,7 @@ int janssonmod_get_helper( char *path = path_s->s; - json_t *v = json_path_get(json, path, 0); + json_t *v = json_path_get(json, path, pmode); if(!v) { goto fail; } @@ -91,7 +91,26 @@ int janssonmod_get(struct sip_msg *msg, char *path_in, char *src_in, char *dst) return -1; } - return janssonmod_get_helper(msg, &path_s, &src_s, (pv_spec_t *)dst); + return janssonmod_get_helper(msg, &path_s, 0, &src_s, (pv_spec_t *)dst); +} + +int janssonmod_get_field( + struct sip_msg *msg, char *path_in, char *src_in, char *dst) +{ + str src_s; + str path_s; + + if(fixup_get_svalue(msg, (gparam_p)src_in, &src_s) != 0) { + ERR("cannot get json string value\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)path_in, &path_s) != 0) { + ERR("cannot get path string value\n"); + return -1; + } + + return janssonmod_get_helper(msg, &path_s, 1, &src_s, (pv_spec_t *)dst); } int janssonmod_pv_get( @@ -111,7 +130,7 @@ int janssonmod_pv_get( return -1; } - ret = janssonmod_get_helper(msg, &path_s, &val.rs, (pv_spec_t *)dst); + ret = janssonmod_get_helper(msg, &path_s, 0, &val.rs, (pv_spec_t *)dst); pv_value_destroy(&val); diff --git a/src/modules/jansson/jansson_funcs.h b/src/modules/jansson/jansson_funcs.h index f59074a210b..ab1c029821f 100644 --- a/src/modules/jansson/jansson_funcs.h +++ b/src/modules/jansson/jansson_funcs.h @@ -27,6 +27,8 @@ int janssonmod_get( struct sip_msg *msg, char *path_in, char *json_in, char *result); +int janssonmod_get_field( + struct sip_msg *msg, char *path_in, char *src_in, char *dst); int janssonmod_pv_get( struct sip_msg *msg, char *path_in, char *json_in, char *result); int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, @@ -34,7 +36,7 @@ int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, int janssonmod_array_size( struct sip_msg *msg, char *json_in, char *path_in, char *dst); int janssonmod_get_helper( - sip_msg_t *msg, str *path_s, str *src_s, pv_spec_t *dst_pv); + sip_msg_t *msg, str *path_s, int pmode, str *src_s, pv_spec_t *dst_pv); int jansson_xdecode(struct sip_msg *msg, char *src_in, char *xavp_in); int jansson_xencode(struct sip_msg *msg, char *xavp, char *dst); diff --git a/src/modules/jansson/jansson_mod.c b/src/modules/jansson/jansson_mod.c index 816cb130fa9..e7dd58ee3fc 100644 --- a/src/modules/jansson/jansson_mod.c +++ b/src/modules/jansson/jansson_mod.c @@ -55,11 +55,6 @@ int janssonmod_set_append(struct sip_msg *msg, char *type_in, char *path_in, { return janssonmod_set(1, msg, type_in, path_in, value_in, result); } -int janssonmod_get_field( - struct sip_msg *msg, char *jansson_in, char *path_in, char *result) -{ - return janssonmod_get(msg, path_in, jansson_in, result); -} /* clang-format off */ /* Exported functions */ @@ -246,7 +241,7 @@ static int ki_jansson_get(sip_msg_t *msg, str *spath, str *sdoc, str *spv) return -1; } - return janssonmod_get_helper(msg, spath, sdoc, pvs); + return janssonmod_get_helper(msg, spath, 0, sdoc, pvs); } /**

1 0

git:master:525dc452: jansson: reformat exported structures
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 525dc4523ac411e1154c3ae8af1ec6f8678d1dbc URL: https://github.com/kamailio/kamailio/commit/525dc4523ac411e1154c3ae8af1ec6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:40+01:00 jansson: reformat exported structures --- Modified: src/modules/jansson/jansson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/525dc4523ac411e1154c3ae8af1ec6f… Patch: https://github.com/kamailio/kamailio/commit/525dc4523ac411e1154c3ae8af1ec6f… --- diff --git a/src/modules/jansson/jansson_mod.c b/src/modules/jansson/jansson_mod.c index 820a5492574..816cb130fa9 100644 --- a/src/modules/jansson/jansson_mod.c +++ b/src/modules/jansson/jansson_mod.c @@ -61,42 +61,44 @@ int janssonmod_get_field( return janssonmod_get(msg, path_in, jansson_in, result); } +/* clang-format off */ /* Exported functions */ static cmd_export_t cmds[] = { - {"jansson_get", (cmd_function)janssonmod_get, 3, fixup_get_params, - fixup_get_params_free, ANY_ROUTE}, - {"jansson_pv_get", (cmd_function)janssonmod_pv_get, 3, - fixup_pv_get_params, fixup_pv_get_params_free, ANY_ROUTE}, - {"jansson_array_size", (cmd_function)janssonmod_array_size, 3, - fixup_get_params, fixup_get_params_free, ANY_ROUTE}, - {"jansson_set", (cmd_function)janssonmod_set_replace, 4, - fixup_set_params, fixup_set_params_free, ANY_ROUTE}, - {"jansson_append", (cmd_function)janssonmod_set_append, 4, - fixup_set_params, fixup_set_params_free, ANY_ROUTE}, - {"jansson_xdecode", (cmd_function)jansson_xdecode, 2, fixup_spve_spve, - fixup_free_spve_spve, ANY_ROUTE}, - {"jansson_xencode", (cmd_function)jansson_xencode, 2, fixup_xencode, - fixup_xencode_free, ANY_ROUTE}, - /* for backwards compatibility */ - {"jansson_get_field", (cmd_function)janssonmod_get_field, 3, - fixup_get_params, fixup_get_params_free, ANY_ROUTE}, - /* non-script functions */ - {"jansson_to_val", (cmd_function)jansson_to_val, 0, 0, 0, 0}, - - {0, 0, 0, 0, 0, 0}}; + {"jansson_get", (cmd_function)janssonmod_get, 3, fixup_get_params, + fixup_get_params_free, ANY_ROUTE}, + {"jansson_pv_get", (cmd_function)janssonmod_pv_get, 3, + fixup_pv_get_params, fixup_pv_get_params_free, ANY_ROUTE}, + {"jansson_array_size", (cmd_function)janssonmod_array_size, 3, + fixup_get_params, fixup_get_params_free, ANY_ROUTE}, + {"jansson_set", (cmd_function)janssonmod_set_replace, 4, + fixup_set_params, fixup_set_params_free, ANY_ROUTE}, + {"jansson_append", (cmd_function)janssonmod_set_append, 4, + fixup_set_params, fixup_set_params_free, ANY_ROUTE}, + {"jansson_xdecode", (cmd_function)jansson_xdecode, 2, fixup_spve_spve, + fixup_free_spve_spve, ANY_ROUTE}, + {"jansson_xencode", (cmd_function)jansson_xencode, 2, fixup_xencode, + fixup_xencode_free, ANY_ROUTE}, + {"jansson_get_field", (cmd_function)janssonmod_get_field, 3, + fixup_get_params, fixup_get_params_free, ANY_ROUTE}, + /* non-script functions */ + {"jansson_to_val", (cmd_function)jansson_to_val, 0, 0, 0, 0}, + + {0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "jansson", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - 0, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "jansson", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + 0, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format off */ static int fixup_get_params(void **param, int param_no)

1 0

git:master:48034ab6: jansson: added path evaluatian mode for helper functions
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 48034ab61482f6b3d9e77ccfc9e0743c44ff4458 URL: https://github.com/kamailio/kamailio/commit/48034ab61482f6b3d9e77ccfc9e0743… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:40+01:00 jansson: added path evaluatian mode for helper functions --- Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_path.c Modified: src/modules/jansson/jansson_path.h --- Diff: https://github.com/kamailio/kamailio/commit/48034ab61482f6b3d9e77ccfc9e0743… Patch: https://github.com/kamailio/kamailio/commit/48034ab61482f6b3d9e77ccfc9e0743… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 926ed34c266..8e154e7bff4 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -52,7 +52,7 @@ int janssonmod_get_helper( char *path = path_s->s; - json_t *v = json_path_get(json, path); + json_t *v = json_path_get(json, path, 0); if(!v) { goto fail; } @@ -252,7 +252,7 @@ int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, goto fail; } - if(json_path_set(result_json, path, value, append) < 0) { + if(json_path_set(result_json, path, 0, value, append) < 0) { goto fail; } @@ -307,7 +307,7 @@ int janssonmod_array_size( char *path = path_s.s; - json_t *v = json_path_get(json, path); + json_t *v = json_path_get(json, path, 0); if(!v) { ERR("failed to find %s in json\n", path); goto fail; diff --git a/src/modules/jansson/jansson_path.c b/src/modules/jansson/jansson_path.c index cc38c380260..d4148591aac 100644 --- a/src/modules/jansson/jansson_path.c +++ b/src/modules/jansson/jansson_path.c @@ -25,7 +25,7 @@ static char *jsonp_strdup(const char *str); static json_malloc_t do_malloc = malloc; static json_free_t do_free = free; -json_t *json_path_get(const json_t *json, const char *path) +json_t *json_path_get(const json_t *json, const char *path, const int pmode) { static const char array_open = '['; static const char *path_delims = ".[", *array_close = "]"; @@ -50,7 +50,11 @@ json_t *json_path_get(const json_t *json, const char *path) while(peek && *peek && cursor) { char *last_peek = peek; - peek = strpbrk(peek, expect); + if(pmode == 0) { + peek = strpbrk(peek, expect); + } else { + peek = NULL; + } if(peek) { if(!token && peek != last_peek) goto fail; @@ -85,8 +89,8 @@ json_t *json_path_get(const json_t *json, const char *path) return NULL; } -int json_path_set( - json_t *json, const char *path, json_t *value, unsigned int append) +int json_path_set(json_t *json, const char *path, const int pmode, + json_t *value, unsigned int append) { static const char array_open = '['; static const char object_delim = '.'; @@ -117,8 +121,11 @@ int json_path_set( while(peek && *peek && cursor) { char *last_peek = peek; - peek = strpbrk(last_peek, expect); - + if(pmode == 0) { + peek = strpbrk(last_peek, expect); + } else { + peek = NULL; + } if(peek) { if(!token && peek != last_peek) { ERR("unexpected trailing chars in JSON path at pos %zu\n", diff --git a/src/modules/jansson/jansson_path.h b/src/modules/jansson/jansson_path.h index 79e1614c6fd..22fc562fee7 100644 --- a/src/modules/jansson/jansson_path.h +++ b/src/modules/jansson/jansson_path.h @@ -10,8 +10,8 @@ #define _JANSSON_PATH_H_ #include <jansson.h> -json_t *json_path_get(const json_t *json, const char *path); -int json_path_set( - json_t *json, const char *path, json_t *value, unsigned int append); +json_t *json_path_get(const json_t *json, const char *path, const int pmode); +int json_path_set(json_t *json, const char *path, const int pmode, + json_t *value, unsigned int append); #endif

1 0

git:master:870e4dc8: pkg: RPM packaging add kamailio-tls_wolfssl subpackage
by S-P Chan 27 Nov '23

27 Nov '23

Module: kamailio Branch: master Commit: 870e4dc86dec7bf51a513bb1a716ad2417a12fa9 URL: https://github.com/kamailio/kamailio/commit/870e4dc86dec7bf51a513bb1a716ad2… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-11-28T06:25:41+08:00 pkg: RPM packaging add kamailio-tls_wolfssl subpackage --- Modified: pkg/kamailio/obs/kamailio-9-x86_64.cfg Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/870e4dc86dec7bf51a513bb1a716ad2… Patch: https://github.com/kamailio/kamailio/commit/870e4dc86dec7bf51a513bb1a716ad2…

1 0

Info: Issue and PR automatic management
by Daniel-Constantin Mierla 27 Nov '23

27 Nov '23

Hello, during the Kamailio Development Meeting that took place in Dusseldorf earlier this month, one topic was related to administrative tasks related to project development and management, how to simplify/automatize such tasks. To reduce the work load on volunteering contributors, GitHub Actions were already used for various tasks related to project development and management (e.g., automatic builds on commits and pull requests to detect compile errors or code formatting mistakes). In Dusseldorf another task was configured to be managed with GitHub Actions, respectively the check of open issues and pull requests to evaluate the interest of submitters, developers and community users to pursue them. If there is no activity on an issue (potential bug or feature request) or a pull request, after 6 weeks it is marked with the label `stale`. After two more weeks of no activity, the issue or the pull request is marked with the label `expired` and closed. Note that any comment postpones the expire timeline, being considered that there is interest in pursuing the issue or the pull request. Requests for features were already treated in this way: if nobody commits to implement it, it can be closed after one month, but it needed manual work and many were still kept open. Potential bug reports that become very old are hard to tackle if the source code changes or new major releases are out, they might even not be valid anymore. Anyhow, this automatic operations can be reverted if there is still interest in pursuing the specific issues or pull requests. A registered developer can remove labels and reopen a closed issue or pull request. The non-registered-developer contributors have to make a comment that includes the token `/notstale` to remove the label `stale` or includes the token `/notexpired` to reopen a closed item. This new kind of automatic task management might add a little inconvenience because one has to restate the interest from time to time for those items that could not be addressed. However, considering that Kamailio is an open source collaborative project, in order to be fair for those that volunteer to spend time and resources for development of Kamailio, also the users/submitters have to stay engaged, not just report and forget about. The process to automatize tasks related to Kamailio development and administration is work in progress. Everything can be adjusted based on feedback (e.g., time lines), feel free to suggest improvements or new solutions to make things easier for everyone within the project ecosystem. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy and Development Services Kamailio Advanced Training -- asipto.com

1 0

git:master:4840ea75: .github/CONTRIBUTING.md: section for issue and pr automatic management
by Daniel-Constantin Mierla 27 Nov '23

27 Nov '23

Module: kamailio Branch: master Commit: 4840ea7536610d07ad6fda76da60ded04dfeabc7 URL: https://github.com/kamailio/kamailio/commit/4840ea7536610d07ad6fda76da60ded… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-27T19:23:36+01:00 .github/CONTRIBUTING.md: section for issue and pr automatic management --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/4840ea7536610d07ad6fda76da60ded… Patch: https://github.com/kamailio/kamailio/commit/4840ea7536610d07ad6fda76da60ded… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2c5d46842b8..e01dd82c3ce 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -20,6 +20,7 @@ changes to this document in a pull request. * [Commit Message Examples](#commit-message-examples) * [See Also](#see-also) * [Reporting Issues](#reporting-issues) + * [Issue And PR Automatic Management](#issue-and-pr-automatic-management) * [License](#license) * [License Of New Code Contributions](#license-of-new-code-contributions) * [Further Assistance](#further-assistance) @@ -251,6 +252,32 @@ Note: replace any sensitive information in the content you add to the issue (e.g., passwords in modparams can be replaced with xyz, each IP address can be replaced with tokens like a.b.c.d, f.g.h.j). +## Issue And PR Automatic Management ## + +This section presents details about the automatic management of potential bug +reports and requests for new features using github actions. + +Kamailio is an open source collaborative project, in order to be fair for those +that volunteer to spend time and resources for development of Kamailio, the users +have to stay engaged, not just report and forget about. + +To reduce the work load on volunteering contributors, GitHub Actions are used +for various tasks related to project development and management (e.g., automatic +builds on commits and pull requests to detect compile errors or code formatting +mistakes). + +One task managed with GitHub Actions is related to the check of open +issues and pull requests to evaluate the interest of submitter, developers and +community users. If there is no activity on an issue (potential bug or feature +request) or a pull request, after 6 weeks it is marked with the label `stale`. +After two more weeks of no activity, the issue or the pull request is marked +with the label `expired` and closed. + +A registered developer can remove labels and reopen a closed issue or pull +request. The other contributors have to make a comment that includes the token +`/notstale` to remove the label `stale` or includes the token `/notexpired` to +reopen a closed item. + ## License ## Kamailio Main License: *GPLv2*.

1 0

git:master:96300556: .github/ISSUE_TEMPLATE: notes about expiration of items and how to reopen
by Daniel-Constantin Mierla 27 Nov '23

27 Nov '23

Module: kamailio Branch: master Commit: 96300556ea4787f6f99926dcc7305ec6e4e3df75 URL: https://github.com/kamailio/kamailio/commit/96300556ea4787f6f99926dcc7305ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-27T17:11:53+01:00 .github/ISSUE_TEMPLATE: notes about expiration of items and how to reopen --- Modified: .github/ISSUE_TEMPLATE/bug_report.md Modified: .github/ISSUE_TEMPLATE/feature_request.md --- Diff: https://github.com/kamailio/kamailio/commit/96300556ea4787f6f99926dcc7305ec… Patch: https://github.com/kamailio/kamailio/commit/96300556ea4787f6f99926dcc7305ec… --- diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index e657ee1a979..01b1672bbb7 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -17,6 +17,15 @@ If you have questions about developing extensions to Kamailio or its existing C Please try to fill this template as much as possible for any issue. It helps the developers to troubleshoot the issue. +Note that an issue report may be closed automatically after about 2 months +if there is no interest from developers or community users on pursuing it, being +considered expired. In such case, it can be reopened by writing a comment that includes +the token `/notexpired`. About two weeks before considered expired, the issue is +marked with the label `stale`, trying to notify the submitter and everyone else +that might be interested in it. To remove the label `stale`, write a comment that +includes the token `/notstale`. Also, any comment postpone the `expire` timeline, +being considered that there is interest in pursuing the issue. + If there is no content to be filled in a section, the entire section can be removed. You can delete the comments from the template sections when filling. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 2c21427e600..6206cee95c7 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -21,6 +21,15 @@ If you submit a feature request (or enhancement) add the description of what you If there is no content to be filled in a section, the entire section can be removed. +Note that a feature request may be closed automatically after about 2 months +if there is no interest from developers or community users to implement it, being +considered expired. In such case can be reopened by writing a comment that includes +the token `/notexpired`. About two weeks before considered expired, the item is +marked with the label `stale`, trying to notify the submitter and everyone else +that might be interested in it. To remove the label `stale`, write a comment that +includes the token `/notstale`. Also, any comment postpone the `expire` timeline, +being considered that there is interest in the proposed feature request. + You can delete the comments from the template sections when filling. You can delete next line and everything above before submitting (it is a comment).

1 0

git:master:5a65791e: modules: readme files regenerated - topoh ... [skip ci]
by Kamailio Dev 27 Nov '23

27 Nov '23

Module: kamailio Branch: master Commit: 5a65791e3959439a699d746ce8e63d438e8db0a5 URL: https://github.com/kamailio/kamailio/commit/5a65791e3959439a699d746ce8e63d4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-27T14:17:09+01:00 modules: readme files regenerated - topoh ... [skip ci] --- Modified: src/modules/topoh/README --- Diff: https://github.com/kamailio/kamailio/commit/5a65791e3959439a699d746ce8e63d4… Patch: https://github.com/kamailio/kamailio/commit/5a65791e3959439a699d746ce8e63d4… --- diff --git a/src/modules/topoh/README b/src/modules/topoh/README index f1a761bf8f9..0217b90d30f 100644 --- a/src/modules/topoh/README +++ b/src/modules/topoh/README @@ -162,12 +162,12 @@ modparam("topoh", "mask_key", "some secret here") IP address to be used in masked headers to build valid SIP URIs. Can be any IP address, even a private-space or non-existing IP address (e.g., 192.168.1.1, 127.0.0.2), including the SIP server address, but must not - be an address potentially used by clients. If not set, the advertised - IP of the incoming or outgoing socket is used. If there is no - advertised IP, the IP of the socket is used. It is not used at all for - SIP routing. + be an address potentially used by clients. If set to empty string, the + advertised IP of the incoming or outgoing socket is used when + specified, otherwise the IP of the socket is used. Note that the value + is actually not used at all for SIP routing. - Default value is empty. + Default value is "127.0.0.8". Example 1.2. Set mask_ip parameter ...

1 0

git:master:e479abe5: github: rework labels workflow [skip ci]
by Victor Seva 27 Nov '23

27 Nov '23

Module: kamailio Branch: master Commit: e479abe5a56e0576b5d5707fbdd7b65d33cf3599 URL: https://github.com/kamailio/kamailio/commit/e479abe5a56e0576b5d5707fbdd7b65… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-27T14:06:15+01:00 github: rework labels workflow [skip ci] --- Modified: .github/workflows/labels.yml --- Diff: https://github.com/kamailio/kamailio/commit/e479abe5a56e0576b5d5707fbdd7b65… Patch: https://github.com/kamailio/kamailio/commit/e479abe5a56e0576b5d5707fbdd7b65… --- diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 51aa34a603f..6dc1ba6f8a0 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -11,10 +11,10 @@ jobs: with: script: | github.rest.issues.removeLabel({ - context.repo.owner, - context.repo.repo, - context.issue.number, - name, + owner: context.repo.owner, + repo: context.repo.repo, + issue_number:context.issue.number, + name: "stale", }); - uses: actions/github-script@v7 if: ${{ !github.event.issue.pull_request && contains(github.event.comment.body, '/notexpired') }} @@ -36,3 +36,19 @@ jobs: pull_number: context.issue.number, state: "open", }); + - uses: actions/github-script@v7 + if: ${{ contains(github.event.comment.body, '/notexpired') }} + with: + script: | + github.rest.issues.removeLabel({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.issue.number, + name: "stale", + }); + github.rest.issues.removeLabel({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.issue.number, + name: "expired", + });

1 0

git:master:949b0079: topoh: mask_ip initialized again to 127.0.0.8
by Daniel-Constantin Mierla 27 Nov '23

27 Nov '23

Module: kamailio Branch: master Commit: 949b00795d748aa6b6af64c4ced8a3e8de369021 URL: https://github.com/kamailio/kamailio/commit/949b00795d748aa6b6af64c4ced8a3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-27T14:04:31+01:00 topoh: mask_ip initialized again to 127.0.0.8 - docs updated - code formatting updated by pre-commit hooks --- Modified: src/modules/topoh/doc/topoh_admin.xml Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/949b00795d748aa6b6af64c4ced8a3e… Patch: https://github.com/kamailio/kamailio/commit/949b00795d748aa6b6af64c4ced8a3e…

1 0

git:master:52cee630: modules: readme files regenerated - topoh ... [skip ci]
by Kamailio Dev 27 Nov '23

27 Nov '23

Module: kamailio Branch: master Commit: 52cee630d367287daa4b15c042b25bec76192e80 URL: https://github.com/kamailio/kamailio/commit/52cee630d367287daa4b15c042b25be… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-27T14:02:31+01:00 modules: readme files regenerated - topoh ... [skip ci] --- Modified: src/modules/topoh/README --- Diff: https://github.com/kamailio/kamailio/commit/52cee630d367287daa4b15c042b25be… Patch: https://github.com/kamailio/kamailio/commit/52cee630d367287daa4b15c042b25be… --- diff --git a/src/modules/topoh/README b/src/modules/topoh/README index 2fa0f4fd398..f1a761bf8f9 100644 --- a/src/modules/topoh/README +++ b/src/modules/topoh/README @@ -162,10 +162,12 @@ modparam("topoh", "mask_key", "some secret here") IP address to be used in masked headers to build valid SIP URIs. Can be any IP address, even a private-space or non-existing IP address (e.g., 192.168.1.1, 127.0.0.2), including the SIP server address, but must not - be an address potentially used by clients. It is not used at all for + be an address potentially used by clients. If not set, the advertised + IP of the incoming or outgoing socket is used. If there is no + advertised IP, the IP of the socket is used. It is not used at all for SIP routing. - Default value is "127.0.0.8". + Default value is empty. Example 1.2. Set mask_ip parameter ...

1 0

git:master:026e9035: github: react to PR/issue comments [skip ci]
by Victor Seva 27 Nov '23

27 Nov '23

Module: kamailio Branch: master Commit: 026e90350d0b4ec64695c373b70fa554d9337c34 URL: https://github.com/kamailio/kamailio/commit/026e90350d0b4ec64695c373b70fa55… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-27T13:53:26+01:00 github: react to PR/issue comments [skip ci] ``/notstale`` will remove ``stale`` label ``/notexpired`` will change the status to ``open`` > https://github.com/marketplace/actions/github-script --- Added: .github/workflows/labels.yml --- Diff: https://github.com/kamailio/kamailio/commit/026e90350d0b4ec64695c373b70fa55… Patch: https://github.com/kamailio/kamailio/commit/026e90350d0b4ec64695c373b70fa55… --- diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml new file mode 100644 index 00000000000..51aa34a603f --- /dev/null +++ b/.github/workflows/labels.yml @@ -0,0 +1,38 @@ +name: manage labels from comments + +on: [issue_comment] + +jobs: + manage: + runs-on: ubuntu-latest + steps: + - uses: actions/github-script@v7 + if: ${{ contains(github.event.comment.body, '/notstale') }} + with: + script: | + github.rest.issues.removeLabel({ + context.repo.owner, + context.repo.repo, + context.issue.number, + name, + }); + - uses: actions/github-script@v7 + if: ${{ !github.event.issue.pull_request && contains(github.event.comment.body, '/notexpired') }} + with: + script: | + github.rest.issues.update({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.issue.number, + state: "open", + }); + - uses: actions/github-script@v7 + if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/notexpired') }} + with: + script: | + github.rest.pulls.update({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: context.issue.number, + state: "open", + });

1 0

[kamailio/kamailio] topoh: uses socket IP when no mask_ip is defined (PR #3341)
by TorPetterson 27 Nov '23

27 Nov '23

#### 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  topoh: uses socket IP when no mask_ip is defined If the parameter mask_ip is not defined the module finds the socket IP and uses that as mask IP for the message. If the socket has an advertised IP it is used, otherwise the socket IP is used. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3341 -- Commit Summary -- * topoh: uses socket IP when no mask_ip is defined * Merge remote-tracking branch 'upstream/master' -- File Changes -- M src/modules/topoh/doc/topoh_admin.xml (4) M src/modules/topoh/th_msg.c (55) M src/modules/topoh/th_msg.h (16) M src/modules/topoh/topoh_mod.c (309) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3341.patch https://github.com/kamailio/kamailio/pull/3341.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3341 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3341(a)github.com>

5 14

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev