sr-dev May 2022

sr-dev@lists.kamailio.org

12 participants
288 discussions

Info: converting dokuwiki content to markdown files
by Daniel-Constantin Mierla 09 May '22

09 May '22

Hello, it was discussed a couple of times during the past Kamailio development meetings and several days ago the works started to convert the Kamailio Wiki content to markdown format and host the files on Kamailio github.com organisation. The Dokuwiki engine has served us very well during more than a decade and a half, but open editing had to be disabled many years ago due to bad actors pushing inappropriate content. The contributors had to make a dedicated account on our portal only for Wiki editing. More recently we had add another layer of protection requiring to grant manually edit permissions to newly created wiki accounts because bots started to work around CAPTCHA and other security extensions, posting again inappropriate content. All these added to operational overhead, but also made it difficult for new people to contribute, specially for small editing to fix typos or add usage examples. Thanks to Kenneth Stowe, who undertook the first big effort of converting the Dowkuwiki files to markdown format, we are now in the position of moving further with the plans of using github for hosting the content of the wiki and enable easier contributions via pull requests. The history of changes done via Dokuwiki show up now as git commits. The github repository for the wiki content is available at: * https://github.com/kamailio/kamailio-wiki It is still work in progress, therefore we ask for the help of community to speed up the conversion, among the tasks that need to be done: * convert relative links between wiki pages – the conversion tools used relative paths without file extensions, like: [Install Kamailio v4.4.x From GIT](/install/4.4.x/git) They have to be converted to relative path with .md extension in order to be able to browse directly :n the github.com portal — practically the leading / has to be removed and .md added at the end, like: [Install Kamailio v4.4.x From GIT](install/4.4.x/git.md) * some section heading markers were not detected/converted, onee may notice many equal signs (=) around a section name, it has to be replaced with the appropriate markdown format based on hash signs (#). For example: ======= Install And Maintain Kamailio v4.4.x From GIT ======= Should be converted to: # Install And Maintain Kamailio v4.4.x From GIT * some Dokuwiki paragraphs used special formatting based on plugins, for example the notes, warnings, … had special colors. The common markdown format does not specify a syntax to color the text, the propose solution is to use emoji at the start of the paragraph to signal its special purpose. For example, the Dokuwiki content: <color blue>//IMPORTANT: Content for older releases than 3.2.0 is available at the **Old Wiki Site**://</color> Has to be transformed to: :fire:*IMPORTANT: Content for older releases than 3.2.0 is available at the **Old Wiki Site**:* You are welcome to propose a better syntax for this kind of transformation. * review config examples and evaluate what improvements can be done (e.g., in terms of formatting and syntax highlighting) Any of these changes do not require any C programming knowledge, nor much Kamailio config knowledge. Can be your first contribution to the project and it will be very appreciated. It can also help you learn more about Kamailio, because you may discover documentation that you were not aware of. A very important decision is how to present the wiki markdown content on kamailio.org website. Besides being able to see it on github repository, we want to process the markdown pages somehow and make them available in html format on kamailio.org website for easier navigation and better indexing (e.g., with tables of content for large pages). If you are aware of a suitable cli or web app that can convert markdown to html and generate table of content, let us know. Any questions and suggestions should be addressed to sr-users(a)lists.kamailio.org mailing list. Looking forward to your contributions on this community effort! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:master:2e38d1a5: mtree: remove single-used small function
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 2e38d1a5a1178ca437d5256d7619fee251b06d6f URL: https://github.com/kamailio/kamailio/commit/2e38d1a5a1178ca437d5256d7619fee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T11:19:16+02:00 mtree: remove single-used small function --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2e38d1a5a1178ca437d5256d7619fee… Patch: https://github.com/kamailio/kamailio/commit/2e38d1a5a1178ca437d5256d7619fee… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 8c703f3531..66f72bbd02 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -318,18 +318,6 @@ static int mod_init(void) return -1; } -static int mt_child_init(void) -{ - db_con = mt_dbf.init(&db_url); - if(db_con==NULL) - { - LM_ERR("failed to connect to database\n"); - return -1; - } - - return 0; -} - /* each child get a new connection to the database */ static int child_init(int rank) @@ -338,9 +326,12 @@ static int child_init(int rank) if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) return 0; - if ( mt_child_init()!=0 ) + db_con = mt_dbf.init(&db_url); + if(db_con==NULL) + { + LM_ERR("failed to connect to database\n"); return -1; - + } LM_DBG("#%d: database connection opened successfully\n", rank); return 0; @@ -942,7 +933,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) } rpc->rpl_printf(c, "Ok. Mtrees reloaded."); return; - } + } if(!mt_defined_trees()) { rpc->fault(c, 500, "No Mtrees defined.");

1 0

git:master:1ff86ffc: dialog: open db connection in POSTCHILDINIT callback for DB_MODE_SHUTDOWN
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 1ff86ffceede46c7a67fec92c8319c34c916a545 URL: https://github.com/kamailio/kamailio/commit/1ff86ffceede46c7a67fec92c8319c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T09:16:49+02:00 dialog: open db connection in POSTCHILDINIT callback for DB_MODE_SHUTDOWN --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/1ff86ffceede46c7a67fec92c8319c3… Patch: https://github.com/kamailio/kamailio/commit/1ff86ffceede46c7a67fec92c8319c3… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 08f0a85882..4d30b2748f 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -738,6 +738,10 @@ static int mod_init(void) return -1; } + if(dlg_db_mode==DB_MODE_SHUTDOWN) { + ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT); + } + return 0; } @@ -777,9 +781,9 @@ static int child_init(int rank) } } - if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) && - (rank>0 || rank==PROC_TIMER || rank==PROC_RPC)) || - (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) ) { + if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) + && (rank>0 || rank==PROC_TIMER || rank==PROC_RPC)) + || (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_POSTCHILDINIT)) ) { if ( dlg_connect_db(&db_url) ) { LM_ERR("failed to connect to database (rank=%d)\n",rank); return -1;

1 0

git:master:4780d469: usrloc: connect to db for main process in PROC_POSTCHILDINIT child init
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 4780d46976a7a392f23af0d89f05855d473bcb30 URL: https://github.com/kamailio/kamailio/commit/4780d46976a7a392f23af0d89f05855… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T09:05:18+02:00 usrloc: connect to db for main process in PROC_POSTCHILDINIT child init --- Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4780d46976a7a392f23af0d89f05855… Patch: https://github.com/kamailio/kamailio/commit/4780d46976a7a392f23af0d89f05855… --- diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index d60162ed3e..797c252b85 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -358,6 +358,16 @@ static int mod_init(void) } /* Shall we use database ? */ + switch (ul_db_mode) { + case DB_ONLY: + case WRITE_THROUGH: + case WRITE_BACK: + /* + * register the need to be called post-fork of all children + * with the special rank PROC_POSTCHILDINIT + */ + ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT); + } if (ul_db_mode != NO_DB) { /* Yes */ if (db_bind_mod(&ul_db_url, &ul_dbf) < 0) { /* Find database module */ LM_ERR("failed to bind database module\n"); @@ -452,14 +462,14 @@ static int child_init(int _rank) case WRITE_THROUGH: /* connect to db only from SIP workers, TIMER and MAIN processes, * and RPC processes */ - if (_rank<=0 && _rank!=PROC_TIMER && _rank!=PROC_MAIN + if (_rank<=0 && _rank!=PROC_TIMER && _rank!=PROC_POSTCHILDINIT && _rank!=PROC_RPC) return 0; break; case WRITE_BACK: /* connect to db only from TIMER (for flush), from MAIN (for * final flush() and from child 1 for preload */ - if (_rank!=PROC_TIMER && _rank!=PROC_MAIN && _rank!=PROC_SIPINIT) + if (_rank!=PROC_TIMER && _rank!=PROC_POSTCHILDINIT && _rank!=PROC_SIPINIT) return 0; break; case DB_READONLY:

1 0

git:master:c5da175f: app_squirrel: updated squirrel interpreter to latest git version (3.2+)
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: c5da175fd79ecd17752bb2fd8af2b5a65739e58e URL: https://github.com/kamailio/kamailio/commit/c5da175fd79ecd17752bb2fd8af2b5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T08:36:19+02:00 app_squirrel: updated squirrel interpreter to latest git version (3.2+) --- Modified: src/modules/app_sqlang/squirrel/include/squirrel.h Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdblob.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdio.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstream.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqapi.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqclass.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqclass.h Modified: src/modules/app_sqlang/squirrel/squirrel/sqcompiler.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqstring.h Modified: src/modules/app_sqlang/squirrel/squirrel/sqtable.h Modified: src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqvm.h --- Diff: https://github.com/kamailio/kamailio/commit/c5da175fd79ecd17752bb2fd8af2b5a… Patch: https://github.com/kamailio/kamailio/commit/c5da175fd79ecd17752bb2fd8af2b5a…

1 0

git:master:3bd6eb0d: app_jsdt: duktape interpreter upgraded to v2.7.0
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 3bd6eb0d7322b9f4654656b3f0b5080cd44c6e5b URL: https://github.com/kamailio/kamailio/commit/3bd6eb0d7322b9f4654656b3f0b5080… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T08:36:18+02:00 app_jsdt: duktape interpreter upgraded to v2.7.0 --- Modified: src/modules/app_jsdt/duk_config.h Modified: src/modules/app_jsdt/duktape.c Modified: src/modules/app_jsdt/duktape.h --- Diff: https://github.com/kamailio/kamailio/commit/3bd6eb0d7322b9f4654656b3f0b5080… Patch: https://github.com/kamailio/kamailio/commit/3bd6eb0d7322b9f4654656b3f0b5080…

1 0

git:master:a21c929a: userblocklist: fix function comment, related to gh #3102
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: a21c929a389c6e5f85e9166d01adb0d474c6ebaf URL: https://github.com/kamailio/kamailio/commit/a21c929a389c6e5f85e9166d01adb0d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T15:33:56Z userblocklist: fix function comment, related to gh #3102 --- Modified: src/modules/userblocklist/db_userblocklist.c --- Diff: https://github.com/kamailio/kamailio/commit/a21c929a389c6e5f85e9166d01adb0d… Patch: https://github.com/kamailio/kamailio/commit/a21c929a389c6e5f85e9166d01adb0d… --- diff --git a/src/modules/userblocklist/db_userblocklist.c b/src/modules/userblocklist/db_userblocklist.c index e857178f25..0377761ab3 100644 --- a/src/modules/userblocklist/db_userblocklist.c +++ b/src/modules/userblocklist/db_userblocklist.c @@ -61,7 +61,7 @@ void userblocklist_db_close(void) { /*! - * Initialises the DB API, check the table version and closes the connection. + * Initialises the DB API and check the table version. * This should be called from the mod_init function. * * \return 0 means ok, -1 means an error occurred.

1 0

[kamailio/kamailio] userblocklist: fix restart errors (PR #3102)
by Stefan Mititelu 08 May '22

08 May '22

#### 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  Spotted this ERRORs on kamailio restart: ``` ERROR: <core> [db.c:481]: db_use_table(): invalid connection parameter ERROR: userblocklist [db.c:123]: db_reload_source(): cannot use db table 'globalblocklist' ERROR: userblocklist [userblocklist.c:425]: load_source(): cannot load source from 'globalblocklist ``` Debugging it further, seen that the above ERRORs appear on ```check_allowlist()``` function fixup. This was happening because db connection is closed in mod_init and re-done in child_init. But the fixups happen before child_init and they need db connection. Decided to not close the db connection after mod_init because they are later, first closed and then re-opened, in each child. Figured out this fix after checked where each function of db_userblocklist.c is used. ERRORs no longer appear on restart. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3102 -- Commit Summary -- * userblocklist: fix restart errors -- File Changes -- M src/modules/userblocklist/db_userblocklist.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3102.patch https://github.com/kamailio/kamailio/pull/3102.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3102 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3102(a)github.com>

2 2

git:master:778374ab: userblocklist: fix restart errors
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 778374aba27d81058869dba18b5dd0833893056a URL: https://github.com/kamailio/kamailio/commit/778374aba27d81058869dba18b5dd08… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:32:12+02:00 userblocklist: fix restart errors --- Modified: src/modules/userblocklist/db_userblocklist.c --- Diff: https://github.com/kamailio/kamailio/commit/778374aba27d81058869dba18b5dd08… Patch: https://github.com/kamailio/kamailio/commit/778374aba27d81058869dba18b5dd08… --- diff --git a/src/modules/userblocklist/db_userblocklist.c b/src/modules/userblocklist/db_userblocklist.c index 47469f5adc..e857178f25 100644 --- a/src/modules/userblocklist/db_userblocklist.c +++ b/src/modules/userblocklist/db_userblocklist.c @@ -91,7 +91,6 @@ int userblocklist_db_init(void) { userblocklist_db_close(); return -1; } - userblocklist_db_close(); return 0; }

1 0

git:master:97efd6a6: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 97efd6a64380025f3b4ef45372180f7e61448c1c URL: https://github.com/kamailio/kamailio/commit/97efd6a64380025f3b4ef45372180f7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-08T17:31:17+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/ldap/README --- Diff: https://github.com/kamailio/kamailio/commit/97efd6a64380025f3b4ef45372180f7… Patch: https://github.com/kamailio/kamailio/commit/97efd6a64380025f3b4ef45372180f7… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 7c31188ac7..878623d24f 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -1129,7 +1129,7 @@ modparam("acc", "cdr_start_on_confirmed", 1) 6.34. cdr_facility (integer) Log facility to which CDR messages are issued to syslog. This allows to - easily seperate CDR-specific logging from the other log messages. + easily separate CDR-specific logging from the other log messages. Default value is LOG_DAEMON. diff --git a/src/modules/ldap/README b/src/modules/ldap/README index c7555ca3c6..921f45822f 100644 --- a/src/modules/ldap/README +++ b/src/modules/ldap/README @@ -533,7 +533,7 @@ ldap_result("telephoneNumber/$avp(s:tel_number)"); AVP. It can be either str for string, or int for integer. If avp_type is specified as int then ldap_result tries to convert the LDAP attribute values to integer. In this case, the values are only stored - as AVP if the conversion to integer is succesfull. + as AVP if the conversion to integer is successful. Function Parameters:

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2022