sr-dev August 2023

sr-dev@lists.kamailio.org

15 participants
207 discussions

git:master:f9dcffc4: htable: added rpc htable.dmqresync command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f9dcffc42f10caa638ba3e2cbbe6ffb6206373b7 URL: https://github.com/kamailio/kamailio/commit/f9dcffc42f10caa638ba3e2cbbe6ffb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-17T18:40:44+02:00 htable: added rpc htable.dmqresync command - reset and dmq sync for a specific hash table --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/f9dcffc42f10caa638ba3e2cbbe6ffb… Patch: https://github.com/kamailio/kamailio/commit/f9dcffc42f10caa638ba3e2cbbe6ffb… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index b12d44f0927..5c682972f0c 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1516,6 +1516,10 @@ static const char *htable_dmqsync_doc[2] = { "Perform DMQ sync action.", 0 }; +static const char *htable_dmqresync_doc[2] = { + "Perform DMQ resync action (flush and sync).", + 0 +}; /* clang-format on */ static void htable_rpc_delete(rpc_t *rpc, void *c) @@ -2119,6 +2123,32 @@ static void htable_rpc_dmqsync(rpc_t *rpc, void *c) rpc->rpl_printf(c, "Ok"); } +/*! \brief RPC htable.dmgresync command to empty a hash table and sync via dmq */ +static void htable_rpc_dmqresync(rpc_t *rpc, void *c) +{ + str htname; + ht_t *ht; + + if(rpc->scan(c, "S", &htname) < 1) { + rpc->fault(c, 500, "No htable name given"); + return; + } + ht = ht_get_table(&htname); + if(ht == NULL) { + rpc->fault(c, 500, "No such htable"); + return; + } + if(ht_reset_content(ht) < 0) { + rpc->fault(c, 500, "Htable flush failed."); + return; + } + if(ht_dmq_request_sync(&htname) < 0) { + rpc->fault(c, 500, "HTable DMQ Sync Failed"); + return; + } + rpc->rpl_printf(c, "Ok"); +} + /* clang-format off */ rpc_export_t htable_rpc[] = { {"htable.dump", htable_rpc_dump, htable_dump_doc, RET_ARRAY}, @@ -2135,6 +2165,7 @@ rpc_export_t htable_rpc[] = { {"htable.stats", htable_rpc_stats, htable_stats_doc, RET_ARRAY}, {"htable.flush", htable_rpc_flush, htable_flush_doc, 0}, {"htable.dmqsync", htable_rpc_dmqsync, htable_dmqsync_doc, 0}, + {"htable.dmqresync", htable_rpc_dmqresync, htable_dmqresync_doc, 0}, {0, 0, 0, 0} }; /* clang-format on */

1 year, 4 months

[kamailio/kamailio] dispatcher: add option to retain existing latency stats when reloading destinations (PR #3534)

by Charles Chance

#### 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  Added new module param to enable retention of call stats for existing destinations when reloading the list from file or database. Also updated to retain stats for other destinations when adding/removing individual ones via RPC. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3534 -- Commit Summary -- * dispatcher: add option to retain existing latency stats when reloading destinations -- File Changes -- M src/modules/dispatcher/dispatch.c (63) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/dispatcher.c (2) M src/modules/dispatcher/doc/dispatcher_admin.xml (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3534.patch https://github.com/kamailio/kamailio/pull/3534.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3534 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3534(a)github.com>

1 year, 4 months

git:master:b612f079: htable: docs for rpc htable.dmqsync

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b612f07918212ae872c092562a9e0527a89f7f9e URL: https://github.com/kamailio/kamailio/commit/b612f07918212ae872c092562a9e052… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-15T14:57:15+02:00 htable: docs for rpc htable.dmqsync --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b612f07918212ae872c092562a9e052… Patch: https://github.com/kamailio/kamailio/commit/b612f07918212ae872c092562a9e052… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 84f20e7b328..c7d68847f04 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1778,6 +1778,25 @@ kamcmd htable.listTables ... kamcmd htable.stats ... +</programlisting> + </section> + <section id="htable.rpc.dmqsync"> + <title> + <function moreinfo="none">htable.dmqsync</function> + </title> + <para> + Perform a MdQ sync action. + </para> + <para> + Name: <emphasis>htable.dmqsync</emphasis> + </para> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +kamcmd htable.dmqsync +... </programlisting> </section>

1 year, 4 months

[kamailio/kamailio] ims_qos: doc update and warn logs (PR #3521)

by Stefan Mititelu

#### 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  Primary goal is to update doc, for Rx_AAR() function, to mention is used only for replies. I've also changed some LM_DBG to LM_WARN but I can revert that on request (don't want to overflow noone with warnings) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3521 -- Commit Summary -- * ims_qos: doc update and warn logs -- File Changes -- M src/modules/ims_qos/doc/ims_qos_admin.xml (6) M src/modules/ims_qos/ims_qos_mod.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3521.patch https://github.com/kamailio/kamailio/pull/3521.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3521 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3521(a)github.com>

1 year, 4 months

git:master:722a79a9: core: cfg.y typo in parsing XAVPVIAFIELDS

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 722a79a9ba8ca2608e699ec14684ce004ae10d60 URL: https://github.com/kamailio/kamailio/commit/722a79a9ba8ca2608e699ec14684ce0… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-15T23:06:20+02:00 core: cfg.y typo in parsing XAVPVIAFIELDS In the XAVPVIAFIELDS block there is the string written to the wrong variable. The string is stored in _ksr_xavp_via_params.s but the lenght is stored in _ksr_xavp_via_fields.len. This breaks XAVPVIAPARAMS and XAVPVIAFIELDS. --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/722a79a9ba8ca2608e699ec14684ce0… Patch: https://github.com/kamailio/kamailio/commit/722a79a9ba8ca2608e699ec14684ce0… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index b93638eaa40..eef8e6acd28 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -886,7 +886,7 @@ assign_stm: _ksr_xavp_via_params.len=strlen($3); } | XAVPVIAPARAMS EQUAL error { yyerror("string value expected"); } - | XAVPVIAFIELDS EQUAL STRING { _ksr_xavp_via_params.s=$3; + | XAVPVIAFIELDS EQUAL STRING { _ksr_xavp_via_fields.s=$3; _ksr_xavp_via_fields.len=strlen($3); } | XAVPVIAFIELDS EQUAL error { yyerror("string value expected"); }

1 year, 4 months

git:master:440bab64: htable: docs for htable parameter of rpc htable.dmqsync

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 440bab64af7428891527cedfadb20a3e9df2b461 URL: https://github.com/kamailio/kamailio/commit/440bab64af7428891527cedfadb20a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-15T22:54:14+02:00 htable: docs for htable parameter of rpc htable.dmqsync --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/440bab64af7428891527cedfadb20a3… Patch: https://github.com/kamailio/kamailio/commit/440bab64af7428891527cedfadb20a3… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 85b29d9b604..2e4b377999a 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1782,7 +1782,7 @@ kamcmd htable.stats </section> <section id="htable.rpc.dmqsync"> <title> - <function moreinfo="none">htable.dmqsync</function> + <function moreinfo="none">htable.dmqsync [htable]</function> </title> <para> Perform a DMQ sync action. @@ -1790,6 +1790,12 @@ kamcmd htable.stats <para> Name: <emphasis>htable.dmqsync</emphasis> </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>htable: name of the hash table to perform dmq sync for. + If not provided, sync is performed for all hash tables that have + dmq sync enabled.</para></listitem> + </itemizedlist> <para> Example: </para>

1 year, 4 months

git:master:49adf6b6: htable: option to dmq sync a single htable via rpc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 49adf6b697c87c1e0426390511048eeacfe4c826 URL: https://github.com/kamailio/kamailio/commit/49adf6b697c87c1e0426390511048ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-15T22:50:15+02:00 htable: option to dmq sync a single htable via rpc --- Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/49adf6b697c87c1e0426390511048ee… Patch: https://github.com/kamailio/kamailio/commit/49adf6b697c87c1e0426390511048ee…

1 year, 4 months

[kamailio/kamailio] core: cfg.y typo in parsing XAVPVIAFIELDS (PR #3540)

by Rick Barenthin

In the XAVPVIAFIELDS block there is the string written to the wrong variable. The string is stored in _ksr_xavp_via_params.s but the lenght is stored in _ksr_xavp_via_fields.len. This breaks XAVPVIAPARAMS and XAVPVIAFIELDS.   #### 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  `via_use_xavp_fields("1");` and probably `via_add_xavp_params("1");` are broken because of a typo in parsing the xavp names. The values of xavp_via_params global parameter and xavp_via_fields global parameter are not stored correctly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3540 -- Commit Summary -- * core: cfg.y typo in parsing XAVPVIAFIELDS -- File Changes -- M src/core/cfg.y (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3540.patch https://github.com/kamailio/kamailio/pull/3540.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3540 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3540(a)github.com>

1 year, 4 months

git:master:e8591696: modules: readme files regenerated - htable ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e859169628ed4c3dc1c5a9230e29046c9cb8fc46 URL: https://github.com/kamailio/kamailio/commit/e859169628ed4c3dc1c5a9230e29046… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-15T23:01:16+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/e859169628ed4c3dc1c5a9230e29046… Patch: https://github.com/kamailio/kamailio/commit/e859169628ed4c3dc1c5a9230e29046… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 350e9fab41d..238c4e86bef 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -93,7 +93,7 @@ Ovidiu Sas 6.11. htable.flush htable 6.12. htable.listTables 6.13. htable.stats - 6.14. htable.dmqsync + 6.14. htable.dmqsync [htable] 7. Event routes @@ -213,7 +213,7 @@ Chapter 1. Admin Guide 6.11. htable.flush htable 6.12. htable.listTables 6.13. htable.stats - 6.14. htable.dmqsync + 6.14. htable.dmqsync [htable] 7. Event routes @@ -1125,7 +1125,7 @@ if(sht_match_str_value("ha", "eq", "alice")) { 6.11. htable.flush htable 6.12. htable.listTables 6.13. htable.stats - 6.14. htable.dmqsync + 6.14. htable.dmqsync [htable] 6.1. htable.get htable key @@ -1371,12 +1371,17 @@ kamcmd htable.listTables kamcmd htable.stats ... -6.14. htable.dmqsync +6.14. htable.dmqsync [htable] Perform a DMQ sync action. Name: htable.dmqsync + Parameters: + * htable: name of the hash table to perform dmq sync for. If not + provided, sync is performed for all hash tables that have dmq sync + enabled. + Example: ... kamcmd htable.dmqsync

1 year, 4 months

[kamailio/kamailio] ims_ipsec_pcscf: typo in spi_add function definition (Issue #3513)

by jbipre2

### Description  Migrating from Kamailio 5.6.4 IMS to Kamailio 5.7.1 IMS; using Open5GS CN, Amarisoft CallBox eNB, and Huawei UE to implement VoLTE infrastructure for lab testing. VoLTE works in Kamailio 5.6.4 IMS with IPSEC and non-IPSEC UE's; but Kamailio 5.7.1 IMS not working yet with IPSEC UE. Client and server port settings in P-CSCF kamailio.cfg: ... modparam("ims_ipsec_pcscf", "ipsec_client_port", 5100) modparam("ims_ipsec_pcscf", "ipsec_server_port", 6100) ... Debug log shows ports are exchanged (server port used as client port and vice-versa): ... Jul 18 12:15:30 corsa03 p-cscf[58287]: DEBUG: ims_ipsec_pcscf [cmd.c:460]: create_ipsec_tunnel(): Creating security associations: Local IP: 10.169.138.17 **port_pc: 6100 port_ps: 5100**; UE IP: 10.46.0.6; port_uc 31409 port_us 31894; spi_pc 4096, spi_ps 4097, spi_uc 48734730, spi_us 96335982, alg hmac-md5-96, ealg null ... ### Troubleshooting spi_add function definition and declaration differ: From src/modules/ims_ipsec_pcscf/spi_list.h: int spi_add(spi_list_t *list, uint32_t spi_cid, uint32_t spi_sid, **uint16_t cport, uint16_t sport**); But in spi_list.c: int spi_add(spi_list_t *list, uint32_t spi_cid, uint32_t spi_sid, **uint16_t sport, uint16_t cport**) #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  Applied following patch: --- a/src/modules/ims_ipsec_pcscf/spi_list.c 2023-06-28 09:40:45.000000000 +0200 +++ b/src/modules/ims_ipsec_pcscf/spi_list.c 2023-07-18 16:12:11.166476076 +0200 @@ -51,7 +51,7 @@ } int spi_add(spi_list_t *list, uint32_t spi_cid, uint32_t spi_sid, - uint16_t sport, uint16_t cport) + uint16_t cport, uint16_t sport) { if(!list) { return 1; Log now shows expected client and server port: ... Jul 18 17:45:22 corsa03 p-cscf[82076]: DEBUG: ims_ipsec_pcscf [cmd.c:460]: create_ipsec_tunnel(): Creating security associations: Local IP: 10.169.138.17 **port_pc: 5100 port_ps: 6100**; UE IP: 10.46.0.6; port_uc 31411 port_us 31896; spi_pc 4096, spi_ps 4097, spi_uc 48734732, spi_us 96335984, alg hmac-md5-96, ealg null ... ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.1 (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 on 16:22:26 Jul 18 2023 with x86_64-pc-linux-gnu-gcc 13.1.1 ``` * **Operating System**:  ``` Linux corsa03 6.4.2-gentoo-x86_64 #2 SMP PREEMPT_DYNAMIC Tue Jul 11 14:35:45 CEST 2023 x86_64 AMD EPYC 7513 32-Core Processor AuthenticAMD GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3513 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3513(a)github.com>

1 year, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2023