- sr-dev - kamailio.org

[kamailio/kamailio] Add support for Linux kernel anyIP feature (Issue #3394)
by mohsen 09 Dec '23

09 Dec '23

Hi I have a kimailio box that receives messages from one interface and send it from another interface and I use dispatcher module successfully. Now I assigned an I range to Linux loopback interface through Linux kernel anyip feature. And I can ping the range. ip -4 route add local 192.168.0.0/24 dev lo I want to send messages from source of the ip in this range but kamailio cant do this in the right way. I added this two directives to kamailio.cfg: mhomed=yes ip_free_bind = 1 and when I want to use an ip from the list I use $fs=”udp:192.168.0.120:5060”; With no luck If I use force_send_socket(udp:192.168.0.120:5060); kamailio returns an error bad force_send_socket argument: 192.168.0.120:5060 (kamailio doesn't listen on it) and if I add listen directive for one ip like: listen=udp:192.168.0.120:5060 everything works fine but I want to be able to use any ip from list not just one ip. Thanks. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3394 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3394(a)github.com>

6 10

Jenkins build is still unstable: kamailio57-nightly-binaries » amd64,stretch #39
by kamailio＠sipwise.com 09 Dec '23

09 Dec '23

See <https://kamailio.sipwise.com/job/kamailio57-nightly-binaries/architecture=a…>

1 0

git:5.7:8674b333: core: parse privacy recompute lenght of rest to parse
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: 5.7 Commit: 8674b333300d5829bff9cb4993886bcf7bea249b URL: https://github.com/kamailio/kamailio/commit/8674b333300d5829bff9cb4993886bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T22:12:01+01:00 core: parse privacy recompute lenght of rest to parse (cherry picked from commit 804ee651b45498727196886c97cb55d20b254c4a) --- Modified: src/core/parser/parse_privacy.c --- Diff: https://github.com/kamailio/kamailio/commit/8674b333300d5829bff9cb4993886bc… Patch: https://github.com/kamailio/kamailio/commit/8674b333300d5829bff9cb4993886bc… --- diff --git a/src/core/parser/parse_privacy.c b/src/core/parser/parse_privacy.c index 64431468675..89423c1dffa 100644 --- a/src/core/parser/parse_privacy.c +++ b/src/core/parser/parse_privacy.c @@ -178,14 +178,13 @@ int parse_privacy(struct sip_msg *msg) values = 0; p = next.s; - len = next.len; - beyond = p + len; + beyond = next.s + next.len; while(p < beyond) { + len = beyond - p; if((val_len = parse_priv_value(p, len, &value)) != 0) { values |= value; p = p + val_len; - len = len - val_len; } else { LM_ERR("invalid privacy value\n"); return -1;

1 0

git:master:804ee651: core: parse privacy recompute lenght of rest to parse
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 804ee651b45498727196886c97cb55d20b254c4a URL: https://github.com/kamailio/kamailio/commit/804ee651b45498727196886c97cb55d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T22:10:36+01:00 core: parse privacy recompute lenght of rest to parse --- Modified: src/core/parser/parse_privacy.c --- Diff: https://github.com/kamailio/kamailio/commit/804ee651b45498727196886c97cb55d… Patch: https://github.com/kamailio/kamailio/commit/804ee651b45498727196886c97cb55d… --- diff --git a/src/core/parser/parse_privacy.c b/src/core/parser/parse_privacy.c index 64431468675..89423c1dffa 100644 --- a/src/core/parser/parse_privacy.c +++ b/src/core/parser/parse_privacy.c @@ -178,14 +178,13 @@ int parse_privacy(struct sip_msg *msg) values = 0; p = next.s; - len = next.len; - beyond = p + len; + beyond = next.s + next.len; while(p < beyond) { + len = beyond - p; if((val_len = parse_priv_value(p, len, &value)) != 0) { values |= value; p = p + val_len; - len = len - val_len; } else { LM_ERR("invalid privacy value\n"); return -1;

1 0

[kamailio/kamailio] siptrace: add haproxy protocol support (Issue #3665)
by sergey-safarov 08 Dec '23

08 Dec '23

When used `tcp_accept_haproxy=yes` and inbound connection from load-balancer received via IPv6 protocol and client real IPv4 then i can see error in the kamailio log ``` 28(723055) ERROR: {1 27 REGISTER 4fkReTbLC-} siptrace [siptrace_hep.c:94]: trace_send_hep3_duplicate(): interworking detected ? ``` Looks like requried add haproxy protocol support into siptrace module -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3665 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3665(a)github.com>

2 2

[kamailio/kamailio] Redefine Advertised socket URI when used haproxy protocol (Issue #3667)
by sergey-safarov 08 Dec '23

08 Dec '23

### Description When used haproxy protocol then from client perspetive TCP connection established to loadbalancer IP address. Real Kamailio listener may be IPv6 and expected to see `$RAut` value with IP of load balancer IP. Really I can see for first message from the client ``` sip:2600::6:45060;transport=tcp ``` For second message ``` Advertised socket URI: sip:[2600::6]:5060 ``` For first case missed `[]` in the IP and expected to see loadbalancer IPv4 because client use IPv4 to establish connection to Kamailio. ### Expected behavior Used loadbalancerserver IP from haproxy protocol for `$RAut` value and for `Record-Route` headers generation. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3667 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3667(a)github.com>

2 2

git:master:5d97afef: core: xavp - info long when skipping serializing a field
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 5d97afefd2a8f53072a36b6eb8927c180fb984c9 URL: https://github.com/kamailio/kamailio/commit/5d97afefd2a8f53072a36b6eb8927c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T16:23:03+01:00 core: xavp - info long when skipping serializing a field --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/5d97afefd2a8f53072a36b6eb8927c1… Patch: https://github.com/kamailio/kamailio/commit/5d97afefd2a8f53072a36b6eb8927c1… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 58f3a567611..128ea631013 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1184,7 +1184,8 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) } break; default: - LM_DBG("skipping value type: %d\n", avp->val.type); + LM_INFO("skipping field [%.*s] value type: %d\n", avp->name.len, + avp->name.s, avp->val.type); ostr.len = 0; } if(ostr.len > 0) { @@ -1678,7 +1679,8 @@ int xavu_serialize_fields(str *rname, char *obuf, int olen) } break; default: - LM_DBG("skipping value type: %d\n", avu->val.type); + LM_INFO("skipping field [%.*s] value type: %d\n", avu->name.len, + avu->name.s, avu->val.type); ostr.len = 0; } if(ostr.len > 0) { @@ -2652,7 +2654,8 @@ int xavi_serialize_fields(str *rname, char *obuf, int olen) } break; default: - LM_DBG("skipping value type: %d\n", avi->val.type); + LM_INFO("skipping field [%.*s] value type: %d\n", avi->name.len, + avi->name.s, avi->val.type); ostr.len = 0; } if(ostr.len > 0) {

1 0

[kamailio/kamailio] TOPOS callid masking (Issue #3606)
by Dennis 08 Dec '23

08 Dec '23

### Description PKG memory errors when configured mask_callid in TOPOS. ### Troubleshooting The poblem in detail desribed in mailing lists: https://www.mail-archive.com/sr-users@lists.kamailio.org/msg19997.html ### Possible Solutions Right way to configure topos for callid masking is: modparam("topoh", "use_mode", 1) modparam("topos", "mask_callid", 1) modparam("topoh", "mask_callid", 1) We need to set mask_callid module parameter for topoh also. There is not a word about this in the documentation, so docs correction needed. ### Additional Information * **Kamailio Version** - 5.7.X -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3606 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3606(a)github.com>

3 5

[kamailio/kamailio] pv: Add support to $hfl $hflc for Diversion header (PR #3651)
by Xenofon Karamanos 08 Dec '23

08 Dec '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) - [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) - [ ] New feature (non-breaking change which adds new functionality) - [x] 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 adds support for $hfl(Diversion)[] and $hflc(Diversion). This parse_diversion.c was inspired by [parse_pai_ppi.c](https://github.com/kamailio/kamailio/blob/master/src/core/…. I am not sure if it's breaking the existing implementation and usage. Any feedback and review is welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3651 -- Commit Summary -- * parser: Extend diversion for multiple bodies * pv: Add hfl and hflc support for Diversion header -- File Changes -- M src/core/parser/parse_diversion.c (152) M src/core/parser/parse_diversion.h (11) M src/modules/pv/pv_core.c (71) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3651.patch https://github.com/kamailio/kamailio/pull/3651.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3651 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3651(a)github.com>

3 10

[kamailio/kamailio] pv: Add support in $hfl and $hflc pv for PPI and PAI headers (PR #3652)
by Xenofon Karamanos 08 Dec '23

08 Dec '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) - [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 adds support for $hfl(name)[] and $hflc(name) for P-Preferred-Identity and P-Asserted-Identity. Should probably also be documented in https://www.kamailio.org/wikidocs/cookbooks/devel/pseudovariables/#hflname-… Any feedback welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3652 -- Commit Summary -- * pv: Add PPI and PAI support to hfl and hflc -- File Changes -- M src/modules/pv/pv_core.c (104) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3652.patch https://github.com/kamailio/kamailio/pull/3652.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3652 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3652(a)github.com>

2 11

[kamailio/kamailio] Segfault with tls init_mode 1 (Issue #3668)
by Bastian Triller 08 Dec '23

08 Dec '23

### Description Kamailio chrashes on startup when set init_mode to 1. Seems to be introduced with 4b068f49b618dca5fa85a1687bd9054c1d98ae6a  ### Troubleshooting #### Reproduction modparam("tls", "init_mode", 1)  #### Debugging Data  ``` #0 ___pthread_mutex_lock (mutex=0x0) at ./nptl/pthread_mutex_lock.c:80 #1 0x00007f9e93510614 in ser_malloc (size=56, fname=<optimized out>, fline=<optimized out>) at ./src/modules/tls/tls_init.c:388 #2 0x00007f9e93031b59 in CRYPTO_zalloc (num=num@entry=56, file=file@entry=0x7f9e9317563d "../crypto/threads_pthread.c", line=line@entry=50) at ../crypto/mem.c:197 #3 0x00007f9e9303dedf in CRYPTO_THREAD_lock_new () at ../crypto/threads_pthread.c:50 #4 0x00007f9e93030ad9 in ossl_init_base () at ../crypto/init.c:64 #5 ossl_init_base_ossl_ () at ../crypto/init.c:55 #6 0x00007f9e97affea7 in __pthread_once_slow (once_control=0x7f9e9327edcc <base>, init_routine=0x7f9e93030ad0 <ossl_init_base_ossl_>) at ./nptl/pthread_once.c:116 #7 0x00007f9e97afff85 in ___pthread_once (once_control=<optimized out>, init_routine=<optimized out>) at ./nptl/pthread_once.c:143 #8 0x00007f9e9303dfc9 in CRYPTO_THREAD_run_once (once=once@entry=0x7f9e9327edcc <base>, init=init@entry=0x7f9e93030ad0 <ossl_init_base_ossl_>) at ../crypto/threads_pthread.c:154 #9 0x00007f9e93030d48 in OPENSSL_init_crypto (opts=opts@entry=131148, settings=settings@entry=0x0) at ../crypto/init.c:507 #10 0x00007f9e93473a21 in OPENSSL_init_ssl (opts=131148, opts@entry=131072, settings=settings@entry=0x0) at ../ssl/ssl_init.c:115 #11 0x00007f9e93511f44 in tls_h_mod_pre_init_f () at ./src/modules/tls/tls_init.c:779 #12 0x000055c792122571 in main (argc=<optimized out>, argv=0x7ffd43d1a338) at ./src/main.c:3174 ``` #### Log Messages  ``` [ 1803.304680] kamailio[7700]: segfault at 10 ip 00007fe7b62c91c0 sp 00007ffd499a0db8 error 4 in libc.so.6[7fe7b6263000+155000] likely on CPU 1 (core 0, socket 1) [ 1803.304698] Code: 30 11 00 ba c2 01 00 00 48 8d 35 47 ad 10 00 48 8d 3d 55 ad 10 00 e8 3f 8c fa ff e8 4a bd 08 00 66 2e 0f 1f 84 00 00 00 00 00 <8b> 47 10 89 c2 81 e2 7f 01 00 00 83 e0 7c 0f 85 ac 00 00 00 53 48 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.3 (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, MEM_JOIN_FREE, 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 12.2.0 ``` ``` version: kamailio 5.8.0-dev2 (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, MEM_JOIN_FREE, 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_SEND_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 12.2.0 ``` * **Operating System**:  ``` % cat /etc/os-release PRETTY_NAME="Debian GNU/Linux 12 (bookworm)" NAME="Debian GNU/Linux" VERSION_ID="12" VERSION="12 (bookworm)" VERSION_CODENAME=bookworm ID=debian HOME_URL="https://www.debian.org/" SUPPORT_URL="https://www.debian.org/support" BUG_REPORT_URL="https://bugs.debian.org/" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3668 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3668(a)github.com>

2 2

git:5.7:b634dc7f: tls: init early the local lock for memory
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: 5.7 Commit: b634dc7f4d8f1653502328488f0dded134547b54 URL: https://github.com/kamailio/kamailio/commit/b634dc7f4d8f1653502328488f0dded… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T12:37:26+01:00 tls: init early the local lock for memory - needed to done before mod param init_mode is set - runtime uses the modparam to do lock/unlock - #3668 (cherry picked from commit 1a9b0b63617afebcee2aecb3b2240d7684ecabc2) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/b634dc7f4d8f1653502328488f0dded… Patch: https://github.com/kamailio/kamailio/commit/b634dc7f4d8f1653502328488f0dded… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 6106cc7f884..57be9cad814 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -78,7 +78,7 @@ int ksr_tls_lock_init(void) { pthread_mutexattr_t attr; - if(!(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM)) { + if(ksr_tls_lock_shm != NULL) { return 0; } ksr_tls_lock_shm = (pthread_mutex_t *)shm_mallocxz(sizeof(pthread_mutex_t)); @@ -723,6 +723,11 @@ int tls_pre_init(void) LM_INFO("libssl linked mode: static\n"); #endif + if(ksr_tls_lock_init() < 0) { + LM_ERR("failed to init local lock\n"); + return -1; + } + /* * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0 @@ -770,6 +775,10 @@ int tls_h_mod_pre_init_f(void) LM_DBG("already mod pre-initialized\n"); return 0; } + if(ksr_tls_lock_init() < 0) { + LM_ERR("failed to init local lock\n"); + return -1; + } LM_DBG("preparing tls env for modules initialization\n"); #if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n");

1 0

git:master:1a9b0b63: tls: init early the local lock for memory
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 1a9b0b63617afebcee2aecb3b2240d7684ecabc2 URL: https://github.com/kamailio/kamailio/commit/1a9b0b63617afebcee2aecb3b2240d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T12:34:56+01:00 tls: init early the local lock for memory - needed to done before mod param init_mode is set - runtime uses the modparam to do lock/unlock - #3668 --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/1a9b0b63617afebcee2aecb3b2240d7… Patch: https://github.com/kamailio/kamailio/commit/1a9b0b63617afebcee2aecb3b2240d7… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 7824245813b..9be5e1d4fab 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -78,7 +78,7 @@ int ksr_tls_lock_init(void) { pthread_mutexattr_t attr; - if(!(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM)) { + if(ksr_tls_lock_shm != NULL) { return 0; } ksr_tls_lock_shm = (pthread_mutex_t *)shm_mallocxz(sizeof(pthread_mutex_t)); @@ -721,6 +721,11 @@ int tls_pre_init(void) LM_INFO("libssl linked mode: static\n"); #endif + if(ksr_tls_lock_init() < 0) { + LM_ERR("failed to init local lock\n"); + return -1; + } + /* * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0 @@ -772,6 +777,10 @@ int tls_h_mod_pre_init_f(void) LM_DBG("already mod pre-initialized\n"); return 0; } + if(ksr_tls_lock_init() < 0) { + LM_ERR("failed to init local lock\n"); + return -1; + } LM_DBG("preparing tls env for modules initialization\n"); #if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n");

1 0

git:master:73536c5f: core: msg translator - consider af from advertise structure
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 73536c5fe93f6f4e41eb92de29d054a0ac38536b URL: https://github.com/kamailio/kamailio/commit/73536c5fe93f6f4e41eb92de29d054a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T12:21:40+01:00 core: msg translator - consider af from advertise structure --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/73536c5fe93f6f4e41eb92de29d054a… Patch: https://github.com/kamailio/kamailio/commit/73536c5fe93f6f4e41eb92de29d054a…

1 0

git:master:59592e04: core: consider af from advertise structure to build recv socket uri
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 59592e0499fbb61ec701a1d7901c357ff5ebc4a4 URL: https://github.com/kamailio/kamailio/commit/59592e0499fbb61ec701a1d7901c357… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:53:45+01:00 core: consider af from advertise structure to build recv socket uri --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/59592e0499fbb61ec701a1d7901c357… Patch: https://github.com/kamailio/kamailio/commit/59592e0499fbb61ec701a1d7901c357… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index c0a06b6af1a..a8504873073 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1341,6 +1341,7 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) char *p; str ip, port; int len; + int af; str proto = STR_NULL; if(!uri || !m || !m->rcv.bind_address) { @@ -1385,8 +1386,13 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) port.s = m->rcv.bind_address->useinfo.port_no_str.s; port.len = m->rcv.bind_address->useinfo.port_no_str.len; } + if(atype == 1 && m->rcv.bind_address->useinfo.address_str.len > 0) { + af = m->rcv.bind_address->useinfo.af; + } else { + af = m->rcv.src_ip.af; + } - len = 4 + ip.len + 2 * (m->rcv.src_ip.af == AF_INET6) + 1 + port.len; + len = 4 + ip.len + 2 * (af == AF_INET6) + 1 + port.len; if(proto.s) { len += TRANSPORT_PARAM_LEN; len += proto.len; @@ -1401,11 +1407,11 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) memcpy(p, "sip:", 4); p += 4; - if(m->rcv.src_ip.af == AF_INET6) + if(af == AF_INET6) *p++ = '['; memcpy(p, ip.s, ip.len); p += ip.len; - if(m->rcv.src_ip.af == AF_INET6) + if(af == AF_INET6) *p++ = ']'; *p++ = ':';

1 0

git:master:faf24134: core: keep address family indication in advertised structure
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: faf24134a00c1b15933f22e8e7702ec8e0dba35d URL: https://github.com/kamailio/kamailio/commit/faf24134a00c1b15933f22e8e7702ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:43:02+01:00 core: keep address family indication in advertised structure --- Modified: src/core/ip_addr.h Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/faf24134a00c1b15933f22e8e7702ec… Patch: https://github.com/kamailio/kamailio/commit/faf24134a00c1b15933f22e8e7702ec… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index cec63fc4fa9..a8f9660b9c6 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -122,6 +122,7 @@ typedef struct advertise_info { str name; /* name - eg.: foo.bar or 10.0.0.1 */ int proto; /* protocol id */ + int af; /* address family based on [ ] around name */ unsigned short port_no; /* port number */ short port_pad; /* padding field */ str port_no_str; /* port number converted to string -- optimization*/ diff --git a/src/core/socket_info.c b/src/core/socket_info.c index caad839ee8f..3f67f16981b 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -336,6 +336,7 @@ static inline struct socket_info *new_sock_info(char *name, if(usename[0] == '[' && usename[si->useinfo.name.len - 1] == ']') { si->useinfo.address_str.len = si->useinfo.name.len - 2; p = si->useinfo.name.s + 1; + si->useinfo.af = AF_INET6; } else { si->useinfo.address_str.len = si->useinfo.name.len; p = si->useinfo.name.s;

1 0

git:master:975bbde5: core: use advertise proto when building get_rcv_socket_uri()
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 975bbde5aa0fd4c2ef4063d906e125911d162ed6 URL: https://github.com/kamailio/kamailio/commit/975bbde5aa0fd4c2ef4063d906e1259… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:36:32+01:00 core: use advertise proto when building get_rcv_socket_uri() --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/975bbde5aa0fd4c2ef4063d906e1259… Patch: https://github.com/kamailio/kamailio/commit/975bbde5aa0fd4c2ef4063d906e1259… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 5d2e799d69d..c0a06b6af1a 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1341,31 +1341,32 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) char *p; str ip, port; int len; - str proto; + str proto = STR_NULL; if(!uri || !m || !m->rcv.bind_address) { ERR("invalid parameter value\n"); return -1; } - if(tmode == 0) { - switch(m->rcv.proto) { - case PROTO_NONE: - case PROTO_UDP: - proto.s = - 0; /* Do not add transport parameter, UDP is default */ - proto.len = 0; - break; - default: - if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto) < 0) { - ERR("unknown transport protocol\n"); - return -1; - } - } + if((tmode == 0) + && (m->rcv.proto == PROTO_NONE || m->rcv.proto == PROTO_UDP)) { + /* do not add transport parameter, UDP is default */ + proto.s = NULL; + proto.len = 0; } else { - if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto) < 0) { - ERR("unknown transport protocol\n"); - return -1; + if(atype == 0 || m->rcv.bind_address->useinfo.address_str.len <= 0 + || m->rcv.bind_address->useinfo.proto == PROTO_NONE) { + if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto) < 0) { + ERR("unknown transport protocol\n"); + return -1; + } + } else { + if(get_valid_proto_string( + m->rcv.bind_address->useinfo.proto, 1, 0, &proto) + < 0) { + ERR("unknown transport protocol\n"); + return -1; + } } }

1 0

git:master:b02a38e6: pv: support for Diversion header in $hfl() and $hflc()
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: b02a38e66d3bd198e75103727130906b2ff9786c URL: https://github.com/kamailio/kamailio/commit/b02a38e66d3bd198e75103727130906… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:04:27+01:00 pv: support for Diversion header in $hfl() and $hflc() --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/b02a38e66d3bd198e75103727130906… Patch: https://github.com/kamailio/kamailio/commit/b02a38e66d3bd198e75103727130906… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index ff6e23f811a..4b8f98bcfd3 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1100,7 +1100,7 @@ int pv_get_diversion(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) } if(param->pvn.u.isname.name.n == 1) { /* uri */ - return pv_get_strval(msg, param, res, &(get_diversion(msg)->uri)); + return pv_get_strval(msg, param, res, &(get_diversion(msg)->id->uri)); } if(param->pvn.u.isname.name.n == 2) { /* reason param */ @@ -2090,6 +2090,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) via_body_t *vb = NULL; rr_t *rrb = NULL; contact_t *cb = NULL; + diversion_body_t *db = NULL; p_id_body_t *ppib = NULL; p_id_body_t *paib = NULL; hdr_field_t *hf = NULL; @@ -2340,6 +2341,58 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } + if((tv.flags == 0) && (tv.ri == HDR_DIVERSION_T)) { + if(msg->diversion == NULL) { + LM_WARN("no Diversion header\n"); + return pv_get_null(msg, param, res); + } + + if(parse_diversion_header(msg) < 0) { + LM_WARN("failed to parse Diversion headers\n"); + return pv_get_null(msg, param, res); + } + + db = (diversion_body_t *)msg->diversion->parsed; + n = 0; + + while(db != NULL) { + n += db->num_ids; + db = db->next; + } + + if(idx < 0) { + idx = -idx; + if(idx > n) { + LM_WARN("index out of range\n"); + return pv_get_null(msg, param, res); + } + idx = n - idx; + } + + n = 0; + db = (diversion_body_t *)msg->diversion->parsed; + /* loop through all parsed Diversion headers lists */ + while(db != NULL) { + if(n + db->num_ids > idx) { + /* Calculate the index within this specific list */ + int innerIndex = idx - n; + + /* Access the desired element within this list */ + sval.s = db->id[innerIndex].body.s; + sval.len = db->id[innerIndex].body.len; + trim(&sval); + res->rs = sval; + return 0; + } + + /* Move to the next Diversion header list */ + n += db->num_ids; + db = db->next; + } + LM_DBG("unexpected diversion index out of range\n"); + return pv_get_null(msg, param, res); + } + if((tv.flags == 0) && (tv.ri == HDR_PPI_T)) { if(msg->ppi == NULL) { LM_DBG("no PPI header\n"); @@ -2563,6 +2616,25 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, n); } + if((tv.flags == 0) && (tv.ri == HDR_DIVERSION_T)) { + if(msg->diversion == NULL) { + LM_DBG("no Diversion header\n"); + return pv_get_sintval(msg, param, res, 0); + } + if(parse_diversion_header(msg) < 0) { + LM_DBG("failed to parse Diversion headers\n"); + return pv_get_sintval(msg, param, res, 0); + } + + diversion_body_t *db = (diversion_body_t *)msg->diversion->parsed; + int diversion_body_count = 0; + while(db != NULL) { + diversion_body_count += db->num_ids; + db = db->next; + } + return pv_get_sintval(msg, param, res, diversion_body_count); + } + if((tv.flags == 0) && (tv.ri == HDR_PPI_T)) { if(msg->ppi == NULL) { LM_DBG("no PPI header\n");

1 0

git:master:ced8d46e: core: parser extended to handle diversion with multiple bodies
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: ced8d46eddb2bda614eaace98437b7dab2d123e3 URL: https://github.com/kamailio/kamailio/commit/ced8d46eddb2bda614eaace98437b7d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:01:39+01:00 core: parser extended to handle diversion with multiple bodies - similar to PAI and PPI --- Modified: src/core/parser/hf.c Modified: src/core/parser/parse_diversion.c Modified: src/core/parser/parse_diversion.h --- Diff: https://github.com/kamailio/kamailio/commit/ced8d46eddb2bda614eaace98437b7d… Patch: https://github.com/kamailio/kamailio/commit/ced8d46eddb2bda614eaace98437b7d…

1 0

[kamailio/kamailio] lib: big integers should not be treated as negative ones (#2106)
by Ivan Murashko 08 Dec '23

08 Dec '23

0xffffffff00000000ULL mask does not take into consideration signed 32 bit integers and as result 2147483648 will be stored as -2147483648. Another mask should be used to correct the issue: 0xffffffff80000000ULL. It processes correctly the case of integers that are greater than 2147483647. There are several gdb tests below: (gdb) p ((unsigned long long)2147483648 & 0xffffffff80000000ULL) $1= 2147483648 (gdb) p ((unsigned long long)2147483647 & 0xffffffff80000000ULL) $2 = 0 (gdb) p ((unsigned long long)2147483646 & 0xffffffff80000000ULL) $3 = 0 (gdb) p ((unsigned long long)4147483646 & 0xffffffff80000000ULL) $4 = 2147483648   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2106 -- Commit Summary -- * lib: big integers should not be treated as negative ones -- File Changes -- M src/lib/srdb1/db_ut.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2106.patch https://github.com/kamailio/kamailio/pull/2106.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2106

4 6

git:master:6d14b4e4: lib/srdb1: rework store of long long values as number if value fits
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 6d14b4e439aec3d046addfa776a4be5f471a33f0 URL: https://github.com/kamailio/kamailio/commit/6d14b4e439aec3d046addfa776a4be5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T10:23:20+01:00 lib/srdb1: rework store of long long values as number if value fits - GH #2106 --- Modified: src/lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/6d14b4e439aec3d046addfa776a4be5… Patch: https://github.com/kamailio/kamailio/commit/6d14b4e439aec3d046addfa776a4be5… --- diff --git a/src/lib/srdb1/db_ut.c b/src/lib/srdb1/db_ut.c index c7a8887044e..9975672aeea 100644 --- a/src/lib/srdb1/db_ut.c +++ b/src/lib/srdb1/db_ut.c @@ -610,11 +610,16 @@ int db_val2pv_spec(struct sip_msg *msg, db_val_t *dbval, pv_spec_t *pvs) pv.rs.len = LL_LEN; db_longlong2str(dbval->val.ll_val, ll_buf, &pv.rs.len); pv.rs.s = ll_buf; - /* if it fits, also store as 32 bit integer*/ - if(!((unsigned long long)dbval->val.ll_val - & 0xffffffff00000000ULL)) { + /* if it fits, also store as long number */ + if(sizeof(long long) == sizeof(long)) { pv.flags |= PV_VAL_INT | PV_TYPE_INT; - pv.ri = (int)dbval->val.ll_val; + pv.ri = (long)dbval->val.ll_val; + } else { + if(dbval->val.ll_val >= LONG_MIN + && dbval->val.ll_val <= LONG_MAX) { + pv.flags |= PV_VAL_INT | PV_TYPE_INT; + pv.ri = (long)dbval->val.ll_val; + } } break; default:

1 0

git:master:c79f28b1: pv: Add PPI and PAI support to hfl and hflc
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: c79f28b11f2683d11aafa72427efb15c95196b8b URL: https://github.com/kamailio/kamailio/commit/c79f28b11f2683d11aafa72427efb15… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T09:46:56+01:00 pv: Add PPI and PAI support to hfl and hflc --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/c79f28b11f2683d11aafa72427efb15… Patch: https://github.com/kamailio/kamailio/commit/c79f28b11f2683d11aafa72427efb15…

1 0

[kamailio/kamailio] uac: fix socket length settings (PR #3664)
by Péter Barabás 08 Dec '23

08 Dec '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 This PR fixes the setting of uac_req object's socket length. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3664 -- Commit Summary -- * uac: fix socket length settings -- File Changes -- M src/modules/uac/uac_send.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3664.patch https://github.com/kamailio/kamailio/pull/3664.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3664 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3664(a)github.com>

2 2

git:master:10519d19: uac: fix socket length settings
by Daniel-Constantin Mierla 08 Dec '23

08 Dec '23

Module: kamailio Branch: master Commit: 10519d199f6cac116399f4473bd82f2b08de72ba URL: https://github.com/kamailio/kamailio/commit/10519d199f6cac116399f4473bd82f2… Author: Pe��ter Baraba��s <peter.barabas(a)securesoft.hu> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T09:42:08+01:00 uac: fix socket length settings - set _uac_req.s_sock.len value to 0 in pv_set_uac_req() method in case of "all" case - change setting of _uac_req.s_apasswd.len to _uac_req.s_sock.len in pv_set_uac_req() method in case of "sock" case --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/10519d199f6cac116399f4473bd82f2… Patch: https://github.com/kamailio/kamailio/commit/10519d199f6cac116399f4473bd82f2… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index c098feacff2..b2cdaad9066 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -210,6 +210,7 @@ int pv_set_uac_req( _uac_req.s_body.len = 0; _uac_req.s_method.len = 0; _uac_req.s_callid.len = 0; + _uac_req.s_sock.len = 0; _uac_req.evroute = 0; _uac_req.evtype = 0; _uac_req.evcode = 0; @@ -399,7 +400,7 @@ int pv_set_uac_req( break; case 12: if(tval == NULL) { - _uac_req.s_apasswd.len = 0; + _uac_req.s_sock.len = 0; return 0; } if(!(tval->flags & PV_VAL_STR)) {

1 0

[kamailio/kamailio] sslv3 errors showing up with 'tls_method' set as 'TLSv1.2+' (Issue #3085)
by Vinicius K. Ruoso 07 Dec '23

07 Dec '23

### Description Some users are having issues connecting to kamailio websocket using TLS. The logs show SSLv3 errors. Cannot find why that error would show up if SSLv2/3 is not enabled. Double checked it via SSLLabs that only TLSv1.2 is allowed in the service. Any pointers would be appreciated. Also, let me know if more debug information is needed. ### Troubleshooting #### Debugging Data This is the TLS config: ``` modparam("tls", "tls_method", "TLSv1.2+") modparam("tls", "verify_certificate", 0) modparam("tls", "require_certificate", 0) modparam("tls", "low_mem_threshold1", 0) modparam("tls", "low_mem_threshold2", 0) modparam("tls", "private_key", "/etc/certs/tls.key") modparam("tls", "certificate", "/etc/certs/tls.crt") ``` This is the output from tls module in kamcmd: ``` kamcmd> tls.info { max_connections: 2048 opened_connections: 353 clear_text_write_queued_bytes: 0 } kamcmd> tls.options { force_run: 0 method: TLSv1.2+ verify_certificate: 0 verify_depth: 9 require_certificate: 0 private_key: /etc/certs/tls.key ca_list: <null string> certificate: /etc/certs/tls.crt cipher_list: <null string> session_cache: 0 session_id: kamailio-tls-5.x.y config: <null string> log: 3 debug: 3 connection_timeout: 600 disable_compression: 1 ssl_release_buffers: -1 ssl_freelist_max: -1 ssl_max_send_fragment: -1 ssl_read_ahead: 0 send_close_notify: 0 low_mem_threshold1: 0 low_mem_threshold2: 0 ct_wq_max: 10485760 con_ct_wq_max: 65536 ct_wq_blk_size: 4096 } ``` #### Log Messages I see this log messages related to SSLv3: ``` 15(36) ERROR: tls [tls_util.h:42]: tls_err_ret(): TLS accept:error:14094416:SSL routines:ssl3_read_bytes:sslv3 alert certificate unknown 15(36) ERROR: <core> [core/tcp_read.c:1512]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7fafc8768190 r: 0x7fafc8768278 (-1) ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.9 (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_BLACKLIST, 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 6.3.0 ``` * **Operating System**: Debian 9.13. ``` Linux 4.19.112+ #1 SMP Wed Sep 23 07:53:39 PDT 2020 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3085 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3085(a)github.com>

3 5

git:5.7:63e87491: tls: rework init mode 1 to set PTHREAD_PROCESS_SHARED
by Daniel-Constantin Mierla 07 Dec '23

07 Dec '23

Module: kamailio Branch: 5.7 Commit: 63e8749132257ef1f8c8d86ec78f6db2c699f1c8 URL: https://github.com/kamailio/kamailio/commit/63e8749132257ef1f8c8d86ec78f6db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-07T13:32:04+01:00 tls: rework init mode 1 to set PTHREAD_PROCESS_SHARED - pthread mutex set in shm - GH #3635 (cherry picked from commit 4b068f49b618dca5fa85a1687bd9054c1d98ae6a) --- Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/63e8749132257ef1f8c8d86ec78f6db… Patch: https://github.com/kamailio/kamailio/commit/63e8749132257ef1f8c8d86ec78f6db…

1 0

git:master:4b068f49: tls: rework init mode 1 to set PTHREAD_PROCESS_SHARED
by Daniel-Constantin Mierla 07 Dec '23

07 Dec '23

Module: kamailio Branch: master Commit: 4b068f49b618dca5fa85a1687bd9054c1d98ae6a URL: https://github.com/kamailio/kamailio/commit/4b068f49b618dca5fa85a1687bd9054… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-07T13:07:09+01:00 tls: rework init mode 1 to set PTHREAD_PROCESS_SHARED - pthread mutex set in shm - GH #3635 --- Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4b068f49b618dca5fa85a1687bd9054… Patch: https://github.com/kamailio/kamailio/commit/4b068f49b618dca5fa85a1687bd9054…

1 0

git:master:964c21e1: pv_headers: rearrange module parameters
by Victor Seva 07 Dec '23

07 Dec '23

Module: kamailio Branch: master Commit: 964c21e16ab4da96d989c230ea18d95872257394 URL: https://github.com/kamailio/kamailio/commit/964c21e16ab4da96d989c230ea18d95… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-07T12:28:02+01:00 pv_headers: rearrange module parameters * pvh_ prefix for global variables --- Modified: src/modules/pv_headers/pv_headers.c Modified: src/modules/pv_headers/pv_headers.h Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_func.h Modified: src/modules/pv_headers/pvh_hash.c Modified: src/modules/pv_headers/pvh_hash.h Modified: src/modules/pv_headers/pvh_hdr.c Modified: src/modules/pv_headers/pvh_hdr.h Modified: src/modules/pv_headers/pvh_str.c Modified: src/modules/pv_headers/pvh_str.h Modified: src/modules/pv_headers/pvh_xavp.c Modified: src/modules/pv_headers/pvh_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/964c21e16ab4da96d989c230ea18d95… Patch: https://github.com/kamailio/kamailio/commit/964c21e16ab4da96d989c230ea18d95…

1 0

Error during TLS handshake
by Markus Bönke 07 Dec '23

07 Dec '23

Hello ng, I currently face an issue to forward a call via tls to a destination. The check with "openssl client -connect …" to the destination is successful and it returns a valid certificate. However if I forward the call via kamailio I see an TLS error: Alert (Level: Fatal, Description: Unknown CA) I’ve compiled tls module with extra_defs="-DTLS_WR_DEBUG -DTLS_RD_DEBUG“ (with 5.4.9 and 5.5.7) and can see: Dec 7 10:46:40 mbo-debian-vm1 /usr/local/sbin/kamailio[170469]: DEBUG: TLS_TRACE: tls [tls_server.c:1141]: tls_h_read_f(): tls_h_read_f(0xffff898c8a88, 0xffffcc5fe320) tls write on read (WRITE_WANTS_READ): ct_wq_flush()=> 0 (ff=2 ssl_error=1)) Dec 7 10:46:40 mbo-debian-vm1 /usr/local/sbin/kamailio[170469]: DEBUG: TLS_TRACE: tls [tls_server.c:1268]: tls_h_read_f(): tls_h_read_f(0xffff898c8a88, 0xffffcc5fe320) tcpconn_send_unsafe 7 bytes Dec 7 10:46:40 mbo-debian-vm1 /usr/local/sbin/kamailio[170469]: ERROR: tls [tls_server.c:1329]: tls_h_read_f(): protocol level error Dec 7 10:46:40 mbo-debian-vm1 /usr/local/sbin/kamailio[170469]: ERROR: tls [tls_util.h:42]: tls_err_ret(): TLS write:error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed It looks like the error "Unknown CA“ is a subsequent error, but the main problem occurs while reading from the tls connection. I’m currently can also debug the issue in the tls module, is there anything which I can check? Maybe the certificate chain is too long? Thanks and regards Markus

1 0

git:master:890dc5f0: ims_charging: free local structure in case of errors
by Daniel-Constantin Mierla 07 Dec '23

07 Dec '23

Module: kamailio Branch: master Commit: 890dc5f017084481cd2b0f0d759939393fa115bc URL: https://github.com/kamailio/kamailio/commit/890dc5f017084481cd2b0f0d7599393… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-07T08:21:22+01:00 ims_charging: free local structure in case of errors --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/890dc5f017084481cd2b0f0d7599393… Patch: https://github.com/kamailio/kamailio/commit/890dc5f017084481cd2b0f0d7599393… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 6fe14ae3dd7..11c74169293 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -1721,6 +1721,7 @@ static void resume_on_initial_ccr( } Ro_free_CCA(ro_cca_data); + ro_cca_data = NULL; LM_DBG("Freeing CCA message\n"); cdpb.AAAFreeMessage(&cca); @@ -1757,9 +1758,11 @@ static void resume_on_initial_ccr( return; error1: - Ro_free_CCA(ro_cca_data); - error0: + if(ro_cca_data != NULL) { + Ro_free_CCA(ro_cca_data); + } + LM_DBG("Trying to reserve credit on initial INVITE failed on cdp " "callback\n"); // counter_add(ims_charging_cnts_h.active_ro_sessions, -1); /*we bumped active on the original initial ccr sent */

1 0

git:master:8794e509: core: tcp - set type for literals usef for time difference
by Daniel-Constantin Mierla 07 Dec '23

07 Dec '23

Module: kamailio Branch: master Commit: 8794e509b951658e055cc06374c0e2561debdde3 URL: https://github.com/kamailio/kamailio/commit/8794e509b951658e055cc06374c0e25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-07T07:02:42+01:00 core: tcp - set type for literals usef for time difference --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/8794e509b951658e055cc06374c0e25… Patch: https://github.com/kamailio/kamailio/commit/8794e509b951658e055cc06374c0e25… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 3d4a6a4e0b1..4972b7d20af 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -5489,11 +5489,11 @@ void tcp_timer_check_connections(unsigned int ticks, void *param) cidset = 0; if(con->state == S_CONN_OK) { if(con->req.tvrstart.tv_sec > 0) { - tvdiff = 1000000 + tvdiff = 1000000LL * (tvnow.tv_sec - con->req.tvrstart.tv_sec) + (tvnow.tv_usec - con->req.tvrstart.tv_usec); - if(tvdiff >= ksr_tcp_msg_read_timeout * 1000000) { + if(tvdiff >= 1000000LL * ksr_tcp_msg_read_timeout) { LM_DBG("n: %d - connection id: %d - message " "reading timeout: %lld\n", n, con->id, tvdiff);

1 0

Jenkins build is still unstable: kamailiodev-nightly-binaries » amd64,stretch #2546
by kamailio＠sipwise.com 07 Dec '23

07 Dec '23

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

git:master:8ca5d90a: cfgt: rearrange mod parameters
by Victor Seva 06 Dec '23

06 Dec '23

Module: kamailio Branch: master Commit: 8ca5d90a44166bf1a501680b2e01dfbbab5f5b94 URL: https://github.com/kamailio/kamailio/commit/8ca5d90a44166bf1a501680b2e01dfb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-06T13:00:11+01:00 cfgt: rearrange mod parameters * use _cfgt_ prefix for init_flag --- Modified: src/modules/cfgt/cfgt.c Modified: src/modules/cfgt/cfgt.h Modified: src/modules/cfgt/cfgt_int.c Modified: src/modules/cfgt/cfgt_int.h Modified: src/modules/cfgt/cfgt_mod.c Modified: src/modules/cfgt/cfgt_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/8ca5d90a44166bf1a501680b2e01dfb… Patch: https://github.com/kamailio/kamailio/commit/8ca5d90a44166bf1a501680b2e01dfb…

1 0

git:master:b7b3f94f: core: xavp - serialize long long values
by Daniel-Constantin Mierla 06 Dec '23

06 Dec '23

Module: kamailio Branch: master Commit: b7b3f94f949feed3cf9e2e3adf3b4596e6e20eac URL: https://github.com/kamailio/kamailio/commit/b7b3f94f949feed3cf9e2e3adf3b459… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-06T08:48:39+01:00 core: xavp - serialize long long values - they are printed as unsigned values, same as for long values --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/b7b3f94f949feed3cf9e2e3adf3b459… Patch: https://github.com/kamailio/kamailio/commit/b7b3f94f949feed3cf9e2e3adf3b459… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 32d1cef8391..58f3a567611 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1147,24 +1147,35 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) switch(avp->val.type) { case SR_XTYPE_LONG: LM_DBG(" XAVP long int value: %ld\n", avp->val.v.l); - ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s=%lu%s", - pr, avp->name.len, avp->name.s, - (unsigned long)avp->val.v.l, sf); + ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s=%lu%s", pr, + avp->name.len, avp->name.s, (unsigned long)avp->val.v.l, + sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, - olen - rlen); + LM_ERR("failed to serialize long int value (%d/%d\n", + ostr.len, olen - rlen); + return -1; + } + break; + case SR_XTYPE_LLONG: + LM_DBG(" XAVP long long int value: %lld\n", avp->val.v.ll); + ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s=%llu%s", pr, + avp->name.len, avp->name.s, + (unsigned long long)avp->val.v.ll, sf); + if(ostr.len <= 0 || ostr.len >= olen - rlen) { + LM_ERR("failed to serialize long long value (%d/%d\n", + ostr.len, olen - rlen); return -1; } break; case SR_XTYPE_STR: LM_DBG(" XAVP str value: %s\n", avp->val.v.s.s); if(avp->val.v.s.len == 0) { - ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s%s", - pr, avp->name.len, avp->name.s, sf); + ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s%s", pr, + avp->name.len, avp->name.s, sf); } else { - ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s=%s%.*s%s%s", - pr, avp->name.len, avp->name.s, qs, avp->val.v.s.len, - avp->val.v.s.s, qs, sf); + ostr.len = snprintf(ostr.s, olen - rlen, + "%s%.*s=%s%.*s%s%s", pr, avp->name.len, avp->name.s, + qs, avp->val.v.s.len, avp->val.v.s.s, qs, sf); } if(ostr.len <= 0 || ostr.len >= olen - rlen) { LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, @@ -1634,8 +1645,19 @@ int xavu_serialize_fields(str *rname, char *obuf, int olen) avu->name.len, avu->name.s, (unsigned long)avu->val.v.l); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, - olen - rlen); + LM_ERR("failed to serialize long int value (%d/%d\n", + ostr.len, olen - rlen); + return -1; + } + break; + case SR_XTYPE_LLONG: + LM_DBG(" XAVP long long int value: %lld\n", avu->val.v.ll); + ostr.len = snprintf(ostr.s, olen - rlen, "%.*s=%llu;", + avu->name.len, avu->name.s, + (unsigned long long)avu->val.v.ll); + if(ostr.len <= 0 || ostr.len >= olen - rlen) { + LM_ERR("failed to serialize long long value (%d/%d\n", + ostr.len, olen - rlen); return -1; } break; @@ -2597,8 +2619,19 @@ int xavi_serialize_fields(str *rname, char *obuf, int olen) avi->name.len, avi->name.s, (unsigned long)avi->val.v.l); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, - olen - rlen); + LM_ERR("failed to serialize long int value (%d/%d\n", + ostr.len, olen - rlen); + return -1; + } + break; + case SR_XTYPE_LLONG: + LM_DBG(" XAVP long long int value: %lld\n", avi->val.v.ll); + ostr.len = snprintf(ostr.s, olen - rlen, "%.*s=%llu;", + avi->name.len, avi->name.s, + (unsigned long long)avi->val.v.ll); + if(ostr.len <= 0 || ostr.len >= olen - rlen) { + LM_ERR("failed to serialize long long value (%d/%d\n", + ostr.len, olen - rlen); return -1; } break;

1 0

git:master:e0909ab1: topoh: init vars inside th_build_socket_strings()
by Daniel-Constantin Mierla 06 Dec '23

06 Dec '23

Module: kamailio Branch: master Commit: e0909ab1c890b11204dd38b26283cba5fad289c7 URL: https://github.com/kamailio/kamailio/commit/e0909ab1c890b11204dd38b26283cba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-06T08:48:39+01:00 topoh: init vars inside th_build_socket_strings() --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e0909ab1c890b11204dd38b26283cba… Patch: https://github.com/kamailio/kamailio/commit/e0909ab1c890b11204dd38b26283cba… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index d40f70fdd86..02098b1c1b0 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -312,9 +312,9 @@ int th_build_uri_prefix(str *uri_prefix, str *ip) */ int th_build_socket_strings(socket_info_t *socket) { - struct th_socket_strings *socket_strings; - struct str_hash_entry *table_entry; - str *socket_ip; + struct th_socket_strings *socket_strings = NULL; + struct str_hash_entry *table_entry = NULL; + str *socket_ip = NULL; if(str_hash_get( th_socket_hash_table, socket->sockname.s, socket->sockname.len)

1 0

git:master:a096684c: github: devcontainer support force build parameter [skip ci]
by Victor Seva 06 Dec '23

06 Dec '23

Module: kamailio Branch: master Commit: a096684c69bd121ba5e60f682e236f621f0e343b URL: https://github.com/kamailio/kamailio/commit/a096684c69bd121ba5e60f682e236f6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-06T01:57:51+01:00 github: devcontainer support force build parameter [skip ci] --- Modified: .github/workflows/devcontainer.yaml --- Diff: https://github.com/kamailio/kamailio/commit/a096684c69bd121ba5e60f682e236f6… Patch: https://github.com/kamailio/kamailio/commit/a096684c69bd121ba5e60f682e236f6… --- diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml index 3321b4feec4..bfecd095f55 100644 --- a/.github/workflows/devcontainer.yaml +++ b/.github/workflows/devcontainer.yaml @@ -7,6 +7,11 @@ name: build devcontainer image - master # Allows you to run this workflow manually from the Actions tab workflow_dispatch: + inputs: + force: + required: true + type: boolean + default: false env: DIST: bookworm @@ -26,12 +31,14 @@ jobs: run: echo ${{ github.sha }} - name: Get changed files + if: ${{ ! inputs.force }} id: changed-files uses: tj-actions/changed-files@v40 with: since_last_remote_commit: true - name: changes in relevant files + if: ${{ ! inputs.force }} id: changed-files-builder uses: tj-actions/changed-files@v40 with: @@ -40,7 +47,7 @@ jobs: pkg/kamailio/deb/${{ env.DIST }}/** - name: Login to GitHub Container Registry - if: steps.changed-files-builder.outputs.any_changed == 'true' + if: steps.changed-files-builder.outputs.any_changed == 'true' || inputs.force uses: docker/login-action@v3 with: registry: ghcr.io @@ -48,7 +55,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Pre-build dev container image - if: steps.changed-files-builder.outputs.any_changed == 'true' + if: steps.changed-files-builder.outputs.any_changed == 'true' || inputs.force uses: devcontainers/ci(a)v0.3 with: imageName: ghcr.io/${{ github.repository_owner }}/kamailio-${{ github.ref_name }}-devcontainer

1 0

[kamailio/kamailio] phonenum: cannot build on Fedora 39 (Issue #3659)
by sergey-safarov 05 Dec '23

05 Dec '23

``` LD (gcc) [M db_perlvdb.so] db_perlvdb.so CC (gcc) [M phonenum.so] phonenum_mod.o CC (gcc) [M phonenum.so] phonenum_pv.o Compiling cphonenumber.cpp g++ -std=c++11 -fPIC -DPIC -g -funroll-loops -Wcast-align -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing -fPIC -DPIC -g -funroll-loops -Wcast-align -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -DNAME='"kamailio"' -DVERSION='"5.7.2"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 13.2.1"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5007002 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/local/include -DMOD_NAME='"phonenum"' -c cphonenumber.cpp -o cphonenumber.o In file included from /usr/include/absl/base/config.h:86, from /usr/include/absl/base/const_init.h:25, from /usr/include/absl/synchronization/mutex.h:67, from /usr/include/phonenumbers/geocoding/phonenumber_offline_geocoder.h:24, from cphonenumber.cpp:24: /usr/include/absl/base/policy_checks.h:79:2: error: #error "C++ versions less than C++14 are not supported." 79 | #error "C++ versions less than C++14 are not supported." | ^~~~~ In file included from /usr/include/absl/time/time.h:89, from /usr/include/absl/time/clock.h:26, from /usr/include/absl/synchronization/internal/kernel_timeout.h:30, from /usr/include/absl/synchronization/mutex.h:74: /usr/include/absl/strings/string_view.h:52:26: error: ‘string_view’ in namespace ‘std’ does not name a type 52 | using string_view = std::string_view; | ^~~~~~~~~~~ /usr/include/absl/strings/string_view.h:52:21: note: ‘std::string_view’ is only available from C++17 onwards 52 | using string_view = std::string_view; | ^~~ /usr/include/absl/strings/string_view.h:686:8: error: ‘string_view’ does not name a type 686 | inline string_view ClippedSubstr(string_view s, size_t pos, | ^~~~~~~~~~~ /usr/include/absl/strings/string_view.h:697:11: error: ‘string_view’ does not name a type 697 | constexpr string_view NullSafeStringView(const char* p) { | ^~~~~~~~~~~ In file included from /usr/include/absl/time/time.h:90: /usr/include/absl/time/civil_time.h:489:27: error: ‘string_view’ is not a member of ‘absl’ 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:489:53: error: expected primary-expression before ‘*’ token 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^ /usr/include/absl/time/civil_time.h:489:55: error: ‘c’ was not declared in this scope 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^ /usr/include/absl/time/civil_time.h:489:56: error: expression list treated as compound expression in initializer [-fpermissive] 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^ /usr/include/absl/time/civil_time.h:490:6: error: redefinition of ‘bool absl::lts_20230802::ParseCivilTime’ 490 | bool ParseCivilTime(absl::string_view s, CivilMinute* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:489:6: note: ‘bool absl::lts_20230802::ParseCivilTime’ previously defined here 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:490:27: error: ‘string_view’ is not a member of ‘absl’ 490 | bool ParseCivilTime(absl::string_view s, CivilMinute* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:490:53: error: expected primary-expression before ‘*’ token 490 | bool ParseCivilTime(absl::string_view s, CivilMinute* c); | ^ /usr/include/absl/time/civil_time.h:490:55: error: ‘c’ was not declared in this scope 490 | bool ParseCivilTime(absl::string_view s, CivilMinute* c); | ^ /usr/include/absl/time/civil_time.h:491:6: error: redefinition of ‘bool absl::lts_20230802::ParseCivilTime’ 491 | bool ParseCivilTime(absl::string_view s, CivilHour* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:489:6: note: ‘bool absl::lts_20230802::ParseCivilTime’ previously defined here 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:491:27: error: ‘string_view’ is not a member of ‘absl’ 491 | bool ParseCivilTime(absl::string_view s, CivilHour* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:491:51: error: expected primary-expression before ‘*’ token 491 | bool ParseCivilTime(absl::string_view s, CivilHour* c); | ^ /usr/include/absl/time/civil_time.h:491:53: error: ‘c’ was not declared in this scope 491 | bool ParseCivilTime(absl::string_view s, CivilHour* c); | ^ /usr/include/absl/time/civil_time.h:492:6: error: redefinition of ‘bool absl::lts_20230802::ParseCivilTime’ 492 | bool ParseCivilTime(absl::string_view s, CivilDay* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:489:6: note: ‘bool absl::lts_20230802::ParseCivilTime’ previously defined here 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:492:27: error: ‘string_view’ is not a member of ‘absl’ 492 | bool ParseCivilTime(absl::string_view s, CivilDay* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:492:50: error: expected primary-expression before ‘*’ token 492 | bool ParseCivilTime(absl::string_view s, CivilDay* c); | ^ /usr/include/absl/time/civil_time.h:492:52: error: ‘c’ was not declared in this scope 492 | bool ParseCivilTime(absl::string_view s, CivilDay* c); | ^ /usr/include/absl/time/civil_time.h:493:6: error: redefinition of ‘bool absl::lts_20230802::ParseCivilTime’ 493 | bool ParseCivilTime(absl::string_view s, CivilMonth* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:489:6: note: ‘bool absl::lts_20230802::ParseCivilTime’ previously defined here 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:493:27: error: ‘string_view’ is not a member of ‘absl’ 493 | bool ParseCivilTime(absl::string_view s, CivilMonth* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:493:52: error: expected primary-expression before ‘*’ token 493 | bool ParseCivilTime(absl::string_view s, CivilMonth* c); | ^ /usr/include/absl/time/civil_time.h:493:54: error: ‘c’ was not declared in this scope 493 | bool ParseCivilTime(absl::string_view s, CivilMonth* c); | ^ /usr/include/absl/time/civil_time.h:494:6: error: redefinition of ‘bool absl::lts_20230802::ParseCivilTime’ 494 | bool ParseCivilTime(absl::string_view s, CivilYear* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:489:6: note: ‘bool absl::lts_20230802::ParseCivilTime’ previously defined here 489 | bool ParseCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:494:27: error: ‘string_view’ is not a member of ‘absl’ 494 | bool ParseCivilTime(absl::string_view s, CivilYear* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:494:51: error: expected primary-expression before ‘*’ token 494 | bool ParseCivilTime(absl::string_view s, CivilYear* c); | ^ /usr/include/absl/time/civil_time.h:494:53: error: ‘c’ was not declared in this scope 494 | bool ParseCivilTime(absl::string_view s, CivilYear* c); | ^ /usr/include/absl/time/civil_time.h:509:34: error: ‘string_view’ is not a member of ‘absl’ 509 | bool ParseLenientCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:509:60: error: expected primary-expression before ‘*’ token 509 | bool ParseLenientCivilTime(absl::string_view s, CivilSecond* c); | ^ /usr/include/absl/time/civil_time.h:509:62: error: ‘c’ was not declared in this scope 509 | bool ParseLenientCivilTime(absl::string_view s, CivilSecond* c); | ^ /usr/include/absl/time/civil_time.h:509:63: error: expression list treated as compound expression in initializer [-fpermissive] 509 | bool ParseLenientCivilTime(absl::string_view s, CivilSecond* c); | ^ /usr/include/absl/time/civil_time.h:510:6: error: redefinition of ‘bool absl::lts_20230802::ParseLenientCivilTime’ 510 | bool ParseLenientCivilTime(absl::string_view s, CivilMinute* c); | ^~~~~~~~~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:509:6: note: ‘bool absl::lts_20230802::ParseLenientCivilTime’ previously defined here 509 | bool ParseLenientCivilTime(absl::string_view s, CivilSecond* c); | ^~~~~~~~~~~~~~~~~~~~~ /usr/include/absl/time/civil_time.h:510:34: error: ‘string_view’ is not a member of ‘absl’ 510 | bool ParseLenientCivilTime(absl::string_view s, CivilMinute* c); | ^~~~~~~~~~~ /usr/include/absl/time/civil_time.h:510:60: error: expected primary-expression before ‘*’ token 510 | bool ParseLenientCivilTime(absl::string_view s, CivilMinute* c); | ^ ``` Full log in the attached file [phonenum-build.log](https://github.com/kamailio/kamailio/files/13489193/pho… -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3659 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3659(a)github.com>

2 4

git:master:6dd5598f: phonenum: Makefile - option to set C standard version
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: 6dd5598fc043fe3d2582e643d7d4ef675c9e6480 URL: https://github.com/kamailio/kamailio/commit/6dd5598fc043fe3d2582e643d7d4ef6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-05T19:30:21+01:00 phonenum: Makefile - option to set C standard version - can be set via option CSTDVER - defaults now to c++17 - GH #3659 --- Modified: src/modules/phonenum/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/6dd5598fc043fe3d2582e643d7d4ef6… Patch: https://github.com/kamailio/kamailio/commit/6dd5598fc043fe3d2582e643d7d4ef6… --- diff --git a/src/modules/phonenum/Makefile b/src/modules/phonenum/Makefile index f465226a974..47780869232 100644 --- a/src/modules/phonenum/Makefile +++ b/src/modules/phonenum/Makefile @@ -7,6 +7,7 @@ NAME=phonenum.so CXX?=g++ LD?=g++ +CSTDVER?="c++17" LIBS+=-L$(LOCALBASE)/lib cphonenumber.o -lphonenumber -lgeocoding DEFS+=-I$(LOCALBASE)/include @@ -18,7 +19,7 @@ include ../../Makefile.modules cphonenumber.o: cphonenumber.cpp cphonenumber.h @echo "Compiling $<" - $(CXX) -std=c++11 $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ + $(CXX) -std=$(CSTDVER) $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ phonenum.so: cphonenumber.o

1 0

git:master:a9e02966: core: remove unnecessary condition on msg
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: a9e02966384cbcdf04aa16feb034b87e524352c9 URL: https://github.com/kamailio/kamailio/commit/a9e02966384cbcdf04aa16feb034b87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-05T15:08:50+01:00 core: remove unnecessary condition on msg - the structure is already used before --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/a9e02966384cbcdf04aa16feb034b87… Patch: https://github.com/kamailio/kamailio/commit/a9e02966384cbcdf04aa16feb034b87… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 51c3477c5ee..52307ce8ad8 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2517,7 +2517,7 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, } /* test and add xavp via reply params */ - if(msg && (msg->msg_flags & FL_ADD_XAVP_VIA_REPLY_PARAMS) + if((msg->msg_flags & FL_ADD_XAVP_VIA_REPLY_PARAMS) && _ksr_xavp_via_reply_params.len > 0) { xparams.s = pv_get_buffer(); xparams.len = xavp_serialize_fields_style(&_ksr_xavp_via_reply_params,

1 0

Updated: Online devel meeting on matrix - 15:00 UTC, Dec 5, 2023
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Hello, we should consider an online devel meeting sometime soon to summarize what was done at (and still needs to be done after) devel meeting in Dusseldorf and plan a bit the targets for next major release (5.8 or 6.0)? If considered useful, I propose Dec 5 at 15:00UTC (16:00 Berlin/Paris/Madrid/Rome), but we can also look for other dates as well. Topics to be discussed can be added at: - https://github.com/kamailio/kamailio-wiki/blob/main/docs/devel/irc-meetings… Pull requests can be made by users without git access. Cheers, Daniel PS: Previous announcement indicated the start time 14:30 UTC, this message changes it to 15:00 UTC - 30min later due to a constraint in availability of one of the Kamailio developers. -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 3

Kamailio + RTPEngine + TURN server to enable calling between WebRTC client and legacy SIP clients
by nguyenquocchinhdev＠gmail.com 05 Dec '23

05 Dec '23

Hi guys, Can anybody explain to me this flow. https://raw.githubusercontent.com/havfo/WEBRTC-to-SIP/master/images/webrtc-… And What will be done in 1,2,3,4,5. When a new connection the request flow is 1,2,3,4,5 order is created. 1: webRTC client -> SIp Server 2: SIP server -> SIP client 3: Kmailio -> RTPengine 4: SIP client -> RTPengine 5: RTPengine -> webRTC client

3 3

git:master:3a02bf42: ims_charging: log message on db updated error
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: 3a02bf42bc182e0eb809e63d8fe828e3ece5f1da URL: https://github.com/kamailio/kamailio/commit/3a02bf42bc182e0eb809e63d8fe828e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-05T12:26:22+01:00 ims_charging: log message on db updated error --- Modified: src/modules/ims_charging/ro_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/3a02bf42bc182e0eb809e63d8fe828e… Patch: https://github.com/kamailio/kamailio/commit/3a02bf42bc182e0eb809e63d8fe828e… --- diff --git a/src/modules/ims_charging/ro_db_handler.c b/src/modules/ims_charging/ro_db_handler.c index 7aaf6fb3a5d..d75126e33bc 100644 --- a/src/modules/ims_charging/ro_db_handler.c +++ b/src/modules/ims_charging/ro_db_handler.c @@ -717,7 +717,9 @@ void ro_update_db(unsigned int ticks, void *param) for(ro_session = ro_session_entry.first; ro_session != NULL; ro_session = ro_session->next) { - update_ro_dbinfo_unsafe(ro_session); + if(update_ro_dbinfo_unsafe(ro_session) != 0) { + LM_ERR("failed to update ro_session in DB\n"); + } } ro_session_unlock(ro_session_table, &ro_session_entry); }

1 0

git:master:4f6a2686: topoh: reorder conditions for safety of cleaning on error
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: 4f6a2686c01a65fe3a23e4d2057c7940eedcf12a URL: https://github.com/kamailio/kamailio/commit/4f6a2686c01a65fe3a23e4d2057c794… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-05T12:20:01+01:00 topoh: reorder conditions for safety of cleaning on error - in the part related to the new th_build_socket_strings() internal function --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4f6a2686c01a65fe3a23e4d2057c794… Patch: https://github.com/kamailio/kamailio/commit/4f6a2686c01a65fe3a23e4d2057c794… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index dbb08d83084..d40f70fdd86 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -357,14 +357,18 @@ int th_build_socket_strings(socket_info_t *socket) return 0; error: - if(socket_strings->ip.s != NULL) - pkg_free(socket_strings->ip.s); - if(table_entry->key.s != NULL) - pkg_free(table_entry->key.s); - if(table_entry != NULL) - pkg_free(table_entry); - if(socket_strings != NULL) + if(socket_strings != NULL) { + if(socket_strings->ip.s != NULL) { + pkg_free(socket_strings->ip.s); + } pkg_free(socket_strings); + } + if(table_entry != NULL) { + if(table_entry->key.s != NULL) { + pkg_free(table_entry->key.s); + } + pkg_free(table_entry); + } return -1; }

1 0

git:master:0d78a1ad: pkg/kamailio/deb: version set 5.8.0~dev2 [skip ci]
by Victor Seva 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: 0d78a1add4292ff1e10347c0199f0d70d31678ea URL: https://github.com/kamailio/kamailio/commit/0d78a1add4292ff1e10347c0199f0d7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-05T12:04:36+01:00 pkg/kamailio/deb: version set 5.8.0~dev2 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/0d78a1add4292ff1e10347c0199f0d7… Patch: https://github.com/kamailio/kamailio/commit/0d78a1add4292ff1e10347c0199f0d7…

1 0

git:master:6305adef: Makefile.defs: version set to 5.8.0-dev2
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: 6305adef50079891386a048b986fd27e9b6e7ca1 URL: https://github.com/kamailio/kamailio/commit/6305adef50079891386a048b986fd27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-05T12:00:00+01:00 Makefile.defs: version set to 5.8.0-dev2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/6305adef50079891386a048b986fd27… Patch: https://github.com/kamailio/kamailio/commit/6305adef50079891386a048b986fd27… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 075ac2041a6..68225943982 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 8 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:ca7e1e49: dialog: prevent duplicate of leg1 attributes in json for dmq
by Daniel-Constantin Mierla 05 Dec '23

05 Dec '23

Module: kamailio Branch: master Commit: ca7e1e49aecd3e0f12cc783e3b97868980f1d3d2 URL: https://github.com/kamailio/kamailio/commit/ca7e1e49aecd3e0f12cc783e3b97868… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-05T10:27:32+01:00 dialog: prevent duplicate of leg1 attributes in json for dmq - reported by #3656 --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/ca7e1e49aecd3e0f12cc783e3b97868… Patch: https://github.com/kamailio/kamailio/commit/ca7e1e49aecd3e0f12cc783e3b97868… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 419fa50a29c..bb8a69cffd6 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -535,6 +535,7 @@ int dlg_dmq_replicate_action(dlg_dmq_action_t action, dlg_cell_t *dlg, &jdoc, jdoc.root, "to_uri", dlg->to_uri.s, dlg->to_uri.len); srjson_AddStrToObject(&jdoc, jdoc.root, "req_uri", dlg->req_uri.s, dlg->req_uri.len); + srjson_AddStrToObject( &jdoc, jdoc.root, "tag1", dlg->tag[0].s, dlg->tag[0].len); srjson_AddStrToObject(&jdoc, jdoc.root, "cseq1", dlg->cseq[0].s, @@ -578,14 +579,16 @@ int dlg_dmq_replicate_action(dlg_dmq_action_t action, dlg_cell_t *dlg, srjson_AddNumberToObject( &jdoc, jdoc.root, "lifetime", dlg->lifetime); - srjson_AddStrToObject(&jdoc, jdoc.root, "tag1", - dlg->tag[0].s, dlg->tag[0].len); - srjson_AddStrToObject(&jdoc, jdoc.root, "cseq1", - dlg->cseq[0].s, dlg->cseq[0].len); - srjson_AddStrToObject(&jdoc, jdoc.root, "route_set1", - dlg->route_set[0].s, dlg->route_set[0].len); - srjson_AddStrToObject(&jdoc, jdoc.root, "contact1", - dlg->contact[0].s, dlg->contact[0].len); + if(action != DLG_DMQ_UPDATE) { + srjson_AddStrToObject(&jdoc, jdoc.root, "tag1", + dlg->tag[0].s, dlg->tag[0].len); + srjson_AddStrToObject(&jdoc, jdoc.root, "cseq1", + dlg->cseq[0].s, dlg->cseq[0].len); + srjson_AddStrToObject(&jdoc, jdoc.root, "route_set1", + dlg->route_set[0].s, dlg->route_set[0].len); + srjson_AddStrToObject(&jdoc, jdoc.root, "contact1", + dlg->contact[0].s, dlg->contact[0].len); + } break; case DLG_STATE_CONFIRMED: srjson_AddNumberToObject( @@ -593,23 +596,24 @@ int dlg_dmq_replicate_action(dlg_dmq_action_t action, dlg_cell_t *dlg, srjson_AddNumberToObject( &jdoc, jdoc.root, "lifetime", dlg->lifetime); - srjson_AddStrToObject(&jdoc, jdoc.root, "tag1", - dlg->tag[0].s, dlg->tag[0].len); + if(action != DLG_DMQ_UPDATE) { + srjson_AddStrToObject(&jdoc, jdoc.root, "tag1", + dlg->tag[0].s, dlg->tag[0].len); + srjson_AddStrToObject(&jdoc, jdoc.root, "cseq1", + dlg->cseq[0].s, dlg->cseq[0].len); + srjson_AddStrToObject(&jdoc, jdoc.root, "route_set1", + dlg->route_set[0].s, dlg->route_set[0].len); + srjson_AddStrToObject(&jdoc, jdoc.root, "contact1", + dlg->contact[0].s, dlg->contact[0].len); + } srjson_AddStrToObject(&jdoc, jdoc.root, "tag2", dlg->tag[1].s, dlg->tag[1].len); - srjson_AddStrToObject(&jdoc, jdoc.root, "cseq1", - dlg->cseq[0].s, dlg->cseq[0].len); srjson_AddStrToObject(&jdoc, jdoc.root, "cseq2", dlg->cseq[1].s, dlg->cseq[1].len); - srjson_AddStrToObject(&jdoc, jdoc.root, "route_set1", - dlg->route_set[0].s, dlg->route_set[0].len); srjson_AddStrToObject(&jdoc, jdoc.root, "route_set2", dlg->route_set[1].s, dlg->route_set[1].len); - srjson_AddStrToObject(&jdoc, jdoc.root, "contact1", - dlg->contact[0].s, dlg->contact[0].len); srjson_AddStrToObject(&jdoc, jdoc.root, "contact2", dlg->contact[1].s, dlg->contact[1].len); - break; case DLG_STATE_DELETED: //dlg->iflags &= ~DLG_IFLAG_DMQ_SYNC;

1 0

Jenkins build is still unstable: kamailiodev-nightly-binaries » amd64,stretch #2544
by kamailio＠sipwise.com 05 Dec '23

05 Dec '23

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

git:master:2f98aaca: ims_ipsec_pcscf: declare vars at beginning of the block
by Daniel-Constantin Mierla 04 Dec '23

04 Dec '23

Module: kamailio Branch: master Commit: 2f98aaca9e4b71b8086abce4c2b41c215fb2a26f URL: https://github.com/kamailio/kamailio/commit/2f98aaca9e4b71b8086abce4c2b41c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-04T20:33:40+01:00 ims_ipsec_pcscf: declare vars at beginning of the block --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/2f98aaca9e4b71b8086abce4c2b41c2… Patch: https://github.com/kamailio/kamailio/commit/2f98aaca9e4b71b8086abce4c2b41c2… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 80a714559ba..de61ad7cf6b 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -806,6 +806,10 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) struct pcontact_info ci; int ret = IPSEC_CMD_FAIL; // FAIL by default tm_cell_t *t = NULL; + sip_msg_t *req = NULL; + security_t *req_sec_params = NULL; + ipsec_t *s = NULL; + ipsec_t *old_s = NULL; if(m->first_line.type == SIP_REPLY) { t = tmb.t_gett(); @@ -847,12 +851,10 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) goto cleanup; } - struct sip_msg *req = t->uas.request; + req = t->uas.request; // Parse security parameters from the REGISTER request and get some data for the new tunnels - security_t *req_sec_params = cscf_get_security(req); - ipsec_t *s; - ipsec_t *old_s = NULL; + req_sec_params = cscf_get_security(req); // Update contacts only for initial registration, for re-registration the existing contacts shouldn't be updated. if(ci.via_port == SIP_PORT

1 0

git:master:812df264: ims_ipsec_pcscf: handle IPSec registration case where first SIP REGISTER does not have VIA port as 5060
by Daniel-Constantin Mierla 04 Dec '23

04 Dec '23

Module: kamailio Branch: master Commit: 812df26470b50d626ce9ee03b9272373b231ce2a URL: https://github.com/kamailio/kamailio/commit/812df26470b50d626ce9ee03b927237… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-04T20:29:40+01:00 ims_ipsec_pcscf: handle IPSec registration case where first SIP REGISTER does not have VIA port as 5060 --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/812df26470b50d626ce9ee03b927237… Patch: https://github.com/kamailio/kamailio/commit/812df26470b50d626ce9ee03b927237… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index c863eff5407..80a714559ba 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -855,7 +855,9 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) ipsec_t *old_s = NULL; // Update contacts only for initial registration, for re-registration the existing contacts shouldn't be updated. - if(ci.via_port == SIP_PORT) { + if(ci.via_port == SIP_PORT + || (pcontact->security_temp->data.ipsec->port_ps == 0 + && pcontact->security_temp->data.ipsec->port_pc == 0)) { LM_DBG("Registration for contact with AOR [%.*s], VIA [%d://%.*s:%d], " "received_host [%d://%.*s:%d]\n", ci.aor.len, ci.aor.s, ci.via_prot, ci.via_host.len,

1 0

[kamailio/kamailio] Hi, could you provide me with a .cfg demo for using SEMS as Announcements in the IMS module? (Issue #3662)
by Helloworld1668 04 Dec '23

04 Dec '23

Hello Kamailio team, I am an enthusiast of the Kamailio project, interested in an IMS project. I am working on integrating Kamailio with SEMS and am keen to utilize SEMS's Announcements (Prompts, Ringbacktones, Pre-call-prompts) feature. However, in the current project's PCSCF module, SEMS is being used as an SBC. Could you possibly provide some .cfg demos for using SEMS specifically for Announcements? I would greatly appreciate your assistance. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3662 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3662(a)github.com>

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev