sr-dev

sr-dev@lists.kamailio.org

12 participants
44199 discussions

git:master:21f12f10: core: add other 4xx reply error count stats

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 21f12f108bd04b95a51704a570bc8215b26bf71b URL: https://github.com/kamailio/kamailio/commit/21f12f108bd04b95a51704a570bc821… Author: AsedMorteza <mortezatorabi001(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T16:01:49+01:00 core: add other 4xx reply error count stats --- Modified: src/modules/kex/core_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/21f12f108bd04b95a51704a570bc821… Patch: https://github.com/kamailio/kamailio/commit/21f12f108bd04b95a51704a570bc821…

1 month, 3 weeks

[kamailio/kamailio] lib/srdb1: Allow '/' in database URL passwords (PR #4017)

by Kent Anderson

- Modify parsing of a database URL so that a '/' character is accepted as a valid character in the password part of the URL.   #### 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  This change modifies the parsing of the DB URL so that '/' characters can be included in the password field. The modified algorithm is similar to that used when a '@' character is contained in the password. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4017 -- Commit Summary -- * lib/srdb1: Allow '/' in database URL passwords -- File Changes -- M src/lib/srdb1/db_id.c (35) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4017.patch https://github.com/kamailio/kamailio/pull/4017.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4017 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4017(a)github.com>

1 month, 3 weeks

git:master:91abfdf6: lib/srdb1: Allow '/' in database URL passwords

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 91abfdf6ebf942cbb0234be36812a9513f92f96b URL: https://github.com/kamailio/kamailio/commit/91abfdf6ebf942cbb0234be36812a95… Author: Kent <kent(a)amtelco.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T16:00:45+01:00 lib/srdb1: Allow '/' in database URL passwords - Modify parsing of a database URL so that a '/' character is accepted as a valid character in the password part of the URL. --- Modified: src/lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/91abfdf6ebf942cbb0234be36812a95… Patch: https://github.com/kamailio/kamailio/commit/91abfdf6ebf942cbb0234be36812a95… --- diff --git a/src/lib/srdb1/db_id.c b/src/lib/srdb1/db_id.c index 93b36253b3b..2546a5f56f0 100644 --- a/src/lib/srdb1/db_id.c +++ b/src/lib/srdb1/db_id.c @@ -237,14 +237,33 @@ static int parse_db_url(struct db_id *id, const str *url) break; case '/': - id->host = prev_token; - prev_token = 0; - id->port = str2s(begin, url->s + i - begin, 0); - if(dupl_string_name( - &id->database, url->s + i + 1, url->s + len) - < 0) - goto err; - return 0; + /* go to last '@' when '/' is part of a password */ + a = 0; + for(j = i + 1; j < len; j++) { + if(url->s[j] == '@') { + a = j; + } + } + if(a != 0) { + st = ST_HOST; + id->username = prev_token; + prev_token = 0; + i = a; + if(dupl_string(&id->password, begin, url->s + i) + < 0) + goto err; + begin = url->s + i + 1; + break; + } else { + id->host = prev_token; + prev_token = 0; + id->port = str2s(begin, url->s + i - begin, 0); + if(dupl_string_name(&id->database, url->s + i + 1, + url->s + len) + < 0) + goto err; + return 0; + } } break;

1 month, 3 weeks

[kamailio/kamailio] siputils: HOTFIX generated icid-value too short (PR #4026)

by Eik Rentzow

#### 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 - icid-value is only 17 characters and not unique - Re-parsing of generated PCV with icid-generated is 2 characters too short, cutting generated-by value or creating false warning Following warning was produced, which shows the problem. > WARNING: siputils [chargingvector.c:240]: sip_parse_charging_vector(): icid-generated-at is missing icid-> value=4557000A000E52000;icid-generated-a You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4026 -- Commit Summary -- * siputils: generated icid-value too short -- File Changes -- M src/modules/siputils/chargingvector.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4026.patch https://github.com/kamailio/kamailio/pull/4026.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4026 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4026(a)github.com>

1 month, 3 weeks

git:master:66350831: siputils: generated icid-value too short

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 66350831872370a5a06f2ee44e8609ceb0164592 URL: https://github.com/kamailio/kamailio/commit/66350831872370a5a06f2ee44e8609c… Author: Eik Rentzow <rentzow(a)gmx.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T15:51:32+01:00 siputils: generated icid-value too short - icid-value is only 17 charaters and not unique - Re-parsing of generated PCV with icid-generated is 2 characters too short, cutting generated-by value or creating false warning --- Modified: src/modules/siputils/chargingvector.c --- Diff: https://github.com/kamailio/kamailio/commit/66350831872370a5a06f2ee44e8609c… Patch: https://github.com/kamailio/kamailio/commit/66350831872370a5a06f2ee44e8609c… --- diff --git a/src/modules/siputils/chargingvector.c b/src/modules/siputils/chargingvector.c index c49e3ebf1a2..110f06be77d 100644 --- a/src/modules/siputils/chargingvector.c +++ b/src/modules/siputils/chargingvector.c @@ -147,7 +147,7 @@ static void sip_generate_charging_vector(char *pcv, const unsigned int maxsize) const char *endptr = ptr + maxsize - 1; for(int i = 0; i < len && ptr < endptr; i++) { - ptr += (snprintf(ptr, 3, "%02X", newConferenceIdentifier[i]) - 1); + ptr += snprintf(ptr, 3, "%02X", newConferenceIdentifier[i]); } } @@ -258,6 +258,7 @@ static int sip_get_charging_vector( } sip_initialize_pcv_buffers(); + _siputils_pcv_status = PCV_NONE; for(hf = msg->headers; hf; hf = hf->next) { if(hf->name.s[0] != 'P') { @@ -298,7 +299,6 @@ static int sip_get_charging_vector( } } LM_DBG("No valid P-Charging-Vector header found.\n"); - _siputils_pcv_status = PCV_NONE; *hf_pcv = NULL; return 1; } @@ -482,7 +482,7 @@ int sip_handle_pcv(struct sip_msg *msg, char *flags, char *str2) /* if generated and added, copy buffer and reparse it */ sip_initialize_pcv_buffers(); - _siputils_pcv.len = body_len - CRLF_LEN; + _siputils_pcv.len = body_len; memcpy(_siputils_pcv.s, pcv_body, _siputils_pcv.len); if(sip_parse_charging_vector( _siputils_pcv_buf, sizeof(_siputils_pcv_buf))) {

1 month, 3 weeks

git:master:59ac31e4: sca: use core function for parsing to header and uri

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 59ac31e496f4d5250567cc3c8fbafa0710f888ed URL: https://github.com/kamailio/kamailio/commit/59ac31e496f4d5250567cc3c8fbafa0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-19T15:09:52+01:00 sca: use core function for parsing to header and uri - instead of local implementation --- Modified: src/modules/sca/sca_util.c --- Diff: https://github.com/kamailio/kamailio/commit/59ac31e496f4d5250567cc3c8fbafa0… Patch: https://github.com/kamailio/kamailio/commit/59ac31e496f4d5250567cc3c8fbafa0… --- diff --git a/src/modules/sca/sca_util.c b/src/modules/sca/sca_util.c index 3e8e6d16bd2..1d5d7178713 100644 --- a/src/modules/sca/sca_util.c +++ b/src/modules/sca/sca_util.c @@ -215,22 +215,11 @@ int sca_get_msg_to_header(sip_msg_t *msg, sca_to_body_t *to) return (-1); } to->flags = SCA_UTIL_FLAG_TO_BODY_MSG; - to->hdr = get_to(msg); - if(to->hdr == NULL) { - parse_to(msg->to->body.s, - msg->to->body.s + msg->to->body.len + 1, // end of buffer - to->hdr); - if(to->hdr->error != PARSE_OK) { - LM_ERR("Bad To header\n"); - return (-1); - } - } - - // ensure the URI is parsed for future use - if(parse_uri(to->hdr->uri.s, to->hdr->uri.len, GET_TO_PURI(msg)) < 0) { - LM_ERR("Failed to parse To URI %.*s\n", STR_FMT(&to->hdr->uri)); + if(parse_to_uri(msg) == NULL) { + LM_ERR("Bad To header\n"); return (-1); } + to->hdr = get_to(msg); } else { LM_DBG("using $avp(%.*s)[%.*s] as to uri\n", STR_FMT(&sca->cfg->to_uri_avp.s), STR_FMT(&uri));

1 month, 3 weeks

git:master:84a448b9: modules: readme files regenerated - db_sqlite ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 84a448b94d2a926285c24f74f60a66d707d05880 URL: https://github.com/kamailio/kamailio/commit/84a448b94d2a926285c24f74f60a66d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-19T14:31:10+01:00 modules: readme files regenerated - db_sqlite ... [skip ci] --- Modified: src/modules/db_sqlite/README --- Diff: https://github.com/kamailio/kamailio/commit/84a448b94d2a926285c24f74f60a66d… Patch: https://github.com/kamailio/kamailio/commit/84a448b94d2a926285c24f74f60a66d…

1 month, 3 weeks

[kamailio/kamailio] db_sqlite: Add busy timeout param to improve concurrency (PR #4029)

by Andreas Granig

It's needed specifically when setting WAL, because on module loading, each child creates its own DB connection and sets the WAL (or other options you might set), and it all happens roughly at the same time. Without setting the busy-timeout, starting of kamailio will fail due to locking issues with sqlite.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4029 -- Commit Summary -- * db_sqlite: Add busy timeout param to improve concurrency -- File Changes -- M src/modules/db_sqlite/db_sqlite.c (52) M src/modules/db_sqlite/db_sqlite.h (1) M src/modules/db_sqlite/dbase.c (16) M src/modules/db_sqlite/doc/db_sqlite.xml (16) M src/modules/db_sqlite/doc/db_sqlite_admin.xml (49) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4029.patch https://github.com/kamailio/kamailio/pull/4029.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4029 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4029(a)github.com>

1 month, 3 weeks

git:master:9d21fa05: db_sqlite: Add busy timeout param to improve concurrency

by Andreas Granig

Module: kamailio Branch: master Commit: 9d21fa0562b8b4379b882d89715c58028eb358dd URL: https://github.com/kamailio/kamailio/commit/9d21fa0562b8b4379b882d89715c580… Author: Andreas Granig <agranig(a)linguin.org> Committer: Andreas Granig <agranig(a)linguin.org> Date: 2024-11-19T14:18:09+01:00 db_sqlite: Add busy timeout param to improve concurrency It's needed specifically when setting WAL, because on module loading, each child creates its own DB connection and sets the WAL (or other options you might set), and it all happens roughly at the same time. Without setting the busy-timeout, starting of kamailio will fail due to locking issues with sqlite. --- Modified: src/modules/db_sqlite/db_sqlite.c Modified: src/modules/db_sqlite/db_sqlite.h Modified: src/modules/db_sqlite/dbase.c Modified: src/modules/db_sqlite/doc/db_sqlite.xml Modified: src/modules/db_sqlite/doc/db_sqlite_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9d21fa0562b8b4379b882d89715c580… Patch: https://github.com/kamailio/kamailio/commit/9d21fa0562b8b4379b882d89715c580…

1 month, 3 weeks

[kamailio/kamailio] db_sqlite: Add busy timeout param to improve concurrency. (PR #4028)

by Andreas Granig

It's needed specifically when setting WAL, because on module loading, each child creates its own DB connection and sets the WAL (or other options you might set), and it all happens roughly at the same time. Without setting the busy-timeout, starting of kamailio will fail due to locking issues with sqlite.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4028 -- Commit Summary -- * db_sqlite: Add busy timeout param to improve concurrency. -- File Changes -- M src/modules/db_sqlite/db_sqlite.c (52) M src/modules/db_sqlite/db_sqlite.h (1) M src/modules/db_sqlite/dbase.c (13) M src/modules/db_sqlite/doc/db_sqlite_admin.xml (48) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4028.patch https://github.com/kamailio/kamailio/pull/4028.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4028 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4028(a)github.com>

1 month, 3 weeks

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev