- sr-dev - kamailio.org

git:master:1d00cf66: modules: readme files regenerated - cplc ... [skip ci]
by Kamailio Dev 31 Mar '21

31 Mar '21

Module: kamailio Branch: master Commit: 1d00cf66f8006b082c0e0258371f4da5015b2ac2 URL: https://github.com/kamailio/kamailio/commit/1d00cf66f8006b082c0e0258371f4da… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-31T08:46:14+02:00 modules: readme files regenerated - cplc ... [skip ci] --- Modified: src/modules/cplc/README Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/1d00cf66f8006b082c0e0258371f4da… Patch: https://github.com/kamailio/kamailio/commit/1d00cf66f8006b082c0e0258371f4da…

1 0

git:master:abafc6c9: cplc: docs - fixed docbook tags removing extra ending section
by Daniel-Constantin Mierla 31 Mar '21

31 Mar '21

Module: kamailio Branch: master Commit: abafc6c99f01a81d108e64efd292920ad5b6a2e4 URL: https://github.com/kamailio/kamailio/commit/abafc6c99f01a81d108e64efd292920… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-31T08:35:34+02:00 cplc: docs - fixed docbook tags removing extra ending section --- Modified: src/modules/cplc/doc/cplc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/abafc6c99f01a81d108e64efd292920… Patch: https://github.com/kamailio/kamailio/commit/abafc6c99f01a81d108e64efd292920… --- diff --git a/src/modules/cplc/doc/cplc_admin.xml b/src/modules/cplc/doc/cplc_admin.xml index 5eef9b9e08..507804ce1a 100644 --- a/src/modules/cplc/doc/cplc_admin.xml +++ b/src/modules/cplc/doc/cplc_admin.xml @@ -459,7 +459,6 @@ modparam("cplc","redirect_route", "CPL_REDIRECT") </example> </section> - </section> <section id="cplc.p.ignore3xx"> <title><varname>ignore3xx</varname> (integer)</title> <para>

1 0

git:master:5a87ec17: pua_dialoginfo: docs - added missing ending section tag
by Daniel-Constantin Mierla 31 Mar '21

31 Mar '21

Module: kamailio Branch: master Commit: 5a87ec17841bbce35dae02baefc0fe350b41ad33 URL: https://github.com/kamailio/kamailio/commit/5a87ec17841bbce35dae02baefc0fe3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-31T08:38:33+02:00 pua_dialoginfo: docs - added missing ending section tag --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5a87ec17841bbce35dae02baefc0fe3… Patch: https://github.com/kamailio/kamailio/commit/5a87ec17841bbce35dae02baefc0fe3… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index e6400c851b..ca8ceb81a9 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -601,6 +601,7 @@ modparam("pua_dialoginfo", "publish_dialog_req_within", 0) </programlisting> </example> </section> + </section> <section> <title>Functions</title>

1 0

git:master:047f6e44: modules: readme files regenerated - cplc ... [skip ci]
by Kamailio Dev 31 Mar '21

31 Mar '21

Module: kamailio Branch: master Commit: 047f6e4409ad4a4ed6bed9f46a8c1e31bd8df83c URL: https://github.com/kamailio/kamailio/commit/047f6e4409ad4a4ed6bed9f46a8c1e3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-31T08:31:14+02:00 modules: readme files regenerated - cplc ... [skip ci] --- Modified: src/modules/cplc/README Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/047f6e4409ad4a4ed6bed9f46a8c1e3… Patch: https://github.com/kamailio/kamailio/commit/047f6e4409ad4a4ed6bed9f46a8c1e3…

1 0

