- sr-dev - kamailio.org

git:5.7:e202f597: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 25 Sep '23

25 Sep '23

Module: kamailio Branch: 5.7 Commit: e202f597e1725c204eb33fa7b6266d9ce934be09 URL: https://github.com/kamailio/kamailio/commit/e202f597e1725c204eb33fa7b6266d9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-25T20:02:22+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_lua/README Modified: src/modules/http_async_client/README Modified: src/modules/mohqueue/README Modified: src/modules/xhttp/README Modified: src/modules/xlog/README --- Diff: https://github.com/kamailio/kamailio/commit/e202f597e1725c204eb33fa7b6266d9… Patch: https://github.com/kamailio/kamailio/commit/e202f597e1725c204eb33fa7b6266d9… --- diff --git a/src/modules/app_lua/README b/src/modules/app_lua/README index c4697435ee0..f8891270e1a 100644 --- a/src/modules/app_lua/README +++ b/src/modules/app_lua/README @@ -149,7 +149,7 @@ Chapter 1. Admin Guide Set the path to the Lua script to be loaded at startup. Then you can use lua_run(function, params) to execute a function from the script at - runtime. + runtime. The script can be in Lua-source or bytecode. Default value is ��null��. diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index 57eff8a890f..0caa3d4631f 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -146,7 +146,8 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * libcurl libev + * libcurl - https://curl.se/libcurl/ + * libevent - https://libevent.org/ 3. Parameters diff --git a/src/modules/mohqueue/README b/src/modules/mohqueue/README index 5a0f746fac6..934b5fa145c 100644 --- a/src/modules/mohqueue/README +++ b/src/modules/mohqueue/README @@ -327,7 +327,7 @@ $var(mohq) = "operators"; volatile database in memory of call status. If the module is restarted it loses the internal database and clears the external one. - On a reqular basis it checks the external table that defines the queues + On a regular basis it checks the external table that defines the queues to see if the definition has changed. It makes this check under the following conditions: the queue has not been checked in the last 60 seconds AND no call is currently in queue or transitioning in or out. diff --git a/src/modules/xhttp/README b/src/modules/xhttp/README index 9a59c839aa1..ec009bacafb 100644 --- a/src/modules/xhttp/README +++ b/src/modules/xhttp/README @@ -83,8 +83,8 @@ Chapter 1. Admin Guide SIP parser can easily handle HTTP requests just by adding a fake Via header. - The <module>xmlrpc</module> module uses the same concept. The xHTTP - module offers a generic way of handling the HTTP protocol, by calling + The xmlrpc module uses the same concept. The xHTTP module offers a + generic way of handling the HTTP protocol, by calling event_route[xhttp:request] in your config. You can check the HTTP URL via the config variable $hu. Note that use of $ru will raise errors since the structure of an HTTP URL is not compatible with that of a SIP @@ -222,7 +222,10 @@ event_route[xhttp:request] { 6.1. xhttp:request - The event route is executed when a new HTTP request is received. + The event route is executed when a new HTTP request is received. Most + of the variables related to a SIP request can be used inside this event + route to get HTTP request attributes (e.g., $si - source IP, $hdr(X) - + body of header X, $rm - request method, $rb - request body, ...). ... tcp_accept_no_cl=yes ... diff --git a/src/modules/xlog/README b/src/modules/xlog/README index 6606c5d9ea1..b21766a6d95 100644 --- a/src/modules/xlog/README +++ b/src/modules/xlog/README @@ -266,7 +266,7 @@ kamcmd cfg.set_now_int xlog methods_filter 15 Example 1.8. Set methods_filter parameter ... -modparam("xlog", "long_format", 1) +modparam("xlog", "methods_filter", 15) ... 5. Functions

1 0

git: new commits in branch 5.7
by Daniel-Constantin Mierla 25 Sep '23

25 Sep '23

- URL: https://github.com/kamailio/kamailio/commit/e681aa8236b502de31ad6600932517a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T19:54:49+02:00 jansson: print unknown type in log message (cherry picked from commit b8cae4fbcd026ffb81e8242500212582d9672ad5) - URL: https://github.com/kamailio/kamailio/commit/80b26beb7d4f9cd4b3858e9e2dae458… Author: Norbert Kopp��ny Legyes <norbert.legyes(a)protonmail.com> Date: 2023-09-25T19:54:49+02:00 xlog: fix docs example for modparam methods_filter (cherry picked from commit b5a37683e364f596b6c5b4ebbba1fff951d7be84) - URL: https://github.com/kamailio/kamailio/commit/b59009089ad2b7cc33af27b637a8139… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2023-09-25T19:54:49+02:00 tm: remove obselete comment, add clarification for reply_wait mode 2 (cherry picked from commit 2dbaa727a38e29da0f887fa5d0d8d20392839f9b) - URL: https://github.com/kamailio/kamailio/commit/ba7b3155611fd983f7d3d244e7b525a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T19:54:49+02:00 kex: safety checks when iterating stats list - GH #3186 (cherry picked from commit 883f6b77211a76b35a9df570a8ddbbc344b05472) - URL: https://github.com/kamailio/kamailio/commit/1b42a7036714a0e50bc61bd9e0619f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T19:54:49+02:00 registrar: increase max size for user and domain building aor - renamed max aor lenght define to match the user and domain style (cherry picked from commit b1356efd61e56eaa3426d8e2e813ea6730b4f2c9) - URL: https://github.com/kamailio/kamailio/commit/3e197c7c41c97badece29cbc6477119… Author: MVONDO Eric OBS/OINIS <bycl2332(a)orange.com> Date: 2023-09-25T19:54:49+02:00 siptrace: fix pseudo var direction attribute length (cherry picked from commit 508886c3054a8470fe4469e78e63aa37ae93922d) - URL: https://github.com/kamailio/kamailio/commit/9276342ea90acffc3d631c6175c1f70… Author: �� <git-dpa(a)aegee.org> Date: 2023-09-25T19:54:49+02:00 mohqueue: typo (cherry picked from commit 0dcaaed5148cba775cebfd88d8e4a593f8c4297d) - URL: https://github.com/kamailio/kamailio/commit/90bd4424e17bc07a9073fd50bbd6d8b… Author: �� <git-dpa(a)aegee.org> Date: 2023-09-25T19:54:49+02:00 etc/ typos (cherry picked from commit 6e9335ff2245596b74bc1c749d1e7805bf186f02) - URL: https://github.com/kamailio/kamailio/commit/5b1592900920143c9ce5c188e2835c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T19:54:49+02:00 http_async_client: docs - dependency on libevent - list style for dependencies and links to projects (cherry picked from commit f16d2658bbefb7a9f43076cbaa958fb3a27f6a0c) - URL: https://github.com/kamailio/kamailio/commit/774b464af7c561e49253066e8ce3b4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T19:54:49+02:00 xhttp: note about available variables during http request processing (cherry picked from commit 170067e633ef32ea7b17adad46fdfe2c85fadda0) - URL: https://github.com/kamailio/kamailio/commit/516894e37e53bf17d29a4c95add29df… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2023-09-25T19:54:49+02:00 ims_ipsec_pcscf: typo in spi_add function definition, GH #3513 - fix typo in spi_add function definition - patch from jbipre2, GH #3513 (cherry picked from commit a053bcc391f0680ecd5f458d2512e57f69499d39) - URL: https://github.com/kamailio/kamailio/commit/34a2d87479d1bcc37d74f3d8fcb4186… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2023-09-25T19:54:49+02:00 core: cfg.y typo in parsing XAVPVIAFIELDS In the XAVPVIAFIELDS block there is the string written to the wrong variable. The string is stored in _ksr_xavp_via_params.s but the lenght is stored in _ksr_xavp_via_fields.len. This breaks XAVPVIAPARAMS and XAVPVIAFIELDS. (cherry picked from commit 722a79a9ba8ca2608e699ec14684ce004ae10d60) - URL: https://github.com/kamailio/kamailio/commit/3a217af6b9229989b3c7a788a01609e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T19:54:49+02:00 rabbitmq: proper check for allocated pointer (cherry picked from commit 4d58141ab84cf248e8c44a96181642ad0f187e80) - URL: https://github.com/kamailio/kamailio/commit/fac1995c8730a83c24036c9d01d52b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T19:54:49+02:00 db_redis: free db_keys in case of failure - backport of 027c2b30b39a7596c8630c06995ddc49bb42d789 - URL: https://github.com/kamailio/kamailio/commit/34885ab83c0c259376ffda04b41253e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T19:54:49+02:00 pv_headers: compare result of pvh_set_xavi() with NULL for error cases - the function returns a pointer (cherry picked from commit 5633026f90e46f7d6da8c1a658d425e8926f6949) - URL: https://github.com/kamailio/kamailio/commit/35f0efadeceaecc8e3315f4682d9ac4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T19:54:49+02:00 msilo: cast to fix storage size warning (cherry picked from commit c11fcbbe9ed19bc54b800100d15d9ae269735f0c) - URL: https://github.com/kamailio/kamailio/commit/59d0ebe41017c2270b62f6171285bae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T19:54:49+02:00 core: parser - set via->params.len when body is finished (cherry picked from commit 82b0f273e1cf65051b6c50301c5073dce56c1149) - URL: https://github.com/kamailio/kamailio/commit/9be895a16c91bcf4eb299ce0ffb1462… Author: �� <git-dpa(a)aegee.org> Date: 2023-09-25T19:54:49+02:00 [app_lua] clarify the file scripts can be in source or bytecode (cherry picked from commit a8747aa02ff3fbffd7a63bdc1e5c06188472edfa) - URL: https://github.com/kamailio/kamailio/commit/1f27bdfc5cc25b9d2f06204169131d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T19:54:49+02:00 Revert "pv_headers: compare result of pvh_set_xavi() with NULL for error cases" This reverts commit 3bb59945d59ae438897a8f797dc2f06489728459.

1 0

git:master:46430b6e: pkg/kamailio: updated pcre2 deps [skip ci]
by Sergey Safarov 25 Sep '23

25 Sep '23

Module: kamailio Branch: master Commit: 46430b6e91bd1fbeae9040e80e078380967e0d68 URL: https://github.com/kamailio/kamailio/commit/46430b6e91bd1fbeae9040e80e07838… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-09-25T20:24:11+03:00 pkg/kamailio: updated pcre2 deps [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/46430b6e91bd1fbeae9040e80e07838… Patch: https://github.com/kamailio/kamailio/commit/46430b6e91bd1fbeae9040e80e07838… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 01265299cf3..2d01160530c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -458,8 +458,8 @@ This module provides various cryptography tools for use in Kamailio configuratio %package dialplan Summary: String translations based on rules for Kamailio Group: %{PKGGROUP} -Requires: pcre, kamailio = %ver -BuildRequires: pcre-devel +Requires: pcre2, kamailio = %ver +BuildRequires: pcre2-devel %description dialplan String translations based on rules for Kamailio. @@ -647,8 +647,8 @@ Kazoo module for Kamailio. %package lcr Summary: Least cost routing for Kamailio Group: %{PKGGROUP} -Requires: pcre, kamailio = %ver -BuildRequires: pcre-devel +Requires: pcre2, kamailio = %ver +BuildRequires: pcre2-devel %description lcr Least cost routing for Kamailio. @@ -903,8 +903,8 @@ Redis configuration file support for Kamailio. %package regex Summary: PCRE mtaching operations for Kamailio Group: %{PKGGROUP} -Requires: pcre, kamailio = %ver -BuildRequires: pcre-devel +Requires: pcre2, kamailio = %ver +BuildRequires: pcre2-devel %description regex PCRE mtaching operations for Kamailio.

1 0

[kamailio/kamailio] core: fixed wrong network interface selection. (PR #3490)
by Ivanuschak Nikolay 25 Sep '23

25 Sep '23

fixed incorrect source IP address selection for the SIP messages sending procedure when TCP transport is used or for UDP with the 'mhomed' setting set as 'mhomed=1'.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [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 - [x] Related to issue #3486(replace XXXX with an open issue number) #### Description  The current service behavior is as follows: if OS contains several network interfaces and the service has a listening TCP socket (or UDP with 'mhomed=1' setting) on the second (third, fourth and so on) interface, then the outbound SIP messages will be always sent from the first (default) interface. These changes make the outbound SIP messages always going through the network_interface/address, which is taken for listening by service. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3490 -- Commit Summary -- * core: fixed wrong network interface selection. -- File Changes -- M src/core/forward.c (7) M src/core/udp_server.c (37) M src/core/udp_server.h (6) M src/main.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3490.patch https://github.com/kamailio/kamailio/pull/3490.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3490 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3490(a)github.com>

3 18

git:master:d4e16520: core: fixed wrong network interface selection.
by Daniel-Constantin Mierla 25 Sep '23

25 Sep '23

Module: kamailio Branch: master Commit: d4e16520a06344ce2bfd07eda4447d68a2c3fce8 URL: https://github.com/kamailio/kamailio/commit/d4e16520a06344ce2bfd07eda4447d6… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T17:04:09+02:00 core: fixed wrong network interface selection. fixed incorrect source IP address selection for the SIP messages sending procedure when TCP transport is used or for UDP with the 'mhomed' setting set as 'mhomed=1'. --- Modified: src/core/forward.c Modified: src/core/socket_info.c Modified: src/core/socket_info.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/d4e16520a06344ce2bfd07eda4447d6… Patch: https://github.com/kamailio/kamailio/commit/d4e16520a06344ce2bfd07eda4447d6…

1 0

git:master:1e52a51a: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 25 Sep '23

25 Sep '23

Module: kamailio Branch: master Commit: 1e52a51a517a08ade0d554544bda2521535e4f98 URL: https://github.com/kamailio/kamailio/commit/1e52a51a517a08ade0d554544bda252… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-25T17:01:36+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/1e52a51a517a08ade0d554544bda252… Patch: https://github.com/kamailio/kamailio/commit/1e52a51a517a08ade0d554544bda252… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index ff0686ef14c..4520bce8333 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -19,7 +19,13 @@ Ovidiu Sas <osas(a)voipembedded.com> +Tyler Moore + + <tmoore(a)dopensource.com> + Copyright �� 2008-2011 http://www.asipto.com + + Copyright �� 2023 Tyler Moore (devopsec), dOpenSource __________________________________________________________________ Table of Contents @@ -514,6 +520,35 @@ $ kamcmd htable.dump htable nodes (htable peers). Please note, module parameter ��enable_dmq�� must also be set in order for this to apply (see below). Default is 0 (no replication). + * coldelim - the character delimeter to use when packing the htable. + When set, this parameter changes the column delimeter between + columns in a multiple column hash table. This can be useful when + loading JSON data types into a hash table as they conflict with the + default ��,�� delimeter, allowing these values to be parsed in the + routing config. See the example below on parsing a JSON array from + an htable with ��;�� as the column delimeter. +... +modparam("htable", "htable", "customer=>size=8;dbtable=customer;cols='dids,descr +iption';coldelim=';'") +... +$avp(customer) = $sht(customer=>1); +$var(customer_dids) = $(avp(customer){s.select,0,;}); +$var(customer_desc) = $(avp(customer){s.select,1,;}); +... + * colnull - the character to use when packing a NULL value into the + htable from the database. This parameter can be set to the empty + string or a single character. This can be used to simplify checking + a single column in a row for emptiness, in the routing config. The + example below shows how one would do that. +... +modparam("htable", "htable", "customer=>size=8;dbtable=customer;cols='name,descr +iption';colnull=''") +... +$avp(customer) = $sht(customer=>1); +$var(customer_name) = $(avp(customer){s.select,0,;}); +if (!strempty($var(customer_name))) { +... +} Default value is NULL. diff --git a/src/modules/tls/README b/src/modules/tls/README index f721ba81d61..7ae3945db77 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -295,10 +295,6 @@ request_route { options, run kamailio -V and look for USE_TLS and TLS_HOOKS among the flags. - For OpenSSL (libssl) v1.1.x, it is required to preload - 'openssl_mutex_shared' library shipped by Kamailio. For more details - see 'src/modules/tls/utils/openssl_mutex_shared/README.md'. - This module includes several workarounds for various Openssl bugs (like compression and Kerberos using the wrong memory allocations functions, low memory problems a.s.o). On startup it will try to enable the needed

1 0

[kamailio/kamailio] tls: remove openssl_mutex_shared (PR #3519)
by Дилян Палаузов 25 Sep '23

25 Sep '23

The code from src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c is in src/main.c . You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3519 -- Commit Summary -- * tls: remove openssl_mutex_shared -- File Changes -- M pkg/kamailio/obs/kamailio.spec (2) M src/modules/tls/Makefile (2) M src/modules/tls/doc/tls.xml (5) D src/modules/tls/utils/openssl_mutex_shared/Makefile (26) D src/modules/tls/utils/openssl_mutex_shared/README.md (63) D src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c (49) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3519.patch https://github.com/kamailio/kamailio/pull/3519.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3519 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3519(a)github.com>

2 1

git:master:b6e600d3: tls: remove openssl_mutex_shared
by Daniel-Constantin Mierla 25 Sep '23

25 Sep '23

Module: kamailio Branch: master Commit: b6e600d3865a287f3c677191c8067bc1c57294ba URL: https://github.com/kamailio/kamailio/commit/b6e600d3865a287f3c677191c8067bc… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T16:52:34+02:00 tls: remove openssl_mutex_shared The code from src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c is in src/main.c . --- Modified: pkg/kamailio/obs/kamailio.spec Modified: src/modules/tls/Makefile Modified: src/modules/tls/doc/tls.xml Removed: src/modules/tls/utils/openssl_mutex_shared/Makefile Removed: src/modules/tls/utils/openssl_mutex_shared/README.md Removed: src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c --- Diff: https://github.com/kamailio/kamailio/commit/b6e600d3865a287f3c677191c8067bc… Patch: https://github.com/kamailio/kamailio/commit/b6e600d3865a287f3c677191c8067bc…

1 0

git:master:9c28f607: htable add column packing features
by Daniel-Constantin Mierla 25 Sep '23

25 Sep '23

Module: kamailio Branch: master Commit: 9c28f6077ff5fc834394af1c571bd3d909290d73 URL: https://github.com/kamailio/kamailio/commit/9c28f6077ff5fc834394af1c571bd3d… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T16:49:27+02:00 htable add column packing features - add support for changing the column delimeter in a hash table - add support for changing the column null character --- Modified: src/modules/htable/doc/htable.xml Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/9c28f6077ff5fc834394af1c571bd3d… Patch: https://github.com/kamailio/kamailio/commit/9c28f6077ff5fc834394af1c571bd3d…

1 0

[kamailio/kamailio] htable add column packing features (PR #3573)
by Tyler Moore 25 Sep '23

25 Sep '23

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description - add support for changing the column delimeter in a hash table - add support for changing the column null character You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3573 -- Commit Summary -- * htable add column packing features -- File Changes -- M src/modules/htable/doc/htable.xml (9) M src/modules/htable/doc/htable_admin.xml (37) M src/modules/htable/ht_api.c (31) M src/modules/htable/ht_api.h (2) M src/modules/htable/ht_db.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3573.patch https://github.com/kamailio/kamailio/pull/3573.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3573 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3573(a)github.com>

2 2

[kamailio/kamailio] New record-route is not updating when the device network is broken/power-off & on (sca_subscribe.c). (PR #3569)
by schiramchetty 25 Sep '23

25 Sep '23

After initial subscription by the SCA device, if we power off and on again, we won't get an unsubscribe notification and we are getting a new record-route with sca-subscription. In this case kamailio not updating the new record-route for the SCA Device.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ *] Commits are split per component (core, individual modules, libs, utils, ...) - [ *] Each component has a single commit (if not, squash them into one commit) - [ *] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [* ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ *] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When we initially subscribe to the SCA (Shared call appearance) device, we receive a new subscription notification. However, if we subsequently power off and then power on the SCA device, we will no longer receive an unsubscribe notification; instead, we are receiving a new subscription notification with a new record-route. In this scenario, kamailio is not updating the new record-route and sca notification is working after the device is powered on. In two different scenario this issue is occuring(1.Device power off & on 2. Device network broken). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3569 -- Commit Summary -- * Update sca_subscribe.c -- File Changes -- M src/modules/sca/sca_subscribe.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3569.patch https://github.com/kamailio/kamailio/pull/3569.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3569 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3569(a)github.com>

3 11

[kamailio/kamailio] cdr_json_pre_encoded_prefix (string) wrong discribe (Issue #3584)
by olegans1972 25 Sep '23

25 Sep '23

I try to do modparam("acc_json", "cdr_extra", "spx_resp=$avp(spx_resp)") modparam("acc_json", "cdr_json_pre_encoded_prefix", "spx_resp") do restart and get next mistakes: modparam("acc_json", "cdr_extra", "spx_resp=$avp(spx_resp)") modparam("acc_json", "cdr_json_pre_encoded_prefix", "spx_resp") do restart and get next mistakes: sep 22 14:17:15 vms-vms-spx-1 kamailio[581922]:  ### Troubleshooting it's a bug at the documentation or in the code I see next: https://www.kamailio.org/docs/modules/devel/modules/acc_json.html#acc.p.cdr… But in the code I see a litle bit another https://github.com/kamailio/kamailio/blob/5.5/src/modules/acc_json/acc_json… Please fix it either in the code or documentation Now it works like this: modparam("acc_json", "cdr_extra", "spx_resp=$avp(spx_resp)") modparam("acc_json", "cdr_pre_encoded_prefix", "spx_resp") #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3584 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3584(a)github.com>

2 2

git:master:212fb408: avp: typo assing â assign
by Daniel-Constantin Mierla 25 Sep '23

25 Sep '23

Module: kamailio Branch: master Commit: 212fb4086a1bba6779178465a85593e537a12903 URL: https://github.com/kamailio/kamailio/commit/212fb4086a1bba6779178465a85593e… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T11:41:31+02:00 avp: typo assing �� assign --- Modified: src/modules/avp/avp.xml --- Diff: https://github.com/kamailio/kamailio/commit/212fb4086a1bba6779178465a85593e… Patch: https://github.com/kamailio/kamailio/commit/212fb4086a1bba6779178465a85593e… --- diff --git a/src/modules/avp/avp.xml b/src/modules/avp/avp.xml index 3fbbc32c4cb..8fcfda6f719 100644 --- a/src/modules/avp/avp.xml +++ b/src/modules/avp/avp.xml @@ -379,7 +379,7 @@ </para> <para> Like <serdoc:func>set_sattr</serdoc:func>, it is identical to - assinging a string using the assignment operator and is + assigning a string using the assignment operator and is deprecated. </para> </refsect2> @@ -399,7 +399,7 @@ If the attribute does not yet exist, it is created. </para> <para> - This function is identical to assinging an integer using the + This function is identical to assigning an integer using the assignment operator and is only kept to retain compatibility with earlier versions of SER. It therefore is deprecated and may be removed in the future. @@ -421,7 +421,7 @@ attribute does not yet exist, it is created. </para> <para> - This function is identical to assinging a string using the + This function is identical to assigning a string using the assignment operator and is only kept to retain compatibility with earlier versions of SER. It therefore is deprecated and may be removed in the future.

1 0

[kamailio/kamailio] avp: typo assing → assign (PR #3576)
by Дилян Палаузов 25 Sep '23

25 Sep '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3576 -- Commit Summary -- * avp: typo assing → assign -- File Changes -- M src/modules/avp/avp.xml (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3576.patch https://github.com/kamailio/kamailio/pull/3576.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3576 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3576(a)github.com>

2 1

git:master:f8effe32: modules: readme files regenerated - acc_json ... [skip ci]
by Kamailio Dev 25 Sep '23

25 Sep '23

Module: kamailio Branch: master Commit: f8effe32d0599645be97dbc8737051d17e00ead4 URL: https://github.com/kamailio/kamailio/commit/f8effe32d0599645be97dbc8737051d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-25T11:17:30+02:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README --- Diff: https://github.com/kamailio/kamailio/commit/f8effe32d0599645be97dbc8737051d… Patch: https://github.com/kamailio/kamailio/commit/f8effe32d0599645be97dbc8737051d… --- diff --git a/src/modules/acc_json/README b/src/modules/acc_json/README index bdcc5e689a5..6d15e77b348 100644 --- a/src/modules/acc_json/README +++ b/src/modules/acc_json/README @@ -43,7 +43,7 @@ Julien Chavanton 3.10. acc_log_level (integer) 3.11. cdr_enable (int) 3.12. cdr_extra (str) - 3.13. cdr_json_pre_encoded_prefix (string) + 3.13. cdr_pre_encoded_prefix (string) 3.14. cdr_expired_dlg_enable (str) 3.15. cdr_output_mqueue (integer) 3.16. cdr_output_syslog (integer) @@ -64,7 +64,7 @@ Julien Chavanton 1.10. acc_log_level example 1.11. cdr_enable example 1.12. cdr_extra example - 1.13. cdr_json_pre_encoded_prefix example + 1.13. cdr_pre_encoded_prefix example 1.14. cdr_expired_dlg_enable example 1.15. cdr_output_mqueue usage example 1.16. cdr_log_facility example @@ -94,7 +94,7 @@ Chapter 1. Admin Guide 3.10. acc_log_level (integer) 3.11. cdr_enable (int) 3.12. cdr_extra (str) - 3.13. cdr_json_pre_encoded_prefix (string) + 3.13. cdr_pre_encoded_prefix (string) 3.14. cdr_expired_dlg_enable (str) 3.15. cdr_output_mqueue (integer) 3.16. cdr_output_syslog (integer) @@ -144,7 +144,7 @@ Chapter 1. Admin Guide 3.10. acc_log_level (integer) 3.11. cdr_enable (int) 3.12. cdr_extra (str) - 3.13. cdr_json_pre_encoded_prefix (string) + 3.13. cdr_pre_encoded_prefix (string) 3.14. cdr_expired_dlg_enable (str) 3.15. cdr_output_mqueue (integer) 3.16. cdr_output_syslog (integer) @@ -350,17 +350,17 @@ modparam("acc_json", "cdr_enable", 1) modparam("acc_json", "cdr_extra", "ci=$dlg_var(call_id);ft=$dlg_var(from_tag)") ... -3.13. cdr_json_pre_encoded_prefix (string) +3.13. cdr_pre_encoded_prefix (string) Prefix to identify values that will be considered to be already json encoded. Default value is NULL. - Example 1.13. cdr_json_pre_encoded_prefix example + Example 1.13. cdr_pre_encoded_prefix example ... modparam("acc_json", "cdr_extra", "json_data=$avp(json_data);") -modparam("acc_json", "cdr_json_pre_encoded_prefix", "json_") +modparam("acc_json", "cdr_pre_encoded_prefix", "json_") ... $avp(json_data) = '{"b":2, "c":3}'; ...

1 0

[kamailio/kamailio] acc_json: Fix parameter name in docs (PR #3582)
by Bastian Triller 25 Sep '23

25 Sep '23

#### 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 - [ ] 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/3582 -- Commit Summary -- * acc_json: Fix parameter name in docs -- File Changes -- M src/modules/acc_json/doc/acc_json_admin.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3582.patch https://github.com/kamailio/kamailio/pull/3582.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3582 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3582(a)github.com>

2 2

git:master:bb33187a: acc_json: Fix parameter name in docs
by Daniel-Constantin Mierla 25 Sep '23

25 Sep '23

Module: kamailio Branch: master Commit: bb33187a0365825db5fde065599538bf5216f45f URL: https://github.com/kamailio/kamailio/commit/bb33187a0365825db5fde065599538b… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-25T11:07:17+02:00 acc_json: Fix parameter name in docs --- Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bb33187a0365825db5fde065599538b… Patch: https://github.com/kamailio/kamailio/commit/bb33187a0365825db5fde065599538b… --- diff --git a/src/modules/acc_json/doc/acc_json_admin.xml b/src/modules/acc_json/doc/acc_json_admin.xml index 99f2b2cf0d1..25206dea32a 100644 --- a/src/modules/acc_json/doc/acc_json_admin.xml +++ b/src/modules/acc_json/doc/acc_json_admin.xml @@ -366,8 +366,8 @@ modparam("acc_json", "cdr_extra", "ci=$dlg_var(call_id);ft=$dlg_var(from_tag)") </example> </section> - <section id="acc.p.cdr_json_pre_encoded_prefix"> - <title><varname>cdr_json_pre_encoded_prefix</varname> (string)</title> + <section id="acc.p.cdr_pre_encoded_prefix"> + <title><varname>cdr_pre_encoded_prefix</varname> (string)</title> <para> Prefix to identify values that will be considered to be already json encoded. </para> @@ -375,11 +375,11 @@ modparam("acc_json", "cdr_extra", "ci=$dlg_var(call_id);ft=$dlg_var(from_tag)") Default value is NULL. </para> <example> - <title>cdr_json_pre_encoded_prefix example</title> + <title>cdr_pre_encoded_prefix example</title> <programlisting format="linespecific"> ... modparam("acc_json", "cdr_extra", "json_data=$avp(json_data);") -modparam("acc_json", "cdr_json_pre_encoded_prefix", "json_") +modparam("acc_json", "cdr_pre_encoded_prefix", "json_") ... $avp(json_data) = '{"b":2, "c":3}'; ...

1 0

SIP to websocket routing problems
by Centelles Martin, Joel 22 Sep '23

22 Sep '23

Hello everybody, we've a kamailio setup as a SIP proxy/SBC that we use to route incoming request into our system . We also need to support web browser clients, so, we properly enabled and configured the websocket module according to its module's documentation: https://www.kamailio.org/docs/modules/devel/modules/websocket.html#idm37 This solution is working fine for both TLS SIP clients and incoming websocket INVITEs but, when we try to route a SIP call from a SIP client to a registered websocket client, our SBC is unable to find the proper socket connection even if the proper IP, port and transport is received in the Request-URI or the Route header: Received request URI looks like: * INVITE sip:b80snduq@185.41.96.32:54510;transport=wss SIP/2.0 while the Route header looks like: * Route: <sip:10.122.144.132:5061;transport=tls;lr;received=sip:185.41.96.32:54510%3Btransport%3Dws> My only guess is that the transport parameter, for some reason, is not being properly parsed but I've been debugging core/forward.c with no luck as it seems that the request is not even being forwarded. Any suggestion about what code I should look into? Is the destination IP, port and protocol usually set in the core parsing or might this be a nathelper module error? Thank you very much in advance for your help. BR, Joel.

1 0

git:master:90cb4c8a: app_python: use global parameter for request route callback
by Daniel-Constantin Mierla 22 Sep '23

22 Sep '23

Module: kamailio Branch: master Commit: 90cb4c8a3376b967960a2185b3acc669734f5e33 URL: https://github.com/kamailio/kamailio/commit/90cb4c8a3376b967960a2185b3acc66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-22T14:11:04+02:00 app_python: use global parameter for request route callback --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/90cb4c8a3376b967960a2185b3acc66… Patch: https://github.com/kamailio/kamailio/commit/90cb4c8a3376b967960a2185b3acc66… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index d163a792c16..c9addc7600a 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -60,7 +60,7 @@ int sr_kemi_config_engine_python( ret = apy_exec( msg, rname->s, (rparam && rparam->s) ? rparam->s : NULL, 0); } else { - ret = apy_exec(msg, "ksr_request_route", NULL, 1); + ret = apy_exec(msg, kemi_request_route_callback.s, NULL, 1); } } else if(rtype == CORE_ONREPLY_ROUTE) { if(kemi_reply_route_callback.len > 0) {

1 0

Change in mailing list configuration related to DMARC spam filtering
by Henning Westerholt 22 Sep '23

22 Sep '23

Hello, due to some changes from certain cloud infrastructure provider related to spam filtering with DMARC, we need to change the list manager "mailman" configuration for the following lists: * sr-users * sr-user-es * sr-dev * business * sr-docs * kamailio-announce * the administrative mailing list The change will impact the "From" that is displayed in your email program. Without that change large e-mail providers (Gmail, Microsoft O365) will reject messages from a sender with certain strict DMARC policy. This is already affecting several people on the lists (for example with GitHub notice mails), but over time the problem will certainly increase. Regarding the technical change: We will munge the From: header so it doesn't contain the domain that triggers the DMARC rejection. Essentially, the Mailman list takes ownership of the message and injects its own address into the From: header. This can affect reply-to-sender, although we add the original From: address in the Reply-To: header (or sometimes the Cc: header) to reduce the impact of this. We plan to do this for all emails unconditionally, regardless of their sender DMARC policy, to have an identical behaviour for all users. Please refer to this [1] page for more details. For a general description of DMARC refer to this page [2]. This change should have not a big impact for you, but some users might need to adapt some mail filters. Therefore, we would like to gather feedback on that change from you. We expect that the most visible change is that It will be not possible anymore to just reply by e-mail to mails from GitHub and have them "automatically" added to the discussed issue. This feature was so far used rarely and only from a few people. We plan to implement this change by the end of this week, when its done it will be also shortly announced. Best regards, Henning Westerholt [1] https://wiki.list.org/DEV/DMARC [2] https://dmarc.org/overview/ -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 1

git:master:daf0d172: app_python3: use global parameter for request route callback
by Daniel-Constantin Mierla 21 Sep '23

21 Sep '23

Module: kamailio Branch: master Commit: daf0d1722e01b5d1a819a7045f8c3347a948144e URL: https://github.com/kamailio/kamailio/commit/daf0d1722e01b5d1a819a7045f8c334… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-21T15:03:52+02:00 app_python3: use global parameter for request route callback --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/daf0d1722e01b5d1a819a7045f8c334… Patch: https://github.com/kamailio/kamailio/commit/daf0d1722e01b5d1a819a7045f8c334… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index a2ca3e0693d..339d505cdda 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -63,7 +63,7 @@ int sr_kemi_config_engine_python( ret = apy_exec( msg, rname->s, (rparam && rparam->s) ? rparam->s : NULL, 0); } else { - ret = apy_exec(msg, "ksr_request_route", NULL, 1); + ret = apy_exec(msg, kemi_request_route_callback.s, NULL, 1); } } else if(rtype == CORE_ONREPLY_ROUTE) { if(kemi_reply_route_callback.len > 0) {

1 0

git:master:eb3895ad: app_python3: use PyErr_Clear() in case of errors
by Daniel-Constantin Mierla 21 Sep '23

21 Sep '23

Module: kamailio Branch: master Commit: eb3895ad2bf666f738ce94ee35ffb9cbfa62d867 URL: https://github.com/kamailio/kamailio/commit/eb3895ad2bf666f738ce94ee35ffb9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-21T15:11:34+02:00 app_python3: use PyErr_Clear() in case of errors --- Modified: src/modules/app_python3/python_exec.c --- Diff: https://github.com/kamailio/kamailio/commit/eb3895ad2bf666f738ce94ee35ffb9c… Patch: https://github.com/kamailio/kamailio/commit/eb3895ad2bf666f738ce94ee35ffb9c… --- diff --git a/src/modules/app_python3/python_exec.c b/src/modules/app_python3/python_exec.c index f57a876dcf7..beab9a978b5 100644 --- a/src/modules/app_python3/python_exec.c +++ b/src/modules/app_python3/python_exec.c @@ -71,6 +71,9 @@ int apy_exec(sip_msg_t *_msg, char *fname, char *fparam, int emode) PyGILState_STATE gstate; int locked = 0; + /* clear error state */ + PyErr_Clear(); + if(lock_try(_sr_python_reload_lock) == 0) { if(_sr_python_reload_version && *_sr_python_reload_version != _sr_python_local_version) { @@ -92,11 +95,13 @@ int apy_exec(sip_msg_t *_msg, char *fname, char *fparam, int emode) pFunc = PyObject_GetAttrString(_sr_apy_handler_obj, fname); if(pFunc == NULL || !PyCallable_Check(pFunc)) { if(emode == 1) { - LM_ERR("%s not found or is not callable\n", fname); + LM_ERR("%s not found or is not callable (%p)\n", fname, pFunc); } else { - LM_DBG("%s not found or is not callable\n", fname); + LM_DBG("%s not found or is not callable (%p)\n", fname, pFunc); + } + if(pFunc) { + Py_XDECREF(pFunc); } - Py_XDECREF(pFunc); _sr_apy_env.msg = bmsg; if(emode == 1) { goto err; @@ -161,6 +166,8 @@ int apy_exec(sip_msg_t *_msg, char *fname, char *fparam, int emode) Py_DECREF(pResult); _sr_apy_env.msg = bmsg; err: + /* clear error state */ + PyErr_Clear(); PY_GIL_RELEASE; LOCK_RELEASE; return rval;

1 0

git:master:e44f8cb0: app_python3s: use global parameter for request route callback
by Daniel-Constantin Mierla 21 Sep '23

21 Sep '23

Module: kamailio Branch: master Commit: e44f8cb0bd217cc9a9d619ae031cfeb9933fc582 URL: https://github.com/kamailio/kamailio/commit/e44f8cb0bd217cc9a9d619ae031cfeb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-21T14:59:14+02:00 app_python3s: use global parameter for request route callback --- Modified: src/modules/app_python3s/apy3s_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/e44f8cb0bd217cc9a9d619ae031cfeb… Patch: https://github.com/kamailio/kamailio/commit/e44f8cb0bd217cc9a9d619ae031cfeb… --- diff --git a/src/modules/app_python3s/apy3s_kemi.c b/src/modules/app_python3s/apy3s_kemi.c index b5041bba4ef..38c67b9e1d5 100644 --- a/src/modules/app_python3s/apy3s_kemi.c +++ b/src/modules/app_python3s/apy3s_kemi.c @@ -182,7 +182,7 @@ int sr_kemi_config_engine_python( ret = apy3s_exec_func( msg, rname->s, (rparam && rparam->s) ? rparam->s : NULL, 0); } else { - ret = apy3s_exec_func(msg, "ksr_request_route", NULL, 1); + ret = apy3s_exec_func(msg, kemi_request_route_callback.s, NULL, 1); } } else if(rtype == CORE_ONREPLY_ROUTE) { if(kemi_reply_route_callback.len > 0) {

1 0

git:master:be39bc8f: app_python3s: use PyErr_Clear() in case of errors
by Daniel-Constantin Mierla 21 Sep '23

21 Sep '23

Module: kamailio Branch: master Commit: be39bc8fd67c38f6a2b9d07047bb990a1ffacf77 URL: https://github.com/kamailio/kamailio/commit/be39bc8fd67c38f6a2b9d07047bb990… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-21T14:56:25+02:00 app_python3s: use PyErr_Clear() in case of errors --- Modified: src/modules/app_python3s/apy3s_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/be39bc8fd67c38f6a2b9d07047bb990… Patch: https://github.com/kamailio/kamailio/commit/be39bc8fd67c38f6a2b9d07047bb990… --- diff --git a/src/modules/app_python3s/apy3s_kemi.c b/src/modules/app_python3s/apy3s_kemi.c index 9130a84f9fa..b5041bba4ef 100644 --- a/src/modules/app_python3s/apy3s_kemi.c +++ b/src/modules/app_python3s/apy3s_kemi.c @@ -76,6 +76,9 @@ int apy3s_exec_func(sip_msg_t *_msg, char *fname, char *fparam, int emode) return -1; } + /* clear error state */ + PyErr_Clear(); + if(lock_try(_sr_python_reload_lock) == 0) { if(_sr_python_reload_version && *_sr_python_reload_version != _sr_python_local_version) { @@ -98,11 +101,13 @@ int apy3s_exec_func(sip_msg_t *_msg, char *fname, char *fparam, int emode) if(pFunc == NULL || !PyCallable_Check(pFunc)) { if(emode == 1) { - LM_ERR("%s not found or is not callable\n", fname); + LM_ERR("%s not found or is not callable (%p)\n", fname, pFunc); } else { - LM_DBG("%s not found or is not callable\n", fname); + LM_DBG("%s not found or is not callable (%p)\n", fname, pFunc); + } + if(pFunc) { + Py_XDECREF(pFunc); } - Py_XDECREF(pFunc); _sr_apy_env.msg = bmsg; if(emode == 1) { goto error; @@ -157,6 +162,8 @@ int apy3s_exec_func(sip_msg_t *_msg, char *fname, char *fparam, int emode) if(locked) { lock_release(_sr_python_reload_lock); } + /* clear error state */ + PyErr_Clear(); return rval; }

1 0

git:master:7e376682: app_lua: proper global parameter for request route callback function
by Daniel-Constantin Mierla 21 Sep '23

21 Sep '23

Module: kamailio Branch: master Commit: 7e37668208d49cc529bfb920db29e71343b44d8f URL: https://github.com/kamailio/kamailio/commit/7e37668208d49cc529bfb920db29e71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-21T14:40:08+02:00 app_lua: proper global parameter for request route callback function - fix of previous commit --- Modified: src/modules/app_lua/app_lua_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7e37668208d49cc529bfb920db29e71… Patch: https://github.com/kamailio/kamailio/commit/7e37668208d49cc529bfb920db29e71… --- diff --git a/src/modules/app_lua/app_lua_mod.c b/src/modules/app_lua/app_lua_mod.c index dc1b4184d3b..5a554f03aba 100644 --- a/src/modules/app_lua/app_lua_mod.c +++ b/src/modules/app_lua/app_lua_mod.c @@ -111,7 +111,7 @@ int sr_kemi_config_engine_lua( (rparam && rparam->s) ? rparam->s : NULL, NULL, NULL, 0); } else { ret = app_lua_run_ex( - msg, kemi_reply_route_callback.s, NULL, NULL, NULL, 1); + msg, kemi_request_route_callback.s, NULL, NULL, NULL, 1); } } else if(rtype == CORE_ONREPLY_ROUTE) { if(kemi_reply_route_callback.len > 0) {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev