sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
238 discussions

[kamailio/kamailio] corex.list_sockets broken output (Issue #3799)

by sergey-safarov

### Description I found `corex.list_sockets` does not show the address family (`af`) properly But `core.sockets_list` properly shows the address family (`af`). ### Troubleshooting #### Reproduction Required to create a config file with content like ``` loadmodule "pv.so" loadmodule "ctl.so" loadmodule "corex.so" listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 request_route { drop; } ``` Start kamailio and then execute ```sh kamcmd corex.list_sockets ``` The output will be like ``` { af: unknown proto: udp name: 127.0.0.1 addrlist: { addr: 127.0.0.1 } port: 5060 sockstr: udp:127.0.0.1:5060 mcast: no mhomed: no virtual: no sockname: - advertise: - } { af: unknown proto: udp name: ::1 addrlist: { addr: ::1 } port: 5060 sockstr: udp:[::1]:5060 mcast: no mhomed: no virtual: no sockname: - advertise: - } ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.9.0-dev0 (aarch64/linux) 206399 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-NOSMP, 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: 206399 compiled on 12:57:52 Mar 30 2024 with gcc 8.5.0 ``` * **Operating System**: ``` NAME="CentOS Stream" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Stream 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux 8" REDHAT_SUPPORT_PRODUCT_VERSION="CentOS Stream" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3799 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3799(a)github.com>

4 months

[kamailio/kamailio] User id conflict between kamctl et. al. and Linux OS installations (Issue #3752)

by Mark Warren

### Description After installing kamailio on Ubuntu (20.04 and 22.04) using normal kamailio.org instructions, things work fine. However, a developer is working on a large project as root, and occasionally restarts kamailio with the command "kamctl <start|stop|restart>", rather than the OS command "systemctl <stop|start|restart> kamailio". After that, any attempt to restart or check status using systmectl fails, and rebooting the server occasionally fails to restart kamailio. ### Troubleshooting #### Reproduction Install ubuntu 22.04 or 20.04. When up and running, try this: `systemctl status kamailio` (everything looks good) `ps -C kamailio -o comm,uid,euid,pid,ppid` (all happy, Kamailio running as user kamailio) `kamctl restart` `ps -C kamailio -o comm,uid,euid,pid,ppid` (Yes it's running, but as root, not kamailio) `systemctl status kamailio` (FAILS, 20.04 reports "Failed to start", 22.04 reports "kamailio.service: Deactivated successfully") `systemctl restart kamailio` (FAILS - same reports as preceding "status" command) #### Debugging Data  #### Log Messages  After command systemctl restart kamailio: ``` Feb 9 18:30:02 usdc2-lab-drproxy02 kamailio: INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Feb 9 18:30:02 usdc2-lab-drproxy02 kamailio: INFO: <core> [core/tcp_main.c:5042]: init_tcp(): using epoll_lt as the io watch method (auto detected) Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: rr [rr_mod.c:177]: mod_init(): outbound module not available Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: auth [auth_mod.c:345]: mod_init(): qop set, but nonce-count (nc_enabled) support disabled Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [main.c:2779]: main(): processes (at least): 32 - shm size: 67108864 - pkg size: 8388608 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: ERROR: <core> [core/tcp_main.c:3162]: tcp_init(): bind(c, 0x7f49b0475c74, 16) on 127.0.0.1:5060 : Address already in use Feb 9 18:30:02 usdc2-lab-drproxy02 /usr/sbin/kamailio[2388]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions Modify kamctl et. al. to call systemctl for start, stop, restart commands. Alternatively have kamctl call setuid() before start, restart, stop commands. ### Additional Information * **Kamailio Version** - output of `kamailio -v` On ubuntu 20.04: ``` version: kamailio 5.3.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 9.2.1 ``` For ubuntu 22.04: ``` version: kamailio 5.6.5 (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 11.4.0 ``` * **Operating System**: For ubuntu 22.04: ``` root@my_22.04_ubuntu:~# lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 22.04.3 LTS Release: 22.04 Codename: jammy root@my_22.04_ubuntu:~# uname -a Linux my_22.04_ubuntu 5.15.0-94-generic #104-Ubuntu SMP Tue Jan 9 15:25:40 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux root@my_22.04_ubuntu:~# ``` For ubuntu 20.04 ``` root@my_20.04_ubuntu:~# lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.6 LTS Release: 20.04 Codename: focal root@my_20.04_ubuntu:~# uname -a Linux my_20.04_ubuntu 5.4.0-171-generic #189-Ubuntu SMP Fri Jan 5 14:23:02 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux root@my_20.04_ubuntu:~# ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3752 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3752(a)github.com>

4 months

[kamailio/kamailio] Kamailio segfaults when KEMI functions are invoked from app_python script (Issue #3746)

by David Minh Phan

### Description Kamailio segfaults when KEMI functions are invoked from app_python script ### Troubleshooting The same code was running ok with the 5.6 branch. It seems that the function sr_apy_kemi_exec_func_ex has been re-written in 5.7 with the following main changes : - The long IF/ELSE statement was replace by a FOR loop - The call to PyArg_ParseTuple function was replaced by the call to PyList_GetItem ==> **This seems to be the cause. The value returned by this function is alway NULL** #### Reproduction Any call to KSR.pv.seti function from a PYTHON 2 script would cause this error. #### Log Messages ``` sbin/kamailio[18449]: ERROR: app_python [apy_kemi.c:280]: sr_apy_kemi_exec_func_ex(): null parameter - func: seti idx: 0 argc: 2 Feb 6 11:34:16 .../sbin/kamailio[18509]: CRITICAL: <core> [core/pass_fd.c:281]: receive_fd(): EOF on 37 Feb 6 11:34:16 .../sbin/kamailio[18380]: ALERT: <core> [main.c:793]: handle_sigs(): child process 18449 exited by a signal 11 Feb 6 11:34:16 .../sbin/kamailio[18380]: ALERT: <core> [main.c:796]: handle_sigs(): core was not generated Feb 6 11:34:16 .../sbin/kamailio[18380]: INFO: <core> [main.c:818]: handle_sigs(): terminating due to SIGCHLD Feb 6 11:34:16 .../sbin/kamailio[18509]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received Feb 6 11:34:16 .../sbin/kamailio[18502]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received Feb 6 11:34:16 .../sbin/kamailio[18495]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received Feb 6 11:34:16 .../sbin/kamailio[18482]: INFO: <core> [main.c:874]: sig_usr(): signal 15 received ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3746 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3746(a)github.com>

4 months, 1 week

[kamailio/kamailio] Topos breaks early dialog transactions on multi-homed kamailio instances using enable_double_rr and versions >= 5.6.5 (Issue #3757)

by George Diamantopoulos

### Description All kamailio versions on the 5.7.x train and additionally point release 5.6.5 break early dialog transactions, at least when the following conditions are (cumulatively) met: * topos-redis is enabled (haven't tested other storage backends yet, let me know if needed) * kamailio is multihomed * enable_double_rr is enabled (the default) ### Troubleshooting #### SIP Traffic Here's an exchange demonstrating the problem: ``` kamailio instance ──────────┬──────────────────┬───────── internal external peer 172.30.154.1:5060 185.73.43.241:5060 195.167.21.66:5060 ──────────┬──────────────────┬───────── ──────────┬───────── │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ INVITE (SDP) │ │ │ ──────────────────────────> │ │ │ 100 Trying │ │ │ <────────────────────────── │ │ │ 183 Session Progress (SDP) │ │ │ <────────────────────────── │ │ │ PRACK │ │ │ ──────────────────────────> │ │ │ 200 OK │ │ │ <────────────────────────── │ │ │ UPDATE (SDP) │ UPDATE (SDP) │ │ <─────────────────────────── │ │ ``` Whereas the expected behaviour should be: ``` │ │ UPDATE (SDP) │ | <────────────────────────── │ UPDATE (SDP)│ │ │ <───────── │ │ │ ``` This is also exemplified by examining the Via headers as rewritten by kamailio. Not working (>= 5.6.5, 5.7.x): * Inbound Via: `Via: SIP/2.0/UDP 195.167.21.66:5060;branch=z9hG4bKtjlwcpvfh03epe0thhtjhq3qg;Role=3;Hpt=8e58_16` * Oubound Via: `Via: SIP/2.0/UDP 185.73.43.241;branch=z9hG4bK66c4.3453dd9a219858819d528b9da671e39e.0` Working (5.6.4): * Inbound Via: `Via: SIP/2.0/UDP 195.167.21.66:5060;branch=z9hG4bK8lj1ahz6npz65khd8jkzl1ohh;Role=3;Hpt=8e68_16` * Oubound Via: `Via: SIP/2.0/UDP 172.30.154.1;branch=z9hG4bK4dce.4f5448efd64465fa5dbaf5eef0dc35b7.0` ### Possible Solutions Only solution I have found so far is to downgrade to kamailio 5.6.4  ### Additional Information ``` version: kamailio 5.7.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, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 ``` But I have also tested all 5.7.x versions, which are all affected, as well 5.6.5. * **Operating System**:  ``` Linux host 5.10.0-27-amd64 #1 SMP Debian 5.10.205-2 (2023-12-31) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3757 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3757(a)github.com>

4 months, 1 week

[kamailio/kamailio] core: dprint - include time in stderr json log (PR #3795)

by Alexander Bakker

#### 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 This patch introduces a new "time" field for JSON logging to stderr. The CEE format already includes this field, but the Kamailio-specific format doesn't. If you need timestamps in your structured logs, but don't want to use the CEE format due to its limitations, this patch'd give you the best of both worlds. I know this comes a little out of the blue, so any feedback is welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3795 -- Commit Summary -- * core: dprint - include time in stderr json log -- File Changes -- M src/core/dprint.c (44) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3795.patch https://github.com/kamailio/kamailio/pull/3795.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3795 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3795(a)github.com>

4 months, 1 week

[kamailio/kamailio] xhttp_prom: export pkg mem statistics (PR #3793)

by Ovidiu Sas

#### 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 Enhance xhttp_prom module to export pkgmem stats. The new stats can be enabled via a new module parameter: `xhttp_prom_pkgmem_stats_enabled`. Default value for the new module parameter: 0 (no pkg mem stats are generated). Any value different then 0 will export the pkg mem statistics. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3793 -- Commit Summary -- * kex: expose access to pkg mem stats * xhttp_prom: export pkg mem stats -- File Changes -- A src/modules/kex/api.c (54) A src/modules/kex/api.h (69) M src/modules/kex/kex_mod.c (2) M src/modules/kex/pkg_stats.c (24) M src/modules/kex/pkg_stats.h (17) M src/modules/xhttp_prom/prom.c (66) M src/modules/xhttp_prom/xhttp_prom.c (44) M src/modules/xhttp_prom/xhttp_prom.h (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3793.patch https://github.com/kamailio/kamailio/pull/3793.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3793 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3793(a)github.com>

4 months, 1 week

Releasing v5.8.1

by Daniel-Constantin Mierla

Hello, with many countries having public holidays around Catholic Easter, I am considering to release Kamailio v5.8.1 (out of branch 5.8) on Wednesday, April 3, 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 World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

4 months, 1 week

[kamailio/kamailio] branch_failure route in case 503 and dns failover (PR #3138)

by vlitvinov

#### Pre-Submission Checklist    - [ ] 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  When we use DNS failover in case of timeout kamailio executes the branch_failure route. In the case of the 503 - on_reply route. This commit is to equate behavior in both cases. So if there are more candidates we will always execute branch_failure route and on_reply route only if this is the last candidate. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3138 -- Commit Summary -- * branch_failure route in case 503 and dns failover -- File Changes -- M src/modules/tm/t_reply.c (52) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3138.patch https://github.com/kamailio/kamailio/pull/3138.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3138 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3138(a)github.com>

4 months, 2 weeks

[kamailio/kamailio] Consider adding socket options SO_BINDTODEVICE when the interface name is given for listen in the config file (Issue #3716)

by Harish S

### Description Consider adding socket options SO_BINDTODEVICE when the interface name is given for listening in the config file. This will be useful in listening to linux VRF interfaces, especially when there are two different VRFs and it is required to proxy SIP messages between the VRFs -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3716 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3716(a)github.com>

4 months, 2 weeks

git:master:022da99c: gcrypt: replace local fixups with core helpers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 022da99ca22efbf226d89234edb3f9883bd89bb2 URL: https://github.com/kamailio/kamailio/commit/022da99ca22efbf226d89234edb3f98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-30T18:24:35+01:00 gcrypt: replace local fixups with core helpers --- Modified: src/modules/gcrypt/gcrypt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/022da99ca22efbf226d89234edb3f98… Patch: https://github.com/kamailio/kamailio/commit/022da99ca22efbf226d89234edb3f98… --- diff --git a/src/modules/gcrypt/gcrypt_mod.c b/src/modules/gcrypt/gcrypt_mod.c index 69be4432535..c75e6b905b4 100644 --- a/src/modules/gcrypt/gcrypt_mod.c +++ b/src/modules/gcrypt/gcrypt_mod.c @@ -45,10 +45,8 @@ static void mod_destroy(void); static int w_gcrypt_aes_encrypt( sip_msg_t *msg, char *inb, char *keyb, char *outb); -static int fixup_gcrypt_aes_encrypt(void **param, int param_no); static int w_gcrypt_aes_decrypt( sip_msg_t *msg, char *inb, char *keyb, char *outb); -static int fixup_gcrypt_aes_decrypt(void **param, int param_no); /* init vector value */ static str _gcrypt_init_vector = str_init("SIP/2.0 is RFC3261"); @@ -59,9 +57,9 @@ static int _gcrypt_aes_mode = GCRY_CIPHER_MODE_ECB; /* clang-format off */ static cmd_export_t cmds[] = { {"gcrypt_aes_encrypt", (cmd_function)w_gcrypt_aes_encrypt, 3, - fixup_gcrypt_aes_encrypt, 0, ANY_ROUTE}, + fixup_spve2_pvar, fixup_free_spve2_pvar, ANY_ROUTE}, {"gcrypt_aes_decrypt", (cmd_function)w_gcrypt_aes_decrypt, 3, - fixup_gcrypt_aes_decrypt, 0, ANY_ROUTE}, + fixup_spve2_pvar, fixup_free_spve2_pvar, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -260,28 +258,6 @@ static int w_gcrypt_aes_encrypt( return ki_gcrypt_aes_encrypt_helper(msg, &ins, &keys, dst); } -/** - * - */ -static int fixup_gcrypt_aes_encrypt(void **param, int param_no) -{ - if(param_no == 1 || param_no == 2) { - if(fixup_spve_null(param, 1) < 0) - return -1; - return 0; - } else if(param_no == 3) { - if(fixup_pvar_null(param, 1) != 0) { - LM_ERR("failed to fixup result pvar\n"); - return -1; - } - if(((pv_spec_t *)(*param))->setf == NULL) { - LM_ERR("result pvar is not writeble\n"); - return -1; - } - } - return 0; -} - /** * */ @@ -422,28 +398,6 @@ static int w_gcrypt_aes_decrypt( return ki_gcrypt_aes_decrypt_helper(msg, &ins, &keys, dst); } -/** - * - */ -static int fixup_gcrypt_aes_decrypt(void **param, int param_no) -{ - if(param_no == 1 || param_no == 2) { - if(fixup_spve_null(param, 1) < 0) - return -1; - return 0; - } else if(param_no == 3) { - if(fixup_pvar_null(param, 1) != 0) { - LM_ERR("failed to fixup result pvar\n"); - return -1; - } - if(((pv_spec_t *)(*param))->setf == NULL) { - LM_ERR("result pvar is not writeble\n"); - return -1; - } - } - return 0; -} - /** *

4 months, 2 weeks

← Newer
1
2
3
4
5
6
7
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024