sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
233 discussions

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

by vlitvinov

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When we use DNS failover in case of timeout kamailio executes the branch_failure route. In the case of the 503 - on_reply route. This commit is to equate behavior in both cases. So if there are more candidates we will always execute branch_failure route and on_reply route only if this is the last candidate. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3138 -- Commit Summary -- * branch_failure route in case 503 and dns failover -- File Changes -- M src/modules/tm/t_reply.c (52) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3138.patch https://github.com/kamailio/kamailio/pull/3138.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3138 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3138(a)github.com>

1 month, 1 week

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

by Harish S

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

1 month, 1 week

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

by Daniel-Constantin Mierla

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

1 month, 1 week

git:master:1c3ae81d: http_client: replaced local fixup with core helpers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1c3ae81d904db99de9398d49af1bf6c5f47a4d74 URL: https://github.com/kamailio/kamailio/commit/1c3ae81d904db99de9398d49af1bf6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-29T23:08:07+01:00 http_client: replaced local fixup with core helpers --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/1c3ae81d904db99de9398d49af1bf6c… Patch: https://github.com/kamailio/kamailio/commit/1c3ae81d904db99de9398d49af1bf6c…

1 month, 1 week

git:master:2063993c: core: added fixup_spve1_pvar() helper

by Daniel-Constantin Mierla

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 month, 1 week

git:5.8:613e2cdf: file_out: FIx âforâ loop initial declarations error

by Xenofon Karamanos

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 month, 1 week

git:5.8:f4d44a92: tls: Fix âforâ loop initial declarations error

by Xenofon Karamanos

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 month, 1 week

[kamailio/kamailio] sipdump.enable will not dump (Issue #3798)

by 53c70r

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>

1 month, 1 week

git:master:44a876a6: modules: readme files regenerated - smsops ... [skip ci]

by Kamailio Dev

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 month, 1 week

git:master:e39557c9: blst: reformat exported structures

by Daniel-Constantin Mierla

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 month, 1 week

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024