sr-dev May 2022

sr-dev@lists.kamailio.org

12 participants
286 discussions

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

[kamailio/kamailio] Fix typos (PR #3103)
by Bastian Triller 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fix typos. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3103 -- Commit Summary -- * doc: Fix typos * pkg: Fix typos * core: Fix typos * lib: Fix typos * acc: Fix typos * auth: Fix typos * ctl: Fix typos * ldap: Fix typos * pike: Fix typos * sanity: Fix typos * tls: Fix typos * uid_auth_db: Fix typos * utils: Fix typos -- File Changes -- M doc/misc/NEWS (2) M doc/tutorials/locking.txt (4) M pkg/kamailio/deb/bionic/rules (2) M pkg/kamailio/deb/bookworm/rules (2) M pkg/kamailio/deb/bullseye/rules (2) M pkg/kamailio/deb/buster/rules (2) M pkg/kamailio/deb/debian/rules (2) M pkg/kamailio/deb/focal/rules (2) M pkg/kamailio/deb/jessie/rules (2) M pkg/kamailio/deb/precise/rules (2) M pkg/kamailio/deb/sid/rules (2) M pkg/kamailio/deb/stretch/rules (2) M pkg/kamailio/deb/trusty/rules (2) M pkg/kamailio/deb/wheezy/rules (2) M pkg/kamailio/deb/xenial/rules (2) M src/core/atomic/atomic_mips2.h (2) M src/core/dns_cache.c (4) M src/core/forward.c (2) M src/core/resolve.c (4) M src/core/tcp_main.c (10) M src/lib/cds/dstring.h (2) M src/lib/srdb1/schema/uid_credentials.xml (2) M src/lib/srdb2/db_cmd.c (4) M src/lib/srdb2/schema/credentials.xml (2) M src/modules/acc/doc/acc_admin.xml (2) M src/modules/auth/challenge.c (2) M src/modules/auth/nonce.c (12) M src/modules/ctl/binrpc.h (4) M src/modules/ldap/doc/ldap_admin.xml (2) M src/modules/pike/ip_tree.c (2) M src/modules/sanity/sanity.c (2) M src/modules/sanity/sanity.h (2) M src/modules/tls/tls_server.c (2) M src/modules/uid_auth_db/authorize.c (2) M utils/kamctl/kamdbctl.pgsql (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3103.patch https://github.com/kamailio/kamailio/pull/3103.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3103 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3103(a)github.com>

2 2

git:master:c282b581: utils: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: c282b5812c9e9badb4c99fe8ce3bd5cce927044f URL: https://github.com/kamailio/kamailio/commit/c282b5812c9e9badb4c99fe8ce3bd5c… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 utils: Fix typos --- Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/c282b5812c9e9badb4c99fe8ce3bd5c… Patch: https://github.com/kamailio/kamailio/commit/c282b5812c9e9badb4c99fe8ce3bd5c… --- diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index fa1fe1ada8..1eb5d88d2b 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -20,7 +20,7 @@ # 2006-10-19 Added address table (bogdan) # 2006-10-27 subscriber table cleanup; some columns are created only if # serweb is installed (bogdan) -# 2007-01-26 added seperate installation routine for presence related tables +# 2007-01-26 added separate installation routine for presence related tables # and fix permissions for the SERIAL sequences. # 2007-05-21 Move SQL database definitions out of this script (henning) # 2007-05-31 Move common definitions to kamdbctl.base file (henningw)

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