- sr-dev - kamailio.org

git:master:c3629f87: timer: extend internal static HTTP message to have one header
by Daniel-Constantin Mierla 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: c3629f877500373028d2c7cdefd976cddda31c15 URL: https://github.com/kamailio/kamailio/commit/c3629f877500373028d2c7cdefd976c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-05T14:26:30+02:00 timer: extend internal static HTTP message to have one header --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/c3629f877500373028d2c7cdefd976c… Patch: https://github.com/kamailio/kamailio/commit/c3629f877500373028d2c7cdefd976c… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index 9880a8420b..224a6bed57 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -159,7 +159,7 @@ static unsigned int timer_msg_no = 0; static ticks_t timer_handler(ticks_t ticks, struct timer_ln* tl, void* data) { /*?min length of first line of message is 16 char!?*/ -#define MSG "GET /timer HTTP/0.9\n\n" +#define MSG "GET /timer HTTP/0.9\r\nUser-Agent: internal\r\n\r\n" sip_msg_t* msg; timer_action_t *a; run_act_ctx_t ra_ctx;

1 0

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

05 Oct '21

Module: kamailio Branch: master Commit: f23d48b975bdfe06d3c07c4b65f60a2a19b38541 URL: https://github.com/kamailio/kamailio/commit/f23d48b975bdfe06d3c07c4b65f60a2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-05T14:16:12+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/f23d48b975bdfe06d3c07c4b65f60a2… Patch: https://github.com/kamailio/kamailio/commit/f23d48b975bdfe06d3c07c4b65f60a2… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 670cd7bb0b..2af6b9a703 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1376,7 +1376,8 @@ modparam("tm", "callid_matching", 1) 3.33. callid_cseq_matching (int) If set to something other than 0, will do transaction matching using - callid and cseq header values instead of via branch md5 value. + callid and cseq header values instead of via branch md5 value. Note + that this behavior is non-RFC conpliant! Default value is 0.

1 0

git:master:fe3e6e7f: tm: update doc for callid_cseq_matching
by Stefan Mititelu 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: fe3e6e7f64199dd6d2f55d6762dbd17ca0160817 URL: https://github.com/kamailio/kamailio/commit/fe3e6e7f64199dd6d2f55d6762dbd17… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2021-10-05T15:05:17+03:00 tm: update doc for callid_cseq_matching --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/fe3e6e7f64199dd6d2f55d6762dbd17… Patch: https://github.com/kamailio/kamailio/commit/fe3e6e7f64199dd6d2f55d6762dbd17… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index d2e2f4db0e..8614fdac85 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1002,6 +1002,10 @@ modparam("tm", "callid_matching", 1) <para> If set to something other than 0, will do transaction matching using callid and cseq header values instead of via branch md5 value. + + <emphasis> + Note that this behavior is non-RFC conpliant! + </emphasis> </para> <para> <emphasis>

1 0

[kamailio/kamailio] tm: Add callid_cseq_matching param (#2868)
by Stefan Mititelu 05 Oct '21

05 Oct '21

Enable transaction matching using callid and cseq values instead of via md5 value.   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Hello, We had an issue with kamailio that the generated tm p_cell->md5 was not sent out in Via "branch=" parameter. Instead, other value was sent. Thus when comparing the replies Via "branch=" md5 value back to p_cell->md5, the transactions mismatched and dialogs were not setup. This happened for the most of the transactions/dialogs. We could not really figure out why the above was happening. Because this was an isolated system, we decided to do this workaround using callid and cseq matching for transactions, and it helped. Now most of the dialogs are setup. Let me know what you think, if other had this problem and if this PR helps. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2868 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2868/commits/ab42c71fa814a9d2f3d8…">tm: Add callid_cseq_matching param</a> -- File Changes -- M src/modules/tm/config.c (3) M src/modules/tm/config.h (1) M src/modules/tm/doc/params.xml (23) M src/modules/tm/t_lookup.c (20) M src/modules/tm/tm.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2868.patch https://github.com/kamailio/kamailio/pull/2868.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/2868

3 8

git:master:93ab4950: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: 93ab49502d418556cffd9aba13411ba464ad1513 URL: https://github.com/kamailio/kamailio/commit/93ab49502d418556cffd9aba13411ba… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-05T13:46:30+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/93ab49502d418556cffd9aba13411ba… Patch: https://github.com/kamailio/kamailio/commit/93ab49502d418556cffd9aba13411ba…

1 0

git:master:b6cebaa7: tm: Add callid_cseq_matching param
by Daniel-Constantin Mierla 05 Oct '21

05 Oct '21

Module: kamailio Branch: master Commit: b6cebaa76eaa4b98bbba6e271c50dbfa14a8f9f7 URL: https://github.com/kamailio/kamailio/commit/b6cebaa76eaa4b98bbba6e271c50dbf… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-05T13:45:23+02:00 tm: Add callid_cseq_matching param Enable transaction matching using callid and cseq values instead of via md5 value. --- Modified: src/modules/tm/config.c Modified: src/modules/tm/config.h Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/b6cebaa76eaa4b98bbba6e271c50dbf… Patch: https://github.com/kamailio/kamailio/commit/b6cebaa76eaa4b98bbba6e271c50dbf…

1 0

[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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev