sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
394 discussions

[kamailio/kamailio] kamctl: Source only one kamctlrc (PR #3594)
by Xenofon Karamanos 16 Nov '23

16 Nov '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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  kamctl now sources the kamctlrc from only one location if available in this order: 1. same folder as kamctl, 2. {intstall_prefix}/etc/kamailio/, 3. ~/.kamctlrc 4. /etc/kamailio/. If no kamctlrc is found, it continues just like before. Should it stop? #### Issue description `kamctl` uses env variables from all the config files above, and retains the env value of the latest config that declares it. Let's say we have 3 kamctlrc files right now: ``` # first config file (same folder that kamctl resides) # {prefix_install}/sbin/kamctlrc ... SIP_DOMAIN=kamailio.org DBENGINE is commented ... ``` ``` # second config file # /etc/kamailio/kamctlrc ... SIP_DOMAIN=kam02.tst.nbg.gilawa.net DBENGINE=MYSQL ... ``` ``` # third config file # {prefix_install}/etc/kamailio/kamctlrc ... SIP_DOMAIN is commented DBENGINE=MYSQL ... ``` Running `{install_prefix}/sbin/kamctl` (before changes in order) it prints : ``` Loading config file /home/xenofon/kamailio-source-install/sbin/kamctlrc Loading config file /etc/kamailio/kamctlrc Loading config file /home/xenofon/kamailio-source-install/etc/kamailio//kamctlrc SIP_DOMAIN env var is kam02.tst.nbg.gilawa.net DBENGINE env var is MYSQL ``` suggesting that env variables from multiple sources are gathered and overwritten in cases. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3594 -- Commit Summary -- * kamctl: Source only one kamctlrc -- File Changes -- M utils/kamctl/kamctl (23) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3594.patch https://github.com/kamailio/kamailio/pull/3594.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3594 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3594(a)github.com>

3 19

Obsoleting unmaintained modules
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Hello, during the Kamailio Developers Meeting 2023 in Dusseldorf that took place last week, it was proposed to obsolete modules that seem to be unmaintained and no activity about them was noticed during the past years. It is quite some overhead in packaging them and trying to keep them compiling when they have external dependencies, therefore such step should spare some resources in the future. The list (see below) was built based on the options of those present at the meeting, now we want to discuss it on the larger communities of developers and users. If you are using any of these modules or you think any of them worth keeping, reply with the names of the modules that you want to be kept. The proposed action is to relocate the obsoleted modules to a new git repository "kamailio-obsolete" to still keep some visibility to them and in the eventually of future interest on any of them, it can be reintroduced in the main repository. Next is the initial list of modules proposed to be considered obsolete: - app_java - app_lua_sr - app_mono - app_python - app_sqlang - auth_identity - call_control - db2_ldap - db2_ops - db_cassandra - db_perldvdb - dnssec - domainpolicy - h350 - mediaproxy - osp - peering - print - print_lib - pua_xmpp - ratelimit - uid_auth_db - uid_avp_db - uid_domain - uid_gflags - uid_uri_db - uri_db - xmpp - xprint Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy and Development Services Kamailio Advanced Training -- asipto.com

3 4

git:master:06ce65a2: topos: detect direction for early dialog NOTIFY
by Daniel-Constantin Mierla 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: 06ce65a2bbea826b890a3712cf1ac4f8b53e54cd URL: https://github.com/kamailio/kamailio/commit/06ce65a2bbea826b890a3712cf1ac4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-16T17:39:11+01:00 topos: detect direction for early dialog NOTIFY --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/06ce65a2bbea826b890a3712cf1ac4f… Patch: https://github.com/kamailio/kamailio/commit/06ce65a2bbea826b890a3712cf1ac4f… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 0e697e8580e..942629568b9 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -915,7 +915,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) | METHOD_NOTIFY)) && stsd.b_contact.len <= 0) { /* no B-side contact, look for INVITE transaction record */ - if(metid & (METHOD_BYE | METHOD_UPDATE)) { + if(metid & (METHOD_BYE | METHOD_UPDATE | METHOD_NOTIFY)) { /* detect direction - via from-tag */ if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { goto error;

1 0

git:5.7:3e979157: core: fix indentation on tcp_main.c
by Ovidiu Sas 16 Nov '23

16 Nov '23

Module: kamailio Branch: 5.7 Commit: 3e9791570645dee833737077b3326ca6acde6aef URL: https://github.com/kamailio/kamailio/commit/3e9791570645dee833737077b3326ca… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-16T11:29:18-05:00 core: fix indentation on tcp_main.c (cherry picked from commit 243951bc487c5c67c81062445d4f4d7ee725684f) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/3e9791570645dee833737077b3326ca… Patch: https://github.com/kamailio/kamailio/commit/3e9791570645dee833737077b3326ca… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 49ad05a7fbb..d7bd4534d59 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3162,7 +3162,7 @@ int tcp_init(struct socket_info *sock_info) #if !defined(TCP_DONT_REUSEADDR) /* Stevens, "Network Programming", Section 7.5, "Generic Socket - * Options": "...server started,..a child continues..on existing + * Options": "...server started,..a child continues..on existing * connection..listening server is restarted...call to bind fails * ... ALL TCP servers should specify the SO_REUSEADDRE option * to allow the server to be restarted in this situation

1 0

git:master:243951bc: core: fix indentation on tcp_main.c
by Ovidiu Sas 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: 243951bc487c5c67c81062445d4f4d7ee725684f URL: https://github.com/kamailio/kamailio/commit/243951bc487c5c67c81062445d4f4d7… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-16T11:27:21-05:00 core: fix indentation on tcp_main.c --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/243951bc487c5c67c81062445d4f4d7… Patch: https://github.com/kamailio/kamailio/commit/243951bc487c5c67c81062445d4f4d7… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 7b46ccbafde..00a1796ec5a 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3162,7 +3162,7 @@ int tcp_init(struct socket_info *sock_info) #if !defined(TCP_DONT_REUSEADDR) /* Stevens, "Network Programming", Section 7.5, "Generic Socket - * Options": "...server started,..a child continues..on existing + * Options": "...server started,..a child continues..on existing * connection..listening server is restarted...call to bind fails * ... ALL TCP servers should specify the SO_REUSEADDRE option * to allow the server to be restarted in this situation

1 0

git:5.7:308506c3: core: fix compilation for older kernels
by Ovidiu Sas 16 Nov '23

16 Nov '23

Module: kamailio Branch: 5.7 Commit: 308506c3dacf9c22c63059166f5b674d0199eb44 URL: https://github.com/kamailio/kamailio/commit/308506c3dacf9c22c63059166f5b674… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-16T11:26:17-05:00 core: fix compilation for older kernels (cherry picked from commit 34054fbd144102d414318249de217cedf8e5bd39) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/308506c3dacf9c22c63059166f5b674… Patch: https://github.com/kamailio/kamailio/commit/308506c3dacf9c22c63059166f5b674… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e6e028c15fd..49ad05a7fbb 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1280,12 +1280,15 @@ inline static int find_listening_sock_info( int optval = 1; su2ip_addr(&ip, &si->su); *from = &si->su; +#if !defined(TCP_DONT_REUSEADDR) if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&optval, sizeof(optval)) == -1) { LM_ERR("setsockopt SO_REUSEADDR %s\n", strerror(errno)); /* continue, not critical */ } +#endif +#ifdef SO_REUSEPORT optval = 1; if(setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void *)&optval, sizeof(optval)) @@ -1293,6 +1296,7 @@ inline static int find_listening_sock_info( LM_ERR("setsockopt SO_REUSEPORT %s\n", strerror(errno)); /* continue, not critical */ } +#endif if(unlikely(bind(s, &si->su.s, sockaddru_len(si->su)) != 0)) { LM_WARN("binding to source address %s failed: %s [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno);

1 0

git:master:34054fbd: core: fix compilation for older kernels
by Ovidiu Sas 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: 34054fbd144102d414318249de217cedf8e5bd39 URL: https://github.com/kamailio/kamailio/commit/34054fbd144102d414318249de217ce… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-16T09:29:00-05:00 core: fix compilation for older kernels --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/34054fbd144102d414318249de217ce… Patch: https://github.com/kamailio/kamailio/commit/34054fbd144102d414318249de217ce… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 1b131a3311a..7b46ccbafde 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1280,12 +1280,15 @@ inline static int find_listening_sock_info( int optval = 1; su2ip_addr(&ip, &si->su); *from = &si->su; +#if !defined(TCP_DONT_REUSEADDR) if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&optval, sizeof(optval)) == -1) { LM_ERR("setsockopt SO_REUSEADDR %s\n", strerror(errno)); /* continue, not critical */ } +#endif +#ifdef SO_REUSEPORT optval = 1; if(setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void *)&optval, sizeof(optval)) @@ -1293,6 +1296,7 @@ inline static int find_listening_sock_info( LM_ERR("setsockopt SO_REUSEPORT %s\n", strerror(errno)); /* continue, not critical */ } +#endif if(unlikely(bind(s, &si->su.s, sockaddru_len(si->su)) != 0)) { LM_WARN("binding to source address %s failed: %s [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno);

1 0

git:5.7:c30e0a3a: pua_dialoginfo: safety check for request pointer
by Ovidiu Sas 16 Nov '23

16 Nov '23

Module: kamailio Branch: 5.7 Commit: c30e0a3a6dbe9b80b591ecb9caa53574ebc2988f URL: https://github.com/kamailio/kamailio/commit/c30e0a3a6dbe9b80b591ecb9caa5357… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-16T08:55:51-05:00 pua_dialoginfo: safety check for request pointer (cherry picked from commit 4e614ba6b7a5663bd88f353a3ce7a0976d8e878f) --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/c30e0a3a6dbe9b80b591ecb9caa5357… Patch: https://github.com/kamailio/kamailio/commit/c30e0a3a6dbe9b80b591ecb9caa5357… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index deecc32f7e1..6efcdc0a880 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -579,9 +579,10 @@ static void __dialog_sendpublish( if(use_pubruri_avps && (refresh_pubruri_avps_flag > -1 - || (request->flags - & (1U << (unsigned int) - refresh_pubruri_avps_flag)))) { + || (request + && (request->flags + & (1U << (unsigned int) + refresh_pubruri_avps_flag))))) { lock_release(&dlginfo->lock); } }

1 0

[kamailio/kamailio] not matching myself when using alt TLS port (Issue #3638)
by Sergiu Pojoga 16 Nov '23

16 Nov '23

### Description When having Kamailio listen for TLS on some alternative port other than 5061 - the `myself` condition doesn't match.  ### Troubleshooting #### Reproduction  `kamailio.cfg` enable_tls=yes tls_port_no=9061 listen=192.168.2.2:9061 advertise "mydomain.com":9061 ``` request_route { if (uri==myself) xlog("L_INFO", "myself matched\n"); else xlog("L_INFO", "myself didn't match\n"); } ``` Send a SIP request to Kamailio over TLS on port 9061 but RURI like `192.168.2.2;transport=tls` and observe the log output. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` OPTIONS sip:192.168.2.2;transport=tls SIP/2.0 Via:SIP/2.0/TLS 10.10.10.10:8934;branch=z9hG4bKfhsdjh2478sdfh256 From:<sip:10.10.10.10>;tag=834848136-1699739 To:<sip:192.168.2.2> Call-ID:SSE2150339541111236507 CSeq:100 OPTIONS Max-Forwards:0 Content-Length:0 ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.4 (x86_64/linux) 239d0a ``` * **Operating System**:  ``` Debian GNU/Linux 11 (bullseye) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3638 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3638(a)github.com>

2 3

git:master:4e614ba6: pua_dialoginfo: safety check for request pointer
by Ovidiu Sas 16 Nov '23

16 Nov '23

Module: kamailio Branch: master Commit: 4e614ba6b7a5663bd88f353a3ce7a0976d8e878f URL: https://github.com/kamailio/kamailio/commit/4e614ba6b7a5663bd88f353a3ce7a09… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-11-15T22:47:58-05:00 pua_dialoginfo: safety check for request pointer --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/4e614ba6b7a5663bd88f353a3ce7a09… Patch: https://github.com/kamailio/kamailio/commit/4e614ba6b7a5663bd88f353a3ce7a09… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 9099f25df40..22a2fb11da7 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -580,9 +580,10 @@ static void __dialog_sendpublish( if(use_pubruri_avps && (refresh_pubruri_avps_flag > -1 - || (request->flags - & (1U << (unsigned int) - refresh_pubruri_avps_flag)))) { + || (request + && (request->flags + & (1U << (unsigned int) + refresh_pubruri_avps_flag))))) { lock_release(&dlginfo->lock); } }

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023