- sr-dev - kamailio.org

git:master:efd94f90: tls: updates to revive TLS_MALLOC_DBG
by Daniel-Constantin Mierla 22 Aug '23

22 Aug '23

Module: kamailio Branch: master Commit: efd94f90069d146d8133d7afd6276ce1c188556f URL: https://github.com/kamailio/kamailio/commit/efd94f90069d146d8133d7afd6276ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-22T11:10:36+02:00 tls: updates to revive TLS_MALLOC_DBG - it still requires q_malloc to be used - GH #3532 --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/efd94f90069d146d8133d7afd6276ce… Patch: https://github.com/kamailio/kamailio/commit/efd94f90069d146d8133d7afd6276ce… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index d7399e8c792..e4a19d6ddad 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -260,14 +260,13 @@ static void *ser_malloc(size_t size, const char *file, int line) #endif s = backtrace2str(bt_buf, sizeof(bt_buf)); /* ugly hack: keep the bt inside the alloc'ed fragment */ - p = _shm_malloc(size + s, file, "via ser_malloc", line); + p = shm_mallocxp(size + s, file, "ser_malloc", line, "tls"); if(p == 0) { - LM_CRIT("tls - ser_malloc(%d)[%s:%d]==null, bt: %s\n", size, file, + LM_CRIT("tls - ser_malloc(%lu)[%s:%d]==null, bt: %s\n", size, file, line, bt_buf); } else { memcpy(p + size, bt_buf, s); - ((struct qm_frag *)((char *)p - sizeof(struct qm_frag)))->func = - p + size; + shm_setfunc(p, p + size); } #ifdef RAND_NULL_MALLOC } else { @@ -304,14 +303,13 @@ static void *ser_realloc(void *ptr, size_t size, const char *file, int line) || (random() % RAND_NULL_MALLOC)) { #endif s = backtrace2str(bt_buf, sizeof(bt_buf)); - p = _shm_realloc(ptr, size + s, file, "via ser_realloc", line); + p = shm_reallocxp(ptr, size + s, file, "ser_realloc", line, "tls"); if(p == 0) { - LM_CRIT("tls - ser_realloc(%p, %d)[%s:%d]==null, bt: %s\n", ptr, + LM_CRIT("tls - ser_realloc(%p, %lu)[%s:%d]==null, bt: %s\n", ptr, size, file, line, bt_buf); } else { memcpy(p + size, bt_buf, s); - ((struct qm_frag *)((char *)p - sizeof(struct qm_frag)))->func = - p + size; + shm_setfunc(p, p + size); } #ifdef RAND_NULL_MALLOC } else { @@ -328,6 +326,18 @@ static void *ser_realloc(void *ptr, size_t size, const char *file, int line) return p; } + +static void ser_free(void *ptr, const char *fname, int fline) +{ + if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) + pthread_mutex_lock(&ksr_tls_lock_shm); + if(ptr) { + shm_free(ptr); + } + if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) + pthread_mutex_unlock(&ksr_tls_lock_shm); +} + #endif /* LIBRESSL_VERSION_NUMBER */ #else /*TLS_MALLOC_DBG */ @@ -710,7 +720,11 @@ int tls_pre_init(void) rf = NULL; ff = NULL; #ifdef TLS_MALLOC_DBG +#if OPENSSL_VERSION_NUMBER < 0x010100000L if(!CRYPTO_set_mem_ex_functions(ser_malloc, ser_realloc, ser_free)) { +#else + if(!CRYPTO_set_mem_functions(ser_malloc, ser_realloc, ser_free)) { +#endif #else if(!CRYPTO_set_mem_functions(ser_malloc, ser_realloc, ser_free)) { #endif

1 0

git:master:4d8811f5: smsops: Fix conversion from UCS-2 to UTF-8 and viceversa (#3546)
by GitHub 22 Aug '23

22 Aug '23

Module: kamailio Branch: master Commit: 4d8811f562013297c7d9380e392e31bae19a260f URL: https://github.com/kamailio/kamailio/commit/4d8811f562013297c7d9380e392e31b… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2023-08-22T10:12:47+02:00 smsops: Fix conversion from UCS-2 to UTF-8 and viceversa (#3546) --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/4d8811f562013297c7d9380e392e31b… Patch: https://github.com/kamailio/kamailio/commit/4d8811f562013297c7d9380e392e31b…

1 0

[kamailio/kamailio] I need to test ISUP to SIP-I conversion Kamailio softswtich..I am sending (Issue #3542)
by vivekkirsh 21 Aug '23

21 Aug '23

Hi All, I need to test ISUP to SIP-I conversion at Kamailio Softswitch .this SIP-I conversion need to verify SIpp-SIP end point. **my architecure flow as below as:-** isup sipi-i/sip-t MTG 200 Trunk Gatway -----------> Kamailio Softswitch ----------------> SIPP. How to make it happend in via Kamailio Softswitch .and what are the configurations need to make in Kamailio Softswitch -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3542 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3542(a)github.com>

2 3

[kamailio/kamailio] regex: migration to pcre2 (PR #3535)
by Victor Seva 21 Aug '23

21 Aug '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) - [ ] 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 #2946 #### Description migrate modules to pcre2 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3535 -- Commit Summary -- * regex: migration to pcre2 -- File Changes -- M src/modules/regex/Makefile (11) M src/modules/regex/regex_mod.c (121) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3535.patch https://github.com/kamailio/kamailio/pull/3535.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3535 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3535(a)github.com>

4 10

git:master:325c7a34: regex: migration to pcre2
by Victor Seva 21 Aug '23

21 Aug '23

Module: kamailio Branch: master Commit: 325c7a34fca74770a4351e00e27fcae75d57852e URL: https://github.com/kamailio/kamailio/commit/325c7a34fca74770a4351e00e27fcae… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-21T13:01:59+02:00 regex: migration to pcre2 --- Modified: src/modules/regex/Makefile Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/325c7a34fca74770a4351e00e27fcae… Patch: https://github.com/kamailio/kamailio/commit/325c7a34fca74770a4351e00e27fcae…

1 0

git:master:b1031c1a: tm: docs - note that t_relay() creates transaction if it does not exist
by Daniel-Constantin Mierla 21 Aug '23

21 Aug '23

Module: kamailio Branch: master Commit: b1031c1ad38bd40a9b6fe8849ced58608f1c30ef URL: https://github.com/kamailio/kamailio/commit/b1031c1ad38bd40a9b6fe8849ced586… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-21T12:49:12+02:00 tm: docs - note that t_relay() creates transaction if it does not exist - removed trailing spaces --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/b1031c1ad38bd40a9b6fe8849ced586… Patch: https://github.com/kamailio/kamailio/commit/b1031c1ad38bd40a9b6fe8849ced586…

1 0

git:master:4bcf0649: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 21 Aug '23

21 Aug '23

Module: kamailio Branch: master Commit: 4bcf0649a86965fc2e5c8ea5f3c6519e2918ba52 URL: https://github.com/kamailio/kamailio/commit/4bcf0649a86965fc2e5c8ea5f3c6519… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-21T12:46:29+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/4bcf0649a86965fc2e5c8ea5f3c6519… Patch: https://github.com/kamailio/kamailio/commit/4bcf0649a86965fc2e5c8ea5f3c6519…

1 0

[kamailio/kamailio] tm: clarify t_relay() can create a transaction (PR #3538)
by Дилян Палаузов 21 Aug '23

21 Aug '23

I removed the word atomic before transaction, since it implies that there are in addition non-atomic ways to create a transaction. Per https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio… t_relay() creates a transaction. - typos You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3538 -- Commit Summary -- * tm: clarify which functions can create a transaction -- File Changes -- M src/modules/tm/config.h (2) M src/modules/tm/dlg.c (2) M src/modules/tm/doc/event_routes.xml (2) M src/modules/tm/doc/functions.xml (24) M src/modules/tm/doc/params.xml (21) M src/modules/tm/doc/tm.xml (4) M src/modules/tm/h_table.c (4) M src/modules/tm/h_table.h (2) M src/modules/tm/select.c (4) M src/modules/tm/sip_msg.c (2) M src/modules/tm/sip_msg.h (2) M src/modules/tm/t_fifo.c (4) M src/modules/tm/t_funcs.c (2) M src/modules/tm/t_funcs.h (2) M src/modules/tm/t_fwd.c (16) M src/modules/tm/t_hooks.c (4) M src/modules/tm/t_hooks.h (6) M src/modules/tm/t_lookup.c (10) M src/modules/tm/t_msgbuilder.c (8) M src/modules/tm/t_msgbuilder.h (2) M src/modules/tm/t_reply.c (24) M src/modules/tm/t_stats.h (10) M src/modules/tm/t_suspend.c (2) M src/modules/tm/timer.c (2) M src/modules/tm/timer.h (2) M src/modules/tm/tm.c (8) M src/modules/tm/uac.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3538.patch https://github.com/kamailio/kamailio/pull/3538.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3538 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3538(a)github.com>

2 1

git:master:8ca1fec1: tm: clarify which functions can create a transaction
by Daniel-Constantin Mierla 21 Aug '23

21 Aug '23

Module: kamailio Branch: master Commit: 8ca1fec1c00a19e3386bedf5ccfe8f9983184905 URL: https://github.com/kamailio/kamailio/commit/8ca1fec1c00a19e3386bedf5ccfe8f9… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-21T12:43:09+02:00 tm: clarify which functions can create a transaction I removed the word atomic before transaction, since it implies that there are in addition non-atomic ways to create a transaction. Per https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio… t_relay() creates a transaction. - typos --- Modified: src/modules/tm/config.h Modified: src/modules/tm/dlg.c Modified: src/modules/tm/doc/event_routes.xml Modified: src/modules/tm/doc/functions.xml Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/doc/tm.xml Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/select.c Modified: src/modules/tm/sip_msg.c Modified: src/modules/tm/sip_msg.h Modified: src/modules/tm/t_fifo.c Modified: src/modules/tm/t_funcs.c Modified: src/modules/tm/t_funcs.h Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_hooks.c Modified: src/modules/tm/t_hooks.h Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_stats.h Modified: src/modules/tm/t_suspend.c Modified: src/modules/tm/timer.c Modified: src/modules/tm/timer.h Modified: src/modules/tm/tm.c Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/8ca1fec1c00a19e3386bedf5ccfe8f9… Patch: https://github.com/kamailio/kamailio/commit/8ca1fec1c00a19e3386bedf5ccfe8f9…

1 0

git:master:1599dd82: rtpengine: set MIME Content-Length
by Richard Fuchs 18 Aug '23

18 Aug '23

Module: kamailio Branch: master Commit: 1599dd829e98cb610ca54903e8564d00fe9e07a0 URL: https://github.com/kamailio/kamailio/commit/1599dd829e98cb610ca54903e8564d0… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2023-08-18T08:12:18-04:00 rtpengine: set MIME Content-Length For MIME multipart SDPs, the embedded MIME section can contain a Content-Length header. Update this field if preset after rewriting the SDP. --- Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine_funcs.c Modified: src/modules/rtpengine/rtpengine_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/1599dd829e98cb610ca54903e8564d0… Patch: https://github.com/kamailio/kamailio/commit/1599dd829e98cb610ca54903e8564d0…

1 0

git:master:52196f95: pkg/kamailio/deb: add pcre2
by Victor Seva 18 Aug '23

18 Aug '23

Module: kamailio Branch: master Commit: 52196f955d9b023d1d1340fadd44dcd09a0e6e67 URL: https://github.com/kamailio/kamailio/commit/52196f955d9b023d1d1340fadd44dcd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-18T13:15:46+02:00 pkg/kamailio/deb: add pcre2 * first step for migration to pcre2 until all modules are migrated --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/52196f955d9b023d1d1340fadd44dcd… Patch: https://github.com/kamailio/kamailio/commit/52196f955d9b023d1d1340fadd44dcd…

1 0

[kamailio/kamailio] 关于acc_cdr的问题，请教一下 (Issue #3541)
by kqbi 17 Aug '23

17 Aug '23

目前进行一同呼叫后，在acc表中可以看到Invite、ack及bye的记录详情并带有时间，acc_cdr表中只有start_time及end_time,是对应invite和bye的。现在我想在acc_cdr中增加ack的时间我该如何去做呢？有没有大佬能解答一下？万分感谢！！！ -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3541 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3541(a)github.com>

2 2

git:master:fcdeedb5: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 17 Aug '23

17 Aug '23

Module: kamailio Branch: master Commit: fcdeedb5e84ff31f25daa7ba8ffdb355f909afa9 URL: https://github.com/kamailio/kamailio/commit/fcdeedb5e84ff31f25daa7ba8ffdb35… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-17T18:46:23+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/fcdeedb5e84ff31f25daa7ba8ffdb35… Patch: https://github.com/kamailio/kamailio/commit/fcdeedb5e84ff31f25daa7ba8ffdb35… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 238c4e86bef..ff0686ef14c 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -94,6 +94,7 @@ Ovidiu Sas 6.12. htable.listTables 6.13. htable.stats 6.14. htable.dmqsync [htable] + 6.15. htable.dmqresync htable 7. Event routes @@ -214,6 +215,7 @@ Chapter 1. Admin Guide 6.12. htable.listTables 6.13. htable.stats 6.14. htable.dmqsync [htable] + 6.15. htable.dmqresync htable 7. Event routes @@ -1126,6 +1128,7 @@ if(sht_match_str_value("ha", "eq", "alice")) { 6.12. htable.listTables 6.13. htable.stats 6.14. htable.dmqsync [htable] + 6.15. htable.dmqresync htable 6.1. htable.get htable key @@ -1385,6 +1388,21 @@ kamcmd htable.stats Example: ... kamcmd htable.dmqsync +kamcmd htable.dmqsync ipban +... + +6.15. htable.dmqresync htable + + Perform a resync action (flush and dmq sync). + + Name: htable.dmqresync + + Parameters: + * htable: name of the hash table to perform resync for. + + Example: +... +kamcmd htable.dmqresync ipban ... 7. Event routes

1 0

git:master:2c9a135d: htable: docs for htable.dmqresync
by Daniel-Constantin Mierla 17 Aug '23

17 Aug '23

Module: kamailio Branch: master Commit: 2c9a135d4272ace414b7b4dd148cdf955f79b614 URL: https://github.com/kamailio/kamailio/commit/2c9a135d4272ace414b7b4dd148cdf9… 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: docs for htable.dmqresync --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2c9a135d4272ace414b7b4dd148cdf9… Patch: https://github.com/kamailio/kamailio/commit/2c9a135d4272ace414b7b4dd148cdf9… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 2e4b377999a..0dd01bea5a0 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1802,10 +1802,34 @@ kamcmd htable.stats <programlisting format="linespecific"> ... kamcmd htable.dmqsync +kamcmd htable.dmqsync ipban +... +</programlisting> + </section> + <section id="htable.rpc.dmqresync"> + <title> + <function moreinfo="none">htable.dmqresync htable</function> + </title> + <para> + Perform a resync action (flush and dmq sync). + </para> + <para> + Name: <emphasis>htable.dmqresync</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>htable: name of the hash table to perform resync for. + </para></listitem> + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +kamcmd htable.dmqresync ipban ... </programlisting> </section> - </section> <section>

1 0

git:master:f9dcffc4: htable: added rpc htable.dmqresync command
by Daniel-Constantin Mierla 17 Aug '23

17 Aug '23

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 0

[kamailio/kamailio] dispatcher: add option to retain existing latency stats when reloading destinations (PR #3534)
by Charles Chance 17 Aug '23

17 Aug '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  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>

4 11

git:master:b612f079: htable: docs for rpc htable.dmqsync
by Daniel-Constantin Mierla 16 Aug '23

16 Aug '23

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>

4 9

[kamailio/kamailio] ims_qos: doc update and warn logs (PR #3521)
by Stefan Mititelu 16 Aug '23

16 Aug '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  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>

4 8

git:master:722a79a9: core: cfg.y typo in parsing XAVPVIAFIELDS
by Daniel-Constantin Mierla 15 Aug '23

15 Aug '23

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 0

git:master:440bab64: htable: docs for htable parameter of rpc htable.dmqsync
by Daniel-Constantin Mierla 15 Aug '23

15 Aug '23

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 0

git:master:49adf6b6: htable: option to dmq sync a single htable via rpc
by Daniel-Constantin Mierla 15 Aug '23

15 Aug '23

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 0

[kamailio/kamailio] core: cfg.y typo in parsing XAVPVIAFIELDS (PR #3540)
by Rick Barenthin 15 Aug '23

15 Aug '23

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>

2 2

git:master:e8591696: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 15 Aug '23

15 Aug '23

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 0

[kamailio/kamailio] ims_ipsec_pcscf: typo in spi_add function definition (Issue #3513)
by jbipre2 15 Aug '23

15 Aug '23

### 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>

2 3

git:master:a053bcc3: ims_ipsec_pcscf: typo in spi_add function definition, GH #3513
by Henning Westerholt 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: a053bcc391f0680ecd5f458d2512e57f69499d39 URL: https://github.com/kamailio/kamailio/commit/a053bcc391f0680ecd5f458d2512e57… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-08-15T14:17:38Z ims_ipsec_pcscf: typo in spi_add function definition, GH #3513 - fix typo in spi_add function definition - patch from jbipre2, GH #3513 --- Modified: src/modules/ims_ipsec_pcscf/spi_list.c --- Diff: https://github.com/kamailio/kamailio/commit/a053bcc391f0680ecd5f458d2512e57… Patch: https://github.com/kamailio/kamailio/commit/a053bcc391f0680ecd5f458d2512e57… --- diff --git a/src/modules/ims_ipsec_pcscf/spi_list.c b/src/modules/ims_ipsec_pcscf/spi_list.c index 37a76cba79c..f56952f8111 100644 --- a/src/modules/ims_ipsec_pcscf/spi_list.c +++ b/src/modules/ims_ipsec_pcscf/spi_list.c @@ -51,7 +51,7 @@ void destroy_list(spi_list_t *lst) } 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;

1 0

git:master:9becbcb1: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: 9becbcb11005377b9925386e5c0de89d20e39b26 URL: https://github.com/kamailio/kamailio/commit/9becbcb11005377b9925386e5c0de89… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-15T16:01:18+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/9becbcb11005377b9925386e5c0de89… Patch: https://github.com/kamailio/kamailio/commit/9becbcb11005377b9925386e5c0de89… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 9b205fc6825..350e9fab41d 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -1373,7 +1373,7 @@ kamcmd htable.stats 6.14. htable.dmqsync - Perform a MdQ sync action. + Perform a DMQ sync action. Name: htable.dmqsync

1 0

git:master:4d285806: htable: spelling fix related to commit b612f0791821
by Henning Westerholt 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: 4d285806b4bb9197c58e0d6e1d4fb33a65865138 URL: https://github.com/kamailio/kamailio/commit/4d285806b4bb9197c58e0d6e1d4fb33… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-08-15T13:49:56Z htable: spelling fix related to commit b612f0791821 --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4d285806b4bb9197c58e0d6e1d4fb33… Patch: https://github.com/kamailio/kamailio/commit/4d285806b4bb9197c58e0d6e1d4fb33… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index c7d68847f04..85b29d9b604 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1785,7 +1785,7 @@ kamcmd htable.stats <function moreinfo="none">htable.dmqsync</function> </title> <para> - Perform a MdQ sync action. + Perform a DMQ sync action. </para> <para> Name: <emphasis>htable.dmqsync</emphasis>

1 0

git:master:0e11b4e8: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: 0e11b4e8f3b1380043034ea9e66f7643e4623960 URL: https://github.com/kamailio/kamailio/commit/0e11b4e8f3b1380043034ea9e66f764… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-15T15:01:14+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/0e11b4e8f3b1380043034ea9e66f764… Patch: https://github.com/kamailio/kamailio/commit/0e11b4e8f3b1380043034ea9e66f764… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 0252b62e030..9b205fc6825 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -93,6 +93,7 @@ Ovidiu Sas 6.11. htable.flush htable 6.12. htable.listTables 6.13. htable.stats + 6.14. htable.dmqsync 7. Event routes @@ -212,6 +213,7 @@ Chapter 1. Admin Guide 6.11. htable.flush htable 6.12. htable.listTables 6.13. htable.stats + 6.14. htable.dmqsync 7. Event routes @@ -1123,6 +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.1. htable.get htable key @@ -1368,6 +1371,17 @@ kamcmd htable.listTables kamcmd htable.stats ... +6.14. htable.dmqsync + + Perform a MdQ sync action. + + Name: htable.dmqsync + + Example: +... +kamcmd htable.dmqsync +... + 7. Event routes 7.1. htable:mod-init

1 0

git:master:a50aa868: htable: rpc command to permorm a dmq sync action
by Daniel-Constantin Mierla 15 Aug '23

15 Aug '23

Module: kamailio Branch: master Commit: a50aa8688afdca9e3c4e34e8d3929e96e6f5b3fa URL: https://github.com/kamailio/kamailio/commit/a50aa8688afdca9e3c4e34e8d3929e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-15T14:52:56+02:00 htable: rpc command to permorm a dmq sync action --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/a50aa8688afdca9e3c4e34e8d3929e9… Patch: https://github.com/kamailio/kamailio/commit/a50aa8688afdca9e3c4e34e8d3929e9… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 22bb221a57f..5b73e4fafb6 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1512,6 +1512,10 @@ static const char *htable_store_doc[2] = { "Store hash table to database.", 0 }; +static const char *htable_dmqsync_doc[2] = { + "Perform DMQ sync action.", + 0 +}; /* clang-format on */ static void htable_rpc_delete(rpc_t *rpc, void *c) @@ -2098,6 +2102,17 @@ static void htable_rpc_store(rpc_t *rpc, void *c) return; } +/*! \brief RPC htable.dmqsync command to sync a hash table via dmq */ +static void htable_rpc_dmqsync(rpc_t *rpc, void *c) +{ + + if(ht_dmq_request_sync() < 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}, @@ -2113,6 +2128,7 @@ rpc_export_t htable_rpc[] = { {"htable.store", htable_rpc_store, htable_store_doc, 0}, {"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}, {0, 0, 0, 0} }; /* clang-format on */

1 0

git:master:8bdc40e0: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 14 Aug '23

14 Aug '23

Module: kamailio Branch: master Commit: 8bdc40e085edddf1e58d8946e06983707fb15770 URL: https://github.com/kamailio/kamailio/commit/8bdc40e085edddf1e58d8946e069837… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-14T17:16:24+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/ims_qos/README --- Diff: https://github.com/kamailio/kamailio/commit/8bdc40e085edddf1e58d8946e069837… Patch: https://github.com/kamailio/kamailio/commit/8bdc40e085edddf1e58d8946e069837…

1 0

git:master:20634fcc: ims_qos: doc and logs update
by Henning Westerholt 14 Aug '23

14 Aug '23

Module: kamailio Branch: master Commit: 20634fccc59c82a35b45a3da0b8e6a0e64acb37e URL: https://github.com/kamailio/kamailio/commit/20634fccc59c82a35b45a3da0b8e6a0… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-08-14T17:08:35+02:00 ims_qos: doc and logs update --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml Modified: src/modules/ims_qos/ims_qos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/20634fccc59c82a35b45a3da0b8e6a0… Patch: https://github.com/kamailio/kamailio/commit/20634fccc59c82a35b45a3da0b8e6a0… --- diff --git a/src/modules/ims_qos/doc/ims_qos_admin.xml b/src/modules/ims_qos/doc/ims_qos_admin.xml index b8a36c7b136..7755a963abd 100644 --- a/src/modules/ims_qos/doc/ims_qos_admin.xml +++ b/src/modules/ims_qos/doc/ims_qos_admin.xml @@ -29,7 +29,7 @@ <itemizedlist> <listitem> - <para>Dialog</para> + <para>IMS Dialog</para> </listitem> <listitem> @@ -625,8 +625,8 @@ route[REG_AAR_REPLY] </listitem> </itemizedlist> - <para>This function can be used from REQUEST_ROUTE or - ONREPLY_ROUTE.</para> + <para>This function can be used only from ONREPLY_ROUTE, only for replies to INVITE, UPDATE, PRACK. + The reply and request must have SDP, for this function to work properly.</para> <para>p.s. this is executed asynchronously. See example on how to retrieve return value</para> diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index d2502020450..9ff174f03eb 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -205,8 +205,8 @@ static int pv_t_copy_msg(struct sip_msg *src, struct sip_msg *dst) } -static cmd_export_t cmds[] = {{"Rx_AAR", (cmd_function)w_rx_aar, 4, fixup_aar, - 0, REQUEST_ROUTE | ONREPLY_ROUTE}, +static cmd_export_t cmds[] = { + {"Rx_AAR", (cmd_function)w_rx_aar, 4, fixup_aar, 0, ONREPLY_ROUTE}, {"Rx_AAR_Register", (cmd_function)w_rx_aar_register, 2, fixup_aar_register, 0, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0}}; @@ -801,7 +801,7 @@ static int w_rx_aar( } if(t->uas.status >= 200) { - LM_DBG("transaction sent out a final response already - %d\n", + LM_WARN("transaction sent out a final response already - %d\n", t->uas.status); return result; } @@ -864,13 +864,13 @@ static int w_rx_aar( || memcmp(t->method.s, "UPDATE", 6) == 0))) { if(cscf_get_content_length(msg) == 0 || cscf_get_content_length(orig_sip_request_msg) == 0) { - LM_DBG("No SDP offer answer -> therefore we can not do Rx AAR"); + LM_WARN("No SDP offer answer -> therefore we can not do Rx AAR"); //goto aarna; //AAR na if we don't have offer/answer pair return result; } } else { - LM_DBG("Message is not response to INVITE, PRACK or UPDATE -> " - "therefore we do not Rx AAR"); + LM_WARN("Message is not response to INVITE, PRACK or UPDATE -> " + "therefore we do not Rx AAR"); return result; } @@ -1162,7 +1162,7 @@ static int w_rx_aar( int ret = create_new_callsessiondata(&callid, &ftag, &ttag, &identifier, identifier_type, &ip, ip_version, &rx_authdata_p); if(!ret) { - LM_DBG("Unable to create new media session data parcel\n"); + LM_ERR("Unable to create new media session data parcel\n"); goto error; }

1 0

git:master:2a1a65db: dispatcher: add option to retain existing latency stats when reloading destinations
by Henning Westerholt 14 Aug '23

14 Aug '23

Module: kamailio Branch: master Commit: 2a1a65dba78665b9d663e2e8335cff11a1116ec2 URL: https://github.com/kamailio/kamailio/commit/2a1a65dba78665b9d663e2e8335cff1… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-08-14T17:06:36+02:00 dispatcher: add option to retain existing latency stats when reloading destinations - also retain when adding/removing individual destinations via RPC --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2a1a65dba78665b9d663e2e8335cff1… Patch: https://github.com/kamailio/kamailio/commit/2a1a65dba78665b9d663e2e8335cff1…

1 0

git:master:2fd5d881: modules: readme files regenerated - rabbitmq ... [skip ci]
by Kamailio Dev 12 Aug '23

12 Aug '23

Module: kamailio Branch: master Commit: 2fd5d881563126f7425730f798afcbfc2feeac65 URL: https://github.com/kamailio/kamailio/commit/2fd5d881563126f7425730f798afcbf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-12T13:46:24+02:00 modules: readme files regenerated - rabbitmq ... [skip ci] --- Modified: src/modules/rabbitmq/README Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/2fd5d881563126f7425730f798afcbf… Patch: https://github.com/kamailio/kamailio/commit/2fd5d881563126f7425730f798afcbf… --- diff --git a/src/modules/rabbitmq/README b/src/modules/rabbitmq/README index 942afffa83f..889512b6a48 100644 --- a/src/modules/rabbitmq/README +++ b/src/modules/rabbitmq/README @@ -176,7 +176,7 @@ modparam("rabbitmq", "direct_reply_to", 1) * content_type - the content_type of the messagebody. * messagebody - the messagebody to be published. - This function can be used from REQUEST_ROUTE. + This function can be used from any route. Example 1.5. rabbitmq_publish usage rabbitmq_publish("exchange", "routing_key", "application/json", "$avp(json_reque diff --git a/src/modules/xhttp/README b/src/modules/xhttp/README index 9a59c839aa1..ec009bacafb 100644 --- a/src/modules/xhttp/README +++ b/src/modules/xhttp/README @@ -83,8 +83,8 @@ Chapter 1. Admin Guide SIP parser can easily handle HTTP requests just by adding a fake Via header. - The <module>xmlrpc</module> module uses the same concept. The xHTTP - module offers a generic way of handling the HTTP protocol, by calling + The xmlrpc module uses the same concept. The xHTTP module offers a + generic way of handling the HTTP protocol, by calling event_route[xhttp:request] in your config. You can check the HTTP URL via the config variable $hu. Note that use of $ru will raise errors since the structure of an HTTP URL is not compatible with that of a SIP @@ -222,7 +222,10 @@ event_route[xhttp:request] { 6.1. xhttp:request - The event route is executed when a new HTTP request is received. + The event route is executed when a new HTTP request is received. Most + of the variables related to a SIP request can be used inside this event + route to get HTTP request attributes (e.g., $si - source IP, $hdr(X) - + body of header X, $rm - request method, $rb - request body, ...). ... tcp_accept_no_cl=yes ...

1 0

[kamailio/kamailio] rabbitmq: Enabling rabbitmq_publish for any route and disabling peer verfication (PR #3537)
by joelbax 12 Aug '23

12 Aug '23

Enabling rabbitmq_publish function on any route so we can send events on reply reception. Also disabling peer verification on the TLS handshake if no CA file is configured.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3537 -- Commit Summary -- * rabbitmq: Enabling rabbitmq_publish for any route and disabling peer -- File Changes -- M src/modules/rabbitmq/doc/rabbitmq_admin.xml (2) M src/modules/rabbitmq/rabbitmq.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3537.patch https://github.com/kamailio/kamailio/pull/3537.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3537 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3537(a)github.com>

2 3

git:master:2475dfa2: rabbitmq: Enabling rabbitmq_publish for any route and disabling peer
by Daniel-Constantin Mierla 12 Aug '23

12 Aug '23

Module: kamailio Branch: master Commit: 2475dfa2564346b7c0790012e72cd17a5d9ca7f6 URL: https://github.com/kamailio/kamailio/commit/2475dfa2564346b7c0790012e72cd17… Author: Joel Centelles <joel_centellesmartin(a)baxter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-12T13:39:24+02:00 rabbitmq: Enabling rabbitmq_publish for any route and disabling peer verification Enabling rabbitmq_publish function on any route so we can send events on reply reception. Also disabling peer verification on the TLS handshake if no CA file is configured. --- Modified: src/modules/rabbitmq/doc/rabbitmq_admin.xml Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/2475dfa2564346b7c0790012e72cd17… Patch: https://github.com/kamailio/kamailio/commit/2475dfa2564346b7c0790012e72cd17… --- diff --git a/src/modules/rabbitmq/doc/rabbitmq_admin.xml b/src/modules/rabbitmq/doc/rabbitmq_admin.xml index 18bd4676021..8ed436a6bfa 100644 --- a/src/modules/rabbitmq/doc/rabbitmq_admin.xml +++ b/src/modules/rabbitmq/doc/rabbitmq_admin.xml @@ -204,7 +204,7 @@ modparam("rabbitmq", "direct_reply_to", 1) </itemizedlist> <para> - This function can be used from REQUEST_ROUTE. + This function can be used from any route. </para> <example> diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 94341070508..50d143723e6 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -120,7 +120,7 @@ static int rbmq_fixup_free_params(void **param, int param_no) /* module commands */ static cmd_export_t cmds[] = { {"rabbitmq_publish", (cmd_function)rabbitmq_publish, 4, fixup_spve_all, - fixup_free_spve_all, REQUEST_ROUTE}, + fixup_free_spve_all, ANY_ROUTE}, {"rabbitmq_publish_consume", (cmd_function)rabbitmq_publish_consume, 5, rbmq_fixup_params, rbmq_fixup_free_params, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0}}; @@ -597,10 +597,10 @@ static int rabbitmq_connect(amqp_connection_state_t *conn) } #if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR < 8 - amqp_ssl_socket_set_verify(amqp_sock, 1); + amqp_ssl_socket_set_verify(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); #else - amqp_ssl_socket_set_verify_peer(amqp_sock, 1); - amqp_ssl_socket_set_verify_hostname(amqp_sock, 1); + amqp_ssl_socket_set_verify_peer(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); + amqp_ssl_socket_set_verify_hostname(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); #endif ret = amqp_socket_open(amqp_sock, amqp_info.host, amqp_info.port);

1 0

git:master:170067e6: xhttp: note about available variables during http request processing
by Daniel-Constantin Mierla 12 Aug '23

12 Aug '23

Module: kamailio Branch: master Commit: 170067e633ef32ea7b17adad46fdfe2c85fadda0 URL: https://github.com/kamailio/kamailio/commit/170067e633ef32ea7b17adad46fdfe2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-12T13:31:15+02:00 xhttp: note about available variables during http request processing --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/170067e633ef32ea7b17adad46fdfe2… Patch: https://github.com/kamailio/kamailio/commit/170067e633ef32ea7b17adad46fdfe2… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index f0e6d3fdeb8..1c7d29a051a 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -22,7 +22,7 @@ Via header. </para> <para> - The <module>xmlrpc</module> module uses the same concept. + The xmlrpc module uses the same concept. The xHTTP module offers a generic way of handling the <acronym>HTTP</acronym> protocol, by calling <emphasis>event_route[xhttp:request]</emphasis> in your config. You can check the HTTP URL via the config variable @@ -228,7 +228,10 @@ event_route[xhttp:request] { <function moreinfo="none">xhttp:request</function> </title> <para> - The event route is executed when a new HTTP request is received. + The event route is executed when a new HTTP request is received. Most + of the variables related to a SIP request can be used inside this event + route to get HTTP request attributes (e.g., $si - source IP, $hdr(X) + - body of header X, $rm - request method, $rb - request body, ...). </para> <programlisting format="linespecific"> ...

1 0

git:master:e60ce488: modules: readme files regenerated - http_async_client ... [skip ci]
by Kamailio Dev 12 Aug '23

12 Aug '23

Module: kamailio Branch: master Commit: e60ce488db239f717803b0f4f83180646ee47200 URL: https://github.com/kamailio/kamailio/commit/e60ce488db239f717803b0f4f831806… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-12T12:31:22+02:00 modules: readme files regenerated - http_async_client ... [skip ci] --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/e60ce488db239f717803b0f4f831806… Patch: https://github.com/kamailio/kamailio/commit/e60ce488db239f717803b0f4f831806… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index 57eff8a890f..0caa3d4631f 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -146,7 +146,8 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * libcurl libev + * libcurl - https://curl.se/libcurl/ + * libevent - https://libevent.org/ 3. Parameters

1 0

git:master:f16d2658: http_async_client: docs - dependency on libevent
by Daniel-Constantin Mierla 12 Aug '23

12 Aug '23

Module: kamailio Branch: master Commit: f16d2658bbefb7a9f43076cbaa958fb3a27f6a0c URL: https://github.com/kamailio/kamailio/commit/f16d2658bbefb7a9f43076cbaa958fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-12T12:16:37+02:00 http_async_client: docs - dependency on libevent - list style for dependencies and links to projects --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f16d2658bbefb7a9f43076cbaa958fb… Patch: https://github.com/kamailio/kamailio/commit/f16d2658bbefb7a9f43076cbaa958fb… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index f514986725d..e03b0208915 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -48,8 +48,12 @@ <itemizedlist> <listitem> <para> - <emphasis>libcurl</emphasis> - <emphasis>libev</emphasis> + <emphasis>libcurl</emphasis> - https://curl.se/libcurl/ + </para> + </listitem> + <listitem> + <para> + <emphasis>libevent</emphasis> - https://libevent.org/ </para> </listitem> </itemizedlist>

1 0

git:master:18ae7720: pkg/kamailio/deb: rule to print excluded modules [skip ci]
by Victor Seva 10 Aug '23

10 Aug '23

Module: kamailio Branch: master Commit: 18ae77207409b816d6dffb13b41e3be9c251d62c URL: https://github.com/kamailio/kamailio/commit/18ae77207409b816d6dffb13b41e3be… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-10T09:56:30+02:00 pkg/kamailio/deb: rule to print excluded modules [skip ci] --- 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/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/18ae77207409b816d6dffb13b41e3be… Patch: https://github.com/kamailio/kamailio/commit/18ae77207409b816d6dffb13b41e3be…

1 0

git:master:5c7de00b: regex: convert to memory error logging helper
by Victor Seva 09 Aug '23

09 Aug '23

Module: kamailio Branch: master Commit: 5c7de00bc0826cf739577010ba7b4882e83819cc URL: https://github.com/kamailio/kamailio/commit/5c7de00bc0826cf739577010ba7b488… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-09T13:21:05+02:00 regex: convert to memory error logging helper --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5c7de00bc0826cf739577010ba7b488… Patch: https://github.com/kamailio/kamailio/commit/5c7de00bc0826cf739577010ba7b488… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index e9943dc57e0..2860e11a413 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -198,13 +198,13 @@ static int mod_init(void) /* Pointer to pcres */ if((pcres_addr = shm_malloc(sizeof(pcre **))) == 0) { - LM_ERR("no memory for pcres_addr\n"); + SHM_MEM_ERROR; goto err; } /* Integer containing the number of pcres */ if((num_pcres = shm_malloc(sizeof(int))) == 0) { - LM_ERR("no memory for num_pcres\n"); + SHM_MEM_ERROR; goto err; } @@ -425,14 +425,14 @@ static int load_pcres(int action) shm_free(pcres); } if((pcres = shm_malloc(sizeof(pcre *) * num_pcres_tmp)) == 0) { - LM_ERR("no more memory for pcres\n"); + SHM_MEM_ERROR; goto err; } memset(pcres, 0, sizeof(pcre *) * num_pcres_tmp); for(i = 0; i < num_pcres_tmp; i++) { pcre_rc = pcre_fullinfo(pcres_tmp[i], NULL, PCRE_INFO_SIZE, &pcre_size); if((pcres[i] = shm_malloc(pcre_size)) == 0) { - LM_ERR("no more memory for pcres[%i]\n", i); + SHM_MEM_ERROR; goto err; } memcpy(pcres[i], pcres_tmp[i], pcre_size);

1 0

[kamailio/kamailio] fix warnings detected via codeql (PR #3497)
by Victor Seva 09 Aug '23

09 Aug '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 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3497 -- Commit Summary -- * sipcapture: use memcpy instead of strncpy for coherence * rtpproxy: use memcpy instead of strcpy for coherence -- File Changes -- M src/modules/rtpproxy/rtpproxy.c (40) M src/modules/sipcapture/sipcapture.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3497.patch https://github.com/kamailio/kamailio/pull/3497.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3497 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3497(a)github.com>

2 7

git:master:11b24eb3: ctl: use snprintf() to set boundaries
by Victor Seva 09 Aug '23

09 Aug '23

Module: kamailio Branch: master Commit: 11b24eb35f4bb1e9825b3191d8f6e0fc9c0a3e28 URL: https://github.com/kamailio/kamailio/commit/11b24eb35f4bb1e9825b3191d8f6e0f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-09T13:20:52+02:00 ctl: use snprintf() to set boundaries > https://github.com/kamailio/kamailio/security/code-scanning/1839 --- Modified: src/modules/ctl/ctl.c --- Diff: https://github.com/kamailio/kamailio/commit/11b24eb35f4bb1e9825b3191d8f6e0f… Patch: https://github.com/kamailio/kamailio/commit/11b24eb35f4bb1e9825b3191d8f6e0f… --- diff --git a/src/modules/ctl/ctl.c b/src/modules/ctl/ctl.c index 87654c8534c..5e289cfa8d9 100644 --- a/src/modules/ctl/ctl.c +++ b/src/modules/ctl/ctl.c @@ -212,6 +212,7 @@ static int mod_init(void) { struct id_list *l; char ctl_socket_path[CTL_SOCKET_PATH_SIZE]; + int len; binrpc_callbacks_init(); @@ -226,17 +227,14 @@ static int mod_init(void) if(strcmp(runtime_dir, RUN_DIR) == 0) { add_binrpc_socket(PARAM_STRING, DEFAULT_CTL_SOCKET); } else { - if(sizeof(DEFAULT_CTL_SOCKET_PROTO) - + sizeof(DEFAULT_CTL_SOCKET_NAME) - + strlen(runtime_dir) + 4 - > CTL_SOCKET_PATH_SIZE) { + len = sizeof(DEFAULT_CTL_SOCKET_PROTO) + + sizeof(DEFAULT_CTL_SOCKET_NAME) + strlen(runtime_dir) + 4; + if(len > CTL_SOCKET_PATH_SIZE) { LM_ERR("ctl socket path is too big\n"); return -1; } - strcpy(ctl_socket_path, DEFAULT_CTL_SOCKET_PROTO); - strcat(ctl_socket_path, runtime_dir); - strcat(ctl_socket_path, "/"); - strcat(ctl_socket_path, DEFAULT_CTL_SOCKET_NAME); + snprintf(ctl_socket_path, len, "%s%s/%s", DEFAULT_CTL_SOCKET_PROTO, + runtime_dir, DEFAULT_CTL_SOCKET_NAME); add_binrpc_socket(PARAM_STRING, ctl_socket_path); } }

1 0

[kamailio/kamailio] Halo Experts, really appreciated if I can get some assistance on the start failure issue when doing patching from kamailio 5.5.4 to 5.5.6 with the error, 'terminating due to SIGCHLD' . Thanks a lot! (Issue #3533)
by Louis Liu 09 Aug '23

09 Aug '23

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3533 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3533(a)github.com>

2 5

Question for not_empty() config function
by Stefan-Cristian Mititelu 09 Aug '23

09 Aug '23

Hello, I have a question for [1] config function. Can I extend it to work with INTs too? e.g. if pv not NULL and INT flag, return 1. This would help, because one won't need to know the type of the pvar beforehand, for using this function. Or is it meant to be used only with string pv only? [1] https://www.kamailio.org/docs/modules/devel/modules/pv.html#pv.f.not_empty Thank you, Stefan

2 2

git:master:d893f3af: core: Add TCP_USER_TIMEOUT socket option on listening socket.
by Daniel-Constantin Mierla 07 Aug '23

07 Aug '23

Module: kamailio Branch: master Commit: d893f3af1444c8c4c5db6cd53fb577703007c90c URL: https://github.com/kamailio/kamailio/commit/d893f3af1444c8c4c5db6cd53fb5777… Author: Walter Schober <walter.schober(a)neotel.at> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-07T19:32:53+02:00 core: Add TCP_USER_TIMEOUT socket option on listening socket. Use tcp_send_timeout config option also on listening socket to timeout outbound messages sent on passive inbound connections. --- Modified: src/core/tcp_main.c Modified: src/core/tcp_options.h --- Diff: https://github.com/kamailio/kamailio/commit/d893f3af1444c8c4c5db6cd53fb5777… Patch: https://github.com/kamailio/kamailio/commit/d893f3af1444c8c4c5db6cd53fb5777… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e96d68c40b2..7f07d724108 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3172,6 +3172,18 @@ int tcp_init(struct socket_info *sock_info) } #endif init_sock_keepalive(sock_info->socket); +#ifdef HAVE_TCP_USER_TIMEOUT + if((optval = TICKS_TO_S(cfg_get(tcp, tcp_cfg, send_timeout)))) { + optval *= 1000; + if(setsockopt(sock_info->socket, IPPROTO_TCP, TCP_USER_TIMEOUT, &optval, + sizeof(optval)) + < 0) { + LM_WARN("failed to set TCP_USER_TIMEOUT: %s\n", strerror(errno)); + } else { + LM_INFO("Set TCP_USER_TIMEOUT=%d ms\n", optval); + } + } +#endif if(bind(sock_info->socket, &addr->s, sockaddru_len(*addr)) == -1) { LM_ERR("bind(%x, %p, %d) on %s:%d : %s\n", sock_info->socket, &addr->s, (unsigned)sockaddru_len(*addr), sock_info->address_str.s, diff --git a/src/core/tcp_options.h b/src/core/tcp_options.h index d5a628a1128..84c551e2a3b 100644 --- a/src/core/tcp_options.h +++ b/src/core/tcp_options.h @@ -68,6 +68,13 @@ #endif /* __OS_ */ #endif /* NO_TCP_LINGER2 */ +/* tcp user_timeout */ +#ifndef NO_TCP_USER_TIMEOUT +#ifdef __OS_linux +#define HAVE_TCP_USER_TIMEOUT +#endif /* __OS_ */ +#endif /* NO_TCP_LINGER2 */ + /* keepalive */ #ifndef NO_TCP_KEEPALIVE #define HAVE_SO_KEEPALIVE

1 0

git:master:63445544: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 07 Aug '23

07 Aug '23

Module: kamailio Branch: master Commit: 63445544d994d7876ff76eb66203400c5a3a4b91 URL: https://github.com/kamailio/kamailio/commit/63445544d994d7876ff76eb66203400… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-07T15:49:07+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/app_perl/README Modified: src/modules/cdp/README Modified: src/modules/cdp_avp/README Modified: src/modules/dialog/README Modified: src/modules/dispatcher/README Modified: src/modules/ims_dialog/README Modified: src/modules/ims_registrar_scscf/README Modified: src/modules/ims_usrloc_pcscf/README Modified: src/modules/ims_usrloc_scscf/README Modified: src/modules/nathelper/README Modified: src/modules/registrar/README Modified: src/modules/rtpengine/README Modified: src/modules/rtpproxy/README Modified: src/modules/snmpstats/README --- Diff: https://github.com/kamailio/kamailio/commit/63445544d994d7876ff76eb66203400… Patch: https://github.com/kamailio/kamailio/commit/63445544d994d7876ff76eb66203400…

1 0

[kamailio/kamailio] Typos (PR #3520)
by Дилян Палаузов 07 Aug '23

07 Aug '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3520 -- Commit Summary -- * docs/ : typos * etc/ typos -- File Changes -- M INSTALL (2) M doc/docbook/catalog.xml (2) M doc/docbook/dep.xsl (4) M doc/docbook/entities.xml (10) M doc/docbook/html.chunked.xsl (2) M doc/doxygen/main.dox (2) M doc/man/kamailio.cfg.5 (2) M doc/misc/HISTORY (10) M doc/misc/NEWS (58) M doc/misc/TODO (10) M doc/misc/cvs-commit-rules.txt (6) M doc/stylesheets/dbschema_k/catalog.xml (2) M doc/stylesheets/dbschema_k/xsl/db_berkeley.xsl (4) M doc/stylesheets/dbschema_k/xsl/db_redis.xsl (4) M doc/stylesheets/dbschema_k/xsl/dbtext.xsl (4) M doc/stylesheets/dbschema_k/xsl/mysql.xsl (2) M doc/stylesheets/dbschema_k/xsl/pi_framework_mod.xsl (2) M doc/tutorials/presence/cfg/ps.cfg (2) M doc/tutorials/presence/install.xml (2) M doc/tutorials/presence/intro.xml (4) M doc/tutorials/serdev/routing_engine.xml (2) M doc/tutorials/seruser/otherapps.xml (2) M etc/kamailio.cfg (4) M etc/sip-router.cfg (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3520.patch https://github.com/kamailio/kamailio/pull/3520.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3520 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3520(a)github.com>

2 1

git:master:9fba6779: docs/ : typos
by Daniel-Constantin Mierla 07 Aug '23

07 Aug '23

Module: kamailio Branch: master Commit: 9fba67792382b53ccd4851764505ee3b119531b1 URL: https://github.com/kamailio/kamailio/commit/9fba67792382b53ccd4851764505ee3… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-07T15:32:56+02:00 docs/ : typos --- Modified: INSTALL Modified: doc/docbook/catalog.xml Modified: doc/docbook/dep.xsl Modified: doc/docbook/entities.xml Modified: doc/docbook/html.chunked.xsl Modified: doc/doxygen/main.dox Modified: doc/man/kamailio.cfg.5 Modified: doc/misc/HISTORY Modified: doc/misc/NEWS Modified: doc/misc/TODO Modified: doc/misc/cvs-commit-rules.txt Modified: doc/stylesheets/dbschema_k/catalog.xml Modified: doc/stylesheets/dbschema_k/xsl/db_berkeley.xsl Modified: doc/stylesheets/dbschema_k/xsl/db_redis.xsl Modified: doc/stylesheets/dbschema_k/xsl/dbtext.xsl Modified: doc/stylesheets/dbschema_k/xsl/mysql.xsl Modified: doc/stylesheets/dbschema_k/xsl/pi_framework_mod.xsl Modified: doc/tutorials/presence/cfg/ps.cfg Modified: doc/tutorials/presence/install.xml Modified: doc/tutorials/presence/intro.xml Modified: doc/tutorials/serdev/routing_engine.xml Modified: doc/tutorials/seruser/otherapps.xml --- Diff: https://github.com/kamailio/kamailio/commit/9fba67792382b53ccd4851764505ee3… Patch: https://github.com/kamailio/kamailio/commit/9fba67792382b53ccd4851764505ee3…

1 0

git:master:6e9335ff: etc/ typos
by Daniel-Constantin Mierla 07 Aug '23

07 Aug '23

Module: kamailio Branch: master Commit: 6e9335ff2245596b74bc1c749d1e7805bf186f02 URL: https://github.com/kamailio/kamailio/commit/6e9335ff2245596b74bc1c749d1e780… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-07T15:32:56+02:00 etc/ typos --- Modified: etc/kamailio.cfg Modified: etc/sip-router.cfg --- Diff: https://github.com/kamailio/kamailio/commit/6e9335ff2245596b74bc1c749d1e780… Patch: https://github.com/kamailio/kamailio/commit/6e9335ff2245596b74bc1c749d1e780… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 68493736d41..715c289af1e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -227,7 +227,7 @@ enable_sctp=no ####### Custom Parameters ######### -/* These parameters can be modified runtime via RPC interface +/* These parameters can be modified at runtime via RPC interface * - see the documentation of 'cfg_rpc' module. * * Format: group.id = value 'desc' description @@ -389,7 +389,7 @@ modparam("registrar", "path_mode", 0) modparam("acc", "early_media", 0) modparam("acc", "report_ack", 0) modparam("acc", "report_cancels", 0) -/* by default ww do not adjust the direct of the sequential requests. +/* by default we do not adjust the direct of the sequential requests. * if you enable this parameter, be sure the enable "append_fromtag" * in "rr" module */ modparam("acc", "detect_direction", 0) diff --git a/etc/sip-router.cfg b/etc/sip-router.cfg index 0390ef7ec57..8669ea63d79 100644 --- a/etc/sip-router.cfg +++ b/etc/sip-router.cfg @@ -1,7 +1,7 @@ # # $Id$ # -# Example configuration file (simpler then ser-oob.cfg, but more +# Example configuration file (simpler than ser-oob.cfg, but more # complex then ser-basic.cfg). # # First start SER sample config script with: @@ -73,7 +73,7 @@ rev_dns=no # (cmd. line: -R) #group=ser #disable_core=yes #disables core dumping #open_fd_limit=1024 # sets the open file descriptors limit -#mhomed=yes # usefull for multihomed hosts, small performance penalty +#mhomed=yes # useful for multihomed hosts, small performance penalty #disable_tcp=yes #tcp_accept_aliases=yes # accepts the tcp alias via option (see NEWS) sip_warning=yes @@ -172,7 +172,7 @@ modparam("ctl", "binrpc", "tcp:127.0.0.1:2046") # failed transactions (=negative responses) should be logged to modparam("acc_db", "failed_transactions", 1) -# comment the next line if you dont want to have accounting to DB +# comment the next line if you don't want to have accounting to DB modparam("acc_db", "log_flag", "FLAG_ACC") # -- tm params -- @@ -197,7 +197,7 @@ modparam("tls", "private_key", "ser-selfsigned.key") # -- xmlrpc params -- -# using a sub-route from the module is a lot safer then relying on the +# using a sub-route from the module is a lot safer than relying on the # request method to distinguish HTTP from SIP modparam("xmlrpc", "route", "RPC"); @@ -358,8 +358,8 @@ route[RR] # particularly good if upstream and downstream entities # use different transport protocol - # if the inital INVITE got the ACC flag store this in - # an RR AVP cookie. this is more for demonstration purpose + # if the initial INVITE got the ACC flag store this in + # an RR AVP cookie. This is more for demonstration purpose if (isflagset(FLAG_ACC)) { $account = "yes"; setavpflag($account, "dialog_cookie"); @@ -377,7 +377,7 @@ route[DOMAIN] # check if the callee is at a local domain lookup_domain("$td", "@ruri.host"); - # we dont know the domain of the caller and also not + # we don't know the domain of the caller and also not # the domain of the callee -> somone uses our proxy as # a relay if (strempty($t.did) && strempty($f.did)) { @@ -528,7 +528,7 @@ route[INBOUND] if (lookup_contacts("location")) { append_hf("P-hint: usrloc applied\r\n"); - # we set the TM module timers according to the prefences + # we set the TM module timers according to the preferences # of the callee (avoid too long ringing of his phones) # Note1: timer values have to be in ms now! # Note2: this makes even more sense if you switch to a voicemail

1 0

Re: Performances issue when freeing shared memory in custom module (Kamailio 5.5.2)
by Henning Westerholt 04 Aug '23

04 Aug '23

Hello, (Adding sr-dev to CC) This looks indeed a bit strange. Do you get any error messages in the log? In which process you are freeing the memory, one of the worker processes or the RPC process? You could also try to use another memory manager to see if you get better performance. There is a command line parameter to choose one during startup. Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/> From: Chaigneau, Nicolas <nicolas.chaigneau(a)capgemini.com> Sent: Wednesday, January 18, 2023 6:49 PM To: Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> Subject: [SR-Users] Performances issue when freeing shared memory in custom module (Kamailio 5.5.2) Hello, I'm encountering performance issues with Kamailio (5.5.2). I'm using a custom Kamailio module that loads routing data in memory, using Kamailio shared memory. This routing data is very large. It can be fully reloaded through a Kamailio RPC command (which is done once each day). When reloading, two sets of data are maintained, one "loading" and another "current" (the latter being used to handle SIP requests). When loading of the new data is finished, it is swapped to "current". Then, memory of the old (now unused) data is freed. I've noticed that when Kamailio is freeing the old data, there is a very significant performance impact on SIP requests. This is surprising to me, because the SIP requests do not use this old data. This is not a CPU issue, idle CPU% is at about 99% at that moment. I'm using the following functions : - shm_mallocxz - shm_free From what I understand, shm_free is actually "qm_shm_free" defined in "src\core\mem\q_malloc.c" (the default shared memory manager being "qm"). I've noticed that there is also a variant shm_free_unsafe ("qm_free"), which does not perform locking. I'm wondering if the lock could be the cause of my performances issues ? (But I'm not sure how this could be possible, because although the SIP requests need to access the shared memory allocated, they do not use directly the functions from the share memory manager.) If the performances issues are causes by the lock, could I use the unsafe version "safely" ? (considering that it is guaranteed that the old data cannot be used by anyone else) Thanks for your help. Regards, Nicolas. This message contains information that may be privileged or confidential and is the property of the Capgemini Group. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain, copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message.

3 13

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev