sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
242 discussions

git:master:e54051d6: ndb_redis: clang-format for WITH_SSL code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e54051d698b059aa168229493dc2d6bf3cdd757c URL: https://github.com/kamailio/kamailio/commit/e54051d698b059aa168229493dc2d6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-19T14:26:27+01:00 ndb_redis: clang-format for WITH_SSL code --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/e54051d698b059aa168229493dc2d6b… Patch: https://github.com/kamailio/kamailio/commit/e54051d698b059aa168229493dc2d6b… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index ab0edf28187..9b755e42d6b 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -233,15 +233,15 @@ int redisc_init(void) } #ifdef WITH_SSL - if(enable_ssl) { - /* Create SSL context*/ - redisInitOpenSSL(); - rsrv->sslCtxRedis = redisCreateSSLContext( + if(enable_ssl) { + /* Create SSL context*/ + redisInitOpenSSL(); + rsrv->sslCtxRedis = redisCreateSSLContext( NULL, ndb_redis_ca_path, NULL, NULL, NULL, NULL); - if(rsrv->sslCtxRedis == NULL) { + if(rsrv->sslCtxRedis == NULL) { LM_ERR("Unable to create Redis TLS Context.\n"); - } - } + } + } #endif if(sock != 0) { @@ -260,10 +260,10 @@ int redisc_init(void) } #ifdef WITH_SSL - if(enable_ssl) { - /* Negotiate SSL/TLS handshake*/ - redisInitiateSSLWithContext(rsrv->ctxRedis, rsrv->sslCtxRedis); - } + if(enable_ssl) { + /* Negotiate SSL/TLS handshake*/ + redisInitiateSSLWithContext(rsrv->ctxRedis, rsrv->sslCtxRedis); + } #endif LOG(ndb_redis_debug, "rsrv->ctxRedis = %p\n", rsrv->ctxRedis); @@ -498,10 +498,10 @@ int redisc_reconnect_server(redisc_server_t *rsrv) pass, sizeof(pass) - 1, "%.*s", pit->body.len, pit->body.s); haspass = 1; #ifdef WITH_SSL - } else if(pit->name.len == 3 && strncmp(pit->name.s, "tls", 3) == 0) { + } else if(pit->name.len == 3 && strncmp(pit->name.s, "tls", 3) == 0) { snprintf( pass, sizeof(pass) - 1, "%.*s", pit->body.len, pit->body.s); - if(str2int(&pit->body, &enable_ssl) < 0) + if(str2int(&pit->body, &enable_ssl) < 0) enable_ssl = 0; #endif } else if(pit->name.len == 14

9 months, 3 weeks

[kamailio/kamailio] ERROR: acc [acc_extra.c:169]: parse_acc_extra() (Issue #3785)

by fulhade

This started happening with 5.8.0. I was to update our project with Docker image from 5.7.1 to 5.8.0 ``` kamailio[594]: ERROR: acc [acc_extra.c:169]: parse_acc_extra(): parse failed in <callid=$dlg(callid);src_user=$(dlg(from_uri){uri.user});dst_user=$(dlg(to_uri){uri.user});xxx_channel_id=$dlg_var(xxx_channel_id);t_error=$dlg_var(to_original_user);src_original_user=$dlg_var(from_original_user);dst_original_user=$dlg_var(to_original_user)id);src_user=$(dlg(from_uri){uri.user});dst_user=$(dlg(to_uri){uri.user});xxx_channel_id=$dlg_var(xxx_channel_id);t_error=$dlg_var(to_original_user);src_original_user=$dlg_var(from_original_user);dst_original_user=$dlg_var(to_original_user> around position 257 kamailio[594]: ERROR: acc [acc_extra.c:173]: parse_acc_extra(): error kamailio[594]: ERROR: acc [acc_cdr.c:827]: set_cdr_extra(): failed to parse crd_extra param kamailio[594]: ERROR: acc [acc_mod.c:528]: mod_init(): failed to set cdr extra 'callid=$dlg(callid);src_user=$(dlg(from_uri){uri.user});dst_user=$(dlg(to_uri){uri.user});xxx_channel_id=$dlg_var(xxx_channel_id);t_error=$dlg_var(to_original_user);src_original_user=$dlg_var(from_original_user);dst_original_user=$dlg_var(to_original_user)id);src_user=$(dlg(from_uri){uri.user});dst_user=$(dlg(to_uri){uri.user});xxx_channel_id=$dlg_var(xxx_channel_id);t_error=$dlg_var(to_original_user);src_original_user=$dlg_var(from_original_user);dst_original_user=$dlg_var(to_original_user' kamailio[594]: ERROR: <core> [core/sr_module.c:1039]: init_mod(): Error while initializing module acc (/usr/lib/x86_64-linux-gnu/kamailio/modules/acc.so) ``` This is how it looks in cfg: ``` modparam("acc", "cdr_extra", "callid=$dlg(callid);src_user=$(dlg(from_uri){uri.user});dst_user=$(dlg(to_uri){uri.user});" "xxx_channel_id=$dlg_var(xxx_channel_id);t_error=$dlg_var(to_original_user);" "src_original_user=$dlg_var(from_original_user);dst_original_user=$dlg_var(to_original_user)") ``` I have tested and it looks like it only happen if cdr_extra fields are bigger > 255 char. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3785 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3785(a)github.com>

9 months, 3 weeks

git:master:cee82c92: keepalive: small formatting updates and comments to the ka dest structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cee82c92b06a026b88fea654944f6146eb5cb4d8 URL: https://github.com/kamailio/kamailio/commit/cee82c92b06a026b88fea654944f614… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-19T10:21:51+01:00 keepalive: small formatting updates and comments to the ka dest structure --- Modified: src/modules/keepalive/keepalive.h --- Diff: https://github.com/kamailio/kamailio/commit/cee82c92b06a026b88fea654944f614… Patch: https://github.com/kamailio/kamailio/commit/cee82c92b06a026b88fea654944f614… --- diff --git a/src/modules/keepalive/keepalive.h b/src/modules/keepalive/keepalive.h index d5a8fcb2197..5ca1ce3561d 100644 --- a/src/modules/keepalive/keepalive.h +++ b/src/modules/keepalive/keepalive.h @@ -69,13 +69,15 @@ typedef struct _ka_initial_dest typedef struct _ka_dest { str uri; - str owner; // name of destination "owner" - // (module asking to monitor this destination - str uuid; // Universal id for this record + str owner; /*!< Name of destination "owner" */ + /*!< Module asking to monitor this destination */ + str uuid; /*!< Universal id for this record */ int flags; int state; - time_t last_checked, last_up, last_down; - int counter; // counts unreachable attempts + time_t last_checked; + time_t last_up; /*!< Time of last successful SIP reply */ + time_t last_down; /*!< Time of last failure SIP reply */ + int counter; /*!< Counts unreachable attempts */ ticks_t ping_interval; /*!< Actual interval between OPTIONS */ void *user_attr;

9 months, 3 weeks

git:master:9e2a0ee5: keepalive: proper storing of last up/down timestamps

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9e2a0ee545646bd4491ecdbe58d7fea770764b54 URL: https://github.com/kamailio/kamailio/commit/9e2a0ee545646bd4491ecdbe58d7fea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-19T09:51:28+01:00 keepalive: proper storing of last up/down timestamps - GH #3790 --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/9e2a0ee545646bd4491ecdbe58d7fea… Patch: https://github.com/kamailio/kamailio/commit/9e2a0ee545646bd4491ecdbe58d7fea… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index 0aaafa8c8da..b1b3581cb34 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -131,11 +131,11 @@ static void ka_options_callback( // accepting 2XX return codes if(ps->code >= 200 && ps->code <= 299) { state = KA_STATE_UP; - ka_dest->last_down = time(NULL); + ka_dest->last_up = time(NULL); ka_dest->counter = 0; } else { state = KA_STATE_DOWN; - ka_dest->last_up = time(NULL); + ka_dest->last_down = time(NULL); ka_dest->counter++; }

9 months, 3 weeks

[kamailio/kamailio] github: [skip ci]: bump tj-actions/changed-files from 42 to 43 (PR #3789)

by dependabot[bot]

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 42 to 43. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/releases">tj… releases</a>.</em></p> <blockquote> <h2>v43</h2> <h1>Changes in v43.0.0</h1> <h2>🔥🔥 BREAKING CHANGE 🔥🔥</h2> <ul> <li><code>any_{changed, modified, deleted}</code> outputs now return <code>true</code> when no file/directory patterns are specified.</li> </ul> <h2>What's Changed</h2> <ul> <li>Upgraded to v42.1.0 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1977&q… <li>chore(deps): lock file maintenance by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1979&q… <li>chore(deps): update dependency <code>@typescript-eslint/parser</code> to v7.2.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1980&q… <li>chore(deps): update dependency <code>@types/node</code> to v20.11.26 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1981&q… <li>chore(deps): update dependency <code>@typescript-eslint/eslint-plugin</code> to v7.2.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1982&q… <li>chore(deps): update dependency <code>@types/lodash</code> to v4.17.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1983&q… <li>chore(deps): update peter-evans/create-pull-request action to v6.0.2 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1984&q… <li>chore(deps): update dependency <code>@types/node</code> to v20.11.27 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1987&q… <li>feat: add support for returning true for <code>any_{changed, modified, deleted}</code> outputs when no patterns are specified by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1988&q… <li>Updated README.md by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1989&q… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/tj-actions/changed-files/compare/v42...v43.0.… <hr /> <h2>v43.0.0</h2> <h2>🔥🔥 BREAKING CHANGE 🔥🔥</h2> <ul> <li><code>any_{changed, modified, deleted}</code> outputs now return <code>true</code> when no file/directory patterns are specified.</li> </ul> <h2>What's Changed</h2> <ul> <li>Upgraded to v42.1.0 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1977&q… <li>chore(deps): lock file maintenance by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1979&q… <li>chore(deps): update dependency <code>@typescript-eslint/parser</code> to v7.2.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1980&q… <li>chore(deps): update dependency <code>@types/node</code> to v20.11.26 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1981&q… <li>chore(deps): update dependency <code>@typescript-eslint/eslint-plugin</code> to v7.2.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1982&q… <li>chore(deps): update dependency <code>@types/lodash</code> to v4.17.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1983&q… <li>chore(deps): update peter-evans/create-pull-request action to v6.0.2 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1984&q… <li>chore(deps): update dependency <code>@types/node</code> to v20.11.27 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1987&q… <li>feat: add support for returning true for <code>any_{changed, modified, deleted}</code> outputs when no patterns are specified by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1988&q… <li>Updated README.md by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/1989&q… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/tj-actions/changed-files/compare/v42...v43.0.… <h2>v42.1.0</h2> <p>🚀 🚀 New Feature 🚀 🚀</p> <ul> <li>Use changed-files output to run matrix jobs by simply setting the new <code>matrix</code> input to <code>true</code>.</li> </ul> <p>This serves as an alias for setting the <code>json</code> input to <code>true</code> and the <code>escape_json</code> input to <code>false</code></p> <pre lang="yml"><code>&lt;/tr&gt;&lt;/table&gt; </code></pre> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/blob/main/HISTORY.md… changelog</a>.</em></p> <blockquote> <h1>Changelog</h1> <h1><a href="https://github.com/tj-actions/changed-files/compare/v42.1.0...v4… - (2024-03-13)</h1> <h2>🚀 Features</h2> <ul> <li>Add support for returning true for <code>any_{changed, modified, deleted}</code> outputs when no patterns are specified (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1988…) (<a href="https://github.com/tj-actions/changed-files/commit/a5cf6aa30cfbe…) - (Tonye Jack)</li> </ul> <h2>🔄 Update</h2> <ul> <li>Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1989… </ul> <p>Co-authored-by: repo-ranger[bot]  (<a href="https://github.com/tj-actions/changed-files/commit/77af4bed28674…) - (tj-actions[bot])</p> <h2>⚙️ Miscellaneous Tasks</h2> <ul> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v20.11.27 (<a href="https://github.com/tj-actions/changed-files/commit/15807c9c84ec7…) - (renovate[bot])</li> <li><strong>deps:</strong> Update peter-evans/create-pull-request action to v6.0.2 (<a href="https://github.com/tj-actions/changed-files/commit/dc458cf7531fd…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/lodash</code> to v4.17.0 (<a href="https://github.com/tj-actions/changed-files/commit/92ca3eebd01cb…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@typescript-eslint/eslint-plugin</code> to v7.2.0 (<a href="https://github.com/tj-actions/changed-files/commit/f591d0c7f0b79…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v20.11.26 (<a href="https://github.com/tj-actions/changed-files/commit/35023362e2b0f…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@typescript-eslint/parser</code> to v7.2.0 (<a href="https://github.com/tj-actions/changed-files/commit/e436cb6d85bcd…) - (renovate[bot])</li> <li><strong>deps:</strong> Lock file maintenance (<a href="https://github.com/tj-actions/changed-files/commit/257d47dfba22b…) - (renovate[bot])</li> </ul> <h2>⬆️ Upgrades</h2> <ul> <li>Upgraded to v42.1.0 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1977… </ul> <p>Co-authored-by: jackton1 <a href="mailto:17484350+jackton1@users.noreply.github.com">17484350+jackton1@users.noreply.github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/4918e1183080b…) - (tj-actions[bot])</p> <h1><a href="https://github.com/tj-actions/changed-files/compare/v42.0.7...v4… - (2024-03-09)</h1> <h2>🚀 Features</h2> <ul> <li>Add matrix alias to simplify using outputs for matrix jobs (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1975…) (<a href="https://github.com/tj-actions/changed-files/commit/008ba8ceec9f1…) - (Tonye Jack)</li> </ul> <h2>🔄 Update</h2> <ul> <li>Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1976… </ul> <p>Co-authored-by: repo-ranger[bot]  (<a href="https://github.com/tj-actions/changed-files/commit/aa08304bd477b…) - (tj-actions[bot])</p> <h2>⬆️ Upgrades</h2> <ul> <li>Upgraded to v42.0.7 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1974… </ul> <p>Co-authored-by: jackton1 <a href="mailto:17484350+jackton1@users.noreply.github.com">17484350+jackton1@users.noreply.github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/fe6c3ea0ca88f…) - (tj-actions[bot])</p> <h1><a href="https://github.com/tj-actions/changed-files/compare/v42.0.6...v4… - (2024-03-07)</h1>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/tj-actions/changed-files/commit/77af4bed28674… Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1989… <li><a href="https://github.com/tj-actions/changed-files/commit/a5cf6aa30cfbe… feat: add support for returning true for <code>any_{changed, modified, deleted}</code> o...</li> <li><a href="https://github.com/tj-actions/changed-files/commit/15807c9c84ec7… chore(deps): update dependency <code>@types/node</code> to v20.11.27</li> <li><a href="https://github.com/tj-actions/changed-files/commit/dc458cf7531fd… chore(deps): update peter-evans/create-pull-request action to v6.0.2</li> <li><a href="https://github.com/tj-actions/changed-files/commit/92ca3eebd01cb… chore(deps): update dependency <code>@types/lodash</code> to v4.17.0</li> <li><a href="https://github.com/tj-actions/changed-files/commit/f591d0c7f0b79… chore(deps): update dependency <code>@typescript-eslint/eslint-plugin</code> to v7.2.0</li> <li><a href="https://github.com/tj-actions/changed-files/commit/35023362e2b0f… chore(deps): update dependency <code>@types/node</code> to v20.11.26</li> <li><a href="https://github.com/tj-actions/changed-files/commit/e436cb6d85bcd… chore(deps): update dependency <code>@typescript-eslint/parser</code> to v7.2.0</li> <li><a href="https://github.com/tj-actions/changed-files/commit/257d47dfba22b… chore(deps): lock file maintenance</li> <li><a href="https://github.com/tj-actions/changed-files/commit/4918e1183080b… Upgraded to v42.1.0 (<a href="https://redirect.github.com/tj-actions/changed-files/issues/1977… <li>See full diff in <a href="https://github.com/tj-actions/changed-files/compare/v42...v43&qu… view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?d… Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3789 -- Commit Summary -- * github: [skip ci]: bump tj-actions/changed-files from 42 to 43 -- File Changes -- M .github/workflows/devcontainer.yaml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3789.patch https://github.com/kamailio/kamailio/pull/3789.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3789 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3789(a)github.com>

9 months, 3 weeks

git:master:9ae99b3d: github: [skip ci]: bump tj-actions/changed-files from 42 to 43

by Victor Seva

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

9 months, 3 weeks

[kamailio/kamailio] Discrepancies in migration of commits from herlesupreeth/kamailio to upstream (Issue #3772)

by Axel Sommerfeldt

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

9 months, 3 weeks

git:5.8:0af55b0e: pdb server: Return negative carrierid for failures. Clang format

by Stefan-Cristian Mititelu

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

9 months, 3 weeks

git:5.8:6410f375: pdb: Return negative carrierid for failures

by Stefan-Cristian Mititelu

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

9 months, 3 weeks

git:5.7:c717c016: pdb server: Return negative carrierid for failures. Clang format

by Stefan-Cristian Mititelu

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

9 months, 3 weeks

← Newer
1
...
11
12
13
14
15
16
17
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024