sr-dev February 2022

sr-dev@lists.kamailio.org

17 participants
243 discussions

git:5.5:76a5a7a9: dispatcher: small docs extension, algo 3 hashes only over r-uri user (DS_HASH_USER_ONLY 1)
by Henning Westerholt 15 Feb '22

15 Feb '22

Module: kamailio Branch: 5.5 Commit: 76a5a7a999d0e37499bcc2ba1e412ae1f10a4f6c URL: https://github.com/kamailio/kamailio/commit/76a5a7a999d0e37499bcc2ba1e412ae… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-02-15T08:35:12Z dispatcher: small docs extension, algo 3 hashes only over r-uri user (DS_HASH_USER_ONLY 1) (cherry picked from commit 0f633c0def3759078fea427597190fab196c89bd) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/76a5a7a999d0e37499bcc2ba1e412ae… Patch: https://github.com/kamailio/kamailio/commit/76a5a7a999d0e37499bcc2ba1e412ae… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 0ac1a430e6..a7191681bc 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1154,7 +1154,7 @@ modparam("dispatcher", "reload_delta", 1) </listitem> <listitem> <para> - <quote>3</quote> - hash over request-URI. + <quote>3</quote> - hash over request-URI user. </para> </listitem> <listitem>

1 0

git:5.4:bf172e99: dispatcher: small docs extension, algo 3 hashes only over r-uri user (DS_HASH_USER_ONLY 1)
by Henning Westerholt 15 Feb '22

15 Feb '22

Module: kamailio Branch: 5.4 Commit: bf172e998ed2a7cfe58635d0722717e40ebf6eea URL: https://github.com/kamailio/kamailio/commit/bf172e998ed2a7cfe58635d0722717e… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-02-15T08:34:55Z dispatcher: small docs extension, algo 3 hashes only over r-uri user (DS_HASH_USER_ONLY 1) (cherry picked from commit 0f633c0def3759078fea427597190fab196c89bd) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bf172e998ed2a7cfe58635d0722717e… Patch: https://github.com/kamailio/kamailio/commit/bf172e998ed2a7cfe58635d0722717e… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 30f32ca038..a0e841b3ce 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1150,7 +1150,7 @@ modparam("dispatcher", "reload_delta", 1) </listitem> <listitem> <para> - <quote>3</quote> - hash over request-URI. + <quote>3</quote> - hash over request-URI user. </para> </listitem> <listitem>

1 0

git:master:0f633c0d: dispatcher: small docs extension, algo 3 hashes only over r-uri user (DS_HASH_USER_ONLY 1)
by Henning Westerholt 15 Feb '22

15 Feb '22

Module: kamailio Branch: master Commit: 0f633c0def3759078fea427597190fab196c89bd URL: https://github.com/kamailio/kamailio/commit/0f633c0def3759078fea427597190fa… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-02-15T08:30:47Z dispatcher: small docs extension, algo 3 hashes only over r-uri user (DS_HASH_USER_ONLY 1) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0f633c0def3759078fea427597190fa… Patch: https://github.com/kamailio/kamailio/commit/0f633c0def3759078fea427597190fa… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 7507773e13..78523a7c1b 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1154,7 +1154,7 @@ modparam("dispatcher", "reload_delta", 1) </listitem> <listitem> <para> - <quote>3</quote> - hash over request-URI. + <quote>3</quote> - hash over request-URI user. </para> </listitem> <listitem>

1 0

git:master:a78b2dcd: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 15 Feb '22

15 Feb '22

Module: kamailio Branch: master Commit: a78b2dcdb484dd3c58b5c3c59e6e627bf2947516 URL: https://github.com/kamailio/kamailio/commit/a78b2dcdb484dd3c58b5c3c59e6e627… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-15T08:16:18+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/a78b2dcdb484dd3c58b5c3c59e6e627… Patch: https://github.com/kamailio/kamailio/commit/a78b2dcdb484dd3c58b5c3c59e6e627… --- diff --git a/src/modules/async/README b/src/modules/async/README index e26f2ea584..744e98bf3e 100644 --- a/src/modules/async/README +++ b/src/modules/async/README @@ -35,6 +35,7 @@ Daniel-Constantin Mierla 4.3. async_sleep(seconds) 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) + 4.6. async_task_group_route(routename, groupname) List of Examples @@ -46,6 +47,7 @@ Daniel-Constantin Mierla 1.6. async_ms_sleep usage 1.7. async_workers usage 1.8. async_task_route usage + 1.9. async_task_group_route usage Chapter 1. Admin Guide @@ -69,6 +71,7 @@ Chapter 1. Admin Guide 4.3. async_sleep(seconds) 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) + 4.6. async_task_group_route(routename, groupname) 1. Overview @@ -139,6 +142,7 @@ modparam("async", "ms_timer", 10) 4.3. async_sleep(seconds) 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) + 4.6. async_task_group_route(routename, groupname) 4.1. async_route(routename, seconds) @@ -266,10 +270,11 @@ route[REQUESTSHAPER] { 4.5. async_task_route(routename) Continue the processing of the SIP request with the route[routename] in - one of the processes from core asynchronous framework. The core - parameter async_workers has to be set to enable asynchronous framework. - The task is executed as soon as a process from asynchronous framework - is idle, there is no wait time for the task like for async_route(...). + one of the processes from first group of core asynchronous framework. + The core parameter async_workers has to be set to enable asynchronous + framework. The task is executed as soon as a process from asynchronous + framework is idle, there is no wait time for the task like for + async_route(...). To enable the core asynchronous framework, you need to set the async_workers core parameter in the configuration file. See the core @@ -307,3 +312,26 @@ route[RESUME] { exit; } ... + +4.6. async_task_group_route(routename, groupname) + + Similar to async_task_route(), but allows to specify the name of the + group for asynchronous workers. See also 'async_workers_group' core + global parameter. + + This function can be used from REQUEST_ROUTE. + + Example 1.9. async_task_group_route usage +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_route("RESUME", "abc"); + ... +} +route[RESUME] { + t_relay(); + exit; +} +...

1 0

git:master:5f590180: async: docs for async_task_group_route(routename, groupname)
by Daniel-Constantin Mierla 15 Feb '22

15 Feb '22

Module: kamailio Branch: master Commit: 5f590180c3acc5f786c1d0667997c1b3b8924ed9 URL: https://github.com/kamailio/kamailio/commit/5f590180c3acc5f786c1d0667997c1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-15T08:10:54+01:00 async: docs for async_task_group_route(routename, groupname) --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5f590180c3acc5f786c1d0667997c1b… Patch: https://github.com/kamailio/kamailio/commit/5f590180c3acc5f786c1d0667997c1b… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index a56c60d7d2..1db4d60e9e 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -287,8 +287,8 @@ route[REQUESTSHAPER] { </title> <para> Continue the processing of the SIP request with the route[routename] - in one of the processes from core asynchronous framework. The core - parameter async_workers has to be set to enable asynchronous + in one of the processes from first group of core asynchronous framework. + The core parameter async_workers has to be set to enable asynchronous framework. The task is executed as soon as a process from asynchronous framework is idle, there is no wait time for the task like for async_route(...). @@ -339,6 +339,37 @@ route[RESUME] { exit; } ... +</programlisting> + </example> + </section> + <section id="async.f.async_task_group_route"> + <title> + <function moreinfo="none">async_task_group_route(routename, groupname)</function> + </title> + <para> + Similar to async_task_route(), but allows to specify the name of the group + for asynchronous workers. See also 'async_workers_group' core global + parameter. + </para> + <para> + This function can be used from REQUEST_ROUTE. + </para> + <example> + <title><function>async_task_group_route</function> usage</title> + <programlisting format="linespecific"> +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_route("RESUME", "abc"); + ... +} +route[RESUME] { + t_relay(); + exit; +} +... </programlisting> </example> </section>

1 0

git:master:812e77d3: async: added async_task_group_route(routename, groupname) function
by Daniel-Constantin Mierla 15 Feb '22

15 Feb '22

