sr-dev September 2023

sr-dev@lists.kamailio.org

17 participants
294 discussions

git:master:062dbc7c: dispatcher: added pactive and pinactive for $dsg(key)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 062dbc7c7f74ebe705eff711e994c3eec5956e03 URL: https://github.com/kamailio/kamailio/commit/062dbc7c7f74ebe705eff711e994c3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T13:00:12+02:00 dispatcher: added pactive and pinactive for $dsg(key) - return percent of active/inactive route in the group --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/062dbc7c7f74ebe705eff711e994c3e… Patch: https://github.com/kamailio/kamailio/commit/062dbc7c7f74ebe705eff711e994c3e… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index e9676b0aae7..741fbe7fab7 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1424,6 +1424,10 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, active); case 2: /* inactive */ return pv_get_sintval(msg, param, res, inactive); + case 3: /* pactive */ + return pv_get_sintval(msg, param, res, (int)((active*100)/count)); + case 4: /* pinactive */ + return pv_get_sintval(msg, param, res, (int)((inactive*100)/count)); default: return pv_get_null(msg, param, res); } @@ -1450,12 +1454,24 @@ static int pv_parse_dsg(pv_spec_p sp, str *in) else goto error; break; + case 7: + if(strncmp(in->s, "pactive", 7) == 0) + sp->pvp.pvn.u.isname.name.n = 3; + 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; + case 9: + if(strncmp(in->s, "pinactive", 9) == 0) + sp->pvp.pvn.u.isname.name.n = 4; + else + goto error; + break; default: goto error; }

8 months, 2 weeks

git:master:b6979b50: modules: readme files regenerated - tm ... [skip ci]

by The Root

Module: kamailio Branch: master Commit: b6979b503ffe65314526a8a2824f50b3f46b7a22 URL: https://github.com/kamailio/kamailio/commit/b6979b503ffe65314526a8a2824f50b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2023-09-05T12:46:08+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/b6979b503ffe65314526a8a2824f50b… Patch: https://github.com/kamailio/kamailio/commit/b6979b503ffe65314526a8a2824f50b… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 0b44b81813c..19f4a9a3781 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1864,11 +1864,12 @@ modparam("tm", "failover_reply_codes", "code=403;code=488;class=5") 4.1. t_relay([host, port]) - Relay a message statefully either to the destination indicated in the - current URI (if called without any parameters) or to the specified host - and port. In the later case (host and port specified) the protocol used - is the same protocol on which the message was received. It creates a - transaction. + Relay a SIP request statefully either to the destination indicated in + the current URI (if called without any parameters) or to the specified + host and port. In the later case (host and port specified) the protocol + used is the same protocol on which the message was received. It creates + the SIP transaction, if none was created before (e.g., with + t_newtran()). t_relay() is the stateful version for forward() while t_relay(host, port) is similar to forward(host, port).

8 months, 2 weeks

git:master:d07eb9e5: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: d07eb9e54a075716c6bc96b123c3bbb885466da8 URL: https://github.com/kamailio/kamailio/commit/d07eb9e54a075716c6bc96b123c3bbb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-05T12:46:34+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/d07eb9e54a075716c6bc96b123c3bbb… Patch: https://github.com/kamailio/kamailio/commit/d07eb9e54a075716c6bc96b123c3bbb… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 307217bf070..79fc82ec175 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -121,6 +121,7 @@ Federico Cabiddu 4.13. ds_load_update() 4.14. ds_load_unset() 4.15. ds_reload() + 4.16. ds_dsg_fetch(setid) 5. RPC Commands @@ -208,8 +209,10 @@ Federico Cabiddu 1.55. ds_is_from_list usage 1.56. ds_is_active usage 1.57. ds_load_unset usage - 1.58. dispatcher list file - 1.59. Kamailio config script - sample dispatcher usage + 1.58. ds_reload usage + 1.59. ds_dsg_fetch() usage + 1.60. dispatcher list file + 1.61. Kamailio config script - sample dispatcher usage Chapter 1. Admin Guide @@ -285,6 +288,7 @@ Chapter 1. Admin Guide 4.13. ds_load_update() 4.14. ds_load_unset() 4.15. ds_reload() + 4.16. ds_dsg_fetch(setid) 5. RPC Commands @@ -1110,6 +1114,7 @@ modparam("dispatcher", "ds_interval_mode", 7200) 4.13. ds_load_update() 4.14. ds_load_unset() 4.15. ds_reload() + 4.16. ds_dsg_fetch(setid) 4.1. ds_select_dst(set, alg[, limit]) @@ -1597,6 +1602,26 @@ onreply_route { This function can be used from ANY_ROUTE. + Example 1.58. ds_reload usage +... + ds_reload(); +... + +4.16. ds_dsg_fetch(setid) + + Sets the destination group id to setid for fetching $dsg(key) + attributes. + + Parameters: setid - integer or variable holding the set id value + + This function can be used from ANY_ROUTE. + + Example 1.59. ds_dsg_fetch() usage +... + ds_dsg_fetch("1"); + xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); +... + 5. RPC Commands 5.1. dispatcher.set_state @@ -1875,7 +1900,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) For database, each element of a line resides in a different column. Next is a dispatcher.list file example: - Example 1.58. dispatcher list file + Example 1.60. dispatcher list file ... # # dispatcher destination sets (groups) @@ -1900,7 +1925,7 @@ r,opt) Next listing shows a sample config for using the dispatcher module. - Example 1.59. Kamailio config script - sample dispatcher usage + Example 1.61. Kamailio config script - sample dispatcher usage ... #!KAMAILIO #

8 months, 2 weeks

git:master:2e341d96: dispatcher: docs for ds_dsg_fetch()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2e341d961e6a9c24c93316459dbfe5c8fbb8db65 URL: https://github.com/kamailio/kamailio/commit/2e341d961e6a9c24c93316459dbfe5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-05T12:39:41+02:00 dispatcher: docs for ds_dsg_fetch() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2e341d961e6a9c24c93316459dbfe5c… Patch: https://github.com/kamailio/kamailio/commit/2e341d961e6a9c24c93316459dbfe5c… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 011c9af827e..334271038fe 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1976,6 +1976,28 @@ onreply_route { ... ds_reload(); ... +</programlisting> + </example> + </section> + <section id="dispatcher.f.ds_dsg_fetch"> + <title> + <function moreinfo="none">ds_dsg_fetch(setid)</function> + </title> + <para> + Sets the destination group id to setid for fetching $dsg(key) attributes. + </para> + <para>Parameters: <emphasis>setid</emphasis> - integer or variable + holding the set id value</para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>ds_dsg_fetch()</function> usage</title> + <programlisting format="linespecific"> +... + ds_dsg_fetch("1"); + xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); +... </programlisting> </example> </section>

8 months, 2 weeks

git:master:0e640014: dispatcher: docs - example for ds_reload()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0e640014019fff58d665e8c3f2d37b7c8d0cfd21 URL: https://github.com/kamailio/kamailio/commit/0e640014019fff58d665e8c3f2d37b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-05T12:34:41+02:00 dispatcher: docs - example for ds_reload() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0e640014019fff58d665e8c3f2d37b7… Patch: https://github.com/kamailio/kamailio/commit/0e640014019fff58d665e8c3f2d37b7… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 46148b03e4b..011c9af827e 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1970,6 +1970,14 @@ onreply_route { <para> This function can be used from ANY_ROUTE. </para> + <example> + <title><function>ds_reload</function> usage</title> + <programlisting format="linespecific"> +... + ds_reload(); +... +</programlisting> + </example> </section> </section>

8 months, 2 weeks

git:master:fef59a82: dispatcher: $dsg(key) - count active/inactive targets in the group

by Daniel-Constantin Mierla

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);

8 months, 2 weeks

[kamailio/kamailio] github: [skip ci]: bump actions/checkout from 3 to 4 (PR #3557)

by dependabot[bot]

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>

8 months, 2 weeks

git:master:873cd24f: github: [skip ci]: bump actions/checkout from 3 to 4

by Victor Seva

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: |

8 months, 2 weeks

[kamailio/kamailio] jwt: build jwt module for debian distributions (PR #3556)

by Emmanuel Schmidbauer

#### 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>

8 months, 2 weeks

git:master:ff323e8d: dispatcher: new variable $dsg(key) to get attributes of a dispatcher group

by Daniel-Constantin Mierla

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 */ /** *

8 months, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2023