[kamailio/kamailio] cplc and pua_dialoginfo enhancement (#2676)
by Frédéric Gaisnon 31 Mar '21

31 Mar '21

#### 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 - [x ] 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  cplc: add a configuration route before redirected call (key: redirect_route) same behaviour as proxy_route cplc: deactivate 3XX responses handling (key: ignore3xx) cplc: time based cpl did not work if several are set cplc: add return result to kamcmd commands cplc: documentation update (new keys, new module name, proxy_route modification) pua_dialoginfo: disable publish notifications for subsequent requests (key: publish_dialog_req_within) Generally all these PUBLISH generated are not usefull. pua_dialoginfo: add new key to really deactivate caller or callee notification when the deactivated party was supervised (key: caller_entity_when_publish_disabled key: callee_entity_when_publish_disabled) If Alice calls Bob with Alice and Bob already supervised by watchers and disable_caller_publish_flag set, PUBLISH generated for Bob will generate NOTIFY for Alice's watchers and Bob's watchers instead of just Bob's watchers. Note that dlginfo_cell structure is updated because flag set for disabling party (disable_caller_publish_flag or disable_callee_publish_flag ) are not always present in subsequent request received by pua_dialoginfo module. So flag set on initial request are stored and used during the dialog. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2676 -- Commit Summary -- * cplc: add a configuration route before redirected call (key: redirect_route) * pua_dialoginfo: disable publish notifications for subsequent requests (key: publish_dialog_req_within) -- File Changes -- M src/modules/cplc/cpl_db.c (2) M src/modules/cplc/cpl_env.h (2) M src/modules/cplc/cpl_loader.c (14) M src/modules/cplc/cpl_proxy.h (5) M src/modules/cplc/cpl_run.c (6) M src/modules/cplc/cpl_switches.h (2) M src/modules/cplc/cplc.c (14) M src/modules/cplc/doc/cplc.xml (9) M src/modules/cplc/doc/cplc_admin.xml (84) M src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml (9) M src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml (66) M src/modules/pua_dialoginfo/pua_dialoginfo.c (188) M src/modules/pua_dialoginfo/pua_dialoginfo.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2676.patch https://github.com/kamailio/kamailio/pull/2676.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/2676

2 5

git:master:cb38addf: cplc: add a configuration route before redirected call (key: redirect_route)
by Daniel-Constantin Mierla 31 Mar '21

31 Mar '21

Module: kamailio Branch: master Commit: cb38addf641d07b8881808ff17fe66ee6af1d743 URL: https://github.com/kamailio/kamailio/commit/cb38addf641d07b8881808ff17fe66e… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-31T08:29:13+02:00 cplc: add a configuration route before redirected call (key: redirect_route) cplc: deactivate 3XX responses handling (key: ignore3xx) cplc: time based cpl did not work if several are set cplc: add return result to kamcmd commands cplc: documentation update (new keys, new module name, proxy_route modification) --- Modified: src/modules/cplc/cpl_db.c Modified: src/modules/cplc/cpl_env.h Modified: src/modules/cplc/cpl_loader.c Modified: src/modules/cplc/cpl_proxy.h Modified: src/modules/cplc/cpl_run.c Modified: src/modules/cplc/cpl_switches.h Modified: src/modules/cplc/cplc.c Modified: src/modules/cplc/doc/cplc.xml Modified: src/modules/cplc/doc/cplc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cb38addf641d07b8881808ff17fe66e… Patch: https://github.com/kamailio/kamailio/commit/cb38addf641d07b8881808ff17fe66e…

1 0

git:master:79be32bc: pua_dialoginfo: disable publish notifications for subsequent requests (key: publish_dialog_req_within)
by Daniel-Constantin Mierla 31 Mar '21

31 Mar '21

Module: kamailio Branch: master Commit: 79be32bcc45775f703319730d405727b0a983726 URL: https://github.com/kamailio/kamailio/commit/79be32bcc45775f703319730d405727… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-31T08:29:13+02:00 pua_dialoginfo: disable publish notifications for subsequent requests (key: publish_dialog_req_within) pua_dialoginfo: add new key to really deactivate caller or callee notification when the deactivated party was supervised (key: caller_entity_when_publish_disabled key: callee_entity_when_publish_disabled) --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/79be32bcc45775f703319730d405727… Patch: https://github.com/kamailio/kamailio/commit/79be32bcc45775f703319730d405727…

1 0

git:master:f4f17c83: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 31 Mar '21

31 Mar '21

Module: kamailio Branch: master Commit: f4f17c83073db933954c4bb1dd52f83fecd8ed80 URL: https://github.com/kamailio/kamailio/commit/f4f17c83073db933954c4bb1dd52f83… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-31T08:16:23+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/f4f17c83073db933954c4bb1dd52f83… Patch: https://github.com/kamailio/kamailio/commit/f4f17c83073db933954c4bb1dd52f83…

1 0

git:master:c990dae2: dmq: new function dmq_process_message()
by Daniel-Constantin Mierla 31 Mar '21

31 Mar '21

Module: kamailio Branch: master Commit: c990dae2a6078772119e1ba2f8f3735e59211341 URL: https://github.com/kamailio/kamailio/commit/c990dae2a6078772119e1ba2f8f3735… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-31T08:02:58+02:00 dmq: new function dmq_process_message() - similar to dmq_handle_message(), but processes the dmq message immediately, without queuing for special worker processes - useful for messages that need very short time for processing, like htable operation, simplifying by no longer cloning request in shared memory --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/message.c Modified: src/modules/dmq/message.h Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/c990dae2a6078772119e1ba2f8f3735… Patch: https://github.com/kamailio/kamailio/commit/c990dae2a6078772119e1ba2f8f3735…

1 0

git:master:a2530363: dmq: docs for dmq_process_message()
by Daniel-Constantin Mierla 31 Mar '21

31 Mar '21

Module: kamailio Branch: master Commit: a2530363bba4415dcb82f4a03691e3e2aa48c88e URL: https://github.com/kamailio/kamailio/commit/a2530363bba4415dcb82f4a03691e3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-31T08:02:58+02:00 dmq: docs for dmq_process_message() --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a2530363bba4415dcb82f4a03691e3e… Patch: https://github.com/kamailio/kamailio/commit/a2530363bba4415dcb82f4a03691e3e… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index b48eea4fe1..20a2e647b3 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -293,6 +293,41 @@ modparam("dmq", "ping_interval", 90) dmq_handle_message(); } ... +</programlisting> + </example> + </section> + <section id="dmq.f.dmq_process_message"> + <title> + <function moreinfo="none">dmq_process_message([continue])</function> + </title> + <para> + Similar to dmq_handle_message, but the processing is happening + immediately, no longer cloning the request in shared memory + to be passed to a DMQ worker process. + </para> + <para>Meaning of parameters:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>continue</emphasis> - by default, dmq_process_message() will end + execution of routing script by returning 0. If this optional parameter + is set to "1", dmq_process_message() will continue executing the routing + script after it is been executed, returning 1. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE. + </para> + + <example> + <title><function>dmq_process_message</function> usage</title> + <programlisting format="linespecific"> +... + if(is_method("KDMQ")) { + dmq_process_message(); + } +... </programlisting> </example> </section>

1 0

git:master:b94c0282: modules: readme files regenerated - crypto ... [skip ci]
by Kamailio Dev 31 Mar '21

31 Mar '21

Module: kamailio Branch: master Commit: b94c0282ca297410c82973423f8104334b4281f9 URL: https://github.com/kamailio/kamailio/commit/b94c0282ca297410c82973423f81043… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-30T23:01:10+02:00 modules: readme files regenerated - crypto ... [skip ci] --- Modified: src/modules/crypto/README --- Diff: https://github.com/kamailio/kamailio/commit/b94c0282ca297410c82973423f81043… Patch: https://github.com/kamailio/kamailio/commit/b94c0282ca297410c82973423f81043… --- diff --git a/src/modules/crypto/README b/src/modules/crypto/README index a305f5c33a..8683d9eba7 100644 --- a/src/modules/crypto/README +++ b/src/modules/crypto/README @@ -31,7 +31,7 @@ Daniel-Constantin Mierla 3.4. kevcb_netio (str) 3.5. netio_key (str) 3.6. key_derivation (str) - 3.7. netio_key (str) + 3.7. init_vector (str) 4. Functions @@ -83,7 +83,7 @@ Chapter 1. Admin Guide 3.4. kevcb_netio (str) 3.5. netio_key (str) 3.6. key_derivation (str) - 3.7. netio_key (str) + 3.7. init_vector (str) 4. Functions @@ -134,7 +134,7 @@ Chapter 1. Admin Guide 3.4. kevcb_netio (str) 3.5. netio_key (str) 3.6. key_derivation (str) - 3.7. netio_key (str) + 3.7. init_vector (str) 3.1. salt (str) @@ -226,7 +226,7 @@ modparam("crypto", "netio_key", "strong-password-here") modparam("crypto", "key_derivation", 0) ... -3.7. netio_key (str) +3.7. init_vector (str) The initialization vector used for the cryptographic operations. This needs to be a Base64 encoded value with 16 bytes lengths.

2 1

[kamailio/kamailio] tls.cfg: resolve macros (#2691)
by sergey-safarov 30 Mar '21

30 Mar '21

### Description I want use macros defined in `kamailio.cfg` inside `tls.cfg` like: ``` [server:[IPV6_ADDR]:5061] method = TLSv1.2+ verify_certificate = yes require_certificate = no private_key = /etc/kamailio/tls/example.com.key certificate = /etc/kamailio/tls/example.com.pem server_name = example.com server_name_mode = 1 ``` This allows to minimize Kamailio config file adjustments inside cloud installations. -- 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/2691

2 3

[kamailio/kamailio] ERROR: connect_unix_sock: connect(/var/run/kamailio//kamailio_ctl): No such file or directory [2] (#2697)
by Fadi Hamdan 30 Mar '21

30 Mar '21

I'm having this error when I try to run: kazoo-kamailio status ERROR: connect_unix_sock: connect(/var/run/kamailio//kamailio_ctl): No such file or directory [2] May I know what is the solution for this error? -- 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/2697

3 3

git:master:305a2ff2: crypto: small copy/paste fix in docs
by Henning Westerholt 30 Mar '21

30 Mar '21

Module: kamailio Branch: master Commit: 305a2ff281ffb4320b9a685d96fc8cac5d82ba33 URL: https://github.com/kamailio/kamailio/commit/305a2ff281ffb4320b9a685d96fc8ca… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-03-30T20:51:43Z crypto: small copy/paste fix in docs --- Modified: src/modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/305a2ff281ffb4320b9a685d96fc8ca… Patch: https://github.com/kamailio/kamailio/commit/305a2ff281ffb4320b9a685d96fc8ca… --- diff --git a/src/modules/crypto/doc/crypto_admin.xml b/src/modules/crypto/doc/crypto_admin.xml index e3c9d747fd..42385aeb98 100644 --- a/src/modules/crypto/doc/crypto_admin.xml +++ b/src/modules/crypto/doc/crypto_admin.xml @@ -206,7 +206,7 @@ modparam("crypto", "key_derivation", 0) </example> </section> <section id="crypto.p.init_vector"> - <title><varname>netio_key</varname> (str)</title> + <title><varname>init_vector</varname> (str)</title> <para> The initialization vector used for the cryptographic operations. This needs to be a Base64 encoded value with 16 bytes lengths.

1 0

git:master:588eeeb2: modules: readme files regenerated - crypto ... [skip ci]
by Kamailio Dev 30 Mar '21

30 Mar '21

Module: kamailio Branch: master Commit: 588eeeb2c56a98de3bb3fe09b0360f1dc53d811a URL: https://github.com/kamailio/kamailio/commit/588eeeb2c56a98de3bb3fe09b0360f1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-30T22:46:12+02:00 modules: readme files regenerated - crypto ... [skip ci] --- Modified: src/modules/crypto/README --- Diff: https://github.com/kamailio/kamailio/commit/588eeeb2c56a98de3bb3fe09b0360f1… Patch: https://github.com/kamailio/kamailio/commit/588eeeb2c56a98de3bb3fe09b0360f1…

1 0

git:master:b08fd55d: crypto: add two new parameters to provide interoperability with existing crypto libraries
by Henning Westerholt 30 Mar '21

30 Mar '21

Module: kamailio Branch: master Commit: b08fd55ddd598115a3b69afc630403a582d239f2 URL: https://github.com/kamailio/kamailio/commit/b08fd55ddd598115a3b69afc630403a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-03-30T20:39:06Z crypto: add two new parameters to provide interoperability with existing crypto libraries - add two new parameters to provide interoperability with existing crypto libraries - key_derivation: specify the mode of the key derivation - init_vector: specify the source of the initialization vector - this can e.g. used to decrypt data coming from a Java middle-ware application or from a PostgreSQL database encrypt function --- Modified: src/modules/crypto/crypto_aes.c Modified: src/modules/crypto/crypto_aes.h Modified: src/modules/crypto/crypto_evcb.c Modified: src/modules/crypto/crypto_mod.c Modified: src/modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b08fd55ddd598115a3b69afc630403a… Patch: https://github.com/kamailio/kamailio/commit/b08fd55ddd598115a3b69afc630403a…

1 0

[kamailio/kamailio] {s.encode.hexa} transformation does not work as expected (#2690)
by iamonte 30 Mar '21

30 Mar '21

We have found an issue in version 5.2 To reproduce it ``` $var(x) = "wg48D8NPIJ5JEfkgqhuu+Q=="; $var(decode64) = $(var(x){s.decode.base64}); $var(encode16) = $(var(decode64){s.encode.hexa}); ``` after these line the value of encode16 must be 'c20e3c0fc34f209e4911f920aa1baef9' Looking inside the module pv, file pv_trans.c, line 347, we realized that the code is not correct because the shift operation keeps the sign, `_tr_buffer[j++] = fourbits2char[val->rs.s[i] >> 4];` we saw that if we modifies the previous line with the following `_tr_buffer[j++] = fourbits2char[(unsigned char)(val->rs.s[i]) >> 4];` the function works as expected -- 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/2690

2 3

git:master:edd28844: modules: readme files regenerated - http_async_client ... [skip ci]
by Kamailio Dev 30 Mar '21

30 Mar '21

Module: kamailio Branch: master Commit: edd2884441ac75d96f6a0a7d53e8c738e5300ecf URL: https://github.com/kamailio/kamailio/commit/edd2884441ac75d96f6a0a7d53e8c73… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-30T14:16:16+02:00 modules: readme files regenerated - http_async_client ... [skip ci] --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/edd2884441ac75d96f6a0a7d53e8c73… Patch: https://github.com/kamailio/kamailio/commit/edd2884441ac75d96f6a0a7d53e8c73…

1 0

[kamailio/kamailio] http_async_client: add curl_follow_redirect parameter (#2694)
by Tristan Mahé 30 Mar '21

30 Mar '21

- add curl_follow_redirect mod parameter to set CURLOPT_FOLLOWLOCATION to tell libcurl to follow 3xx responses.   #### 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  Add curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L) on curl init to tell libcurl to follow redirects if needed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2694 -- Commit Summary -- * http_async_client: add curl_follow_redirect parameter -- File Changes -- M src/modules/http_async_client/doc/http_async_client_admin.xml (20) M src/modules/http_async_client/http_async_client_mod.c (2) M src/modules/http_async_client/http_multi.c (3) M src/modules/http_async_client/http_multi.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2694.patch https://github.com/kamailio/kamailio/pull/2694.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/2694

2 3

git:master:0183de31: Merge pull request #2694 from gled-rs/http_async_follow_redirect
by GitHub 30 Mar '21

30 Mar '21

Module: kamailio Branch: master Commit: 0183de317d0d2578e83061fc7541afde37ec4853 URL: https://github.com/kamailio/kamailio/commit/0183de317d0d2578e83061fc7541afd… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-03-30T14:04:06+02:00 Merge pull request #2694 from gled-rs/http_async_follow_redirect http_async_client: add curl_follow_redirect parameter --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml Modified: src/modules/http_async_client/http_async_client_mod.c Modified: src/modules/http_async_client/http_multi.c Modified: src/modules/http_async_client/http_multi.h --- Diff: https://github.com/kamailio/kamailio/commit/0183de317d0d2578e83061fc7541afd… Patch: https://github.com/kamailio/kamailio/commit/0183de317d0d2578e83061fc7541afd… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 1efe0a1f33..4e4701fcb3 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -200,6 +200,26 @@ modparam("http_async_client", "curl_verbose", 1) </programlisting> </example> </section> + <section> + <title><varname>curl_follow_redirect</varname> (integer)</title> + <para> + If defined to a non-zero value, will tell curl to follow HTTP 3xx redirects. + </para> + <para> + <emphasis> + Default value is 0 (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>curl_follow_redirect</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_async_client", "curl_follow_redirect", 1) +... +</programlisting> + </example> + </section> + <section> <title><varname>memory_manager</varname> (string)</title> <para> diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 7f56f98a56..f369cf083d 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -74,6 +74,7 @@ int tls_version = 0; // Use default SSL version in HTTPS requests (see curl/curl int tls_verify_host = 1; // By default verify host in HTTPS requests int tls_verify_peer = 1; // By default verify peer in HTTPS requests int curl_verbose = 0; +int curl_follow_redirect = 0; char* tls_client_cert = NULL; // client SSL certificate path, defaults to NULL char* tls_client_key = NULL; // client SSL certificate key path, defaults to NULL char* tls_ca_path = NULL; // certificate authority dir path, defaults to NULL @@ -150,6 +151,7 @@ static param_export_t params[]={ {"tls_verify_host", INT_PARAM, &tls_verify_host}, {"tls_verify_peer", INT_PARAM, &tls_verify_peer}, {"curl_verbose", INT_PARAM, &curl_verbose}, + {"curl_follow_redirect", INT_PARAM, &curl_follow_redirect}, {"tls_client_cert", PARAM_STRING, &tls_client_cert}, {"tls_client_key", PARAM_STRING, &tls_client_key}, {"tls_ca_path", PARAM_STRING, &tls_ca_path}, diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index c4351b1b94..7baf153140 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -462,6 +462,9 @@ int new_request(str *query, http_m_params_t *query_params, http_multi_cbe_t cb, curl_easy_setopt(cell->easy, CURLOPT_VERBOSE, 1L); curl_easy_setopt(cell->easy, CURLOPT_DEBUGFUNCTION, debug_cb); } + if (curl_follow_redirect) { + curl_easy_setopt(cell->easy, CURLOPT_FOLLOWLOCATION, 1L); + } curl_easy_setopt(cell->easy, CURLOPT_ERRORBUFFER, cell->error); curl_easy_setopt(cell->easy, CURLOPT_PRIVATE, cell); curl_easy_setopt(cell->easy, CURLOPT_SSL_VERIFYPEER, cell->params.tls_verify_peer); diff --git a/src/modules/http_async_client/http_multi.h b/src/modules/http_async_client/http_multi.h index 0e63811df7..2a99b8cb36 100644 --- a/src/modules/http_async_client/http_multi.h +++ b/src/modules/http_async_client/http_multi.h @@ -58,6 +58,7 @@ extern stat_var *errors; extern stat_var *timeouts; extern int tls_version; extern int curl_verbose; +extern int curl_follow_redirect; void set_curl_mem_callbacks(void); int init_http_multi();

1 0

git:master:14a39965: http_async_client: add curl_follow_redirect parameter
by gled 30 Mar '21

30 Mar '21

Module: kamailio Branch: master Commit: 14a399652bb813f77da13956eb47e1f16c5d6b8f URL: https://github.com/kamailio/kamailio/commit/14a399652bb813f77da13956eb47e1f… Author: gled <gled(a)remote-shell.net> Committer: gled <gled(a)remote-shell.net> Date: 2021-03-26T17:17:09-07:00 http_async_client: add curl_follow_redirect parameter - add curl_follow_redirect mod parameter to set CURLOPT_FOLLOWLOCATION to tell libcurl to follow 3xx responses. - write the doc in doc subfolder for the curl_follow_redirect param --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml Modified: src/modules/http_async_client/http_async_client_mod.c Modified: src/modules/http_async_client/http_multi.c Modified: src/modules/http_async_client/http_multi.h --- Diff: https://github.com/kamailio/kamailio/commit/14a399652bb813f77da13956eb47e1f… Patch: https://github.com/kamailio/kamailio/commit/14a399652bb813f77da13956eb47e1f… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 1efe0a1f33..4e4701fcb3 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -200,6 +200,26 @@ modparam("http_async_client", "curl_verbose", 1) </programlisting> </example> </section> + <section> + <title><varname>curl_follow_redirect</varname> (integer)</title> + <para> + If defined to a non-zero value, will tell curl to follow HTTP 3xx redirects. + </para> + <para> + <emphasis> + Default value is 0 (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>curl_follow_redirect</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_async_client", "curl_follow_redirect", 1) +... +</programlisting> + </example> + </section> + <section> <title><varname>memory_manager</varname> (string)</title> <para> diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 7f56f98a56..f369cf083d 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -74,6 +74,7 @@ int tls_version = 0; // Use default SSL version in HTTPS requests (see curl/curl int tls_verify_host = 1; // By default verify host in HTTPS requests int tls_verify_peer = 1; // By default verify peer in HTTPS requests int curl_verbose = 0; +int curl_follow_redirect = 0; char* tls_client_cert = NULL; // client SSL certificate path, defaults to NULL char* tls_client_key = NULL; // client SSL certificate key path, defaults to NULL char* tls_ca_path = NULL; // certificate authority dir path, defaults to NULL @@ -150,6 +151,7 @@ static param_export_t params[]={ {"tls_verify_host", INT_PARAM, &tls_verify_host}, {"tls_verify_peer", INT_PARAM, &tls_verify_peer}, {"curl_verbose", INT_PARAM, &curl_verbose}, + {"curl_follow_redirect", INT_PARAM, &curl_follow_redirect}, {"tls_client_cert", PARAM_STRING, &tls_client_cert}, {"tls_client_key", PARAM_STRING, &tls_client_key}, {"tls_ca_path", PARAM_STRING, &tls_ca_path}, diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index c4351b1b94..7baf153140 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -462,6 +462,9 @@ int new_request(str *query, http_m_params_t *query_params, http_multi_cbe_t cb, curl_easy_setopt(cell->easy, CURLOPT_VERBOSE, 1L); curl_easy_setopt(cell->easy, CURLOPT_DEBUGFUNCTION, debug_cb); } + if (curl_follow_redirect) { + curl_easy_setopt(cell->easy, CURLOPT_FOLLOWLOCATION, 1L); + } curl_easy_setopt(cell->easy, CURLOPT_ERRORBUFFER, cell->error); curl_easy_setopt(cell->easy, CURLOPT_PRIVATE, cell); curl_easy_setopt(cell->easy, CURLOPT_SSL_VERIFYPEER, cell->params.tls_verify_peer); diff --git a/src/modules/http_async_client/http_multi.h b/src/modules/http_async_client/http_multi.h index 0e63811df7..2a99b8cb36 100644 --- a/src/modules/http_async_client/http_multi.h +++ b/src/modules/http_async_client/http_multi.h @@ -58,6 +58,7 @@ extern stat_var *errors; extern stat_var *timeouts; extern int tls_version; extern int curl_verbose; +extern int curl_follow_redirect; void set_curl_mem_callbacks(void); int init_http_multi();

1 0

git:5.4:8d6c2b96: path: set dst udp uri length for decoding received value in alias format
by Daniel-Constantin Mierla 30 Mar '21

30 Mar '21

Module: kamailio Branch: 5.4 Commit: 8d6c2b96e83fc58f7159957ea86d5f91c00808ba URL: https://github.com/kamailio/kamailio/commit/8d6c2b96e83fc58f7159957ea86d5f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-30T12:00:32+02:00 path: set dst udp uri length for decoding received value in alias format (cherry picked from commit f90640f7cec45a359e996493ae91b1a45d2603e7) --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/8d6c2b96e83fc58f7159957ea86d5f9… Patch: https://github.com/kamailio/kamailio/commit/8d6c2b96e83fc58f7159957ea86d5f9… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 137c73b720..836cef33b7 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -441,10 +441,13 @@ void path_rr_callback(struct sip_msg *_m, str *r_param, void *cb_param) p += 10; memcpy(p, sproto.s, sproto.len); p += sproto.len; - *p = '\0'; - dst_uri.len = p - dst_uri_buf; - break; + } else { + /* go back one byte to overwrite ';' */ + p--; } + *p = '\0'; + dst_uri.len = p - dst_uri_buf; + break; } else { LM_ERR("invalid number of separators (%d)\n", n); goto done;

1 0

git:master:f90640f7: path: set dst udp uri length for decoding received value in alias format
by Daniel-Constantin Mierla 30 Mar '21

30 Mar '21

Module: kamailio Branch: master Commit: f90640f7cec45a359e996493ae91b1a45d2603e7 URL: https://github.com/kamailio/kamailio/commit/f90640f7cec45a359e996493ae91b1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-30T11:58:53+02:00 path: set dst udp uri length for decoding received value in alias format --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/f90640f7cec45a359e996493ae91b1a… Patch: https://github.com/kamailio/kamailio/commit/f90640f7cec45a359e996493ae91b1a… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index a8d95c2e51..c90aa93900 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -465,10 +465,13 @@ void path_rr_callback(struct sip_msg *_m, str *r_param, void *cb_param) p += 10; memcpy(p, sproto.s, sproto.len); p += sproto.len; - *p = '\0'; - dst_uri.len = p - dst_uri_buf; - break; + } else { + /* go back one byte to overwrite ';' */ + p--; } + *p = '\0'; + dst_uri.len = p - dst_uri_buf; + break; } else { LM_ERR("invalid number of separators (%d)\n", n); goto done;

1 0

git:master:c1fcb837: core: dset - asume udp if uri without transport for alias encoding
by Daniel-Constantin Mierla 30 Mar '21

30 Mar '21

Module: kamailio Branch: master Commit: c1fcb8379c24efed52f6dca2f3f00f6ee5d43706 URL: https://github.com/kamailio/kamailio/commit/c1fcb8379c24efed52f6dca2f3f00f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-30T11:58:11+02:00 core: dset - asume udp if uri without transport for alias encoding - set output length for udp proto --- Modified: src/core/dset.c --- Diff: https://github.com/kamailio/kamailio/commit/c1fcb8379c24efed52f6dca2f3f00f6… Patch: https://github.com/kamailio/kamailio/commit/c1fcb8379c24efed52f6dca2f3f00f6… --- diff --git a/src/core/dset.c b/src/core/dset.c index 1252135043..adabe7bba0 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -1153,7 +1153,7 @@ int ksr_uri_alias_encode(str *iuri, str *ualias) p += 4; } *p++ = '~'; - *p++ = puri.proto + '0'; + *p++ = ((puri.proto)?puri.proto:1) + '0'; ualias->len = p - ualias->s; ualias->s[ualias->len] = '\0'; @@ -1204,6 +1204,9 @@ int ksr_uri_alias_decode(str *ualias, str *ouri) goto error; } nproto = *p - '0'; + if(nproto == PROTO_NONE) { + nproto = PROTO_UDP; + } if (nproto != PROTO_UDP) { proto_type_to_str(nproto, &sproto); if (sproto.len == 0) { @@ -1214,11 +1217,13 @@ int ksr_uri_alias_decode(str *ualias, str *ouri) p += 10; memcpy(p, sproto.s, sproto.len); p += sproto.len; - *p = '\0'; - ouri->len = (int)(p - ouri->s); - ouri->s[ouri->len] = '\0'; - break; + } else { + /* go back one byte to overwrite ';' */ + p--; } + ouri->len = (int)(p - ouri->s); + ouri->s[ouri->len] = '\0'; + break; } else { LM_ERR("invalid number of separators (%d)\n", n); goto error;

1 0

git:master:bb2fd8c0: pv: new transformation class - urialias
by Daniel-Constantin Mierla 30 Mar '21

30 Mar '21

Module: kamailio Branch: master Commit: bb2fd8c0cd9909f87df7df6fa300a06c38259a10 URL: https://github.com/kamailio/kamailio/commit/bb2fd8c0cd9909f87df7df6fa300a06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-30T11:29:26+02:00 pv: new transformation class - urialias - encode/decode uri alias values (addr~port~proto) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/bb2fd8c0cd9909f87df7df6fa300a06… Patch: https://github.com/kamailio/kamailio/commit/bb2fd8c0cd9909f87df7df6fa300a06…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev