sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
242 discussions

git:master:62e3069f: file_out: Add support for multiple files, extensions and interval

by Xenofon Karamanos

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…

10 months, 2 weeks

git:master:ba921b21: core/rthread.h: add prototype for db queries

by S-P Chan

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

10 months, 2 weeks

[kamailio/kamailio] DRAFT: new global config var to constrain thread wrapping (PR #3745)

by space88man

#### 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>

10 months, 2 weeks

[kamailio/kamailio] tools/kemi: update kemi_mock for python (PR #3751)

by tsearle

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>

10 months, 2 weeks

git:master:3e1a7bb5: tools/kemi: update kemi_mock for python (#3751)

by GitHub

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…

10 months, 2 weeks

git:master:6918c9e3: modules: readme files regenerated - ldap ... [skip ci]

by Kamailio Dev

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)")) {

10 months, 2 weeks

[kamailio/kamailio] Ldap: option to start even when connecting to ldap server fails (PR #3747)

by Xenofon Karamanos

#### 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 aims to give the option for ldap to allow kamailio to start-up even if server is not reachable/available when starting. It follows similar logic to https://github.com/kamailio/kamailio/commit/2df43b992b1e6932974bd0c928c0465… for SQL. A new config parameter for `ldap` module is defined, `connect_mode`, that defaults to 0, preserving the old behavior. If it's set `1`, `kamailio` will not exit and allow `ldap` to try and reconnect when necessary. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3747 -- Commit Summary -- * ldap: option to start even when connecting to server fails * ldap/docs: Add connect_mode docs -- File Changes -- M src/modules/ldap/doc/ldap_admin.xml (18) M src/modules/ldap/ldap_mod.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3747.patch https://github.com/kamailio/kamailio/pull/3747.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3747 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3747(a)github.com>

10 months, 2 weeks

git:master:e7397acb: ldap/docs: Add connect_mode docs

by Henning Westerholt

Module: kamailio Branch: master Commit: e7397acb86db5cf0a214fe7f2812e21130e7b2f6 URL: https://github.com/kamailio/kamailio/commit/e7397acb86db5cf0a214fe7f2812e21… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-09T09:46:25+01:00 ldap/docs: Add connect_mode docs --- Modified: src/modules/ldap/doc/ldap_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e7397acb86db5cf0a214fe7f2812e21… Patch: https://github.com/kamailio/kamailio/commit/e7397acb86db5cf0a214fe7f2812e21… --- diff --git a/src/modules/ldap/doc/ldap_admin.xml b/src/modules/ldap/doc/ldap_admin.xml index 3337dd2be0c..2bb2c3a5ef4 100644 --- a/src/modules/ldap/doc/ldap_admin.xml +++ b/src/modules/ldap/doc/ldap_admin.xml @@ -455,6 +455,23 @@ modparam("ldap", "config_file", "/usr/local/etc/&kamailiobinary;/ldap.ini") </programlisting> </example> </section> + + <section> + <title><varname>connect_mode</varname> (int)</title> + + <para>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..</para> + <para>Default value: + <varname>0</varname></para> + + <example> + <title>Set <varname>connect_mode</varname> parameter</title> + + <programlisting format="linespecific"> +modparam("ldap", "connect_mode", 1) + </programlisting> + </example> + </section> + </section> <section> @@ -1079,4 +1096,3 @@ if (ldap_search( </section> </section> </chapter> -

10 months, 2 weeks

git:master:3120d1df: ldap: option to start even when connecting to server fails

by Henning Westerholt

Module: kamailio Branch: master Commit: 3120d1dfcfa393b90272526e6fe2efb3aa32a19d URL: https://github.com/kamailio/kamailio/commit/3120d1dfcfa393b90272526e6fe2efb… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-09T09:46:25+01:00 ldap: option to start even when connecting to server fails --- Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3120d1dfcfa393b90272526e6fe2efb… Patch: https://github.com/kamailio/kamailio/commit/3120d1dfcfa393b90272526e6fe2efb… --- diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index fada29a3023..de0e25b1545 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -80,6 +80,7 @@ static int w_ldap_result_check_2( * Default module parameter values */ #define DEF_LDAP_CONFIG "/usr/local/etc/kamailio/ldap.cfg" +static int ldap_connect_mode = 0; /* * Module parameter variables @@ -125,6 +126,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"config_file", PARAM_STR, &ldap_config}, + {"connect_mode", PARAM_INT, &ldap_connect_mode}, {0, 0, 0} }; @@ -151,6 +153,7 @@ static int child_init(int rank) { int i = 0, ld_count = 0; char *ld_name; + int ret = 0; /* don't do anything for non-worker processes */ if(rank == PROC_INIT || rank == PROC_MAIN || rank == PROC_TCP_MAIN) @@ -168,9 +171,15 @@ static int child_init(int rank) } if(oldap_connect(ld_name) != 0) { - LM_ERR("[%s]: failed to connect to LDAP host(s)\n", ld_name); - ldap_disconnect(ld_name); - return -1; + if(ldap_connect_mode == 1) { + LM_INFO("[%s]: Failed to connect to LDAP host(s) but start " + "without connection enabled - proceed", + ld_name); + } else { + LM_ERR("[%s]: failed to connect to LDAP host(s)\n", ld_name); + ldap_disconnect(ld_name); + return -1; + } } }

10 months, 2 weeks

[kamailio/kamailio] RTPengine call was not terminated on BYE (Issue #3749)

by sergey-safarov

### Description Via sngrep I can see call was terminated via BYE message but was not terminated on RTPengine hosts. The `rtpengine-ctl list sessions all` show calls that was terminated properly via BYE message. In the kamailio config used `rtpengine_manage` function. I do not have any idea how to troubleshoot this. Could you suggest next step and I will add more details for this issue ### Additional Information * **Kamailio Version** Used 5.6.4 with small customization. ``` version: kamailio 5.6.4 (aarch64/linux) 06ad45 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-NOSMP, 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: 06ad45 compiled on 16:37:11 Aug 7 2023 with gcc 8.5.0 ``` * **Operating System**: CentOS 8 Stream, aarch64 ``` [root@sbc-a0 ~]# uname -a Linux sbc-a0.nga911.com 4.19.113-300.el8.aarch64 #1 SMP Fri May 12 11:47:07 UTC 2023 aarch64 aarch64 aarch64 GNU/Linux [root@sbc-a0 ~]# cat /etc/os-release NAME="CentOS Stream" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Stream 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux 8" REDHAT_SUPPORT_PRODUCT_VERSION="CentOS Stream" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3749 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3749(a)github.com>

10 months, 2 weeks

← Newer
1
...
13
14
15
16
17
18
19
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2024