- sr-dev - kamailio.org

[kamailio/kamailio] Correcting rank value passed to fork_process #2809 (#2863)
by ErhanOnur 05 Oct '21

05 Oct '21

PROC_SIPINIT has a special meaning representing the first SIP worker.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2863 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2863/commits/df5f41ccc3c779848bdb…">Correcting rank value passed to fork_process #2809</a> -- File Changes -- M src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2863.patch https://github.com/kamailio/kamailio/pull/2863.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2863

2 2

git:master:25ef591f: Correcting rank value passed to fork_process #2809
by Daniel-Constantin Mierla 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: 25ef591f5c160515b2b8c4e53036fccf8a9671bc URL: https://github.com/kamailio/kamailio/commit/25ef591f5c160515b2b8c4e53036fcc… Author: 67456745 <erhan.sendag(a)i2i-systems.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-05T13:43:31+02:00 Correcting rank value passed to fork_process #2809 PROC_SIPINIT has a special meaning representing the first SIP worker --- Modified: src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/25ef591f5c160515b2b8c4e53036fcc… Patch: https://github.com/kamailio/kamailio/commit/25ef591f5c160515b2b8c4e53036fcc… --- diff --git a/src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c b/src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c index 8eb3c7b4a4..b5bb650098 100644 --- a/src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c +++ b/src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c @@ -325,7 +325,7 @@ static int child_init(int rank) LM_DBG("Initialization of module in child [%d] \n", rank); if ((subscribe_to_reginfo == 1) && (rank == PROC_MAIN)) { LM_DBG("Creating RegInfo Event Processor process\n"); - int pid = fork_process(PROC_SIPINIT, "RegInfo Event Processor", 1); + int pid = fork_process(PROC_NOCHLDINIT, "RegInfo Event Processor", 1); if (pid < 0) return -1; //error if (pid == 0) {

1 0

git:master:3a042b99: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: 3a042b99e0ae21c3127d69d41dcce8925dbaa185 URL: https://github.com/kamailio/kamailio/commit/3a042b99e0ae21c3127d69d41dcce89… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-05T10:01:29+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/3a042b99e0ae21c3127d69d41dcce89… Patch: https://github.com/kamailio/kamailio/commit/3a042b99e0ae21c3127d69d41dcce89… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index 4f0097535d..5f6bf33867 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -252,9 +252,13 @@ Chapter 1. Admin Guide The module implements text based operations over the SIP message processed by Kamailio. SIP is a text based protocol and the module provides a large set of very useful functions to manipulate the message - at text level, e.g., regular expression search and replace, Perl-like + at text level, e.g., regular expression search, replace or substitutions, checks for method type, header presence, insert of new - header and date, etc. + header and date, string comparisons, multi-part body operations, etc. + + If not stated otherwise, the regular expressions parameters for search, + replace or substitute have to be in POSIX format. For PCRE regular + expression matching, see the pcre or dialplan modules. 2. Known Limitations @@ -602,7 +606,7 @@ replace_hdrs_str("Kamailio", "Kamailio SIP Proxy", "a"); 4.16. subst('/re/repl/flags') - Replaces re with repl (sed or perl like). + Replaces re with repl. Meaning of the parameters is as follows: * '/re/repl/flags' - sed like regular expression. flags can be a @@ -683,7 +687,7 @@ if (subst_user('/(.*)3642$/$avp(user_prefix)\13642/')){$ 4.19. subst_body('/re/repl/flags') - Replaces re with repl (sed or perl like) in the body of the message. + Replaces re with repl in the body of the message. Meaning of the parameters is as follows: * '/re/repl/flags' - sed like regular expression. flags can be a @@ -704,7 +708,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; 4.20. subst_hf(hf, subexp, flags) - Perl-like substitutions in the body of a header field. + Substitutions in the body of a header field. Meaning of the parameters is as follows: * hf - header field name.

1 0

git:master:b19aab7f: textops: docs update to state regex params expect posix format
by Daniel-Constantin Mierla 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: b19aab7fe00f72d0c9e54a7a106ec7a065a3d02b URL: https://github.com/kamailio/kamailio/commit/b19aab7fe00f72d0c9e54a7a106ec7a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-05T09:57:40+02:00 textops: docs update to state regex params expect posix format --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b19aab7fe00f72d0c9e54a7a106ec7a… Patch: https://github.com/kamailio/kamailio/commit/b19aab7fe00f72d0c9e54a7a106ec7a… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 4427ee1e00..974fbf568c 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -19,9 +19,15 @@ The module implements text based operations over the SIP message processed by &kamailio;. SIP is a text based protocol and the module provides a large set of very useful functions to manipulate the - message at text level, e.g., regular expression search and replace, - Perl-like substitutions, checks for method type, header presence, - insert of new header and date, etc. + message at text level, e.g., regular expression search, replace + or substitutions, checks for method type, header presence, + insert of new header and date, string comparisons, multi-part body + operations, etc. + </para> + <para> + If not stated otherwise, the regular expressions parameters for search, + replace or substitute have to be in POSIX format. For PCRE regular + expression matching, see the pcre or dialplan modules. </para> </section> <section> @@ -591,7 +597,7 @@ replace_hdrs_str("&kamailio;", "&kamailio; SIP Proxy", "a"); <function moreinfo="none">subst('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like). + Replaces re with repl. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -728,7 +734,7 @@ if (subst_user('/(.*)3642$/$avp(user_prefix)\13642/')){$ <function moreinfo="none">subst_body('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like) in the body of the message. + Replaces re with repl in the body of the message. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -768,7 +774,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; <function moreinfo="none">subst_hf(hf, subexp, flags)</function> </title> <para> - Perl-like substitutions in the body of a header field. + Substitutions in the body of a header field. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist>

1 0

git:5.5:2ce38e6c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 04 Oct '21

04 Oct '21

Module: kamailio Branch: 5.5 Commit: 2ce38e6ca5e822210e47b7966a335adcf8df7e23 URL: https://github.com/kamailio/kamailio/commit/2ce38e6ca5e822210e47b7966a335ad… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-04T17:46:39+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/2ce38e6ca5e822210e47b7966a335ad… Patch: https://github.com/kamailio/kamailio/commit/2ce38e6ca5e822210e47b7966a335ad… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 49b786ac13..ef7c0e9634 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -44,8 +44,8 @@ Frederic Gaisnon 3.11. contact_mode (int) 3.12. cparam_name (int) 3.13. xavu_cfg (str) - 3.14. xavu_filed_a_contact (str) - 3.15. xavu_filed_b_contact (str) + 3.14. xavu_field_a_contact (str) + 3.15. xavu_field_b_contact (str) 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) @@ -76,8 +76,8 @@ Frederic Gaisnon 1.11. Set contact_mode parameter 1.12. Set cparam_name parameter 1.13. Set xavu_cfg parameter - 1.14. Set xavu_filed_a_contact parameter - 1.15. Set xavu_filed_b_contact parameter + 1.14. Set xavu_field_a_contact parameter + 1.15. Set xavu_field_b_contact parameter 1.16. Set xavu_field_contact_host parameter 1.17. Set rr_update parameter 1.18. Set context parameter @@ -112,8 +112,8 @@ Chapter 1. Admin Guide 3.11. contact_mode (int) 3.12. cparam_name (int) 3.13. xavu_cfg (str) - 3.14. xavu_filed_a_contact (str) - 3.15. xavu_filed_b_contact (str) + 3.14. xavu_field_a_contact (str) + 3.15. xavu_field_b_contact (str) 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) @@ -182,8 +182,8 @@ Chapter 1. Admin Guide 3.11. contact_mode (int) 3.12. cparam_name (int) 3.13. xavu_cfg (str) - 3.14. xavu_filed_a_contact (str) - 3.15. xavu_filed_b_contact (str) + 3.14. xavu_field_a_contact (str) + 3.15. xavu_field_b_contact (str) 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) @@ -320,7 +320,7 @@ modparam("topos", "event_mode", 2) 3.10. contact_host (str) You may need to control the host part of the Contact header added by - topos. If the xavu_filed_contact_host parameter is set, this value is + topos. If the xavu_field_contact_host parameter is set, this value is ignored. For example when using TLS with TOPOS the remote UAS must be able to open a new TLS socket to the contact header. In this case, the contact header must contain a domain name with a trusted CA signed @@ -388,12 +388,12 @@ modparam("topos", "cparam_name", "xyz") Example 1.13. Set xavu_cfg parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... -3.14. xavu_filed_a_contact (str) +3.14. xavu_field_a_contact (str) Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the A-side Contact Header user part. This parameter is only @@ -401,15 +401,15 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") Default value is “NULL” (disabled). - Example 1.14. Set xavu_filed_a_contact parameter + Example 1.14. Set xavu_field_a_contact parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... -3.15. xavu_filed_b_contact (str) +3.15. xavu_field_b_contact (str) Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the B-side Contact Header user part. This parameter is only @@ -417,10 +417,10 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") Default value is “NULL” (disabled). - Example 1.15. Set xavu_filed_b_contact parameter + Example 1.15. Set xavu_field_b_contact parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_b_contact", "b_contact") +modparam("topos", "xavu_field_b_contact", "b_contact") ... $xavu(_tps_=>b_contact) = "...";

1 0

git:master:b163e40a: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 04 Oct '21

04 Oct '21

Module: kamailio Branch: master Commit: b163e40a8d13201cc07c1df69a58855cba0df540 URL: https://github.com/kamailio/kamailio/commit/b163e40a8d13201cc07c1df69a58855… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-04T17:46:22+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/b163e40a8d13201cc07c1df69a58855… Patch: https://github.com/kamailio/kamailio/commit/b163e40a8d13201cc07c1df69a58855… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 49b786ac13..ef7c0e9634 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -44,8 +44,8 @@ Frederic Gaisnon 3.11. contact_mode (int) 3.12. cparam_name (int) 3.13. xavu_cfg (str) - 3.14. xavu_filed_a_contact (str) - 3.15. xavu_filed_b_contact (str) + 3.14. xavu_field_a_contact (str) + 3.15. xavu_field_b_contact (str) 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) @@ -76,8 +76,8 @@ Frederic Gaisnon 1.11. Set contact_mode parameter 1.12. Set cparam_name parameter 1.13. Set xavu_cfg parameter - 1.14. Set xavu_filed_a_contact parameter - 1.15. Set xavu_filed_b_contact parameter + 1.14. Set xavu_field_a_contact parameter + 1.15. Set xavu_field_b_contact parameter 1.16. Set xavu_field_contact_host parameter 1.17. Set rr_update parameter 1.18. Set context parameter @@ -112,8 +112,8 @@ Chapter 1. Admin Guide 3.11. contact_mode (int) 3.12. cparam_name (int) 3.13. xavu_cfg (str) - 3.14. xavu_filed_a_contact (str) - 3.15. xavu_filed_b_contact (str) + 3.14. xavu_field_a_contact (str) + 3.15. xavu_field_b_contact (str) 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) @@ -182,8 +182,8 @@ Chapter 1. Admin Guide 3.11. contact_mode (int) 3.12. cparam_name (int) 3.13. xavu_cfg (str) - 3.14. xavu_filed_a_contact (str) - 3.15. xavu_filed_b_contact (str) + 3.14. xavu_field_a_contact (str) + 3.15. xavu_field_b_contact (str) 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) @@ -320,7 +320,7 @@ modparam("topos", "event_mode", 2) 3.10. contact_host (str) You may need to control the host part of the Contact header added by - topos. If the xavu_filed_contact_host parameter is set, this value is + topos. If the xavu_field_contact_host parameter is set, this value is ignored. For example when using TLS with TOPOS the remote UAS must be able to open a new TLS socket to the contact header. In this case, the contact header must contain a domain name with a trusted CA signed @@ -388,12 +388,12 @@ modparam("topos", "cparam_name", "xyz") Example 1.13. Set xavu_cfg parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... -3.14. xavu_filed_a_contact (str) +3.14. xavu_field_a_contact (str) Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the A-side Contact Header user part. This parameter is only @@ -401,15 +401,15 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") Default value is “NULL” (disabled). - Example 1.14. Set xavu_filed_a_contact parameter + Example 1.14. Set xavu_field_a_contact parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... -3.15. xavu_filed_b_contact (str) +3.15. xavu_field_b_contact (str) Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the B-side Contact Header user part. This parameter is only @@ -417,10 +417,10 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") Default value is “NULL” (disabled). - Example 1.15. Set xavu_filed_b_contact parameter + Example 1.15. Set xavu_field_b_contact parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_b_contact", "b_contact") +modparam("topos", "xavu_field_b_contact", "b_contact") ... $xavu(_tps_=>b_contact) = "...";

1 0

[kamailio/kamailio] topos/topos_redis, error: "could not evaluate a_contact xavu" when in-dialog msg have Rexord-Rourte header. (#2852)
by Dennis 04 Oct '21

04 Oct '21

Hi ! topos+redis used in the folowing configuration: modparam("ndb_redis", "server", "REDIS_SERVER") modparam("ndb_redis", "init_without_redis", 1) modparam("topos", "storage", "redis") modparam("topos_redis", "serverid", "srv1") modparam("topos", "contact_mode", 2) modparam("topos", "xavu_cfg", "_tps_") modparam("topos", "xavu_field_a_contact", "a_contact") modparam("topos", "xavu_field_b_contact", "b_contact") modparam("topos", "xavu_field_contact_host", "contact_host") In the inital INVITE xavu variables a_contact and b_contact are set by script, topos work as expected at this point, but when the following in-dalog messages from upstream have Record-Route header, topos fails with error message: Sep 13 18:50:01 gw481 /usr/sbin/kamailio[29874]: ERROR: {1 1 ACK 1-20643(a)87.250.237.98} topos [tps_storage.c:331]: tps_storage_fill_contact(): could not evaluate a_contact xavu Sep 13 18:50:01 gw481 /usr/sbin/kamailio[29874]: ERROR: {1 1 ACK 1-20643(a)87.250.237.98} topos [tps_storage.c:604]: tps_storage_record(): failed to store In case of absent Record-Route headers the are no errors. #### Debugging Data Signaling dump and debug log in attachment. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.5.1 (x86_64/linux) ``` * **Operating System**:  ``` Ubuntu 18.04.5 LTS ``` [dump.txt](https://github.com/kamailio/kamailio/files/7157118/dump.txt) [call.log](https://github.com/kamailio/kamailio/files/7157120/call.log) -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2852

3 13

git:5.5:11ae371e: topos: spelling fix in README for contact parameter
by Henning Westerholt 04 Oct '21

04 Oct '21

Module: kamailio Branch: 5.5 Commit: 11ae371e59496c6ea3036c15d44afcd3488ca9e9 URL: https://github.com/kamailio/kamailio/commit/11ae371e59496c6ea3036c15d44afcd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-04T15:39:04Z topos: spelling fix in README for contact parameter (cherry picked from commit 0a9b039f79de90a45e263325cb247f49a31d9f36) --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/11ae371e59496c6ea3036c15d44afcd… Patch: https://github.com/kamailio/kamailio/commit/11ae371e59496c6ea3036c15d44afcd… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 4218dae3fe..dee94df414 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -294,7 +294,7 @@ modparam("topos", "event_mode", 2) <title><varname>contact_host</varname> (str)</title> <para> You may need to control the host part of the Contact header added - by topos. If the xavu_filed_contact_host parameter is set, this value is + by topos. If the xavu_field_contact_host parameter is set, this value is ignored. For example when using TLS with TOPOS the remote UAS must be able to open @@ -397,7 +397,7 @@ modparam("topos", "cparam_name", "xyz") <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... @@ -405,7 +405,7 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </example> </section> <section id="topos.p.xavu_field_a_contact"> - <title><varname>xavu_filed_a_contact</varname> (str)</title> + <title><varname>xavu_field_a_contact</varname> (str)</title> <para> Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the A-side Contact Header user part. This parameter @@ -417,11 +417,11 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </emphasis> </para> <example> - <title>Set <varname>xavu_filed_a_contact</varname> parameter</title> + <title>Set <varname>xavu_field_a_contact</varname> parameter</title> <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... @@ -429,7 +429,7 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </example> </section> <section id="topos.p.xavu_field_b_contact"> - <title><varname>xavu_filed_b_contact</varname> (str)</title> + <title><varname>xavu_field_b_contact</varname> (str)</title> <para> Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the B-side Contact Header user part. This parameter @@ -441,11 +441,11 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </emphasis> </para> <example> - <title>Set <varname>xavu_filed_b_contact</varname> parameter</title> + <title>Set <varname>xavu_field_b_contact</varname> parameter</title> <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_b_contact", "b_contact") +modparam("topos", "xavu_field_b_contact", "b_contact") ... $xavu(_tps_=>b_contact) = "...";

1 0

git:master:0a9b039f: topos: spelling fix in README for contact parameter
by Henning Westerholt 04 Oct '21

04 Oct '21

Module: kamailio Branch: master Commit: 0a9b039f79de90a45e263325cb247f49a31d9f36 URL: https://github.com/kamailio/kamailio/commit/0a9b039f79de90a45e263325cb247f4… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-04T15:38:23Z topos: spelling fix in README for contact parameter --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0a9b039f79de90a45e263325cb247f4… Patch: https://github.com/kamailio/kamailio/commit/0a9b039f79de90a45e263325cb247f4… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 4218dae3fe..dee94df414 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -294,7 +294,7 @@ modparam("topos", "event_mode", 2) <title><varname>contact_host</varname> (str)</title> <para> You may need to control the host part of the Contact header added - by topos. If the xavu_filed_contact_host parameter is set, this value is + by topos. If the xavu_field_contact_host parameter is set, this value is ignored. For example when using TLS with TOPOS the remote UAS must be able to open @@ -397,7 +397,7 @@ modparam("topos", "cparam_name", "xyz") <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... @@ -405,7 +405,7 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </example> </section> <section id="topos.p.xavu_field_a_contact"> - <title><varname>xavu_filed_a_contact</varname> (str)</title> + <title><varname>xavu_field_a_contact</varname> (str)</title> <para> Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the A-side Contact Header user part. This parameter @@ -417,11 +417,11 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </emphasis> </para> <example> - <title>Set <varname>xavu_filed_a_contact</varname> parameter</title> + <title>Set <varname>xavu_field_a_contact</varname> parameter</title> <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_a_contact", "a_contact") +modparam("topos", "xavu_field_a_contact", "a_contact") ... $xavu(_tps_=>a_contact) = "..."; ... @@ -429,7 +429,7 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </example> </section> <section id="topos.p.xavu_field_b_contact"> - <title><varname>xavu_filed_b_contact</varname> (str)</title> + <title><varname>xavu_field_b_contact</varname> (str)</title> <para> Name of the field inside root XAVU specifed by `xavu_cfg` to evaluate for the B-side Contact Header user part. This parameter @@ -441,11 +441,11 @@ modparam("topos", "xavu_filed_a_contact", "a_contact") </emphasis> </para> <example> - <title>Set <varname>xavu_filed_b_contact</varname> parameter</title> + <title>Set <varname>xavu_field_b_contact</varname> parameter</title> <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_filed_b_contact", "b_contact") +modparam("topos", "xavu_field_b_contact", "b_contact") ... $xavu(_tps_=>b_contact) = "...";

1 0

Syntax error
by Scherney Theodor 04 Oct '21

04 Oct '21

Hello, I have tested following scenario: Alice "calls" Bob. Call is established. At the end of the call, Bob disconnects (hangs up) first and generates a BYE message. If there is a syntax error in FROM Header of BYE message, a 400 “Bad From header” is responded by the Proxy. If there is a syntax error in TO Header of BYE message, the message is discarded. According RFC 3261 this is not correct. Is it okay, to implement the same logic for TO Header as done for FROM Header? RFC 3261: 16.2 Stateful Proxy ………. For all new requests, including any with unknown methods, an element intending to proxy the request MUST: 1. Validate the request (Section 16.3) 2. Preprocess routing information (Section 16.4) 3. Determine target(s) for the request (Section 16.5) +--------------------+ | | +---+ | | | C | | | | T | | | +---+ +---+ | Proxy | +---+ CT = Client Transaction | S | | "Higher" Layer | | C | | T | | | | T | ST = Server Transaction +---+ | | +---+ | | +---+ | | | C | | | | T | | | +---+ +--------------------+ Figure 3: Stateful Proxy Model 4. Forward the request to each target (Section 16.6) 5. Process all responses (Section 16.7) 16.3 Request Validation Before an element can proxy a request, it MUST verify the message’s validity. A valid message must pass the following checks: 1. Reasonable Syntax 2. URI scheme 3. Max-Forwards 4. (Optional) Loop Detection 5. Proxy-Require 6. Proxy-Authorization If any of these checks fail, the element MUST behave as a user agent server (see Section 8.2) and respond with an error code. LOGs: BYE with syntax error in FROM header: Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_addr_spec.c:555]: parse_to_param(): unexpected end of header, status 20: [;transport=UDP;tag=b3af-8e5a-1e36-79340f18;#015] . Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_addr_spec.c:881]: parse_addr_spec(): invalid To - unexpected end of header in state 11 Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_from.c:75]: parse_from_header(): bad From header [sip:catt180@vict-ims.net;transport=UDP;tag=b3af-8e5a-1e36-79340f18;] Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="pv"] ERROR: pv [pv_core.c:468]: pv_get_from_attr(): cannot parse From header Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="xlog"] INFO: <script>: route BYE (<null> (193.154.113.40:5065) to sip:catt181@vict-ims.net, 1632235417904catt180, ) Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="xlog"] INFO: <script>: BYE (BYE sip:catt181@193.154.113.40:5065;transport=UDP;rinstance=317-catt181 SIP/2.0#015#012From: sip:catt180@vict-ims.net;transport=UDP;tag=b3af-8e5a-1e36-79340f18;#015#012To: sip:catt181@vict-ims.net;transport=UDP;tag=9d7b-d1c6-c06b-7a1dbec7#015#012Call-ID: 1632235417904catt180#015#012CSeq: 2 BYE#015#012Contact: sip:catt180@193.154.113.40:5065;transport=UDP;rinstance=317-catt180#015#012Content-Length: 0#015#012Max-Forwards: 70#015#012Route: sip:mo@172.29.21.60;r2=on;lr;ftag=b3af-8e5a-1e36-79340f18;rm=8;did=8ed.6e12#015#012Route: sip:mo@pcscf-1.vict-ims.net:5060;r2=on;lr;ftag=b3af-8e5a-1e36-79340f18;rm=8;did=8ed.6e12#015#012Route: sip:mo@vict-ims.net;lr;ftag=b3af-8e5a-1e36-79340f18;did=8ed.e7b1#015#012Route: sip:mt@vict-ims.net;lr;ftag=b3af-8e5a-1e36-79340f18;did=8ed.e7b1#015#012Route: sip:mt@pcscf-1.vict-ims.net;r2=on;lr;ftag=b3af-8e5a-1e36-79340f18;rm=7;did=8ed.7e12#015#012Route: sip:mt@172.29.21.60:5060;r2=on;lr;ftag=b3af-8e5a-1e36-79340f18;rm=7;did=8ed.7e12#015#012Via: SIP/2.0/UDP 193.154.113.40:5065;branch=z9hG4bKf7057b36-0#015#012#015#012) Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_addr_spec.c:555]: parse_to_param(): unexpected end of header, status 20: [;transport=UDP;tag=b3af-8e5a-1e36-79340f18;#015] . Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_addr_spec.c:881]: parse_addr_spec(): invalid To - unexpected end of header in state 11 Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="sanity"] WARNING: sanity [sanity.c:776]: check_parse_uris(): failed to parse From header [sip:catt180@vict-ims.net;transport=UDP;tag=b3af-8e5a-1e36-79340f18;] Sep 21 16:44:51 vict2-ims3 /usr/sbin/kamailio[12723]: [logSDID@20306 resource="xlog"] INFO: <script>: t_relay_send_reply_sl - BYE (SIP/2.0 400 Bad From header#015#012From: sip:catt180@vict-ims.net;transport=UDP;tag=b3af-8e5a-1e36-79340f18;#015#012To: sip:catt181@vict-ims.net;transport=UDP;tag=9d7b-d1c6-c06b-7a1dbec7#015#012Call-ID: 1632235417904catt180#015#012CSeq: 2 BYE#015#012Via: SIP/2.0/UDP 193.154.113.40:5065;branch=z9hG4bKf7057b36-0#015#012Server: Kamailio P-CSCF#015#012Content-Length: 0#015#012#015#012) BYE with syntax error in TO header: Sep 21 16:41:07 vict2-ims3 /usr/sbin/kamailio[12733]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_addr_spec.c:555]: parse_to_param(): unexpected end of header, status 20: [;transport=UDP;tag=1ba4-ff0c-82af-415174d1;#015#012] . Sep 21 16:41:07 vict2-ims3 /usr/sbin/kamailio[12733]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/parse_addr_spec.c:881]: parse_addr_spec(): invalid To - unexpected end of header in state 13 Sep 21 16:41:07 vict2-ims3 /usr/sbin/kamailio[12733]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/msg_parser.c:167]: get_hdr_field(): bad to header Sep 21 16:41:07 vict2-ims3 /usr/sbin/kamailio[12733]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/msg_parser.c:337]: parse_headers(): bad header field [To: sip:catt181@vict] Sep 21 16:41:07 vict2-ims3 /usr/sbin/kamailio[12733]: [logSDID@20306 resource="core"] ERROR: <core> [core/parser/msg_parser.c:687]: parse_msg(): ERROR: parse_msg: message=<BYE sip:catt181@193.154.113.40:5065;transport=UDP;rinstance=317-catt181 SIP/2.0#015#012From: sip:catt180@vict-ims.net;transport=UDP;tag=b7fb-dd8f-30fd-2a93fc86#015#012To: sip:catt181@vict-ims.net;transport=UDP;tag=1ba4-ff0c-82af-415174d1;#015#012Call-ID: 1632235194213catt180#015#012CSeq: 2 BYE#015#012Contact: sip:catt180@193.154.113.40:5065;transport=UDP;rinstance=317-catt180#015#012Content-Length: 0#015#012Max-Forwards: 70#015#012Route: sip:mo@172.29.21.60;r2=on;lr;ftag=b7fb-dd8f-30fd-2a93fc86;rm=8;did=281.c9a1#015#012Route: sip:mo@pcscf-1.vict-ims.net:5060;r2=on;lr;ftag=b7fb-dd8f-30fd-2a93fc86;rm=8;did=281.c9a1#015#012Route: sip:mo@vict-ims.net;lr;ftag=b7fb-dd8f-30fd-2a93fc86;did=281.b871#015#012Route: sip:mt@vict-ims.net;lr;ftag=b7fb-dd8f-30fd-2a93fc86;did=281.b871#015#012Route: sip:mt@pcscf-1.vict-ims.net;r2=on;lr;ftag=b7fb-dd8f-30fd-2a93fc86;rm=7;did=281.d9a1#015#012Route: sip:mt@172.29.21.60:5060;r2=on;lr;ftag=b7fb-dd8f-30fd-2a93fc86;rm=7;did=281.d9a1#015#012Via: SIP/2.0/UDP 193.154.113.40:5065;branch=z9hG4bK0850615e-0#015#012#015#012> Sep 21 16:41:07 vict2-ims3 /usr/sbin/kamailio[12733]: [logSDID@20306 resource="core"] ERROR: <core> [core/receive.c:199]: receive_msg(): core parsing of SIP message failed (193.154.113.40:5065/1) BR Theo

2 2

[kamailio/kamailio] SIP Preconditions Settings? (#2866)
by JoelBorrego 04 Oct '21

04 Oct '21

Hi GitHub Team, We are trying to find how to disable the SIP Precondition flag in the Kamailio, because until now the only way to do any changes is via UE (Smartphones with debug SW). According with the RFC3312 (https://datatracker.ietf.org/doc/html/rfc3312) The SDP parameters are the following We define the following media level SDP attributes: current-status = "a=curr:" precondition-type SP status-type SP direction-tag desired-status = "a=des:" precondition-type SP strength-tag SP status-type SP direction-tag confirm-status = "a=conf:" precondition-type SP status-type SP direction-tag **precondition-type = "qos" | token strength-tag = ("mandatory" | "optional" | "none" = | "failure" | "unknown")** status-type = ("e2e" | "local" | "remote") direction-tag = ("none" | "send" | "recv" | "sendrecv") Which one should be the equivalent in the Kamailio?, is the a specific module? Br, Joel -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2866

3 4

git:master:1ea71703: lwsc: wait to read more data if not last ws fragment
by Daniel-Constantin Mierla 01 Oct '21

01 Oct '21

Module: kamailio Branch: master Commit: 1ea717032d90fcc98a5de07e746ec367eaeed3be URL: https://github.com/kamailio/kamailio/commit/1ea717032d90fcc98a5de07e746ec36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-01T12:41:02+02:00 lwsc: wait to read more data if not last ws fragment - GH #2862 --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1ea717032d90fcc98a5de07e746ec36… Patch: https://github.com/kamailio/kamailio/commit/1ea717032d90fcc98a5de07e746ec36… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index a6985acb6d..7eb1f4285e 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -144,6 +144,7 @@ typedef struct lwsc_endpoint { /* first LWS_PRE bytes must preserved for headers */ str wbuf; str rbuf; + int rdone; int tlson; struct lws_protocols protocols[2]; struct lws_context_creation_info crtinfo; @@ -226,6 +227,7 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, lwsc_endpoint_t *ep = NULL; str rbuf = STR_NULL; str wbuf = STR_NULL; + int blen = 0; if(_lwsc_verbosity>1) { LM_DBG("callback called with reason %d\n", reason); @@ -349,28 +351,35 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, LM_DBG("LWS_CALLBACK_RECEIVE - wsi: %p len: %lu\n", wsi, (unsigned long)len); #endif + ep = lwsc_get_endpoint_by_wsi(wsi); + if(ep==NULL) { + LM_ERR("no endpoint for wsi %p\n", wsi); + goto done; + } + pthread_mutex_lock(&ep->wslock); if(len>0) { - ep = lwsc_get_endpoint_by_wsi(wsi); - if(ep==NULL) { - LM_ERR("no endpoint for wsi %p\n", wsi); - goto done; - } - rbuf.s = (char*)pkg_malloc(len + 1); + blen = ep->rbuf.len + len; + rbuf.s = (char*)pkg_malloc(blen + 1); if(rbuf.s==NULL) { PKG_MEM_ERROR; } else { - memcpy(rbuf.s, in, len); - rbuf.len = len; - rbuf.s[rbuf.len] = '\0'; - pthread_mutex_lock(&ep->wslock); if(ep->rbuf.s!=NULL) { - LM_ERR("losing read buffer of %d bytes\n", ep->rbuf.len); + LM_DBG("append to read buffer of %d bytes more %d bytes\n", + ep->rbuf.len, (int)len); + memcpy(rbuf.s, ep->rbuf.s, ep->rbuf.len); pkg_free(ep->rbuf.s); + ep->rbuf.s = NULL; } + memcpy(rbuf.s + ep->rbuf.len, in, len); + rbuf.len = blen; + rbuf.s[rbuf.len] = '\0'; ep->rbuf = rbuf; - pthread_mutex_unlock(&ep->wslock); } } + if (lws_is_final_fragment(wsi)) { + ep->rdone = 1; + } + pthread_mutex_unlock(&ep->wslock); break; case LWS_CALLBACK_WS_PEER_INITIATED_CLOSE: @@ -646,6 +655,7 @@ static int lwsc_api_request(str* wsurl, str *wsproto, str* sdata, ep->rbuf.s = NULL; ep->rbuf.len = 0; } + ep->rdone = 0; if(ep->wbuf.s!=NULL) { LM_ERR("losing write buffer content of %d bytes\n", ep->wbuf.len); pkg_free(ep->wbuf.s); @@ -659,10 +669,13 @@ static int lwsc_api_request(str* wsurl, str *wsproto, str* sdata, do { pthread_mutex_lock(&ep->wslock); - if(ep->rbuf.s!=NULL) { - *rdata = ep->rbuf; - ep->rbuf.s = NULL; - ep->rbuf.len = 0; + if(ep->rdone==1) { + if(ep->rbuf.s!=NULL) { + *rdata = ep->rbuf; + ep->rbuf.s = NULL; + ep->rbuf.len = 0; + } + ep->rdone = 0; } pthread_mutex_unlock(&ep->wslock); if(rdata->s==NULL) {

1 0

git:master:e4e07a9c: posops: set index relative to the buffer for search functions
by Daniel-Constantin Mierla 01 Oct '21

01 Oct '21

Module: kamailio Branch: master Commit: e4e07a9cca8d91cb4acce8cbf7c8def9c3df06d9 URL: https://github.com/kamailio/kamailio/commit/e4e07a9cca8d91cb4acce8cbf7c8def… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-01T08:43:22+02:00 posops: set index relative to the buffer for search functions --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e4e07a9cca8d91cb4acce8cbf7c8def… Patch: https://github.com/kamailio/kamailio/commit/e4e07a9cca8d91cb4acce8cbf7c8def… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 9c6f7d702f..5710b83da2 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -684,7 +684,7 @@ static int ki_posops_pos_search_helper(sip_msg_t *msg, int idx, regex_t *re) return -1; } - _posops_data.idx = (int)(msg->buf + idx + pmatch.rm_so); + _posops_data.idx = idx + pmatch.rm_so; _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; _posops_data.len = pmatch.rm_eo-pmatch.rm_so; @@ -757,7 +757,7 @@ static int ki_posops_pos_rsearch_helper(sip_msg_t *msg, int idx, regex_t *re) return -1; } - _posops_data.idx = (int)(msg->buf + i + pmatch.rm_so); + _posops_data.idx = i + pmatch.rm_so; _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; _posops_data.len = pmatch.rm_eo-pmatch.rm_so;

1 0

git:master:0f851d79: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 30 Sep '21

30 Sep '21

Module: kamailio Branch: master Commit: 0f851d791d1d452be079ced5271e64a1a6a2ab69 URL: https://github.com/kamailio/kamailio/commit/0f851d791d1d452be079ced5271e64a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-30T12:31:26+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/0f851d791d1d452be079ced5271e64a… Patch: https://github.com/kamailio/kamailio/commit/0f851d791d1d452be079ced5271e64a… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index fb2fbe0a8c..43a05c6833 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -42,6 +42,7 @@ Daniel-Constantin Mierla 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) 4.12. pos_search(idx, re) + 4.13. pos_rsearch(idx, re) 5. Pseudo Variables @@ -60,6 +61,7 @@ Daniel-Constantin Mierla 1.11. pos_find_str() usage 1.12. pos_rfindi_str() usage 1.13. pos_search() usage + 1.14. pos_rsearch() usage Chapter 1. Admin Guide @@ -89,6 +91,7 @@ Chapter 1. Admin Guide 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) 4.12. pos_search(idx, re) + 4.13. pos_rsearch(idx, re) 5. Pseudo Variables @@ -148,6 +151,7 @@ modparam("posops", "idx0", -200) 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) 4.12. pos_search(idx, re) + 4.13. pos_rsearch(idx, re) 4.1. pos_append(idx, val) @@ -345,6 +349,26 @@ $var(idx) = pos_rfindi_str("100", "kamailio"); $var(idx) = pos_search("100", "[0-9]+"); ... +4.13. pos_rsearch(idx, re) + + Return the position of last match that starts matching the regular + expression re in message buffer starting at idx. In case of not finding + it or error, the return code is negative. If val is at index 0, it + returns the value specified by modparam idx0. + + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. + + The re can be a static regular expression string. + + This function can be used from ANY_ROUTE. + + Example 1.14. pos_rsearch() usage +... +$var(idx) = pos_rsearch("100", "[0-9]+"); +... + 5. Pseudo Variables The module exports a pseudo-variable class, $pos(key), to access

1 0

git:master:d92cf070: posops: pos_rsearch() - search last occurence of a regex
by Daniel-Constantin Mierla 30 Sep '21

30 Sep '21

Module: kamailio Branch: master Commit: d92cf070a06c1528207c2ddab76d99641f7a9dc2 URL: https://github.com/kamailio/kamailio/commit/d92cf070a06c1528207c2ddab76d996… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-30T08:43:08+02:00 posops: pos_rsearch() - search last occurence of a regex --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d92cf070a06c1528207c2ddab76d996… Patch: https://github.com/kamailio/kamailio/commit/d92cf070a06c1528207c2ddab76d996…

1 0

git:master:02611920: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 29 Sep '21

29 Sep '21

Module: kamailio Branch: master Commit: 026119200117d20740cbe4d162a14767fe560fc5 URL: https://github.com/kamailio/kamailio/commit/026119200117d20740cbe4d162a1476… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-29T10:01:26+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/026119200117d20740cbe4d162a1476… Patch: https://github.com/kamailio/kamailio/commit/026119200117d20740cbe4d162a1476… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index 6e126f645f..fb2fbe0a8c 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -43,6 +43,8 @@ Daniel-Constantin Mierla 4.11. pos_rfindi_str(idx, val) 4.12. pos_search(idx, re) + 5. Pseudo Variables + List of Examples 1.1. Set idx0 parameter @@ -88,6 +90,8 @@ Chapter 1. Admin Guide 4.11. pos_rfindi_str(idx, val) 4.12. pos_search(idx, re) + 5. Pseudo Variables + 1. Overview The module exports utility functions to work with position inside the @@ -340,3 +344,11 @@ $var(idx) = pos_rfindi_str("100", "kamailio"); ... $var(idx) = pos_search("100", "[0-9]+"); ... + +5. Pseudo Variables + + The module exports a pseudo-variable class, $pos(key), to access + attributes upon specific function execution. + + These are documented in the appropriate Wiki pages hosted on the + project web site.

1 0

git:master:4f44fc43: posops: docs - section with notes about exported variables
by Daniel-Constantin Mierla 29 Sep '21

29 Sep '21

Module: kamailio Branch: master Commit: 4f44fc435b7819645ec39c44e37f25629809290a URL: https://github.com/kamailio/kamailio/commit/4f44fc435b7819645ec39c44e37f256… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-29T09:40:06+02:00 posops: docs - section with notes about exported variables --- Modified: src/modules/posops/doc/posops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4f44fc435b7819645ec39c44e37f256… Patch: https://github.com/kamailio/kamailio/commit/4f44fc435b7819645ec39c44e37f256… --- diff --git a/src/modules/posops/doc/posops_admin.xml b/src/modules/posops/doc/posops_admin.xml index 8f3ea7a44b..ac824f988b 100644 --- a/src/modules/posops/doc/posops_admin.xml +++ b/src/modules/posops/doc/posops_admin.xml @@ -382,5 +382,17 @@ $var(idx) = pos_search("100", "[0-9]+"); </section> </section> + <section id="posops.pvs"> + <title>Pseudo Variables</title> + <para> + The module exports a pseudo-variable class, $pos(key), to access + attributes upon specific function execution. + </para> + <para> + These are documented in the appropriate Wiki pages hosted on the + project web site. + </para> + </section> + </chapter>

1 0

git:master:c1087058: posops: store len of matched string with search function
by Daniel-Constantin Mierla 29 Sep '21

29 Sep '21

Module: kamailio Branch: master Commit: c108705810e3e84c18c91bcc7755077002443643 URL: https://github.com/kamailio/kamailio/commit/c108705810e3e84c18c91bcc7755077… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-29T09:23:42+02:00 posops: store len of matched string with search function --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c108705810e3e84c18c91bcc7755077… Patch: https://github.com/kamailio/kamailio/commit/c108705810e3e84c18c91bcc7755077… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 7e219e63e5..6efb201ae4 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -54,6 +54,7 @@ static int w_posops_pos_search(sip_msg_t* msg, char* p1idx, char* p2re); typedef struct posops_data { int ret; int idx; + int len; } posops_data_t; static int posops_idx0 = -255; @@ -659,6 +660,7 @@ static int ki_posops_pos_search_helper(sip_msg_t *msg, int idx, regex_t *re) _posops_data.idx = (int)(msg->buf + idx + pmatch.rm_so); _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; + _posops_data.len = pmatch.rm_eo-pmatch.rm_so; return _posops_data.ret; } @@ -708,6 +710,8 @@ static int pv_posops_get_pos(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, _posops_data.idx); case 1: /* ret */ return pv_get_sintval(msg, param, res, _posops_data.ret); + case 2: /* len */ + return pv_get_sintval(msg, param, res, _posops_data.len); } return pv_get_null(msg, param, res); } @@ -723,6 +727,8 @@ static int pv_posops_parse_pos_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "ret", 3)==0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "len", 3)==0) + sp->pvp.pvn.u.isname.name.n = 2; else goto error; break;

1 0

git:master:f6e93064: posops: init data structure for each function
by Daniel-Constantin Mierla 29 Sep '21

29 Sep '21

Module: kamailio Branch: master Commit: f6e9306428d28a65783034f981734ccb8b853e5e URL: https://github.com/kamailio/kamailio/commit/f6e9306428d28a65783034f981734cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-29T09:32:50+02:00 posops: init data structure for each function --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f6e9306428d28a65783034f981734cc… Patch: https://github.com/kamailio/kamailio/commit/f6e9306428d28a65783034f981734cc…

1 0

git:5.5:548e14cb: topos: reset vavu variable, otherwise we will get errors in contact_mode 2 (GH #2852)
by Henning Westerholt 28 Sep '21

28 Sep '21

Module: kamailio Branch: 5.5 Commit: 548e14cb12a9d39374ee20c9e5ab35b84c609a0c URL: https://github.com/kamailio/kamailio/commit/548e14cb12a9d39374ee20c9e5ab35b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-28T11:30:29Z topos: reset vavu variable, otherwise we will get errors in contact_mode 2 (GH #2852) (cherry picked from commit 5484b7a2bf662d3bced662d11a04e1f25f965023) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/548e14cb12a9d39374ee20c9e5ab35b… Patch: https://github.com/kamailio/kamailio/commit/548e14cb12a9d39374ee20c9e5ab35b… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index b94a960340..1a67c0252c 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -352,7 +352,8 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir, td->cp++; } - /* contact_host xavu takes preference */ + /* contact_host xavu takes preference, reset vavu */ + vavu = NULL; if (_tps_xavu_cfg.len>0 && _tps_xavu_field_contact_host.len>0) { vavu = xavu_get_child_with_sval(&_tps_xavu_cfg, &_tps_xavu_field_contact_host);

1 0

git:master:5484b7a2: topos: reset vavu variable, otherwise we will get errors in contact_mode 2 (GH #2852)
by Henning Westerholt 28 Sep '21

28 Sep '21

Module: kamailio Branch: master Commit: 5484b7a2bf662d3bced662d11a04e1f25f965023 URL: https://github.com/kamailio/kamailio/commit/5484b7a2bf662d3bced662d11a04e1f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-28T11:27:50Z topos: reset vavu variable, otherwise we will get errors in contact_mode 2 (GH #2852) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5484b7a2bf662d3bced662d11a04e1f… Patch: https://github.com/kamailio/kamailio/commit/5484b7a2bf662d3bced662d11a04e1f… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index b94a960340..1a67c0252c 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -352,7 +352,8 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir, td->cp++; } - /* contact_host xavu takes preference */ + /* contact_host xavu takes preference, reset vavu */ + vavu = NULL; if (_tps_xavu_cfg.len>0 && _tps_xavu_field_contact_host.len>0) { vavu = xavu_get_child_with_sval(&_tps_xavu_cfg, &_tps_xavu_field_contact_host);

1 0

git:master:d0e51c2f: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 28 Sep '21

28 Sep '21

Module: kamailio Branch: master Commit: d0e51c2f862ce0089c899d97c16906b037c485b3 URL: https://github.com/kamailio/kamailio/commit/d0e51c2f862ce0089c899d97c16906b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-28T10:46:28+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/d0e51c2f862ce0089c899d97c16906b… Patch: https://github.com/kamailio/kamailio/commit/d0e51c2f862ce0089c899d97c16906b… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 9d5e39f488..a9caf8951f 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2748,6 +2748,8 @@ ackets, 0 errors is enabled, the sessions are still allowed to finish for the hidden old nodes. + The execution of this command is limited to 10 seconds intervals. + Example 1.103. rtpengine.reload usage ... $ kamcmd rtpengine.reload

1 0

git:master:a9c9b83c: rtpengine: docs - note that rpc reload is limited to 10secs frequency
by Daniel-Constantin Mierla 28 Sep '21

28 Sep '21

Module: kamailio Branch: master Commit: a9c9b83c9dd1c09738b5a33362a8e339c20b786c URL: https://github.com/kamailio/kamailio/commit/a9c9b83c9dd1c09738b5a33362a8e33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-28T10:35:12+02:00 rtpengine: docs - note that rpc reload is limited to 10secs frequency --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a9c9b83c9dd1c09738b5a33362a8e33… Patch: https://github.com/kamailio/kamailio/commit/a9c9b83c9dd1c09738b5a33362a8e33… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 2106241f8d..c3201bbf37 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -3285,7 +3285,7 @@ play_dtmf("code=1 volume=5 duration=300 pause=150"); <title>RPC Commands</title> <section id="rtpengine.r.reload"> - <title>rtpengine.reload</title> + <title><function moreinfo="none">rtpengine.reload</function></title> <para> Reloads the database node table content <emphasis>if configured</emphasis>. Returns specific message related to success, failure and no db_url configured. @@ -3295,6 +3295,9 @@ play_dtmf("code=1 volume=5 duration=300 pause=150"); hides old ones, based on the database content. If allow_op modparam is enabled, the sessions are still allowed to finish for the hidden old nodes. </para> + <para> + The execution of this command is limited to 10 seconds intervals. + </para> <example> <title> <function moreinfo="none">rtpengine.reload</function> usage</title>

1 0

seas module
by dpaape 27 Sep '21

27 Sep '21

I’m attempting to connect my application to kamailio via the seas module. Kamailio ver. 5.3.2 I have loaded all the necessary configuration file components. I start kamailio and everything looks good. I then start my app server which connects to the loopback ports 5040 and 5041 and send my counted string “servername” to each connection. Again everything looks good. Seas module responds with : “… EUREKA, we have a new connected AS: myappserver I then send a register request to kamailio. Request_route calls as_relay_t(myappserver) and I subsequently get an ERROR – w_as_relay_t(): no processer found for packet dst xxx.xxx.xxx.xxx:pppp As best as I can figure out from the source…. It looks as if something else needs to be sent to kamailio (from myappserver) in order for a processor_id to be assigned to ‘as->bound_processor[i] My application server is just straight up C code. I must be forgetting something or maybe completely off the mark as to how the seas module functions. Any help would be greatly appreciated. Thanks, Dan Sent from Mail for Windows

1 0

git:master:2fdf550a: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 27 Sep '21

27 Sep '21

Module: kamailio Branch: master Commit: 2fdf550ac0a865ba2336e80ce2d450f3c378ad50 URL: https://github.com/kamailio/kamailio/commit/2fdf550ac0a865ba2336e80ce2d450f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-27T12:46:18+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/2fdf550ac0a865ba2336e80ce2d450f… Patch: https://github.com/kamailio/kamailio/commit/2fdf550ac0a865ba2336e80ce2d450f… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index d5f49f0cbb..6e126f645f 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -41,6 +41,7 @@ Daniel-Constantin Mierla 4.9. pos_findi_str(idx, val) 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) + 4.12. pos_search(idx, re) List of Examples @@ -56,6 +57,7 @@ Daniel-Constantin Mierla 1.10. pos_findi_str() usage 1.11. pos_find_str() usage 1.12. pos_rfindi_str() usage + 1.13. pos_search() usage Chapter 1. Admin Guide @@ -84,6 +86,7 @@ Chapter 1. Admin Guide 4.9. pos_findi_str(idx, val) 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) + 4.12. pos_search(idx, re) 1. Overview @@ -140,6 +143,7 @@ modparam("posops", "idx0", -200) 4.9. pos_findi_str(idx, val) 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) + 4.12. pos_search(idx, re) 4.1. pos_append(idx, val) @@ -316,3 +320,23 @@ $var(idx) = pos_rfind_str("100", "kamailio"); ... $var(idx) = pos_rfindi_str("100", "kamailio"); ... + +4.12. pos_search(idx, re) + + Return the position that starts matching the regular expression re in + message buffer starting at idx. In case of not finding it or error, the + return code is negative. If val is at index 0, it returns the value + specified by modparam idx0. + + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. + + The re can be a static regular expression string. + + This function can be used from ANY_ROUTE. + + Example 1.13. pos_search() usage +... +$var(idx) = pos_search("100", "[0-9]+"); +...

1 0

git:master:efe64a9a: posops: function to get the position of a regexp match
by Daniel-Constantin Mierla 27 Sep '21

27 Sep '21

Module: kamailio Branch: master Commit: efe64a9a14af608c47819678520c08eac98f52d7 URL: https://github.com/kamailio/kamailio/commit/efe64a9a14af608c47819678520c08e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-27T12:35:47+02:00 posops: function to get the position of a regexp match --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/efe64a9a14af608c47819678520c08e… Patch: https://github.com/kamailio/kamailio/commit/efe64a9a14af608c47819678520c08e…

1 0

git:master:421ba0ad: core: fixup helper for igp and regexp params
by Daniel-Constantin Mierla 27 Sep '21

27 Sep '21

Module: kamailio Branch: master Commit: 421ba0adde21ebc9f1e7a2289901a9574cc37259 URL: https://github.com/kamailio/kamailio/commit/421ba0adde21ebc9f1e7a2289901a95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-27T12:31:59+02:00 core: fixup helper for igp and regexp params --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/421ba0adde21ebc9f1e7a2289901a95… Patch: https://github.com/kamailio/kamailio/commit/421ba0adde21ebc9f1e7a2289901a95… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 49dbb44f1f..148ba50227 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -251,6 +251,50 @@ int fixup_free_regexp_regexp(void** param, int param_no) return fixup_free_regexp_null(param, 1); } +int fixup_igp_regexp(void** param, int param_no) +{ + struct regex_fixup* re; + + if (param_no == 1) { + return fixup_igp_null(param, param_no); + } + if (param_no == 2) { + if ((re=pkg_malloc(sizeof(*re))) ==0) { + PKG_MEM_ERROR; + goto error; + } + if (regcomp(&re->regex, *param, + REG_EXTENDED|REG_ICASE|REG_NEWLINE)) + goto error; + re->orig = *param; + *param = re; + } + return 0; +error: + if (re) + pkg_free(re); + return E_UNSPEC; +} + +int fixup_free_igp_regexp(void** param, int param_no) +{ + struct regex_fixup* re; + + if (param_no == 1) { + return fixup_free_igp_null(param, param_no); + } + if (param_no == 2) { + if (*param) { + re = *param; + *param = re->orig; + regfree(&re->regex); + pkg_free(re); + } + } + return 0; +} + + /* fixup_pvar_*() has to be written "by hand", since it needs to save the original pointer (the fixup users expects a pointer to the pv_spec_t in *param and hence the original value diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 29d937a261..f91e489f68 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -159,4 +159,7 @@ free_fixup_function mod_fix_get_fixup_free(fixup_function f); int fixup_vstr_all(void** param, int param_no); int fixup_free_vstr_all(void** param, int param_no); int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen); + +int fixup_igp_regexp(void** param, int param_no); +int fixup_free_igp_regexp(void** param, int param_no); #endif

1 0

git:master:ed3b2506: async: docs - added section ids for parameters
by Daniel-Constantin Mierla 27 Sep '21

27 Sep '21

Module: kamailio Branch: master Commit: ed3b2506e13214d25a3dd78e487ed35ed13053ac URL: https://github.com/kamailio/kamailio/commit/ed3b2506e13214d25a3dd78e487ed35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-27T11:38:42+02:00 async: docs - added section ids for parameters --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ed3b2506e13214d25a3dd78e487ed35… Patch: https://github.com/kamailio/kamailio/commit/ed3b2506e13214d25a3dd78e487ed35… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 5e9277a194..a56c60d7d2 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -68,7 +68,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="async.p.workers"> <title><varname>workers</varname> (int)</title> <para> Number of worker processes to be started to handle the asynchronous @@ -88,7 +88,7 @@ modparam("async", "workers", 2) </programlisting> </example> </section> - <section> + <section id="async.p.ms_timer"> <title><varname>ms_timer</varname> (int)</title> <para> Enables millisecond timer for async_ms_sleep() and async_ms_route() functions.

1 0

mod_pike is broken in 5.4 branch ?
by Markus Bönke 24 Sep '21

24 Sep '21

Hello all, It looks like mod_pike is broken in 5.4 branch since 5.4.6 because this patch is missing: https://github.com/kamailio/kamailio/commit/79fbb7c6df5d4c742b1283b752c2df0… <https://github.com/kamailio/kamailio/commit/79fbb7c6df5d4c742b1283b752c2df0…> If I test my script and send a lot of REGISTER messages, I only see this DEBUG message, the IP is never added to the tree: DEBUG: {1 [100-6380(a)10.211.55.12 <mailto:100-6380@10.211.55.12>] [1 REGISTER] [0]} pike [ip_tree.c:291]: mark_node(): search on branch 10 (top=(nil)) Versions 5.5.x are OK again. Thanks and regards Markus

2 1

git:5.4:523085f0: pike: fixed regression
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: 5.4 Commit: 523085f0a3c0953faa47bed7113507eb3c8b4f2c URL: https://github.com/kamailio/kamailio/commit/523085f0a3c0953faa47bed7113507e… Author: Boris Korzun <korzun(a)miatel.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T18:06:32+02:00 pike: fixed regression - removed unnecessary NULL-return from mark_node() after previous commit (cherry picked from commit 79fbb7c6df5d4c742b1283b752c2df0f51e77f09) (cherry picked from commit b62a773c8f0c1daf1aa3d1cd57845d414eea5bac) --- Modified: src/modules/pike/ip_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/523085f0a3c0953faa47bed7113507e… Patch: https://github.com/kamailio/kamailio/commit/523085f0a3c0953faa47bed7113507e… --- diff --git a/src/modules/pike/ip_tree.c b/src/modules/pike/ip_tree.c index c0324c0476..1fe9227a5f 100644 --- a/src/modules/pike/ip_tree.c +++ b/src/modules/pike/ip_tree.c @@ -301,10 +301,6 @@ pike_ip_node_t* mark_node(unsigned char *ip,int ip_len, } } - if(node==NULL) { - return NULL; - } - LM_DBG("only first %d were matched!\n",byte_pos); *flag = 0; *father = 0;

1 0

git:master:932e46b0: core: jump to error in case of unexpected comma for parse addr spec
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: 932e46b09176544cf6e085a32677980b26e4d2eb URL: https://github.com/kamailio/kamailio/commit/932e46b09176544cf6e085a32677980… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T14:43:40+02:00 core: jump to error in case of unexpected comma for parse addr spec --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/932e46b09176544cf6e085a32677980… Patch: https://github.com/kamailio/kamailio/commit/932e46b09176544cf6e085a32677980… --- diff --git a/src/core/parser/parse_addr_spec.c b/src/core/parser/parse_addr_spec.c index 1ff5a16908..f003e5f31a 100644 --- a/src/core/parser/parse_addr_spec.c +++ b/src/core/parser/parse_addr_spec.c @@ -494,6 +494,7 @@ static char *parse_to_param(char *const buffer, const char *const end, } LM_ERR("invalid character ',' in status %d: [%.*s]\n", status, (int)(tmp - buffer), ZSW(buffer)); + goto error; } default: switch(status) {

1 0

git:master:9d32ae36: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: 9d32ae36488ae988a8e6c13698f8f95eaab906f6 URL: https://github.com/kamailio/kamailio/commit/9d32ae36488ae988a8e6c13698f8f95… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-24T12:31:20+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/9d32ae36488ae988a8e6c13698f8f95… Patch: https://github.com/kamailio/kamailio/commit/9d32ae36488ae988a8e6c13698f8f95…

1 0

git:master:f5d73407: textopsx: exported msg_set_buffer(data) function
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: f5d7340773b9fb0f69644a6a1187ce5ef8cd55b8 URL: https://github.com/kamailio/kamailio/commit/f5d7340773b9fb0f69644a6a1187ce5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T12:17:19+02:00 textopsx: exported msg_set_buffer(data) function - it was available to KEMI --- Modified: src/modules/textopsx/doc/functions.xml Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/f5d7340773b9fb0f69644a6a1187ce5… Patch: https://github.com/kamailio/kamailio/commit/f5d7340773b9fb0f69644a6a1187ce5… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index b5a6cac103..3de3a6c8e6 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -46,6 +46,34 @@ if(msg_apply_changes()) } } ... +</programlisting> + </example> + </section> + + <section id="textopsx.f.msg_set_buffer"> + <title> + <function moreinfo="none">msg_set_buffer(data)</function> + </title> + <para> + Set the content of the SIP message buffer, replacing the exiting data. + The parameter can contain variables, its value must be a valid SIP + request or reply, a matter of what the old message is. + </para> + <para> + This function can be used from REQUEST_ROUTE or core REPLY_ROUTE. + </para> + <para> + Note: It must be used before the transaction is created in + request_route and not inside the onreply_route[name] executed by tm + module. Also, do not use after resuming a suspended request or reply, + at that moment the transaction is already created. + </para> + <example> + <title><function>msg_set_buffer()</function> usage</title> + <programlisting format="linespecific"> +... +msg_set_buffer("INVITE sip:..."); +... </programlisting> </example> </section> diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index a9a60f9ed8..5ddeffa2c7 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -46,6 +46,7 @@ MODULE_VERSION static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2); +static int msg_set_buffer_f(sip_msg_t *msg, char *p1data, char *p2); static int change_reply_status_f(sip_msg_t *, char *, char *); static int change_reply_status_fixup(void **param, int param_no); @@ -121,6 +122,9 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"msg_apply_changes", (cmd_function)msg_apply_changes_f, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {"msg_set_buffer", (cmd_function)msg_set_buffer_f, 1, + fixup_spve_null, fixup_free_spve_null, + REQUEST_ROUTE | ONREPLY_ROUTE}, {"change_reply_status", change_reply_status_f, 2, change_reply_status_fixup, 0, ONREPLY_ROUTE}, {"change_reply_status_code", change_reply_status_code_f, 1, @@ -242,6 +246,21 @@ static int ki_msg_set_buffer(sip_msg_t *msg, str *obuf) return ki_msg_update_buffer(msg, obuf); } +/** + * + */ +static int msg_set_buffer_f(sip_msg_t *msg, char *p1data, char *p2) +{ + str data = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)p1data, &data) < 0) { + LM_ERR("could not get string param value\n"); + return -1; + } + + return ki_msg_set_buffer(msg, &data); +} + /** * */

1 0

git:master:e51fa240: modules: readme files regenerated - sworker ... [skip ci]
by Kamailio Dev 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: e51fa240a0b8a39757c42f62fbdba21b3c1a2a11 URL: https://github.com/kamailio/kamailio/commit/e51fa240a0b8a39757c42f62fbdba21… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-24T10:46:17+02:00 modules: readme files regenerated - sworker ... [skip ci] --- Modified: src/modules/sworker/README --- Diff: https://github.com/kamailio/kamailio/commit/e51fa240a0b8a39757c42f62fbdba21… Patch: https://github.com/kamailio/kamailio/commit/e51fa240a0b8a39757c42f62fbdba21… --- diff --git a/src/modules/sworker/README b/src/modules/sworker/README index c5d571a179..d4aa30b864 100644 --- a/src/modules/sworker/README +++ b/src/modules/sworker/README @@ -23,15 +23,20 @@ Daniel-Constantin Mierla 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Functions + 3. Parameters - 3.1. sworker_active() - 3.2. swork_task(gname) + 3.1. xdata (str) + + 4. Functions + + 4.1. sworker_active() + 4.2. swork_task(gname) List of Examples - 1.1. sworker_active() usage - 1.2. sworker_task() usage + 1.1. xdata usage + 1.2. sworker_active() usage + 1.3. sworker_task() usage Chapter 1. Admin Guide @@ -43,10 +48,14 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Functions + 3. Parameters + + 3.1. xdata (str) - 3.1. sworker_active() - 3.2. swork_task(gname) + 4. Functions + + 4.1. sworker_active() + 4.2. swork_task(gname) 1. Overview @@ -81,19 +90,39 @@ Chapter 1. Admin Guide running Kamailio with this module loaded: * None -3. Functions +3. Parameters + + 3.1. xdata (str) + +3.1. xdata (str) + + Name of a script variable from where to take additional data to be + passed to special worker along with the SIP message. Same variable will + be set by the special worker, therefore it has to be a writable + variable. Moreover, it must be a variable that can be set without the + SIP message structure, like $var(name), otherwise it can lead to a + crash. + + Default value: not set. + + Example 1.1. xdata usage +... +modparam("sworker", "xdata", "$var(xdata)") +... + +4. Functions - 3.1. sworker_active() - 3.2. swork_task(gname) + 4.1. sworker_active() + 4.2. swork_task(gname) -3.1. sworker_active() +4.1. sworker_active() Return 1 (true) if the processing happens in an asyn process, or -1 (false) if the processing is happening in a SIP receiving process. This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE. - Example 1.1. sworker_active() usage + Example 1.2. sworker_active() usage ... request_route { ... @@ -103,7 +132,7 @@ request_route { } ... -3.2. swork_task(gname) +4.2. swork_task(gname) Delegate the processing of SIP message to a group of async workers. The function is restricted to be used inside event_route[core:pre-routing]. @@ -119,7 +148,7 @@ request_route { This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE. - Example 1.2. sworker_task() usage + Example 1.3. sworker_task() usage ... event_route[core:pre-routing] { if(sworker_task("default")) {

1 0

git:master:d60c758e: sworker: added parameter to be able to pass extra data to worker
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: d60c758e26048d2c9f055e8715ac54eee0b5a5ee URL: https://github.com/kamailio/kamailio/commit/d60c758e26048d2c9f055e8715ac54e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T10:31:12+02:00 sworker: added parameter to be able to pass extra data to worker --- Modified: src/modules/sworker/doc/sworker_admin.xml Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d60c758e26048d2c9f055e8715ac54e… Patch: https://github.com/kamailio/kamailio/commit/d60c758e26048d2c9f055e8715ac54e…

1 0

git:master:b6431ea5: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: b6431ea5044897e6152d5785a30af71ed759e19c URL: https://github.com/kamailio/kamailio/commit/b6431ea5044897e6152d5785a30af71… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-24T08:46:16+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/b6431ea5044897e6152d5785a30af71… Patch: https://github.com/kamailio/kamailio/commit/b6431ea5044897e6152d5785a30af71…

1 0

git:master:f23008ea: pv: added functions for xavu params explode/implode
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: f23008ea338e3fa67f50bab8fabf93cacc07804b URL: https://github.com/kamailio/kamailio/commit/f23008ea338e3fa67f50bab8fabf93c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T08:32:31+02:00 pv: added functions for xavu params explode/implode --- Modified: src/modules/pv/doc/pv_admin.xml Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c Modified: src/modules/pv/pv_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/f23008ea338e3fa67f50bab8fabf93c… Patch: https://github.com/kamailio/kamailio/commit/f23008ea338e3fa67f50bab8fabf93c…

1 0

Releasing Kamailio 5.3.9
by Henning Westerholt 23 Sep '21

23 Sep '21

Hello, I am planning to release in two weeks (likely on Wednesday 7th October) the next minor version out of branch 5.3, version 5.3.9. Backports of fixed issues from other stable branches will be integrated as usual. If you are aware of new issues which were not yet reported on the issue tracker or are missing back-ports, report them. Please note that this will be the last minor release created from the 5.3.x stable branch. The stable branches are usually maintained from the Kamailio development team for a period of two years. The other two stable branches of Kamailio will still be maintained (5.4.x and 5.5.x). Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

git:master:e41d23e2: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: e41d23e2955ab9e311f4292b6ffe58e4e4a4432b URL: https://github.com/kamailio/kamailio/commit/e41d23e2955ab9e311f4292b6ffe58e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-23T09:46:23+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/e41d23e2955ab9e311f4292b6ffe58e… Patch: https://github.com/kamailio/kamailio/commit/e41d23e2955ab9e311f4292b6ffe58e… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index 319e654c50..d5f49f0cbb 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -39,6 +39,8 @@ Daniel-Constantin Mierla 4.7. pos_body_end() 4.8. pos_find_str(idx, val) 4.9. pos_findi_str(idx, val) + 4.10. pos_rfind_str(idx, val) + 4.11. pos_rfindi_str(idx, val) List of Examples @@ -52,6 +54,8 @@ Daniel-Constantin Mierla 1.8. pos_body_end() usage 1.9. pos_find_str() usage 1.10. pos_findi_str() usage + 1.11. pos_find_str() usage + 1.12. pos_rfindi_str() usage Chapter 1. Admin Guide @@ -78,6 +82,8 @@ Chapter 1. Admin Guide 4.7. pos_body_end() 4.8. pos_find_str(idx, val) 4.9. pos_findi_str(idx, val) + 4.10. pos_rfind_str(idx, val) + 4.11. pos_rfindi_str(idx, val) 1. Overview @@ -132,6 +138,8 @@ modparam("posops", "idx0", -200) 4.7. pos_body_end() 4.8. pos_find_str(idx, val) 4.9. pos_findi_str(idx, val) + 4.10. pos_rfind_str(idx, val) + 4.11. pos_rfindi_str(idx, val) 4.1. pos_append(idx, val) @@ -236,7 +244,9 @@ $var(pos) = pos_body_end(); case of not finding it or error, the return code is negative. If val is at index 0, it returns the value specified by modparam idx0. - The idx can be an integer value or a variable holding an integer. + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. The val can be a static string or variables. @@ -254,7 +264,9 @@ $var(idx) = pos_find_str("100", "kamailio"); code is negative. If val is at index 0, it returns the value specified by modparam idx0. - The idx can be an integer value or a variable holding an integer. + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. The val can be a static string or variables. @@ -264,3 +276,43 @@ $var(idx) = pos_find_str("100", "kamailio"); ... $var(idx) = pos_findi_str("100", "kamailio"); ... + +4.10. pos_rfind_str(idx, val) + + Return the last position of the val in message buffer starting at idx + (reverse search). In case of not finding it or error, the return code + is negative. If val is at index 0, it returns the value specified by + modparam idx0. + + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. + + The val can be a static string or variables. + + This function can be used from ANY_ROUTE. + + Example 1.11. pos_find_str() usage +... +$var(idx) = pos_rfind_str("100", "kamailio"); +... + +4.11. pos_rfindi_str(idx, val) + + Return the last position of the val (matching case insensitive) in + message buffer starting at idx (reverse search). In case of not finding + it or error, the return code is negative. If val is at index 0, it + returns the value specified by modparam idx0. + + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. + + The val can be a static string or variables. + + This function can be used from ANY_ROUTE. + + Example 1.12. pos_rfindi_str() usage +... +$var(idx) = pos_rfindi_str("100", "kamailio"); +...

1 0

git:master:2cd6f16f: posops: functions for getting the position by reverse search
by Daniel-Constantin Mierla 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: 2cd6f16f9a377bf35a6f3f840dbedc5780897736 URL: https://github.com/kamailio/kamailio/commit/2cd6f16f9a377bf35a6f3f840dbedc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-23T09:25:43+02:00 posops: functions for getting the position by reverse search --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2cd6f16f9a377bf35a6f3f840dbedc5… Patch: https://github.com/kamailio/kamailio/commit/2cd6f16f9a377bf35a6f3f840dbedc5…

1 0

git:master:2ae296f5: posops: handle negative index parameter for find functions
by Daniel-Constantin Mierla 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: 2ae296f5d8fa2baa2d451213d668fdd8fabe06d9 URL: https://github.com/kamailio/kamailio/commit/2ae296f5d8fa2baa2d451213d668fdd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-23T09:06:51+02:00 posops: handle negative index parameter for find functions --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2ae296f5d8fa2baa2d451213d668fdd… Patch: https://github.com/kamailio/kamailio/commit/2ae296f5d8fa2baa2d451213d668fdd… --- diff --git a/src/modules/posops/doc/posops_admin.xml b/src/modules/posops/doc/posops_admin.xml index 7aa9620343..b0b67b117e 100644 --- a/src/modules/posops/doc/posops_admin.xml +++ b/src/modules/posops/doc/posops_admin.xml @@ -246,7 +246,8 @@ $var(pos) = pos_body_end(); val is at index 0, it returns the value specified by modparam idx0. </para> <para> - The idx can be an integer value or a variable holding an integer. + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the buffer. </para> <para> The val can be a static string or variables. @@ -274,7 +275,8 @@ $var(idx) = pos_find_str("100", "kamailio"); by modparam idx0. </para> <para> - The idx can be an integer value or a variable holding an integer. + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the buffer. </para> <para> The val can be a static string or variables. diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 8c538720ce..6e367c53aa 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -427,13 +427,15 @@ static int ki_posops_pos_find_str(sip_msg_t *msg, int idx, str *val) char *p; str text; - if(idx<0 || val==NULL || val->s==NULL || val->len<=0) { + if(val==NULL || val->s==NULL || val->len<=0) { return -1; } - if(idx > msg->len - val->len) { + if(idx<0) { + idx += msg->len; + } + if(idx<0 || idx > msg->len - val->len) { return -1; } - text.s = msg->buf + idx; text.len = msg->len - idx; p = str_search(&text, val); @@ -476,10 +478,13 @@ static int ki_posops_pos_findi_str(sip_msg_t *msg, int idx, str *val) char *p; str text; - if(idx<0 || val==NULL || val->s==NULL || val->len<=0) { + if(val==NULL || val->s==NULL || val->len<=0) { return -1; } - if(idx > msg->len - val->len) { + if(idx<0) { + idx += msg->len; + } + if(idx<0 || idx > msg->len - val->len) { return -1; }

1 0

git:master:747ed6d1: core: ut - functions for reverse search of str value
by Daniel-Constantin Mierla 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: 747ed6d1c9434a90b77fd86c4dae35e447da9185 URL: https://github.com/kamailio/kamailio/commit/747ed6d1c9434a90b77fd86c4dae35e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-23T09:22:21+02:00 core: ut - functions for reverse search of str value --- Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/747ed6d1c9434a90b77fd86c4dae35e… Patch: https://github.com/kamailio/kamailio/commit/747ed6d1c9434a90b77fd86c4dae35e… --- diff --git a/src/core/ut.c b/src/core/ut.c index 00254eba23..8dde51aaff 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -392,6 +392,49 @@ char *str_casesearch_strz(str *text, char *needlez) return str_casesearch(text, &needle); } +/** + * @brief search for last occurence of needle in text (reverse search) + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *str_rsearch(str *text, str *needle) +{ + char *p; + + if(text==NULL || text->s==NULL || needle==NULL || needle->s==NULL + || text->len<needle->len) + return NULL; + + for (p = text->s + text->len - needle->len; p >= text->s; p--) { + if (*p == *needle->s && memcmp(p, needle->s, needle->len)==0) { + return p; + } + } + + return NULL; +} + +/** + * @brief case insensitive search for last occurence of needle in text (reverse search) + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *str_rcasesearch(str *text, str *needle) +{ + int i,j; + for(i=text->len-needle->len;i>=0;i--) { + for(j=0;j<needle->len;j++) { + if ( !((text->s[i+j]==needle->s[j]) || + ( isalpha((int)text->s[i+j]) + && ((text->s[i+j])^(needle->s[j]))==0x20 )) ) + break; + } + if (j==needle->len) + return text->s+i; + } + return NULL; +} + /* * ser_memmem() returns the location of the first occurrence of data * pattern b2 of size len2 in memory block b1 of size len1 or diff --git a/src/core/ut.h b/src/core/ut.h index f2173d3dcf..385db99ca7 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1110,6 +1110,10 @@ char *strz_casesearch_strz(char *textz, char *needlez); char *str_casesearch_strz(str *text, char *needlez); +char *str_rsearch(str *text, str *needle); + +char *str_rcasesearch(str *text, str *needle); + /* * ser_memmem() returns the location of the first occurrence of data * pattern b2 of size len2 in memory block b1 of size len1 or

1 0

git:master:706dd0c9: posops: adjust offset on negative index for update ops
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: master Commit: 706dd0c9bf528881d758bc5c26f05870d8f22e35 URL: https://github.com/kamailio/kamailio/commit/706dd0c9bf528881d758bc5c26f0587… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T21:19:01+02:00 posops: adjust offset on negative index for update ops --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/706dd0c9bf528881d758bc5c26f0587… Patch: https://github.com/kamailio/kamailio/commit/706dd0c9bf528881d758bc5c26f0587… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 4c0c1b1535..8c538720ce 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -153,7 +153,7 @@ static int ki_posops_pos_append(sip_msg_t *msg, int idx, str *val) } if(idx<0) { - offset = msg->len + idx + 1; + offset = msg->len + idx; } else { offset = idx; } @@ -206,7 +206,7 @@ static int ki_posops_pos_insert(sip_msg_t *msg, int idx, str *val) } if(idx<0) { - offset = msg->len + idx + 1; + offset = msg->len + idx; } else { offset = idx; } @@ -259,7 +259,7 @@ static int ki_posops_pos_rm(sip_msg_t *msg, int idx, int len) return -1; } if(idx<0) { - offset = msg->len + idx + 1; + offset = msg->len + idx; } else { offset = idx; }

1 0

[kamailio/kamailio] how to choose 2 different rr heads (#2861)
by hance2010 22 Sep '21

22 Sep '21

### Description how to choose 2 different rr heads when relay a public call to lan? Thanks! ### Expected behavior #### Actual observed behavior #### 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` ``` kamailio 5.5.1 ``` * **Operating System**:  ``` debian10 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2861

2 2

Kamailio v5.4.7 Released
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Hello, Kamailio SIP Server v5.4.7 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.6. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.7. Note that 5.4 is the second last stable branch, still officially maintained by Kamailio development team. The latest stable branch is 5.5, with v5.5.2 being release out of it. For more details about version 5.4.7 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/09/kamailio-v5-4-7-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:5.4:b647485d: Makefile.defs: version set to 5.4.7
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.4 Commit: b647485d7e5f91c7ecfed167289ff21a91c739fa URL: https://github.com/kamailio/kamailio/commit/b647485d7e5f91c7ecfed167289ff21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T12:27:56+02:00 Makefile.defs: version set to 5.4.7 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b647485d7e5f91c7ecfed167289ff21… Patch: https://github.com/kamailio/kamailio/commit/b647485d7e5f91c7ecfed167289ff21… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 542ac73cdc..c7695a973d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = # memory manager switcher

1 0

git:5.4:a19fe100: ChangeLog: content updated for v5.4.7
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.4 Commit: a19fe100777c2c53e275804568cee99e3d61f466 URL: https://github.com/kamailio/kamailio/commit/a19fe100777c2c53e275804568cee99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T12:28:15+02:00 ChangeLog: content updated for v5.4.7 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/a19fe100777c2c53e275804568cee99… Patch: https://github.com/kamailio/kamailio/commit/a19fe100777c2c53e275804568cee99…

1 0

git:5.4:de082004: pkg/kamailoio: version set to 5.4.7 for rpm and alpine specs
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.4 Commit: de082004b3e5f4719b961850045a3971b7feba8e URL: https://github.com/kamailio/kamailio/commit/de082004b3e5f4719b961850045a397… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T10:51:41+02:00 pkg/kamailoio: version set to 5.4.7 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/de082004b3e5f4719b961850045a397… Patch: https://github.com/kamailio/kamailio/commit/de082004b3e5f4719b961850045a397… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f4ff87ce2d..b9d6a15066 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.6 +pkgver=5.4.7 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index e73c048b22..695c46797c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.6 +%define ver 5.4.7 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.4:d8d5eeab: pkg/kamailio/deb: version set 5.4.7
by Victor Seva 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.4 Commit: d8d5eeab5f5ff7945b13dd16cc215c0f790461ba URL: https://github.com/kamailio/kamailio/commit/d8d5eeab5f5ff7945b13dd16cc215c0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-09-22T10:16:53+02:00 pkg/kamailio/deb: version set 5.4.7 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/d8d5eeab5f5ff7945b13dd16cc215c0… Patch: https://github.com/kamailio/kamailio/commit/d8d5eeab5f5ff7945b13dd16cc215c0…

1 0

git:5.5:3b523ff4: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.5 Commit: 3b523ff4d0bc276ece043f4d4d613662afc0a0d4 URL: https://github.com/kamailio/kamailio/commit/3b523ff4d0bc276ece043f4d4d61366… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-22T08:46:41+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/kazoo/README --- Diff: https://github.com/kamailio/kamailio/commit/3b523ff4d0bc276ece043f4d4d61366… Patch: https://github.com/kamailio/kamailio/commit/3b523ff4d0bc276ece043f4d4d61366… --- diff --git a/src/modules/kazoo/README b/src/modules/kazoo/README index ab9206a243..7497dd20e8 100644 --- a/src/modules/kazoo/README +++ b/src/modules/kazoo/README @@ -443,9 +443,9 @@ modparam("kazoo", "amqp_connection", "kazoo://guest:guest@otherhost:5672") handles control to the next sub-loop. ... while(true) // main loop - while(ACK or timeout) // acknowledge from worker process - while(SEND or timeout) // anything to send ? - while(CONSUME or timeout) // any data on consumed exchanges ? +while(ACK or timeout) // acknowledge from worker process +while(SEND or timeout) // anything to send ? +while(CONSUME or timeout) // any data on consumed exchanges ? ... 4.2.1. amqp_consumer_loop_count(int) @@ -652,11 +652,11 @@ modparam("kazoo", "pua_mode", 0) Example 1.22. kazoo_publish usage ... -$var(amqp_payload_request) = "{'Event-Category' : 'directory', 'Event-Name' : 'r -eg_success', 'Contact' : '" + $var(fs_contact) + "', 'Call-ID' : '" + $ci + "', -'Realm' : '" + $fd +"', 'Username' : '" + $fU + "', 'From-User' : '" + $fU + "', - 'From-Host' : '" + $fd + "', 'To-User' : '" + $tU +"', 'To-Host' : '" + $td + " -', 'User-Agent' : '" + $ua +"' ," + $var(register_contants)+ " }"; +$var(amqp_payload_request) = $_s({"Event-Category" : "directory", "Event-Name" : + "reg_success", "Contact" : "$(ct{s.escape.common}{s.replace,\','}{s.replace,$$, +})", "Call-ID" : "$ci", "Realm" : "$fd", "Username" : "$fU", "From-User" : "$fU" +, "From-Host" : "$fd", "To-User" : "$tU", "To-Host" : "$td", "User-Agent" : "$(u +a{s.escape.common}{s.replace,\','}{s.replace,$$,})" }); $var(amqp_routing_key) = "registration.success." + $(fd{kz.encode}) + "." + $fU; kazoo_publish("callmgr", $var(amqp_routing_key), $var(amqp_payload_request)); ...

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev