sr-dev September 2023

sr-dev@lists.kamailio.org

17 participants
299 discussions

git:master:fef59a82: dispatcher: $dsg(key) - count active/inactive targets in the group
by Daniel-Constantin Mierla 05 Sep '23

05 Sep '23

Module: kamailio Branch: master Commit: fef59a8216e70a0eef47ce9c2eb9da32a16cd764 URL: https://github.com/kamailio/kamailio/commit/fef59a8216e70a0eef47ce9c2eb9da3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-05T12:31:32+02:00 dispatcher: $dsg(key) - count active/inactive targets in the group --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/fef59a8216e70a0eef47ce9c2eb9da3… Patch: https://github.com/kamailio/kamailio/commit/fef59a8216e70a0eef47ce9c2eb9da3… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 0264a37bc7e..e9676b0aae7 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1395,6 +1395,7 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) int count = 0; int active = 0; int inactive = 0; + int j = 0; if(param == NULL) { return -1; @@ -1405,6 +1406,17 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } + lock_get(&dsg->lock); + count = dsg->nr; + for(j = 0; j < dsg->nr; j++) { + if(ds_skip_dst(dsg->dlist[j].flags)) { + inactive++; + } else { + active++; + } + } + lock_release(&dsg->lock); + switch(param->pvn.u.isname.name.n) { case 0: /* count */ return pv_get_sintval(msg, param, res, count);

1 0

[kamailio/kamailio] github: [skip ci]: bump actions/checkout from 3 to 4 (PR #3557)
by dependabot[bot] 05 Sep '23

05 Sep '23

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/actions/checkout/releases">actions/ch… releases</a>.</em></p> <blockquote> <h2>v4.0.0</h2> <h2>What's Changed</h2> <ul> <li>Update default runtime to node20 by <a href="https://github.com/takost"><code>@takost</code… in <a href="https://redirect.github.com/actions/checkout/pull/1436">… <li>Support fetching without the --progress option by <a href="https://github.com/simonbaird"><code>@simonbaird&… in <a href="https://redirect.github.com/actions/checkout/pull/1067">… <li>Release 4.0.0 by <a href="https://github.com/takost"><code>@takost</code… in <a href="https://redirect.github.com/actions/checkout/pull/1447">… </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/takost"><code>@takost</code… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1436">… <li><a href="https://github.com/simonbaird"><code>@simonbaird&… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1067">… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/checkout/compare/v3...v4.0.0"&gt… <h2>v3.6.0</h2> <h2>What's Changed</h2> <ul> <li>Mark test scripts with Bash'isms to be run via Bash by <a href="https://github.com/dscho"><code>@dscho</code&g… in <a href="https://redirect.github.com/actions/checkout/pull/1377">… <li>Add option to fetch tags even if fetch-depth &gt; 0 by <a href="https://github.com/RobertWieczoreck"><code>@Rober… in <a href="https://redirect.github.com/actions/checkout/pull/579">a… <li>Release 3.6.0 by <a href="https://github.com/luketomlinson"><code>@luketoml… in <a href="https://redirect.github.com/actions/checkout/pull/1437">… </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/RobertWieczoreck"><code>@Rober… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/579">a… <li><a href="https://github.com/luketomlinson"><code>@luketoml… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1437">… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/checkout/compare/v3.5.3...v3.6.0&quot… <h2>v3.5.3</h2> <h2>What's Changed</h2> <ul> <li>Fix: Checkout Issue in self hosted runner due to faulty submodule check-ins by <a href="https://github.com/megamanics"><code>@megamanics&… in <a href="https://redirect.github.com/actions/checkout/pull/1196">… <li>Fix typos found by codespell by <a href="https://github.com/DimitriPapadopoulos"><code>@Di… in <a href="https://redirect.github.com/actions/checkout/pull/1287">… <li>Add support for sparse checkouts by <a href="https://github.com/dscho"><code>@dscho</code&g… and <a href="https://github.com/dfdez"><code>@dfdez</code&g… in <a href="https://redirect.github.com/actions/checkout/pull/1369">… <li>Release v3.5.3 by <a href="https://github.com/TingluoHuang"><code>@TingluoHu… in <a href="https://redirect.github.com/actions/checkout/pull/1376">… </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/megamanics"><code>@megamanics&… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1196">… <li><a href="https://github.com/DimitriPapadopoulos"><code>@Di… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1287">… <li><a href="https://github.com/dfdez"><code>@dfdez</code&g… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1369">… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/checkout/compare/v3...v3.5.3"&gt… <h2>v3.5.2</h2> <h2>What's Changed</h2> <ul> <li>Fix: Use correct API url / endpoint in GHES by <a href="https://github.com/fhammerl"><code>@fhammerl</… in <a href="https://redirect.github.com/actions/checkout/pull/1289">… based on <a href="https://redirect.github.com/actions/checkout/issues/1286"&g… by <a href="https://github.com/1newsr"><code>@1newsr</code… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/checkout/compare/v3.5.1...v3.5.2&quot… <h2>v3.5.1</h2> <h2>What's Changed</h2> <ul> <li>Improve checkout performance on Windows runners by upgrading <code>@actions/github</code> dependency by <a href="https://github.com/BrettDong"><code>@BrettDong&lt… in <a href="https://redirect.github.com/actions/checkout/pull/1246">… </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/BrettDong"><code>@BrettDong&lt… made their first contribution in <a href="https://redirect.github.com/actions/checkout/pull/1246">… </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/actions/checkout/blob/main/CHANGELOG.md"… changelog</a>.</em></p> <blockquote> <h1>Changelog</h1> <h2>v4.0.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1067">… fetching without the --progress option</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1436">… to node20</a></li> </ul> <h2>v3.6.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1377">…">Fix: Mark test scripts with Bash'isms to be run via Bash</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/579">A… option to fetch tags even if fetch-depth &gt; 0</a></li> </ul> <h2>v3.5.3</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1196">…">Fix: Checkout fail in self-hosted runners when faulty submodule are checked-in</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1287">… typos found by codespell</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1369">… support for sparse checkouts</a></li> </ul> <h2>v3.5.2</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1289">… api endpoint for GHES</a></li> </ul> <h2>v3.5.1</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1246">… slow checkout on Windows</a></li> </ul> <h2>v3.5.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1237">… new public key for known_hosts</a></li> </ul> <h2>v3.4.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1209">… codeql actions to v2</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1210">… dependencies</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1225">… <code>@actions/io</code></a></li> </ul> <h2>v3.3.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/1045">… branch list using callbacks from exec function</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1050">… in explicit reference to private checkout options</a></li> <li>[Fix comment typos (that got added in <a href="https://redirect.github.com/actions/checkout/issues/770"&gt… href="https://redirect.github.com/actions/checkout/pull/1057">… </ul> <h2>v3.2.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/942">A… GitHub Action to perform release</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/967">F… status badge</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1002">… datadog/squid with ubuntu/squid Docker image</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/964">W… pipeline commands for submoduleForeach in quotes</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1029">… <code>@actions/io</code> to 1.1.2</a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/1039">… version to 3.2.0</a></li> </ul> <h2>v3.1.0</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/939">U… <code>@actions/core</code> <code>saveState</code> and <code>getState</code></a></li> <li><a href="https://redirect.github.com/actions/checkout/pull/922">A… <code>github-server-url</code> input</a></li> </ul> <h2>v3.0.2</h2> <ul> <li><a href="https://redirect.github.com/actions/checkout/pull/770">A… input <code>set-safe-directory</code></a></li> </ul> <h2>v3.0.1</h2>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/actions/checkout/commit/3df4ab11eba7bda6032a0… Release 4.0.0 (<a href="https://redirect.github.com/actions/checkout/issues/1447"&g… <li><a href="https://github.com/actions/checkout/commit/8b5e8b768746b50394015… Support fetching without the --progress option (<a href="https://redirect.github.com/actions/checkout/issues/1067"&g… <li><a href="https://github.com/actions/checkout/commit/97a652b80035363df47ba… Update default runtime to node20 (<a href="https://redirect.github.com/actions/checkout/issues/1436"&g… <li>See full diff in <a href="https://github.com/actions/checkout/compare/v3...v4">com… 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/3557 -- Commit Summary -- * github: [skip ci]: bump actions/checkout from 3 to 4 -- File Changes -- M .github/workflows/alpine.yml (2) M .github/workflows/codeql.yml (2) M .github/workflows/main.yml (2) M .github/workflows/pull_request.yml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3557.patch https://github.com/kamailio/kamailio/pull/3557.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3557 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3557(a)github.com>

2 1

git:master:873cd24f: github: [skip ci]: bump actions/checkout from 3 to 4
by Victor Seva 05 Sep '23

05 Sep '23

Module: kamailio Branch: master Commit: 873cd24f6aa49b0b567a858ac8ab1b60eba2ef5f URL: https://github.com/kamailio/kamailio/commit/873cd24f6aa49b0b567a858ac8ab1b6… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-05T12:02:16+02:00 github: [skip ci]: bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/alpine.yml Modified: .github/workflows/codeql.yml Modified: .github/workflows/main.yml Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/873cd24f6aa49b0b567a858ac8ab1b6… Patch: https://github.com/kamailio/kamailio/commit/873cd24f6aa49b0b567a858ac8ab1b6… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 22cb34cd55b..7f2f5395734 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: print latest_commit run: echo ${{ github.sha }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 5fde27446e3..b6837bbdd0b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1cd2b414452..04885eaf034 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: - distribution: sid compilier: clang steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ammaraskar/gcc-problem-matcher(a)0.2.0 - name: build run: | diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index bf3168859de..bfba0702bdf 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,7 +12,7 @@ jobs: check-format: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: wolletd/clang-format-checker(a)v1.10 with: target-ref: master @@ -33,7 +33,7 @@ jobs: - distribution: bookworm compilier: clang steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ammaraskar/gcc-problem-matcher(a)0.2.0 - name: build run: |

1 0

[kamailio/kamailio] jwt: build jwt module for debian distributions (PR #3556)
by Emmanuel Schmidbauer 05 Sep '23

05 Sep '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 - [ ] 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 I am not very familiar with the build/packaging process but I'm hoping we can get `jwt` module packaged for debian since the dependencies (`libjwt`) already ship with most recent debian distributions. Any feedback would be appreciated here, thanks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3556 -- Commit Summary -- * jwt: build jwt module for debian distributions -- File Changes -- M pkg/kamailio/deb/bionic/rules (1) M pkg/kamailio/deb/bookworm/rules (1) M pkg/kamailio/deb/bullseye/rules (1) M pkg/kamailio/deb/buster/rules (1) M pkg/kamailio/deb/debian/rules (1) M pkg/kamailio/deb/focal/rules (1) M pkg/kamailio/deb/jammy/rules (1) M pkg/kamailio/deb/jessie/rules (1) M pkg/kamailio/deb/precise/rules (1) M pkg/kamailio/deb/sid/rules (1) M pkg/kamailio/deb/stretch/rules (1) M pkg/kamailio/deb/trusty/rules (1) M pkg/kamailio/deb/wheezy/rules (1) M pkg/kamailio/deb/xenial/rules (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3556.patch https://github.com/kamailio/kamailio/pull/3556.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3556 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3556(a)github.com>

3 8

git:master:ff323e8d: dispatcher: new variable $dsg(key) to get attributes of a dispatcher group
by Daniel-Constantin Mierla 04 Sep '23

04 Sep '23

Module: kamailio Branch: master Commit: ff323e8d7166fd781763608434da982e0918c7c9 URL: https://github.com/kamailio/kamailio/commit/ff323e8d7166fd781763608434da982… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-04T11:29:49+02:00 dispatcher: new variable $dsg(key) to get attributes of a dispatcher group --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/ff323e8d7166fd781763608434da982… Patch: https://github.com/kamailio/kamailio/commit/ff323e8d7166fd781763608434da982… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 5ba70524359..0264a37bc7e 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -184,6 +184,7 @@ static int w_ds_reload(struct sip_msg* msg, char*, char*); static int w_ds_is_active(sip_msg_t *msg, char *pset, char *p2); static int w_ds_is_active_uri(sip_msg_t *msg, char *pset, char *puri); +static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2); static int fixup_ds_is_from_list(void** param, int param_no); static int fixup_ds_list_exist(void** param,int param_no); @@ -194,10 +195,15 @@ static int ds_warn_fixup(void** param, int param_no); static int pv_get_dsv(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_dsv(pv_spec_p sp, str *in); +static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_dsg(pv_spec_p sp, str *in); +static void ds_dsg_fetch(int dg); static pv_export_t mod_pvs[] = { { {"dsv", (sizeof("dsv")-1)}, PVT_OTHER, pv_get_dsv, 0, pv_parse_dsv, 0, 0, 0 }, + { {"dsg", (sizeof("dsg")-1)}, PVT_OTHER, pv_get_dsg, 0, + pv_parse_dsg, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -255,6 +261,8 @@ static cmd_export_t cmds[]={ 0, 0, 0}, {"ds_reload", (cmd_function)w_ds_reload, 0, 0, 0, ANY_ROUTE}, + {"ds_dsg_fetch", (cmd_function)w_ds_dsg_fetch, 1, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -1349,6 +1357,106 @@ static int pv_parse_dsv(pv_spec_p sp, str *in) return -1; } +/** + * + */ +static int _pv_dsg_fetch = 1; + +/** + * + */ +static void ds_dsg_fetch(int dg) +{ + _pv_dsg_fetch = dg; +} + +/** + * + */ +static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2) +{ + int set; + + if(fixup_get_ivalue(msg, (gparam_p)pset, &set) != 0) { + LM_ERR("cannot get set id param value\n"); + return -1; + } + ds_dsg_fetch(set); + + return 1; +} + +/** + * + */ +static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + ds_set_t *dsg; + int count = 0; + int active = 0; + int inactive = 0; + + if(param == NULL) { + return -1; + } + dsg = ds_list_lookup(_pv_dsg_fetch); + + if(dsg == NULL) { + return pv_get_null(msg, param, res); + } + + switch(param->pvn.u.isname.name.n) { + case 0: /* count */ + return pv_get_sintval(msg, param, res, count); + case 1: /* active */ + return pv_get_sintval(msg, param, res, active); + case 2: /* inactive */ + return pv_get_sintval(msg, param, res, inactive); + default: + return pv_get_null(msg, param, res); + } +} + +/** + * + */ +static int pv_parse_dsg(pv_spec_p sp, str *in) +{ + if(sp == NULL || in == NULL || in->len <= 0) + return -1; + + switch(in->len) { + case 5: + if(strncmp(in->s, "count", 5) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + else + goto error; + break; + case 6: + if(strncmp(in->s, "active", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 1; + else + goto error; + break; + case 8: + if(strncmp(in->s, "inactive", 8) == 0) + sp->pvp.pvn.u.isname.name.n = 2; + else + goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV key: %.*s\n", in->len, in->s); + return -1; +} + /* KEMI wrappers */ /** *

1 0

git:master:4bbeaad2: dispatcher: helper function to return dispatcher set
by Daniel-Constantin Mierla 04 Sep '23

04 Sep '23

Module: kamailio Branch: master Commit: 4bbeaad235f8db5216380c3b381071a45d469ee0 URL: https://github.com/kamailio/kamailio/commit/4bbeaad235f8db5216380c3b381071a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-01T21:49:33+02:00 dispatcher: helper function to return dispatcher set --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/4bbeaad235f8db5216380c3b381071a… Patch: https://github.com/kamailio/kamailio/commit/4bbeaad235f8db5216380c3b381071a… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 9356fe65e1b..f64ab45ab16 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1598,6 +1598,25 @@ int ds_list_exist(int set) return 1; /* True */ } +/* + * Return a destination set + */ +ds_set_t *ds_list_lookup(int set) +{ + ds_set_t *si = NULL; + LM_DBG("looking for destination set [%d]\n", set); + + /* get the index of the set */ + si = ds_avl_find(_ds_list, set); + + if(si == NULL) { + LM_DBG("destination set [%d] not found\n", set); + return NULL; + } + LM_DBG("destination set [%d] found\n", set); + return si; +} + /** * */ diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 1add2d7000f..7b4d59edb0f 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -160,7 +160,6 @@ int ds_log_sets(void); int ds_list_exist(int set); int ds_is_active_uri(sip_msg_t *msg, int group, str *uri); - int ds_load_unset(struct sip_msg *msg); int ds_load_update(struct sip_msg *msg); @@ -278,6 +277,8 @@ struct ds_filter_dest_cb_arg { ds_set_t *ds_get_list(void); int ds_get_list_nr(void); +ds_set_t *ds_list_lookup(int set); + int ds_ping_active_init(void); int ds_ping_active_get(void); int ds_ping_active_set(int v);

1 0

git:master:f1ef0fa0: pv: added $viaX(params) to retun the parameters part of a Via body
by Daniel-Constantin Mierla 04 Sep '23

04 Sep '23

Module: kamailio Branch: master Commit: f1ef0fa09983969066784f20a78ec604e7ab66d2 URL: https://github.com/kamailio/kamailio/commit/f1ef0fa09983969066784f20a78ec60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-01T21:20:20+02:00 pv: added $viaX(params) to retun the parameters part of a Via body --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/f1ef0fa09983969066784f20a78ec60… Patch: https://github.com/kamailio/kamailio/commit/f1ef0fa09983969066784f20a78ec60… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index fc3cc7d125b..b81f37bc9a5 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4507,6 +4507,8 @@ int pv_parse_via_name(pv_spec_p sp, str *in) case 6: if(strncmp(in->s, "branch", 6) == 0) sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "params", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 8; else goto error; break; @@ -4580,6 +4582,11 @@ int pv_get_via_attr( return pv_get_strval(msg, param, res, &vb->i->value); } break; + case 8: /* params */ + if(vb->params.s != NULL && vb->params.len > 0) { + return pv_get_strval(msg, param, res, &vb->params); + } + break; default: return pv_get_null(msg, param, res);

1 0

git:master:753a60bf: core: parser for overflow control parameters in via header
by Daniel-Constantin Mierla 04 Sep '23

04 Sep '23

Module: kamailio Branch: master Commit: 753a60bf538985a54f8b9eafb98b7ce86b616a63 URL: https://github.com/kamailio/kamailio/commit/753a60bf538985a54f8b9eafb98b7ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-01T21:08:07+02:00 core: parser for overflow control parameters in via header - RFC7339 --- Modified: src/core/parser/parse_via.c Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/753a60bf538985a54f8b9eafb98b7ce… Patch: https://github.com/kamailio/kamailio/commit/753a60bf538985a54f8b9eafb98b7ce… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index 9452ce51132..921911f1d17 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -2817,3 +2817,40 @@ int parse_via_header(struct sip_msg *msg, int n, struct via_body **q) } else return -1; } + + +/* + * Parse/link Via overload-control parameters + */ +int parse_via_oc(struct sip_msg *msg, struct via_body *vbp, via_oc_t *ocp) +{ + via_param_t *vp; + + if(vbp == NULL || ocp == NULL) { + return -1; + } + memset(ocp, 0, sizeof(via_oc_t)); + + for(vp = vbp->param_lst; vp != NULL; vp = vp->next) { + if(vp->name.len == 2 && strncasecmp(vp->name.s, "oc", 2) == 0) { + ocp->oc = 1; + } else if(vp->name.len == 7 + && strncasecmp(vp->name.s, "oc-algo", 7) == 0) { + if(vp->value.len > 0) { + ocp->algo.len = vp->value.len; + ocp->algo.s = vp->value.s; + } + } else if(vp->name.len == 11 + && strncasecmp(vp->name.s, "oc-validity", 11) == 0) { + if(vp->value.len > 0) { + str2ulong(&vp->value, &ocp->validity); + } + } else if(vp->name.len == 6 + && strncasecmp(vp->name.s, "oc-seq", 6) == 0) { + if(vp->value.len > 0) { + str2int(&vp->value, &ocp->seq); + } + } + } + return 0; +} diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index 4cd17ca3e19..bd0a4ffbb14 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -66,6 +66,15 @@ typedef struct via_param } via_param_t; +/* RFC7339 - overload control */ +typedef struct via_oc +{ + int oc; + str algo; + unsigned long validity; + unsigned int seq; +} via_oc_t; + /* Format: name/version/transport host:port;params comment */ /* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ typedef struct via_body @@ -123,5 +132,9 @@ void free_via_list(struct via_body *vb); */ int parse_via_header(struct sip_msg *msg, int n, struct via_body **q); +/* + * Parse/link Via overload-control parameters + */ +int parse_via_oc(struct sip_msg *msg, struct via_body *vbp, via_oc_t *ocp); #endif /* PARSE_VIA_H */

1 0

Kamailio Patching Issues
by Bin LIU 03 Sep '23

03 Sep '23

Halo Experts, So sorry to disturb you for the kamailio start failure issue I faced recently when doing patching from version 5.5.4 to 5.5.6. Really appreciated if you could give me some assistance on it ! And attached is the start log. Thanks. Best regards, Louis LIU Senior Software Engineer (Cloud Platform && Audio/Video Intercom) M +86 18575580920 8F-A CES Building,No.3099 Global Offer Innovation E bin.liu2(a)se.com<mailto:bin.liu2@se.com> Keyuan South Road, Nanshan District Home & Distribution Division, Energy Management Shenzhen, China [cid:image001.png@01D9CAE5.A472D190] Download mySchneider app<https://www.se.com/ww/en/work/support/myschneider-app/> 24/7 support Mobile catalog. Acces to expert help. Internal

2 4

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2023