sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

git:master:c4105a18: db_cluster: docs updates about insert-async support

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c4105a1882582f1a7d4315f419adc4ed3025e809 URL: https://github.com/kamailio/kamailio/commit/c4105a1882582f1a7d4315f419adc4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-10T18:22:27+01:00 db_cluster: docs updates about insert-async support --- Modified: src/modules/db_cluster/doc/db_cluster_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c4105a1882582f1a7d4315f419adc4e… Patch: https://github.com/kamailio/kamailio/commit/c4105a1882582f1a7d4315f419adc4e… --- diff --git a/src/modules/db_cluster/doc/db_cluster_admin.xml b/src/modules/db_cluster/doc/db_cluster_admin.xml index eb1e8bc489..9d3da2393a 100644 --- a/src/modules/db_cluster/doc/db_cluster_admin.xml +++ b/src/modules/db_cluster/doc/db_cluster_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -26,8 +26,13 @@ </para> <para> The following database commands are considered to be write operations: - INSERT, DELETE, UPDATE, REPLACE, INSERT-DELAYED, INSERT-UPDATE. The - read operations are done for database commands: QUERY and RAW-QUERY. + INSERT, DELETE, UPDATE, REPLACE, INSERT-DELAYED, INSERT-UPDATE, + INSERT-ASYNC. The read operations are done for database commands: + QUERY and RAW-QUERY. + </para> + <para> + Note: if INSERT-ASYNC is not implemented by DB connector module, then + standard INSERT operation is done. </para> </section> @@ -110,7 +115,7 @@ modparam("db_cluster", "connection", <para> <para> The first two characters is priority and mode for read, followed by - two characters for priority and mode for write operations. "p" is + two characters for priority and mode for write operations. "p" is only used for write operations. </para> <emphasis>

4 years, 8 months

git:master:0ce4310d: db_cluster: support for insert_async db api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0ce4310d8cfae43c194b7f48561dcd85fc7fdb99 URL: https://github.com/kamailio/kamailio/commit/0ce4310d8cfae43c194b7f48561dcd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-10T18:02:08+01:00 db_cluster: support for insert_async db api --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_api.h --- Diff: https://github.com/kamailio/kamailio/commit/0ce4310d8cfae43c194b7f48561dcd8… Patch: https://github.com/kamailio/kamailio/commit/0ce4310d8cfae43c194b7f48561dcd8…

4 years, 8 months

git:master:40128763: db_cluster: trailing spaces removed

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 40128763d8a987e4c64d51584f1d72872b53dff5 URL: https://github.com/kamailio/kamailio/commit/40128763d8a987e4c64d51584f1d728… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-10T16:11:14+01:00 db_cluster: trailing spaces removed --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_api.h Modified: src/modules/db_cluster/dbcl_data.c Modified: src/modules/db_cluster/dbcl_data.h --- Diff: https://github.com/kamailio/kamailio/commit/40128763d8a987e4c64d51584f1d728… Patch: https://github.com/kamailio/kamailio/commit/40128763d8a987e4c64d51584f1d728…

4 years, 8 months

git:master:3f57257c: tm: t_clean() exported to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3f57257c118ede63979d9755dd9d0d809d0cbebd URL: https://github.com/kamailio/kamailio/commit/3f57257c118ede63979d9755dd9d0d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-10T15:27:55+01:00 tm: t_clean() exported to kemi framework --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/3f57257c118ede63979d9755dd9d0d8… Patch: https://github.com/kamailio/kamailio/commit/3f57257c118ede63979d9755dd9d0d8… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index ec39c3cd49..69990200ef 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2961,6 +2961,13 @@ static int t_clean(struct sip_msg* msg, char* key, char* value) return 1; } +/* kemi function to clean active but very old transactions */ +static int ki_t_clean(sip_msg_t* msg) +{ + tm_clean_lifetime(); + return 1; +} + /** * */ @@ -3221,6 +3228,12 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_clean"), + SR_KEMIP_INT, ki_t_clean, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

4 years, 8 months

