sr-dev July 2024

sr-dev@lists.kamailio.org

16 participants
214 discussions

git:master:3333611a: core: cfg select - check res when getting the variable
by Daniel-Constantin Mierla 26 Jul '24

26 Jul '24

Module: kamailio Branch: master Commit: 3333611a3ef9078cbcb9867db88921f0c48fce1b URL: https://github.com/kamailio/kamailio/commit/3333611a3ef9078cbcb9867db88921f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-26T19:50:40+02:00 core: cfg select - check res when getting the variable --- Modified: src/core/cfg/cfg_select.c --- Diff: https://github.com/kamailio/kamailio/commit/3333611a3ef9078cbcb9867db88921f… Patch: https://github.com/kamailio/kamailio/commit/3333611a3ef9078cbcb9867db88921f… --- diff --git a/src/core/cfg/cfg_select.c b/src/core/cfg/cfg_select.c index e6c599a204e..b4e9e6ebef7 100644 --- a/src/core/cfg/cfg_select.c +++ b/src/core/cfg/cfg_select.c @@ -212,7 +212,7 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) group = (cfg_group_t *)s->params[1].v.p; var = (cfg_mapping_t *)s->params[2].v.p; - if(!group || !var) + if(!group || !var || !res) return -1; /* use the module's handle to access the variable, so the variables

1 0

git:master:660a0192: xprint: return on mod init error case
by Daniel-Constantin Mierla 26 Jul '24

26 Jul '24

Module: kamailio Branch: master Commit: 660a019263b81d318700c205531bf4e042c912cf URL: https://github.com/kamailio/kamailio/commit/660a019263b81d318700c205531bf4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-26T19:50:40+02:00 xprint: return on mod init error case --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/660a019263b81d318700c205531bf4e… Patch: https://github.com/kamailio/kamailio/commit/660a019263b81d318700c205531bf4e… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index b6fc5066556..fda12a82fc3 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1899,6 +1899,7 @@ int xl_mod_init() s = NULL; str_ipaddr.len = 0; PKG_MEM_ERROR_FMT("for str_ipaddr\n"); + return -1; } } else if(strncmp(str_ipaddr.s, s, str_ipaddr.len) != 0) {

1 0

[kamailio/kamailio] Advertise in listen directive doesn't let to use hostname without port (Issue #3932)
by Evgenii Buchnev 26 Jul '24

26 Jul '24

Hey Team, Thank you for the awesome software ### Description Neither option work: `listen=... advertise some.custom.hostname.io` `listen=... advertise some.custom.hostname.io:0` to make Kamailio present only hostname(without port) in Record-Route headers, affects NAPTR/SRV. ### Troubleshooting ============ _Hostname without port - still gives port 5081 in Record-Route_ **kamailio.cfg** ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io name "provider_socket_tls"` ... **sngrep, 200 OK for INVITE** ... `Record-Route: <sip:some.custom.io:5081;transport=tls;r2=on;lr;did=494.6e51>` ... **kamcmd corex.list_sockets** ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:0 } ``` ... ======== _Hostname with port 0 - still gives port 5081 in Record-Route_ kamailio.cfg ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io:0 name "provider_socket_tls"` ... sngrep, 200 OK for INVITE ... `Record-Route: <sip:some.custom.io:5081;transport=tls;r2=on;lr;did=042.7721>` ... kamcmd corex.list_sockets ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:0 } ``` ... ============ _Hostname with explicit different port 8888 - gives that port 8888 in Record-Route (to confirm config works)_ kamailio.cfg ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io:8888 name "provider_socket_tls"` ... sngrep, 200 OK for INVITE ... `Record-Route: <sip:some.custom.io:8888;transport=tls;r2=on;lr;did=dae.ac31>` ... kamcmd corex.list_sockets ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:8888 } ``` ... #### Reproduction Please see Troubleshooting section #### Debugging Data Please see Troubleshooting section #### Log Messages N/A #### SIP Traffic Please see Troubleshooting section ### Possible Solutions N/A ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.2 (x86_64/linux) dbe51d flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: dbe51d compiled on 07:13:22 Jul 17 2024 with gcc 12.2.0) ``` * **Operating System**: ``` [dev]root@[voiceproxy]:~# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 12 (bookworm) Release: 12 Codename: bookworm [dev]root@[voiceproxy]:~# uname -a Linux i-0875d7720d6152612 6.1.0-23-cloud-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.99-1 (2024-07-15) x86_64 GNU/Linux [dev]root@[voiceproxy]:~# cat /etc/*relea* ID=ec2 VERSION="20240702-1796" PRETTY_NAME="Debian GNU/Linux 12 (bookworm)" NAME="Debian GNU/Linux" VERSION_ID="12" VERSION="12 (bookworm)" VERSION_CODENAME=bookworm ID=debian HOME_URL="https://www.debian.org/" SUPPORT_URL="https://www.debian.org/support" BUG_REPORT_URL="https://bugs.debian.org/" ``` * **Might be related** : https://github.com/kamailio/kamailio/issues/1884 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3932 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3932(a)github.com>

2 4

[kamailio/kamailio] cdp: fix use after free in transaction call backs (PR #3931)
by Rick Barenthin 25 Jul '24

25 Jul '24

If the traction is set to auto drop, the memory will be freed and with it the next pointer.   #### 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  The use after free caused on a Load tested system crashes. Now the next pointer is saved before executing the callback and handle the auto drop. Then the stored next pointer is used to continue the iteration over the callbacks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3931 -- Commit Summary -- * cdp: fix use after free in transaction call backs -- File Changes -- M src/modules/cdp/transaction.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3931.patch https://github.com/kamailio/kamailio/pull/3931.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3931 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3931(a)github.com>

3 2

git:master:a71bd9d9: cdp: fix use after free in transaction call backs
by Daniel-Constantin Mierla 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: a71bd9d9424456ef1167468c5bbbfd38b1099e89 URL: https://github.com/kamailio/kamailio/commit/a71bd9d9424456ef1167468c5bbbfd3… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-25T12:20:59+02:00 cdp: fix use after free in transaction call backs If the traction is set to auto drop, the memory will be freed and with it the next pointer. --- Modified: src/modules/cdp/transaction.c --- Diff: https://github.com/kamailio/kamailio/commit/a71bd9d9424456ef1167468c5bbbfd3… Patch: https://github.com/kamailio/kamailio/commit/a71bd9d9424456ef1167468c5bbbfd3… --- diff --git a/src/modules/cdp/transaction.c b/src/modules/cdp/transaction.c index f1445ff15be..a2b97654dd0 100644 --- a/src/modules/cdp/transaction.c +++ b/src/modules/cdp/transaction.c @@ -256,10 +256,11 @@ int cdp_trans_timer(time_t now, void *ptr) /* do all queued callbacks */ x = cb_queue->head; while(x) { + n = x->next; (x->cb)(1, *(x->ptr), 0, (now - x->expires)); if(x->auto_drop) cdp_free_trans(x); - x = x->next; + x = n; } pkg_free(cb_queue);

1 0

[kamailio/kamailio] ims_qos_npn: fixed issues discovered by coverity (PR #3926)
by Dragos Vingarzan 25 Jul '24

25 Jul '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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fixing issues discovered by Coverity You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3926 -- Commit Summary -- * ims_qos_npn: fixed issues discovered by coverity -- File Changes -- M src/modules/ims_qos_npn/rx_aar.c (12) M src/modules/ims_qos_npn/rx_avp.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3926.patch https://github.com/kamailio/kamailio/pull/3926.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3926 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3926(a)github.com>

2 2

git:master:79433959: ims_qos_npn: fixed missing breaks in switch and checks for null pointers
by Dragos Vingarzan 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: 7943395957c070a16553b16536e5be59b4719d9b URL: https://github.com/kamailio/kamailio/commit/7943395957c070a16553b16536e5be5… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-25T11:47:24+02:00 ims_qos_npn: fixed missing breaks in switch and checks for null pointers --- Modified: src/modules/ims_qos_npn/rx_aar.c Modified: src/modules/ims_qos_npn/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/7943395957c070a16553b16536e5be5… Patch: https://github.com/kamailio/kamailio/commit/7943395957c070a16553b16536e5be5… --- diff --git a/src/modules/ims_qos_npn/rx_aar.c b/src/modules/ims_qos_npn/rx_aar.c index fc99344c2c6..4423a0561b2 100644 --- a/src/modules/ims_qos_npn/rx_aar.c +++ b/src/modules/ims_qos_npn/rx_aar.c @@ -615,7 +615,7 @@ int add_media_components(AAAMessage *aar, struct sip_msg *req, //check if the src or dst port is 0 and if so then don't add to rx intportA = atoi(req_sdp_stream->port.s); - if(rpl) { + if(rpl_sdp_stream) { intportB = atoi(rpl_sdp_stream->port.s); } if(intportA != 0 && (rpl && intportB != 0)) { @@ -719,18 +719,20 @@ int add_media_components(AAAMessage *aar, struct sip_msg *req, auth->u.auth.generic_data, sdp_stream_num + 1, &req_sdp_stream->media, &ipA, &portA, &ipB, &portB, - rpl ? &rpl_sdp_stream->transport : 0, + rpl_sdp_stream ? &rpl_sdp_stream->transport : 0, &req_sdp_stream->raw_stream, - rpl ? &rpl_sdp_stream->raw_stream : 0, + rpl_sdp_stream ? &rpl_sdp_stream->raw_stream + : 0, direction, 0 /*This is a new mcd, we are not setting it as active*/); rx_add_media_component_description_avp(aar, sdp_stream_num + 1, &req_sdp_stream->media, &ipA, &portA, &ipB, &portB, - rpl ? &rpl_sdp_stream->transport : 0, + rpl_sdp_stream ? &rpl_sdp_stream->transport : 0, &req_sdp_stream->raw_stream, - rpl ? &rpl_sdp_stream->raw_stream : 0, + rpl_sdp_stream ? &rpl_sdp_stream->raw_stream + : 0, direction, AVP_EPC_Flow_Usage_No_Information); } add_flow = 1; diff --git a/src/modules/ims_qos_npn/rx_avp.c b/src/modules/ims_qos_npn/rx_avp.c index a0053138b4f..a2fd3188efe 100644 --- a/src/modules/ims_qos_npn/rx_avp.c +++ b/src/modules/ims_qos_npn/rx_avp.c @@ -1402,7 +1402,7 @@ int rx_mcc_mnc_to_sip_visited(str *dst, str src) } mcc = (100 * (src.s[0] - '0') + (10 * (src.s[1] - '0')) + ((src.s[2] - '0'))); - if(mcc < 0 || mcc >= 999) { + if(mcc >= 999) { LOG(L_ERR, "Invalid MCC value\n"); return 0; } @@ -1699,6 +1699,7 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) p += 7; length -= 7; } + break; case 1: // SAI if(length >= 7) { @@ -1707,6 +1708,7 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) p += 7; length -= 7; } + break; case 2: // RAI if(length >= 7) { @@ -1715,6 +1717,7 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) p += 7; length -= 7; } + break; case 3 ... 127: // spare for future use break;

1 0

git:master:b4efe772: janssonrpcc: free new servers list on error
by Daniel-Constantin Mierla 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: b4efe7725728392d0c8921c006d6fbc6455e9b8f URL: https://github.com/kamailio/kamailio/commit/b4efe7725728392d0c8921c006d6fbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-25T10:59:15+02:00 janssonrpcc: free new servers list on error --- Modified: src/modules/janssonrpcc/janssonrpc_srv.c --- Diff: https://github.com/kamailio/kamailio/commit/b4efe7725728392d0c8921c006d6fbc… Patch: https://github.com/kamailio/kamailio/commit/b4efe7725728392d0c8921c006d6fbc… --- diff --git a/src/modules/janssonrpcc/janssonrpc_srv.c b/src/modules/janssonrpcc/janssonrpc_srv.c index 73eb25ce62d..9b7ac31c084 100644 --- a/src/modules/janssonrpcc/janssonrpc_srv.c +++ b/src/modules/janssonrpcc/janssonrpc_srv.c @@ -90,6 +90,7 @@ int refresh_srv(jsonrpc_srv_t *srv_obj) srv_record = (struct srv_rdata *)l->rdata; if(srv_record == NULL) { free_rdata_list(head); + free_server_list(new_servers); ERR("BUG: null rdata\n"); return -1; }

1 0

git:master:a8cb2390: pkg: Add systemd template for starting multiple kamailio services
by Xenofon Karamanos 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: a8cb23903b271a1b78456fed5da8e10474aee405 URL: https://github.com/kamailio/kamailio/commit/a8cb23903b271a1b78456fed5da8e10… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-07-25T11:11:36+03:00 pkg: Add systemd template for starting multiple kamailio services --- Added: pkg/kamailio/deb/debian/kamailio@.service --- Diff: https://github.com/kamailio/kamailio/commit/a8cb23903b271a1b78456fed5da8e10… Patch: https://github.com/kamailio/kamailio/commit/a8cb23903b271a1b78456fed5da8e10… --- diff --git a/pkg/kamailio/deb/debian/kamailio@.service b/pkg/kamailio/deb/debian/kamailio@.service new file mode 100644 index 00000000000..81c06394d17 --- /dev/null +++ b/pkg/kamailio/deb/debian/kamailio@.service @@ -0,0 +1,26 @@ +[Unit] +Description=Kamailio - the Open Source SIP Server (instance %i) +Documentation=man:kamailio(8) +Wants=network-online.target +After=network-online.target + +[Service] +Type=forking +User=kamailio +Group=kamailio +Environment='CFGFILE=/etc/kamailio/kamailio-%i.cfg' +Environment='SHM_MEMORY=64' +Environment='PKG_MEMORY=8' +EnvironmentFile=-/etc/default/kamailio-%i +EnvironmentFile=-/etc/default/kamailio-%i.d/* +# PIDFile requires a full absolute path +PIDFile=/run/kamailio-%i/kamailio.pid +# ExecStart requires a full absolute path +ExecStart=/usr/sbin/kamailio -P /run/kamailio-%i/kamailio.pid -Y /run/kamailio-%i -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY +Restart=on-failure +# /run/kamailio in tmpfs +RuntimeDirectory=kamailio-%i +RuntimeDirectoryMode=0770 + +[Install] +WantedBy=multi-user.target

1 0

git:master:a6c41571: core: cfg select - check res before initializing
by Daniel-Constantin Mierla 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: a6c415713bb209b03ff110d4ae891173d04ac471 URL: https://github.com/kamailio/kamailio/commit/a6c415713bb209b03ff110d4ae89117… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-25T08:44:15+02:00 core: cfg select - check res before initializing --- Modified: src/core/cfg/cfg_select.c --- Diff: https://github.com/kamailio/kamailio/commit/a6c415713bb209b03ff110d4ae89117… Patch: https://github.com/kamailio/kamailio/commit/a6c415713bb209b03ff110d4ae89117… --- diff --git a/src/core/cfg/cfg_select.c b/src/core/cfg/cfg_select.c index f3b2d681d3e..e6c599a204e 100644 --- a/src/core/cfg/cfg_select.c +++ b/src/core/cfg/cfg_select.c @@ -147,8 +147,10 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) int i; static char buf[INT2STR_MAX_LEN]; - res->s = 0; - res->len = 0; + if(res != NULL) { + res->s = 0; + res->len = 0; + } if(msg == NULL) { /* fixup call */

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2024