sr-dev October 2021

sr-dev@lists.kamailio.org

19 participants
245 discussions

git:5.4:4bee0582: dlgs: proper return for tags counting
by Daniel-Constantin Mierla 14 Oct '21

14 Oct '21

Module: kamailio Branch: 5.4 Commit: 4bee05821e9a9a1c72b73da8d1aae82735802602 URL: https://github.com/kamailio/kamailio/commit/4bee05821e9a9a1c72b73da8d1aae82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-14T10:36:45+02:00 dlgs: proper return for tags counting - GH #2884 (cherry picked from commit 1f12e2a03856f9c2d12cf62c1e65e84380729a06) (cherry picked from commit b6484e4614ebc0f3fd54224ba9470d6c5b322a6f) --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4bee05821e9a9a1c72b73da8d1aae82… Patch: https://github.com/kamailio/kamailio/commit/4bee05821e9a9a1c72b73da8d1aae82… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index 503dd8c197..46de9d5c44 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -344,10 +344,7 @@ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) int ret; ret = dlgs_tags_count(msg, vtags); - if(ret<=0) { - return (ret-1); - } - return 1; + return (ret<=0)?(ret-1):ret; } /**

1 0

git:5.5:b6484e46: dlgs: proper return for tags counting
by Daniel-Constantin Mierla 14 Oct '21

14 Oct '21

Module: kamailio Branch: 5.5 Commit: b6484e4614ebc0f3fd54224ba9470d6c5b322a6f URL: https://github.com/kamailio/kamailio/commit/b6484e4614ebc0f3fd54224ba9470d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-14T10:35:32+02:00 dlgs: proper return for tags counting - GH #2884 (cherry picked from commit 1f12e2a03856f9c2d12cf62c1e65e84380729a06) --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b6484e4614ebc0f3fd54224ba9470d6… Patch: https://github.com/kamailio/kamailio/commit/b6484e4614ebc0f3fd54224ba9470d6… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index 503dd8c197..46de9d5c44 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -344,10 +344,7 @@ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) int ret; ret = dlgs_tags_count(msg, vtags); - if(ret<=0) { - return (ret-1); - } - return 1; + return (ret<=0)?(ret-1):ret; } /**

1 0

git:master:1f12e2a0: dlgs: proper return for tags counting
by Daniel-Constantin Mierla 14 Oct '21

14 Oct '21

Module: kamailio Branch: master Commit: 1f12e2a03856f9c2d12cf62c1e65e84380729a06 URL: https://github.com/kamailio/kamailio/commit/1f12e2a03856f9c2d12cf62c1e65e84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-14T10:09:32+02:00 dlgs: proper return for tags counting - GH #2884 --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1f12e2a03856f9c2d12cf62c1e65e84… Patch: https://github.com/kamailio/kamailio/commit/1f12e2a03856f9c2d12cf62c1e65e84… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index 503dd8c197..46de9d5c44 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -344,10 +344,7 @@ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) int ret; ret = dlgs_tags_count(msg, vtags); - if(ret<=0) { - return (ret-1); - } - return 1; + return (ret<=0)?(ret-1):ret; } /**

1 0

[kamailio/kamailio] dialog: fix dlg_onroute (#2878)
by Ivan Aponte 13 Oct '21

13 Oct '21

- adds a default value for when there is no call-id in the req struct. - reported in #2803   #### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2803 #### Description  In some cases the callid field of the msg structure doesn't get initialized. In the case the dlg_onroute function is called with this msg and the dialog is not found a warning message is printed using the LM_WARN macro. This logger is called with a req->callid as argument and when this is null a segmentation fault happens. I added a small default value for this case. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2878 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2878/commits/1a9c0c930c009e09853c…">dialog: fix dlg_onroute</a> -- File Changes -- M src/modules/dialog/dlg_handlers.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2878.patch https://github.com/kamailio/kamailio/pull/2878.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/2878

2 2

[kamailio/kamailio] core: fixup sip_msg_apply_changes (#2877)
by Ivan Aponte 13 Oct '21

13 Oct '21

- adds header parser to fill headers in msg structure. msg gets copied but many of the headers don't when msg_apply_changes is called. - reported in #2803   #### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2803 #### Description adds header parser to fill headers in msg structure. msg gets copied but many of the headers don't get filled when msg_apply_changes is called. This can cause segmentation fault by calling null pointers. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2877 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2877/commits/a3a351c8b76abdd3da73…">core: fixup sip_msg_apply_changes</a> -- File Changes -- M src/core/msg_translator.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2877.patch https://github.com/kamailio/kamailio/pull/2877.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/2877

2 2

git:master:d5c1b469: core: parse main headers after updating msg buffer
by Daniel-Constantin Mierla 13 Oct '21

13 Oct '21

Module: kamailio Branch: master Commit: d5c1b4693b6e47b4123b5f9417b5fd88d4dafd1f URL: https://github.com/kamailio/kamailio/commit/d5c1b4693b6e47b4123b5f9417b5fd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-13T19:16:06+02:00 core: parse main headers after updating msg buffer - same group of headers as for the case of receiving the message - applies for msg_apply_changes() as well - related to GH #2877 --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/d5c1b4693b6e47b4123b5f9417b5fd8… Patch: https://github.com/kamailio/kamailio/commit/d5c1b4693b6e47b4123b5f9417b5fd8… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 9fd5635655..bc1b9736df 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3328,7 +3328,13 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) * valid/safe for config */ return 0; } - + if(parse_headers(msg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F, 0) < 0) { + LM_ERR("parsing main headers of new sip message failed [[%.*s]]\n", + msg->len, msg->buf); + /* exit config execution - sip_msg_t structure is no longer + * valid/safe for config */ + return 0; + } return 1; }

1 0

git:master:f7965fc5: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 12 Oct '21

12 Oct '21

Module: kamailio Branch: master Commit: f7965fc52f0c9b65b78004ee68b9a9b5e6222a98 URL: https://github.com/kamailio/kamailio/commit/f7965fc52f0c9b65b78004ee68b9a9b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-12T22:31:16+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/f7965fc52f0c9b65b78004ee68b9a9b… Patch: https://github.com/kamailio/kamailio/commit/f7965fc52f0c9b65b78004ee68b9a9b…

1 0

git:master:7f6248d1: htable: docs for iterator sets and seti functions
by Daniel-Constantin Mierla 12 Oct '21

12 Oct '21

Module: kamailio Branch: master Commit: 7f6248d15e8830d80cc7a898ee53754be2dc76be URL: https://github.com/kamailio/kamailio/commit/7f6248d15e8830d80cc7a898ee53754… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-12T22:19:37+02:00 htable: docs for iterator sets and seti functions --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7f6248d15e8830d80cc7a898ee53754… Patch: https://github.com/kamailio/kamailio/commit/7f6248d15e8830d80cc7a898ee53754… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 6793bff435..dca7cd279a 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1116,6 +1116,56 @@ sht_iterator_end("i1"); } sht_iterator_end("i1"); ... +</programlisting> + </example> + </section> + <section id="htable.f.sht_iterator_sets"> + <title> + <function moreinfo="none">sht_iterator_sets(iname, sval)</function> + </title> + <para> + Set the value of the current item to the string in the sval. + </para> + <para> + The parameters can be dynamic strings with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_iterator_sets</function> usage</title> + <programlisting format="linespecific"> +... + sht_iterator_start("i1", "h1"); + sht_iterator_next("i1"); + sht_iterator_sets("i1", "$ci"); + sht_iterator_end("i1"); +... +</programlisting> + </example> + </section> + <section id="htable.f.sht_iterator_seti"> + <title> + <function moreinfo="none">sht_iterator_seti(iname, ival)</function> + </title> + <para> + Set the value of the current item to the integer in the ival. + </para> + <para> + The parameters can be dynamic strings or integers with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_iterator_seti</function> usage</title> + <programlisting format="linespecific"> +... + sht_iterator_start("i1", "h1"); + sht_iterator_next("i1"); + sht_iterator_seti("i1", "20"); + sht_iterator_end("i1"); +... </programlisting> </example> </section>

1 0

git:master:f971ec45: htable: iterator functions to set the value of current item
by Daniel-Constantin Mierla 12 Oct '21

12 Oct '21

Module: kamailio Branch: master Commit: f971ec451f58e2a50dbe51de7fc8c5a9f65344fa URL: https://github.com/kamailio/kamailio/commit/f971ec451f58e2a50dbe51de7fc8c5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-12T14:17:17+02:00 htable: iterator functions to set the value of current item --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/f971ec451f58e2a50dbe51de7fc8c5a… Patch: https://github.com/kamailio/kamailio/commit/f971ec451f58e2a50dbe51de7fc8c5a…

1 0

[kamailio/kamailio] $msrp(srcaddr) hardcoded urls (#2881)
by sergey-safarov 11 Oct '21

11 Oct '21

### Description In my config used `msrp` and `tls` modules. When MSRP client is connected using TCP socket (not TLS), then `$msrp(srcaddr)` always returns "msrps" URL. When used TCP socket, then must be returned "msrp" URL. And no matter TLS module is loaded or not. [Relevant code](https://github.com/kamailio/kamailio/blob/d737c876cc36b4de802da77dfcd… -- 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/2881

1 4

← Newer
1
...
18
19
20
21
22
23
24
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2021