sr-dev July 2020

sr-dev@lists.kamailio.org

26 participants
391 discussions

[kamailio/kamailio] db_cluster module initialization problem - linked perhaps to change in srdb1 lib (#2385)
by Andrew Pogrebennyk 02 Jul '20

02 Jul '20

Hi, using kamailio 5.3, I have added two connections to the cluster: ``` modparam("db_cluster", "connection", DB_URL_REDIS_READ) modparam("db_cluster", "connection", DB_URL_REDIS_WRITE) modparam("ims_charging", "db_url", "cluster://cluster1") ``` it fails to start, here with additional debug prints ``` 2020-06-30T20:51:10.003728531Z 0(128) DEBUG: db_cluster [dbcl_api.c:267]: db_cluster_init(): initializing with cluster [cluster://k1] len 46 2020-06-30T20:51:10.003751277Z 0(128) DEBUG: db_cluster [dbcl_api.c:277]: db_cluster_init(): call dbcl_get_cluster with trimmed name of cluster [k1] len 36 2020-06-30T20:51:10.003772897Z 0(128) DEBUG: db_cluster [dbcl_data.c:67]: dbcl_get_cluster(): inside dbcl_get_cluster looking up new cluster [k1] len 36 2020-06-30T20:51:10.003801798Z 0(128) DEBUG: db_cluster [dbcl_data.c:75]: dbcl_get_cluster(): checking new 2749854490 cluster with name [k1] len 36 2020-06-30T20:51:10.003825383Z 0(128) DEBUG: db_cluster [dbcl_data.c:76]: dbcl_get_cluster(): checking 26214 cluster with name [k1] len 2 2020-06-30T20:51:10.003844796Z 0(128) ERROR: db_cluster [dbcl_api.c:281]: db_cluster_init(): cluster not found [cluster://k1] ``` so i see different hash id and the length mismatch, where it seems that db_cluster_init already gets wrong dburl strict structure from DB API, because the _dburl.s is pointing to the db_url but the length is calculated from the 2nd connection URL so 36 = strlen ("c2=>mysql://scscf:heslo@mysql/scscf2") I couldn't get it work also with only 1 connection. I could only tell there is something wrong with the way db_do_init2 / new_db_id from srdb1 interacts with db_cluster_init and then I found this commit [https://github.com/kamailio/kamailio/commit/5457bcbc51012e93775c3aaefa32c73… What I am getting at is: is it possible that commit in srdb1 with id 5457bcbc51012e93775c3aaefa32c73f956aa279 broke the db_cluster module in 2014? -- 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/issues/2385

2 4

git:master:71bc5524: ims_charging: db_url param type set to PARAM_STR
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: master Commit: 71bc55240a144dbad9d9d8afc942b81237c806d2 URL: https://github.com/kamailio/kamailio/commit/71bc55240a144dbad9d9d8afc942b81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T10:44:03+02:00 ims_charging: db_url param type set to PARAM_STR - the variable pointer is str* not char* - GH #2385 --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/71bc55240a144dbad9d9d8afc942b81… Patch: https://github.com/kamailio/kamailio/commit/71bc55240a144dbad9d9d8afc942b81… --- diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index 41871d5f47..a9a2dd0fb8 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -135,7 +135,7 @@ static param_export_t params[] = { { "video_service_identifier", INT_PARAM, &video_service_identifier },/*service id for voice*/ { "video_rating_group", INT_PARAM, &video_rating_group },/*rating group for voice*/ { "db_mode", INT_PARAM, &ro_db_mode_param }, - { "db_url", PARAM_STRING, &db_url }, + { "db_url", PARAM_STR, &db_url }, { "db_update_period", INT_PARAM, &db_update_period }, { "vendor_specific_chargeinfo", INT_PARAM, &vendor_specific_chargeinfo }, /* VSI for extra charing info in Ro */ { "vendor_specific_id", INT_PARAM, &vendor_specific_id }, /* VSI for extra charing info in Ro */

1 0

git:5.3:dffd3502: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: dffd3502fed5cf33055f67967ba538f2c68c2a59 URL: https://github.com/kamailio/kamailio/commit/dffd3502fed5cf33055f67967ba538f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-07-02T10:02:03+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/carrierroute/README Modified: src/modules/pua/README --- Diff: https://github.com/kamailio/kamailio/commit/dffd3502fed5cf33055f67967ba538f… Patch: https://github.com/kamailio/kamailio/commit/dffd3502fed5cf33055f67967ba538f… --- diff --git a/src/modules/carrierroute/README b/src/modules/carrierroute/README index cb659bdf75..8f1b4a0532 100644 --- a/src/modules/carrierroute/README +++ b/src/modules/carrierroute/README @@ -365,7 +365,8 @@ modparam("carrierroute", "config_source", "file") 3.6. config_file (string) - Specifies the path to the config file. + Specifies the path to the config file. The file has to be owned by the + user and group used to run Kamailio. Default value is “/etc/kamailio/carrierroute.conf”. diff --git a/src/modules/pua/README b/src/modules/pua/README index e232590207..3079312646 100644 --- a/src/modules/pua/README +++ b/src/modules/pua/README @@ -193,7 +193,7 @@ modparam("pua", "hash_size", 11) Example 1.2. Set db_url parameter ... -modparam("pua", "db_url" "dbdriver://username:password@dbhost/dbname") +modparam("pua", "db_url", "dbdriver://username:password@dbhost/dbname") ... 3.3. db_table (str)

1 0

git:5.3:f959dec0: usrloc: rpc scan flags, cflags and methods fields as unsigned int
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: f959dec0c073c2b2dae904ee3d844872de989a2d URL: https://github.com/kamailio/kamailio/commit/f959dec0c073c2b2dae904ee3d84487… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T09:48:20+02:00 usrloc: rpc scan flags, cflags and methods fields as unsigned int (cherry picked from commit 2c622627ea145eddcf891ba9b89b756457074991) --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/f959dec0c073c2b2dae904ee3d84487… Patch: https://github.com/kamailio/kamailio/commit/f959dec0c073c2b2dae904ee3d84487… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 0f87230697..2bffad62aa 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -618,7 +618,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) memset(&ci, 0, sizeof(ucontact_info_t)); - ret = rpc->scan(ctx, "SSSdfSddd*SS", &table, &aor, &contact, &ci.expires, + ret = rpc->scan(ctx, "SSSdfSuuu*SS", &table, &aor, &contact, &ci.expires, &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods, &received, &socket); if (ret < 9) {

1 0

git:5.3:c33d634f: kamctl: set Path to '.' when parameter not set for 'ul add'
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: c33d634f400d5219dd1a820b209a123ef3e27020 URL: https://github.com/kamailio/kamailio/commit/c33d634f400d5219dd1a820b209a123… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T09:48:11+02:00 kamctl: set Path to '.' when parameter not set for 'ul add' (cherry picked from commit 301525dfbbad2ffcec6738ef5eff952645ab9dfe) --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/c33d634f400d5219dd1a820b209a123… Patch: https://github.com/kamailio/kamailio/commit/c33d634f400d5219dd1a820b209a123… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index c97ad491a2..a2fc9ffe43 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2652,12 +2652,12 @@ usrloc() { UL_EXPIRES=0 UL_FLAGS=0 BR_FLAGS=0 - UL_PATH=0 + UL_PATH="." elif [ $# -eq 4 ] ; then UL_EXPIRES=$4 UL_FLAGS=0 BR_FLAGS=0 - UL_PATH=0 + UL_PATH="." elif [ $# -eq 5 ] ; then UL_EXPIRES=$4 UL_FLAGS=0

1 0

git:5.3:070efaa8: jsonrpcs: more debug messages in case field of scanning failure
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: 070efaa8497773c3a903c26d7f5f31632ad99703 URL: https://github.com/kamailio/kamailio/commit/070efaa8497773c3a903c26d7f5f316… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T09:47:57+02:00 jsonrpcs: more debug messages in case field of scanning failure (cherry picked from commit 0a4fa9594d871a41c2ef6b811e2b342ed6ccfe09) --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/070efaa8497773c3a903c26d7f5f316… Patch: https://github.com/kamailio/kamailio/commit/070efaa8497773c3a903c26d7f5f316… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index d939be5d0f..9f7e5f68bb 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -586,8 +586,10 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) va_list ap; str stmp; - if(ctx->req_node==NULL) + if(ctx->req_node==NULL) { + LM_DBG("no request node\n"); return 0; + } orig_fmt=fmt; va_start(ap, fmt); @@ -632,10 +634,14 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) *char_ptr = int2str(SRJSON_GET_ULONG(ctx->req_node), &stmp.len); } else { + LM_ERR("field is not a number to auto-convert - type %d\n", + ctx->req_node->type); *char_ptr = NULL; goto error; } } else { + LM_ERR("field is not a string - type %d\n", + ctx->req_node->type); *char_ptr = NULL; goto error; } @@ -650,11 +656,15 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) str_ptr->s = int2str(SRJSON_GET_ULONG(ctx->req_node), &str_ptr->len); } else { + LM_ERR("field is not a number to auto-convert - type %d\n", + ctx->req_node->type); str_ptr->s = NULL; str_ptr->len = 0; goto error; } } else { + LM_ERR("field is not a string - type %d\n", + ctx->req_node->type); str_ptr->s = NULL; str_ptr->len = 0; goto error; @@ -676,8 +686,10 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) ctx->req_node = ctx->req_node->next; } /* error if there is still a scan char type and it is not optional */ - if(*fmt && *fmt!='*' && mandatory_param==1) + if(*fmt && *fmt!='*' && mandatory_param==1) { + LM_ERR("no more fields to scan\n"); goto error; + } va_end(ap); return (int)(fmt-orig_fmt)-modifiers;

1 0

git:5.3:bc58790b: imc: let space for ending characters
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: bc58790b7d33e7d2f3818e22894604c90edb0a7b URL: https://github.com/kamailio/kamailio/commit/bc58790b7d33e7d2f3818e22894604c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T09:47:28+02:00 imc: let space for ending characters (cherry picked from commit 1d256290cf10414a2f1af1feda3c9a357eb8ac27) --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/bc58790b7d33e7d2f3818e22894604c… Patch: https://github.com/kamailio/kamailio/commit/bc58790b7d33e7d2f3818e22894604c… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index bf68967d21..4ace0b800e 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -1027,7 +1027,7 @@ int imc_handle_rooms(struct sip_msg* msg, imc_cmd_t *cmd, size_t left; p = imc_body_buf; - left = sizeof(imc_body_buf); + left = sizeof(imc_body_buf) - 2; memcpy(p, ROOMS, sizeof(ROOMS) - 1); p += sizeof(ROOMS) - 1;

1 0

git:5.3:35d977ae: carrierroute: docs - note about config file ownership
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: 35d977aed4c7137d34d4cf8216d503ac48f1e423 URL: https://github.com/kamailio/kamailio/commit/35d977aed4c7137d34d4cf8216d503a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T09:47:15+02:00 carrierroute: docs - note about config file ownership - GH #2369 (cherry picked from commit 214c762c46d5cd5892d2ddc06a25193a01164e8b) --- Modified: src/modules/carrierroute/doc/carrierroute_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/35d977aed4c7137d34d4cf8216d503a… Patch: https://github.com/kamailio/kamailio/commit/35d977aed4c7137d34d4cf8216d503a… --- diff --git a/src/modules/carrierroute/doc/carrierroute_admin.xml b/src/modules/carrierroute/doc/carrierroute_admin.xml index 21fb73f42e..dee8d006f5 100644 --- a/src/modules/carrierroute/doc/carrierroute_admin.xml +++ b/src/modules/carrierroute/doc/carrierroute_admin.xml @@ -206,7 +206,8 @@ modparam("carrierroute", "config_source", "file") <section> <title><varname>config_file</varname> (string)</title> <para> - Specifies the path to the config file. + Specifies the path to the config file. The file has to be owned by + the user and group used to run &kamailio;. </para> <para> <emphasis>

1 0

git:5.3:77a8fab3: carrierroute: more details on error message checking file permissions
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: 77a8fab36f878938cfd1b630439b9d0bde2f975b URL: https://github.com/kamailio/kamailio/commit/77a8fab36f878938cfd1b630439b9d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T09:47:05+02:00 carrierroute: more details on error message checking file permissions - GH #2369 (cherry picked from commit 31c7493d0d822239a76df4b504b2c319de09c19c) --- Modified: src/modules/carrierroute/carrierroute.c --- Diff: https://github.com/kamailio/kamailio/commit/77a8fab36f878938cfd1b630439b9d0… Patch: https://github.com/kamailio/kamailio/commit/77a8fab36f878938cfd1b630439b9d0… --- diff --git a/src/modules/carrierroute/carrierroute.c b/src/modules/carrierroute/carrierroute.c index 7d557c9852..79f8f2e2dc 100644 --- a/src/modules/carrierroute/carrierroute.c +++ b/src/modules/carrierroute/carrierroute.c @@ -216,7 +216,8 @@ static int mod_init(void) { if( !( fs.st_mode & S_IWOTH) && !((fs.st_mode & S_IWGRP) && (fs.st_gid == gid)) && !((fs.st_mode & S_IWUSR) && (fs.st_uid == uid))) { - LM_ERR("config file %s not writable\n", config_file); + LM_ERR("config file %s not writable or not owned by uid: %d and gid: %d\n", + config_file, uid, gid); return -1; } }

1 0

git:5.3:de92bd35: siputils: docs - added section ids for parameters
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: de92bd3500c28be19e8e86cb48dad0e42061269a URL: https://github.com/kamailio/kamailio/commit/de92bd3500c28be19e8e86cb48dad0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T09:46:23+02:00 siputils: docs - added section ids for parameters (cherry picked from commit ec0b1d31f1d667abdcd7cce7fbfff110583e271c) --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/de92bd3500c28be19e8e86cb48dad0e… Patch: https://github.com/kamailio/kamailio/commit/de92bd3500c28be19e8e86cb48dad0e… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index a430f85cc9..d7ef042486 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -72,7 +72,7 @@ <section> <title>Parameters</title> - <section> + <section id="siputils.p.ring_timeout"> <title><varname>ring_timeout</varname> (int)</title> <para> Timeout value in seconds, define how long the call-id is stored in the internal list kept for replacing 183 messages with 180. @@ -92,7 +92,7 @@ modparam("siputils", "ring_timeout", 30) </programlisting> </example> </section> - <section> + <section id="siputils.p.options_accept"> <title><varname>options_accept</varname> (string)</title> <para> This parameter is the content of the Accept header field. @@ -115,7 +115,7 @@ modparam("siputils", "options_accept", "application/*") </programlisting> </example> </section> - <section> + <section id="siputils.p.options_accept_encoding"> <title><varname>options_accept_encoding</varname> (string)</title> <para> This parameter is the content of the Accept-Encoding header field. @@ -137,7 +137,7 @@ modparam("siputils", "options_accept_encoding", "gzip") </example> </section> - <section> + <section id="siputils.p.contact_flds_separator"> <title><varname>contact_flds_separator</varname> (string)</title> <para> First char of this parameter is used as separator for encoding/decoding @@ -170,7 +170,7 @@ modparam("siputils", "contact_flds_separator", "-") </section> - <section> + <section id="siputils.p.options_accept_language"> <title><varname>options_accept_language</varname> (string)</title> <para> This parameter is the content of the Accept-Language header field. @@ -193,7 +193,7 @@ modparam("siputils", "options_accept_language", "de") </programlisting> </example> </section> - <section> + <section id="siputils.p.options_support"> <title><varname>options_support</varname> (string)</title> <para> This parameter is the content of the Support header field, @@ -215,7 +215,7 @@ modparam("siputils", "options_support", "100rel") </programlisting> </example> </section> - <section> + <section id="siputils.p.rpid_prefix"> <title><varname>rpid_prefix</varname> (string)</title> <para> Prefix to be added to Remote-Party-ID header field just before @@ -231,7 +231,7 @@ modparam("auth", "rpid_prefix", "Whatever <") </programlisting> </example> </section> - <section> + <section id="siputils.p.rpid_suffix"> <title><varname>rpid_suffix</varname> (string)</title> <para> Suffix to be added to Remote-Party-ID header field after the URI @@ -248,7 +248,7 @@ modparam("auth", "rpid_suffix", "@1.2.3.4>") </programlisting> </example> </section> - <section> + <section id="siputils.p.rpid_avp"> <title><varname>rpid_avp</varname> (string)</title> <para> Full AVP specification for the AVP which

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 July 2020