- sr-dev - kamailio.org

git:master:b5a6e7d7: stirshaken: enhance documentation
by Piotr Gregor 19 Mar '21

19 Mar '21

Module: kamailio Branch: master Commit: b5a6e7d7900ab9255ba10bd7aded9e60a9fc3d9e URL: https://github.com/kamailio/kamailio/commit/b5a6e7d7900ab9255ba10bd7aded9e6… Author: Piotr Gregor <piotr(a)signalwire.com> Committer: Piotr Gregor <piotr(a)signalwire.com> Date: 2021-03-19T12:02:17Z stirshaken: enhance documentation --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b5a6e7d7900ab9255ba10bd7aded9e6… Patch: https://github.com/kamailio/kamailio/commit/b5a6e7d7900ab9255ba10bd7aded9e6… --- diff --git a/src/modules/stirshaken/doc/stirshaken_admin.xml b/src/modules/stirshaken/doc/stirshaken_admin.xml index b4b5ce1e14..a78eed9050 100644 --- a/src/modules/stirshaken/doc/stirshaken_admin.xml +++ b/src/modules/stirshaken/doc/stirshaken_admin.xml @@ -193,8 +193,8 @@ modparam("stirshaken", "vs_connect_timeout_s", 10) <section> <title><varname>vs_cache_certificates</varname> (int)</title> <para> - If set, then certificates caching is turned on. This means that certificates downloaded during call verification - are cached inside vs_cache_dir, and will be loaded from that cache as long as they are not there for more than vs_cache_expire_s seconds. + If set, then certificates caching is turned on. This means that certificates downloaded during call verification with stirshaken_check_identity() + are cached inside vs_cache_dir, and will be loaded from that cache as long as they are not there for more than vs_cache_expire_s seconds (see vs_cache_expire_s). If vs_cache_certificates is set then vs_cache_dir must be set too and pointing to existing directory. This param has no meaning for calls to stirshaken_check_identity_with_key(key) and stirshaken_check_identity_with_cert(cert). </para> @@ -239,6 +239,8 @@ modparam("stirshaken", "vs_cache_dir", "/tmp/cert_cache") <para> If vs_cache_certificates is set then cached certificates are saved in vs_cache_dir directory and loaded from there when needed during a call verification executed with stirshaken_check_identity(), as long as they are not there for more than vs_cache_expire_s seconds. + If they are in cache for more than vs_cache_expire_s seconds, then a blocking HTTP(s) call is executed to download a new version of (expired) certificate. + If this is successful then old version is removed and new version is saved in cache. This param has no meaning for calls to stirshaken_check_identity_with_key(key) and stirshaken_check_identity_with_cert(cert). </para> <para>

1 0

git:master:a011e766: modules: readme files regenerated - stirshaken ... [skip ci]
by Kamailio Dev 19 Mar '21

19 Mar '21

Module: kamailio Branch: master Commit: a011e766c146cde9660c0c2ef9eb28dd9f8aeb33 URL: https://github.com/kamailio/kamailio/commit/a011e766c146cde9660c0c2ef9eb28d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-19T12:46:38+01:00 modules: readme files regenerated - stirshaken ... [skip ci] --- Modified: src/modules/stirshaken/README --- Diff: https://github.com/kamailio/kamailio/commit/a011e766c146cde9660c0c2ef9eb28d… Patch: https://github.com/kamailio/kamailio/commit/a011e766c146cde9660c0c2ef9eb28d…

1 0

[kamailio/kamailio] stirshaken: handle empty origid, enhance docs (#2683)
by Piotr 19 Mar '21

19 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:  - [X ] PR should be backported to stable branches - [X ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Now random uuid is generated for empty origid, as stated in documentaion. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2683 -- Commit Summary -- * modules: Add stirshaken module * stirshaken: add doc * stirshaken: enhance documentation * stirshaken: handle NULL or empty origid by generating random uuid -- File Changes -- A src/modules/stirshaken/Makefile (28) A src/modules/stirshaken/doc/Makefile (4) A src/modules/stirshaken/doc/stirshaken.xml (42) A src/modules/stirshaken/doc/stirshaken_admin.xml (470) A src/modules/stirshaken/stirshaken_mod.c (981) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2683.patch https://github.com/kamailio/kamailio/pull/2683.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/2683

2 3

git:master:dc851040: stirshaken: handle NULL or empty origid by generating random uuid
by Piotr Gregor 19 Mar '21

19 Mar '21

Module: kamailio Branch: master Commit: dc851040054692a955b92cf601eb308878017013 URL: https://github.com/kamailio/kamailio/commit/dc851040054692a955b92cf601eb308… Author: Piotr Gregor <piotr(a)signalwire.com> Committer: Piotr Gregor <piotr(a)signalwire.com> Date: 2021-03-18T17:58:14Z stirshaken: handle NULL or empty origid by generating random uuid --- Modified: src/modules/stirshaken/stirshaken_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dc851040054692a955b92cf601eb308… Patch: https://github.com/kamailio/kamailio/commit/dc851040054692a955b92cf601eb308… --- diff --git a/src/modules/stirshaken/stirshaken_mod.c b/src/modules/stirshaken/stirshaken_mod.c index ce42e57935..bc4a04f0fb 100644 --- a/src/modules/stirshaken/stirshaken_mod.c +++ b/src/modules/stirshaken/stirshaken_mod.c @@ -741,7 +741,16 @@ static int ki_stirshaken_add_identity_with_key(sip_msg_t *msg, str *x5u, str *at .origtn_val = origtn_val ? origtn_val->s : NULL, .origid = origid ? origid->s : NULL }; + char uuid_str[37] = { 0 }; + if (!params.origid || !strlen(params.origid)) { + + uuid_t uuid; + + uuid_generate(uuid); + uuid_unparse_lower(uuid, uuid_str); + params.origid = uuid_str; + } if (keypath && keypath->s) {

1 0

git:master:7d27ac37: Merge pull request #2683 from signalwire/mod-libstirshaken
by GitHub 19 Mar '21

19 Mar '21

Module: kamailio Branch: master Commit: 7d27ac370b762c6f6c820c4a74053db569cbb19b URL: https://github.com/kamailio/kamailio/commit/7d27ac370b762c6f6c820c4a74053db… Author: Piotr <piotr(a)signalwire.com> Committer: GitHub <noreply(a)github.com> Date: 2021-03-19T11:44:49Z Merge pull request #2683 from signalwire/mod-libstirshaken stirshaken: handle empty origid, enhance docs --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml Modified: src/modules/stirshaken/stirshaken_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7d27ac370b762c6f6c820c4a74053db… Patch: https://github.com/kamailio/kamailio/commit/7d27ac370b762c6f6c820c4a74053db…

1 0

git:master:3eacb64f: stirshaken: enhance documentation
by Piotr Gregor 19 Mar '21

19 Mar '21

Module: kamailio Branch: master Commit: 3eacb64f2df8b8ce7816f738b72ec16d5060a576 URL: https://github.com/kamailio/kamailio/commit/3eacb64f2df8b8ce7816f738b72ec16… Author: Piotr Gregor <piotr(a)signalwire.com> Committer: Piotr Gregor <piotr(a)signalwire.com> Date: 2021-03-18T17:58:14Z stirshaken: enhance documentation --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3eacb64f2df8b8ce7816f738b72ec16… Patch: https://github.com/kamailio/kamailio/commit/3eacb64f2df8b8ce7816f738b72ec16…

1 0

[CRON] Still Failing: dbank888/kamailio#128 (master - 491e19e)
by Travis CI 18 Mar '21

18 Mar '21

Build Update for dbank888/kamailio ------------------------------------- Build: #128 Status: Still Failing Duration: 5 mins and 14 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/github/dbank888/kamailio/builds/763470257?utm_medium=… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

[kamailio/kamailio] modules: Add stirshaken module (#2679)
by Piotr 18 Mar '21

18 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 - [ ] 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This module uses libstirshaken to implement STIR-Shaken authentication and verification functions (STI-AS/VS). It allows for easy verification of a SIP call containing PASSporT wrapped into SIP Identity Header using a specific certificate, or a specific key, or by performing complete check on PASSporT including downloading certificate referenced in it's x5u header, and optionally checking it against trusted root certificates (X509 cert path check). Certificates may be cached and loaded from disk. Example usage: loadmodule "stirshaken" modparam("stirshaken", "as_default_key", "/path/to/key") modparam("stirshaken", "vs_verify_x509_cert_path", 1) modparam("stirshaken", "vs_ca_dir", "/path/to/ca") modparam("stirshaken", "vs_cache_certificates", 1) modparam("stirshaken", "vs_cache_dir", "/tmp/cert_cache") modparam("stirshaken", "vs_cache_expire_s", 90) request_route { (...) stirshaken_add_identity("https://sp.com/sp.pem".pem", "B", "+44100", "+44200", "ref"); (...) request_route { (...) stirshaken_check_identity(); (...) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2679 -- Commit Summary -- * modules: Add stirshaken module -- File Changes -- A src/modules/stirshaken/Makefile (28) A src/modules/stirshaken/stirshaken_mod.c (972) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2679.patch https://github.com/kamailio/kamailio/pull/2679.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/2679

2 7

How to Play RBT With Media Server
by amitsharma＠coraltele.com 18 Mar '21

18 Mar '21

Dear Team, I am using SBC as proxy server and I am using Freeswitch for providing RBT/MOH. Please guide how can I play RBT from Freeswitch while using SBC as proxy server. Thanks & Regards, Amit Sharma (Sr. Team Leader) (An ISO 9001:2008 company) Mobile: <tel:9891612004> tel:9891612004 PH: +91 120 2595870 Ext.: <tel:870> tel:870 Email : <mailto:amitsharma@coraltele.com> amitsharma(a)coraltele.com Web : <blocked::http://www.coraltele.com> www.coraltele.com

3 2

Errored: kamailio/kamailio#9990 (master - 35cffd8)
by Travis CI 18 Mar '21

18 Mar '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9990 Status: Errored Duration: 7 mins and 23 secs Commit: 35cffd8 (master) Author: Daniel-Constantin Mierla Message: stirshaken: added initial README file View the changeset: https://github.com/kamailio/kamailio/compare/fe130dcf2756...35cffd84f7d1 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/763369835?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Errored: kamailio/kamailio#9989 (master - fe130dc)
by Travis CI 18 Mar '21

18 Mar '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9989 Status: Errored Duration: 6 mins and 23 secs Commit: fe130dc (master) Author: Piotr Gregor Message: stirshaken: add doc View the changeset: https://github.com/kamailio/kamailio/compare/1af163d0f658...fe130dcf2756 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/763369510?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:3aa92a48: stirshaken: docs - removed extra section ending tag
by Daniel-Constantin Mierla 18 Mar '21

18 Mar '21

Module: kamailio Branch: master Commit: 3aa92a488ef63991e565fd9289e25ea522df75d6 URL: https://github.com/kamailio/kamailio/commit/3aa92a488ef63991e565fd9289e25ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-18T08:48:13+01:00 stirshaken: docs - removed extra section ending tag --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3aa92a488ef63991e565fd9289e25ea… Patch: https://github.com/kamailio/kamailio/commit/3aa92a488ef63991e565fd9289e25ea… --- diff --git a/src/modules/stirshaken/doc/stirshaken_admin.xml b/src/modules/stirshaken/doc/stirshaken_admin.xml index 1b6c7379fd..c311fe0907 100644 --- a/src/modules/stirshaken/doc/stirshaken_admin.xml +++ b/src/modules/stirshaken/doc/stirshaken_admin.xml @@ -124,7 +124,6 @@ modparam("stirshaken", "vs_ca_dir", "/path/to/ca_dir") </programlisting> </example> </section> - </section> <section> <title><varname>vs_crl_dir</varname> (str)</title> <para>

1 0

git:master:35cffd84: stirshaken: added initial README file
by Daniel-Constantin Mierla 18 Mar '21

18 Mar '21

Module: kamailio Branch: master Commit: 35cffd84f7d189b50d4a0da9909a4904116021d0 URL: https://github.com/kamailio/kamailio/commit/35cffd84f7d189b50d4a0da9909a490… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-18T08:48:38+01:00 stirshaken: added initial README file --- Added: src/modules/stirshaken/README --- Diff: https://github.com/kamailio/kamailio/commit/35cffd84f7d189b50d4a0da9909a490… Patch: https://github.com/kamailio/kamailio/commit/35cffd84f7d189b50d4a0da9909a490…

1 0

git:master:5ccfa3c0: Makefile.groups: added group for stirshaken module
by Daniel-Constantin Mierla 18 Mar '21

18 Mar '21

Module: kamailio Branch: master Commit: 5ccfa3c0272e7a13fd0875f3664e75a88a3abf86 URL: https://github.com/kamailio/kamailio/commit/5ccfa3c0272e7a13fd0875f3664e75a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-18T08:45:43+01:00 Makefile.groups: added group for stirshaken module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/5ccfa3c0272e7a13fd0875f3664e75a… Patch: https://github.com/kamailio/kamailio/commit/5ccfa3c0272e7a13fd0875f3664e75a… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index fa7c6dd719..34bbd98678 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -187,6 +187,9 @@ mod_list_ev=evapi # - modules depending on libjwt library mod_list_jwt=jwt +# - modules depending on libstirshaken library +mod_list_stirshaken=stirshaken + # - modules depending on kazoo/rabbitmq mod_list_kazoo=kazoo @@ -260,6 +263,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_mqtt) \ $(mod_list_secsipid) \ $(mod_list_jwt) \ + $(mod_list_stirshaken) \ $(mod_list_rtp_media_server) @@ -453,6 +457,9 @@ module_group_kev=$(mod_list_ev) # pkg jwt module module_group_kjwt=$(mod_list_jwt) +# pkg stirshaken module +module_group_kstirshaken=$(mod_list_stirshaken) + # pkg kazoo module module_group_kkazoo=$(mod_list_kazoo)

1 0

git:master:2e8ead7e: modules: Add stirshaken module
by Daniel-Constantin Mierla 18 Mar '21

18 Mar '21

Module: kamailio Branch: master Commit: 2e8ead7ec434e27a344916ddbf092337e6a0bdb4 URL: https://github.com/kamailio/kamailio/commit/2e8ead7ec434e27a344916ddbf09233… Author: Piotr Gregor <piotr(a)signalwire.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-18T08:43:26+01:00 modules: Add stirshaken module This module uses libstirshaken to implement STIR-Shaken authentication and verification functions (STI-AS/VS). It allows for easy verification of a SIP call containing PASSporT wrapped into SIP Identity Header using a specific certificate, or a specific key, or by performing complete check on PASSporT including downloading certificate referenced in it's x5u header, and optionally checking it against trusted root certificates (X509 cert path check). Certificates may be cached and loaded from disk. Example usage: loadmodule "stirshaken" modparam("stirshaken", "as_default_key", "/path/to/key") modparam("stirshaken", "vs_verify_x509_cert_path", 1) modparam("stirshaken", "vs_ca_dir", "/path/to/ca") modparam("stirshaken", "vs_cache_certificates", 1) modparam("stirshaken", "vs_cache_dir", "/tmp/cert_cache") modparam("stirshaken", "vs_cache_expire_s", 90) request_route { (...) stirshaken_add_identity("https://sp.com/sp.pem", "B", "+44100", "+44200", "ref"); (...) request_route { (...) stirshaken_check_identity(); (...) --- Added: src/modules/stirshaken/Makefile Added: src/modules/stirshaken/stirshaken_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2e8ead7ec434e27a344916ddbf09233… Patch: https://github.com/kamailio/kamailio/commit/2e8ead7ec434e27a344916ddbf09233…

1 0

git:master:fe130dcf: stirshaken: add doc
by Daniel-Constantin Mierla 18 Mar '21

18 Mar '21

Module: kamailio Branch: master Commit: fe130dcf2756c81bff7c06eb857c4c4a4c39db84 URL: https://github.com/kamailio/kamailio/commit/fe130dcf2756c81bff7c06eb857c4c4… Author: Piotr Gregor <piotr(a)signalwire.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-18T08:43:26+01:00 stirshaken: add doc --- Added: src/modules/stirshaken/doc/Makefile Added: src/modules/stirshaken/doc/stirshaken.xml Added: src/modules/stirshaken/doc/stirshaken_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fe130dcf2756c81bff7c06eb857c4c4… Patch: https://github.com/kamailio/kamailio/commit/fe130dcf2756c81bff7c06eb857c4c4…

1 0

Errored: kamailio/kamailio#9986 (master - 1af163d)
by Travis CI 17 Mar '21

17 Mar '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9986 Status: Errored Duration: 7 mins and 32 secs Commit: 1af163d (master) Author: Daniel-Constantin Mierla Message: dmq: proper check of proto match in cmp_dmq_node() View the changeset: https://github.com/kamailio/kamailio/compare/7f8df73a1723...1af163d0f658 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/763289278?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

[kamailio/kamailio] Problems Defining To/From Headers when using rtjson_init_routes and rtjson_push_routes (#2677)
by carloslleitao 17 Mar '21

17 Mar '21

Hi, I'm using Kamailio version 5.4.0 on centos and I'm using rtjson to redirect SIP Invites. I'm using the JSON example bellow to try to set up the destination. It works fine to redirect the SIP Invite but From/To Headers are not working as expected, they are not changed and remain the same from original INVITE. I also attached my kamailio.cfg file in order for someone to help me here. JSON Example String: {"version":"1.0","routing":"serial","routes":[{"uri":"sip:3005011999999999@10.20.10.55:5060","dst_uri":"sip:3005011999999999@10.20.10.55:5060","headers":{"from":{"display":"original","uri":"sip:6000@10.20.131.28:5060"},"to":{"display":"","uri":"sip:3005011999999999@10.20.10.55:5060"}}}]} [kamailio.txt](https://github.com/kamailio/kamailio/files/6151929/kamailio.t… Has anyone experienced 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/2677

2 4

git:master:1af163d0: dmq: proper check of proto match in cmp_dmq_node()
by Daniel-Constantin Mierla 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: 1af163d0f658541ead6e81edc52cdadb4049896a URL: https://github.com/kamailio/kamailio/commit/1af163d0f658541ead6e81edc52cdad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-17T18:02:17+01:00 dmq: proper check of proto match in cmp_dmq_node() --- Modified: src/modules/dmq/dmqnode.c --- Diff: https://github.com/kamailio/kamailio/commit/1af163d0f658541ead6e81edc52cdad… Patch: https://github.com/kamailio/kamailio/commit/1af163d0f658541ead6e81edc52cdad… --- diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index fe23890742..7e6ef93bdf 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -88,7 +88,7 @@ int cmp_dmq_node(dmq_node_t *node, dmq_node_t *cmpnode) } return STR_EQ(node->uri.host, cmpnode->uri.host) && STR_EQ(node->uri.port, cmpnode->uri.port) - && (node->uri.proto, cmpnode->uri.proto); + && (node->uri.proto == cmpnode->uri.proto); } /**

1 0

git:master:7f8df73a: dmq: check proto in cmp_dmq_node()
by Daniel-Constantin Mierla 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: 7f8df73a1723ce30911b00e09c7506cab1e41ad7 URL: https://github.com/kamailio/kamailio/commit/7f8df73a1723ce30911b00e09c7506c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-17T17:56:20+01:00 dmq: check proto in cmp_dmq_node() --- Modified: src/modules/dmq/dmqnode.c --- Diff: https://github.com/kamailio/kamailio/commit/7f8df73a1723ce30911b00e09c7506c… Patch: https://github.com/kamailio/kamailio/commit/7f8df73a1723ce30911b00e09c7506c… --- diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index edc42e1f27..fe23890742 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -87,7 +87,8 @@ int cmp_dmq_node(dmq_node_t *node, dmq_node_t *cmpnode) return -1; } return STR_EQ(node->uri.host, cmpnode->uri.host) - && STR_EQ(node->uri.port, cmpnode->uri.port); + && STR_EQ(node->uri.port, cmpnode->uri.port) + && (node->uri.proto, cmpnode->uri.proto); } /**

1 0

git:master:7558e50c: dmq: build_node_str() makes uri with transport if not udp
by Daniel-Constantin Mierla 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: 7558e50c551c172079d44a7a95774575aa5e5eea URL: https://github.com/kamailio/kamailio/commit/7558e50c551c172079d44a7a9577457… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-17T17:22:00+01:00 dmq: build_node_str() makes uri with transport if not udp --- Modified: src/modules/dmq/dmqnode.c --- Diff: https://github.com/kamailio/kamailio/commit/7558e50c551c172079d44a7a9577457… Patch: https://github.com/kamailio/kamailio/commit/7558e50c551c172079d44a7a9577457… --- diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 2eb3b1c373..edc42e1f27 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -397,8 +397,10 @@ int update_dmq_node_status(dmq_node_list_t *list, dmq_node_t *node, int status) */ int build_node_str(dmq_node_t *node, char *buf, int buflen) { - /* sip:host:port;status=[status] */ + /* sip:host:port;protocol=abcd;status=[status] */ int len = 0; + str sproto = STR_NULL; + if(buflen < node->orig_uri.len + 32) { LM_ERR("no more space left for node string\n"); return -1; @@ -411,6 +413,18 @@ int build_node_str(dmq_node_t *node, char *buf, int buflen) len += 1; memcpy(buf + len, node->uri.port.s, node->uri.port.len); len += node->uri.port.len; + if(node->uri.proto!=PROTO_NONE && node->uri.proto!=PROTO_UDP + && node->uri.proto!=PROTO_OTHER) { + if(get_valid_proto_string(node->uri.proto, 1, 0, &sproto)<0) { + LM_WARN("unknown transport protocol - fall back to udp\n"); + sproto.s = "udp"; + sproto.len = 3; + } + memcpy(buf + len, TRANSPORT_PARAM, TRANSPORT_PARAM_LEN); + len += TRANSPORT_PARAM_LEN; + memcpy(buf + len, sproto.s, sproto.len); + len += sproto.len; + } memcpy(buf + len, ";", 1); len += 1; memcpy(buf + len, "status=", 7);

1 0

[kamailio/kamailio] siputils: fix undefined symbol ruri_mark_new (#2681)
by Stefan Mititelu 17 Mar '21

17 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) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2681 -- Commit Summary -- * siputils: fix undefined symbol ruri_mark_new -- File Changes -- M src/modules/siputils/contact_ops.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2681.patch https://github.com/kamailio/kamailio/pull/2681.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/2681

2 4

git:5.3:993da649: siputils: fix undefined symbol ruri_mark_new
by Daniel-Constantin Mierla 17 Mar '21

17 Mar '21

Module: kamailio Branch: 5.3 Commit: 993da649f5f6d7467bf641598e60dce35992b361 URL: https://github.com/kamailio/kamailio/commit/993da649f5f6d7467bf641598e60dce… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-17T13:32:47+01:00 siputils: fix undefined symbol ruri_mark_new --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/993da649f5f6d7467bf641598e60dce… Patch: https://github.com/kamailio/kamailio/commit/993da649f5f6d7467bf641598e60dce… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index 20c76efdd6..55c83d8cca 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -36,6 +36,7 @@ #include "../../core/parser/hf.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/contact/parse_contact.h" +#include "../../core/dset.h" #include "../../core/ut.h" #include <stdio.h>

1 0

[kamailio/kamailio] smsops: fix parsing of validity period (#2680)
by alexyosifov 17 Mar '21

17 Mar '21

- Validity period is present only for SUBMIT msg type and it is an optional parameter. For now supports only Relative VP format.   #### 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) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2680 -- Commit Summary -- * smsops: fix parsing of validity period -- File Changes -- M src/modules/smsops/smsops_impl.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2680.patch https://github.com/kamailio/kamailio/pull/2680.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/2680

2 2

git:master:c4b1d0ab: smsops: fix parsing of validity period
by Daniel-Constantin Mierla 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: c4b1d0ab700ea03869114d08daa78ab6a6a56b96 URL: https://github.com/kamailio/kamailio/commit/c4b1d0ab700ea03869114d08daa78ab… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-17T13:31:33+01:00 smsops: fix parsing of validity period - Validity period is present only for SUBMIT msg type and it is an optional parameter. For now supports only Relative VP format. --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/c4b1d0ab700ea03869114d08daa78ab… Patch: https://github.com/kamailio/kamailio/commit/c4b1d0ab700ea03869114d08daa78ab… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index e956656d1a..6205c89928 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -173,6 +173,10 @@ void freeRP_DATA(sms_rp_data_t * rpdata) { #define BITMASK_HIGH_4BITS 0xF0 #define BITMASK_LOW_4BITS 0x0F #define BITMASK_TP_UDHI 0x40 +#define BITMASK_TP_VPF 0x18 +#define BITMASK_TP_VPF_RELATIVE 0x10 +#define BITMASK_TP_VPF_ENHANCED 0x08 +#define BITMASK_TP_VPF_ABSOLUTE 0x18 // Encode SMS-Message by merging 7 bit ASCII characters into 8 bit octets. static int ascii_to_gsm(str sms, char * output_buffer, int buffer_size) { @@ -525,7 +529,27 @@ int decode_3gpp_sms(struct sip_msg *msg) { } rp_data->pdu.pid = (unsigned char)body.s[p++]; rp_data->pdu.coding = (unsigned char)body.s[p++]; - rp_data->pdu.validity = (unsigned char)body.s[p++]; + + // 3GPP TS 03.40 9.2.2.2 SMS SUBMIT type + // https://en.wikipedia.org/wiki/GSM_03.40 + if(rp_data->pdu.msg_type == SUBMIT){ + // 3GPP TS 03.40 9.2.3.3 TP Validity Period Format (TP VPF) + switch (rp_data->pdu.flags & BITMASK_TP_VPF){ + case BITMASK_TP_VPF_RELATIVE: // 3GPP TS 03.40 9.2.3.12.1 TP-VP (Relative format) + rp_data->pdu.validity = (unsigned char)body.s[p++]; + break; + case BITMASK_TP_VPF_ENHANCED: // 3GPP TS 03.40 9.2.3.12.2 TP-VP (Absolute format) + p += 7; + LM_WARN("3GPP TS 03.40 9.2.3.12.2 TP-VP (Absolute format) is not supported\n"); + break; + case BITMASK_TP_VPF_ABSOLUTE: // 3GPP TS 03.40 9.2.3.12.3 TP-VP (Enhanced format) + p += 7; + LM_WARN("3GPP TS 03.40 9.2.3.12.3 TP-VP (Enhanced format) is not supported\n"); + break; + default: + break; + } + } //TP-User-Data-Length and TP-User-Data len = (unsigned char)body.s[p++];

1 0

git:master:8cab8c2d: modules: readme files regenerated - lrkproxy ... [skip ci]
by Kamailio Dev 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: 8cab8c2daa0c3f906406741db14df3861bb32cb4 URL: https://github.com/kamailio/kamailio/commit/8cab8c2daa0c3f906406741db14df38… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-17T11:01:17+01:00 modules: readme files regenerated - lrkproxy ... [skip ci] --- Modified: src/modules/lrkproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/8cab8c2daa0c3f906406741db14df38… Patch: https://github.com/kamailio/kamailio/commit/8cab8c2daa0c3f906406741db14df38… --- diff --git a/src/modules/lrkproxy/README b/src/modules/lrkproxy/README index d6b03a6642..b43dd8b16a 100644 --- a/src/modules/lrkproxy/README +++ b/src/modules/lrkproxy/README @@ -97,7 +97,7 @@ Chapter 1. Admin Guide 2.1. LRKP_Controlling Layer (LRKP_CL) - The first layer develope as User-Space application that allows + The first layer is developed as User-Space application that allows User-Space to directly access and manipulate cache data buffer and packet buffer in Kernel-Space. This layer gets all information about creating new sessions, active sessions and teardown sessions which is @@ -106,8 +106,8 @@ Chapter 1. Admin Guide 2.2. LRKP_Transport Stateful Layer (LRKP_TSL) - The second layer develope in Kernel-Space as a main decision point for - RTP admission controller and Quickpath selector to where a received + The second layer is developed in Kernel-Space as a main decision point + for RTP admission controller and Quickpath selector to where a received packet should be forwarded with power of packet mangling framework in the network stack.

1 0

git:master:81f8833c: lrkproxy: update doc/ folder
by mojtaba 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: 81f8833ccbb80e1a4975c2ffaf56dd55fc0d3b54 URL: https://github.com/kamailio/kamailio/commit/81f8833ccbb80e1a4975c2ffaf56dd5… Author: mojtaba <mespio(a)gmail.com> Committer: mojtaba <mespio(a)gmail.com> Date: 2021-03-17T13:30:28+03:30 lrkproxy: update doc/ folder --- Modified: src/modules/lrkproxy/doc/lrkproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/81f8833ccbb80e1a4975c2ffaf56dd5… Patch: https://github.com/kamailio/kamailio/commit/81f8833ccbb80e1a4975c2ffaf56dd5… --- diff --git a/src/modules/lrkproxy/doc/lrkproxy_admin.xml b/src/modules/lrkproxy/doc/lrkproxy_admin.xml index 1f9eacc534..c826047040 100644 --- a/src/modules/lrkproxy/doc/lrkproxy_admin.xml +++ b/src/modules/lrkproxy/doc/lrkproxy_admin.xml @@ -35,7 +35,7 @@ <section> <title>LRKP_Controlling Layer (LRKP_CL)</title> <para> - The first layer develope as User-Space + The first layer is developed as User-Space application that allows User-Space to directly access and manipulate cache data buffer and packet buffer in Kernel-Space. This layer @@ -49,7 +49,7 @@ <section> <title>LRKP_Transport Stateful Layer (LRKP_TSL)</title> <para> - The second layer develope in Kernel-Space as + The second layer is developed in Kernel-Space as a main decision point for RTP admission controller and Quickpath selector to where a received packet should be forwarded with power of packet mangling

1 0

git:master:91c5626d: lrkproxy: update doc/ folder for README
by mojtaba 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: 91c5626d7119cd9c78028d9b3bf968ecd7db5952 URL: https://github.com/kamailio/kamailio/commit/91c5626d7119cd9c78028d9b3bf968e… Author: mojtaba <mespio(a)gmail.com> Committer: mojtaba <mespio(a)gmail.com> Date: 2021-03-17T12:49:04+03:30 lrkproxy: update doc/ folder for README --- Modified: src/modules/lrkproxy/doc/lrkproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/91c5626d7119cd9c78028d9b3bf968e… Patch: https://github.com/kamailio/kamailio/commit/91c5626d7119cd9c78028d9b3bf968e… --- diff --git a/src/modules/lrkproxy/doc/lrkproxy_admin.xml b/src/modules/lrkproxy/doc/lrkproxy_admin.xml index 57cc2faab3..1f9eacc534 100644 --- a/src/modules/lrkproxy/doc/lrkproxy_admin.xml +++ b/src/modules/lrkproxy/doc/lrkproxy_admin.xml @@ -17,14 +17,16 @@ <section> <title>Overview</title> <para> - This is a module that enables media streams to be relayed via an - lrkproxy. This module works with py_lrkproxy engine in: + This is a module that enables media streams to be relayed via + pylrkproxy engine that exist in: https://github.com/mojtabaesfandiari/pylrkproxy - This module does relaying audio streams between peers in + It does relaying audio streams between peers in PREROUTING netfilter-hooking section in kernel-space linux. The LRKProxy architecture is composed of two different layers. These layers are independent of each other. + For more information about LRKProxy architecture, please visit our paper in ieeexplore: + https://ieeexplore.ieee.org/document/9303608 </para> </section> @@ -33,12 +35,12 @@ <section> <title>LRKP_Controlling Layer (LRKP_CL)</title> <para> - The first layer is developed as User-Space + The first layer develope as User-Space application that allows User-Space to directly access and manipulate cache data buffer and packet buffer in Kernel-Space. This layer gets all information about creating new sessions, - active sessions and tear-down sessions which is + active sessions and teardown sessions which is gotten from SDP body during signaling plan and relay them to the LRKP-Transport Stateful Layer (LRKP- TSL). @@ -47,7 +49,7 @@ <section> <title>LRKP_Transport Stateful Layer (LRKP_TSL)</title> <para> - The second layer is developed in Kernel-Space as + The second layer develope in Kernel-Space as a main decision point for RTP admission controller and Quickpath selector to where a received packet should be forwarded with power of packet mangling

2 1

git:master:a1ac1f38: modules: readme files regenerated - lrkproxy ... [skip ci]
by Kamailio Dev 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: a1ac1f385097c7ddc15ecab6a3f076d36a1b7728 URL: https://github.com/kamailio/kamailio/commit/a1ac1f385097c7ddc15ecab6a3f076d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-17T10:31:27+01:00 modules: readme files regenerated - lrkproxy ... [skip ci] --- Modified: src/modules/lrkproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/a1ac1f385097c7ddc15ecab6a3f076d… Patch: https://github.com/kamailio/kamailio/commit/a1ac1f385097c7ddc15ecab6a3f076d…

1 0

[kamailio/kamailio] topos module may not be able to transparently transmit the update message (#2659)
by zhangyang 17 Mar '21

17 Mar '21

**Description** We use below config to test the topology hiding function，when kamailio receive “update” message，doesn't send out，it will send to itself with destination port 5060； Sorry for raising this question again，I really don’t know what parameters need to be configured。And after I modified some codes, it could succeed probabilistically... Sorry again, excuse me **Troubleshooting** ``` loadmodule "ndb_redis.so" loadmodule "topos_redis.so" loadmodule "topos.so" modparam("ndb_redis", "server", "name=srv8;addr=127.0.0.1;port=6381;db=2") modparam("topos", "storage", "redis") modparam("topos", "db_url", "redis://127.0.0.1:6381/2") modparam("topos_redis", "serverid", "srv8") ...Omit the configuration in the middle... route[WITHINDLG] { if (has_totag()) { # sequential request withing a dialog should # take the path determined by record-routing xlog("L_INFO","yang yangyang testin to not here"); if (loose_route()){ if(is_method("INFO")){ route("INFO_SELF"); } route(BYE); route(REINVITE); route(ACK); route(RELAY); } else { if ( is_method("ACK")) { if ( t_check_trans() ) { # no loose-route, but stateful ACK; # must be an ACK after a 487 # or e.g. 404 $var(obj) = $sht(call_objects=>$ci); xlog("L_INFO","Call $ci: ACK received in A-Leg, $fU@$si:$sp -----> $rU@$Ri:$Rp relaying downstreamrouteWITHINDLG\n"); t_relay(); exit; } else { exit; } } xlog("L_INFO","yang in to not here"); sl_send_reply("404","Not here"); } exit; } } ``` -------- Call flow ``` UE-----------------PROXY-------------B2bua invite-------------->|------------------>invite 183<----------------|<------------------183 Prack------------ ->|------------------>Prack 200ok<-------------|<-----------------200ok update1---------->| |update2<-----------| | 404 not here-------> | ```` **Additional Information** ``` version: kamailio master (x86_64/linux) ``` ### Possible Solutions I set the log level to debug, and the comparison found that the logic of prack and update is different。After checking the code of topos, it is found that kamailio/src/modules/topos/tps_msg.c has a separate processing for prack.according to commit [37830f5](https://github.com/kamailio/kamailio/commit/37830f53b1f21fba5beef5… So I added update to the prack processing method，Later I found that when the B-side update message comes, it should follow the original logic。 So I distinguish whether to follow the modified logic according to ONREPLY_ROUTE。 But after probabilistic success，The problem is that the value returned by get_route_type（） is sometimes 1 and sometimes 4 Call flow after modification： ``` UE-----------------PROXY-------------B2bua invite-------------->|------------------>invite 183<----------------|<------------------183 Prack------------ ->|------------------>Prack 200ok<-------------|<-----------------200ok update1---------->|----------------->|update 200ok<-------------|<-----------------200ok |<-----------------|update2 | 404 not here---------> | ```` Here is the code I modified： /src/modules/topos/tps_msg.c ![image](https://user-images.githubusercontent.com/16113837/109925737-107b0580-7cfd-11eb-9eaf-7a66ba224b55.png) -- 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/2659

3 5

[kamailio/kamailio] modules: Add stirshaken module (#2678)
by Piotr 17 Mar '21

17 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 - [ ] 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:  - [ x] PR should be backported to stable branches - [ x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This module uses libstirshaken to implement STIR-Shaken authentication and verification functions (STI-AS/VS). It allows for easy verification of a SIP call containing PASSporT wrapped into SIP Identity Header using a specific certificate, or a specific key, or by performing complete check on PASSporT including downloading certificate referenced in it's x5u header, and optionally checking it against trusted root certificates (X509 cert path check). Certificates may be cached and loaded from disk. Example usage: loadmodule "stirshaken" modparam("stirshaken", "as_default_key", "/path/to/key") modparam("stirshaken", "vs_verify_x509_cert_path", 1) modparam("stirshaken", "vs_ca_dir", "/path/to/ca") modparam("stirshaken", "vs_cache_certificates", 1) modparam("stirshaken", "vs_cache_dir", "/tmp/cert_cache") modparam("stirshaken", "vs_cache_expire_s", 90) request_route { (...) stirshaken_add_identity("https://sp.com/sp.pem".pem", "B", "+44100", "+44200", "ref"); (...) request_route { (...) stirshaken_check_identity(); (...) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2678 -- Commit Summary -- * modules: Add stirshaken module -- File Changes -- A src/modules/stirshaken/Makefile (28) A src/modules/stirshaken/stirshaken_mod.c (972) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2678.patch https://github.com/kamailio/kamailio/pull/2678.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/2678

1 3

git:5.3:9c6b822b: siputils: 0-ending value on deconding uri
by Ovidiu Sas 16 Mar '21

16 Mar '21

Module: kamailio Branch: 5.3 Commit: 9c6b822b4e9b297c497cec241b257a177ca804b1 URL: https://github.com/kamailio/kamailio/commit/9c6b822b4e9b297c497cec241b257a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-03-16T15:54:51-04:00 siputils: 0-ending value on deconding uri (cherry picked from commit 735911fcced21eb5c66393045bc143bd953d08bb) --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/9c6b822b4e9b297c497cec241b257a1… Patch: https://github.com/kamailio/kamailio/commit/9c6b822b4e9b297c497cec241b257a1… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index 427bf3bb13..20c76efdd6 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -163,12 +163,14 @@ int ki_decode_contact(sip_msg_t *msg) return res; } else { /* we do not modify the original first line */ - if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) + if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) { msg->new_uri = newUri; - else { + } else { pkg_free(msg->new_uri.s); msg->new_uri = newUri; } + msg->parsed_uri_ok=0; + ruri_mark_new(); } return 1; } @@ -575,7 +577,7 @@ int decode_uri(str uri, char separator, str *result) uri.len); /* adding one comes from * */ - result->s = pkg_malloc(result->len); + result->s = pkg_malloc(result->len + 1); /* NULL termination */ if(result->s == NULL) { LM_ERR("unable to allocate pkg memory\n"); return -4; @@ -624,6 +626,7 @@ int decode_uri(str uri, char separator, str *result) memcpy(pos, uri.s + format.second, uri.len - format.second); /* till end: */ + result->s[result->len] = '\0'; LM_DBG("New decoded uri [%.*s]\n", result->len, result->s); return 0;

1 0

git:5.3:a6fa3dee: mangler: 0-ending value on deconding uri
by Ovidiu Sas 16 Mar '21

16 Mar '21

Module: kamailio Branch: 5.3 Commit: a6fa3dee5b1642e3285a1d92c890bff39810e804 URL: https://github.com/kamailio/kamailio/commit/a6fa3dee5b1642e3285a1d92c890bff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-03-16T15:54:45-04:00 mangler: 0-ending value on deconding uri (cherry picked from commit 3b038ed6761a5818441a7610a8305491aa358377) --- Modified: src/modules/mangler/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/a6fa3dee5b1642e3285a1d92c890bff… Patch: https://github.com/kamailio/kamailio/commit/a6fa3dee5b1642e3285a1d92c890bff… --- diff --git a/src/modules/mangler/contact_ops.c b/src/modules/mangler/contact_ops.c index de94edb534..c3e1a2ff2e 100644 --- a/src/modules/mangler/contact_ops.c +++ b/src/modules/mangler/contact_ops.c @@ -610,28 +610,28 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) { LOG(L_ERR,"ERROR: decode_uri: Unable to decode host address \n"); return -2;/* should I quit or ignore ? */ - } + } if ((format.password.len > 0) && (format.username.len <= 0)) { LOG(L_ERR,"ERROR: decode_uri: Password decoded but no username available\n"); return -3; } - + /* a complete uri would be sip:username:password@ip:port;transport=protocol goes to * sip:enc_pref#username#password#ip#port#protocol@public_ip */ result->len = format.first + (uri->len - format.second); /* not NULL terminated */ if (format.username.len > 0) result->len += format.username.len + 1; //: or @ if (format.password.len > 0) result->len += format.password.len + 1; //@ - + /* if (format.ip.len > 0) */ result->len += format.ip.len; - + if (format.port.len > 0) result->len += 1 + format.port.len; //: if (format.protocol.len > 0) result->len += 1 + 10 + format.protocol.len; //;transport= - + /* adding one comes from * */ - result->s = pkg_malloc (result->len); + result->s = pkg_malloc (result->len + 1); /* NULL termination */ if (result->s == NULL) { LOG(L_ERR,"ERROR: decode_contact: Unable to allocate memory\n"); @@ -640,7 +640,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) pos = result->s; memcpy (pos, uri->s, format.first); /* till sip: */ pos = pos + format.first; - + if (format.username.len > 0) { memcpy (pos, format.username.s, format.username.len); @@ -662,7 +662,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.ip.s, format.ip.len); pos = pos + format.ip.len; - + if (format.port.len > 0) { memcpy (pos, ":", 1); @@ -677,9 +677,11 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.protocol.s, format.protocol.len); pos = pos + format.protocol.len; } - + memcpy (pos, uri->s + format.second, uri->len - format.second); /* till end: */ - + + result->s[result->len] = '\0'; + /* dst_uri */ if (dst_uri && format.rcv_ip.s){ dst_uri->len=4 /* sip: */ + format.rcv_ip.len;

1 0

git:5.4:a779c66d: mangler: 0-ending value on deconding uri
by Ovidiu Sas 16 Mar '21

16 Mar '21

Module: kamailio Branch: 5.4 Commit: a779c66dbb19cc5b7938072439327003acd5dc7a URL: https://github.com/kamailio/kamailio/commit/a779c66dbb19cc5b793807243932700… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-03-16T13:17:30-04:00 mangler: 0-ending value on deconding uri (cherry picked from commit 3b038ed6761a5818441a7610a8305491aa358377) --- Modified: src/modules/mangler/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/a779c66dbb19cc5b793807243932700… Patch: https://github.com/kamailio/kamailio/commit/a779c66dbb19cc5b793807243932700… --- diff --git a/src/modules/mangler/contact_ops.c b/src/modules/mangler/contact_ops.c index de94edb534..c3e1a2ff2e 100644 --- a/src/modules/mangler/contact_ops.c +++ b/src/modules/mangler/contact_ops.c @@ -610,28 +610,28 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) { LOG(L_ERR,"ERROR: decode_uri: Unable to decode host address \n"); return -2;/* should I quit or ignore ? */ - } + } if ((format.password.len > 0) && (format.username.len <= 0)) { LOG(L_ERR,"ERROR: decode_uri: Password decoded but no username available\n"); return -3; } - + /* a complete uri would be sip:username:password@ip:port;transport=protocol goes to * sip:enc_pref#username#password#ip#port#protocol@public_ip */ result->len = format.first + (uri->len - format.second); /* not NULL terminated */ if (format.username.len > 0) result->len += format.username.len + 1; //: or @ if (format.password.len > 0) result->len += format.password.len + 1; //@ - + /* if (format.ip.len > 0) */ result->len += format.ip.len; - + if (format.port.len > 0) result->len += 1 + format.port.len; //: if (format.protocol.len > 0) result->len += 1 + 10 + format.protocol.len; //;transport= - + /* adding one comes from * */ - result->s = pkg_malloc (result->len); + result->s = pkg_malloc (result->len + 1); /* NULL termination */ if (result->s == NULL) { LOG(L_ERR,"ERROR: decode_contact: Unable to allocate memory\n"); @@ -640,7 +640,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) pos = result->s; memcpy (pos, uri->s, format.first); /* till sip: */ pos = pos + format.first; - + if (format.username.len > 0) { memcpy (pos, format.username.s, format.username.len); @@ -662,7 +662,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.ip.s, format.ip.len); pos = pos + format.ip.len; - + if (format.port.len > 0) { memcpy (pos, ":", 1); @@ -677,9 +677,11 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.protocol.s, format.protocol.len); pos = pos + format.protocol.len; } - + memcpy (pos, uri->s + format.second, uri->len - format.second); /* till end: */ - + + result->s[result->len] = '\0'; + /* dst_uri */ if (dst_uri && format.rcv_ip.s){ dst_uri->len=4 /* sip: */ + format.rcv_ip.len;

1 0

git:5.4:b739727c: siputils: 0-ending value on deconding uri
by Ovidiu Sas 16 Mar '21

16 Mar '21

Module: kamailio Branch: 5.4 Commit: b739727cfb66eb56683d236540d8463b870080f5 URL: https://github.com/kamailio/kamailio/commit/b739727cfb66eb56683d236540d8463… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-03-16T13:17:15-04:00 siputils: 0-ending value on deconding uri (cherry picked from commit 735911fcced21eb5c66393045bc143bd953d08bb) --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/b739727cfb66eb56683d236540d8463… Patch: https://github.com/kamailio/kamailio/commit/b739727cfb66eb56683d236540d8463… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index f21d7705b3..1964ef59ee 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -165,12 +165,14 @@ int ki_decode_contact(sip_msg_t *msg) return res; } else { /* we do not modify the original first line */ - if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) + if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) { msg->new_uri = newUri; - else { + } else { pkg_free(msg->new_uri.s); msg->new_uri = newUri; } + msg->parsed_uri_ok=0; + ruri_mark_new(); } return 1; } @@ -577,7 +579,7 @@ int decode_uri(str uri, char separator, str *result) uri.len); /* adding one comes from * */ - result->s = pkg_malloc(result->len); + result->s = pkg_malloc(result->len + 1); /* NULL termination */ if(result->s == NULL) { LM_ERR("unable to allocate pkg memory\n"); return -4; @@ -626,6 +628,7 @@ int decode_uri(str uri, char separator, str *result) memcpy(pos, uri.s + format.second, uri.len - format.second); /* till end: */ + result->s[result->len] = '\0'; LM_DBG("New decoded uri [%.*s]\n", result->len, result->s); return 0;

1 0

Errored: kamailio/kamailio#9971 (master - a089d62)
by Travis CI 16 Mar '21

16 Mar '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9971 Status: Errored Duration: 6 mins and 19 secs Commit: a089d62 (master) Author: Daniel-Constantin Mierla Message: dmq: docs - examples with TLS URI for nodes View the changeset: https://github.com/kamailio/kamailio/compare/b06ed377323c...a089d62b59a3 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/763114493?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

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

16 Mar '21

Module: kamailio Branch: master Commit: b06927cdc8d4a5444be0a584ecf02f6a48105e59 URL: https://github.com/kamailio/kamailio/commit/b06927cdc8d4a5444be0a584ecf02f6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-16T14:31:18+01:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/b06927cdc8d4a5444be0a584ecf02f6… Patch: https://github.com/kamailio/kamailio/commit/b06927cdc8d4a5444be0a584ecf02f6… --- diff --git a/src/modules/dmq/README b/src/modules/dmq/README index 2ea40a2642..085fe3c9df 100644 --- a/src/modules/dmq/README +++ b/src/modules/dmq/README @@ -216,6 +216,8 @@ sip:192.168.40.17:5060;status=active ... modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... +modparam("dmq", "server_address", "sip:10.0.0.20:5061;transport=tls") +... 3.2. notification_address(str) @@ -228,6 +230,8 @@ modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... modparam("dmq", "notification_address", "sip:10.0.0.21:5060") ... +modparam("dmq", "notification_address", "sip:10.0.0.21:5061;transport=tls") +... 3.3. notification_channel(str)

1 0

git:master:a089d62b: dmq: docs - examples with TLS URI for nodes
by Daniel-Constantin Mierla 16 Mar '21

16 Mar '21

Module: kamailio Branch: master Commit: a089d62b59a31b943bb273d996636a58a3e96133 URL: https://github.com/kamailio/kamailio/commit/a089d62b59a31b943bb273d996636a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T14:25:22+01:00 dmq: docs - examples with TLS URI for nodes --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a089d62b59a31b943bb273d996636a5… Patch: https://github.com/kamailio/kamailio/commit/a089d62b59a31b943bb273d996636a5… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 3b4121fdb3..d8b94614e2 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -132,6 +132,8 @@ sip:192.168.40.17:5060;status=active ... modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... +modparam("dmq", "server_address", "sip:10.0.0.20:5061;transport=tls") +... </programlisting> </example> </section> @@ -149,6 +151,8 @@ modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... modparam("dmq", "notification_address", "sip:10.0.0.21:5060") ... +modparam("dmq", "notification_address", "sip:10.0.0.21:5061;transport=tls") +... </programlisting> </example> </section>

1 0

git:master:b06ed377: dmq: request nodes list in worker one init callback instead of main proc
by Daniel-Constantin Mierla 16 Mar '21

16 Mar '21

Module: kamailio Branch: master Commit: b06ed377323ce11a8ae0442af6558b453c4872bb URL: https://github.com/kamailio/kamailio/commit/b06ed377323ce11a8ae0442af6558b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T13:40:03+01:00 dmq: request nodes list in worker one init callback instead of main proc - ensure availability of all transports --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/b06ed377323ce11a8ae0442af6558b4… Patch: https://github.com/kamailio/kamailio/commit/b06ed377323ce11a8ae0442af6558b4… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 0a807a983f..06e091038a 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -286,6 +286,11 @@ static int child_init(int rank) { int i, newpid; + if(rank == PROC_TCP_MAIN) { + /* do nothing for the tcp main process */ + return 0; + } + if(rank == PROC_INIT) { for(i = 0; i < dmq_num_workers; i++) { if (init_worker(&dmq_workers[i]) < 0) { @@ -312,6 +317,10 @@ static int child_init(int rank) dmq_workers[i].pid = newpid; } } + return 0; + } + + if(rank == PROC_SIPINIT) { /* notification_node - the node from which the Kamailio instance * gets the server list on startup. * the address is given as a module parameter in dmq_notification_address @@ -326,11 +335,6 @@ static int child_init(int rank) STR_FMT(&dmq_notification_address)); } } - return 0; - } - if(rank == PROC_TCP_MAIN) { - /* do nothing for the tcp main process */ - return 0; } dmq_pid = my_pid();

1 0

git:master:4cf65a7e: dmq: init internal tcp socket and global cfg structure for worker
by Daniel-Constantin Mierla 16 Mar '21

16 Mar '21

Module: kamailio Branch: master Commit: 4cf65a7ee1f1803c7c1471f35dcddc8f55c958b1 URL: https://github.com/kamailio/kamailio/commit/4cf65a7ee1f1803c7c1471f35dcddc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T13:11:09+01:00 dmq: init internal tcp socket and global cfg structure for worker --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/4cf65a7ee1f1803c7c1471f35dcddc8… Patch: https://github.com/kamailio/kamailio/commit/4cf65a7ee1f1803c7c1471f35dcddc8… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 4230e48a7f..0a807a983f 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -37,6 +37,7 @@ #include "../../core/pt.h" #include "../../core/hashes.h" #include "../../core/mod_fix.h" +#include "../../core/cfg/cfg_struct.h" #include "../../core/rpc_lookup.h" #include "../../core/kemi.h" @@ -299,11 +300,12 @@ static int child_init(int rank) /* fork worker processes */ for(i = 0; i < dmq_num_workers; i++) { LM_DBG("starting worker process %d\n", i); - newpid = fork_process(PROC_RPC, "DMQ WORKER", 0); + newpid = fork_process(PROC_RPC, "DMQ WORKER", 1); if(newpid < 0) { LM_ERR("failed to fork worker process %d\n", i); return -1; } else if(newpid == 0) { + if (cfg_child_init()) return -1; /* child - this will loop forever */ worker_loop(i); } else { @@ -327,7 +329,7 @@ static int child_init(int rank) return 0; } if(rank == PROC_TCP_MAIN) { - /* do nothing for the main process */ + /* do nothing for the tcp main process */ return 0; } diff --git a/src/modules/dmq/worker.c b/src/modules/dmq/worker.c index 43d76da309..fa4025fff2 100644 --- a/src/modules/dmq/worker.c +++ b/src/modules/dmq/worker.c @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -29,6 +29,7 @@ #include "../../core/sip_msg_clone.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" +#include "../../core/cfg/cfg_struct.h" /** * @brief set the body of a response @@ -88,6 +89,7 @@ void worker_loop(int id) } else { sleep_us(dmq_worker_usleep); } + cfg_update(); /* remove from queue until empty */ while(job_queue_size(worker->queue) > 0) {

1 0

git:master:8ced2d76: dmq: log the address of notification peer on failure callback
by Daniel-Constantin Mierla 16 Mar '21

16 Mar '21

Module: kamailio Branch: master Commit: 8ced2d76fda260f7a3a746a9d4820f84eb260618 URL: https://github.com/kamailio/kamailio/commit/8ced2d76fda260f7a3a746a9d4820f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T12:55:46+01:00 dmq: log the address of notification peer on failure callback --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/8ced2d76fda260f7a3a746a9d4820f8… Patch: https://github.com/kamailio/kamailio/commit/8ced2d76fda260f7a3a746a9d4820f8… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index 83da389269..c991acbf5f 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -600,13 +600,14 @@ int notification_resp_callback_f( } } else if(code == 408) { if(STR_EQ(node->orig_uri, dmq_notification_address)) { - LM_ERR("not deleting notification_peer\n"); - update_dmq_node_status(dmq_node_list, node, DMQ_NODE_PENDING); + LM_ERR("not deleting notification peer [%.*s]\n", + STR_FMT(&dmq_notification_address)); + update_dmq_node_status(dmq_node_list, node, DMQ_NODE_PENDING); return 0; } if (node->status == DMQ_NODE_DISABLED) { /* deleting node - the server did not respond */ - LM_ERR("deleting server %.*s because of failed request\n", + LM_ERR("deleting server node %.*s because of failed request\n", STR_FMT(&node->orig_uri)); ret = del_dmq_node(dmq_node_list, node); LM_DBG("del_dmq_node returned %d\n", ret);

1 0

git:master:9ea922d8: dmq: build node uri with transport
by Daniel-Constantin Mierla 16 Mar '21

16 Mar '21

Module: kamailio Branch: master Commit: 9ea922d82f1ab4acc3efe2f79ce9aa6a6bdab759 URL: https://github.com/kamailio/kamailio/commit/9ea922d82f1ab4acc3efe2f79ce9aa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T12:44:00+01:00 dmq: build node uri with transport --- Modified: src/modules/dmq/dmq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/9ea922d82f1ab4acc3efe2f79ce9aa6… Patch: https://github.com/kamailio/kamailio/commit/9ea922d82f1ab4acc3efe2f79ce9aa6… --- diff --git a/src/modules/dmq/dmq_funcs.c b/src/modules/dmq/dmq_funcs.c index f9fb5c78ea..af3db27d6e 100644 --- a/src/modules/dmq/dmq_funcs.c +++ b/src/modules/dmq/dmq_funcs.c @@ -74,8 +74,9 @@ void dmq_tm_callback(struct cell *t, int type, struct tmcb_params *ps) int build_uri_str(str *username, struct sip_uri *uri, str *from) { - /* sip:user@host:port */ + /* sip:user@host:port;transport=abcd */ int from_len; + str sproto = STR_NULL; if(!uri->host.s || !uri->host.len) { LM_ERR("no host in uri\n"); @@ -86,7 +87,8 @@ int build_uri_str(str *username, struct sip_uri *uri, str *from) return -1; } - from_len = username->len + uri->host.len + uri->port.len + 10; + from_len = username->len + uri->host.len + uri->port.len + 12 + + TRANSPORT_PARAM_LEN; from->s = pkg_malloc(from_len); if(from->s == NULL) { LM_ERR("no more pkg\n"); @@ -112,6 +114,21 @@ int build_uri_str(str *username, struct sip_uri *uri, str *from) memcpy(from->s + from->len, uri->port.s, uri->port.len); from->len += uri->port.len; } + + if(uri->proto!=PROTO_NONE && uri->proto!=PROTO_UDP + && uri->proto!=PROTO_OTHER) { + if(get_valid_proto_string(uri->proto, 1, 0, &sproto)<0) { + LM_WARN("unknown transport protocol - fall back to udp\n"); + sproto.s = "udp"; + sproto.len = 3; + } + memcpy(from->s + from->len, TRANSPORT_PARAM, TRANSPORT_PARAM_LEN); + from->len += TRANSPORT_PARAM_LEN; + memcpy(from->s + from->len, sproto.s, sproto.len); + from->len += sproto.len; + } + from->s[from->len] = '\0'; + return 0; }

1 0

git:master:684317aa: dmq: print protocol in the rpc output listing the nodes
by Daniel-Constantin Mierla 16 Mar '21

16 Mar '21

Module: kamailio Branch: master Commit: 684317aa54a5a3c5ddee13793551b8a6a649cd66 URL: https://github.com/kamailio/kamailio/commit/684317aa54a5a3c5ddee13793551b8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T12:04:42+01:00 dmq: print protocol in the rpc output listing the nodes --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/684317aa54a5a3c5ddee13793551b8a… Patch: https://github.com/kamailio/kamailio/commit/684317aa54a5a3c5ddee13793551b8a… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 51ea35588e..4230e48a7f 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -365,10 +365,11 @@ static void dmq_rpc_list_nodes(rpc_t *rpc, void *c) ip_addr2sbuf(&cur->ip_address, ip, IP6_MAX_STR_SIZE); if(rpc->add(c, "{", &h) < 0) goto error; - if(rpc->struct_add(h, "SSsSdd", "host", &cur->uri.host, "port", - &cur->uri.port, "resolved_ip", ip, "status", - dmq_get_status_str(cur->status), "last_notification", - cur->last_notification, "local", cur->local) + if(rpc->struct_add(h, "SSssSdd", "host", &cur->uri.host, "port", + &cur->uri.port, "proto", get_proto_name(cur->uri.proto), + "resolved_ip", ip, "status", dmq_get_status_str(cur->status), + "last_notification", cur->last_notification, + "local", cur->local) < 0) goto error; cur = cur->next;

1 0

git:master:5e3a016e: dmq: use core function to get protocol string from parsed uri
by Daniel-Constantin Mierla 16 Mar '21

16 Mar '21

Module: kamailio Branch: master Commit: 5e3a016eb3d424b39b1f811f72ba34c69f5dea28 URL: https://github.com/kamailio/kamailio/commit/5e3a016eb3d424b39b1f811f72ba34c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T11:51:48+01:00 dmq: use core function to get protocol string from parsed uri --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/5e3a016eb3d424b39b1f811f72ba34c… Patch: https://github.com/kamailio/kamailio/commit/5e3a016eb3d424b39b1f811f72ba34c… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 337d75c1b9..51ea35588e 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -136,19 +136,29 @@ struct module_exports exports = { static int make_socket_str_from_uri(struct sip_uri *uri, str *socket) { + str sproto = STR_NULL; + if(!uri->host.s || !uri->host.len) { LM_ERR("no host in uri\n"); return -1; } - socket->len = uri->host.len + uri->port.len + 6; + socket->len = uri->host.len + uri->port.len + 7 /*sctp + : + : \0*/; socket->s = pkg_malloc(socket->len); if(socket->s == NULL) { LM_ERR("no more pkg\n"); return -1; } - memcpy(socket->s, "udp:", 4); - socket->len = 4; + + if(get_valid_proto_string(uri->proto, 0, 0, &sproto)<0) { + LM_WARN("unknown transport protocol - fall back to udp\n"); + sproto.s = "udp"; + sproto.len = 3; + } + + memcpy(socket->s, sproto.s, sproto.len); + socket->s[sproto.len] = ':'; + socket->len = sproto.len + 1; memcpy(socket->s + socket->len, uri->host.s, uri->host.len); socket->len += uri->host.len;

1 0

Errored: kamailio/kamailio#9963 (master - 3b038ed)
by Travis CI 16 Mar '21

16 Mar '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9963 Status: Errored Duration: 6 mins and 30 secs Commit: 3b038ed (master) Author: Daniel-Constantin Mierla Message: mangler: 0-ending value on deconding uri View the changeset: https://github.com/kamailio/kamailio/compare/2d971f5f0577...3b038ed6761a View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/763089570?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:735911fc: siputils: 0-ending value on deconding uri
by Daniel-Constantin Mierla 16 Mar '21

16 Mar '21

Module: kamailio Branch: master Commit: 735911fcced21eb5c66393045bc143bd953d08bb URL: https://github.com/kamailio/kamailio/commit/735911fcced21eb5c66393045bc143b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T09:38:53+01:00 siputils: 0-ending value on deconding uri --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/735911fcced21eb5c66393045bc143b… Patch: https://github.com/kamailio/kamailio/commit/735911fcced21eb5c66393045bc143b… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index f21d7705b3..1964ef59ee 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -165,12 +165,14 @@ int ki_decode_contact(sip_msg_t *msg) return res; } else { /* we do not modify the original first line */ - if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) + if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) { msg->new_uri = newUri; - else { + } else { pkg_free(msg->new_uri.s); msg->new_uri = newUri; } + msg->parsed_uri_ok=0; + ruri_mark_new(); } return 1; } @@ -577,7 +579,7 @@ int decode_uri(str uri, char separator, str *result) uri.len); /* adding one comes from * */ - result->s = pkg_malloc(result->len); + result->s = pkg_malloc(result->len + 1); /* NULL termination */ if(result->s == NULL) { LM_ERR("unable to allocate pkg memory\n"); return -4; @@ -626,6 +628,7 @@ int decode_uri(str uri, char separator, str *result) memcpy(pos, uri.s + format.second, uri.len - format.second); /* till end: */ + result->s[result->len] = '\0'; LM_DBG("New decoded uri [%.*s]\n", result->len, result->s); return 0;

1 0

git:master:3b038ed6: mangler: 0-ending value on deconding uri
by Daniel-Constantin Mierla 16 Mar '21

16 Mar '21

Module: kamailio Branch: master Commit: 3b038ed6761a5818441a7610a8305491aa358377 URL: https://github.com/kamailio/kamailio/commit/3b038ed6761a5818441a7610a830549… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T09:38:53+01:00 mangler: 0-ending value on deconding uri --- Modified: src/modules/mangler/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/3b038ed6761a5818441a7610a830549… Patch: https://github.com/kamailio/kamailio/commit/3b038ed6761a5818441a7610a830549… --- diff --git a/src/modules/mangler/contact_ops.c b/src/modules/mangler/contact_ops.c index de94edb534..c3e1a2ff2e 100644 --- a/src/modules/mangler/contact_ops.c +++ b/src/modules/mangler/contact_ops.c @@ -610,28 +610,28 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) { LOG(L_ERR,"ERROR: decode_uri: Unable to decode host address \n"); return -2;/* should I quit or ignore ? */ - } + } if ((format.password.len > 0) && (format.username.len <= 0)) { LOG(L_ERR,"ERROR: decode_uri: Password decoded but no username available\n"); return -3; } - + /* a complete uri would be sip:username:password@ip:port;transport=protocol goes to * sip:enc_pref#username#password#ip#port#protocol@public_ip */ result->len = format.first + (uri->len - format.second); /* not NULL terminated */ if (format.username.len > 0) result->len += format.username.len + 1; //: or @ if (format.password.len > 0) result->len += format.password.len + 1; //@ - + /* if (format.ip.len > 0) */ result->len += format.ip.len; - + if (format.port.len > 0) result->len += 1 + format.port.len; //: if (format.protocol.len > 0) result->len += 1 + 10 + format.protocol.len; //;transport= - + /* adding one comes from * */ - result->s = pkg_malloc (result->len); + result->s = pkg_malloc (result->len + 1); /* NULL termination */ if (result->s == NULL) { LOG(L_ERR,"ERROR: decode_contact: Unable to allocate memory\n"); @@ -640,7 +640,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) pos = result->s; memcpy (pos, uri->s, format.first); /* till sip: */ pos = pos + format.first; - + if (format.username.len > 0) { memcpy (pos, format.username.s, format.username.len); @@ -662,7 +662,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.ip.s, format.ip.len); pos = pos + format.ip.len; - + if (format.port.len > 0) { memcpy (pos, ":", 1); @@ -677,9 +677,11 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.protocol.s, format.protocol.len); pos = pos + format.protocol.len; } - + memcpy (pos, uri->s + format.second, uri->len - format.second); /* till end: */ - + + result->s[result->len] = '\0'; + /* dst_uri */ if (dst_uri && format.rcv_ip.s){ dst_uri->len=4 /* sip: */ + format.rcv_ip.len;

1 0

git:master:5c69b6ab: core: renamed recent params wait_child1_* to wait_worker1_*
by Daniel-Constantin Mierla 16 Mar '21

16 Mar '21

Module: kamailio Branch: master Commit: 5c69b6ab94c3a4ebf2dcf2eb3a549fe83d7aab34 URL: https://github.com/kamailio/kamailio/commit/5c69b6ab94c3a4ebf2dcf2eb3a549fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T09:38:52+01:00 core: renamed recent params wait_child1_* to wait_worker1_* - consistent with the event route name --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/tcp_main.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/5c69b6ab94c3a4ebf2dcf2eb3a549fe… Patch: https://github.com/kamailio/kamailio/commit/5c69b6ab94c3a4ebf2dcf2eb3a549fe…

1 0

git:master:2d971f5f: pkg/kamailio/obs: packaged lrkproxy module [skip ci]
by Sergey Safarov 15 Mar '21

15 Mar '21

Module: kamailio Branch: master Commit: 2d971f5f0577255fa6192b5584a612ffe88fa347 URL: https://github.com/kamailio/kamailio/commit/2d971f5f0577255fa6192b5584a612f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-03-15T19:10:58+03:00 pkg/kamailio/obs: packaged lrkproxy module [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/2d971f5f0577255fa6192b5584a612f… Patch: https://github.com/kamailio/kamailio/commit/2d971f5f0577255fa6192b5584a612f… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 0c0170d100..29d074cac4 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1448,6 +1448,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kemix %doc %{_docdir}/kamailio/modules/README.kex +%doc %{_docdir}/kamailio/modules/README.lrkproxy %doc %{_docdir}/kamailio/modules/README.malloc_test %doc %{_docdir}/kamailio/modules/README.mangler %doc %{_docdir}/kamailio/modules/README.matrix @@ -1606,6 +1607,7 @@ fi %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kemix.so %{_libdir}/kamailio/modules/kex.so +%{_libdir}/kamailio/modules/lrkproxy.so %{_libdir}/kamailio/modules/malloc_test.so %{_libdir}/kamailio/modules/mangler.so %{_libdir}/kamailio/modules/matrix.so

1 0

Roadmap to the next major release - v5.5.0
by Daniel-Constantin Mierla 15 Mar '21

15 Mar '21

Hello, it is the time to plan a bit the road to the next major release, to be versioned 5.5.0. The 5.4.0 was release by end of July 2020, therefore we are approaching the end of our usual development cycle, also during the last online devel meeting we considered the 2nd part of spring 2021 as a target time frame for 5.5. To narrow it down, I would propose to freeze the development at the end of March 2021, test during April and maybe beginning of May, then release v5.5.0. So far we have a lot of development to existing components, by the freeze date I expect 3-5 new modules to be in the repo as well. If anyone wants a different time line towards 5.5.0, let's discuss and choose the one that suits most of the developers. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

1 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev