- sr-dev - kamailio.org

git:5.7:dc393ec6: ChangeLog: content updated for v5.7.4
by Daniel-Constantin Mierla 18 Jan '24

18 Jan '24

Module: kamailio Branch: 5.7 Commit: dc393ec6d83dfe7efd9afbcc8d496afacea25775 URL: https://github.com/kamailio/kamailio/commit/dc393ec6d83dfe7efd9afbcc8d496af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-18T11:30:07+01:00 ChangeLog: content updated for v5.7.4 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/dc393ec6d83dfe7efd9afbcc8d496af… Patch: https://github.com/kamailio/kamailio/commit/dc393ec6d83dfe7efd9afbcc8d496af…

1 0

git:5.7:116ce498: Makefile.defs: version set to 5.7.4
by Daniel-Constantin Mierla 18 Jan '24

18 Jan '24

Module: kamailio Branch: 5.7 Commit: 116ce498cba50a071ee878e803dbcf63530688cc URL: https://github.com/kamailio/kamailio/commit/116ce498cba50a071ee878e803dbcf6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-18T10:49:23+01:00 Makefile.defs: version set to 5.7.4 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/116ce498cba50a071ee878e803dbcf6… Patch: https://github.com/kamailio/kamailio/commit/116ce498cba50a071ee878e803dbcf6… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5d485bb2c74..d393653c4a0 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 7 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = # memory manager switcher

1 0

git:5.7:743cfae4: pkg: deb specs updated for v5.7.4
by Daniel-Constantin Mierla 18 Jan '24

18 Jan '24

Module: kamailio Branch: 5.7 Commit: 743cfae479bed2e5f09ed8e1cd4f3a959299e3ab URL: https://github.com/kamailio/kamailio/commit/743cfae479bed2e5f09ed8e1cd4f3a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-18T10:30:20+01:00 pkg: deb specs updated for v5.7.4 --- 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/743cfae479bed2e5f09ed8e1cd4f3a9… Patch: https://github.com/kamailio/kamailio/commit/743cfae479bed2e5f09ed8e1cd4f3a9…

1 0

git:5.7:d5cf7148: pkg: version set to 5.7.4 for rpms and alpine specs
by Daniel-Constantin Mierla 18 Jan '24

18 Jan '24

Module: kamailio Branch: 5.7 Commit: d5cf7148375feb7d4202a07023caaeaeda3396c7 URL: https://github.com/kamailio/kamailio/commit/d5cf7148375feb7d4202a07023caaea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-18T09:30:38+01:00 pkg: version set to 5.7.4 for rpms and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d5cf7148375feb7d4202a07023caaea… Patch: https://github.com/kamailio/kamailio/commit/d5cf7148375feb7d4202a07023caaea… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index bf51c6ce047..506bf79dd30 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.7.3 +pkgver=5.7.4 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 28ebdc70ee4..e3e002dfa68 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.7.3 +%define ver 5.7.4 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing v5.7.4
by Daniel-Constantin Mierla 18 Jan '24

18 Jan '24

Hello, I am considering to release Kamailio v5.7.4 (out of branch 5.7) on Thursday, Jan 18, 2024. If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio Advanced Training, February 20-22, 2024 -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

1 1

git:master:79697b4d: pkg: RPM spec missing %description for sqlang
by S-P Chan 17 Jan '24

17 Jan '24

Module: kamailio Branch: master Commit: 79697b4d565665b696ee39021e27d82e716bc176 URL: https://github.com/kamailio/kamailio/commit/79697b4d565665b696ee39021e27d82… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-18T06:52:00+08:00 pkg: RPM spec missing %description for sqlang --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/79697b4d565665b696ee39021e27d82… Patch: https://github.com/kamailio/kamailio/commit/79697b4d565665b696ee39021e27d82… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 48c78435028..a7758b98e61 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1008,6 +1008,9 @@ Group: %{PKGGROUP} Requires: kamailio = %version BuildRequires: gcc-c++ +%description sqlang +Squirrel Language (SQLang) for Kamailio + %package sqlite Summary: SQLite database connectivity for Kamailio

1 0

git:master:d0e7aa54: pkg: RPM spec use automatic dependency for wolfssl
by S-P Chan 17 Jan '24

17 Jan '24

Module: kamailio Branch: master Commit: d0e7aa5405a293401ad19347cc062d1585d06956 URL: https://github.com/kamailio/kamailio/commit/d0e7aa5405a293401ad19347cc062d1… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-18T06:42:28+08:00 pkg: RPM spec use automatic dependency for wolfssl - wolfssl doesn't follow semantic versioning - let RPM figure out the correct runtime library name depending on the -devel package used for building i.e. based on the package used for pkgconfig(wolfssl) e.g. if wolfssl35-devel - then libwolfssl.so.35 if wolfssl42-devel - then libwolfssl.so.42 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d0e7aa5405a293401ad19347cc062d1… Patch: https://github.com/kamailio/kamailio/commit/d0e7aa5405a293401ad19347cc062d1… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ab556f5cd59..48c78435028 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1037,7 +1037,6 @@ TLS transport for Kamailio. %package tls_wolfssl Summary: TLS transport for Kamailio based on wolfSSL Group: %{PKGGROUP} -Requires: wolfssl>=5.6.4 BuildRequires: pkgconfig(wolfssl) %description tls_wolfssl

1 0

git:5.7:3b79c1ef: tls_wolfssl: clean-upâusing wolfSSL native naming for functions / structs
by S-P Chan 17 Jan '24

17 Jan '24

Module: kamailio Branch: 5.7 Commit: 3b79c1ef3cc6c1019fe7cb99ff77e0c51d8e789a URL: https://github.com/kamailio/kamailio/commit/3b79c1ef3cc6c1019fe7cb99ff77e0c… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-18T06:28:28+08:00 tls_wolfssl: clean-up��using wolfSSL native naming for functions / structs (cherry-pick from 5bbb224fdad1770150dd2fc37c69393aeda96d40) --- Modified: src/modules/tls_wolfssl/tls_bio.c Modified: src/modules/tls_wolfssl/tls_bio.h Modified: src/modules/tls_wolfssl/tls_select.c Modified: src/modules/tls_wolfssl/tls_server.c Modified: src/modules/tls_wolfssl/tls_util.h --- Diff: https://github.com/kamailio/kamailio/commit/3b79c1ef3cc6c1019fe7cb99ff77e0c… Patch: https://github.com/kamailio/kamailio/commit/3b79c1ef3cc6c1019fe7cb99ff77e0c…

1 0

git:master:5bbb224f: tls_wolfssl: clean-upâusing wolfSSL native naming for functions / structs
by S-P Chan 17 Jan '24

17 Jan '24

Module: kamailio Branch: master Commit: 5bbb224fdad1770150dd2fc37c69393aeda96d40 URL: https://github.com/kamailio/kamailio/commit/5bbb224fdad1770150dd2fc37c69393… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-18T06:25:19+08:00 tls_wolfssl: clean-up��using wolfSSL native naming for functions / structs --- Modified: src/modules/tls_wolfssl/tls_bio.c Modified: src/modules/tls_wolfssl/tls_bio.h Modified: src/modules/tls_wolfssl/tls_select.c Modified: src/modules/tls_wolfssl/tls_server.c Modified: src/modules/tls_wolfssl/tls_util.h --- Diff: https://github.com/kamailio/kamailio/commit/5bbb224fdad1770150dd2fc37c69393… Patch: https://github.com/kamailio/kamailio/commit/5bbb224fdad1770150dd2fc37c69393…

1 0

git:master:a752fde2: tls_wolfssl: update to v5.6.6-stable
by S-P Chan 17 Jan '24

17 Jan '24

Module: kamailio Branch: master Commit: a752fde2fd2eb3615d16eb8940364ceea2f7d79c URL: https://github.com/kamailio/kamailio/commit/a752fde2fd2eb3615d16eb8940364ce… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-16T16:06:45+08:00 tls_wolfssl: update to v5.6.6-stable --- Modified: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/a752fde2fd2eb3615d16eb8940364ce… Patch: https://github.com/kamailio/kamailio/commit/a752fde2fd2eb3615d16eb8940364ce… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index 37884f864d6..66596ad9e1d 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit 37884f864d6fd9b04f44677cb04da15d0c9d6526 +Subproject commit 66596ad9e1d7efa8479656872cf09c9c1870a02e

3 3

[kamailio/kamailio] kazoo: SIGSEGV on module unload (Issue #3648)
by sergey-safarov 17 Jan '24

17 Jan '24

On core load ``` Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio --atexit=no -DD -P /run/kamailio/kamailio.pid -f /etc/kamail'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x0000ffff94f36350 in strlen () from /lib64/libc.so.6 Missing separate debuginfos, use: yum debuginfo-install glibc-2.28-236.el8.aarch64 jansson-2.14-1.el8.aarch64 json-c-0.13.1-3.el8.aarch64 keyutils-libs-1.5.10-9.el8.aarch64 krb5-libs-1.18.2-25.el8.aarch64 libblkid-2.32.1-43.el8.aarch64 libcom_err-1.45.6-5.el8.aarch64 libcurl-minimal-7.61.1-33.el8.aarch64 libevent-2.1.8-5.el8.aarch64 libgcc-8.5.0-20.el8.aarch64 libmount-2.32.1-43.el8.aarch64 libnghttp2-1.33.0-3.el8_2.1.aarch64 librabbitmq-0.9.0-4.el8.aarch64 libselinux-2.9-8.el8.aarch64 libunistring-0.9.9-3.el8.aarch64 libuuid-2.32.1-43.el8.aarch64 libxml2-2.9.7-16.el8.aarch64 mariadb-connector-c-3.1.11-2.el8_3.aarch64 openssl-libs-1.1.1k-9.el8.aarch64 pcre-8.42-6.el8.aarch64 pcre2-10.32-3.el8.aarch64 systemd-libs-239-78.el8.aarch64 xz-libs-5.2.4-4.el8.aarch64 zlib-1.2.11-25.el8.aarch64 ``` **bt full** ``` #0 0x0000ffff94f36350 in strlen () from /lib64/libc.so.6 No symbol table info available. #1 0x0000ffff94f60c7c in vfprintf () from /lib64/libc.so.6 No symbol table info available. #2 0x0000ffff94fe500c in __vsyslog_chk () from /lib64/libc.so.6 No symbol table info available. #3 0x0000ffff94fe5110 in syslog () from /lib64/libc.so.6 No symbol table info available. #4 0x000000000077ebb8 in qm_status (qmp=0xffff8acee000) at core/mem/q_malloc.c:877 __llevel = -4 qm = 0xffff8acee000 f = 0xffff8c0e0c08 i = 5961 j = 9650680 h = 0 unused = 0 memlog = -4 mem_summary = 0 __func__ = "qm_status" __llevel = <optimized out> __kld = <optimized out> #5 0x0000000000772e30 in qm_debug_check_frag (qm=0xffff8acee000, f=0xffff8c0e0c08, file=0xffff8a2a47f0 "kazoo: kz_amqp.c", line=633, efile=0x934218 "core/mem/q_malloc.c", eline=511) at core/mem/q_malloc.c:139 p = 0xffffd0ed96e0 __func__ = "qm_debug_check_frag" #6 0x00000000007775c8 in qm_free (qmp=0xffff8acee000, p=0xffff8c0e0c40, file=0xffff8a2a47f0 "kazoo: kz_amqp.c", func=0xffff8a2abcb0 <__func__.18644> "kz_amqp_destroy_channels", line=633, mname=0xffff8a2a4350 "kazoo") at core/mem/q_malloc.c:511 qm = 0xffff8acee000 f = 0xffff8c0e0c08 size = 281472999768912 next = 0xd0ed9740 prev = 0x1 __func__ = "qm_free" #7 0x0000000000784058 in qm_shm_free (qmp=0xffff8acee000, p=0xffff8c0e0c40, file=0xffff8a2a47f0 "kazoo: kz_amqp.c", func=0xffff8a2abcb0 <__func__.18644> "kz_amqp_destroy_channels", line=633, mname=0xffff8a2a4350 "kazoo") at core/mem/q_malloc.c:1350 No locals. #8 0x0000ffff8a248270 in kz_amqp_destroy_channels (server_ptr=0xffff8ad28880) at kz_amqp.c:633 i = 25 __func__ = "kz_amqp_destroy_channels" #9 0x0000ffff8a2482b4 in kz_amqp_destroy_server (server_ptr=0xffff8ad28880) at kz_amqp.c:641 next = 0x0 __func__ = "kz_amqp_destroy_server" #10 0x0000ffff8a248388 in kz_amqp_destroy_zone (zone_ptr=0xffff8ad28410) at kz_amqp.c:652 next = 0xffff8ad28918 server_ptr = 0xffff8ad28880 __func__ = "kz_amqp_destroy_zone" #11 0x0000ffff8a248488 in kz_amqp_destroy_zones () at kz_amqp.c:664 g = 0xffff8ad28410 __func__ = "kz_amqp_destroy_zones" #12 0x0000ffff8a248510 in kz_amqp_destroy () at kz_amqp.c:672 __func__ = "kz_amqp_destroy" #13 0x0000ffff8a2402a0 in mod_destroy () at kazoo.c:541 __func__ = "mod_destroy" #14 0x00000000005e1670 in destroy_modules () at core/sr_module.c:842 t = 0xffff9379c750 foo = 0xffff9379b798 __func__ = "destroy_modules" #15 0x000000000041e81c in cleanup (show_status=1) at main.c:561 memlog = -767102331 __func__ = "cleanup" #16 0x00000000004208b4 in shutdown_children (sig=15, show_status=1) at main.c:704 __func__ = "shutdown_children" #17 0x00000000004217d0 in handle_sigs () at main.c:735 chld = 65535 chld_status = 0 any_chld_stopped = 0 memlog = 4407388 __func__ = "handle_sigs" #18 0x0000000000434058 in main_loop () at main.c:1900 i = 8 pid = 1350059 si = 0x0 si_desc = "udp receiver child=7 sock=[2605:84c0:51:1f04::6]:5080\000\000\000\360\234\355\320\377\377\000\000صx\223\377\377\000\000\300\234\355\320\377\377\000\000\250\303Փ\377\377\000\000\340\234\355\320\377\377\000\000\360\234\355\320\377\377\000\000\360\234\355\320\377\377\000\000\300\234\355\320\377\377\000\000\320\377\377\377\200\377\377\377" nrprocs = 8 woneinit = 1 __func__ = "main_loop" #19 0x000000000043f094 in main (argc=11, argv=0xffffd0eda278) at main.c:3078 cfg_stream = 0xec522a0 c = -1 r = 0 tmp = 0xffffd0edae66 "" tmp_len = 0 port = 0 proto = 65535 ahost = 0x0 aport = 0 options = 0x8c99d0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1225301378 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0xffffffff p = 0xffff94f39348 <__libc_start_main+160> "" st = {st_dev = 22, st_ino = 18918, st_mode = 16832, st_nlink = 2, st_uid = 992, st_gid = 987, st_rdev = 0, __pad1 = 0, st_size = 60, st_blksize = 4096, __pad2 = 0, st_blocks = 0, st_atim = {tv_sec = 1695127265, tv_nsec = 210164976}, st_mtim = {tv_sec = 1695742685, tv_nsec = 688032700}, st_ctim = {tv_sec = 1695742685, tv_nsec = 688032700}, __glibc_reserved = {0, 0}} tbuf = '\000' <repeats 56 times>, "xN!\225\377\377\000\000hN!\225\377\377\000\000\bN!\225\377\377\000\000(N!\225\377\377\000\000\070N!\225\377\377\000\000\250N!\225\377\377\000\000\270N!\225\377\377\000\000\310N!\225\377\377\000\000HN!\225\377\377\000\000XN!\225\377\377", '\000' <repeats 18 times>, "\330M!\225\377\377", '\000' <repeats 42 times>... option_index = 12 long_options = {{name = 0x8cbda8 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x8c6c10 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x8cbdb0 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x8cbdb8 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x8cbdc0 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x8cbdd0 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x8cbde0 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x8cbdf0 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x8cbe00 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x8cbe10 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x8cbe20 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x8cbe28 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x8cbe38 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` Some more info ``` (gdb) f 8 #8 0x0000ffff8a248270 in kz_amqp_destroy_channels (server_ptr=0xffff8ad28880) at kz_amqp.c:633 633 shm_free(server_ptr->channels); (gdb) list 628 for(i=0; i < dbk_channels; i++) { 629 if(server_ptr->channels[i].targeted != NULL) { 630 kz_amqp_free_bind(server_ptr->channels[i].targeted); 631 } 632 } 633 shm_free(server_ptr->channels); 634 server_ptr->channels = NULL; 635 } 636 637 kz_amqp_server_ptr kz_amqp_destroy_server(kz_amqp_server_ptr server_ptr) (gdb) p server_ptr $1 = (kz_amqp_server_ptr) 0xffff8ad28880 (gdb) p *server_ptr $2 = {id = 1, channel_index = 20, zone = 0xffff8ad28410, connection = 0xffff8ad28578, producer = 0xffff8c754700, channels = 0xffff8c0e0c40, next = 0x0} (gdb) p server_ptr->channels $3 = (kz_amqp_channel_ptr) 0xffff8c0e0c40 (gdb) p *server_ptr->channels $4 = {cmd = 0x0, targeted = 0xffff8c0e1220, consumer = 0x0, channel = 1, state = KZ_AMQP_CHANNEL_FREE, timer = {tv_sec = 1700266610, tv_usec = 250929}, lock = 0} (gdb) f 7 #7 0x0000000000784058 in qm_shm_free (qmp=0xffff8acee000, p=0xffff8c0e0c40, file=0xffff8a2a47f0 "kazoo: kz_amqp.c", func=0xffff8a2abcb0 <__func__.18644> "kz_amqp_destroy_channels", line=633, mname=0xffff8a2a4350 "kazoo") at core/mem/q_malloc.c:1350 1350 qm_free(qmp, p, file, func, line, mname); (gdb) list 1345 } 1346 void qm_shm_free(void* qmp, void* p, const char* file, const char* func, 1347 unsigned int line, const char* mname) 1348 { 1349 qm_shm_lock(); 1350 qm_free(qmp, p, file, func, line, mname); 1351 qm_shm_unlock(); 1352 } 1353 #else 1354 void* qm_shm_malloc(void* qmp, size_t size) ``` This happened on customized Kamailio 5.6.4 where reverted some commits. If it does not make sense for you please close. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3648 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3648(a)github.com>

2 2

[kamailio/kamailio] Kamailio 5.6 do not execute "event_route[websocket:closed]" when tcp reset (Issue #3389)
by ReznikovAlexei 17 Jan '24

17 Jan '24

### Description I have faced with an issue in Kamailio 5.6 when tcp closed reset by peer on remote side but Kamailio dont executing route block "event_route[websocket:closed]". ### Kamailio minimal config file ####### Global Parameters ######### listen=udp:192.168.31.81:5060 listen=tcp:192.168.31.81:5060 listen=tcp:192.168.31.81:7000 tcp_accept_no_cl=yes ######## Kamailio control connector module ######## loadmodule "tm.so" loadmodule "ctl.so" modparam("ctl", "binrpc_buffer_size", 4096) loadmodule "pv.so" loadmodule "sl.so" loadmodule "xlog.so" loadmodule "nathelper.so" loadmodule "xhttp.so" loadmodule "websocket.so" loadmodule "ipops.so" loadmodule "siputils.so" loadmodule "rr.so" loadmodule "usrloc.so" loadmodule "registrar.so" request_route { if(method=="REGISTER"){ save("location"); exit; } } event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); xlog("L_WARN", "websocket|log|connection from $si received!\n"); if ($hdr(Upgrade)=~"websocket" && $hdr(Connection)=~"Upgrade" && $rm=~"GET") { if (ws_handle_handshake()) { exit; } } xhttp_reply("404", "Not found", "", ""); } event_route[websocket:closed] { xlog("L_WARN", "websocket|log|connection from $si closed!\n"); } #### Reproduction ###Kamailio started and client sipml5 connected [root@centos8 kamailio]# sh /root/run_kamailio.sh Listening on udp: 192.168.31.81:5060 tcp: 192.168.31.81:5060 tcp: 192.168.31.81:7000 Aliases: tcp: centos8.local.tst:7000 tcp: centos8.local.tst:5060 udp: centos8.local.tst:5060 15(29286) WARNING: <script>: websocket|log|connection from 192.168.31.100 received! ### closing tcp connection by remote side C:\Users\Alex>netstat -ano | findstr :7000 TCP 192.168.31.100:51688 192.168.31.81:7000 ESTABLISHED 9624 C:\Users\Alex>taskkill /pid 9624 /F SUCCESS: The process with PID 9624 has been terminated. ### issue reproduced 17(29288) ERROR: <core> [core/tcp_read.c:272]: tcp_read_data(): error reading: Connection reset by peer (104) ([192.168.31.100]:51688 ->17(29288) ERROR: <core> [core/tcp_read.c:274]: tcp_read_data(): -> [192.168.31.81]:7000) 17(29288) ERROR: <core> [core/tcp_read.c:1478]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f47d5134ad0 r: 0x7f47d5134bf8 (-1) And nothing else but I am expecting something like that: this is output from Kamailio 5.5 where the issue not reproduced. 13(39207) WARNING: websocket [ws_frame.c:227]: encode_and_send_ws_frame(): TCP/TLS connection get failed 13(39207) ERROR: websocket [ws_frame.c:761]: ping_pong(): sending keepalive 14(39208) WARNING: <script>: websocket|log|connection from 192.168.31.100 closed! Also additional output ws.dump [root@centos8 kamailio]# kamcmd ws.dump { connections: { } info: { wscounter: 0 truncated: no } } ### Possible Solutions I found a commit which called this behavior https://github.com/kamailio/kamailio/commit/3033b7681b4240fd64c9f1ff446b529… If I was built Kamailo without this commit, the issue not reproduced, also the issue not reproduced in Kamailio 5.5 or older. ### Additional Information ``` [root@centos8 kamailio-5.6]# kamailio -v version: kamailio 5.6.4 (x86_64/linux) a004cf flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a004cf compiled on 11:09:28 Mar 6 2023 with gcc 8.5.0 ``` * **Operating System**: ``` [root@centos8 kamailio-5.6]# cat /etc/centos-release CentOS Stream release 8 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3389 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3389(a)github.com>

3 4

[kamailio/kamailio] core/cfg has memory leak if string value is set (#2094)
by Bastian Triller 17 Jan '24

17 Jan '24

### Description Setting string values via `cfg_rpc` leaves old strings in SHM. #### Reproduction  Set some string value to e.g. `tm.ac_extra_hdrs`: ```shell x=10 while [ $x -gt 0 ] ; do sudo kamctl rpc cfg.sets tm ac_extra_hdrs das$x >/dev/null sleep 0.001 x=$((x - 1)) done ``` #### Debugging Data After running above snippet four times: ``` sudo kamcmd cfg.set_now_int core mem_dump_shm 1 grep "^Oct 4 15:11:4.* qm_status:.*alloc'd" /var/log/syslog | cut -d: -f6- | sort | uniq -c | sort -n | grep core/cfg/cfg 1 alloc'd from core: core/cfg/cfg_struct.c: cfg_shmize(217) 1 alloc'd from core: core/cfg/cfg_struct.c: sr_cfg_init(322) 1 alloc'd from core: core/cfg/cfg_struct.c: sr_cfg_init(334) 1 alloc'd from core: core/cfg/cfg_struct.c: sr_cfg_init(346) 1 alloc'd from core: core/cfg/cfg_struct.c: sr_cfg_init(353) 1 alloc'd from core: core/cfg/cfg_struct.c: sr_cfg_init(360) 2 alloc'd from core: core/cfg/cfg_ctx.c: cfg_register_ctx(47) 3 alloc'd from core: core/cfg/cfg_struct.c: cfg_clone_global(625) 39 alloc'd from core: core/cfg/cfg_ctx.c: cfg_set_now(559) 40 alloc'd from core: core/cfg/cfg_struct.c: cfg_child_cb_new(828) 42 alloc'd from core: core/cfg/cfg_struct.c: cfg_clone_str(130) sudo kamcmd mod.stats core shm|grep \\bcfg_ cfg_clone_global(625): 1392 cfg_set_now(559): 624 cfg_clone_str(130): 384 cfg_shmize(217): 696 cfg_register_ctx(47): 64 cfg_child_cb_new(828): 2560 ``` memory values from cfg_clone_str addresses: ``` grep -B1 'Oct 4 15:11:4.*cfg_clone_str' /var/log/syslog|sed '/address=/!d' | cut -d: -f6- 55. N address=0x7f1310eab7f8 frag=0x7f1310eab7c0 size=40 used=1 56. N address=0x7f1310eab888 frag=0x7f1310eab850 size=24 used=1 62. N address=0x7f1310ec7b10 frag=0x7f1310ec7ad8 size=8 used=1 65. N address=0x7f1310ec7ca0 frag=0x7f1310ec7c68 size=8 used=1 68. N address=0x7f1310ec7e30 frag=0x7f1310ec7df8 size=8 used=1 69. N address=0x7f1310ec7ea0 frag=0x7f1310ec7e68 size=8 used=1 72. N address=0x7f1310ec8030 frag=0x7f1310ec7ff8 size=8 used=1 75. N address=0x7f1310ec81c0 frag=0x7f1310ec8188 size=8 used=1 78. N address=0x7f1310ec8350 frag=0x7f1310ec8318 size=8 used=1 81. N address=0x7f1310ec84e0 frag=0x7f1310ec84a8 size=8 used=1 84. N address=0x7f1310ec8670 frag=0x7f1310ec8638 size=8 used=1 87. N address=0x7f1310ec8800 frag=0x7f1310ec87c8 size=8 used=1 90. N address=0x7f1310ec8990 frag=0x7f1310ec8958 size=8 used=1 93. N address=0x7f1310ec8b20 frag=0x7f1310ec8ae8 size=8 used=1 96. N address=0x7f1310ec8cb0 frag=0x7f1310ec8c78 size=8 used=1 99. N address=0x7f1310ec8e40 frag=0x7f1310ec8e08 size=8 used=1 103. N address=0x7f1310ec92f0 frag=0x7f1310ec92b8 size=8 used=1 106. N address=0x7f1310ec9480 frag=0x7f1310ec9448 size=8 used=1 109. N address=0x7f1310ec9610 frag=0x7f1310ec95d8 size=8 used=1 112. N address=0x7f1310ec97a0 frag=0x7f1310ec9768 size=8 used=1 115. N address=0x7f1310ec9930 frag=0x7f1310ec98f8 size=8 used=1 118. N address=0x7f1310ec9ac0 frag=0x7f1310ec9a88 size=8 used=1 121. N address=0x7f1310ec9c50 frag=0x7f1310ec9c18 size=8 used=1 124. N address=0x7f1310ec9de0 frag=0x7f1310ec9da8 size=8 used=1 127. N address=0x7f1310ec9f70 frag=0x7f1310ec9f38 size=8 used=1 131. N address=0x7f1310eca420 frag=0x7f1310eca3e8 size=8 used=1 134. N address=0x7f1310eca5b0 frag=0x7f1310eca578 size=8 used=1 137. N address=0x7f1310eca740 frag=0x7f1310eca708 size=8 used=1 140. N address=0x7f1310eca8d0 frag=0x7f1310eca898 size=8 used=1 144. N address=0x7f1310ecad80 frag=0x7f1310ecad48 size=8 used=1 147. N address=0x7f1310ecaf10 frag=0x7f1310ecaed8 size=8 used=1 150. N address=0x7f1310ecb0a0 frag=0x7f1310ecb068 size=8 used=1 153. N address=0x7f1310ecb230 frag=0x7f1310ecb1f8 size=8 used=1 156. N address=0x7f1310ecb3c0 frag=0x7f1310ecb388 size=8 used=1 159. N address=0x7f1310ecb550 frag=0x7f1310ecb518 size=8 used=1 162. N address=0x7f1310ecb6e0 frag=0x7f1310ecb6a8 size=8 used=1 165. N address=0x7f1310ecb870 frag=0x7f1310ecb838 size=8 used=1 168. N address=0x7f1310ecba00 frag=0x7f1310ecb9c8 size=8 used=1 172. N address=0x7f1310ecbeb0 frag=0x7f1310ecbe78 size=8 used=1 175. N address=0x7f1310ecc040 frag=0x7f1310ecc008 size=8 used=1 178. N address=0x7f1310ecc1d0 frag=0x7f1310ecc198 size=8 used=1 181. N address=0x7f1310ecc360 frag=0x7f1310ecc328 size=8 used=1 0x7f1310eab7f8: "trying -- your call is important to us" 0x7f1310eab888: "Server Internal Error" 0x7f1310ec7b10: "das10" 0x7f1310ec7ca0: "das9" 0x7f1310ec7e30: "das10" 0x7f1310ec7ea0: "das10" 0x7f1310ec8030: "das9" 0x7f1310ec81c0: "das9" 0x7f1310ec8350: "das8" 0x7f1310ec84e0: "das7" 0x7f1310ec8670: "das6" 0x7f1310ec8800: "das5" 0x7f1310ec8990: "das4" 0x7f1310ec8b20: "das3" 0x7f1310ec8cb0: "das2" 0x7f1310ec8e40: "das1" 0x7f1310ec92f0: "das10" 0x7f1310ec9480: "das9" 0x7f1310ec9610: "das8" 0x7f1310ec97a0: "das7" 0x7f1310ec9930: "das6" 0x7f1310ec9ac0: "das5" 0x7f1310ec9c50: "das4" 0x7f1310ec9de0: "das3" 0x7f1310ec9f70: "das2" 0x7f1310eca420: "das1" 0x7f1310eca5b0: "das8" 0x7f1310eca740: "das7" 0x7f1310eca8d0: "das6" 0x7f1310ecad80: "das5" 0x7f1310ecaf10: "das4" 0x7f1310ecb0a0: "das3" 0x7f1310ecb230: "das2" 0x7f1310ecb3c0: "das1" 0x7f1310ecb550: "das8" 0x7f1310ecb6e0: "das7" 0x7f1310ecb870: "das6" 0x7f1310ecba00: "das5" 0x7f1310ecbeb0: "das4" 0x7f1310ecc040: "das3" 0x7f1310ecc1d0: "das2" 0x7f1310ecc360: "das1" ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` /usr/sbin/kamailio -v version: kamailio 5.2.4 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 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.11 ``` -- 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/issues/2094

5 13

git:5.7:784bb3b3: tls: set parameter name for tls_h_mod_randctx()
by Elena-Ramona Modroiu 16 Jan '24

16 Jan '24

Module: kamailio Branch: 5.7 Commit: 784bb3b397cc1922d06054c611c443dd19216504 URL: https://github.com/kamailio/kamailio/commit/784bb3b397cc1922d06054c611c443d… Author: Elena-Ramona Modroiu <anomarme(a)users.noreply.github.com> Committer: Elena-Ramona Modroiu <anomarme(a)gmail.com> Date: 2024-01-16T16:13:19+01:00 tls: set parameter name for tls_h_mod_randctx() - without it fails to compile on Unbuntu 22.04 with low latency kernel (cherry picked from commit 03456e5e5983e2236b8e182cf3317d14ebf34e18) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/784bb3b397cc1922d06054c611c443d… Patch: https://github.com/kamailio/kamailio/commit/784bb3b397cc1922d06054c611c443d… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 629f69ad6b3..1c6b19f560e 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -737,7 +737,8 @@ int tls_pre_init(void) * left here in case more complex requirements arise in * OpenSSL >= 3.2. */ -long tls_h_mod_randctx(void *) { +long tls_h_mod_randctx(void *param) +{ do { OSSL_LIB_CTX *osslglobal = NULL; EVP_RAND_CTX *randctx = NULL;

1 0

git:master:03456e5e: tls: set parameter name for tls_h_mod_randctx()
by GitHub 16 Jan '24

16 Jan '24

Module: kamailio Branch: master Commit: 03456e5e5983e2236b8e182cf3317d14ebf34e18 URL: https://github.com/kamailio/kamailio/commit/03456e5e5983e2236b8e182cf3317d1… Author: Elena-Ramona Modroiu <anomarme(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2024-01-16T16:07:43+01:00 tls: set parameter name for tls_h_mod_randctx() - without it fails to compile on Unbuntu 22.04 with low latency kernel --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/03456e5e5983e2236b8e182cf3317d1… Patch: https://github.com/kamailio/kamailio/commit/03456e5e5983e2236b8e182cf3317d1… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index bb1d0f19207..6992d4a65e2 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -739,7 +739,8 @@ int tls_pre_init(void) * left here in case more complex requirements arise in * OpenSSL >= 3.2. */ -long tls_h_mod_randctx(void *) { +long tls_h_mod_randctx(void *param) +{ do { OSSL_LIB_CTX *osslglobal = NULL; EVP_RAND_CTX *randctx = NULL;

1 0

git: new commits in branch 5.7
by Daniel-Constantin Mierla 16 Jan '24

16 Jan '24

- URL: https://github.com/kamailio/kamailio/commit/18fead63dca0982df500b35b7c4e2d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:10:53+01:00 core: set proto on fixing forward actions (cherry picked from commit e51ccd11fe51f2d53dd7719b8fdec561a6ba7494) - URL: https://github.com/kamailio/kamailio/commit/065203150aaf2f99bd6fe40ce5ffb96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:16:40+01:00 dialog: prevent duplicate of leg1 attributes in json for dmq - reported by #3656 (cherry picked from commit ca7e1e49aecd3e0f12cc783e3b97868980f1d3d2) - URL: https://github.com/kamailio/kamailio/commit/3046d01bed4bdd0fe763fd770ffc8f7… Author: Pe��ter Baraba��s <peter.barabas(a)securesoft.hu> Date: 2024-01-16T11:18:24+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 (cherry picked from commit 10519d199f6cac116399f4473bd82f2b08de72ba) - URL: https://github.com/kamailio/kamailio/commit/81dce4e5003f3c00301671144ac6787… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:20:20+01:00 core: xavp - info long when skipping serializing a field (cherry picked from commit 5d97afefd2a8f53072a36b6eb8927c180fb984c9) - URL: https://github.com/kamailio/kamailio/commit/37621005e38a0191a93fbaf4f39b8b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:21:55+01:00 dialog: check first the size (cherry picked from commit 9db18bc48bff0d230e66973a45c8e72e1b7744e8) - URL: https://github.com/kamailio/kamailio/commit/1189bb2962dd80c21a1d497125f3199… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:23:24+01:00 tm: check get_t() result for consistency (cherry picked from commit 1191ab4e5e03b35714ec1ad9d9bf2dd9665c71fd) - URL: https://github.com/kamailio/kamailio/commit/0712576dc4d57ba41e45012486dd206… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:23:49+01:00 registrar: check returned branch pointer (cherry picked from commit 5d641f56fc1bc342d9be008ecd96959e114fef66) - URL: https://github.com/kamailio/kamailio/commit/62b76c076ff0f36b847a13c180b7d50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:24:10+01:00 core: check if conversion could not be done (cherry picked from commit 077651fa3bfd50e0f654c907f3783b1421497bd5) - URL: https://github.com/kamailio/kamailio/commit/4371adffc07bb555e2a52dedd6cd5af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:24:20+01:00 app_python3: check allocated pointer (cherry picked from commit 49b3b90cd229b7c4da06b61cdfd782450d383cc9) - URL: https://github.com/kamailio/kamailio/commit/0ca30e87655798e3841c005abb63ca6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:24:53+01:00 core: srjson - init vars and check scanned values (cherry picked from commit 678b1a68de86d9539adeaf0262d9735b8d435077) - URL: https://github.com/kamailio/kamailio/commit/2d385c1983a921a95fb392e8aea0332… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:25:18+01:00 pv: typo in transformation log message (cherry picked from commit ca2a9479adf720e67bf50c9d2795cc8937e223dc) - URL: https://github.com/kamailio/kamailio/commit/5a26d9e9fba36a49a93bb3b88683661… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:25:38+01:00 pv: removed unnecessary condition (cherry picked from commit 2f43510be37c157f800389dfb432b6c52d7435a7) - URL: https://github.com/kamailio/kamailio/commit/916d02d883dc938247576bdf8f5c5b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:27:30+01:00 tm: make lookup event_route[tm:local-response] only once - related to issue #3064 and PR #3687 (cherry picked from commit 1f5444fd2e25d227ffd70f1087d057a3b8002558) - URL: https://github.com/kamailio/kamailio/commit/6cd8f2acc0601fbd040999d776f15b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:28:03+01:00 tmx: rework cleaning up on init failure (cherry picked from commit 5192e5d275761ccd1af49d4bf9dd12e1438947b7) - URL: https://github.com/kamailio/kamailio/commit/fc0bd88b55121e3588f5793480f0594… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:28:34+01:00 statsd: use bool type for local variable to match return of function (cherry picked from commit 0186246fce8f0e4bb46b30c05174983cd957a3ba) - URL: https://github.com/kamailio/kamailio/commit/be5b4b160ecff8dc398735fbd28ceb7… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Date: 2024-01-16T11:29:08+01:00 core: fixed haproxy protocol parser fixes GH #3683 (cherry picked from commit c5237830f3e7fbeec403a0190471a066081c1117) - URL: https://github.com/kamailio/kamailio/commit/37a07037b6e3485f3ddd1b27b1998af… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2024-01-16T11:29:22+01:00 dialog: fixed saving dialogs on shutdown that are already loaded at startup when using db_mode 3 - The dialogs that loaded at startup are not saved in DB on shutdown, and so not loaded at restart, fixes issue #3669 (cherry picked from commit 2d00ce546bb0852dc1784d5bc2e794d06f919577) - URL: https://github.com/kamailio/kamailio/commit/dc59286c26e9799f86e698a9698c9da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:31:59+01:00 htable: read rpc number value as long - remove autoconvert for number, it is only for string values - GH #3674 (cherry picked from commit 577fb11010ff61af3c4b567581c0bbc5404654c8) - URL: https://github.com/kamailio/kamailio/commit/2dff6f52d1393cf8eabe714262ec8e5… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-01-16T11:32:25+01:00 http_async_client: exit mod_init if tm is not loaded (cherry picked from commit 5a40d1ef1b484c4fc437a3f0183a101241e80313) - URL: https://github.com/kamailio/kamailio/commit/a539ca32ec3a898e354aab90d899b99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:32:57+01:00 core: keep listen socket even if advertise address does not resolve - the core advertise_address parameter works in the same fashion - previously it was starting by skipping the listen, which resulted in unexpected runtime list of sockets (cherry picked from commit b50036200c5bc09fd2d412a18585b42d63763b27)

1 0

git:master:14828091: rtp_media_server: use local user for building contact
by Daniel-Constantin Mierla 16 Jan '24

16 Jan '24

Module: kamailio Branch: master Commit: 14828091b06dca86c91659d705a4f58a6fead4d3 URL: https://github.com/kamailio/kamailio/commit/14828091b06dca86c91659d705a4f58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T13:10:34+01:00 rtp_media_server: use local user for building contact - GH #3380 --- Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/14828091b06dca86c91659d705a4f58… Patch: https://github.com/kamailio/kamailio/commit/14828091b06dca86c91659d705a4f58… --- diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index 0026c2e0fff..a41b5715022 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -408,12 +408,27 @@ static int rms_sip_reply( return 1; } +static str _rms_default_user = str_init("rms"); +static void rms_link_user(str *suri, str *suser) +{ + sip_uri_t puri; + if(parse_uri(suri->s, suri->len, &puri) < 0 || puri.user.s == NULL + || puri.user.len <= 0) { + suser->s = _rms_default_user.s; + suser->len = _rms_default_user.len; + return; + } + suser->s = puri.user.s; + suser->len = puri.user.len; +} + static int rms_answer_call( struct cell *cell, rms_dialog_info_t *di, rms_sdp_info_t *sdp_info) { - char buffer[128]; + char buffer[256]; str reason = str_init("OK"); str contact_hdr; + str luser; if(di->state == RMS_ST_CONNECTED) { return 1; } @@ -428,9 +443,10 @@ static int rms_answer_call( sdp_info->local_ip.s = di->local_ip.s; sdp_info->local_ip.len = di->local_ip.len; - snprintf(buffer, 128, - "Contact: <sip:rms@%s:%d>\r\nContent-Type: application/sdp\r\n", - di->local_ip.s, di->local_port); + rms_link_user(&di->local_uri, &luser); + snprintf(buffer, 256, + "Contact: <sip:%.*s@%s:%d>\r\nContent-Type: application/sdp\r\n", + luser.len, luser.s, di->local_ip.s, di->local_port); contact_hdr.len = strlen(buffer); contact_hdr.s = buffer; @@ -592,6 +608,7 @@ static int rms_bridging_call(rms_dialog_info_t *di, rms_action_t *a) int result; str method_invite = str_init("INVITE"); str headers; + str luser; struct sip_uri ruri_t; str *param_uri = &a->param; @@ -609,10 +626,11 @@ static int rms_bridging_call(rms_dialog_info_t *di, rms_action_t *a) goto error; } + rms_link_user(&di->local_uri, &luser); snprintf(buff, 256, "Max-Forwards: 70\r\nContact: " - "<sip:rms@%s:%d>\r\nContent-Type: application/sdp\r\n", - di->local_ip.s, di->local_port); + "<sip:%.*s@%s:%d>\r\nContent-Type: application/sdp\r\n", + luser.len, luser.s, di->local_ip.s, di->local_port); headers.len = strlen(buff); headers.s = buff; LM_INFO("si[%p]call-id[%.*s]cseq[%d]ruri[%d|%s]remote_uri[%s]local_uri[%s]" @@ -997,6 +1015,7 @@ static int rms_sip_forward( int result; str headers; char buff[1024]; + str luser; if(!rms_create_trans(msg)) return 0; @@ -1020,10 +1039,11 @@ static int rms_sip_forward( return 0; } + rms_link_user(&di->local_uri, &luser); snprintf(buff, 256, "Max-Forwards: 70\r\nContact: " - "<sip:rms@%s:%d>\r\nContent-Type: application/sdp\r\n", - di->local_ip.s, di->local_port); + "<sip:%.*s@%s:%d>\r\nContent-Type: application/sdp\r\n", + luser.len, luser.s, di->local_ip.s, di->local_port); headers.len = strlen(buff); headers.s = buff;

1 0

[kamailio/kamailio] dmq_usrloc not replicating contact attributes (#1968)
by pwakano 16 Jan '24

16 Jan '24

### Description  The dmq_usrloc module is not replicating the extra attributes saved in the xavp for the contact. So remote nodes don't receive these values, being unable to access it properly. It is expected that the attributes are replicated as well. #### Reproduction  Setup two nodes using the dmq_usrloc and usrloc in db_mode=0. When receiving a REGISTER, before saving the contact add some attribute in the xavp_contact. In a subsequent message to this contact (e.g.: INVITE) use a lookup() or registered() and try to access the desired xavp_contact attribute. If the request is received in the local node (which received the original REGISTER), the attribute will be valid, but if the request is received in the remote node, the attribute is empty. #### Log Messages  ``` May 29 16:06:18 kamailio-2 /usr/sbin/kamailio[23230]: DEBUG: registrar [save.c:410]: pack_ci(): generated ruid is: uloc-5cee2114-5abe-2 May 29 16:06:18 kamailio-2 /usr/sbin/kamailio[23230]: DEBUG: usrloc [ucontact.c:73]: ucontact_xavp_store(): trying to clone per contact xavps May 29 16:06:18 kamailio-2 /usr/sbin/kamailio[23230]: DEBUG: <core> [core/xavp.c:697]: xavp_clone_level_nodata(): cloned root xavp [ulattrs] May 29 16:06:18 kamailio-2 /usr/sbin/kamailio[23230]: DEBUG: <core> [core/xavp.c:721]: xavp_clone_level_nodata(): cloned inner xavp [cluster_node] May 29 16:06:18 kamailio-2 /usr/sbin/kamailio[23230]: DEBUG: usrloc [ucontact.c:1701]: update_ucontact(): exists callback for type= UL_CONTACT_UPDATE May 29 16:06:18 kamailio-2 /usr/sbin/kamailio[23230]: DEBUG: usrloc [ul_callback.h:84]: run_ul_callbacks(): contact=0x7f51b624d418, callback type 2/15, id 1 entered May 29 16:06:18 kamailio-2 /usr/sbin/kamailio[23230]: DEBUG: dmq_usrloc [usrloc_sync.c:776]: dmq_ul_cb_contact(): Callback from usrloc with type=2 May 29 16:06:18 kamailio-2 /usr/sbin/kamailio[23230]: DEBUG: dmq_usrloc [usrloc_sync.c:427]: init_usrloc_dmq_recv(): Initializing usrloc_dmq_recv for pid (23230) May 29 16:06:18 kamailio-2 /usr/sbin/kamailio[23230]: DEBUG: dmq_usrloc [usrloc_sync.c:785]: dmq_ul_cb_contact(): Replicating local update to other nodes... May 29 16:06:18 kamailio-2 /usr/sbin/kamailio[23230]: DEBUG: dmq_usrloc [usrloc_sync.c:746]: usrloc_dmq_send_contact(): sending serialized data {"action":1,"aor":"345671002","ruid":"uloc-5cee20df-5953-1","c":"sip:345671002@172.28.128.200:5060;rinstance=38e53fed7e84e081;transport=UDP","received":"","path":"<sip:172.28.128.102:5060;received=sip:172.28.128.200:5060;lr>","callid":"NOeeFh1Bh5JR0eJG8DENkg..","user_agent":"Z 3.15.40006 rv2.8.20","instance":"","expires":1559110577,"cseq":12,"flags":0,"cflags":3072,"q":-1,"last_modified":1559109977,"methods":4294967295,"reg_id":0,"server_id":0} May 29 16:06:18 kamailio-2 /usr/sbin/kamailio[23230]: DEBUG: dmq_usrloc [usrloc_sync.c:315]: usrloc_dmq_send(): sending dmq broadcast... ``` ### Possible Solutions  Only workaround seems to use usrloc with db_mode=3 and then not use the dmq_usrloc, having the usrloc with attributes info shared via the DB.... ### Additional Information Kamailio 5.2.2 installed from the repo. ``` # kamailio -v version: kamailio 5.2.2 (x86_64/linux) 67f967 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 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: 67f967 compiled on 11:40:41 Mar 11 2019 with gcc 4.8.5 ``` * **Operating System**:  ``` # cat /etc/centos-release CentOS Linux release 7.3.1611 (Core) # uname -a Linux kamailio-2 3.10.0-514.21.2.el7.x86_64 #1 SMP Tue Jun 20 12:24:47 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/issues/1968

3 7

git:master:167d8af9: core: snexpr - rename some inner blocks variables
by Daniel-Constantin Mierla 16 Jan '24

16 Jan '24

Module: kamailio Branch: master Commit: 167d8af9ff1c55804a66cc948670ab1d3069e063 URL: https://github.com/kamailio/kamailio/commit/167d8af9ff1c55804a66cc948670ab1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:03:02+01:00 core: snexpr - rename some inner blocks variables --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/167d8af9ff1c55804a66cc948670ab1… Patch: https://github.com/kamailio/kamailio/commit/167d8af9ff1c55804a66cc948670ab1… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index cdfe55c45d8..5b159a256e3 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -1254,10 +1254,10 @@ extern "C" sne_vec_free(&arg.args); goto cleanup; /* first argument is not a variable */ } - struct snexpr_var *v; - for(v = vars->head; v; v = v->next) { - if(v == u->param.var.vref) { - struct macro m = {v->name, arg.args}; + struct snexpr_var *v1; + for(v1 = vars->head; v1; v1 = v1->next) { + if(v1 == u->param.var.vref) { + struct macro m = {v1->name, arg.args}; sne_vec_push(&macros, m); break; } @@ -1284,9 +1284,9 @@ extern "C" char varname[14]; snprintf(varname, sizeof(varname) - 1, "$%d", (j + 1)); - struct snexpr_var *v = snexpr_var_find( + struct snexpr_var *v1 = snexpr_var_find( vars, varname, strlen(varname)); - struct snexpr ev = snexpr_varref(v); + struct snexpr ev = snexpr_varref(v1); struct snexpr assign = snexpr_binary(SNE_OP_ASSIGN, ev, sne_vec_nth(&arg.args, j)); @@ -1409,10 +1409,10 @@ extern "C" cleanup: sne_vec_foreach(&macros, m, i) { - struct snexpr e; - sne_vec_foreach(&m.body, e, j) + struct snexpr e1; + sne_vec_foreach(&m.body, e1, j) { - snexpr_destroy_args(&e); + snexpr_destroy_args(&e1); } sne_vec_free(&m.body); }

1 0

git:master:6ebe3b61: ss7ops: rename local variable that hides the function parameter
by Daniel-Constantin Mierla 16 Jan '24

16 Jan '24

Module: kamailio Branch: master Commit: 6ebe3b612d60e02854c7b88cd241615b50666b00 URL: https://github.com/kamailio/kamailio/commit/6ebe3b612d60e02854c7b88cd241615… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-16T11:03:02+01:00 ss7ops: rename local variable that hides the function parameter --- Modified: src/modules/ss7ops/isup_parsed.c --- Diff: https://github.com/kamailio/kamailio/commit/6ebe3b612d60e02854c7b88cd241615… Patch: https://github.com/kamailio/kamailio/commit/6ebe3b612d60e02854c7b88cd241615… --- diff --git a/src/modules/ss7ops/isup_parsed.c b/src/modules/ss7ops/isup_parsed.c index 5ebc2d7f348..75a132435f8 100644 --- a/src/modules/ss7ops/isup_parsed.c +++ b/src/modules/ss7ops/isup_parsed.c @@ -1067,7 +1067,7 @@ static int do_parse( while(opt_left > 0) { uint8_t ie = opt_data[0]; - size_t len; + size_t len1; opt_data += 1; opt_left -= 1; @@ -1078,20 +1078,20 @@ static int do_parse( LM_ERR("ISUP no space for len %zu\n", opt_left); return -1; } - len = opt_data[0]; + len1 = opt_data[0]; opt_left -= 1; opt_data += 1; - if(opt_left < len) { + if(opt_left < len1) { LM_ERR("ISUP no space optional data %zu vs. %zu\n", opt_left, - len); + len1); return -1; } - visitor(ie, opt_data, len, ptr); + visitor(ie, opt_data, len1, ptr); - opt_data += len; - opt_left -= len; + opt_data += len1; + opt_left -= len1; } }

1 0

auto build failure
by Henning Westerholt 16 Jan '24

16 Jan '24

Hello, the kamailio auto build is failing, I noticed after my last commit. But it seems to be related to some docker issue: [...] Starting job container /usr/bin/docker --config /home/runner/work/_temp/.docker_0ae486ca-dcaa-4edb-a953-36dca2bac9d9 login ghcr.io -u henningw --password-stdin /usr/bin/docker --config /home/runner/work/_temp/.docker_0ae486ca-dcaa-4edb-a953-36dca2bac9d9 pull ghcr.io/kamailio/pkg-kamailio-docker:master-sid master-sid: Pulling from kamailio/pkg-kamailio-docker manifest unknown Warning: Docker pull failed with exit code 1, back off 1.515 seconds before retry. /usr/bin/docker --config /home/runner/work/_temp/.docker_0ae486ca-dcaa-4edb-a953-36dca2bac9d9 pull ghcr.io/kamailio/pkg-kamailio-docker:master-sid master-sid: Pulling from kamailio/pkg-kamailio-docker manifest unknown Warning: Docker pull failed with exit code 1, back off 1.58 seconds before retry. /usr/bin/docker --config /home/runner/work/_temp/.docker_0ae486ca-dcaa-4edb-a953-36dca2bac9d9 pull ghcr.io/kamailio/pkg-kamailio-docker:master-sid master-sid: Pulling from kamailio/pkg-kamailio-docker manifest unknown Error: Docker pull failed with exit code 1 Is this an issue from the github infrastructure or some issue in our scripts? Cheers, Henning

2 2

git:5.7:d411c6ea: dialog: don't send the BYE if dialog is in deleted state (#3714)
by Federico Cabiddu 16 Jan '24

16 Jan '24

Module: kamailio Branch: 5.7 Commit: d411c6ea4358e6d9dd367349e877ed5f5bf4bb2f URL: https://github.com/kamailio/kamailio/commit/d411c6ea4358e6d9dd367349e877ed5… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-01-16T09:51:14+01:00 dialog: don't send the BYE if dialog is in deleted state (#3714) (cherry picked from commit 695f155f3a127f0bbe220a6b44a0fc3887e1e4be) --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/d411c6ea4358e6d9dd367349e877ed5… Patch: https://github.com/kamailio/kamailio/commit/d411c6ea4358e6d9dd367349e877ed5… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index aab22da3c64..fb5f2e51e32 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -383,6 +383,14 @@ static inline int send_bye(struct dlg_cell *cell, int dir, str *hdrs) dlg_iuid_t *iuid = NULL; str lhdrs; + /* dialog is already in deleted state, nothing to do */ + if(cell->state == DLG_STATE_DELETED) { + LM_WARN("dlg [%u:%u] with callid %.*s already in deleted state, BYE " + "not sent.\n", + cell->h_entry, cell->h_id, cell->callid.len, cell->callid.s); + return 0; + } + /* Send Cancel or final response for non-confirmed dialogs */ if(cell->state != DLG_STATE_CONFIRMED_NA && cell->state != DLG_STATE_CONFIRMED) {

1 0

[kamailio/kamailio] dialog: don't send the BYE if dialog is in deleted state (PR #3714)
by Federico Cabiddu 16 Jan '24

16 Jan '24

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  We've recently been exeperiencing a core dump in dialog module. The core dump was caused by trying to terminate via rpc command a dialog that had just been terminated by one of the parties sending a BYE. That's because send_bye threats a deleted dialog as a non confimed one (https://github.com/kamailio/kamailio/blob/404b47791678c4eaccd4cfc7a83e0bb97…) and tries then to access a transaction that does not exist anymore (https://github.com/kamailio/kamailio/blob/404b47791678c4eaccd4cfc7a83e0bb97…) and crashes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3714 -- Commit Summary -- * dialog: don't send the BYE if dialog is in deleted state -- File Changes -- M src/modules/dialog/dlg_req_within.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3714.patch https://github.com/kamailio/kamailio/pull/3714.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3714 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3714(a)github.com>

2 2

git:master:695f155f: dialog: don't send the BYE if dialog is in deleted state (#3714)
by GitHub 16 Jan '24

16 Jan '24

Module: kamailio Branch: master Commit: 695f155f3a127f0bbe220a6b44a0fc3887e1e4be URL: https://github.com/kamailio/kamailio/commit/695f155f3a127f0bbe220a6b44a0fc3… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2024-01-16T09:42:27+01:00 dialog: don't send the BYE if dialog is in deleted state (#3714) --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/695f155f3a127f0bbe220a6b44a0fc3… Patch: https://github.com/kamailio/kamailio/commit/695f155f3a127f0bbe220a6b44a0fc3… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index aab22da3c64..fb5f2e51e32 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -383,6 +383,14 @@ static inline int send_bye(struct dlg_cell *cell, int dir, str *hdrs) dlg_iuid_t *iuid = NULL; str lhdrs; + /* dialog is already in deleted state, nothing to do */ + if(cell->state == DLG_STATE_DELETED) { + LM_WARN("dlg [%u:%u] with callid %.*s already in deleted state, BYE " + "not sent.\n", + cell->h_entry, cell->h_id, cell->callid.len, cell->callid.s); + return 0; + } + /* Send Cancel or final response for non-confirmed dialogs */ if(cell->state != DLG_STATE_CONFIRMED_NA && cell->state != DLG_STATE_CONFIRMED) {

1 0

git:5.7:b6796b11: tls_wolfssl: mask outer make DESTDIR=XX if building internal submodule
by S-P Chan 16 Jan '24

16 Jan '24

Module: kamailio Branch: 5.7 Commit: b6796b110adbe4dec7ac1acb1d7d70bdc58bf1c2 URL: https://github.com/kamailio/kamailio/commit/b6796b110adbe4dec7ac1acb1d7d70b… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-16T16:37:47+08:00 tls_wolfssl: mask outer make DESTDIR=XX if building internal submodule --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b6796b110adbe4dec7ac1acb1d7d70b… Patch: https://github.com/kamailio/kamailio/commit/b6796b110adbe4dec7ac1acb1d7d70b… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 730076023a9..5ef95d697b6 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -30,7 +30,7 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \ --exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX); \ fi; - @$(MAKE) -C $(WOLFSSL_SRC) prefix=$(CURDIR)/$(WOLFSSL_PREFIX) exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX) install + @$(MAKE) -C $(WOLFSSL_SRC) DESTDIR= prefix=$(CURDIR)/$(WOLFSSL_PREFIX) exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX) install $(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a

1 0

git:master:7e5843e2: tls_wolfssl: mask outer make DESTDIR=XX if building internal submodule
by S-P Chan 16 Jan '24

16 Jan '24

Module: kamailio Branch: master Commit: 7e5843e28dc4e331f434381defeb4cef43c5298f URL: https://github.com/kamailio/kamailio/commit/7e5843e28dc4e331f434381defeb4ce… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-16T16:36:57+08:00 tls_wolfssl: mask outer make DESTDIR=XX if building internal submodule --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/7e5843e28dc4e331f434381defeb4ce… Patch: https://github.com/kamailio/kamailio/commit/7e5843e28dc4e331f434381defeb4ce… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 1a6254ea7b2..dda5ad4779e 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -37,7 +37,7 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \ --exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX); \ fi; - @$(MAKE) -C $(WOLFSSL_SRC) prefix=$(CURDIR)/$(WOLFSSL_PREFIX) exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX) install + @$(MAKE) -C $(WOLFSSL_SRC) DESTDIR= prefix=$(CURDIR)/$(WOLFSSL_PREFIX) exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX) install $(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a

1 0

git:master:4df93942: github: add default registry credentials [skip ci]
by Victor Seva 16 Jan '24

16 Jan '24

Module: kamailio Branch: master Commit: 4df939428555f8c4fde67f7b8638809aca56c9f2 URL: https://github.com/kamailio/kamailio/commit/4df939428555f8c4fde67f7b8638809… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-16T09:34:38+01:00 github: add default registry credentials [skip ci] > https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-gith… --- Modified: .github/workflows/main.yml Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/4df939428555f8c4fde67f7b8638809… Patch: https://github.com/kamailio/kamailio/commit/4df939428555f8c4fde67f7b8638809… --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8f1d028cda8..86b05df1822 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,6 +13,9 @@ jobs: contents: read # to fetch code (actions/checkout) container: image: ghcr.io/kamailio/pkg-kamailio-docker:${{ github.ref_name }}-${{ matrix.distribution }} + credentials: + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} volumes: - ${{ github.workspace }}:/code env: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index a2fc539ddfc..cda04d04389 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -22,6 +22,9 @@ jobs: contents: read # to fetch code (actions/checkout) container: image: ghcr.io/kamailio/pkg-kamailio-docker:master-${{ matrix.distribution }} + credentials: + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} volumes: - ${{ github.workspace }}:/code env:

1 0

git:5.7:d5ebc271: tls_wolfssl: update to v5.6.6-stable
by S-P Chan 16 Jan '24

16 Jan '24

Module: kamailio Branch: 5.7 Commit: d5ebc2716992c2480c604555511511ce043bead7 URL: https://github.com/kamailio/kamailio/commit/d5ebc2716992c2480c604555511511c… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-16T16:13:55+08:00 tls_wolfssl: update to v5.6.6-stable --- Modified: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/d5ebc2716992c2480c604555511511c… Patch: https://github.com/kamailio/kamailio/commit/d5ebc2716992c2480c604555511511c… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index 3b3c175af0e..66596ad9e1d 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit 3b3c175af0e993ffaae251871421e206cc41963f +Subproject commit 66596ad9e1d7efa8479656872cf09c9c1870a02e

1 0

[kamailio/kamailio] ims_usrloc_pcscf: udomain.c get_pcontact_from_cache() name check blocks SIP SUBSCRIBE for some UE's (Issue #3646)
by jbipre2 16 Jan '24

16 Jan '24

### Description We have various commercial UE's connecting over an Amarisoft Callbox Classic eNB with Open5GS core network. This issue concerns different UE behaviour. Name checking code introduced between Kamailio v5.6.4 and v5.7.1 (udomain.c lines 580 to 599) leads to rejection of the SUBSCRIBE request from a Huawei UE (user-agent: IM-client/OMA1.0 HW-Rto/V1.0). SUBSCRIBE requests from a OnePlus UE (user-agent: OnePlus_KB2003_RPIA.201005.001) are accepted. We assume that the behaviour of the commercial-off-the-shelf UE's complies with the 3GPP standards; but we do not know to what extent. The following code, however, caused our Huawei UE's to lose VoLTE capability, after updating the Kamailio IMS from v5.6.4 to v5.7.1. ``` 580 if ((contact_info->aor.len>0) && (needle_uri.user.len != 0)){ 581 if ((needle_uri.user.len != c->contact_user.len) || 582 (memcmp(needle_uri.user.s, c->contact_user.s, needle_uri.user.len) != 0)) { 583 LM_ERR("user name does not match - no match here...\n"); 584 LM_DBG("found pcontact username [%d]: [%.*s]\n", i, c->contact_user.len, c->contact_user.s); 585 LM_DBG("incoming contact username: [%.*s]\n", needle_uri.user.len, needle_uri.user.s); 586 c = c->next; 587 continue; 588 } 589 if ((contact_info->aor.len >= 4) && (memcmp(contact_info->aor.s, c->aor.s, 4) != 0)) { // do not mix up sip- and tel-URIs. 590 LM_ERR("scheme does not match - no match here...\n"); 591 LM_DBG("found pcontact scheme [%d]: [%.*s]\n", i, 4, c->aor.s); 592 LM_DBG("incoming contact scheme: [%.*s]\n", 4, contact_info->aor.s); 593 c = c->next; 594 continue; 595 } 596 } 597 else{ 598 LM_DBG("No user name present - abort user name check\n"); 599 } ``` The above code also does not consider the reverse_search flag (uses c=c->next instead of c = reverse_search? c->prev : c->next), so if reverse_search is set, the code's behaviour may be incorrect. In the following pcap file, the Huawei's SIP REGISTER process starts at packet 2, 200 OK arriving in packet 41, with the P-Associated-URI <sip:51194@ims.mnc001.mcc001.3gppnetwork.org>. This UE sends SUBSCRIBE (packet 47) incorporating a new Contact: <sip:51194@10.46.0.6:31896>, presumably derived from the P-Associated-URI; but receives "403 Forbidden - You must register first with a S-CSCF". The Oneplus sends SIP REGISTER at packet 56, receiving 200 OK at packet 83 with P-Associated-URI <sip:51196@ims.mnc001.mcc001.3gppnetwork.org>. But this UE's SUBSCRIBE (packet 84) incorporates the same Contact used in the REGISTER request: <sip:c57d4262-e59d-4530-a0f4-b4faaa2fb1c6@10.46.0.8:5060>, and 200 OK arrives at packet 92. [v571-pcscf-name-check-fail.zip](https://github.com/kamailio/kamailio/files/… #### Debugging Data None acquired #### Log Messages  NB: log messages acquired prior to above pcap. The following extract shows failed name check (udomain.c lines 580 - 599) for username 51194, while 001010000051194 was registered: ``` Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_registrar_pcscf [service_routes.c:210]: getContactP(): This is a request - using first via to find contact Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_registrar_pcscf [service_routes.c:218]: getContactP(): searching for contact with host:port:proto contact [1://10.46.0.6:31894] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:459]: get_pcontact_from_cache(): Searching for contact with AOR [sip:51194@10.46.0.6:31894] in P-CSCF usrloc based on VIA [1://10.46.0.6:31894] Received [1://10.46.0.6:31409], Search flag is 0, reverse_search 0 Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:469]: get_pcontact_from_cache(): Have an AOR to search for Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:474]: get_pcontact_from_cache(): checking for rinstance Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [usrloc.c:157]: get_aor_hash(): Returning hash: [1746035570] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:509]: get_pcontact_from_cache(): get_pcontact slot is [370] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:513]: get_pcontact_from_cache(): comparing contact with aorhash [1746035570], aor [sip:001010000051194@10.46.0.6:5060] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:514]: get_pcontact_from_cache(): contact host [10.46.0.6:5060] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:515]: get_pcontact_from_cache(): contact received [2:10.46.0.6:5060] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:522]: get_pcontact_from_cache(): mached a record by aorhash: 1746035570 Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:513]: get_pcontact_from_cache(): comparing contact with aorhash [1746035570], aor [sip:001010000051194@10.46.0.6:31894] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:514]: get_pcontact_from_cache(): contact host [10.46.0.6:31894] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:515]: get_pcontact_from_cache(): contact received [2:10.46.0.6:31409] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:522]: get_pcontact_from_cache(): mached a record by aorhash: 1746035570 Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:541]: get_pcontact_from_cache(): matched contact ip address and port Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:569]: get_pcontact_from_cache(): found contact with URI [sip:001010000051194@10.46.0.6:31894] Jul 18 12:15:31 corsa03 p-cscf[58090]: ERROR: ims_usrloc_pcscf [udomain.c:583]: get_pcontact_from_cache(): user name does not match - no match here... Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:584]: get_pcontact_from_cache(): found pcontact username [1]: [001010000051194] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:585]: get_pcontact_from_cache(): incoming contact username: [51194] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:643]: get_pcontact_from_cache(): contact not found in memory Jul 18 12:15:31 corsa03 p-cscf[58090]: INFO: ims_registrar_pcscf [service_routes.c:277]: getContactP(): Contact not found based on Contact-header, trying IP/Port/Proto Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:459]: get_pcontact_from_cache(): Searching for contact with AOR [sip:51194@10.46.0.6:31894] in P-CSCF usrloc based on VIA [1://10.46.0.6:31894] Received [1://10.46.0.6:31409], Search flag is 1, reverse_search 0 Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:469]: get_pcontact_from_cache(): Have an AOR to search for Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:474]: get_pcontact_from_cache(): checking for rinstance Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [usrloc.c:157]: get_aor_hash(): Returning hash: [1746035570] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:509]: get_pcontact_from_cache(): get_pcontact slot is [370] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:513]: get_pcontact_from_cache(): comparing contact with aorhash [1746035570], aor [sip:001010000051194@10.46.0.6:5060] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:514]: get_pcontact_from_cache(): contact host [10.46.0.6:5060] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:515]: get_pcontact_from_cache(): contact received [2:10.46.0.6:5060] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:522]: get_pcontact_from_cache(): mached a record by aorhash: 1746035570 Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:546]: get_pcontact_from_cache(): continuing to match on received details Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:513]: get_pcontact_from_cache(): comparing contact with aorhash [1746035570], aor [sip:001010000051194@10.46.0.6:31894] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:514]: get_pcontact_from_cache(): contact host [10.46.0.6:31894] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:515]: get_pcontact_from_cache(): contact received [2:10.46.0.6:31409] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:522]: get_pcontact_from_cache(): mached a record by aorhash: 1746035570 Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:546]: get_pcontact_from_cache(): continuing to match on received details Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:569]: get_pcontact_from_cache(): found contact with URI [sip:001010000051194@10.46.0.6:31894] Jul 18 12:15:31 corsa03 p-cscf[58090]: ERROR: ims_usrloc_pcscf [udomain.c:583]: get_pcontact_from_cache(): user name does not match - no match here... Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:584]: get_pcontact_from_cache(): found pcontact username [1]: [001010000051194] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:585]: get_pcontact_from_cache(): incoming contact username: [51194] Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_usrloc_pcscf [udomain.c:643]: get_pcontact_from_cache(): contact not found in memory Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_registrar_pcscf [service_routes.c:282]: getContactP(): No entry in usrloc for 10.46.0.6:31409 (Proto 1) found! Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: ims_registrar_pcscf [service_routes.c:319]: getContactP(): Asserted identity not set Jul 18 12:15:31 corsa03 p-cscf[58090]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[MO] c=[/etc/kamailio/pcscf/route/mo.cfg] l=16 a=26 n=send_reply Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: sl [sl.c:310]: send_reply(): reply in stateless mode (sl) Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: <core> [core/receive.c:126]: sip_check_fline(): first line indicates a SIP reply Jul 18 12:15:31 corsa03 p-cscf[58090]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[MO] c=[/etc/kamailio/pcscf/route/mo.cfg] l=17 a=2 n=exit Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: <core> [core/receive.c:528]: receive_msg(): request-route executed in: 4219 usec Jul 18 12:15:31 corsa03 p-cscf[58090]: DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list 0x7f043587bfc0 ``` ### Possible Solutions Commenting out udomain.c lines 580-599 allowed both UE's to complete their SUBSCRIBE's, and make VoLTE calls. In the following pcap, the Oneplus REGISTER's and SUBSCRIBE's over packets 1 to 37; the Huawei process occurs from packets 45 to 98. [v571-pcscf-name-check-skipped.zip](https://github.com/kamailio/kamailio/fil… ### Additional Information ``` version: kamailio 5.7.1 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, 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 ``` * **Operating System**:  ``` Linux corsa03 6.5.?-gentoo-x86_64 #2 SMP PREEMPT_DYNAMIC <not recorded> CEST 2023 x86_64 AMD EPYC 7513 32-Core Processor AuthenticAMD GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3646 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3646(a)github.com>

2 2

[kamailio/kamailio] tls: (historical) root cause analysis of per-worker SSL_CTX during OpenSSL 1.1.1 integration (Issue #3709)
by space88man 16 Jan '24

16 Jan '24

### Description During OpenSSL 1.1.1 integration it was necessary to use per-worker SSL_CTX —instantiated in `tls/tls_mod.c`. This is still required for OpenSSL 3.x integration. This is a retrospective root cause analysis of why this duplicated SSL_CTX is needed. #### Reproduction 1. Instead of creating repeating SSL_CTX (one-per-worker) have all workers use a single SSL_CTX 2. Observation: intermittent connection failures 3. Observation: if `tls` is using only EC keys, the connections will succeed #### Root Cause Analysis OpenSSL RSA BN operations are multi-threaded ready (can be used in single-process multi-threaded applications). However the BN operations depend crucially on each thread reporting different `pthread_self()` values. At runtime `pthread_self()` values can be reused and are only different for all running threads in a single process. When rank 0 forks the worker processes their `pthread_self()` values will overlap. This will result in invalid BN computations and lead to failure of RSA connections. In a sense the workers perform “identify theft”. There is no mechanism in pthreads to reset the thread ids; they are opaque handles. In contrast, OpenSSL ECDSA operations do not invoke `pthread_self()` and do not require unique thread IDs. Notes - no action is required; this is purely a historical note - I have added a code comment: https://github.com/kamailio/kamailio/commit/29007ada5bc9e07ede3cdbce285f04d… - I will leave this issue up for a few days knowledge sharing -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3709 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3709(a)github.com>

2 3

[kamailio/kamailio] dmq_usrloc: DMQ also copies and sends attributes related to contacts (PR #3679)
by Xenofon Karamanos 15 Jan '24

15 Jan '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes the issue in https://github.com/kamailio/kamailio/issues/1968. Any feedback is welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3679 -- Commit Summary -- * dmq_usrloc: Transfer attributes * usrloc: Modify destroy order and contact xavp -- File Changes -- M src/modules/dmq_usrloc/usrloc_sync.c (132) M src/modules/usrloc/ucontact.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3679.patch https://github.com/kamailio/kamailio/pull/3679.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3679 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3679(a)github.com>

3 14

git:master:404b4779: usrloc: synchronize attributes from DMQ (GH #3679)
by Henning Westerholt 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: 404b47791678c4eaccd4cfc7a83e0bb97a29b5d3 URL: https://github.com/kamailio/kamailio/commit/404b47791678c4eaccd4cfc7a83e0bb… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-01-15T17:22:06Z usrloc: synchronize attributes from DMQ (GH #3679) - make ucontact_xavp_store static and add some comments - change order of xavp operations in ucontact_xavp_store to not overwrite DMQ xavp - add logic to receive xavp information from DMQ and save it in the contact --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/404b47791678c4eaccd4cfc7a83e0bb… Patch: https://github.com/kamailio/kamailio/commit/404b47791678c4eaccd4cfc7a83e0bb… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index fbb16e4b88d..f95fe987d75 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -50,10 +50,10 @@ void ul_set_xavp_contact_clone(int v) } /*! - * \brief Store xavp list per contact + * \brief Store xavp list per contact from core, update existing contact as well * \param _c contact structure */ -void ucontact_xavp_store(ucontact_t *_c) +static void ucontact_xavp_store(ucontact_t *_c) { sr_xavp_t *xavp; if(_c == NULL) @@ -62,12 +62,15 @@ void ucontact_xavp_store(ucontact_t *_c) return; if(ul_xavp_contact_name.s == NULL) return; - /* remove old list if it is set -- update case */ - if(_c->xavp) - xavp_destroy_list(&_c->xavp); + /* XAVP from core */ xavp = xavp_get(&ul_xavp_contact_name, NULL); - if(xavp == NULL) + if(xavp == NULL) { return; + } + /* remove old xavp if it is set -- update case */ + if(_c->xavp) { + xavp_destroy_list(&_c->xavp); + } /* clone the xavp found in core */ LM_DBG("trying to clone per contact xavps\n"); _c->xavp = xavp_clone_level_nodata(xavp); @@ -124,6 +127,15 @@ ucontact_t *new_ucontact( if(shm_str_dup(&c->instance, &_ci->instance) < 0) goto error; } + /* we got a xavp from e.g. DMQ */ + if(_ci->xavp) { + /* destroy the existing contact xavp */ + if(c->xavp) { + xavp_destroy_list(&c->xavp); + } + /* clone the DMQ xavp because it will be destroyed */ + c->xavp = xavp_clone_level_nodata(_ci->xavp); + } c->domain = _dom; c->aor = _aor; @@ -141,6 +153,8 @@ ucontact_t *new_ucontact( c->tcpconn_id = _ci->tcpconn_id; c->server_id = _ci->server_id; c->keepalive = (_ci->cflags & ul_nat_bflag) ? 1 : 0; + + /* Use core xavp if set, otherwise does nothing */ ucontact_xavp_store(c); @@ -317,6 +331,16 @@ int mem_update_ucontact(ucontact_t *_c, ucontact_info_t *_ci) _c->path.len = 0; } + /* we got a xavp from e.g. DMQ */ + if(_ci->xavp) { + /* destroy the existing contact xavp */ + if(_c->xavp) { + xavp_destroy_list(&_c->xavp); + } + /* clone the DMQ xavp because it will be destroyed */ + _c->xavp = xavp_clone_level_nodata(_ci->xavp); + } + /* Use core xavp if set, otherwise does nothing */ ucontact_xavp_store(_c); _c->sock = _ci->sock;

1 0

git:master:d2eb6a9f: dmq_usrloc: DMQ also copies and sends attributes related to contacts (GH #3679)
by Henning Westerholt 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: d2eb6a9f324a2077d0f4422621aa4d125c72c880 URL: https://github.com/kamailio/kamailio/commit/d2eb6a9f324a2077d0f4422621aa4d1… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-01-15T17:21:39Z dmq_usrloc: DMQ also copies and sends attributes related to contacts (GH #3679) --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/d2eb6a9f324a2077d0f4422621aa4d1… Patch: https://github.com/kamailio/kamailio/commit/d2eb6a9f324a2077d0f4422621aa4d1…

1 0

git:master:aa67092e: github: fix cleanup matrix definition [skip ci]
by Victor Seva 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: aa67092e6ea7d8581e11970993607511771c1be6 URL: https://github.com/kamailio/kamailio/commit/aa67092e6ea7d8581e1197099360751… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-15T15:23:55+01:00 github: fix cleanup matrix definition [skip ci] --- Modified: .github/workflows/cleanup.yml --- Diff: https://github.com/kamailio/kamailio/commit/aa67092e6ea7d8581e1197099360751… Patch: https://github.com/kamailio/kamailio/commit/aa67092e6ea7d8581e1197099360751… --- diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml index 6488a7b4bcd..47818602368 100644 --- a/.github/workflows/cleanup.yml +++ b/.github/workflows/cleanup.yml @@ -12,12 +12,11 @@ jobs: packages: write strategy: matrix: - include: - image_name: - - kamailio - - kamailio-ci - - kamailio-master-devcontainer - - pkg-kamailio-docker + image_name: + - kamailio + - kamailio-ci + - kamailio-master-devcontainer + - pkg-kamailio-docker steps: - name: Delete untagged images uses: camargo/delete-untagged-action@v1

1 0

[kamailio/kamailio] Run failed at startup: cleanup packages - master (f3b4f2f)
by kamailio-sync 15 Jan '24

15 Jan '24

[kamailio/kamailio] cleanup packages workflow run Repository: kamailio/kamailio Workflow: cleanup packages Duration: 1.0 second Finished: 2024-01-15 14:22:19 UTC View results: https://github.com/kamailio/kamailio/actions/runs/7530184334 Jobs: -- You are receiving this because you are subscribed to this thread. Manage your GitHub Actions notifications: https://github.com/settings/notifications

1 0

git:master:f3b4f2fe: github: add all packages images to cleanup
by Victor Seva 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: f3b4f2fe2b88a06cdc49ba473e4b3fc3fbbfd8bf URL: https://github.com/kamailio/kamailio/commit/f3b4f2fe2b88a06cdc49ba473e4b3fc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-15T15:21:06+01:00 github: add all packages images to cleanup --- Modified: .github/workflows/cleanup.yml --- Diff: https://github.com/kamailio/kamailio/commit/f3b4f2fe2b88a06cdc49ba473e4b3fc… Patch: https://github.com/kamailio/kamailio/commit/f3b4f2fe2b88a06cdc49ba473e4b3fc… --- diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml index 37d8e9fe2e5..6488a7b4bcd 100644 --- a/.github/workflows/cleanup.yml +++ b/.github/workflows/cleanup.yml @@ -5,18 +5,22 @@ on: - cron: '0 5 * * *' # Allows you to run this workflow manually from the Actions tab workflow_dispatch: - -env: - IMAGE_NAME: kamailio-ci - jobs: x86_64: runs-on: ubuntu-latest permissions: packages: write + strategy: + matrix: + include: + image_name: + - kamailio + - kamailio-ci + - kamailio-master-devcontainer + - pkg-kamailio-docker steps: - name: Delete untagged images uses: camargo/delete-untagged-action@v1 with: github-token: ${{ secrets.CLEAN_PACKAGES }} - package-name: ${{ env.IMAGE_NAME }} + package-name: ${{ matrix.image_name }}

1 0

git:master:cb520baa: github: use CLEAN_PACKAGES secret at cleanup workflow
by Victor Seva 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: cb520baa9349f86fc104e2c1eed633ea59157b1b URL: https://github.com/kamailio/kamailio/commit/cb520baa9349f86fc104e2c1eed633e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-15T15:03:15+01:00 github: use CLEAN_PACKAGES secret at cleanup workflow kamailio-sync PAT with delete:packages permissions as described > https://github.com/camargo/delete-untagged-action --- Modified: .github/workflows/cleanup.yml --- Diff: https://github.com/kamailio/kamailio/commit/cb520baa9349f86fc104e2c1eed633e… Patch: https://github.com/kamailio/kamailio/commit/cb520baa9349f86fc104e2c1eed633e… --- diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml index bea47fa30dc..37d8e9fe2e5 100644 --- a/.github/workflows/cleanup.yml +++ b/.github/workflows/cleanup.yml @@ -18,5 +18,5 @@ jobs: - name: Delete untagged images uses: camargo/delete-untagged-action@v1 with: - github-token: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ secrets.CLEAN_PACKAGES }} package-name: ${{ env.IMAGE_NAME }}

1 0

git:5.7:44915522: outbound: update to OpenSSL 3 API
by S-P Chan 15 Jan '24

15 Jan '24

Module: kamailio Branch: 5.7 Commit: 449155221586294d716e760fbabbd4e101ad1be2 URL: https://github.com/kamailio/kamailio/commit/449155221586294d716e760fbabbd4e… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-15T21:34:46+08:00 outbound: update to OpenSSL 3 API (cherry-pick from fe5c7125c66e37d2db032a63328ad713738a4b0c) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/449155221586294d716e760fbabbd4e… Patch: https://github.com/kamailio/kamailio/commit/449155221586294d716e760fbabbd4e… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 32f10f6cdb9..e2e3a86a73b 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -79,8 +79,13 @@ static void *mod_init_openssl(void *arg) { if(flow_token_secret.s) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); +#if OPENSSL_VERSION_NUMBER < 0x030000000L SHA1((const unsigned char *)flow_token_secret.s, flow_token_secret.len, (unsigned char *)ob_key.s); +#else + EVP_Q_digest(NULL, "SHA1", NULL, flow_token_secret.s, + flow_token_secret.len, (unsigned char *)ob_key.s, NULL); +#endif } else { if(RAND_bytes((unsigned char *)ob_key.s, ob_key.len) == 0) { LM_ERR("unable to get %d cryptographically strong pseudo-"

1 0

git:master:fe5c7125: outbound: update to OpenSSL 3 API
by S-P Chan 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: fe5c7125c66e37d2db032a63328ad713738a4b0c URL: https://github.com/kamailio/kamailio/commit/fe5c7125c66e37d2db032a63328ad71… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-15T21:32:53+08:00 outbound: update to OpenSSL 3 API --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fe5c7125c66e37d2db032a63328ad71… Patch: https://github.com/kamailio/kamailio/commit/fe5c7125c66e37d2db032a63328ad71… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 32f10f6cdb9..e2e3a86a73b 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -79,8 +79,13 @@ static void *mod_init_openssl(void *arg) { if(flow_token_secret.s) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); +#if OPENSSL_VERSION_NUMBER < 0x030000000L SHA1((const unsigned char *)flow_token_secret.s, flow_token_secret.len, (unsigned char *)ob_key.s); +#else + EVP_Q_digest(NULL, "SHA1", NULL, flow_token_secret.s, + flow_token_secret.len, (unsigned char *)ob_key.s, NULL); +#endif } else { if(RAND_bytes((unsigned char *)ob_key.s, ob_key.len) == 0) { LM_ERR("unable to get %d cryptographically strong pseudo-"

1 0

git:master:47303fc3: Makefile.defs: remove unused define WITH_XAVP, its not used anymore from the code
by Henning Westerholt 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: 47303fc34d4795edc7b58569fb97e7b0532b0367 URL: https://github.com/kamailio/kamailio/commit/47303fc34d4795edc7b58569fb97e7b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-01-15T12:07:16Z Makefile.defs: remove unused define WITH_XAVP, its not used anymore from the code --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/47303fc34d4795edc7b58569fb97e7b… Patch: https://github.com/kamailio/kamailio/commit/47303fc34d4795edc7b58569fb97e7b… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 7a4b7418670..b088bcfffe2 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -727,7 +727,6 @@ C_DEFS+= -DSHM_MMAP \ -DUSE_DNS_FAILOVER \ -DUSE_DST_BLOCKLIST \ -DUSE_NAPTR \ - -DWITH_XAVP \ #-DUSE_DNS_CACHE_STATS \ #-DUSE_DST_BLOCKLIST_STATS \ #-DDNS_WATCHDOG_SUPPORT \

1 0

git:master:555530c7: doc/tutorial: remove unused define WITH_XAVP, its not used anymore from the code
by Henning Westerholt 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: 555530c70f8f7034046e0b81f4a8469ed76bb405 URL: https://github.com/kamailio/kamailio/commit/555530c70f8f7034046e0b81f4a8469… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-01-15T12:06:54Z doc/tutorial: remove unused define WITH_XAVP, its not used anymore from the code --- Modified: doc/tutorials/cfg_list/Makefile Modified: doc/tutorials/counter_list/Makefile Modified: doc/tutorials/rpc_list/Makefile Modified: doc/tutorials/select_list/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/555530c70f8f7034046e0b81f4a8469… Patch: https://github.com/kamailio/kamailio/commit/555530c70f8f7034046e0b81f4a8469… --- diff --git a/doc/tutorials/cfg_list/Makefile b/doc/tutorials/cfg_list/Makefile index cda24264d1c..66aa377d50d 100644 --- a/doc/tutorials/cfg_list/Makefile +++ b/doc/tutorials/cfg_list/Makefile @@ -72,7 +72,7 @@ c_defs=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -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 \ + -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS \ -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT \ -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 \ diff --git a/doc/tutorials/counter_list/Makefile b/doc/tutorials/counter_list/Makefile index 0ef48b23602..7cef0f72103 100644 --- a/doc/tutorials/counter_list/Makefile +++ b/doc/tutorials/counter_list/Makefile @@ -66,7 +66,7 @@ c_defs=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -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 \ + -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS \ -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT \ -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 \ diff --git a/doc/tutorials/rpc_list/Makefile b/doc/tutorials/rpc_list/Makefile index ac838ef7dcd..c620793f858 100644 --- a/doc/tutorials/rpc_list/Makefile +++ b/doc/tutorials/rpc_list/Makefile @@ -139,7 +139,7 @@ c_defsX=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -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 \ + -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS \ -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT \ -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 \ diff --git a/doc/tutorials/select_list/Makefile b/doc/tutorials/select_list/Makefile index 50be57d3a8a..5f3a3282291 100644 --- a/doc/tutorials/select_list/Makefile +++ b/doc/tutorials/select_list/Makefile @@ -68,7 +68,7 @@ c_defs=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -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 \ + -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS \ -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT \ -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 \

1 0

git:master:6f962070: docs/scripts: remove unused define WITH_XAVP, its not used anymore from the code
by Henning Westerholt 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: 6f9620704c661151415ad723e5f0b31f34b70c1d URL: https://github.com/kamailio/kamailio/commit/6f9620704c661151415ad723e5f0b31… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-01-15T12:06:25Z docs/scripts: remove unused define WITH_XAVP, its not used anymore from the code --- Modified: doc/scripts/cdefs2doc/dump_cfg_defs.pl Modified: doc/scripts/cdefs2doc/dump_counters.pl Modified: doc/scripts/cdefs2doc/dump_rpcs.pl Modified: doc/scripts/cdefs2doc/dump_selects.pl --- Diff: https://github.com/kamailio/kamailio/commit/6f9620704c661151415ad723e5f0b31… Patch: https://github.com/kamailio/kamailio/commit/6f9620704c661151415ad723e5f0b31…

1 0

git:master:2ffeaf6f: usrloc: fix condition for keepalive interval
by Daniel-Constantin Mierla 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: 2ffeaf6f480cbe1581395519b252c2bf35291ef7 URL: https://github.com/kamailio/kamailio/commit/2ffeaf6f480cbe1581395519b252c2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-15T12:15:58+01:00 usrloc: fix condition for keepalive interval --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/2ffeaf6f480cbe1581395519b252c2b… Patch: https://github.com/kamailio/kamailio/commit/2ffeaf6f480cbe1581395519b252c2b… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 8d0fc259bdf..e5a013b45a3 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -164,7 +164,7 @@ int ul_ka_urecord(urecord_t *ur) } if(ul_ka_interval > 0 && uc->last_keepalive > 0) { ka_limit = ul_ka_interval + (fastrand() % ul_ka_randomize); - if((uc->last_keepalive + ka_limit) < tnow) { + if((uc->last_keepalive + ka_limit) > tnow) { /* not yet the time for keepalive */ continue; }

1 0

git:master:4d8e888c: usrloc: add ka_randomize to ka_interval when checking for keepalive
by Daniel-Constantin Mierla 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: 4d8e888c805ddecdb7227350c1c01e52c235ffb5 URL: https://github.com/kamailio/kamailio/commit/4d8e888c805ddecdb7227350c1c01e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-15T10:37:42+01:00 usrloc: add ka_randomize to ka_interval when checking for keepalive --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/4d8e888c805ddecdb7227350c1c01e5… Patch: https://github.com/kamailio/kamailio/commit/4d8e888c805ddecdb7227350c1c01e5… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index eba6bec5c0d..8d0fc259bdf 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -163,7 +163,7 @@ int ul_ka_urecord(urecord_t *ur) } } if(ul_ka_interval > 0 && uc->last_keepalive > 0) { - ka_limit = ul_ka_interval - (fastrand() % ul_ka_randomize); + ka_limit = ul_ka_interval + (fastrand() % ul_ka_randomize); if((uc->last_keepalive + ka_limit) < tnow) { /* not yet the time for keepalive */ continue;

1 0

git:master:b3e19d8c: lcr: prefix global variable with short name
by Daniel-Constantin Mierla 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: b3e19d8c97c099823ad439167b07ccbb30d05a25 URL: https://github.com/kamailio/kamailio/commit/b3e19d8c97c099823ad439167b07ccb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-15T10:15:52+01:00 lcr: prefix global variable with short name --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b3e19d8c97c099823ad439167b07ccb… Patch: https://github.com/kamailio/kamailio/commit/b3e19d8c97c099823ad439167b07ccb… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 5442c59601a..dac215a9eb5 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -240,7 +240,7 @@ struct gw_info **gw_pt = (struct gw_info **)NULL; struct rule_id_info **rule_id_hash_table = (struct rule_id_info **)NULL; /* Pinging related vars */ -struct tm_binds tmb; +struct tm_binds _lcr_tmb; void ping_timer(unsigned int ticks, void *param); unsigned int ping_valid_reply_codes[MAX_NO_OF_REPLY_CODES]; str ping_method = {"OPTIONS", 7}; @@ -622,7 +622,7 @@ static int mod_init(void) return -1; } if(ping_interval_param > 0) { - if(load_tm_api(&tmb) == -1) { + if(load_tm_api(&_lcr_tmb) == -1) { LM_ERR("could not bind tm api\n"); return -1; } @@ -2951,7 +2951,8 @@ void ping_timer(unsigned int ticks, void *param) uac_r.ssock = &ping_socket_param; } - if(tmb.t_request(&uac_r, &uri, &uri, &ping_from_param, 0) < 0) { + if(_lcr_tmb.t_request(&uac_r, &uri, &uri, &ping_from_param, 0) + < 0) { LM_ERR("unable to ping [%.*s]\n", uri.len, uri.s); } }

1 0

git:master:e6836cf2: registrar: prefix global variables with short name
by Daniel-Constantin Mierla 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: e6836cf2dc772fd7e5b4322d4243ca3c2177de1f URL: https://github.com/kamailio/kamailio/commit/e6836cf2dc772fd7e5b4322d4243ca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-15T10:11:22+01:00 registrar: prefix global variables with short name --- Modified: src/modules/registrar/api.c Modified: src/modules/registrar/lookup.c Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/registrar.h Modified: src/modules/registrar/regpv.c Modified: src/modules/registrar/reply.c Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/e6836cf2dc772fd7e5b4322d4243ca3… Patch: https://github.com/kamailio/kamailio/commit/e6836cf2dc772fd7e5b4322d4243ca3…

1 0

git:master:82ae289d: sanity: prefix global variables with short name
by Daniel-Constantin Mierla 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: 82ae289d8f549b142aa0631b6225838bbbc1f446 URL: https://github.com/kamailio/kamailio/commit/82ae289d8f549b142aa0631b6225838… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-15T10:00:34+01:00 sanity: prefix global variables with short name --- Modified: src/modules/sanity/sanity.c Modified: src/modules/sanity/sanity_mod.c Modified: src/modules/sanity/sanity_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/82ae289d8f549b142aa0631b6225838… Patch: https://github.com/kamailio/kamailio/commit/82ae289d8f549b142aa0631b6225838… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index 7ec9fc6c26b..fa3d0493883 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -81,12 +81,13 @@ int ki_sanity_reply(sip_msg_t *msg) || msg->id != _ksr_sanity_info.msgid || msg->pid != _ksr_sanity_info.msgpid) { LM_INFO("no sanity reply info set - sending 500\n"); - if(slb.zreply(msg, 500, "Server Sanity Failure") < 0) { + if(_sanity_slb.zreply(msg, 500, "Server Sanity Failure") < 0) { return -1; } return 1; } - if(slb.zreply(msg, _ksr_sanity_info.code, _ksr_sanity_info.reason) + if(_sanity_slb.zreply( + msg, _ksr_sanity_info.code, _ksr_sanity_info.reason) < 0) { return -1; } @@ -120,7 +121,7 @@ int sanity_reply(sip_msg_t *msg, int code, char *reason) _ksr_sanity_info.msgpid = msg->pid; } else { if(!(msg->msg_flags & FL_MSG_NOREPLY)) { - if(slb.zreply(msg, code, reason) < 0) { + if(_sanity_slb.zreply(msg, code, reason) < 0) { return -1; } } diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 7a496ca2a83..99f64fbf082 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -34,7 +34,7 @@ MODULE_VERSION #define PROXY_REQUIRE_DEF "" -str pr_str = STR_STATIC_INIT(PROXY_REQUIRE_DEF); +static str _sanity_prval = STR_STATIC_INIT(PROXY_REQUIRE_DEF); int default_msg_checks = SANITY_DEFAULT_CHECKS; int default_uri_checks = SANITY_DEFAULT_URI_CHECKS; @@ -43,7 +43,7 @@ int ksr_sanity_noreply = 0; str_list_t *proxyrequire_list = NULL; -sl_api_t slb; +sl_api_t _sanity_slb; static int mod_init(void); static int w_sanity_check(sip_msg_t *_msg, char *_msg_check, char *_uri_check); @@ -70,7 +70,7 @@ static cmd_export_t cmds[] = {{"sanity_check", (cmd_function)w_sanity_check, 0, static param_export_t params[] = { {"default_checks", PARAM_INT, &default_msg_checks}, {"uri_checks", PARAM_INT, &default_uri_checks}, - {"proxy_require", PARAM_STR, &pr_str}, + {"proxy_require", PARAM_STR, &_sanity_prval}, {"autodrop", PARAM_INT, &_sanity_drop}, {"noreply", PARAM_INT, &ksr_sanity_noreply}, {0, 0, 0}}; @@ -102,13 +102,13 @@ static int mod_init(void) ksr_sanity_info_init(); /* bind the SL API */ - if(sl_load_api(&slb) != 0) { + if(sl_load_api(&_sanity_slb) != 0) { LM_ERR("cannot bind to SL API\n"); return -1; } LM_DBG("parsing proxy requires string:\n"); - ptr = parse_str_list(&pr_str); + ptr = parse_str_list(&_sanity_prval); proxyrequire_list = ptr; diff --git a/src/modules/sanity/sanity_mod.h b/src/modules/sanity/sanity_mod.h index 4ad92850e15..41e13359eb2 100644 --- a/src/modules/sanity/sanity_mod.h +++ b/src/modules/sanity/sanity_mod.h @@ -72,6 +72,6 @@ extern int default_checks; extern str_list_t *proxyrequire_list; -extern sl_api_t slb; +extern sl_api_t _sanity_slb; #endif /* MOD_SANITY_CHK_H */

1 0

git:master:7867a29d: siptrace: prefix global variables with short name
by Daniel-Constantin Mierla 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: 7867a29d3f49d6bc149b9f556ae28ce089e841f4 URL: https://github.com/kamailio/kamailio/commit/7867a29d3f49d6bc149b9f556ae28ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-15T09:54:49+01:00 siptrace: prefix global variables with short name --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/7867a29d3f49d6bc149b9f556ae28ce… Patch: https://github.com/kamailio/kamailio/commit/7867a29d3f49d6bc149b9f556ae28ce…

1 0

[kamailio/kamailio] Ticket to monitor the progress of tls_wolfssl (Issue #3160)
by space88man 15 Jan '24

15 Jan '24

### Description This is an umbrella ticket to address issues with the WIP `tls_wolfssl` module ### Expected behavior The module behaves robustly under load testing and various configurations and thus can be accepted long-term in kamailio -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3160 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3160(a)github.com>

4 7

[kamailio/kamailio] kamailio 5.7.2 & master - compile tls_wolfssl error (Issue #3610)
by badien 15 Jan '24

15 Jan '24

Compile tls_wolfssl error: checking dependency style of gcc... gcc3 checking whether make supports nested variables... (cached) yes ./configure: line 6164: syntax error near unexpected token `2.4.2' ./configure: line 6164: `LT_PREREQ(2.4.2)' make[2]: *** [Makefile:21: ../../../misc/external/wolfssl/build/include/wolfssl/options.h] Error 2 make[1]: *** [Makefile:508: modules] Error 1 make[1]: Leaving directory '/usr/local/src/kamailio-5.7/src' make: *** [Makefile:34: all] Error 2 Please check, thanks -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3610 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3610(a)github.com>

3 8

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev