- sr-dev - kamailio.org

git:master:6462571b: async: docs for async task data functions
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: 6462571bbdf1270516243b6759a26625ca874b80 URL: https://github.com/kamailio/kamailio/commit/6462571bbdf1270516243b6759a2662… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T09:39:43+01:00 async: docs for async task data functions --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6462571bbdf1270516243b6759a2662… Patch: https://github.com/kamailio/kamailio/commit/6462571bbdf1270516243b6759a2662… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 1db4d60e9e..b0e5ec45bd 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -370,6 +370,74 @@ route[RESUME] { exit; } ... +</programlisting> + </example> + </section> + <section id="async.f.async_task_data"> + <title> + <function moreinfo="none">async_task_data(routename, data)</function> + </title> + <para> + Send the data to a asynchronous task process (in the first group) that + executes the route[rountename] and makes the data available via $async(data). + </para> + <para> + The current SIP message is not suspended and it is not available in + the asynchronous task process, a local faked SIP request is used there. + </para> + <para> + The parameters can contain variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>async_task_data</function> usage</title> + <programlisting format="linespecific"> +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_data("RESUME", "caller: $fU - callee: $tU"); + ... +} +route[RESUME] { + xinfo("$async(data)\n"); + exit; +} +... +</programlisting> + </example> + </section> + <section id="async.f.async_task_group_data"> + <title> + <function moreinfo="none">async_task_group_data(routename, groupname, data)</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 ANY_ROUTE. + </para> + <example> + <title><function>async_task_group_data</function> usage</title> + <programlisting format="linespecific"> +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_data("RESUME", "abc", "caller: $fU - callee: $tU"); + ... +} +route[RESUME] { + xinfo("$async(data)\n"); + exit; +} +... </programlisting> </example> </section>

1 0

git:master:e9595b5f: async: allow async task data functions in any route
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: e9595b5fcc758a50cea5dcaa0d9109e2f349ecca URL: https://github.com/kamailio/kamailio/commit/e9595b5fcc758a50cea5dcaa0d9109e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T09:39:43+01:00 async: allow async task data functions in any route --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e9595b5fcc758a50cea5dcaa0d9109e… Patch: https://github.com/kamailio/kamailio/commit/e9595b5fcc758a50cea5dcaa0d9109e… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 69717273b9..60cd10e677 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -79,9 +79,9 @@ static cmd_export_t cmds[]={ {"async_task_group_route", (cmd_function)w_async_task_group_route, 2, fixup_async_task_route, 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"async_task_data", (cmd_function)w_async_task_data, 2, fixup_async_task_route, - 0, REQUEST_ROUTE|FAILURE_ROUTE}, + 0, ANY_ROUTE}, {"async_task_group_data", (cmd_function)w_async_task_group_data, 3, fixup_async_task_route, - 0, REQUEST_ROUTE|FAILURE_ROUTE}, + 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -104,7 +104,7 @@ struct module_exports exports = { cmds, params, 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ + mod_pvs, /* exported pseudo-variables */ 0, /* response function */ mod_init, /* module initialization function */ child_init, /* per child init function */

1 0

git:master:5f32e36b: async: functions to execute async tasks only with custom data
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: 5f32e36b94ec21836fa910062e4121a8e47019fc URL: https://github.com/kamailio/kamailio/commit/5f32e36b94ec21836fa910062e4121a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T09:39:43+01:00 async: functions to execute async tasks only with custom data - variants which don't suspend transaction, just pass some custom data to async workers to execute route blocks with faked message --- 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/5f32e36b94ec21836fa910062e4121a… Patch: https://github.com/kamailio/kamailio/commit/5f32e36b94ec21836fa910062e4121a…

1 0

git:master:a2b08993: async: added variable $async(key)
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: a2b089939afc5309fc86d68bc9d43619bda4fec5 URL: https://github.com/kamailio/kamailio/commit/a2b089939afc5309fc86d68bc9d4361… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T09:39:43+01:00 async: added variable $async(key) - get async task group name and async task data --- 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/a2b089939afc5309fc86d68bc9d4361… Patch: https://github.com/kamailio/kamailio/commit/a2b089939afc5309fc86d68bc9d4361… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 1020cd0c46..69717273b9 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -92,6 +92,12 @@ static param_export_t params[]={ {0, 0, 0} }; +static pv_export_t mod_pvs[] = { + { {"async", sizeof("async")-1}, PVT_OTHER, pv_get_async, 0, + pv_parse_async_name, 0, 0, 0 }, + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + struct module_exports exports = { "async", DEFAULT_DLFLAGS, /* dlopen flags */ diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 7c46174284..cfbfe98cef 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -619,3 +619,59 @@ int async_send_data(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, return 0; } + + +/** + * + */ +int pv_get_async(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + async_wgroup_t *awg = NULL; + + switch(param->pvn.u.isname.name.n) { + case 0: + if(_ksr_async_data_param==NULL || _ksr_async_data_param->sval.s==NULL + || _ksr_async_data_param->sval.len<0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &_ksr_async_data_param->sval); + case 1: + awg = async_task_workers_get_crt(); + if(awg==NULL || awg->name.s==NULL || awg->name.len<0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &awg->name); + default: + return pv_get_null(msg, param, res); + } +} + +/** + * + */ +int pv_parse_geoip_name(pv_spec_t *sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) { + case 4: + if(strncmp(in->s, "data", 4)==0) + sp->pvp.pvn.u.isname.name.n = 0; + break; + case 5: + if(strncmp(in->s, "gname", 5)==0) + sp->pvp.pvn.u.isname.name.n = 1; + 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 time name %.*s\n", in->len, in->s); + return -1; +} diff --git a/src/modules/async/async_sleep.h b/src/modules/async/async_sleep.h index 2da46556f2..bb7dd042ce 100644 --- a/src/modules/async/async_sleep.h +++ b/src/modules/async/async_sleep.h @@ -53,4 +53,7 @@ int async_send_task(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname); int async_send_data(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, str *sdata); +int pv_get_async(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_async_name(pv_spec_t *sp, str *in); + #endif

1 0

[kamailio/kamailio] [tm.so] To-Tag in 200ok for CANCEL request (Issue #3021)
by alexey-khabulyak 15 Feb '22

15 Feb '22

Hi. I have simple call flow: ``` UAS PROXY UAS 1 | INVITE | | |---------->| | 2 | 100 | | |<----------| | 3 | | INVITE | | |---------->| 4 | | 100 | | |<----------| 5 | | 180 | | |<----------| 6 | 180 | | |<----------| | 7 | | 183 | | |<----------| 8 | 183 | | |<----------| | 9 | CANCEL | | |---------->| | 10| | CANCEL | | |---------->| 11| 200 | | |<----------| | 12| | 200 | | |<----------| 13| | 487 | | |<----------| 14| | ACK | | |---------->| 15| 487 | | |<----------| | 16| ACK | | |---------->| | ``` One of our customers complains that TO-TAGs in 183 (packet 8) and 200(packet 11) are not equal(their devices see 3 to-tag during 1 dialog). I found in RFC 3261that it's ok(https://datatracker.ietf.org/doc/html/rfc3261#section-16.10). 183 is forwarded from UAS(UAS sets to-tag) and 200 is generated by Kamailio. This is why to-tags in 183 and 200 are not equal. Is it possible to use to-tag from master branch(ofc if we have received a reply from UAS and we have this tag)? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3021 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3021(a)github.com>

2 3

[kamailio/kamailio] Kamailio Activation Failed (Issue #3027)
by LeoM30 15 Feb '22

15 Feb '22

kamailio[20903]: ERROR: <core> [core/tcp_main.c:3101]: tcp_init(): bind(2d, 0x7f7cff0ff610, 16) on xxx.xxx.xx.xx:5060 : Address already in use #Sudo kamailio status ERROR: connect_unix_sock: connect(/var/run/kamailio//kamailio_ctl): No such file or directory Thanks -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3027 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3027(a)github.com>

2 2

[kamailio/kamailio] SIP redirect server cannot changes port service (Issue #3026)
by bayupmail 15 Feb '22

15 Feb '22

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` Hello Experts, please help me to change port service from default 5060 port into other port due to security reason. Since I have change port in kamailio.cfg file, but services cannot fly normally that shown client unable login online (status not online). ![image](https://user-images.githubusercontent.com/76675592/154027407-24ab423b-302b-435e-bad4-5dcb22a5ad3d.png) Besides, I need to run the kamailio services after install default kamailio, I have not found where procedure found in this installation process. Thanks Bp -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3026 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3026(a)github.com>

2 2

git:5.4:dfcb993e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 15 Feb '22

15 Feb '22

Module: kamailio Branch: 5.4 Commit: dfcb993e65f47ab5ca8c56a9b1783d5f37c8bc84 URL: https://github.com/kamailio/kamailio/commit/dfcb993e65f47ab5ca8c56a9b1783d5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-15T09:47:02+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/dfcb993e65f47ab5ca8c56a9b1783d5… Patch: https://github.com/kamailio/kamailio/commit/dfcb993e65f47ab5ca8c56a9b1783d5… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 0b23347716..9cb4426a73 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1046,7 +1046,7 @@ modparam("dispatcher", "reload_delta", 1) + “0” - hash over callid + “1” - hash over from URI. + “2” - hash over to URI. - + “3” - hash over request-URI. + + “3” - hash over request-URI user. + “4” - round-robin (next destination). + “5” - hash over authorization-username (Proxy-Authorization or "normal" authorization). If no username is found, round robin

1 0

git:5.5:315b22ad: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 15 Feb '22

15 Feb '22

Module: kamailio Branch: 5.5 Commit: 315b22adf71908f147760b161045c9dda3ff1979 URL: https://github.com/kamailio/kamailio/commit/315b22adf71908f147760b161045c9d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-15T09:46:42+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/315b22adf71908f147760b161045c9d… Patch: https://github.com/kamailio/kamailio/commit/315b22adf71908f147760b161045c9d… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 5b029903f4..09a96871e8 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1051,7 +1051,7 @@ modparam("dispatcher", "reload_delta", 1) + “0” - hash over callid + “1” - hash over from URI. + “2” - hash over to URI. - + “3” - hash over request-URI. + + “3” - hash over request-URI user. + “4” - round-robin (next destination). + “5” - hash over authorization-username (Proxy-Authorization or "normal" authorization). If no username is found, round robin

1 0

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

15 Feb '22

Module: kamailio Branch: master Commit: 961f27665394010d517e54c7e3e2e8da0916cce7 URL: https://github.com/kamailio/kamailio/commit/961f27665394010d517e54c7e3e2e8d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-15T09:46:21+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/961f27665394010d517e54c7e3e2e8d… Patch: https://github.com/kamailio/kamailio/commit/961f27665394010d517e54c7e3e2e8d… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 76e24ffa69..6f9146b8d6 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1055,7 +1055,7 @@ modparam("dispatcher", "reload_delta", 1) + “0” - hash over callid + “1” - hash over from URI. + “2” - hash over to URI. - + “3” - hash over request-URI. + + “3” - hash over request-URI user. + “4” - round-robin (next destination). + “5” - hash over authorization-username (Proxy-Authorization or "normal" authorization). If no username is found, round robin

1 0

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:19cef203: core: updated description for core.psa rpc command
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 19cef203a1b487174ce7a0e66431b2c03bf78c65 URL: https://github.com/kamailio/kamailio/commit/19cef203a1b487174ce7a0e66431b2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:03:33+01:00 core: updated description for core.psa rpc command (cherry picked from commit aca381d30413eb1b43abf9e7e3b1306854ceb117) --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/19cef203a1b487174ce7a0e66431b2c… Patch: https://github.com/kamailio/kamailio/commit/19cef203a1b487174ce7a0e66431b2c… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index ba17c06e47..3fb2e6d8d7 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -439,7 +439,7 @@ static void core_psx(rpc_t* rpc, void* c) } static const char* core_psa_doc[] = { - "Return all the attributes of running.", + "Return all the attributes of running processes.", /* Documentation string */ 0 /* Method signature(s) */ };

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

git:5.5:43b94264: src/Makefile: Also stop compiling kamcmd from here
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 43b94264f81e54625ee90faa7f52b006b67a1b61 URL: https://github.com/kamailio/kamailio/commit/43b94264f81e54625ee90faa7f52b00… Author: Adrian Bunk <bunk(a)debian.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:03:19+01:00 src/Makefile: Also stop compiling kamcmd from here (cherry picked from commit c1335157c53ca014bbeec6de312f42d955221d58) --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/43b94264f81e54625ee90faa7f52b00… Patch: https://github.com/kamailio/kamailio/commit/43b94264f81e54625ee90faa7f52b00… --- diff --git a/src/Makefile b/src/Makefile index 11be15fb2b..a6380c2283 100644 --- a/src/Makefile +++ b/src/Makefile @@ -202,7 +202,7 @@ cmodules=$(foreach mods,$(modules_dirs), $($(mods))) # list of utils directories that should be compiled by make utils -C_COMPILE_UTILS= ../utils/kamcmd +C_COMPILE_UTILS= # kamcmd is now installed by ctl # list of binaries that should be installed alongside # (they should be created after make utils, see C_COMPILE_UTILS) C_INSTALL_BIN= # kamcmd is now installed by ctl

1 0

git:5.5:10cfb3ea: db_perlvdb: removed unnecessary condition
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 10cfb3ea0e80cfbaa5745093d471a58997a633ff URL: https://github.com/kamailio/kamailio/commit/10cfb3ea0e80cfbaa5745093d471a58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:02:32+01:00 db_perlvdb: removed unnecessary condition (cherry picked from commit d3daed0a617024fde1efabbcdab27dc4c5c140c8) --- Modified: src/modules/db_perlvdb/perlvdb_conv.c --- Diff: https://github.com/kamailio/kamailio/commit/10cfb3ea0e80cfbaa5745093d471a58… Patch: https://github.com/kamailio/kamailio/commit/10cfb3ea0e80cfbaa5745093d471a58… --- diff --git a/src/modules/db_perlvdb/perlvdb_conv.c b/src/modules/db_perlvdb/perlvdb_conv.c index f263774658..fcf7b024a5 100644 --- a/src/modules/db_perlvdb/perlvdb_conv.c +++ b/src/modules/db_perlvdb/perlvdb_conv.c @@ -57,9 +57,8 @@ AV *conds2perlarray(const db_key_t* keys, const db_op_t* ops, const db_val_t* va for (i = 0; i < n; i++) { if (ops) { - if (ops + i) - if (*(ops + i)) - element = cond2perlcond(*(keys + i), + if (*(ops + i)) + element = cond2perlcond(*(keys + i), *(ops + i), vals + i); } else { /* OP_EQ is defined in Kamailio _and_ perl. Includes collide :( */

1 0

git:5.5:6c3b7c0e: ims_dialog: updated test conditions
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 6c3b7c0e2ee3e0d397f1781f385eb78483fdd67f URL: https://github.com/kamailio/kamailio/commit/6c3b7c0e2ee3e0d397f1781f385eb78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:02:49+01:00 ims_dialog: updated test conditions - GH #3014 (cherry picked from commit a8d56242da48708949149c11c06d031b5c2fad49) --- Modified: src/modules/ims_dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/6c3b7c0e2ee3e0d397f1781f385eb78… Patch: https://github.com/kamailio/kamailio/commit/6c3b7c0e2ee3e0d397f1781f385eb78… --- diff --git a/src/modules/ims_dialog/dlg_hash.c b/src/modules/ims_dialog/dlg_hash.c index bc32282d9e..cfe0148e7b 100644 --- a/src/modules/ims_dialog/dlg_hash.c +++ b/src/modules/ims_dialog/dlg_hash.c @@ -253,7 +253,7 @@ void destroy_dlg(struct dlg_cell *dlg) { shm_free(var); } - if (&(dlg->dlg_entry_out)) { + if (dlg->dlg_entry_out.first) { lock_get(dlg->dlg_out_entries_lock); destroy_entry_out(&(dlg->dlg_entry_out)); lock_release(dlg->dlg_out_entries_lock);

1 0

git:5.5:b0a327f7: presence: safety checks for user and domain in ps_ptable_search()
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: b0a327f79d14d1c40742ba1177dd5bdcffc02c6d URL: https://github.com/kamailio/kamailio/commit/b0a327f79d14d1c40742ba1177dd5bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:03:08+01:00 presence: safety checks for user and domain in ps_ptable_search() - GH #3008 (cherry picked from commit c47ec08d8d4a14dc190091ccb79ace62ea6674e3) --- Modified: src/modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/b0a327f79d14d1c40742ba1177dd5bd… Patch: https://github.com/kamailio/kamailio/commit/b0a327f79d14d1c40742ba1177dd5bd… --- diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index c313b01cf0..5d0f0a9568 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -1247,6 +1247,11 @@ ps_presentity_t *ps_ptable_search(ps_presentity_t *ptm, int mmode, int rmode) uint32_t idx = 0; int pmax = 0; + if(ptm->user.s==NULL || ptm->domain.s==NULL) { + LM_WARN("no user or domain for presentity\n"); + return NULL; + } + ptm->hashid = core_case_hash(&ptm->user, &ptm->domain, 0); idx = core_hash_idx(ptm->hashid, _ps_ptable->ssize);

1 0

git:5.5:86c897fa: rls: fixed format-truncation warning GH #3013
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 86c897fac37d2a78b8122b4c62ec87a2371fd9d4 URL: https://github.com/kamailio/kamailio/commit/86c897fac37d2a78b8122b4c62ec87a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:01:45+01:00 rls: fixed format-truncation warning GH #3013 (cherry picked from commit e921fc8ed7a6c9fdeb532179a77503cd67799487) --- Modified: src/modules/rls/rls.c --- Diff: https://github.com/kamailio/kamailio/commit/86c897fac37d2a78b8122b4c62ec87a… Patch: https://github.com/kamailio/kamailio/commit/86c897fac37d2a78b8122b4c62ec87a… --- diff --git a/src/modules/rls/rls.c b/src/modules/rls/rls.c index 19ecce0ca2..63c69a64c6 100644 --- a/src/modules/rls/rls.c +++ b/src/modules/rls/rls.c @@ -684,8 +684,8 @@ static int child_init(int rank) for (i = 0; i < rls_notifier_processes; i++) { - char tmp[16]; - snprintf(tmp, 16, "RLS NOTIFIER %d", i); + char tmp[25]; + snprintf(tmp, 25, "RLS NOTIFIER %d", i); rls_notifier_id[i] = i; if (fork_basic_utimer(PROC_TIMER, tmp, 1,

1 0

git:5.5:5d05de90: presence: fixed format-truncation warning GH #3013
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 5d05de900de0145a22a5bf044267d9b0c0ceb712 URL: https://github.com/kamailio/kamailio/commit/5d05de900de0145a22a5bf044267d9b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:02:02+01:00 presence: fixed format-truncation warning GH #3013 (cherry picked from commit c1b14f49ead9a29711cde5334155819cd1c6c90d) --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/5d05de900de0145a22a5bf044267d9b… Patch: https://github.com/kamailio/kamailio/commit/5d05de900de0145a22a5bf044267d9b… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 09751bbc15..98c0711d0b 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -564,8 +564,8 @@ static int child_init(int rank) int i; for(i = 0; i < pres_notifier_processes; i++) { - char tmp[21]; - snprintf(tmp, 21, "PRESENCE NOTIFIER %d", i); + char tmp[30]; + snprintf(tmp, 30, "PRESENCE NOTIFIER %d", i); pres_notifier_id[i] = i; if(fork_basic_utimer(PROC_TIMER, tmp, 1, pres_timer_send_notify,

1 0

git:5.5:56d9073e: xhttp_pi: wrap freeing and setting to null in curly braces
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 56d9073ef2dd61f6ab48602fe2af77e3c090e290 URL: https://github.com/kamailio/kamailio/commit/56d9073ef2dd61f6ab48602fe2af77e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:02:17+01:00 xhttp_pi: wrap freeing and setting to null in curly braces - GH #3012 (cherry picked from commit 37580a25694d5e5b0b4c89a92d1ba2d8b77aacba) --- Modified: src/modules/xhttp_pi/xhttp_pi_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/56d9073ef2dd61f6ab48602fe2af77e… Patch: https://github.com/kamailio/kamailio/commit/56d9073ef2dd61f6ab48602fe2af77e… --- diff --git a/src/modules/xhttp_pi/xhttp_pi_fnc.c b/src/modules/xhttp_pi/xhttp_pi_fnc.c index 5610e319bb..f5c2fdd78b 100644 --- a/src/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/src/modules/xhttp_pi/xhttp_pi_fnc.c @@ -2901,7 +2901,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx) case 0: LM_ERR("no record on clause key [%.*s]\n", command->c_keys[0]->len, command->c_keys[0]->s); - if(c_vals) pkg_free(c_vals); c_vals = NULL; + if(c_vals) { pkg_free(c_vals); c_vals = NULL; } goto finish_page; case 1: LM_DBG("got [%d] rows for key [%.*s]\n",

1 0

git:5.5:ba6b3e8d: sms: fixed misleading-indentation warning GH #3012
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: ba6b3e8d8a9cc898e54acf750f871b812911d972 URL: https://github.com/kamailio/kamailio/commit/ba6b3e8d8a9cc898e54acf750f871b8… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:01:01+01:00 sms: fixed misleading-indentation warning GH #3012 (cherry picked from commit adb2d539e0db7feb1d6758dcc040c22a5915f104) --- Modified: src/modules/sms/sms_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/ba6b3e8d8a9cc898e54acf750f871b8… Patch: https://github.com/kamailio/kamailio/commit/ba6b3e8d8a9cc898e54acf750f871b8… --- diff --git a/src/modules/sms/sms_funcs.c b/src/modules/sms/sms_funcs.c index 32efec520c..36b85a964e 100644 --- a/src/modules/sms/sms_funcs.c +++ b/src/modules/sms/sms_funcs.c @@ -883,21 +883,22 @@ void modem_process(struct modem *mdm) /* if any, let's get them */ if (used_mem) LM_DBG("%d new SMS on modem\n",used_mem); - for(i=1,k=1;k<=used_mem && i<=max_mem;i++) { - if (getsms(&sms,mdm,i)!=-1) { - k++; - LM_DBG("SMS Get from location %d\n",i); - /*for test ;-) -> to be remove*/ - LM_DBG("SMS RECEIVED:\n\rFrom: %s %s\n\r%.*s %.*s" - "\n\r\"%.*s\"\n\r",sms.sender,sms.name, - DATE_LEN,sms.date,TIME_LEN,sms.time, - sms.userdatalength,sms.ascii); - if (!sms.is_statusreport) - _send_sms_as_sip(&sms, mdm); - else - check_sms_report(&sms); - } + + for(i=1,k=1;k<=used_mem && i<=max_mem;i++) { + if (getsms(&sms,mdm,i)!=-1) { + k++; + LM_DBG("SMS Get from location %d\n",i); + /*for test ;-) -> to be remove*/ + LM_DBG("SMS RECEIVED:\n\rFrom: %s %s\n\r%.*s %.*s" + "\n\r\"%.*s\"\n\r",sms.sender,sms.name, + DATE_LEN,sms.date,TIME_LEN,sms.time, + sms.userdatalength,sms.ascii); + if (!sms.is_statusreport) + _send_sms_as_sip(&sms, mdm); + else + check_sms_report(&sms); } + } /* if reports are used, checks for expired records in report queue */ if (sms_report_type!=NO_REPORT)

1 0

git:5.5:99b9324f: ims_charging: fixed misleading-indentation warning GH #3012
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 99b9324fc2f682288e358304602cdc8fb2bc32a1 URL: https://github.com/kamailio/kamailio/commit/99b9324fc2f682288e358304602cdc8… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:01:12+01:00 ims_charging: fixed misleading-indentation warning GH #3012 (cherry picked from commit d94879b06f9bbb9d6ffa2dcaae5b213f169f2d5a) --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/99b9324fc2f682288e358304602cdc8… Patch: https://github.com/kamailio/kamailio/commit/99b9324fc2f682288e358304602cdc8… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 05dc7f29c6..b8c15da445 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -1575,23 +1575,23 @@ static int create_cca_result_code(int result) { static int create_cca_fui_avps(int action, str* redirecturi) { int_str action_avp_val, action_avp_name, redirecturi_avp_val, redirecturi_avp_name; - action_avp_name.s.s = RO_AVP_CCA_FUI_ACTION; - action_avp_name.s.len = RO_AVP_CCA_FUI_ACTION_LENGTH; + action_avp_name.s.s = RO_AVP_CCA_FUI_ACTION; + action_avp_name.s.len = RO_AVP_CCA_FUI_ACTION_LENGTH; redirecturi_avp_name.s.s = RO_AVP_CCA_FUI_REDIRECT_URI; - redirecturi_avp_name.s.len = RO_AVP_CCA_FUI_REDIRECT_URI_LENGTH; - char buf[10]; + redirecturi_avp_name.s.len = RO_AVP_CCA_FUI_REDIRECT_URI_LENGTH; + char buf[10]; int rc; - action_avp_val.n = action; - action_avp_val.s.len = snprintf(buf, 10, "%i", action); - action_avp_val.s.s = buf; + action_avp_val.n = action; + action_avp_val.s.len = snprintf(buf, 10, "%i", action); + action_avp_val.s.s = buf; - rc = add_avp(AVP_NAME_STR|AVP_VAL_STR, action_avp_name, action_avp_val); + rc = add_avp(AVP_NAME_STR|AVP_VAL_STR, action_avp_name, action_avp_val); - if (rc < 0) - LM_ERR("Couldn't create ["RO_AVP_CCA_FUI_ACTION"] AVP\n"); - else - LM_DBG("Created AVP ["RO_AVP_CCA_FUI_ACTION"] successfully: value=[%d]\n", action); + if (rc < 0) + LM_ERR("Couldn't create ["RO_AVP_CCA_FUI_ACTION"] AVP\n"); + else + LM_DBG("Created AVP ["RO_AVP_CCA_FUI_ACTION"] successfully: value=[%d]\n", action); if (redirecturi && redirecturi->len >0 && redirecturi->s) { redirecturi_avp_val.s.len = redirecturi->len; @@ -1605,7 +1605,7 @@ static int create_cca_fui_avps(int action, str* redirecturi) { LM_DBG("Created AVP ["RO_AVP_CCA_FUI_REDIRECT_URI"] successfully: value=[%.*s]\n", redirecturi->len, redirecturi->s); } - return 1; + return 1; } static int get_mac_avp_value(struct sip_msg *msg, str *value) {

1 0

git:5.5:2c3de1ae: kazoo: fixed misleading-indentation warning GH #3012
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 2c3de1aebc526939c12fa501509d12ce1728b9a8 URL: https://github.com/kamailio/kamailio/commit/2c3de1aebc526939c12fa501509d12c… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:01:30+01:00 kazoo: fixed misleading-indentation warning GH #3012 (cherry picked from commit 2b9706aca33b8ca34d3d9c58b80527956c92dd7a) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/2c3de1aebc526939c12fa501509d12c… Patch: https://github.com/kamailio/kamailio/commit/2c3de1aebc526939c12fa501509d12c… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 5685f5a845..ecbac752b4 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -796,9 +796,9 @@ void kz_amqp_connection_close(kz_amqp_conn_ptr rmq) { } void kz_amqp_channel_close(kz_amqp_conn_ptr rmq, amqp_channel_t channel) { - LM_DBG("Close rmq channel\n"); - if (!rmq) - return; + LM_DBG("Close rmq channel\n"); + if (!rmq) + return; LM_DBG("close channel: %d rmq(%p)->channel(%d)\n", getpid(), (void *)rmq, channel); kz_amqp_error("closing channel", amqp_channel_close(rmq->conn, channel, AMQP_REPLY_SUCCESS)); @@ -1121,11 +1121,11 @@ int kz_amqp_pipe_send(str *str_exchange, str *str_routing_key, str *str_payload) if(cmd) kz_amqp_free_pipe_cmd(cmd); - if(json_obj) - json_object_put(json_obj); + if(json_obj) + json_object_put(json_obj); - if(s_local_routing_key) - pkg_free(s_local_routing_key); + if(s_local_routing_key) + pkg_free(s_local_routing_key); return ret; } @@ -2009,14 +2009,13 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange binding->bind = bind; bindings_count++; - return 1; + return 1; error: - if(binding != NULL) - shm_free(binding); + if(binding != NULL) + shm_free(binding); return -1; - }

1 0

git:master:5b4506b2: core: async task - do not close sockets for sip worker processes
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: master Commit: 5b4506b2b11600f9678a32a4b9f49a7aef837d94 URL: https://github.com/kamailio/kamailio/commit/5b4506b2b11600f9678a32a4b9f49a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T14:10:43+01:00 core: async task - do not close sockets for sip worker processes --- Modified: src/core/async_task.c --- Diff: https://github.com/kamailio/kamailio/commit/5b4506b2b11600f9678a32a4b9f49a7… Patch: https://github.com/kamailio/kamailio/commit/5b4506b2b11600f9678a32a4b9f49a7… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index 99e04dd989..b64e071a11 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -186,7 +186,8 @@ int async_task_child_init(int rank) } if(rank>0) { - async_task_close_sockets_parent(); + /* no need to close the socket from sip workers */ + /* async_task_close_sockets_parent(); */ return 0; } if (rank!=PROC_MAIN)

1 0

[kamailio/kamailio] Kamailio crash with in-memory publ_cache = 2 (Issue #3008)
by Joe Mordica 14 Feb '22

14 Feb '22

### Description Usage of `modparam("presence", "publ_cache", 2)` causes kamailio to crash shortly after starting up. This only happens when subscribe traffic is high (400 requests per second avg). ### Troubleshooting #### Reproduction The issue can be reproduced by starting up kamailio with the option above enabled and ~400 subscribe requests per second. The crash happens ~20 seconds after startup. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` kernel: kamailio[25401]: segfault at 0 ip 00007f4a0a22d4d7 sp 00007fff6064a370 error 4 in presence.so[7f4a0a21e000+fe000] ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions Running with the default ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` Linux hostName 2.6.32-754.11.1.el6.x86_64 #1 SMP Tue Feb 26 15:38:56 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux version: kamailio 5.4.3 (x86_64/linux) e19ae3 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: e19ae3 compiled on 18:24:43 Dec 14 2020 with gcc 4.4.7 ``` I realize this is an older version so if it's resolved in a newer one let me know. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3008 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3008(a)github.com>

2 9

[kamailio/kamailio] dialog keep-alive ignores listening ip/port (Issue #3018)
by Riccardo-78 14 Feb '22

14 Feb '22

### Description When dialog module needs to send keep-alive to caller and/or called it doens't check if the ip address and port of the dialog is the current listening ip/port. If you have two distinct kamailio instances sharing a single dialog database, both instances are sending the OPTIONS and not just the one which handled the call at setup time.  ### Troubleshooting #### Reproduction Start two instance with a shared dialog database and db_mode set to 1 (realtime), set property ka-src for every dialog in kamailio cfg. Setup a long call and restart the instance not involved in the call. You should see it starting to send OPTIONS. ### Possible Solutions In dlg_send_ka, if the ip/port stored in the dialog db is not present in the listening ip/port set, skip the check.  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.2 (x86_64/linux) 55e232 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 55e232 compiled on 14:20:31 Aug 25 2021 with gcc 4.8.5 ``` * **Operating System**: Centos 7  -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3018 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3018(a)github.com>

2 3

git:master:12af4fb3: core: added tcp_script_mode global parameter
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: master Commit: 12af4fb33a02617288f0b598356310cdcdff49d6 URL: https://github.com/kamailio/kamailio/commit/12af4fb33a02617288f0b598356310c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T08:51:12+01:00 core: added tcp_script_mode global parameter - control if the tcp connection should be closed if received message processing resulted in error return code --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/12af4fb33a02617288f0b598356310c… Patch: https://github.com/kamailio/kamailio/commit/12af4fb33a02617288f0b598356310c…

1 0

[kamailio/kamailio] Setting rtpengine DTLS flags on specific user agents only? (Issue #3025)
by Ryan Gehrig 14 Feb '22

14 Feb '22

Hello, I need to enable DTLS (e.g. add "SDES-off DTLS" to my $var(rtpengine_flags), but only on specific endpoint device types. So far, on an inbound call, the SDP comes from Asterisk, and once it hits this specific endpoint, if no encryption is enabled, the endpoint rejects the call and I get "488 Not Acceptable Here". If I statically enable the DTLS options in kamailio, then the endpoint accepts it and the call connects. I need to do conditional logic in the kam config, so unless there is a way to reinvite a second time, adding DTLS, I am now trying to figure out a way to determine the destination user agent, potentially via the most recent sip registration or contact/location data saved, then based on the user agent that was registered, I can decide to enable or disable DTLS. Open to any and all ideas on the right way to do this! Thanks! Ryan -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3025 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3025(a)github.com>

2 2

Advertised Address in LRKProxy
by Mojtaba 12 Feb '22

12 Feb '22

Hello there, In regard to developing LRKPRoxy to use behind NAT, I am planning to add some features to support Advertised Address. For example, this feature could be used when the LRKProxy is used in AWS. Does anybody have any opinion in this regard? or some extra features? -- --Mojtaba Esfandiari.S

1 0

git:master:c15c1286: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 11 Feb '22

11 Feb '22

Module: kamailio Branch: master Commit: c15c1286c41dc2ce519b46cfcdd8487c2b45ecbd URL: https://github.com/kamailio/kamailio/commit/c15c1286c41dc2ce519b46cfcdd8487… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-11T16:16:13+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/c15c1286c41dc2ce519b46cfcdd8487… Patch: https://github.com/kamailio/kamailio/commit/c15c1286c41dc2ce519b46cfcdd8487… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 4258d3b3b1..73e16a5977 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -99,7 +99,7 @@ Julien Klingenmeyer 6.47. bridge_contact (string) 6.48. initial_cbs_inscript (int) 6.49. send_bye (int) - 6.50. ignore_non_local_dlg (int) + 6.50. dlg_filter_mode (int) 6.51. wait_ack (int) 6.52. ka_timer (int) 6.53. ka_interval (int) @@ -241,7 +241,7 @@ Julien Klingenmeyer 1.47. Set bridge_contact parameter 1.48. Set initial_cbs_inscript parameter 1.49. Set send_bye parameter - 1.50. Set ignore_non_local_dlg parameter + 1.50. Set dlg_filter_mode parameter 1.51. Set wait_ack parameter 1.52. Set ka_timer parameter 1.53. Set ka_interval parameter @@ -341,7 +341,7 @@ Chapter 1. Admin Guide 6.47. bridge_contact (string) 6.48. initial_cbs_inscript (int) 6.49. send_bye (int) - 6.50. ignore_non_local_dlg (int) + 6.50. dlg_filter_mode (int) 6.51. wait_ack (int) 6.52. ka_timer (int) 6.53. ka_interval (int) @@ -573,7 +573,7 @@ Chapter 1. Admin Guide 6.47. bridge_contact (string) 6.48. initial_cbs_inscript (int) 6.49. send_bye (int) - 6.50. ignore_non_local_dlg (int) + 6.50. dlg_filter_mode (int) 6.51. wait_ack (int) 6.52. ka_timer (int) 6.53. ka_interval (int) @@ -1230,16 +1230,19 @@ modparam("dialog", "initial_cbs_inscript", 0) modparam("dialog", "send_bye", 1) ... -6.50. ignore_non_local_dlg (int) +6.50. dlg_filter_mode (int) - If set to 1, don't send keepalives and do nothing on timeout if dialog - is non local. + Set dialog fitering mode, which can specify what dialogs are processed. + Its value can be a combination (the sum) of following flags: + * 1 - do not send keepalives and do not execute timeout function if + dialog is not local (if the associated bind address is not a local + socket). Default value is “0”. - Example 1.50. Set ignore_non_local_dlg parameter + Example 1.50. Set dlg_filter_mode parameter ... -modparam("dialog", "ignore_non_local_dlg", 1) +modparam("dialog", "dlg_filter_mode", 1) ... 6.51. wait_ack (int)

1 0

git:master:1581ef7a: dialog: docs for dlg_filter_mode parameter
by Daniel-Constantin Mierla 11 Feb '22

11 Feb '22

Module: kamailio Branch: master Commit: 1581ef7acbd6ac6459956cf8b327cd4fd7a14736 URL: https://github.com/kamailio/kamailio/commit/1581ef7acbd6ac6459956cf8b327cd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-11T16:13:29+01:00 dialog: docs for dlg_filter_mode parameter --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1581ef7acbd6ac6459956cf8b327cd4… Patch: https://github.com/kamailio/kamailio/commit/1581ef7acbd6ac6459956cf8b327cd4… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 1850a08de6..f8cbfb2e9c 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -1299,22 +1299,29 @@ modparam("dialog", "send_bye", 1) </programlisting> </example> </section> - <section id="dialog.p.ignore_non_local_dlg"> - <title><varname>ignore_non_local_dlg</varname> (int)</title> + <section id="dialog.p.dlg_filter_mode"> + <title><varname>dlg_filter_mode</varname> (int)</title> <para> - If set to 1, don't send keepalives and - do nothing on timeout if dialog is non local. + Set dialog fitering mode, which can specify what dialogs are processed. + Its value can be a combination (the sum) of following flags: </para> + <itemizedlist> + <listitem><para> + <emphasis>1</emphasis> - do not send keepalives and do not + execute timeout function if dialog is not local (if the + associated bind address is not a local socket). + </para></listitem> + </itemizedlist> <para> <emphasis> Default value is <quote>0</quote>. </emphasis> </para> <example> - <title>Set <varname>ignore_non_local_dlg</varname> parameter</title> + <title>Set <varname>dlg_filter_mode</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("dialog", "ignore_non_local_dlg", 1) +modparam("dialog", "dlg_filter_mode", 1) ... </programlisting> </example>

1 0

git:master:14348216: dialog: renamed ignore_non_local_dlg to dlg_filter_mode
by Daniel-Constantin Mierla 11 Feb '22

11 Feb '22

Module: kamailio Branch: master Commit: 14348216c4c993d582f54270fc73298c864403ad URL: https://github.com/kamailio/kamailio/commit/14348216c4c993d582f54270fc73298… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-11T16:13:29+01:00 dialog: renamed ignore_non_local_dlg to dlg_filter_mode --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_hash.h Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/14348216c4c993d582f54270fc73298… Patch: https://github.com/kamailio/kamailio/commit/14348216c4c993d582f54270fc73298… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index ddcb3b134b..08f0a85882 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -104,7 +104,7 @@ str dlg_extra_hdrs = {NULL,0}; static int db_fetch_rows = 200; static int db_skip_load = 0; static int dlg_keep_proxy_rr = 0; -int dlg_ignore_non_local_dlg = 0; +int dlg_filter_mode = 0; int initial_cbs_inscript = 1; int dlg_wait_ack = 1; static int dlg_timer_procs = 0; @@ -328,7 +328,7 @@ static param_export_t mod_params[]={ { "h_id_start", PARAM_INT, &dlg_h_id_start }, { "h_id_step", PARAM_INT, &dlg_h_id_step }, { "keep_proxy_rr", INT_PARAM, &dlg_keep_proxy_rr }, - { "ignore_non_local_dlg", INT_PARAM, &dlg_ignore_non_local_dlg }, + { "dlg_filter_mode", INT_PARAM, &dlg_filter_mode }, { 0,0,0 } }; diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index dd8cef6fd8..bf49981b4c 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -71,7 +71,7 @@ extern int dlg_send_bye; extern int dlg_event_rt[DLG_EVENTRT_MAX]; extern int dlg_wait_ack; extern int dlg_enable_dmq; -extern int dlg_ignore_non_local_dlg; +extern int dlg_filter_mode; int spiral_detected = -1; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ @@ -1582,7 +1582,7 @@ void dlg_ontimeout(struct dlg_tl *tl) dlg = ((struct dlg_cell*)((char *)(tl) - (unsigned long)(&((struct dlg_cell*)0)->tl))); - if (dlg_ignore_non_local_dlg) { + if (dlg_filter_mode & DLG_FILTER_LOCALONLY) { if (dlg->bind_addr[0] == NULL) { LM_DBG("skipping dialog without bind address\n"); return; @@ -1593,7 +1593,7 @@ void dlg_ontimeout(struct dlg_tl *tl) return; } } - + /* mark dialog as expired */ dlg->dflags |= DLG_FLAG_EXPIRED; diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h index ed5cd7bef0..7367a1b783 100644 --- a/src/modules/dialog/dlg_hash.h +++ b/src/modules/dialog/dlg_hash.h @@ -92,6 +92,9 @@ #define DLG_EVENTRT_FAILED 2 #define DLG_EVENTRT_MAX 3 +/* flags for filtering dialogs processing */ +#define DLG_FILTER_LOCALONLY (1<<0) /*!< processing only local dialogs */ + /*! internal unique ide per dialog */ typedef struct dlg_iuid { unsigned int h_id; /*!< id in the hash table entry (seq nr in slot) */ diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index c38d2062cc..bd65d995d2 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -53,7 +53,7 @@ extern str dlg_extra_hdrs; extern str dlg_lreq_callee_headers; extern int dlg_ka_failed_limit; -extern int dlg_ignore_non_local_dlg; +extern int dlg_filter_mode; /** * @@ -453,7 +453,7 @@ int dlg_send_ka(dlg_cell_t *dlg, int dir) int result; dlg_iuid_t *iuid = NULL; - if (dlg_ignore_non_local_dlg) { + if (dlg_filter_mode & DLG_FILTER_LOCALONLY) { if (dlg->bind_addr[dir] == NULL) { LM_DBG("skipping dialog without bind address\n"); return 0;

1 0

git:master:af8f9e38: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 11 Feb '22

11 Feb '22

Module: kamailio Branch: master Commit: af8f9e38c4331334a242457fa5d3fb9ba14d2e82 URL: https://github.com/kamailio/kamailio/commit/af8f9e38c4331334a242457fa5d3fb9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-11T16:01:21+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/af8f9e38c4331334a242457fa5d3fb9… Patch: https://github.com/kamailio/kamailio/commit/af8f9e38c4331334a242457fa5d3fb9…

1 0

[kamailio/kamailio] dialog keep-alive only for own records (PR #3023)
by Riccardo-78 11 Feb '22

11 Feb '22

#### 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 - [x] Related to issue #3018 #### Description Skip keepalive check if dialog is not local, do the same in case of dialog timeout  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3023 -- Commit Summary -- * dialog: don't do nothing on timeout if dialog is not local * dialog: don't sent ka if dialog is not local -- File Changes -- M src/modules/dialog/dlg_handlers.c (10) M src/modules/dialog/dlg_req_within.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3023.patch https://github.com/kamailio/kamailio/pull/3023.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3023 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3023(a)github.com>

3 6

git:master:e530ad44: dialog: add ignore_non_local_dlg parameter
by Daniel-Constantin Mierla 11 Feb '22

11 Feb '22

Module: kamailio Branch: master Commit: e530ad444741a2d8bddc1e6c67676282ce648456 URL: https://github.com/kamailio/kamailio/commit/e530ad444741a2d8bddc1e6c6767628… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-11T15:57:17+01:00 dialog: add ignore_non_local_dlg parameter --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_req_within.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e530ad444741a2d8bddc1e6c6767628… Patch: https://github.com/kamailio/kamailio/commit/e530ad444741a2d8bddc1e6c6767628… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index a25224318c..ddcb3b134b 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -104,6 +104,7 @@ str dlg_extra_hdrs = {NULL,0}; static int db_fetch_rows = 200; static int db_skip_load = 0; static int dlg_keep_proxy_rr = 0; +int dlg_ignore_non_local_dlg = 0; int initial_cbs_inscript = 1; int dlg_wait_ack = 1; static int dlg_timer_procs = 0; @@ -327,6 +328,7 @@ static param_export_t mod_params[]={ { "h_id_start", PARAM_INT, &dlg_h_id_start }, { "h_id_step", PARAM_INT, &dlg_h_id_step }, { "keep_proxy_rr", INT_PARAM, &dlg_keep_proxy_rr }, + { "ignore_non_local_dlg", INT_PARAM, &dlg_ignore_non_local_dlg }, { 0,0,0 } }; diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 422a714daf..dd8cef6fd8 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -71,6 +71,7 @@ extern int dlg_send_bye; extern int dlg_event_rt[DLG_EVENTRT_MAX]; extern int dlg_wait_ack; extern int dlg_enable_dmq; +extern int dlg_ignore_non_local_dlg; int spiral_detected = -1; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ @@ -1581,14 +1582,16 @@ void dlg_ontimeout(struct dlg_tl *tl) dlg = ((struct dlg_cell*)((char *)(tl) - (unsigned long)(&((struct dlg_cell*)0)->tl))); - if (dlg->bind_addr[0] == NULL) { - LM_DBG("skipping dialog without bind address\n"); - return 0; - } + if (dlg_ignore_non_local_dlg) { + if (dlg->bind_addr[0] == NULL) { + LM_DBG("skipping dialog without bind address\n"); + return; + } - if (lookup_local_socket(&(dlg->bind_addr[0]->sock_str)) == NULL) { - LM_DBG("skipping non local dialog\n"); - return 0; + if (lookup_local_socket(&(dlg->bind_addr[0]->sock_str)) == NULL) { + LM_DBG("skipping non local dialog\n"); + return; + } } /* mark dialog as expired */ diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index fb81da8066..c38d2062cc 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -53,6 +53,7 @@ extern str dlg_extra_hdrs; extern str dlg_lreq_callee_headers; extern int dlg_ka_failed_limit; +extern int dlg_ignore_non_local_dlg; /** * @@ -452,14 +453,16 @@ int dlg_send_ka(dlg_cell_t *dlg, int dir) int result; dlg_iuid_t *iuid = NULL; - if (dlg->bind_addr[dir] == NULL) { - LM_DBG("skipping dialog without bind address\n"); - return 0; - } + if (dlg_ignore_non_local_dlg) { + if (dlg->bind_addr[dir] == NULL) { + LM_DBG("skipping dialog without bind address\n"); + return 0; + } - if (lookup_local_socket(&(dlg->bind_addr[dir]->sock_str)) == NULL) { - LM_DBG("skipping non local dialog\n"); - return 0; + if (lookup_local_socket(&(dlg->bind_addr[dir]->sock_str)) == NULL) { + LM_DBG("skipping non local dialog\n"); + return 0; + } } /* do not send KA request for non-confirmed dialogs (not supported) */ diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 290e68d4d6..1850a08de6 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -1299,7 +1299,26 @@ modparam("dialog", "send_bye", 1) </programlisting> </example> </section> - + <section id="dialog.p.ignore_non_local_dlg"> + <title><varname>ignore_non_local_dlg</varname> (int)</title> + <para> + If set to 1, don't send keepalives and + do nothing on timeout if dialog is non local. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ignore_non_local_dlg</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "ignore_non_local_dlg", 1) +... +</programlisting> + </example> + </section> <section id="dialog.p.wait_ack"> <title><varname>wait_ack</varname> (int)</title> <para>

1 0

git:master:79c4c7d0: dialog: don't do nothing on timeout if dialog is not local
by Daniel-Constantin Mierla 11 Feb '22

11 Feb '22

Module: kamailio Branch: master Commit: 79c4c7d0c4de2b15c68e07380a106544f2e27dbe URL: https://github.com/kamailio/kamailio/commit/79c4c7d0c4de2b15c68e07380a10654… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-11T15:57:17+01:00 dialog: don't do nothing on timeout if dialog is not local --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/79c4c7d0c4de2b15c68e07380a10654… Patch: https://github.com/kamailio/kamailio/commit/79c4c7d0c4de2b15c68e07380a10654… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 3f8adefb79..422a714daf 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1581,6 +1581,16 @@ void dlg_ontimeout(struct dlg_tl *tl) dlg = ((struct dlg_cell*)((char *)(tl) - (unsigned long)(&((struct dlg_cell*)0)->tl))); + if (dlg->bind_addr[0] == NULL) { + LM_DBG("skipping dialog without bind address\n"); + return 0; + } + + if (lookup_local_socket(&(dlg->bind_addr[0]->sock_str)) == NULL) { + LM_DBG("skipping non local dialog\n"); + return 0; + } + /* mark dialog as expired */ dlg->dflags |= DLG_FLAG_EXPIRED;

1 0

git:master:f8398d93: dialog: don't sent ka if dialog is not local
by Daniel-Constantin Mierla 11 Feb '22

11 Feb '22

Module: kamailio Branch: master Commit: f8398d937611c692f87ccc0ddc284442acbf1893 URL: https://github.com/kamailio/kamailio/commit/f8398d937611c692f87ccc0ddc28444… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-11T15:57:17+01:00 dialog: don't sent ka if dialog is not local --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/f8398d937611c692f87ccc0ddc28444… Patch: https://github.com/kamailio/kamailio/commit/f8398d937611c692f87ccc0ddc28444… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 809834527f..fb81da8066 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -452,6 +452,16 @@ int dlg_send_ka(dlg_cell_t *dlg, int dir) int result; dlg_iuid_t *iuid = NULL; + if (dlg->bind_addr[dir] == NULL) { + LM_DBG("skipping dialog without bind address\n"); + return 0; + } + + if (lookup_local_socket(&(dlg->bind_addr[dir]->sock_str)) == NULL) { + LM_DBG("skipping non local dialog\n"); + return 0; + } + /* do not send KA request for non-confirmed dialogs (not supported) */ if (dlg->state != DLG_STATE_CONFIRMED) { LM_DBG("skipping non-confirmed dialogs\n");

1 0

[kamailio/kamailio] resending same message from UE after receiving RP-ACK (Issue #3022)
by EugeneBogush 10 Feb '22

10 Feb '22

### Description I trying to use smsops module as SMSC. ### Troubleshooting When I sending message from UE I see re-sending same message after each RP-ACK #### Reproduction Always when I send sms message. #### Log Messages [case1.log](https://github.com/kamailio/kamailio/files/8042347/case1.log) #### SIP Traffic [sip.zip](https://github.com/kamailio/kamailio/files/8042345/sip.zip) ### Additional Information version: kamailio 5.3.2 (x86_64/linux) 42be5d flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 42be5d compiled on 07:21:24 Oct 22 2021 with gcc 7.5.0 ubuntu 18.04 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3022 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3022(a)github.com>

2 2

git:master:b3314c8b: modules: readme files regenerated - xmlops ... [skip ci]
by Kamailio Dev 10 Feb '22

10 Feb '22

Module: kamailio Branch: master Commit: b3314c8b99fb7e9c15aee137e2b9f1fe83881c05 URL: https://github.com/kamailio/kamailio/commit/b3314c8b99fb7e9c15aee137e2b9f1f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-10T17:16:16+01:00 modules: readme files regenerated - xmlops ... [skip ci] --- Modified: src/modules/xmlops/README --- Diff: https://github.com/kamailio/kamailio/commit/b3314c8b99fb7e9c15aee137e2b9f1f… Patch: https://github.com/kamailio/kamailio/commit/b3314c8b99fb7e9c15aee137e2b9f1f… --- 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:master:56e26387: xmlops: docs - added the remark that xml_ns param can be set many times
by Daniel-Constantin Mierla 10 Feb '22

10 Feb '22

Module: kamailio Branch: master Commit: 56e26387b77536e6c9f13dd62e5aecabaaba2d9a URL: https://github.com/kamailio/kamailio/commit/56e26387b77536e6c9f13dd62e5aeca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-10T17:11:45+01:00 xmlops: docs - added the remark that xml_ns param can be set many times --- Modified: src/modules/xmlops/doc/xmlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/56e26387b77536e6c9f13dd62e5aeca… Patch: https://github.com/kamailio/kamailio/commit/56e26387b77536e6c9f13dd62e5aeca… --- 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:master:0cb6a064: xmlops: docs - more practical example for xml_ns
by Daniel-Constantin Mierla 10 Feb '22

10 Feb '22

Module: kamailio Branch: master Commit: 0cb6a0640e9e3e2e06d2c5bc68c6177d5bd38b89 URL: https://github.com/kamailio/kamailio/commit/0cb6a0640e9e3e2e06d2c5bc68c6177… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-10T17:06:13+01:00 xmlops: docs - more practical example for xml_ns --- Modified: src/modules/xmlops/doc/xmlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0cb6a0640e9e3e2e06d2c5bc68c6177… Patch: https://github.com/kamailio/kamailio/commit/0cb6a0640e9e3e2e06d2c5bc68c6177… --- 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

git:master:aca381d3: core: updated description for core.psa rpc command
by Daniel-Constantin Mierla 10 Feb '22

10 Feb '22

Module: kamailio Branch: master Commit: aca381d30413eb1b43abf9e7e3b1306854ceb117 URL: https://github.com/kamailio/kamailio/commit/aca381d30413eb1b43abf9e7e3b1306… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-10T08:42:10+01:00 core: updated description for core.psa rpc command --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/aca381d30413eb1b43abf9e7e3b1306… Patch: https://github.com/kamailio/kamailio/commit/aca381d30413eb1b43abf9e7e3b1306… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index e4695bb251..d045a144cb 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -478,7 +478,7 @@ static void core_psx(rpc_t* rpc, void* c) } static const char* core_psa_doc[] = { - "Return all the attributes of running.", + "Return all the attributes of running processes.", /* Documentation string */ 0 /* Method signature(s) */ };

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev