sr-dev October 2023

sr-dev@lists.kamailio.org

15 participants
291 discussions

git:master:8d84c621: cdp: Disable TLS support for openssl versions older than 1.1.0
by Daniel-Constantin Mierla 11 Oct '23

11 Oct '23

Module: kamailio Branch: master Commit: 8d84c6210fa7071d3ea96f219d486cc1b41dc119 URL: https://github.com/kamailio/kamailio/commit/8d84c6210fa7071d3ea96f219d486cc… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-11T13:19:04+02:00 cdp: Disable TLS support for openssl versions older than 1.1.0 --- Modified: src/modules/cdp/cdp_mod.c Modified: src/modules/cdp/cdp_tls.c Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/8d84c6210fa7071d3ea96f219d486cc… Patch: https://github.com/kamailio/kamailio/commit/8d84c6210fa7071d3ea96f219d486cc… --- diff --git a/src/modules/cdp/cdp_mod.c b/src/modules/cdp/cdp_mod.c index d63e5206d90..5f776f57a1f 100644 --- a/src/modules/cdp/cdp_mod.c +++ b/src/modules/cdp/cdp_mod.c @@ -239,6 +239,7 @@ static int cdp_init(void) return 1; } + #if OPENSSL_VERSION_NUMBER >= 0x10100000L if(enable_tls) { init_ssl_methods(); method = tls_parse_method(&tls_method); @@ -247,6 +248,12 @@ static int cdp_init(void) return -1; } } + #else + if(enable_tls) { + LM_ERR("TLS requires openssl 1.1.0 or newer\n"); + return -1; + } + #endif register_procs(2 + config->workers + 2 * config->peers_cnt); cfg_register_child(2 + config->workers + 2 * config->peers_cnt); diff --git a/src/modules/cdp/cdp_tls.c b/src/modules/cdp/cdp_tls.c index 6c7fb9a1f45..903445b676d 100644 --- a/src/modules/cdp/cdp_tls.c +++ b/src/modules/cdp/cdp_tls.c @@ -1,3 +1,4 @@ +#if OPENSSL_VERSION_NUMBER >= 0x10100000L #include "cdp_tls.h" cfg_option_t methods[] = {{"TLSv1", .val = TLS_USE_TLSv1}, @@ -255,3 +256,4 @@ int to_ssl(SSL_CTX **tls_ctx_p, SSL **tls_conn_p, int tcp_sock, int method) } return 0; } +#endif \ No newline at end of file diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 3c6223a758a..0a15ce3aaeb 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -813,10 +813,12 @@ int receive_loop(peer *original_peer) p->R_sock = fd; } + #if OPENSSL_VERSION_NUMBER >= 0x10100000L if(enable_tls) { to_ssl(&sp2->tls_ctx, &sp2->tls_conn, sp->tcp_socket, method); } + #endif } else { sp2 = add_serviced_peer(NULL); if(!sp2) { @@ -824,10 +826,12 @@ int receive_loop(peer *original_peer) continue; } sp2->tcp_socket = fd; + #if OPENSSL_VERSION_NUMBER >= 0x10100000L if(enable_tls) { to_ssl(&sp2->tls_ctx, &sp2->tls_conn, sp->tcp_socket, method); } + #endif } } } @@ -879,7 +883,9 @@ int receive_loop(peer *original_peer) sp->p ? sp->p->fqdn.s : "", sp->tcp_socket, strerror(errno)); AAAFreeMessage(&msg); + #if OPENSSL_VERSION_NUMBER >= 0x10100000L cleanup_ssl(sp->tls_ctx, sp->tls_conn); + #endif close(sp->tcp_socket); goto drop_peer; } @@ -892,7 +898,9 @@ int receive_loop(peer *original_peer) sp->p ? sp->p->fqdn.s : "", sp->tcp_socket, cnt, msg->buf.len); AAAFreeMessage(&msg); + #if OPENSSL_VERSION_NUMBER >= 0x10100000L cleanup_ssl(sp->tls_ctx, sp->tls_conn); + #endif close(sp->tcp_socket); goto drop_peer; }

1 0

git:master:54c18ebb: core: mem/shm - wrapper marcro to check if xsetfunc is implemented
by Daniel-Constantin Mierla 11 Oct '23

11 Oct '23

Module: kamailio Branch: master Commit: 54c18ebb4b471af95aa403a81d4a37b71c9c4a14 URL: https://github.com/kamailio/kamailio/commit/54c18ebb4b471af95aa403a81d4a37b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-11T13:11:04+02:00 core: mem/shm - wrapper marcro to check if xsetfunc is implemented --- Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/54c18ebb4b471af95aa403a81d4a37b… Patch: https://github.com/kamailio/kamailio/commit/54c18ebb4b471af95aa403a81d4a37b… --- diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 9ea31d53131..8d4d0d95eed 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -105,7 +105,14 @@ extern sr_shm_api_t _shm_root; #define shm_global_lock() _shm_root.xglock(_shm_root.mem_block) #define shm_global_unlock() _shm_root.xgunlock(_shm_root.mem_block) -#define shm_setfunc(p, f) _shm_root.xsetfunc(_shm_root.mem_block, (p), (f)) +#define shm_setfunc(p, f) \ + do { \ + if(_shm_root.xsetfunc) { \ + _shm_root.xsetfunc(_shm_root.mem_block, (p), (f)); \ + } else { \ + LM_ERR("xsetfunc not implemented\n"); \ + } \ + } while(0) void *shm_core_get_pool(void); int shm_init_api(sr_shm_api_t *ap);

1 0

Kamailio Developers Meeting, Nov 7-8, 2023, in Dusseldorf
by Daniel-Constantin Mierla 11 Oct '23

11 Oct '23

Hello, Kamailio SIP Server project is organizing another meeting of its developers and community members during November 7-8, 2023, hosted again by sipgate.de in Dusseldorf, Germany. The event is intended to facilitate the interaction between Kamailio developers and contributors in order to offer a convenient environment for working together on several topics of high interest for the project, including writing code for Kamailio and its tools, improving documentation, or discuss about future development. Everyone from the community is welcome to join, developer or user interested in helping the project. Please note we have a limited capacity of seats in the meeting room, the main policy for accepting participants being first come first server. Also, very important to be aware that this is not an event to learn how to use Kamailio. More details about the event, the venue, how to register, are available at: * https://www.kamailio.org/w/developers-meeting/ Looking forward to those two intensive hacking Kamailio days in Dusseldorf! Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy and Development Services Kamailio Advanced Training - Online - Nov 14-16, 2023 -- asipto.com

1 0

[kamailio/kamailio] 503(service unavailable) (Issue #3599)
by masudmuborakshohi 11 Oct '23

11 Oct '23

Hello! It often happens to me that the service begins to refuse service (503) and so far I have not been able to understand the exact reason. Typically, before clients start receiving 503, many before them receive a 408 code. As soon as the service starts responding with 503, it does not recover on its own, you have to restart. There is no way to understand from the logs what led to this (nothing unusual). My server is powerful enough for the number of users of my service (what I mean is that there is no problem with resources). For example, 64 cores, 125GB of DDR4 RAM, 2TB of disk, of which 1TB SSD for the database, 10Gigabit channel, this is only a server for Kamailio for Rtpengines separate servers. Please help me figure out what causes a service failure!? OS: Debian 11, 64 cores, 125GB of DDR4 RAM; DB: MariaDB 10.5.15; kamailio -v version: kamailio 5.5.3 (x86_64/linux) 473cef 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. udp_children: 30; tcp_children: 34; TLS: YES; async_workers: 64. Incoming calls are sent via push notifications( Federico Cabiddu method: [https://www.voztovoice.org/sites/default/files/KamilioWorld2015%20-Federico…). NetBridging(for SIP and RTPEngine). ims_charging for billing (integration with our billing system using the Diameter protocol). In the logs exactly at the moment when the service began to refuse, the recording disappears completely for 7 minutes, absolutely no entries, after which the recording of the TCP queue full begins. Oct 3 18:38:07 sip1-life3 kamailio[3380553]: CRITICAL: {2 3691 INVITE 672699d1-c76b-4153-b72a-fe647913a9e9} tm [../../core/forward.h:292]: msg_send_buffer(): tcp_send failed Oct 3 18:38:09 sip1-life3 kamailio[3380539]: CRITICAL: {2 3691 INVITE 672699d1-c76b-4153-b72a-fe647913a9e9} tm [../../core/forward.h:292]: msg_send_buffer(): tcp_send failed Oct 3 18:38:12 sip1-life3 kamailio[3380534]: CRITICAL: {2 30106 INVITE 032f8650-1d90-49ed-82f1-c50ccbef191d} tm [../../core/forward.h:292]: msg_send_buffer(): tcp_send failed Oct 3 18:45:14 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 11, socket 224: queue full, 285 requests queued (total handled 2899418) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 1, socket 204: queue full, 286 requests queued (total handled 2964063) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 4, socket 210: queue full, 286 requests queued (total handled 2923484) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 6, socket 214: queue full, 286 requests queued (total handled 2911633) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 7, socket 216: queue full, 286 requests queued (total handled 2907132) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 8, socket 218: queue full, 286 requests queued (total handled 2903281) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 9, socket 220: queue full, 286 requests queued (total handled 2903438) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 11, socket 224: queue full, 286 requests queued (total handled 2899419) Oct 3 18:45:15 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 12, socket 226: queue full, 286 requests queued (total handled 2897842) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 16, socket 234: queue full, 286 requests queued (total handled 2895429) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 17, socket 236: queue full, 286 requests queued (total handled 2895303) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 22, socket 246: queue full, 286 requests queued (total handled 2891873) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 26, socket 254: queue full, 286 requests queued (total handled 2892619) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 27, socket 256: queue full, 286 requests queued (total handled 2891769) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 224 , queue entry 0, retries 98, connection 0x7f0b6d974348, tcp so Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 30, socket 262: queue full, 286 requests queued (total handled 2891614) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 31, socket 264: queue full, 286 requests queued (total handled 2890778) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 33, socket 268: queue full, 286 requests queued (total handled 2890852) Oct 3 18:45:16 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 0, socket 202: queue full, 287 requests queued (total handled 3071438) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 1, socket 204: queue full, 287 requests queued (total handled 2964064) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 2, socket 206: queue full, 287 requests queued (total handled 2944928) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 4, socket 210: queue full, 287 requests queued (total handled 2923485) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 5, socket 212: queue full, 287 requests queued (total handled 2915778) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 6, socket 214: queue full, 287 requests queued (total handled 2911634) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 7, socket 216: queue full, 287 requests queued (total handled 2907133) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 8, socket 218: queue full, 287 requests queued (total handled 2903282) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 9, socket 220: queue full, 287 requests queued (total handled 2903439) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 10, socket 222: queue full, 287 requests queued (total handled 2900227) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 11, socket 224: queue full, 287 requests queued (total handled 2899420) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 12, socket 226: queue full, 287 requests queued (total handled 2897843) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 204 , queue entry 0, retries 88, connection 0x7f0b742a1968, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 13, socket 228: queue full, 287 requests queued (total handled 2896210) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 210 , queue entry 0, retries 86, connection 0x7f0b74ffaa08, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 16, socket 234: queue full, 287 requests queued (total handled 2895430) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 214 , queue entry 0, retries 88, connection 0x7f0b75003218, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 216 , queue entry 1, retries 86, connection 0x7f0b75007620, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 218 , queue entry 2, retries 84, connection 0x7f0b74772f70, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 17, socket 236: queue full, 287 requests queued (total handled 2895304) Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 220 , queue entry 0, retries 87, connection 0x7f0b74777378, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: ERROR: <core> [core/tcp_main.c:3458]: send_fd_queue_run(): send_fd failed on socket 224 , queue entry 1, retries 83, connection 0x7f0b7477fb88, tcp so Oct 3 18:45:17 sip1-life3 /usr/local/sbin/kamailio[3380778]: CRITICAL: <core> [core/tcp_main.c:4170]: send2child(): tcp child 21, socket 244: queue full, 287 requests queued (total handled 2893042) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3599 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3599(a)github.com>

2 2

git:master:d1d14f9b: pkg/docker: submodule update [skip ci]
by Victor Seva 11 Oct '23

11 Oct '23

Module: kamailio Branch: master Commit: d1d14f9b832401f8282b4e6ade9cfe7ea1751e6a URL: https://github.com/kamailio/kamailio/commit/d1d14f9b832401f8282b4e6ade9cfe7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-11T11:23:38+02:00 pkg/docker: submodule update [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/d1d14f9b832401f8282b4e6ade9cfe7… Patch: https://github.com/kamailio/kamailio/commit/d1d14f9b832401f8282b4e6ade9cfe7… --- diff --git a/pkg/docker b/pkg/docker index 524fa4769d3..cf48a82c5f9 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 524fa4769d3b48add204c2bbd8303f60dfde2d61 +Subproject commit cf48a82c5f9df67813d14e6619cc9a41ec9a683b

1 0

[kamailio/kamailio] Typos at https://www.kamailio.org/docs/modules/devel/ (Issue #3596)
by Дилян Палаузов 10 Oct '23

10 Oct '23

At https://www.kamailio.org/docs/modules/devel/ is spelled CALL_CONTROL | Conector to call_control application -- | -- EVREXEC | Execut event routes at startup on dedicated processes It shall be co**NN**ector and execut**E**. Likewise for https://www.kamailio.org/docs/modules/5.8.x/ , https://www.kamailio.org/docs/modules/5.7.x/, https://www.kamailio.org/docs/modules/5.6.x/ … -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3596 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3596(a)github.com>

2 2

[kamailio/kamailio] smsops: avoid c99 error (PR #3597)
by mtryfoss 10 Oct '23

10 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Small adjustment to avoid C99 error from older compiler. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3597 -- Commit Summary -- * smsops: avoid c99 error -- File Changes -- M src/modules/smsops/smsops_impl.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3597.patch https://github.com/kamailio/kamailio/pull/3597.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3597 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3597(a)github.com>

2 1

git:master:65ccf80c: smsops: avoid c99 error (#3597)
by GitHub 10 Oct '23

10 Oct '23

Module: kamailio Branch: master Commit: 65ccf80c90e007d7636e973009d8cb2446cd8821 URL: https://github.com/kamailio/kamailio/commit/65ccf80c90e007d7636e973009d8cb2… Author: mtryfoss <morten(a)tryfoss.no> Committer: GitHub <noreply(a)github.com> Date: 2023-10-10T14:01:38+02:00 smsops: avoid c99 error (#3597) --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/65ccf80c90e007d7636e973009d8cb2… Patch: https://github.com/kamailio/kamailio/commit/65ccf80c90e007d7636e973009d8cb2… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 485a814774c..c8ccc2df4e1 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -511,8 +511,9 @@ int ucs2_to_utf8(char *ucs2, int ucs2_len, char *utf8) uint16_t high_surrogate, low_surrogate; uint32_t codepoint; uint16_t ucs2_char; + size_t ucs2_index; - for(size_t ucs2_index = 0; ucs2_index < ucs2_len; ucs2_index += 2) { + for(ucs2_index = 0; ucs2_index < ucs2_len; ucs2_index += 2) { ucs2_char = (unsigned char)ucs2[ucs2_index]; ucs2_char = (ucs2_char << 8) | (unsigned char)ucs2[ucs2_index + 1]; if(ucs2_char <= 0x7F) {

1 0

git:master:8f3d76e9: corex: rpc command to print shm status report to file based on filter
by Daniel-Constantin Mierla 09 Oct '23

09 Oct '23

Module: kamailio Branch: master Commit: 8f3d76e9808024bff1d816acddeb81667e1df0d2 URL: https://github.com/kamailio/kamailio/commit/8f3d76e9808024bff1d816acddeb816… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-09T13:51:47+02:00 corex: rpc command to print shm status report to file based on filter --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/8f3d76e9808024bff1d816acddeb816… Patch: https://github.com/kamailio/kamailio/commit/8f3d76e9808024bff1d816acddeb816… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 6230f1b129d..02fa08f8a36 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -115,13 +115,41 @@ static void corex_rpc_shm_report(rpc_t *rpc, void *ctx) mrep.min_used_frag_line); } +/*clang-format off*/ +static const char *corex_rpc_shm_rprint_doc[2] = { + "Print shm status report to file matching the filter", 0}; +/*clang-format on*/ + +/* + * RPC command to print the shm status report + */ +static void corex_rpc_shm_rprint(rpc_t *rpc, void *ctx) +{ + char *fname = NULL; + str fmatch = STR_NULL; + FILE *fp = NULL; + + if(rpc->scan(ctx, "ss", &fname, &fmatch) < 2) { + rpc->fault(ctx, 400, "Filename and filter not provided"); + return; + } + fp = fopen(fname, "w"); + if(fp == NULL) { + LM_ERR("cannot open file: %s\n", fname); + rpc->fault(ctx, 500, "Cannot open file"); + return; + } + shm_status_filter(&fmatch, fp); + fclose(fp); +} + /*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}, - {0, 0, 0, 0} -}; + {"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*/ /**

2 4

git:master:a86db7b6: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 09 Oct '23

09 Oct '23

Module: kamailio Branch: master Commit: a86db7b642feaf4bb7367280463a9b22e33ffae5 URL: https://github.com/kamailio/kamailio/commit/a86db7b642feaf4bb7367280463a9b2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-10-09T14:16:24+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/a86db7b642feaf4bb7367280463a9b2… Patch: https://github.com/kamailio/kamailio/commit/a86db7b642feaf4bb7367280463a9b2… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 7d0f6f06082..f50a1287bd8 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -76,6 +76,7 @@ Muhammad Shahzad Shafi 5.7. corex.shm.info 5.8. corex.shm.report 5.9. corex.shm.stats + 5.10. corex.shm.rprint 6. Event Routes @@ -180,6 +181,7 @@ Chapter 1. Admin Guide 5.7. corex.shm.info 5.8. corex.shm.report 5.9. corex.shm.stats + 5.10. corex.shm.rprint 6. Event Routes @@ -800,6 +802,7 @@ route[reply] { 5.7. corex.shm.info 5.8. corex.shm.report 5.9. corex.shm.stats + 5.10. corex.shm.rprint 5.1. corex.debug @@ -873,6 +876,18 @@ route[reply] { Example: kamcli rpc shm.stats +5.10. corex.shm.rprint + + Shared memory usage status report printed to file upon filter match + with the file of allocation. + + It takes two parameters: the path to file where to write the report; + the string to match the allocation file (the match is done as value + included in the path fo the allocation file). + + Example: + kamcli rpc shm.rprint /tmp/kamailioshm.txt dns_cache.c + 6. Event Routes 6.1. event_route[network:msg]

1 0

← Newer
1
...
23
24
25
26
27
28
29
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2023