git:master:43f6a02e: modules: readme files regenerated - auth_db ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 43f6a02e45658b734988919151af8e9990b71fb6 URL: https://github.com/kamailio/kamailio/commit/43f6a02e45658b734988919151af8e9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-10T12:16:20+01:00 modules: readme files regenerated - auth_db ... [skip ci] --- Modified: src/modules/auth_db/README --- Diff: https://github.com/kamailio/kamailio/commit/43f6a02e45658b734988919151af8e9… Patch: https://github.com/kamailio/kamailio/commit/43f6a02e45658b734988919151af8e9… --- diff --git a/src/modules/auth_db/README b/src/modules/auth_db/README index 0896481c23..287f1517c5 100644 --- a/src/modules/auth_db/README +++ b/src/modules/auth_db/README @@ -50,6 +50,7 @@ Jan Janak 3.7. use_domain (integer) 3.8. load_credentials (string) 3.9. version_table (integer) + 3.10. force_generate_avps (integer) 4. Functions @@ -71,10 +72,11 @@ Jan Janak 1.7. use_domain parameter usage 1.8. load_credentials parameter usage 1.9. version_table parameter usage - 1.10. www_authorize usage - 1.11. proxy_authorize usage - 1.12. auth_check usage - 1.13. is_subscriber usage + 1.10. force_generate_avps parameter usage + 1.11. www_authorize usage + 1.12. proxy_authorize usage + 1.13. auth_check usage + 1.14. is_subscriber usage Chapter 1. Admin Guide @@ -97,6 +99,7 @@ Chapter 1. Admin Guide 3.7. use_domain (integer) 3.8. load_credentials (string) 3.9. version_table (integer) + 3.10. force_generate_avps (integer) 4. Functions @@ -145,6 +148,7 @@ Chapter 1. Admin Guide 3.7. use_domain (integer) 3.8. load_credentials (string) 3.9. version_table (integer) + 3.10. force_generate_avps (integer) 3.1. db_url (string) @@ -297,6 +301,19 @@ modparam("auth_db", "load_credentials", "$avp(i:123)=rpid;email_address") modparam("auth_db", "version_table", 0) ... +3.10. force_generate_avps (integer) + + If set to different than 0, the module will fetch user DB attributes + even if authentication failed. + + Default value is “0” (don't fetch user DB attributes if authentication + failed). + + Example 1.10. force_generate_avps parameter usage +... +modparam("auth_db", "force_generate_avps", 1) +... + 4. Functions 4.1. www_authenticate(realm, table [, method]) @@ -348,7 +365,7 @@ modparam("auth_db", "version_table", 0) This function can be used from REQUEST_ROUTE. - Example 1.10. www_authorize usage + Example 1.11. www_authorize usage ... if (!www_authorize("kamailio.org", "subscriber")) { www_challenge("kamailio.org", "1"); @@ -388,7 +405,7 @@ if (!www_authorize("kamailio.org", "subscriber")) { This function can be used from REQUEST_ROUTE. - Example 1.11. proxy_authorize usage + Example 1.12. proxy_authorize usage ... if (!proxy_authorize("$fd", "subscriber)) { proxy_challenge("$fd", "1"); # Realm will be autogenerated @@ -439,7 +456,7 @@ if (!proxy_authorize("$fd", "subscriber)) { This function can be used from REQUEST_ROUTE. - Example 1.12. auth_check usage + Example 1.13. auth_check usage ... if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "1"); @@ -472,7 +489,7 @@ if (!auth_check("$fd", "subscriber", "1")) { This function can be used from ANY_ROUTE. - Example 1.13. is_subscriber usage + Example 1.14. is_subscriber usage ... if (!is_subscriber("$ru", "subscriber", "3")) { # callee is not a local subscriber

4 years, 8 months

[kamailio/kamailio] auth_db: add force_generate_avps parameter (#2242)

by Stefan Mititelu

In order to fetch user DB attributes even when user authentication failed. Default behavior unchanged.   #### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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  Related to discussion: https://lists.kamailio.org/pipermail/sr-dev/2020-March/055912.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2242 -- Commit Summary -- * auth_db: add force_generate_avps parameter -- File Changes -- M src/modules/auth_db/auth_db_mod.c (2) M src/modules/auth_db/authorize.c (10) M src/modules/auth_db/authorize.h (2) M src/modules/auth_db/doc/auth_db_admin.xml (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2242.patch https://github.com/kamailio/kamailio/pull/2242.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2242

4 years, 8 months

git:master:e52aada2: auth_db: add force_generate_avps parameter

by Stefan Mititelu

Module: kamailio Branch: master Commit: e52aada2a9ffa87136bdc5e1fe44273e601c32b8 URL: https://github.com/kamailio/kamailio/commit/e52aada2a9ffa87136bdc5e1fe44273… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-03-10T13:11:56+02:00 auth_db: add force_generate_avps parameter In order to fetch user DB attributes even when user authentication failed. Default behavior unchanged. --- Modified: src/modules/auth_db/auth_db_mod.c Modified: src/modules/auth_db/authorize.c Modified: src/modules/auth_db/authorize.h Modified: src/modules/auth_db/doc/auth_db_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e52aada2a9ffa87136bdc5e1fe44273… Patch: https://github.com/kamailio/kamailio/commit/e52aada2a9ffa87136bdc5e1fe44273… --- diff --git a/src/modules/auth_db/auth_db_mod.c b/src/modules/auth_db/auth_db_mod.c index faea44f612..ce8baae838 100644 --- a/src/modules/auth_db/auth_db_mod.c +++ b/src/modules/auth_db/auth_db_mod.c @@ -82,6 +82,7 @@ static int version_table_check = 1; int calc_ha1 = 0; int use_domain = 0; /* Use also domain when looking up in table */ +int force_generate_avps = 0; /* Even when user failed to authenticate */ db1_con_t* auth_db_handle = 0; /* database connection handle */ db_func_t auth_dbf; @@ -128,6 +129,7 @@ static param_export_t params[] = { {"use_domain", INT_PARAM, &use_domain }, {"load_credentials", PARAM_STRING, &credentials_list }, {"version_table", INT_PARAM, &version_table_check }, + {"force_generate_avps", INT_PARAM, &force_generate_avps}, {0, 0, 0} }; diff --git a/src/modules/auth_db/authorize.c b/src/modules/auth_db/authorize.c index b45a2d128a..4f8d967454 100644 --- a/src/modules/auth_db/authorize.c +++ b/src/modules/auth_db/authorize.c @@ -294,13 +294,21 @@ static int digest_authenticate_hdr(sip_msg_t* msg, str *realm, goto end; } + /* Even when user failed to authenticate */ + if (force_generate_avps) { + generate_avps(msg, result); + } + /* Recalculate response, it must be same to authorize successfully */ rauth = auth_api.check_response(&(cred->digest), method, ha1); if(rauth==AUTHENTICATED) { ret = AUTH_OK; switch(auth_api.post_auth(msg, h, ha1)) { case AUTHENTICATED: - generate_avps(msg, result); + /* Only when user succeded to authenticate */ + if (!force_generate_avps) { + generate_avps(msg, result); + } break; default: ret = AUTH_ERROR; diff --git a/src/modules/auth_db/authorize.h b/src/modules/auth_db/authorize.h index e3638a25af..fd26f39e75 100644 --- a/src/modules/auth_db/authorize.h +++ b/src/modules/auth_db/authorize.h @@ -28,6 +28,8 @@ #include "../../core/parser/msg_parser.h" #include "api.h" +extern int force_generate_avps; + int auth_db_init(const str* db_url); int auth_db_bind(const str* db_url); void auth_db_close(void); diff --git a/src/modules/auth_db/doc/auth_db_admin.xml b/src/modules/auth_db/doc/auth_db_admin.xml index 654c889415..422738e869 100644 --- a/src/modules/auth_db/doc/auth_db_admin.xml +++ b/src/modules/auth_db/doc/auth_db_admin.xml @@ -300,6 +300,24 @@ modparam("auth_db", "version_table", 0) </example> </section> + <section id="auth_db.p.force_generate_avps"> + <title><varname>force_generate_avps</varname> (integer)</title> + <para> + If set to different than 0, the module will fetch user DB attributes even if authentication failed. + </para> + <para> + Default value is <quote>0</quote> (don't fetch user DB attributes if authentication failed). + </para> + <example> + <title><varname>force_generate_avps</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("auth_db", "force_generate_avps", 1) +... + </programlisting> + </example> + </section> + </section> <section>

4 years, 8 months

pv module problems on master

by Juha Heinanen

May have something to do with recent two commits. -- Juha ----------------------------------------------------------------------- CC (gcc) [M pv.so] pv_trans.o pv_trans.c: In function 'tr_eval_string': pv_trans.c:539:22: warning: pointer targets in passing argument 1 of 'base64url_enc' differ in signedness [-Wpointer-sign] i = base64url_enc((unsigned char *) val->rs.s, val->rs.len, ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:867:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_enc(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:540:6: warning: pointer targets in passing argument 3 of 'base64url_enc' differ in signedness [-Wpointer-sign] (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:867:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_enc(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:552:22: warning: pointer targets in passing argument 1 of 'base64url_dec' differ in signedness [-Wpointer-sign] i = base64url_dec((unsigned char *) val->rs.s, val->rs.len, ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:868:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_dec(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:553:6: warning: pointer targets in passing argument 3 of 'base64url_dec' differ in signedness [-Wpointer-sign] (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:868:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_dec(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:565:22: warning: pointer targets in passing argument 1 of 'base64url_enc' differ in signedness [-Wpointer-sign] i = base64url_enc((unsigned char *) val->rs.s, val->rs.len, ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:867:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_enc(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:566:6: warning: pointer targets in passing argument 3 of 'base64url_enc' differ in signedness [-Wpointer-sign] (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:867:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_enc(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:597:23: warning: pointer targets in passing argument 1 of 'base64url_dec' differ in signedness [-Wpointer-sign] i = base64url_dec((unsigned char *) st.s, st.len, ^~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:868:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_dec(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:598:7: warning: pointer targets in passing argument 3 of 'base64url_dec' differ in signedness [-Wpointer-sign] (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:868:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_dec(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:600:23: warning: pointer targets in passing argument 1 of 'base64url_dec' differ in signedness [-Wpointer-sign] i = base64url_dec((unsigned char *) val->rs.s, val->rs.len, ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:868:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_dec(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:601:7: warning: pointer targets in passing argument 3 of 'base64url_dec' differ in signedness [-Wpointer-sign] (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:868:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_dec(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ ------------------------------------------------------------------------ Mar 7 00:15:46 char sip-proxy[21381]: 0(21433) ERROR: <core> [core/sr_module.c:512]: load_module(): could not open module </usr/lib/x86_64-linux-gnu/sip-proxy/modules/pv.so>: /usr/lib/x86_64-linux-gnu/sip-proxy/modules/pv.so: undefined symbol: base64url_enc

4 years, 8 months

git:master:957fde95: modules: readme files regenerated - registrar ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 957fde95e15c0b5b4d6d92252df5adbeeb50736d URL: https://github.com/kamailio/kamailio/commit/957fde95e15c0b5b4d6d92252df5adb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-09T20:31:12+01:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/957fde95e15c0b5b4d6d92252df5adb… Patch: https://github.com/kamailio/kamailio/commit/957fde95e15c0b5b4d6d92252df5adb…

4 years, 8 months

git:master:c9ff5ef7: Merge pull request #2234 from smititelu/master

by GitHub

Module: kamailio Branch: master Commit: c9ff5ef72c0562748eff9e2055eba3181be5b8c2 URL: https://github.com/kamailio/kamailio/commit/c9ff5ef72c0562748eff9e2055eba31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-03-09T20:30:25+01:00 Merge pull request #2234 from smititelu/master registrar: add use_expired_contacts config param --- Modified: src/modules/registrar/config.c Modified: src/modules/registrar/config.h Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/lookup.c Modified: src/modules/registrar/registrar.c --- Diff: https://github.com/kamailio/kamailio/commit/c9ff5ef72c0562748eff9e2055eba31… Patch: https://github.com/kamailio/kamailio/commit/c9ff5ef72c0562748eff9e2055eba31…

4 years, 8 months

← Newer
1
...
32
33
34
35
36
37
38
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020