February 2024 - sr-dev - kamailio.org

git:master:ce437384: core: helper fixup functions for (str, str, int) parameters
by Daniel-Constantin Mierla 10 Feb '24

10 Feb '24

Module: kamailio Branch: master Commit: ce437384ce13bb78b01d3d18f9ddfdd6b8e37fa5 URL: https://github.com/kamailio/kamailio/commit/ce437384ce13bb78b01d3d18f9ddfdd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-10T22:28:26+01:00 core: helper fixup functions for (str, str, int) parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/ce437384ce13bb78b01d3d18f9ddfdd… Patch: https://github.com/kamailio/kamailio/commit/ce437384ce13bb78b01d3d18f9ddfdd… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index ecd870c0ca5..10be560982f 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -843,6 +843,38 @@ int fixup_free_ssi(void **param, int param_no) } } +/** + * + */ +int fixup_sii(void **param, int param_no) +{ + switch(param_no) { + case 1: + return fixup_spve_null(param, 1); + case 2: + case 3: + return fixup_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_sii(void **param, int param_no) +{ + switch(param_no) { + case 1: + return fixup_free_spve_null(param, 1); + case 2: + case 3: + return fixup_free_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index a76d64f0ce7..3143f060426 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -168,6 +168,9 @@ int fixup_free_igp_regexp(void **param, int param_no); int fixup_ssi(void **param, int param_no); int fixup_free_ssi(void **param, int param_no); +int fixup_sii(void **param, int param_no); +int fixup_free_sii(void **param, int param_no); + int fixup_sssi(void **param, int param_no); int fixup_free_sssi(void **param, int param_no);

1 0

[kamailio/kamailio] [pua] reginfo_increase_version does nothing (Issue #3234)
by Matteo 09 Feb '24

09 Feb '24

### Description The reginfo notifications sent via pua_reginfo + presence_reginfo contains the version fixed to `0`. The pua docs report the param `reginfo_increase_version` which should increase the version if enabled, but currently does nothing. Looking into the code seems to confirm that, param is read from `pua` module but is not used anywhere. While the param `dlginfo_increase_version` seems to be used for the intended scope. #### Reproduction Setup pua + pua_reginfo to publish registration informations and observe that version param of reginfo is always 0, not respecting pua `reginfo_increase_version` setting. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.1 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 9.4.0 ``` * **Operating System**: ``` Linux Debian bullseye/sid ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3234 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3234(a)github.com>

4 10

[kamailio/kamailio] file_out: Add support for extensions and interval per file. (PR #3750)
by Xenofon Karamanos 09 Feb '24

09 Feb '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR updates `file_out` module to support the definition of extension and interval on a per-file basis. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3750 -- Commit Summary -- * file_out: Add support for multiple files, extensions and interval * file_out: Update docs -- File Changes -- M src/modules/file_out/doc/file_out_admin.xml (117) M src/modules/file_out/file_out.c (164) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3750.patch https://github.com/kamailio/kamailio/pull/3750.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3750 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3750(a)github.com>

2 3

git:master:44fcca35: file_out: Update docs
by Xenofon Karamanos 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: 44fcca3596438841c0752d39dedfbe7de07a30c5 URL: https://github.com/kamailio/kamailio/commit/44fcca3596438841c0752d39dedfbe7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-02-09T16:20:08+02:00 file_out: Update docs --- Modified: src/modules/file_out/doc/file_out_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/44fcca3596438841c0752d39dedfbe7… Patch: https://github.com/kamailio/kamailio/commit/44fcca3596438841c0752d39dedfbe7…

1 0

git:master:62e3069f: file_out: Add support for multiple files, extensions and interval
by Xenofon Karamanos 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: 62e3069f484ea28745bce93dd5e1e7634c336f6b URL: https://github.com/kamailio/kamailio/commit/62e3069f484ea28745bce93dd5e1e76… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-02-09T16:20:08+02:00 file_out: Add support for multiple files, extensions and interval --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/62e3069f484ea28745bce93dd5e1e76… Patch: https://github.com/kamailio/kamailio/commit/62e3069f484ea28745bce93dd5e1e76…

1 0

git:master:ba921b21: core/rthread.h: add prototype for db queries
by S-P Chan 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: ba921b2112e87625fba5789d1b049161bb611073 URL: https://github.com/kamailio/kamailio/commit/ba921b2112e87625fba5789d1b04916… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-06T10:17:53+08:00 core/rthread.h: add prototype for db queries --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/ba921b2112e87625fba5789d1b04916… Patch: https://github.com/kamailio/kamailio/commit/ba921b2112e87625fba5789d1b04916… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index a5ad7670dae..a416ad2ca50 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -98,3 +98,60 @@ static void run_threadV(_thread_protoV fn) pthread_join(tid, NULL); } #endif + +/* + * prototype: int fn(void *, void *) { ... } + */ +#ifdef KSR_RTHREAD_NEED_4PP +typedef int (*_thread_proto4PP)(void *, void *); +struct _thread_args4PP +{ + _thread_proto4PP fn; + void *arg1; + void *arg2; + int *ret; +}; +static void *run_thread_wrap4PP(struct _thread_args4PP *args) +{ + *args->ret = (*args->fn)(args->arg1, args->arg2); + return NULL; +} + +static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2) +{ + pthread_t tid; + int ret; + + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4PP, + &(struct _thread_args4PP){fn, arg1, arg2, &ret}); + pthread_join(tid, NULL); + + return ret; +} +#endif + +/* + * prototype: void fn(void *) { ... } + */ +#ifdef KSR_RTHREAD_NEED_0P +typedef void (*_thread_proto0P)(void *); +struct _thread_args0P +{ + _thread_proto0P fn; + void *arg1; +}; +static void *run_thread_wrap0P(struct _thread_args0P *args) +{ + (*args->fn)(args->arg1); + return NULL; +} + +static void run_thread0P(_thread_proto0P fn, void *arg1) +{ + pthread_t tid; + + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap0P, + &(struct _thread_args0P){fn, arg1}); + pthread_join(tid, NULL); +} +#endif

4 6

[kamailio/kamailio] DRAFT: new global config var to constrain thread wrapping (PR #3745)
by space88man 09 Feb '24

09 Feb '24

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Add global config var ``` enable_tls_thread=1 #0 | 1 | 2 ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3745 -- Commit Summary -- * step-1 * step-2 * step-3 -- File Changes -- M src/core/cfg.lex (2) M src/core/cfg.y (5) M src/core/globals.h (1) M src/core/rthreads.h (19) M src/main.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3745.patch https://github.com/kamailio/kamailio/pull/3745.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3745 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3745(a)github.com>

3 6

[kamailio/kamailio] tools/kemi: update kemi_mock for python (PR #3751)
by tsearle 09 Feb '24

09 Feb '24

fixes code generation when python keywords are used fixes formating issues of generated code fixes crash from pv.setl reporting parameters as null instead of 'none' made example more complete   #### 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 - [ ] 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/3751 -- Commit Summary -- * tools/kemi: update kemi_mock for python -- File Changes -- M misc/tools/kemi/python_mock/kemi_mock.py (51) M misc/tools/kemi/python_mock/test.py (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3751.patch https://github.com/kamailio/kamailio/pull/3751.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3751 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3751(a)github.com>

2 2

git:master:3e1a7bb5: tools/kemi: update kemi_mock for python (#3751)
by GitHub 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: 3e1a7bb5f6143383b1f486b8c67c3bf97cb32a3f URL: https://github.com/kamailio/kamailio/commit/3e1a7bb5f6143383b1f486b8c67c3bf… Author: tsearle <torrey.searle(a)wavecrest.com> Committer: GitHub <noreply(a)github.com> Date: 2024-02-09T10:17:58+01:00 tools/kemi: update kemi_mock for python (#3751) fixes code generation when python keywords are uses fixes formating issues of generated code fixes crash from pv.setl reporting parameters as null instead of 'none' --- Modified: misc/tools/kemi/python_mock/kemi_mock.py Modified: misc/tools/kemi/python_mock/test.py --- Diff: https://github.com/kamailio/kamailio/commit/3e1a7bb5f6143383b1f486b8c67c3bf… Patch: https://github.com/kamailio/kamailio/commit/3e1a7bb5f6143383b1f486b8c67c3bf…

1 0

git:master:6918c9e3: modules: readme files regenerated - ldap ... [skip ci]
by Kamailio Dev 09 Feb '24

09 Feb '24

Module: kamailio Branch: master Commit: 6918c9e34b826f8d8c7fb1746851055fa35f8ece URL: https://github.com/kamailio/kamailio/commit/6918c9e34b826f8d8c7fb1746851055… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-02-09T10:01:34+01:00 modules: readme files regenerated - ldap ... [skip ci] --- Modified: src/modules/ldap/README --- Diff: https://github.com/kamailio/kamailio/commit/6918c9e34b826f8d8c7fb1746851055… Patch: https://github.com/kamailio/kamailio/commit/6918c9e34b826f8d8c7fb1746851055… --- diff --git a/src/modules/ldap/README b/src/modules/ldap/README index 921f45822f1..d69005f864e 100644 --- a/src/modules/ldap/README +++ b/src/modules/ldap/README @@ -31,6 +31,7 @@ Christian Schlatter 4. Parameters 4.1. config_file (string) + 4.2. connect_mode (int) 5. Functions @@ -82,12 +83,13 @@ Christian Schlatter 1.6. ldap_client_bind_timeout example 1.7. Example LDAP Configuration File 1.8. config_file parameter usage - 1.9. Example Usage of ldap_url - 1.10. Example Usage + 1.9. Set connect_mode parameter + 1.10. Example Usage of ldap_url 1.11. Example Usage 1.12. Example Usage 1.13. Example Usage 1.14. Example Usage + 1.15. Example Usage 2.1. Example code fragment to load LDAP module API 2.2. Example LDAP module API function call @@ -114,6 +116,7 @@ Chapter 1. Admin Guide 4. Parameters 4.1. config_file (string) + 4.2. connect_mode (int) 5. Functions @@ -418,6 +421,7 @@ ldap_client_bind_timeout = 500 4. Parameters 4.1. config_file (string) + 4.2. connect_mode (int) 4.1. config_file (string) @@ -428,6 +432,17 @@ ldap_client_bind_timeout = 500 Example 1.8. config_file parameter usage modparam("ldap", "config_file", "/usr/local/etc/kamailio/ldap.ini") +4.2. connect_mode (int) + + Control if the module must stop loading when connecting to server fails + during start up. Values: 0 - stop loading; 1 - continue even if + connecting to database server fails.. + + Default value: 0 + + Example 1.9. Set connect_mode parameter +modparam("ldap", "connect_mode", 1) + 5. Functions 5.1. ldap_search(ldap_url) @@ -458,7 +473,7 @@ modparam("ldap", "config_file", "/usr/local/etc/kamailio/ldap.ini") Kamailio pseudo variables and AVPs included in ldap_url do get substituted with their value. - Example 1.9. Example Usage of ldap_url + Example 1.10. Example Usage of ldap_url Search with LDAP session named sipaccounts, base ou=sip,dc=example,dc=com, one level deep using search filter @@ -492,7 +507,7 @@ ldap://ldap_1/dc=example,dc=com? This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.10. Example Usage + Example 1.11. Example Usage ... # ldap search if (!ldap_search("ldap://sipaccounts/ou=sip,dc=example,dc=com??one?(cn=$rU)")) @@ -570,7 +585,7 @@ ldap_result("telephoneNumber/$avp(s:tel_number)"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.11. Example Usage + Example 1.12. Example Usage ... # ldap_search call @@ -639,7 +654,7 @@ ldap_result("SIPIdentitySIPURI/$avp(i:10)", "/^[^@]+@(.+)$/\1/"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.12. Example Usage + Example 1.13. Example Usage ... # ldap_search call ... @@ -688,7 +703,7 @@ if (!ldap_result_check("sn/$ru", "/^sip:([^@]).*$/\1/")) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.13. Example Usage + Example 1.14. Example Usage ... # ldap_search call ... @@ -745,7 +760,7 @@ if (ldap_result_next()) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, and ONREPLY_ROUTE. - Example 1.14. Example Usage + Example 1.15. Example Usage ... if (!ldap_filter_url_encode("cn=$avp(s:name)", "$avp(s:name_esc)")) {

1 0