sr-dev June 2023

sr-dev@lists.kamailio.org

10 participants
309 discussions

git:master:d9d4ef01: jansson: reformat kemi exports for kemdocs.py tool
by Daniel-Constantin Mierla 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: d9d4ef011c9ee4f9c664ad945b36197a98efa9cd URL: https://github.com/kamailio/kamailio/commit/d9d4ef011c9ee4f9c664ad945b36197… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T10:03:06+02:00 jansson: reformat kemi exports for kemdocs.py tool --- Modified: src/modules/jansson/jansson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d9d4ef011c9ee4f9c664ad945b36197… Patch: https://github.com/kamailio/kamailio/commit/d9d4ef011c9ee4f9c664ad945b36197… --- diff --git a/src/modules/jansson/jansson_mod.c b/src/modules/jansson/jansson_mod.c index 17bf8aefd8f..820a5492574 100644 --- a/src/modules/jansson/jansson_mod.c +++ b/src/modules/jansson/jansson_mod.c @@ -250,12 +250,17 @@ static int ki_jansson_get(sip_msg_t *msg, str *spath, str *sdoc, str *spv) /** * */ +/* clang-format off */ static sr_kemi_t sr_kemi_jansson_exports[] = { - {str_init("jansson"), str_init("get"), SR_KEMIP_INT, ki_jansson_get, - {SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, + { str_init("jansson"), str_init("get"), + SR_KEMIP_INT, ki_jansson_get, + {SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, - {{0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0}}}; + { {0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0} } +}; +/* clang-format on */ /** *

1 0

[kamailio/kamailio] mqueue: no support for db_text (Issue #3474)
by Ovidiu Sas 12 Jun '23

12 Jun '23

### Description If mqueue is configured to use db_text, kamailio will not start. #### Reproduction Here's a simple config that will expose the issue: ``` loadmodule "xlog.so" loadmodule "db_text.so" loadmodule "mqueue.so" modparam("mqueue", "db_url", "text:///usr/local/etc/kamailio/dbtext") modparam("mqueue", "mqueue", "name=mqueue_dbtext;dbmode=1") # ------------------------- request routing logic ------------------- # main routing logic route{ xlog("\n"); } ``` Content of the dbtext file: ``` $ cat /usr/local/etc/kamailio/dbtext/mqueue_dbtext id(int,auto) key(string) val(string) ``` #### Log Messages ``` May 31 23:07:47 asrock kamailio: INFO: mqueue [mqueue_mod.c:247]: mq_param(): mqueue param: [mqueue_dbtext|1|0] May 31 23:07:47 asrock kamailio: DEBUG: <core> [core/sr_module.c:752]: find_mod_export_record(): found export of <db_bind_api> in module db_text [/home/osas/src/kamailio/src/modules/db_text/db_text.so] May 31 23:07:47 asrock kamailio: DEBUG: <core> [db.c:210]: db_bind_mod(): using db bind api for db_text May 31 23:07:47 asrock kamailio: DEBUG: db_text [dbt_base.c:54]: dbt_init(): initializing for db url: [text:///usr/local/etc/kamailio/dbtext] May 31 23:07:47 asrock kamailio: ERROR: db_text [dbt_lib.c:111]: dbt_cache_get_db(): dbtext cache is not initialized! Check if you loaded dbtext before any other module that uses it May 31 23:07:47 asrock kamailio: ERROR: db_text [dbt_base.c:97]: dbt_init(): cannot get the link to database May 31 23:07:47 asrock kamailio: ERROR: mqueue [mqueue_db.c:67]: mqueue_db_open_con(): failed to connect to the database May 31 23:07:47 asrock kamailio: ERROR: mqueue [mqueue_db.c:101]: mqueue_db_load_queue(): no db connection May 31 23:07:47 asrock kamailio: ERROR: mqueue [mqueue_mod.c:251]: mq_param(): error loading mqueue: mqueue_dbtext from DB May 31 23:07:47 asrock kamailio: CRITICAL: <core> [core/cfg.y:3903]: yyerror_at(): parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 18, column 61: Can't set module parameter ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3474 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3474(a)github.com>

1 1

git:master:848d5538: mqueue: fix support for db_text
by Ovidiu Sas 12 Jun '23

12 Jun '23

Module: kamailio Branch: master Commit: 848d55388dda0c135820d9f24950561946249bbc URL: https://github.com/kamailio/kamailio/commit/848d55388dda0c135820d9f24950561… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-06-12T00:24:15-04:00 mqueue: fix support for db_text - db_operations are safe only after db mod_init() - closes #3474 --- Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/848d55388dda0c135820d9f24950561… Patch: https://github.com/kamailio/kamailio/commit/848d55388dda0c135820d9f24950561… --- diff --git a/src/modules/mqueue/mqueue_mod.c b/src/modules/mqueue/mqueue_mod.c index 912a36b33bb..d51b65f5d19 100644 --- a/src/modules/mqueue/mqueue_mod.c +++ b/src/modules/mqueue/mqueue_mod.c @@ -101,6 +101,8 @@ struct module_exports exports = { */ static int mod_init(void) { + mq_head_t *mh = mq_head_get(NULL); + if(!mq_head_defined()) LM_WARN("no mqueue defined\n"); @@ -109,6 +111,17 @@ static int mod_init(void) return 1; } + while(mh != NULL) { + if (mh->dbmode == 1 || mh->dbmode == 2) { + if(mqueue_db_load_queue(&(mh->name)) < 0) { + LM_ERR("error loading mqueue: %.*s from DB\n", + mh->name.len, mh->name.s); + return 1; + } + } + mh = mh->next; + } + return 0; } @@ -245,13 +258,6 @@ int mq_param(modparam_t type, void *val) } LM_INFO("mqueue param: [%.*s|%d|%d]\n", qname.len, qname.s, dbmode, addmode); - if(dbmode == 1 || dbmode == 2) { - if(mqueue_db_load_queue(&qname) < 0) { - LM_ERR("error loading mqueue: %.*s from DB\n", qname.len, qname.s); - free_params(params_list); - return -1; - } - } mq_set_dbmode(&qname, dbmode); free_params(params_list); return 0;

1 0

git:5.6:a24659dc: pv: exported {val} transformation
by Daniel-Constantin Mierla 03 Jun '23

03 Jun '23

Module: kamailio Branch: 5.6 Commit: a24659dc380e05fa2b6715ade62c341ad0307c4b URL: https://github.com/kamailio/kamailio/commit/a24659dc380e05fa2b6715ade62c341… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-02T21:29:45+02:00 pv: exported {val} transformation (cherry picked from commit 79b82198075250420cb08d6b5fd5b100ff672606) (cherry picked from commit 1c23c2ff23b5c25c943856f5064739794d71bc7f) --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/a24659dc380e05fa2b6715ade62c341… Patch: https://github.com/kamailio/kamailio/commit/a24659dc380e05fa2b6715ade62c341… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index cdd34ce5b95..2cef71b8a37 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -61,6 +61,8 @@ static tr_export_t mod_trans[] = { tr_parse_line }, { {"urialias", sizeof("urialias")-1}, /* uri alias class */ tr_parse_urialias }, + {{"val", sizeof("val") - 1}, /* val class */ + tr_parse_val}, { { 0, 0 }, 0 } };

1 0

git:5.7:1c23c2ff: pv: exported {val} transformation
by Daniel-Constantin Mierla 02 Jun '23

02 Jun '23

Module: kamailio Branch: 5.7 Commit: 1c23c2ff23b5c25c943856f5064739794d71bc7f URL: https://github.com/kamailio/kamailio/commit/1c23c2ff23b5c25c943856f50647397… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-02T21:27:55+02:00 pv: exported {val} transformation (cherry picked from commit 79b82198075250420cb08d6b5fd5b100ff672606) --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/1c23c2ff23b5c25c943856f50647397… Patch: https://github.com/kamailio/kamailio/commit/1c23c2ff23b5c25c943856f50647397… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index eda72107255..2d779ce2127 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -62,6 +62,8 @@ static tr_export_t mod_trans[] = { tr_parse_line }, { {"urialias", sizeof("urialias")-1}, /* uri alias class */ tr_parse_urialias }, + {{"val", sizeof("val") - 1}, /* val class */ + tr_parse_val}, { { 0, 0 }, 0 } };

1 0

git:master:79b82198: pv: exported {val} transformation
by Daniel-Constantin Mierla 02 Jun '23

02 Jun '23

Module: kamailio Branch: master Commit: 79b82198075250420cb08d6b5fd5b100ff672606 URL: https://github.com/kamailio/kamailio/commit/79b82198075250420cb08d6b5fd5b10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-02T21:23:30+02:00 pv: exported {val} transformation --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/79b82198075250420cb08d6b5fd5b10… Patch: https://github.com/kamailio/kamailio/commit/79b82198075250420cb08d6b5fd5b10… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 9e1014db17a..3a905593dc7 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -61,6 +61,8 @@ static tr_export_t mod_trans[] = {{{"s", sizeof("s") - 1}, /* string class */ tr_parse_line}, {{"urialias", sizeof("urialias") - 1}, /* uri alias class */ tr_parse_urialias}, + {{"val", sizeof("val") - 1}, /* val class */ + tr_parse_val}, {{0, 0}, 0}};

1 0

[kamailio/kamailio] Adding SSL support to db_redis and ndb_redis (PR #3345)
by joelbax 02 Jun '23

02 Jun '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, ...) - [ ] 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 A couple of commit (1 per each module) adding SSL support to db_redis and ndb_redis. This mainly includes checking if proper parameter is provided (for ndb_redis it is `ssl` option in the DB URL and, for db_redis, a new `opt_ssl` parameter) and create a temporary SSL context that is used to initialise the redis context. db_redis is also updated with another parameter to provide a DB access password. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3345 -- Commit Summary -- * db_redis: Adding SSL support * ndb_redis: Adding SSL support -- File Changes -- M src/modules/db_redis/Makefile (8) M src/modules/db_redis/db_redis_mod.c (5) M src/modules/db_redis/redis_connection.c (43) M src/modules/db_redis/redis_connection.h (2) M src/modules/ndb_redis/Makefile (6) M src/modules/ndb_redis/redis_client.c (47) M src/modules/ndb_redis/redis_client.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3345.patch https://github.com/kamailio/kamailio/pull/3345.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3345 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3345(a)github.com>

3 18

git:master:bc82f893: modules: readme files regenerated - ims_usrloc_scscf ... [skip ci]
by Kamailio Dev 01 Jun '23

01 Jun '23

Module: kamailio Branch: master Commit: bc82f8938a779dc5835079e0477b5970287c49e9 URL: https://github.com/kamailio/kamailio/commit/bc82f8938a779dc5835079e0477b597… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-01T13:46:22+02:00 modules: readme files regenerated - ims_usrloc_scscf ... [skip ci] --- Modified: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/bc82f8938a779dc5835079e0477b597… Patch: https://github.com/kamailio/kamailio/commit/bc82f8938a779dc5835079e0477b597… --- diff --git a/src/modules/ims_usrloc_scscf/README b/src/modules/ims_usrloc_scscf/README index 384d9ee6742..d128b226b00 100644 --- a/src/modules/ims_usrloc_scscf/README +++ b/src/modules/ims_usrloc_scscf/README @@ -39,7 +39,7 @@ Yasin Caner 3.11. matching_mode (int) 3.12. cseq_delay (int) 3.13. fetch_rows(int) - 3.14. hash_size (string) + 3.14. hash_size (int) 3.15. subs_hash_size (int) 3.16. contacts_hash_size (integer) 3.17. nat_bflag (integer) @@ -108,7 +108,7 @@ Chapter 1. Admin Guide 3.11. matching_mode (int) 3.12. cseq_delay (int) 3.13. fetch_rows(int) - 3.14. hash_size (string) + 3.14. hash_size (int) 3.15. subs_hash_size (int) 3.16. contacts_hash_size (integer) 3.17. nat_bflag (integer) @@ -157,7 +157,7 @@ Chapter 1. Admin Guide 3.11. matching_mode (int) 3.12. cseq_delay (int) 3.13. fetch_rows(int) - 3.14. hash_size (string) + 3.14. hash_size (int) 3.15. subs_hash_size (int) 3.16. contacts_hash_size (integer) 3.17. nat_bflag (integer) @@ -315,7 +315,7 @@ st/scscf") ... modparam("ims_usrloc_scscf", "fetch_rows", 3000) -3.14. hash_size (string) +3.14. hash_size (int) The number of entries of the hash table used by usrloc

1 0

git:master:1217c909: ims_usrloc_scscf: docs - type int for hash_size parameter
by Daniel-Constantin Mierla 01 Jun '23

01 Jun '23

Module: kamailio Branch: master Commit: 1217c9098bc8790e659959a7df97e441e84b54ff URL: https://github.com/kamailio/kamailio/commit/1217c9098bc8790e659959a7df97e44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-01T13:39:47+02:00 ims_usrloc_scscf: docs - type int for hash_size parameter --- Modified: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1217c9098bc8790e659959a7df97e44… Patch: https://github.com/kamailio/kamailio/commit/1217c9098bc8790e659959a7df97e44… --- diff --git a/src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml b/src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml index fc8400c5f6d..1e3d58ae5a5 100644 --- a/src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml +++ b/src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml @@ -231,7 +231,7 @@ </example> </section> <section id="ims_usrloc_scscf.p.hash_size"> - <title>hash_size (string)</title> + <title>hash_size (int)</title> <para>The number of entries of the hash table used by usrloc </para> <para><emphasis> Default value 512</emphasis></para> <example>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2023