Module: kamailio Branch: master Commit: 812e77d393faf9b49f54d7fc16e3aa5e74168a5d URL: https://github.com/kamailio/kamailio/commit/812e77d393faf9b49f54d7fc16e3aa5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-15T08:09:52+01:00 async: added async_task_group_route(routename, groupname) function - similar to async_task_route() that allows to specify the group of async task processes --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c Modified: src/modules/async/async_sleep.h --- Diff: https://github.com/kamailio/kamailio/commit/812e77d393faf9b49f54d7fc16e3aa5… Patch: https://github.com/kamailio/kamailio/commit/812e77d393faf9b49f54d7fc16e3aa5…

1 0

git:master:546639ba: core: async task - keep group structure as global for own processes
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: master Commit: 546639ba55e8d0e3116d4d2bb1999d7a44f6fe69 URL: https://github.com/kamailio/kamailio/commit/546639ba55e8d0e3116d4d2bb1999d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T15:17:11+01:00 core: async task - keep group structure as global for own processes --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/546639ba55e8d0e3116d4d2bb1999d7… Patch: https://github.com/kamailio/kamailio/commit/546639ba55e8d0e3116d4d2bb1999d7… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index b64e071a11..a96eb90286 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -46,6 +46,7 @@ #include "async_task.h" static async_wgroup_t *_async_wgroup_list = NULL; +static async_wgroup_t *_async_wgroup_crt = NULL; int async_task_run(async_wgroup_t *awg, int idx); @@ -68,6 +69,14 @@ int async_task_workers_active(void) return 1; } +/** + * + */ +async_wgroup_t *async_task_workers_get_crt(void) +{ + return _async_wgroup_crt; +} + /** * */ @@ -446,6 +455,8 @@ int async_task_run(async_wgroup_t *awg, int idx) LM_DBG("async task worker [%.*s] idx [%d] ready\n", awg->name.len, awg->name.s, idx); + _async_wgroup_crt = awg; + for( ; ; ) { if(unlikely(awg->usleep)) sleep_us(awg->usleep); if ((received = recvfrom(awg->sockets[0], diff --git a/src/core/async_task.h b/src/core/async_task.h index 6539f7f92e..4f6a3598b1 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -50,6 +50,7 @@ int async_task_push(async_task_t *task); int async_task_set_usleep(int n); int async_task_workers_get(void); int async_task_workers_active(void); +async_wgroup_t *async_task_workers_get_crt(void); int async_task_group_push(str *gname, async_task_t *task);

1 0

git:5.5:3c3ffd80: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 3c3ffd803192b92f126f7f08119459593eafe30c URL: https://github.com/kamailio/kamailio/commit/3c3ffd803192b92f126f7f081194595… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-14T15:17:04+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/xmlops/README --- Diff: https://github.com/kamailio/kamailio/commit/3c3ffd803192b92f126f7f081194595… Patch: https://github.com/kamailio/kamailio/commit/3c3ffd803192b92f126f7f081194595… --- diff --git a/src/modules/xmlops/README b/src/modules/xmlops/README index 0ecfcb5ca0..df62770802 100644 --- a/src/modules/xmlops/README +++ b/src/modules/xmlops/README @@ -93,11 +93,28 @@ modparam("xmlops", "buf_size", 8192) 3.2. xml_ns (str) Register xml namespace prefix. Parameter value must have the format: - 'prefix=uri'. + 'prefix=uri'. It can be set many times to cope with multiple namespaces + without prefix. + + This is useful when it is needed to access XML documents that specify + xmlns without prefix, which is not XML-standard compliant, but it comes + with SIP SIMPLE presence bodies. Example 1.2. Set xml_ns parameter ... modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") +modparam("xmlops", "xml_ns", "pidf=urn:ietf:params:xml:ns:pidf") +... +$xml(x=>doc) = '<?xml version="1.0" encoding="utf-8"?> + <presence xmlns="urn:ietf:params:xml:ns:pidf" entity="sip:test@mydomain.com" +> + <tuple id="86ae65b7-42de-4399-b635-295caad13aac"> + <status><basic>none</basic></status> + </tuple> + </presence>'; + +xinfo("status: $xml(x=>xpath:/pidf:presence/pidf:tuple/pidf:status/pidf:basic)\n +"); ... 4. Pseudo-Variables

1 0

git:5.5:78710d9d: xmlops: docs - added the remark that xml_ns param can be set many times
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 78710d9da5cfe117190694cd3b77ced54414a2e8 URL: https://github.com/kamailio/kamailio/commit/78710d9da5cfe117190694cd3b77ced… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:04:01+01:00 xmlops: docs - added the remark that xml_ns param can be set many times (cherry picked from commit 56e26387b77536e6c9f13dd62e5aecabaaba2d9a) --- Modified: src/modules/xmlops/doc/xmlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/78710d9da5cfe117190694cd3b77ced… Patch: https://github.com/kamailio/kamailio/commit/78710d9da5cfe117190694cd3b77ced… --- diff --git a/src/modules/xmlops/doc/xmlops_admin.xml b/src/modules/xmlops/doc/xmlops_admin.xml index d78247d310..d9a6e04a5d 100644 --- a/src/modules/xmlops/doc/xmlops_admin.xml +++ b/src/modules/xmlops/doc/xmlops_admin.xml @@ -68,7 +68,8 @@ modparam("xmlops", "buf_size", 8192) <title><varname>xml_ns</varname> (str)</title> <para> Register xml namespace prefix. Parameter value must have the format: - 'prefix=uri'. + 'prefix=uri'. It can be set many times to cope with multiple namespaces + without prefix. </para> <para> This is useful when it is needed to access XML documents that specify @@ -80,6 +81,7 @@ modparam("xmlops", "buf_size", 8192) <programlisting format="linespecific"> <![CDATA[ ... +modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") modparam("xmlops", "xml_ns", "pidf=urn:ietf:params:xml:ns:pidf") ... $xml(x=>doc) = '<?xml version="1.0" encoding="utf-8"?>

1 0

git:5.5:207e0d9f: xmlops: docs - more practical example for xml_ns
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 207e0d9f80b2e1a48c7c21844f158e231bfd8e1e URL: https://github.com/kamailio/kamailio/commit/207e0d9f80b2e1a48c7c21844f158e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:03:43+01:00 xmlops: docs - more practical example for xml_ns (cherry picked from commit 0cb6a0640e9e3e2e06d2c5bc68c6177d5bd38b89) --- Modified: src/modules/xmlops/doc/xmlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/207e0d9f80b2e1a48c7c21844f158e2… Patch: https://github.com/kamailio/kamailio/commit/207e0d9f80b2e1a48c7c21844f158e2… --- diff --git a/src/modules/xmlops/doc/xmlops_admin.xml b/src/modules/xmlops/doc/xmlops_admin.xml index 7082b03b1f..d78247d310 100644 --- a/src/modules/xmlops/doc/xmlops_admin.xml +++ b/src/modules/xmlops/doc/xmlops_admin.xml @@ -68,13 +68,30 @@ modparam("xmlops", "buf_size", 8192) <title><varname>xml_ns</varname> (str)</title> <para> Register xml namespace prefix. Parameter value must have the format: - 'prefix=uri'.</para> + 'prefix=uri'. + </para> + <para> + This is useful when it is needed to access XML documents that specify + xmlns without prefix, which is not XML-standard compliant, but it + comes with SIP SIMPLE presence bodies. + </para> <example> <title>Set <varname>xml_ns</varname> parameter</title> <programlisting format="linespecific"> +<![CDATA[ ... -modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") +modparam("xmlops", "xml_ns", "pidf=urn:ietf:params:xml:ns:pidf") +... +$xml(x=>doc) = '<?xml version="1.0" encoding="utf-8"?> + <presence xmlns="urn:ietf:params:xml:ns:pidf" entity="sip:test@mydomain.com"> + <tuple id="86ae65b7-42de-4399-b635-295caad13aac"> + <status><basic>none</basic></status> + </tuple> + </presence>'; + +xinfo("status: $xml(x=>xpath:/pidf:presence/pidf:tuple/pidf:status/pidf:basic)\n"); ... +]]> </programlisting> </example> </section>

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
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 February 2022