sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
247 discussions

git:master:2063993c: core: added fixup_spve1_pvar() helper
by Daniel-Constantin Mierla 29 Mar '24

29 Mar '24

Module: kamailio Branch: master Commit: 2063993c1ae54c07b39ea9deb8f735a47785c0ee URL: https://github.com/kamailio/kamailio/commit/2063993c1ae54c07b39ea9deb8f735a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-29T11:13:48+01:00 core: added fixup_spve1_pvar() helper - comments to spveX pvar fixup helpers --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/2063993c1ae54c07b39ea9deb8f735a… Patch: https://github.com/kamailio/kamailio/commit/2063993c1ae54c07b39ea9deb8f735a… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 0947f788461..bba3a469028 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -728,7 +728,9 @@ int fixup_free_spve_spve_igp(void **param, int param_no) } /** - * + * - first params are dynamic strings (spve) + * - n - how many params are spve; n+1 is name of pv + * - if pvmode==1, the last param pv has to be r/w */ int fixup_spve_n_pvar(void **param, int n, int param_no, int pvmode) { @@ -768,6 +770,15 @@ int fixup_spve_pvar(void **param, int param_no) return fixup_spve_n_pvar(param, 1, param_no, 0); } +/** + * - first params are dynamic strings + * - last param pv has to be r/w + */ +int fixup_spve1_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 1, param_no, 1); +} + /** * */ @@ -777,7 +788,8 @@ int fixup_free_spve_pvar(void **param, int param_no) } /** - * + * - first params are dynamic strings + * - last param pv has to be r/w */ int fixup_spve2_pvar(void **param, int param_no) { @@ -793,7 +805,8 @@ int fixup_free_spve2_pvar(void **param, int param_no) } /** - * + * - first params are dynamic strings + * - last param pv has to be r/w */ int fixup_spve3_pvar(void **param, int param_no) { @@ -809,7 +822,8 @@ int fixup_free_spve3_pvar(void **param, int param_no) } /** - * + * - first params are dynamic strings + * - last param pv has to be r/w */ int fixup_spve4_pvar(void **param, int param_no) { diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index a202c4ade2b..d3f954fb1c2 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -147,6 +147,7 @@ int fixup_free_igp_all(void **param, int param_no); int fixup_spve_igp(void **param, int param_no); int fixup_free_spve_igp(void **param, int param_no); int fixup_spve_pvar(void **param, int param_no); +int fixup_spve1_pvar(void **param, int param_no); int fixup_free_spve_pvar(void **param, int param_no); int fixup_spve2_pvar(void **param, int param_no); int fixup_free_spve2_pvar(void **param, int param_no);

1 0

git:5.8:613e2cdf: file_out: FIx âforâ loop initial declarations error
by Xenofon Karamanos 28 Mar '24

28 Mar '24

Module: kamailio Branch: 5.8 Commit: 613e2cdfc3ae9242d259bf8b67b6ed715c0c0ad8 URL: https://github.com/kamailio/kamailio/commit/613e2cdfc3ae9242d259bf8b67b6ed7… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-28T16:05:48Z file_out: FIx ��for�� loop initial declarations error (cherry picked from commit ae04ccac92225a1e7b573a28ded555789e8604cd) --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/613e2cdfc3ae9242d259bf8b67b6ed7… Patch: https://github.com/kamailio/kamailio/commit/613e2cdfc3ae9242d259bf8b67b6ed7… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 886f01f944f..a13d3531dde 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -100,6 +100,7 @@ struct module_exports exports = { static int mod_init(void) { + int i = 0; LM_DBG("initializing\n"); LM_DBG("base_folder = %.*s\n", fo_base_folder.len, fo_base_folder.s); @@ -121,7 +122,7 @@ static int mod_init(void) *fo_number_of_files = fo_count_assigned_files(); /* Fixup the prefix */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { str s; s.s = fo_files[i].fo_prefix.s; s.len = fo_files[i].fo_prefix.len; @@ -139,7 +140,7 @@ static int mod_init(void) } /* Initialize per process vars */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { fo_files[i].fo_stored_timestamp = time(NULL); } @@ -156,6 +157,7 @@ static int mod_init(void) static int child_init(int rank) { int pid; + int i = 0; if(rank != PROC_MAIN) { return 0; } @@ -172,7 +174,7 @@ static int child_init(int rank) return -1; /* Initialize and open files */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { fo_init_file(i); } @@ -194,7 +196,8 @@ static int child_init(int rank) static void destroy(void) { int result = 0; - for(int i = 0; i < *fo_number_of_files; i++) { + int i = 0; + for(i = 0; i < *fo_number_of_files; i++) { result = fo_file_properties_destroy(&fo_files[i]); if(result < 0) { LM_ERR("Failed to destroy file properties\n");

1 0

git:5.8:f4d44a92: tls: Fix âforâ loop initial declarations error
by Xenofon Karamanos 28 Mar '24

28 Mar '24

Module: kamailio Branch: 5.8 Commit: f4d44a9201a79acf0620a005008f2594ff8d26ee URL: https://github.com/kamailio/kamailio/commit/f4d44a9201a79acf0620a005008f259… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-28T16:05:14Z tls: Fix ��for�� loop initial declarations error (cherry picked from commit 9f2abc69e27c4b3246628138ec81fced81d7bc7a) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f4d44a9201a79acf0620a005008f259… Patch: https://github.com/kamailio/kamailio/commit/f4d44a9201a79acf0620a005008f259… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index b4a2afb7818..83b86d99d58 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -345,7 +345,8 @@ static tls_domains_cfg_t* tls_use_modparams(void) */ static void fork_child(void) { - for(int k = 0; k < 16; k++) { + int k = 0; + for(k = 0; k < 16; k++) { if(pthread_getspecific(k) != 0) pthread_setspecific(k, 0x0); }

1 0

[kamailio/kamailio] sipdump.enable will not dump (Issue #3798)
by 53c70r 28 Mar '24

28 Mar '24

While testing I noticed a strange behavior. Usually when activated, `sipdump.enable 1` for the specific interface will dump needed logs and captures to `/tmp/`. After stopping the dump with `sipdump.enable 0` deleting all captures starting with `kamailio.*` under `/tmp/` and reactivating the dump with `sipdump.enable 1` without restarting kamailio, the service will not create new captures under `/tmp/`. This behavior was reproducible. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3798 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3798(a)github.com>

2 4

git:master:44a876a6: modules: readme files regenerated - smsops ... [skip ci]
by Kamailio Dev 28 Mar '24

28 Mar '24

Module: kamailio Branch: master Commit: 44a876a6a832b0d6baf4e6ee183576684b91f0af URL: https://github.com/kamailio/kamailio/commit/44a876a6a832b0d6baf4e6ee1835766… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-28T08:46:17+01:00 modules: readme files regenerated - smsops ... [skip ci] --- Modified: src/modules/smsops/README --- Diff: https://github.com/kamailio/kamailio/commit/44a876a6a832b0d6baf4e6ee1835766… Patch: https://github.com/kamailio/kamailio/commit/44a876a6a832b0d6baf4e6ee1835766… --- diff --git a/src/modules/smsops/README b/src/modules/smsops/README index 65e410de6ba..0dc5edbd605 100644 --- a/src/modules/smsops/README +++ b/src/modules/smsops/README @@ -33,6 +33,8 @@ Carsten Bock 4.1. isRPDATA() 4.2. smsdump() + 5. Variables + List of Examples 1.1. isRPDATA() usage @@ -57,6 +59,8 @@ Chapter 1. Admin Guide 4.1. isRPDATA() 4.2. smsdump() + 5. Variables + 1. Overview This module collects the Transformations for 3GPP-SMS. @@ -115,3 +119,12 @@ if (isRPDATA()) ... smsdump(); ... + +5. Variables + + Several variables are exported by the module to access the attributes + of the SMS. + * $smsack + $smsbody + $rpdata(key) + $tpdu(key)

1 0

git:master:e39557c9: blst: reformat exported structures
by Daniel-Constantin Mierla 28 Mar '24

28 Mar '24

Module: kamailio Branch: master Commit: e39557c96d2f419184c826d779f1a3309acc4269 URL: https://github.com/kamailio/kamailio/commit/e39557c96d2f419184c826d779f1a33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-28T08:31:05+01:00 blst: reformat exported structures --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/e39557c96d2f419184c826d779f1a33… Patch: https://github.com/kamailio/kamailio/commit/e39557c96d2f419184c826d779f1a33… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 6a2c1d625b6..148a9a9d9d0 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -49,37 +49,44 @@ static int blst_rpl_set_ignore_f(struct sip_msg *, char *, char *); static int blst_rpl_clear_ignore_f(struct sip_msg *, char *, char *); -static cmd_export_t cmds[] = {{"blst_add", blst_add0_f, 0, 0, 0, ANY_ROUTE}, - {"blst_add", blst_add1_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_add_retry_after", blst_add_retry_after_f, 2, fixup_var_int_12, 0, +/* clang-format off */ +static cmd_export_t cmds[] = { + {"blst_add", blst_add0_f, 0, 0, 0, ANY_ROUTE}, + {"blst_add", blst_add1_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, + {"blst_add_retry_after", blst_add_retry_after_f, 2, fixup_var_int_12, 0, ANY_ROUTE}, - {"blst_del", blst_del_f, 0, 0, 0, ANY_ROUTE}, - {"blst_is_blocklisted", blst_is_blocklisted_f, 0, 0, 0, ANY_ROUTE}, - {"blst_set_ignore", blst_set_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_set_ignore", blst_set_ignore_f, 1, fixup_var_int_1, 0, + {"blst_del", blst_del_f, 0, 0, 0, ANY_ROUTE}, + {"blst_is_blocklisted", blst_is_blocklisted_f, 0, 0, 0, ANY_ROUTE}, + {"blst_set_ignore", blst_set_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_set_ignore", blst_set_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_clear_ignore", blst_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_clear_ignore", blst_clear_ignore_f, 1, fixup_var_int_1, 0, + {"blst_clear_ignore", blst_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_clear_ignore", blst_clear_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 1, fixup_var_int_1, 0, + {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 1, fixup_var_int_1, + {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = {{0, 0, 0}}; /* no params */ struct module_exports exports = { - "blst", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, params, 0, /* RPC methods */ - 0, /* pseudo-variables exports */ - 0, /* response function */ - 0, /* module initialization function */ - 0, /* per-child init function */ - 0 /* destroy function */ + "blst", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, + params, + 0, /* RPC methods */ + 0, /* pseudo-variables exports */ + 0, /* response function */ + 0, /* module initialization function */ + 0, /* per-child init function */ + 0 /* destroy function */ }; +/* clang-format on */ /**

1 0

git:master:9a94930a: smsops: short reference section about variables
by Daniel-Constantin Mierla 28 Mar '24

28 Mar '24

Module: kamailio Branch: master Commit: 9a94930ae1168d5df79e3dc1414841cdf23a2eba URL: https://github.com/kamailio/kamailio/commit/9a94930ae1168d5df79e3dc1414841c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-28T08:31:05+01:00 smsops: short reference section about variables --- Modified: src/modules/smsops/doc/smsops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9a94930ae1168d5df79e3dc1414841c… Patch: https://github.com/kamailio/kamailio/commit/9a94930ae1168d5df79e3dc1414841c… --- diff --git a/src/modules/smsops/doc/smsops_admin.xml b/src/modules/smsops/doc/smsops_admin.xml index fa19ebfc79c..da95e37c012 100644 --- a/src/modules/smsops/doc/smsops_admin.xml +++ b/src/modules/smsops/doc/smsops_admin.xml @@ -95,5 +95,19 @@ smsdump(); </section> </section> + <section> + <title>Variables</title> + <para>Several variables are exported by the module to access the + attributes of the SMS.</para> + <itemizedlist> + <listitem> + <para><emphasis>$smsack</emphasis></para> + <para><emphasis>$smsbody</emphasis></para> + <para><emphasis>$rpdata(key)</emphasis></para> + <para><emphasis>$tpdu(key)</emphasis></para> + </listitem> + </itemizedlist> + </section> + </chapter>

1 0

[kamailio/kamailio] Kamailio 5.7 TLS fail to compile (Issue #3796)
by iliesh 27 Mar '24

27 Mar '24

### Description Unable to upgrade Kamailio 5.7 on CentOS7 Error: ``` tls_mod.c: In function ‘fork_child’: tls_mod.c:348:2: error: ‘for’ loop initial declarations are only allowed in C99 mode for(int k = 0; k < 16; k++) { ^ tls_mod.c:348:2: note: use option -std=c99 or -std=gnu99 to compile your code make[2]: *** [tls_mod.o] Error 1 make[1]: *** [modules] Error 1 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` Current installed version: ``` version: kamailio 5.7.4 (x86_64/linux) 2e6e87 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3796 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3796(a)github.com>

3 3

[kamailio/kamailio] Fix 'for' loop initial declarations error (PR #3797)
by Xenofon Karamanos 27 Mar '24

27 Mar '24

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3796 (replace XXXX with an open issue number) #### Description  This PR fixes the compiles error regarding initial declarations in `for` loops You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3797 -- Commit Summary -- * tls: Fix ‘for’ loop initial declarations error * file_out: FIx ‘for’ loop initial declarations error -- File Changes -- M src/modules/file_out/file_out.c (11) M src/modules/tls/tls_mod.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3797.patch https://github.com/kamailio/kamailio/pull/3797.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3797 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3797(a)github.com>

1 1

git:master:ae04ccac: file_out: FIx âforâ loop initial declarations error
by Xenofon Karamanos 27 Mar '24

27 Mar '24

Module: kamailio Branch: master Commit: ae04ccac92225a1e7b573a28ded555789e8604cd URL: https://github.com/kamailio/kamailio/commit/ae04ccac92225a1e7b573a28ded5557… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-27T18:08:20+02:00 file_out: FIx ��for�� loop initial declarations error --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/ae04ccac92225a1e7b573a28ded5557… Patch: https://github.com/kamailio/kamailio/commit/ae04ccac92225a1e7b573a28ded5557… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 886f01f944f..a13d3531dde 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -100,6 +100,7 @@ struct module_exports exports = { static int mod_init(void) { + int i = 0; LM_DBG("initializing\n"); LM_DBG("base_folder = %.*s\n", fo_base_folder.len, fo_base_folder.s); @@ -121,7 +122,7 @@ static int mod_init(void) *fo_number_of_files = fo_count_assigned_files(); /* Fixup the prefix */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { str s; s.s = fo_files[i].fo_prefix.s; s.len = fo_files[i].fo_prefix.len; @@ -139,7 +140,7 @@ static int mod_init(void) } /* Initialize per process vars */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { fo_files[i].fo_stored_timestamp = time(NULL); } @@ -156,6 +157,7 @@ static int mod_init(void) static int child_init(int rank) { int pid; + int i = 0; if(rank != PROC_MAIN) { return 0; } @@ -172,7 +174,7 @@ static int child_init(int rank) return -1; /* Initialize and open files */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { fo_init_file(i); } @@ -194,7 +196,8 @@ static int child_init(int rank) static void destroy(void) { int result = 0; - for(int i = 0; i < *fo_number_of_files; i++) { + int i = 0; + for(i = 0; i < *fo_number_of_files; i++) { result = fo_file_properties_destroy(&fo_files[i]); if(result < 0) { LM_ERR("Failed to destroy file properties\n");

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024