- sr-dev - kamailio.org

git:5.5:44eed1c1: pkg/kamailio/deb: fix backports scripts [skip ci]
by Victor Seva 26 Oct '23

26 Oct '23

Module: kamailio Branch: 5.5 Commit: 44eed1c1ad533ce60741aeedf97d328f1fc0757f URL: https://github.com/kamailio/kamailio/commit/44eed1c1ad533ce60741aeedf97d328… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-26T10:36:51+02:00 pkg/kamailio/deb: fix backports scripts [skip ci] missing space was causing some modules not to be build fixes #3617 (cherry picked from commit 9326e98d2677ada18f90e28ef37f496ab4d2e985) --- Modified: pkg/kamailio/deb/debian/backports/sid --- Diff: https://github.com/kamailio/kamailio/commit/44eed1c1ad533ce60741aeedf97d328… Patch: https://github.com/kamailio/kamailio/commit/44eed1c1ad533ce60741aeedf97d328… --- diff --git a/pkg/kamailio/deb/debian/backports/sid b/pkg/kamailio/deb/debian/backports/sid index deb134222af..da837bb9301 100755 --- a/pkg/kamailio/deb/debian/backports/sid +++ b/pkg/kamailio/deb/debian/backports/sid @@ -32,7 +32,7 @@ sed -i -e '/dh-systemd/d' ${DIST}/control sed -i -e '/^ python,/d' -e '/python-dev/d' \ -e '/^Package: kamailio-python-modules/,/^$/d' \ ${DIST}/control -sed -i -e 's/ python [ ,$]*//' ${DIST}/rules +sed -i -e 's/ python [ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXCLUDED_MODULES=/s/$/ python/' ${DIST}/rules # no lsb-base

1 0

[kamailio/kamailio] Debian 12 packaging: missing files for kamailio-redis-modules (Issue #3617)
by bonan 26 Oct '23

26 Oct '23

### Description I installed kamailio-redis-modules for kamailio 5.6.4 on debian 12 (`kamailio-redis-modules_5.6.4+bpo12_amd64.deb`) The package doesn't contain the modules, only changelog and copyright The issue also seems to affect `kamailio-redis-modules_5.6.4+ubuntu22.04_amd64.deb` #### Reproduction ```sh wget "https://deb.kamailio.org/kamailio56/pool/main/k/kamailio/kamailio-redis-mod…" dpkg-deb -c "kamailio-redis-modules_5.6.4+bpo12_amd64.deb" ``` Result: ``` drwxr-xr-x root/root 0 2023-02-27 12:48 ./ drwxr-xr-x root/root 0 2023-02-27 12:48 ./usr/ drwxr-xr-x root/root 0 2023-02-27 12:48 ./usr/share/ drwxr-xr-x root/root 0 2023-02-27 12:48 ./usr/share/doc/ drwxr-xr-x root/root 0 2023-02-27 12:48 ./usr/share/doc/kamailio-redis-modules/ -rw-r--r-- root/root 487 2023-02-27 12:48 ./usr/share/doc/kamailio-redis-modules/changelog.Debian.gz -rw-r--r-- root/root 121021 2023-02-27 12:48 ./usr/share/doc/kamailio-redis-modules/changelog.gz -rw-r--r-- root/root 15067 2023-02-27 12:48 ./usr/share/doc/kamailio-redis-modules/copyright ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 12.2.0 ``` * **Operating System**: ``` # lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 12 (bookworm) Release: 12 Codename: bookworm # uname -a Linux [hostname] 6.1.0-13-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.55-1 (2023-09-29) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3617 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3617(a)github.com>

2 2

git:5.6:239d0a46: pkg/kamailio/deb: refresh files [skip ci]
by Victor Seva 26 Oct '23

26 Oct '23

Module: kamailio Branch: 5.6 Commit: 239d0a4623dc827b4285d8e888f873d0cd3c8b1e URL: https://github.com/kamailio/kamailio/commit/239d0a4623dc827b4285d8e888f873d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-26T10:22:36+02:00 pkg/kamailio/deb: refresh files [skip ci] related to #3617 --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/changelog Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/239d0a4623dc827b4285d8e888f873d… Patch: https://github.com/kamailio/kamailio/commit/239d0a4623dc827b4285d8e888f873d…

1 0

git:5.6:9326e98d: pkg/kamailio/deb: fix backports scripts [skip ci]
by Victor Seva 26 Oct '23

26 Oct '23

Module: kamailio Branch: 5.6 Commit: 9326e98d2677ada18f90e28ef37f496ab4d2e985 URL: https://github.com/kamailio/kamailio/commit/9326e98d2677ada18f90e28ef37f496… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-26T10:21:43+02:00 pkg/kamailio/deb: fix backports scripts [skip ci] missing space was causing some modules not to be build fixes #3617 --- Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/bookworm Modified: pkg/kamailio/deb/debian/backports/bullseye Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/focal Modified: pkg/kamailio/deb/debian/backports/jammy Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial --- Diff: https://github.com/kamailio/kamailio/commit/9326e98d2677ada18f90e28ef37f496… Patch: https://github.com/kamailio/kamailio/commit/9326e98d2677ada18f90e28ef37f496…

1 0

git:5.6:92977742: pv_headers: pvh_xavi_get_child() fix fallback logic
by Victor Seva 25 Oct '23

25 Oct '23

Module: kamailio Branch: 5.6 Commit: 929777428cdcfc18bdee55d09dce1b2b554c5df9 URL: https://github.com/kamailio/kamailio/commit/929777428cdcfc18bdee55d09dce1b2… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-25T18:35:47+02:00 pv_headers: pvh_xavi_get_child() fix fallback logic * don't fallback to Initial request headers for Replies (cherry picked from commit 19a32b863d9a79c0cbaf04a7a9864e0c08a914f7) (cherry picked from commit 7af9dc940e29fa3aecda011096820e011de0b254) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/929777428cdcfc18bdee55d09dce1b2… Patch: https://github.com/kamailio/kamailio/commit/929777428cdcfc18bdee55d09dce1b2… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 8b2acbf08be..29d5e0f74f8 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -287,7 +287,7 @@ sr_xavp_t *pvh_xavi_get_child(struct sip_msg *msg, str *xname, str *name) pvh_get_branch_xname(msg, xname, &br_xname); xavi = xavi_get_child(&br_xname, name); - if(xavi == NULL) { + if(xavi == NULL && msg->first_line.type == SIP_REQUEST) { if(cmp_str(xname, &br_xname) != 0) { xavi = xavi_get_child(xname, name); if(xavi) {

1 0

git:5.7:7af9dc94: pv_headers: pvh_xavi_get_child() fix fallback logic
by Victor Seva 25 Oct '23

25 Oct '23

Module: kamailio Branch: 5.7 Commit: 7af9dc940e29fa3aecda011096820e011de0b254 URL: https://github.com/kamailio/kamailio/commit/7af9dc940e29fa3aecda011096820e0… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-25T18:31:13+02:00 pv_headers: pvh_xavi_get_child() fix fallback logic * don't fallback to Initial request headers for Replies (cherry picked from commit 19a32b863d9a79c0cbaf04a7a9864e0c08a914f7) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/7af9dc940e29fa3aecda011096820e0… Patch: https://github.com/kamailio/kamailio/commit/7af9dc940e29fa3aecda011096820e0… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 4f90808c6f6..426831db561 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -287,7 +287,7 @@ sr_xavp_t *pvh_xavi_get_child(struct sip_msg *msg, str *xname, str *name) pvh_get_branch_xname(msg, xname, &br_xname); xavi = xavi_get_child(&br_xname, name); - if(xavi == NULL) { + if(xavi == NULL && msg->first_line.type == SIP_REQUEST) { if(cmp_str(xname, &br_xname) != 0) { xavi = xavi_get_child(xname, name); if(xavi) {

1 0

git:master:9a50e380: usrloc: reformat exported structures to be more readable
by Daniel-Constantin Mierla 25 Oct '23

25 Oct '23

Module: kamailio Branch: master Commit: 9a50e380216b7557b53a2e8a0e4068f81ecf635e URL: https://github.com/kamailio/kamailio/commit/9a50e380216b7557b53a2e8a0e4068f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-25T18:31:21+02:00 usrloc: reformat exported structures to be more readable --- Modified: src/modules/usrloc/ul_rpc.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9a50e380216b7557b53a2e8a0e4068f… Patch: https://github.com/kamailio/kamailio/commit/9a50e380216b7557b53a2e8a0e4068f…

1 0

git:master:f97149ae: dmq_usrloc: avoid needless second local socket search
by Daniel-Constantin Mierla 25 Oct '23

25 Oct '23

Module: kamailio Branch: master Commit: f97149aec9da71085df9dcf4541abba7b756939c URL: https://github.com/kamailio/kamailio/commit/f97149aec9da71085df9dcf4541abba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-25T18:31:21+02:00 dmq_usrloc: avoid needless second local socket search - remove overwriting local socket string value with received item --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/f97149aec9da71085df9dcf4541abba… Patch: https://github.com/kamailio/kamailio/commit/f97149aec9da71085df9dcf4541abba… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 61342cca2fe..8cbf63731c2 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -373,10 +373,6 @@ static int usrloc_dmq_execute_action(srjson_t *jdoc_action, dmq_node_t *node) sock = grep_sock_info(&host, (unsigned short)port, proto); if(sock == 0) { LM_DBG("non-local socket <%s>...ignoring\n", it->valuestring); - } else { - sock = grep_sock_info(&host, (unsigned short)port, proto); - sock->sock_str.s = it->valuestring; - sock->sock_str.len = strlen(sock->sock_str.s); } } else if(_dmq_usrloc_replicate_socket_info == DMQ_USRLOC_REPLICATE_SOCKNAME

1 0

git:master:19a32b86: pv_headers: pvh_xavi_get_child() fix fallback logic
by Victor Seva 25 Oct '23

25 Oct '23

Module: kamailio Branch: master Commit: 19a32b863d9a79c0cbaf04a7a9864e0c08a914f7 URL: https://github.com/kamailio/kamailio/commit/19a32b863d9a79c0cbaf04a7a9864e0… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-25T18:29:50+02:00 pv_headers: pvh_xavi_get_child() fix fallback logic * don't fallback to Initial request headers for Replies --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/19a32b863d9a79c0cbaf04a7a9864e0… Patch: https://github.com/kamailio/kamailio/commit/19a32b863d9a79c0cbaf04a7a9864e0… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 441a2a664af..203c8b8be2a 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -285,7 +285,7 @@ sr_xavp_t *pvh_xavi_get_child(struct sip_msg *msg, str *xname, str *name) pvh_get_branch_xname(msg, xname, &br_xname); xavi = xavi_get_child(&br_xname, name); - if(xavi == NULL) { + if(xavi == NULL && msg->first_line.type == SIP_REQUEST) { if(cmp_str(xname, &br_xname) != 0) { xavi = xavi_get_child(xname, name); if(xavi) {

1 0

git:master:dc42a189: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 24 Oct '23

24 Oct '23

Module: kamailio Branch: master Commit: dc42a1892282ffb7a95f731224a9ae88ac16c17d URL: https://github.com/kamailio/kamailio/commit/dc42a1892282ffb7a95f731224a9ae8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-10-24T20:47:06+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/dc42a1892282ffb7a95f731224a9ae8… Patch: https://github.com/kamailio/kamailio/commit/dc42a1892282ffb7a95f731224a9ae8…

1 0

git:master:b882db36: http_client: Add parameter timeout_mode (timeout in seconds or milliseconds)
by Daniel-Constantin Mierla 24 Oct '23

24 Oct '23

Module: kamailio Branch: master Commit: b882db36bbb7f7f13366bcc8f1db9f50910d2c0c URL: https://github.com/kamailio/kamailio/commit/b882db36bbb7f7f13366bcc8f1db9f5… Author: Nicolas C <nchaigne(a)capgemini.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-24T20:36:39+02:00 http_client: Add parameter timeout_mode (timeout in seconds or milliseconds) A new parameter timeout_mode is added. This parameter defines if timeouts are enabled, and in which unit timeout values are expressed. - 0 - Timeouts are disabled. - 1 - Timeout values are in seconds (default). - 2 - Timeout values are in milliseconds. Implementation detail: default global timeout = 0 (unconfigured). Parse connections as usual. If they have a timeout configured, use it. In mod_init: if global timeout == 0 (unconfigured), and timeout_mode is 1 or 2: if timeout_mode == 1 -> global timeout = 4 (seconds) if timeout_mode == 2 -> global timeout = 4000 (milliseconds) for each connection "conn" (fixup): if timeout_mode is not 1 or 2 -> conn.timeout = 0 (to reflect the fact that no timeout will be handled) else if conn.timeout is not configured -> conn.timeout = global timeout (in seconds or milliseconds, depending on timeout_mode). When doing Curl requests (curL_request_url): if timeout_mode == 1: set CURLOPT_TIMEOUT if timeout_mode == 2: set CURLOPT_TIMEOUT_MS --- Modified: src/modules/http_client/curlcon.c Modified: src/modules/http_client/curlcon.h Modified: src/modules/http_client/doc/http_client_admin.xml Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/b882db36bbb7f7f13366bcc8f1db9f5… Patch: https://github.com/kamailio/kamailio/commit/b882db36bbb7f7f13366bcc8f1db9f5…

1 0

[kamailio/kamailio] http_client: Add parameter timeout_mode (timeout in seconds or ms) (PR #3615)
by Nicolas C 24 Oct '23

24 Oct '23

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description A new parameter timeout_mode is added. This parameter defines if timeouts are enabled, and in which unit timeout values are expressed. - 0 - Timeouts are disabled. - 1 - Timeout values are in seconds (default). - 2 - Timeout values are in milliseconds. For reference, see discussion in: https://github.com/kamailio/kamailio/pull/3611 Implementation detail: ``` default global timeout = 0 (unconfigured). Parse connections as usual. If they have a timeout configured, use it. In mod_init: if global timeout == 0 (unconfigured), and timeout_mode is 1 or 2: if timeout_mode == 1 -> global timeout = 4 (seconds) if timeout_mode == 2 -> global timeout = 4000 (milliseconds) for each connection "conn" (fixup): if timeout_mode is not 1 or 2 -> conn.timeout = 0 (to reflect the fact that no timeout will be handled) else if conn.timeout is not configured -> conn.timeout = global timeout (in seconds or milliseconds, depending on timeout_mode). When doing Curl requests (curL_request_url): if timeout_mode == 1: set CURLOPT_TIMEOUT if timeout_mode == 2: set CURLOPT_TIMEOUT_MS ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3615 -- Commit Summary -- * http_client: Add parameter timeout_mode (timeout in seconds or milliseconds) -- File Changes -- M src/modules/http_client/curlcon.c (27) M src/modules/http_client/curlcon.h (14) M src/modules/http_client/doc/http_client_admin.xml (35) M src/modules/http_client/functions.c (21) M src/modules/http_client/http_client.c (32) M src/modules/http_client/http_client.h (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3615.patch https://github.com/kamailio/kamailio/pull/3615.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3615 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3615(a)github.com>

2 5

[kamailio/kamailio] cdp: Add and apply cdp_openssl_clear_errors function (PR #3612)
by Xenofon Karamanos 24 Oct '23

24 Oct '23

- Add new function to clear OpenSSL errors prior to any SSL_* call - Apply function where appropriate   #### 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 - [x] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR proposes similar fixes like https://github.com/kamailio/kamailio/pull/3607. OpenSSL docs suggest that the error stack must be empty for [SSL_get_error() to work reliably](https://www.openssl.org/docs/man3.0/man3/SSL_get_error.html). _Note: This has not been tested like previous PR and any feedback of course is appreciated._ You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3612 -- Commit Summary -- * cdp: Add and apply cdp_openssl_clear_errors function -- File Changes -- M src/modules/cdp/cdp_tls.c (2) M src/modules/cdp/receiver.c (3) A src/modules/cdp/utils.c (21) M src/modules/cdp/utils.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3612.patch https://github.com/kamailio/kamailio/pull/3612.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3612 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3612(a)github.com>

3 13

git:master:4ec11b1a: cdp: Add and apply cdp_openssl_clear_errors function (#3612)
by GitHub 24 Oct '23

24 Oct '23

Module: kamailio Branch: master Commit: 4ec11b1a851d321959a0a38041bc7a6ea8107f39 URL: https://github.com/kamailio/kamailio/commit/4ec11b1a851d321959a0a38041bc7a6… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: GitHub <noreply(a)github.com> Date: 2023-10-24T20:07:36+02:00 cdp: Add and apply cdp_openssl_clear_errors function (#3612) * cdp: Add and apply cdp_openssl_clear_errors function - add new function to clear OpenSSL errors prior to any SSL_* call --- Modified: src/modules/cdp/cdp_tls.c Modified: src/modules/cdp/cdp_tls.h Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/4ec11b1a851d321959a0a38041bc7a6… Patch: https://github.com/kamailio/kamailio/commit/4ec11b1a851d321959a0a38041bc7a6… --- diff --git a/src/modules/cdp/cdp_tls.c b/src/modules/cdp/cdp_tls.c index 903445b676d..3f1c15fd182 100644 --- a/src/modules/cdp/cdp_tls.c +++ b/src/modules/cdp/cdp_tls.c @@ -164,6 +164,22 @@ int load_certificates(SSL_CTX *ctx, str *cert, str *key) return 0; } +/* + * Get any leftover errors from OpenSSL and print them. + * ERR_get_error() also removes the error from the OpenSSL error stack. + * This is useful to call before any SSL_* IO calls to make sure + * we don't have any leftover errors from previous calls (OpenSSL docs). + */ +void cdp_openssl_clear_errors(void) +{ + int i; + char err[256]; + while((i = ERR_get_error())) { + ERR_error_string(i, err); + LM_INFO("clearing leftover error before SSL_* calls: %s\n", err); + } +} + SSL *init_ssl_conn(int client_fd, SSL_CTX *ctx) { X509 *cert = NULL; @@ -184,6 +200,7 @@ SSL *init_ssl_conn(int client_fd, SSL_CTX *ctx) goto cleanup; } /* Perform the TLS handshake */ + cdp_openssl_clear_errors(); ssl_ret = SSL_connect(ssl); if(ssl_ret != 1) { error = SSL_get_error(ssl, ssl_ret); diff --git a/src/modules/cdp/cdp_tls.h b/src/modules/cdp/cdp_tls.h index b2e49408b34..a4981fbade9 100644 --- a/src/modules/cdp/cdp_tls.h +++ b/src/modules/cdp/cdp_tls.h @@ -67,6 +67,7 @@ static inline int tls_err_ret(char *s, SSL_CTX *ctx) } while(0) int tls_parse_method(str *method); +void cdp_openssl_clear_errors(void); void init_ssl_methods(void); SSL_CTX *init_ssl_ctx(int method); SSL *init_ssl_conn(int client_fd, SSL_CTX *ctx); diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index ceee98127f6..223d14dd403 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -537,6 +537,7 @@ static inline int do_read(serviced_peer_t *sp, char *dst, int n) char *err_str; if(sp->tls_conn) { + cdp_openssl_clear_errors(); cnt = SSL_read(sp->tls_conn, dst, n); if(unlikely(cnt < 0)) { ssl_err = SSL_get_error(sp->tls_conn, cnt); @@ -687,6 +688,7 @@ static int do_write(serviced_peer_t *sp, const void *buf, int num) char *err_str; if(sp->tls_conn) { + cdp_openssl_clear_errors(); cnt = SSL_write(sp->tls_conn, buf, num); if(unlikely(cnt <= 0)) { ssl_err = SSL_get_error(sp->tls_conn, cnt);

1 0

git:master:16378fd6: core: use advertised proto to build lump-based recv/send values
by Daniel-Constantin Mierla 24 Oct '23

24 Oct '23

Module: kamailio Branch: master Commit: 16378fd6435355749d9a6602769132be7ef0aa6d URL: https://github.com/kamailio/kamailio/commit/16378fd6435355749d9a6602769132b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-24T20:05:03+02:00 core: use advertised proto to build lump-based recv/send values --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/16378fd6435355749d9a6602769132b… Patch: https://github.com/kamailio/kamailio/commit/16378fd6435355749d9a6602769132b…

1 0

git:master:558afc14: core: via builder can use proto from xavp fields or advertised address
by Daniel-Constantin Mierla 24 Oct '23

24 Oct '23

Module: kamailio Branch: master Commit: 558afc14d71913214fa11c926f66ec2337a1ec3a URL: https://github.com/kamailio/kamailio/commit/558afc14d71913214fa11c926f66ec2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-24T17:18:11+02:00 core: via builder can use proto from xavp fields or advertised address --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/558afc14d71913214fa11c926f66ec2… Patch: https://github.com/kamailio/kamailio/commit/558afc14d71913214fa11c926f66ec2… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f3e2ce6c28b..019bd610a0d 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2825,6 +2825,7 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, char *comp_name; #endif /* USE_COMP */ int port; + int proto; struct ip_addr ip; union sockaddr_union *from = NULL; union sockaddr_union local_addr; @@ -2868,7 +2869,23 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, else port_str = &(send_sock->port_no_str); } - + proto = PROTO_NONE; + if(msg && (msg->msg_flags & FL_USE_XAVP_VIA_FIELDS) + && _ksr_xavp_via_fields.len > 0) { + xname.s = "proto"; + xname.len = 5; + rxavp = xavp_get_child_with_sval(&_ksr_xavp_via_fields, &xname); + if(rxavp != NULL) { + proto = get_valid_proto_id(&rxavp->val.v.s); + } + } + if(proto==PROTO_NONE) { + if(send_sock->useinfo.proto != PROTO_NONE) { + proto = send_sock->useinfo.proto; + } else { + proto = send_info->proto; + } + } comp_len = comp_name_len = 0; #ifdef USE_COMP comp_name = 0; @@ -2891,7 +2908,7 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, } #endif /* USE_COMP */ - via_prefix_len = MY_VIA_LEN + (send_info->proto == PROTO_SCTP); + via_prefix_len = MY_VIA_LEN + (proto == PROTO_SCTP); max_len = via_prefix_len + address_str->len /* space in MY_VIA */ + 2 /* just in case it is a v6 address ... [ ] */ + 1 /*':'*/ + port_str->len @@ -2910,15 +2927,15 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, via_len = via_prefix_len + address_str->len; /*space included in MY_VIA*/ memcpy(line_buf, MY_VIA, MY_VIA_LEN); - if(send_info->proto == PROTO_UDP) { + if(proto == PROTO_UDP) { /* do nothing */ - } else if(send_info->proto == PROTO_TCP) { + } else if(proto == PROTO_TCP) { memcpy(line_buf + MY_VIA_LEN - 4, "TCP ", 4); - } else if(send_info->proto == PROTO_TLS) { + } else if(proto == PROTO_TLS) { memcpy(line_buf + MY_VIA_LEN - 4, "TLS ", 4); - } else if(send_info->proto == PROTO_SCTP) { + } else if(proto == PROTO_SCTP) { memcpy(line_buf + MY_VIA_LEN - 4, "SCTP ", 5); - } else if(send_info->proto == PROTO_WS) { + } else if(proto == PROTO_WS) { if(unlikely(send_info->send_flags.f & SND_F_FORCE_SOCKET && send_info->send_sock)) { local_addr = send_info->send_sock->su; @@ -2957,10 +2974,10 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, return 0; } tcpconn_put(con); - } else if(send_info->proto == PROTO_WSS) { + } else if(proto == PROTO_WSS) { memcpy(line_buf + MY_VIA_LEN - 4, "WSS ", 4); } else { - LM_CRIT("unknown proto %d\n", send_info->proto); + LM_CRIT("unknown proto %d\n", proto); pkg_free(line_buf); return 0; }

1 0

git:master:296ed155: core: helper function to get proto id from str
by Daniel-Constantin Mierla 24 Oct '23

24 Oct '23

Module: kamailio Branch: master Commit: 296ed155be83bc854507892f944748cb8864b704 URL: https://github.com/kamailio/kamailio/commit/296ed155be83bc854507892f944748c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-24T17:16:16+02:00 core: helper function to get proto id from str --- Modified: src/core/ip_addr.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/296ed155be83bc854507892f944748c… Patch: https://github.com/kamailio/kamailio/commit/296ed155be83bc854507892f944748c… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index bc42b4532d8..02c26f969d5 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -705,6 +705,44 @@ char *get_proto_name(unsigned int proto) } } +/** get protocol id from string value. + * @param protoval - protocol value + * @return int value of the protocol. + */ +int get_valid_proto_id(str *protoval) +{ + if(protoval == NULL || protoval->s == NULL || protoval->len <= 0) { + return PROTO_NONE; + } + switch(protoval->len) { + case 2: + if(strncasecmp(protoval->s, "ws", 2) == 0) { + return PROTO_WS; + } + break; + case 3: + if(strncasecmp(protoval->s, "udp", 3) == 0) { + return PROTO_UDP; + } + if(strncasecmp(protoval->s, "tcp", 3) == 0) { + return PROTO_TCP; + } + if(strncasecmp(protoval->s, "tls", 3) == 0) { + return PROTO_TLS; + } + if(strncasecmp(protoval->s, "wss", 3) == 0) { + return PROTO_WSS; + } + break; + case 4: + if(strncasecmp(protoval->s, "sctp", 4) == 0) { + return PROTO_SCTP; + } + break; + } + return PROTO_NONE; +} + /** get address family name (asciiz). * @param af - address family id * @return string with the adderess family name or "unknown". diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index c0067b56d2a..cec63fc4fa9 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -338,6 +338,7 @@ char *get_proto_name(unsigned int proto); int get_valid_proto_string( unsigned int iproto, int utype, int vtype, str *sproto); +int get_valid_proto_id(str *protoval); char *get_af_name(unsigned int af);

1 0

[kamailio/kamailio] http_client: Add parameter connect_timeout_ms / timeout_ms (2) (PR #3611)
by Nicolas C 24 Oct '23

24 Oct '23

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description The new parameter connect_timeout_ms (global) / timeout_ms (in httpcon) allows to specify a timeout in milliseconds on curl requests. If this parameter is defined (non zero), then the timeout in seconds is ignored. If either timeout or timeout_ms is defined at connection level, then they take precedence over the global parameters. These principles also apply to the file configuration. The timeout in ms is used internally to set CURLOPT_TIMEOUT_MS. The value is shown in ms when using RPC "httpclient.listcon". You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3611 -- Commit Summary -- * http_client: Add parameter connect_timeout_ms / timeout_ms (2) -- File Changes -- M src/modules/http_client/curlcon.c (103) M src/modules/http_client/doc/http_client_admin.xml (32) M src/modules/http_client/functions.c (24) M src/modules/http_client/http_client.c (12) M src/modules/http_client/http_client.h (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3611.patch https://github.com/kamailio/kamailio/pull/3611.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3611 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3611(a)github.com>

3 11

[kamailio/kamailio] ims_dialog: Add function to get dialog by hash entry and id (PR #3613)
by mtryfoss 24 Oct '23

24 Oct '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Add function to get dialog by internal hash entry and id. This is needed by my other ongoing changes to the ims_charging module for restoring records from database. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3613 -- Commit Summary -- * ims_dialog: Add function to get dialog by hash entry and id -- File Changes -- M src/modules/ims_dialog/dlg_handlers.c (19) M src/modules/ims_dialog/dlg_handlers.h (8) M src/modules/ims_dialog/dlg_load.h (5) M src/modules/ims_dialog/ims_dialog.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3613.patch https://github.com/kamailio/kamailio/pull/3613.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3613 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3613(a)github.com>

2 2

git:master:309565b0: ims_dialog: Add function to get dialog by hash entry and id
by Daniel-Constantin Mierla 24 Oct '23

24 Oct '23

Module: kamailio Branch: master Commit: 309565b08f6294fdbd3d31163a73bd75a680a7e0 URL: https://github.com/kamailio/kamailio/commit/309565b08f6294fdbd3d31163a73bd7… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-24T14:55:49+02:00 ims_dialog: Add function to get dialog by hash entry and id --- Modified: src/modules/ims_dialog/dlg_handlers.c Modified: src/modules/ims_dialog/dlg_handlers.h Modified: src/modules/ims_dialog/dlg_load.h Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/309565b08f6294fdbd3d31163a73bd7… Patch: https://github.com/kamailio/kamailio/commit/309565b08f6294fdbd3d31163a73bd7… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index 0ba5857c2d5..3487d7f4c2a 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -2101,3 +2101,22 @@ struct dlg_cell *dlg_get_msg_dialog(sip_msg_t *msg) } return dlg; } + +/*! + * \brief Get dialog based on hash entry and id + * \param h_entry number of the hash table entry + * \param h_id id of the hash table entry + * \return dialog structure on success, NULL on failure + */ + +struct dlg_cell *dlg_get_hash_dialog(unsigned int h_entry, unsigned int h_id) +{ + struct dlg_cell *dlg = NULL; + + dlg = lookup_dlg(h_entry, h_id); + if(dlg == NULL) { + LM_ERR("Unable to find dlg\n"); + return NULL; + } + return dlg; +} diff --git a/src/modules/ims_dialog/dlg_handlers.h b/src/modules/ims_dialog/dlg_handlers.h index 0e61d5dc825..5e5538ebf99 100644 --- a/src/modules/ims_dialog/dlg_handlers.h +++ b/src/modules/ims_dialog/dlg_handlers.h @@ -210,4 +210,12 @@ void internal_print_all_dlg(struct dlg_cell *dlg); */ struct dlg_cell *dlg_get_msg_dialog(sip_msg_t *msg); +/*! + * \brief Get dialog based on hash entry and id + * \param h_entry number of the hash table entry + * \param h_id id of the hash table entry + * \return dialog structure on success, NULL on failure + */ +struct dlg_cell *dlg_get_hash_dialog(unsigned int h_entry, unsigned int h_id); + #endif diff --git a/src/modules/ims_dialog/dlg_load.h b/src/modules/ims_dialog/dlg_load.h index be2d5f61ca3..4f62e5acc30 100644 --- a/src/modules/ims_dialog/dlg_load.h +++ b/src/modules/ims_dialog/dlg_load.h @@ -42,6 +42,10 @@ typedef int (*ims_lookup_terminate_dlg_f)( /* get the current dialog based on message function prototype */ typedef struct dlg_cell *(*ims_get_dlg_f)(struct sip_msg *msg); +/* get dialog based on hash entry and id */ +typedef struct dlg_cell *(*ims_get_dlg_hash_f)( + unsigned int h_entry, unsigned int h_id); + /* get_dlg_lifetime function prototype */ typedef time_t (*ims_get_dlg_expires_f)(str *callid, str *ftag, str *ttag); @@ -57,6 +61,7 @@ typedef struct ims_dlg_binds ims_get_dlg_variable_f get_dlg_var; ims_get_dlg_expires_f get_dlg_expires; ims_get_dlg_f get_dlg; + ims_get_dlg_hash_f get_dlg_hash; ims_release_dlg_f release_dlg; } ims_dlg_api_t; diff --git a/src/modules/ims_dialog/ims_dialog.c b/src/modules/ims_dialog/ims_dialog.c index a9fd0aecebf..23b3160b14e 100644 --- a/src/modules/ims_dialog/ims_dialog.c +++ b/src/modules/ims_dialog/ims_dialog.c @@ -355,6 +355,7 @@ int load_ims_dlg(ims_dlg_api_t *dlgb) dlgb->lookup_terminate_dlg = w_api_lookup_terminate_dlg; dlgb->get_dlg_expires = api_get_dlg_expires; dlgb->get_dlg = dlg_get_msg_dialog; + dlgb->get_dlg_hash = dlg_get_hash_dialog; dlgb->release_dlg = dlg_release; return 1;

1 0

[kamailio/kamailio] http_client: Add parameter connect_timeout_ms / timeout_ms (PR #3609)
by Nicolas C 24 Oct '23

24 Oct '23

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description The new parameter connect_timeout_ms (global) / timeout_ms (in httpcon) allows to specify a timeout in milliseconds on curl requests. If this parameter is defined (non zero), then the timeout in seconds is ignored. See https://curl.se/libcurl/c/CURLOPT_TIMEOUT_MS.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3609 -- Commit Summary -- * http_client: Add parameter connect_timeout_ms / timeout_ms -- File Changes -- M src/modules/http_client/curlcon.c (55) M src/modules/http_client/doc/http_client_admin.xml (29) M src/modules/http_client/functions.c (22) M src/modules/http_client/http_client.c (12) M src/modules/http_client/http_client.h (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3609.patch https://github.com/kamailio/kamailio/pull/3609.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3609 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3609(a)github.com>

3 12

git:master:111d9f70: app_ruby: Fix rpc documentation typo
by Victor Seva 24 Oct '23

24 Oct '23

Module: kamailio Branch: master Commit: 111d9f70cf55eca08b78e21213f3452fa8622d21 URL: https://github.com/kamailio/kamailio/commit/111d9f70cf55eca08b78e21213f3452… Author: Konstantin Tumalevich <userad(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-24T14:21:27+02:00 app_ruby: Fix rpc documentation typo --- Modified: src/modules/app_ruby/app_ruby_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/111d9f70cf55eca08b78e21213f3452… Patch: https://github.com/kamailio/kamailio/commit/111d9f70cf55eca08b78e21213f3452… --- diff --git a/src/modules/app_ruby/app_ruby_mod.c b/src/modules/app_ruby/app_ruby_mod.c index cf0574e325a..4d08464a996 100644 --- a/src/modules/app_ruby/app_ruby_mod.c +++ b/src/modules/app_ruby/app_ruby_mod.c @@ -556,7 +556,7 @@ static sr_kemi_t sr_kemi_app_ruby_exports[] = { /* clang-format on */ -static const char *app_ruby_rpc_reload_doc[2] = {"Reload javascript file", 0}; +static const char *app_ruby_rpc_reload_doc[2] = {"Reload ruby file", 0}; static void app_ruby_rpc_reload(rpc_t *rpc, void *ctx)

1 0

[kamailio/kamailio] app_ruby: Fix rpc documentation typo (PR #3614)
by Konstantin Tumalevich 24 Oct '23

24 Oct '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Just a small change in app_ruby_rpc_reload_doc constant which mistakingly says javascript instead of ruby file. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3614 -- Commit Summary -- * app_ruby: Fix rpc documentation typo -- File Changes -- M src/modules/app_ruby/app_ruby_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3614.patch https://github.com/kamailio/kamailio/pull/3614.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3614 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3614(a)github.com>

2 2

git:master:7731fc3a: tls: add log line-break, increase buffer size (related to GH 3612 and GH 3607)
by Henning Westerholt 24 Oct '23

24 Oct '23

Module: kamailio Branch: master Commit: 7731fc3a1d793ffc7204e5c042a8bfc38d97e691 URL: https://github.com/kamailio/kamailio/commit/7731fc3a1d793ffc7204e5c042a8bfc… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-10-24T11:13:36Z tls: add log line-break, increase buffer size (related to GH 3612 and GH 3607) --- Modified: src/modules/tls/tls_util.c --- Diff: https://github.com/kamailio/kamailio/commit/7731fc3a1d793ffc7204e5c042a8bfc… Patch: https://github.com/kamailio/kamailio/commit/7731fc3a1d793ffc7204e5c042a8bfc… --- diff --git a/src/modules/tls/tls_util.c b/src/modules/tls/tls_util.c index 0377397200c..40d2bf07d22 100644 --- a/src/modules/tls/tls_util.c +++ b/src/modules/tls/tls_util.c @@ -106,9 +106,9 @@ void collect_garbage(void) void tls_openssl_clear_errors(void) { int i; - char err[160]; + char err[256]; while((i = ERR_get_error())) { ERR_error_string(i, err); - INFO("clearing leftover error before SSL_* calls: %s", err); + INFO("clearing leftover error before SSL_* calls: %s\n", err); } }

1 0

git:master:0a98a0d5: corex: read fmatch as str rpc parameter for shm.rprint
by Daniel-Constantin Mierla 23 Oct '23

23 Oct '23

Module: kamailio Branch: master Commit: 0a98a0d504f79cc6aa0cac13e2b30a00e6181636 URL: https://github.com/kamailio/kamailio/commit/0a98a0d504f79cc6aa0cac13e2b30a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-23T10:42:54+02:00 corex: read fmatch as str rpc parameter for shm.rprint --- Modified: src/modules/corex/corex_mod.c Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/0a98a0d504f79cc6aa0cac13e2b30a0… Patch: https://github.com/kamailio/kamailio/commit/0a98a0d504f79cc6aa0cac13e2b30a0… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index bdfcbe71213..ed37b22c757 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -93,7 +93,7 @@ static int corex_dns_cache_param_add(str *pval); static int corex_sip_reply_out(sr_event_param_t *evp); -/*clang-format off*/ +/* clang-format off */ static pv_export_t mod_pvs[] = { {{"cfg", (sizeof("cfg") - 1)}, PVT_OTHER, pv_get_cfg, 0, pv_parse_cfg_name, 0, 0, 0}, @@ -196,7 +196,7 @@ struct module_exports exports = { child_init, /* per-child init function */ mod_destroy /* module destroy function */ }; -/*clang-format on*/ +/* clang-format on */ /** * init module function diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 02fa08f8a36..81866ab2bc8 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -129,7 +129,7 @@ static void corex_rpc_shm_rprint(rpc_t *rpc, void *ctx) str fmatch = STR_NULL; FILE *fp = NULL; - if(rpc->scan(ctx, "ss", &fname, &fmatch) < 2) { + if(rpc->scan(ctx, "sS", &fname, &fmatch) < 2) { rpc->fault(ctx, 400, "Filename and filter not provided"); return; } @@ -139,18 +139,20 @@ static void corex_rpc_shm_rprint(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Cannot open file"); return; } + LM_DBG("matching file name with: %.*s\n", fmatch.len, fmatch.s); shm_status_filter(&fmatch, fp); fclose(fp); } -/*clang-format off*/ +/* clang-format off */ rpc_export_t corex_rpc_shm_cmds[] = { - {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, - {"shm.report", corex_rpc_shm_report, corex_rpc_shm_report_doc, 0}, - {"shm.stats", corex_rpc_shm_stats, corex_rpc_shm_stats_doc, 0}, - {"shm.rprint", corex_rpc_shm_rprint, corex_rpc_shm_rprint_doc, 0}, - {0, 0, 0, 0}}; -/*clang-format on*/ + {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, + {"shm.report", corex_rpc_shm_report, corex_rpc_shm_report_doc, 0}, + {"shm.stats", corex_rpc_shm_stats, corex_rpc_shm_stats_doc, 0}, + {"shm.rprint", corex_rpc_shm_rprint, corex_rpc_shm_rprint_doc, 0}, + {0, 0, 0, 0} +}; +/* clang-format on */ /** * register RPC shm commands

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev