sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
221 discussions

[kamailio/kamailio] The RPC `rtpengine.show` API result has the field `disabled` value change on different values. (Issue #3896)

by Oded Arbel

### Description When using the RPC command `rtpengine.show`, the resulting list has the field `disabled` for each RTPEngine configured, and its value - for some reason can be either `0` (number), `1` (number) or `"1(permanent)"` (string). For example: ``` $ curl -k -X POST -HContent-Type:application/json -d '{"jsonrpc":"2.0","method":"rtpengine.show","params":["all"],"id":1}' https://localhost:8443/rpc { "jsonrpc": "2.0", "result": [{ "url": "udp:old-rtpengine2227", "set": 0, "index": 0, "weight": 1, "disabled": 1, "recheck_ticks": 0 }, { "url": "udp:172.24.73.28:2227", "set": 0, "index": 1, "weight": 1, "disabled": 0, "recheck_ticks": 0 }, { "url": "udp:172.24.75.15:2227", "set": 0, "index": 2, "weight": 1, "disabled": "1(permanent)", "recheck_ticks": "N/A" }], "id": 1 } ``` This makes it very annoying to parse the results from JSON RPC (and maybe other machine readable RPC APIs). Also the same problem for `recheck_ticks`, but I never actually read it so it is less important for me. #### Reproduction The difference between `0` and `"1(permanent)"` can be seen by setting up multiple RTPEngine sockets that work and then disable one of the using the `rtpengine.enable` RPC command with the `flag` set to `0`. As far as I can tell that is the only way to get `recheck_ticks` to be set to `RTPENGINE_MAX_RECHECK_TICKS` which causes the "permanently disabled" state. ### Possible Solutions I can try to offer a patch, but any change I can make will be a breaking API change - so if users are relying on this weird behavior, that could be a problem. Maybe the best way to move forward is to expose two additional fields: - `active` : `boolean` - set to `true` if the RTPEngine is not disabled, and to `false` if it is disabled (i.e. the value is equal to `disabled == 0`). - `active` : `boolean` - set to `true` if the RTPEngine had not failed it checks (i.e. `recheck_ticks` is either 0 or `RTPENGINE_MAX_RECHECK_TICKS`). This will be set to `false` if `disabled` is set to `1`, and not `"1(permanent)"`. Maybe the last field is unneeded? Maybe `"disabled"` can be changed to only report whether the RPC was used to disable the socket and let the `active` field specify whether the socket can be used? ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.5 (x86_64/linux) 58499a 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: 58499a compiled on 00:00:00 Sep 13 2022 with gcc 11.4.1 ``` * **Operating System**:  ``` $ uname -a Linux sip-172-24-50-23.XX.XX.XX 6.5.0-1020-aws #20~22.04.1-Ubuntu SMP Wed May 1 16:10:50 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux $ cat /etc/os-release NAME="AlmaLinux" VERSION="9.4 (Seafoam Ocelot)" ID="almalinux" ID_LIKE="rhel centos fedora" VERSION_ID="9.4" PLATFORM_ID="platform:el9" PRETTY_NAME="AlmaLinux 9.4 (Seafoam Ocelot)" ANSI_COLOR="0;34" LOGO="fedora-logo-icon" CPE_NAME="cpe:/o:almalinux:almalinux:9::baseos" HOME_URL="https://almalinux.org/" DOCUMENTATION_URL="https://wiki.almalinux.org/" BUG_REPORT_URL="https://bugs.almalinux.org/" ALMALINUX_MANTISBT_PROJECT="AlmaLinux-9" ALMALINUX_MANTISBT_PROJECT_VERSION="9.4" REDHAT_SUPPORT_PRODUCT="AlmaLinux" REDHAT_SUPPORT_PRODUCT_VERSION="9.4" SUPPORT_END=2032-06-01 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3896 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3896(a)github.com>

2 months, 4 weeks

[kamailio/kamailio] add "active" field to rtpengine.show as alternate of "disabled" (PR #3898)

by Oded Arbel

#### 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) - [ ] New feature (non-breaking change which adds new functionality) - [x] 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 #3896 #### Description As per issue #3896, "active" is a boolean field that just describes whether the socket will be used, while "disabled" now just describes whether the socket was disabled by an RPC command. Also make "disabled" and "recheck_ticks" fields have a fixed value type of boolean and number respectively. use `"recheck_ticks": -1` instead of "N/A" as per discussion. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3898 -- Commit Summary -- * rtpengine: add "active" field to rtpengine.show as alternate of "disabled" -- File Changes -- M src/modules/rtpengine/rtpengine.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3898.patch https://github.com/kamailio/kamailio/pull/3898.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3898 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3898(a)github.com>

2 months, 4 weeks

git:master:96ada96f: rtpengine: add "active" field to rtpengine.show as alternate of "disabled" (#3898)

by GitHub

Module: kamailio Branch: master Commit: 96ada96f69f606c35fd46a45def3b095026f2393 URL: https://github.com/kamailio/kamailio/commit/96ada96f69f606c35fd46a45def3b09… Author: Oded Arbel <oded(a)geek.co.il> Committer: GitHub <noreply(a)github.com> Date: 2024-06-30T12:40:53-04:00 rtpengine: add "active" field to rtpengine.show as alternate of "disabled" (#3898) As per issue #3896, "active" is a boolean field that just describes whether the socket will be used, while "disabled" now just describes whether the socket was disabled by an RPC command. Also make "disabled" and "recheck_ticks" fields have a fixed value type of boolean and number respectively. use `"recheck_ticks": -1` instead of "N/A" as per discussion --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/96ada96f69f606c35fd46a45def3b09… Patch: https://github.com/kamailio/kamailio/commit/96ada96f69f606c35fd46a45def3b09… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 775542c5994..54f22b1843f 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1784,13 +1784,14 @@ static int add_rtpp_node_info( if((1 == crt_rtpp->rn_disabled) && (crt_rtpp->rn_recheck_ticks == RTPENGINE_MAX_RECHECK_TICKS)) { - rpc->struct_add(vh, "s", "disabled", "1(permanent)"); + rpc->struct_add(vh, "b", "disabled", 1); } else { - rpc->struct_add(vh, "d", "disabled", crt_rtpp->rn_disabled); + rpc->struct_add(vh, "b", "disabled", 0); } + rpc->struct_add(vh, "b", "active", crt_rtpp->rn_disabled == 0); if(crt_rtpp->rn_recheck_ticks == RTPENGINE_MAX_RECHECK_TICKS) { - rpc->struct_add(vh, "s", "recheck_ticks", "N/A"); + rpc->struct_add(vh, "d", "recheck_ticks", -1); } else { rtpp_ticks = crt_rtpp->rn_recheck_ticks - get_ticks(); rtpp_ticks = rtpp_ticks < 0 ? 0 : rtpp_ticks;

2 months, 4 weeks

git:master:fc5f61b7: tls: reformat exported structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fc5f61b7e838cf51ae24dd9714ebb7080b78e4c3 URL: https://github.com/kamailio/kamailio/commit/fc5f61b7e838cf51ae24dd9714ebb70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-28T12:09:09+02:00 tls: reformat exported structures --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fc5f61b7e838cf51ae24dd9714ebb70… Patch: https://github.com/kamailio/kamailio/commit/fc5f61b7e838cf51ae24dd9714ebb70…

3 months

git:master:ef05d0f6: modules: readme files regenerated - tls ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: ef05d0f6210d73a3f991b31ce28630807ede23af URL: https://github.com/kamailio/kamailio/commit/ef05d0f6210d73a3f991b31ce286308… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-28T11:46:10+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/ef05d0f6210d73a3f991b31ce286308… Patch: https://github.com/kamailio/kamailio/commit/ef05d0f6210d73a3f991b31ce286308…

3 months

Ubuntu 24.04 Packages for Kamailio 5.8 on deb.kamailio.org

by Xenofon Karamanos

Hey everybody, While attempting to use the official Ubuntu package for Kamailio version 5.7.4 on Ubunut 24.04, we encountered an issue where TLS functionality does not seem to work as expected but 5.8 branch does. Given this, I am inquiring about the availability and status of Kamailio packages for Ubuntu 24.04 on the official Kamailio repository at deb.kamailio.org. Are there any plans to support this version of Ubuntu with updated packages? If so, is there an estimated timeline for when these packages might become available? Thank you in advance for your assistance. Best regards, Xenofon

3 months

git:master:e7268fff: tls: docs for private_key_password and key_password_mode params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e7268ffffb35916118e21d1c3a5631c726464e51 URL: https://github.com/kamailio/kamailio/commit/e7268ffffb35916118e21d1c3a5631c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-28T11:39:13+02:00 tls: docs for private_key_password and key_password_mode params --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/e7268ffffb35916118e21d1c3a5631c… Patch: https://github.com/kamailio/kamailio/commit/e7268ffffb35916118e21d1c3a5631c… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index fa14216a4ee..c6dc019c5c7 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -179,6 +179,43 @@ modparam("tls", "private_key", "/usr/local/etc/kamailio/my_pkey.pem") </example> </section> + <section id="tls.p.private_key_password"> + <title><varname>private_key_password</varname> (string)</title> + <para> + The password for the private key. + </para> + <para> + The default value is empty. + </para> + <example> + <title>Set <varname>private_key_password</varname> parameter</title> + <programlisting> +... +modparam("tls", "private_key_password", "secret") +... + </programlisting> + </example> + </section> + + <section id="tls.p.key_password_mode"> + <title><varname>key_password_mode</varname> (int)</title> + <para> + The mode to get the password for the private key. If 0, take it + from the config "private_key_password". If 1, promt for it at start up. + </para> + <para> + The default value is 0. + </para> + <example> + <title>Set <varname>key_password_mode</varname> parameter</title> + <programlisting> +... +modparam("tls", "key_password_mode", 0) +... + </programlisting> + </example> + </section> + <section id="tls.p.ca_list"> <title><varname>ca_list</varname> (string)</title> <para>

3 months

git:master:54f248e6: tls: added key_password_mode modparam

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 54f248e60ce4d6ab9a87967d7df05e60c05d926d URL: https://github.com/kamailio/kamailio/commit/54f248e60ce4d6ab9a87967d7df05e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-28T11:31:48+02:00 tls: added key_password_mode modparam - if 0 (default), get private key password from config; if 1, prompt for it (old way) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/54f248e60ce4d6ab9a87967d7df05e6… Patch: https://github.com/kamailio/kamailio/commit/54f248e60ce4d6ab9a87967d7df05e6… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index e292c7eb1b2..4c41f94bcac 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -308,6 +308,7 @@ static param_export_t params[] = { {"rand_engine", PARAM_STR | USE_FUNC_PARAM, (void *)ksr_rand_engine_param}, {"init_mode", PARAM_INT, &ksr_tls_init_mode}, + {"key_password_mode", PARAM_INT, &ksr_tls_key_password_mode}, {0, 0, 0}};

3 months

git:master:d4cf61d7: tls: new option to set the password for private key

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d4cf61d78af54671056a65f3b91ea67574cc0158 URL: https://github.com/kamailio/kamailio/commit/d4cf61d78af54671056a65f3b91ea67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-28T11:25:19+02:00 tls: new option to set the password for private key - the provate_key_password field can be set in the tls profile --- Modified: src/modules/tls/tls_cfg.c Modified: src/modules/tls/tls_cfg.h Modified: src/modules/tls/tls_config.c Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_domain.h Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d4cf61d78af54671056a65f3b91ea67… Patch: https://github.com/kamailio/kamailio/commit/d4cf61d78af54671056a65f3b91ea67…

3 months

git:master:7129f73a: tls: small changes in log messages for key password callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7129f73ad0f27accc9c7c9922e0b04f594dee058 URL: https://github.com/kamailio/kamailio/commit/7129f73ad0f27accc9c7c9922e0b04f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-28T10:18:00+02:00 tls: small changes in log messages for key password callback --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/7129f73ad0f27accc9c7c9922e0b04f… Patch: https://github.com/kamailio/kamailio/commit/7129f73ad0f27accc9c7c9922e0b04f… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index cb74468b62f..645f45b1fe1 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1223,12 +1223,12 @@ static int ksr_passwd_ui_cb(char *buf, int size, int rwflag, void *filename) return strlen(buf); err: - ERR("passwd_cb: Error in passwd_cb\n"); + ERR("failure in password callback\n"); return 0; #else if(des_read_pw_string(buf, size - 1, "Enter Private Key password:", 0)) { - ERR("Error in passwd_cb\n"); + ERR("failure in password callback\n"); return 0; } return strlen(buf);

3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2024