[sr-dev] Re: [kamailio/kamailio] p_usrloc: use a global p_usrloc_columns variable in db_load* functions (PR #3845)
Hi @henningw, Will make a similar PR for usrloc. Thank you -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3845#issuecomment-2114142321 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] p_usrloc: use a global p_usrloc_columns variable in db_load* functions (PR #3845)
Merged #3845 into master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3845#event-12815686632 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:922d7dfd: p_usrloc: use a global p_usrloc_columns variable in db_load* functions
Module: kamailio Branch: master Commit: 922d7dfd9ae7d13436c23d60f22d47c9c2fa127a URL: https://github.com/kamailio/kamailio/commit/922d7dfd9ae7d13436c23d60f22d47c9c2fa127a Author: Lucian Balaceanu Committer: Lucian Balaceanu Date: 2024-05-15T14:09:02+03:00 p_usrloc: use a global p_usrloc_columns variable in db_load* functions --- Modified: src/modules/p_usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/922d7dfd9ae7d13436c23d60f22d47c9c2fa127a.diff Patch: https://github.com/kamailio/kamailio/commit/922d7dfd9ae7d13436c23d60f22d47c9c2fa127a.patch ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] p_usrloc: use a global p_usrloc_columns variable in db_load* functions (PR #3845)
Hi @miconda, Do I "Squash and merge" or "Rebase and merge" this PR? Do you consider worthwhile to do a similar PR for usrloc? Thank you -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3845#issuecomment-2112184585 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] p_usrloc: use a global p_usrloc_columns variable in db_load* functions (PR #3845)
Thank you for the comments, I made the static and renaming changes. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3845#issuecomment-2107552088 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] p_usrloc: use a global all_columns variable in db_load* functions (PR #3845)
@lbalaceanu pushed 1 commit. 9ec5eaa88dd8f4146430429c6cb6aa086063d4ef p_usrloc: use a global all_columns variable in db_load* functions -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3845/files/58bffd732b5adb886dac83366027a8ed64e071ac..9ec5eaa88dd8f4146430429c6cb6aa086063d4ef You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] p_usrloc: use a global all_columns variable in db_load* functions (PR #3845)
Thank you Henning, let's see if there are other comments. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3845#issuecomment-2104412982 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] [kamailio/kamailio] p_usrloc: use a global all_columns variable in db_load* functions (PR #3845)
!-- Kamailio Pull Request Template -- !-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with git cherry-pick -x ... - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -- Pre-Submission Checklist !-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -- !-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-- !-- If youre unsure about any of these, dont hesitate to ask on sr-dev mailing list -- - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) Checklist: !-- Go over all points below, and after creating the PR, tick the checkboxes that apply -- - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue # (replace with an open issue number) Description !-- Describe your changes in detail -- You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3845 -- Commit Summary -- * p_usrloc: use a global all_columns variable in db_load* functions -- File Changes -- M src/modules/p_usrloc/udomain.c (157) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3845.patch https://github.com/kamailio/kamailio/pull/3845.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3845 You are receiving this because you are subscribed to this thread. Message ID: kamailio/kamailio/pull/3...@github.com ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: Add and apply cdp_openssl_clear_errors function (PR #3612)
>From my point of view this PR can be squashed and merged. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3612#issuecomment-1777676433 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: Add and apply cdp_openssl_clear_errors function (PR #3612)
In the cdp_tls.c I would put the function before the first one that uses it, possibly SSL *init_ssl_conn(int client_fd, SSL_CTX *ctx). In the cdp_tls.h, maybe just under tls_parse_method(). Much appreciated. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3612#issuecomment-1777052228 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: Add and apply cdp_openssl_clear_errors function (PR #3612)
Hello, Thanks for the changes. I did manage to get some extra information with this new function so the addition is welcome. Sorry to come just now with another suggestion: we can use cdp_tls.h/cdp_tls.c to house the cdp_openssl_clear_errors() function. This would get rid of the extra utils.c file. LM_INFO also requires \n at end of line. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3612#issuecomment-1776974420 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: Add and apply cdp_openssl_clear_errors function (PR #3612)
@lbalaceanu commented on this pull request.
Hello @xkaraman ,
Thank you for your contribution. I will also test minimally the code and give
an input after that as well.
> +#include "../../core/dprint.h"
+#include "utils.h"
+
+/*
+ * Get any leftover errors from OpenSSL and print them.
+ * ERR_get_error() also removes the error from the OpenSSL error stack.
+ * This is useful to call before any SSL_* IO calls to make sure
+ * we don't have any leftover errors from previous calls (OpenSSL docs).
+ */
+void cdp_openssl_clear_errors(void)
+{
+ int i;
+ char err[160];
+ while((i = ERR_get_error())) {
+ ERR_error_string(i, err);
+ INFO("clearing leftover error before SSL_* calls: %s", err);
Hello,
Just a cosmetic change, but maybe this should be a LM_INFO call.
> +#include
+#include
+
+#include "../../core/dprint.h"
+#include "utils.h"
+
+/*
+ * Get any leftover errors from OpenSSL and print them.
+ * ERR_get_error() also removes the error from the OpenSSL error stack.
+ * This is useful to call before any SSL_* IO calls to make sure
+ * we don't have any leftover errors from previous calls (OpenSSL docs).
+ */
+void cdp_openssl_clear_errors(void)
+{
+ int i;
+ char err[160];
Maybe 256 should be a better value, or maybe use ERR_error_string_n? I saw in
https://www.openssl.org/docs/man3.0/man3/ERR_error_string.html they suggest 256
for the buffer.
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3612#pullrequestreview-1692747227
You are receiving this because you are subscribed to this thread.
Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: add TLS capability (PR #3548)
Thank you all for your help. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3548#issuecomment-1723436966 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: add TLS capability (PR #3548)
Hello @oej @henningw @miconda do you think this commit can be merged? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3548#issuecomment-1723184408 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: add TLS capability (PR #3548)
Hi. Hope I took care of the punctual requests made by @oej and @henningw. Please comment. However, starting tomorrow I will not have access to my laptop for a week. Have a nice day! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3548#issuecomment-1712821653 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: add TLS capability (PR #3548)
@lbalaceanu pushed 2 commits. ff9adaf928a4932894f8e628a48bfb7fdac684db cdp: adding TLS capability to peer connections 0a2a63a606a883ecc4720d90ca8745a3db50b0e1 cdp: documenting TLS capability related parameters -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3548/files/a1e6bed57a1e84b4837cfc9a6d961b3c262155ee..0a2a63a606a883ecc4720d90ca8745a3db50b0e1 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: add TLS capability (PR #3548)
@lbalaceanu pushed 2 commits. e3dea073f93bccdc9353d2f1ab9fa0a29fca0030 cdp: adding TLS capability to peer connections a1e6bed57a1e84b4837cfc9a6d961b3c262155ee cdp: documenting TLS capability related parameters -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3548/files/441aabc1ad2988801473c269ff5b2713a89ca7fe..a1e6bed57a1e84b4837cfc9a6d961b3c262155ee You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: add TLS capability (PR #3548)
@lbalaceanu pushed 1 commit. 60af9df0a5683c57472244fcf666ea3f07d78c62 cdp: updating docu for TLSv1.3 configuration addition -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3548/files/085bf21505a67e1404118d79f7e3288bdd2e4e51..60af9df0a5683c57472244fcf666ea3f07d78c62 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: add TLS capability (PR #3548)
@lbalaceanu pushed 1 commit. 085bf21505a67e1404118d79f7e3288bdd2e4e51 cdp: adding TLSv1.3 configuration -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3548/files/8ad748a420162625e653f5f7759a85f66174c083..085bf21505a67e1404118d79f7e3288bdd2e4e51 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: add TLS capability (PR #3548)
@lbalaceanu pushed 1 commit. 8ad748a420162625e653f5f7759a85f66174c083 cdp: adding more in-depth openssl logging -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3548/files/35a08f96a3919a58d53ca5ce25d74134de978e8d..8ad748a420162625e653f5f7759a85f66174c083 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: add TLS capability (PR #3548)
@lbalaceanu pushed 2 commits. d0a81b44f6cc3a058fd5771d7080c4e5d052ac7d cdp: adding ca_list param 35a08f96a3919a58d53ca5ce25d74134de978e8d cdp: updated with ca_list param and clarifications -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3548/files/9bdbe7250d892cb2d871f7e283217f0af2274ea9..35a08f96a3919a58d53ca5ce25d74134de978e8d You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: add TLS capability (PR #3548)
More changes to follow in subsequent commits. In the end I will squash commits in the PR. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3548#issuecomment-1693514716 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: add TLS capability (PR #3548)
@lbalaceanu pushed 2 commits. 9c3d2117168dc3c992df5d18ff18385508082f29 cdp: fixing formatting 9bdbe7250d892cb2d871f7e283217f0af2274ea9 cdp: logging reworking -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3548/files/408805dbe01baab0edcf53106b4201f1292f7c29..9bdbe7250d892cb2d871f7e283217f0af2274ea9 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] cdp: add TLS capability (PR #3548)
Thank you for the comments, I will make changes accordingly. Will look into the multi-stack issue as well. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3548#issuecomment-1691175127 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] [kamailio/kamailio] cdp: add TLS capability (PR #3548)
!-- Kamailio Pull Request Template -- !-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with git cherry-pick -x ... - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -- Pre-Submission Checklist !-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -- !-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-- !-- If youre unsure about any of these, dont hesitate to ask on sr-dev mailing list -- - [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: !-- Go over all points below, and after creating the PR, tick the checkboxes that apply -- - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue # (replace with an open issue number) Description !-- Describe your changes in detail -- Adding TLS capability to connections between Kamailio and configured peers. Configuration done via kamailio.cfg. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3548 -- Commit Summary -- * cdp: adding TLS capability to peer connections * cdp: documenting TLS capability related parameters -- File Changes -- M src/modules/cdp/Makefile (2) M src/modules/cdp/cdp_mod.c (27) A src/modules/cdp/cdp_tls.c (196) A src/modules/cdp/cdp_tls.h (51) M src/modules/cdp/doc/cdp_admin.xml (97) M src/modules/cdp/receiver.c (73) M src/modules/cdp/receiver.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3548.patch https://github.com/kamailio/kamailio/pull/3548.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3548 You are receiving this because you are subscribed to this thread. Message ID: kamailio/kamailio/pull/3...@github.com ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] carrierroute module functions export to kemi (PR #3325)
Thank you for the approval. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3325#issuecomment-1378970369 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] carrierroute module functions export to kemi (PR #3325)
Merged #3325 into master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3325#event-8202929412 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] carrierroute module functions export to kemi (PR #3325)
For me this looks ok. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3325#issuecomment-1375553408 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Re: [sr-dev] [kamailio/kamailio] KEMI API implementation for carrierroute module (PR #3247)
@miconda, thank you for the comments/ commits, I am looking into them. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3247#issuecomment-1263385817 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] KEMI API implementation for carrierroute module (PR #3247)
The implementation looks ok to me since it is convenient for now to keep changes to the regular cmd export functions low. The force-pushed appeared because of reverting some merge commit and then changing the commit message. I think this is ok for a merge. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3247#issuecomment-1259382193 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio 5.4.4 extremely slow carrierroute preloading (#2653)
This being said, @kristina258, I would close the issue. -- 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/2653#issuecomment-811711289___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.3:00b6341b: carrierroute: replace faulty warning mechanism
Module: kamailio Branch: 5.3 Commit: 00b6341b361bdcd07b6fa901a652850e3dcd67be URL: https://github.com/kamailio/kamailio/commit/00b6341b361bdcd07b6fa901a652850e3dcd67be Author: Lucian Balaceanu Committer: Lucian Balaceanu Date: 2021-03-30T12:07:54+03:00 carrierroute: replace faulty warning mechanism - warning log for the same carrier/domain having routes with only 0 probability is now triggered through counting probabilities per carrier and domain - kudos also go to Huseyin Dikme - GH #2653 (cherry picked from commit 087c00a276623adad6b87242bc58f7c0b4d8ff33) --- Modified: src/modules/carrierroute/cr_data.c Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/cr_db.h Modified: src/modules/carrierroute/cr_domain.h --- Diff: https://github.com/kamailio/kamailio/commit/00b6341b361bdcd07b6fa901a652850e3dcd67be.diff Patch: https://github.com/kamailio/kamailio/commit/00b6341b361bdcd07b6fa901a652850e3dcd67be.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.4:f08e5814: carrierroute: replace faulty warning mechanism
Module: kamailio Branch: 5.4 Commit: f08e58145e93e57f2654ffcb901d49f9e898bcab URL: https://github.com/kamailio/kamailio/commit/f08e58145e93e57f2654ffcb901d49f9e898bcab Author: Lucian Balaceanu Committer: Lucian Balaceanu Date: 2021-03-30T12:06:26+03:00 carrierroute: replace faulty warning mechanism - warning log for the same carrier/domain having routes with only 0 probability is now triggered through counting probabilities per carrier and domain - kudos also go to Huseyin Dikme - GH #2653 (cherry picked from commit 087c00a276623adad6b87242bc58f7c0b4d8ff33) --- Modified: src/modules/carrierroute/cr_data.c Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/cr_db.h Modified: src/modules/carrierroute/cr_domain.h --- Diff: https://github.com/kamailio/kamailio/commit/f08e58145e93e57f2654ffcb901d49f9e898bcab.diff Patch: https://github.com/kamailio/kamailio/commit/f08e58145e93e57f2654ffcb901d49f9e898bcab.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio 5.4.4 extremely slow carrierroute preloading (#2653)
Hi @kristina258, I have also tried with kamailio 4.4 but unfortunately this time I get 1min7 secs for the approx 500k entries in carrierroute tables created with kamdbctl tool. I don't know if I am doing something wrong as I don't have experience with postgres, but for me kamailio dev vs kamailio 4.4 are more ore less similar as far as load times are involved. -- 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/2653#issuecomment-809358264___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio 5.4.4 extremely slow carrierroute preloading (#2653)
Hello @kristina258 , Unfortunately, I can't reproduce your issue. I have built Postgres carrierroute tables using kamctlrc/kamdbctl and am testing using main branch (including new commit). **time ./utils/kamcmd/kamcmd cr.reload_routes real0m52.270s** ser=# select count(*) from carrierroute where prob != 0; count 501684 ser=# select count(*) from carrierroute where prob = 0; count --- 0 (1 row) Are you also using the carrierroute tables structures provided by the kamdbctl tool? Could you provide some logs from the start/reload process? Thank you, Lucian -- 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/2653#issuecomment-804838974___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio 5.4.4 extremely slow carrierroute preloading (#2653)
Hi @kristina258, I will try to reproduce with postgres and will come back to you. -- 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/2653#issuecomment-800183303___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio 5.4.4 extremely slow carrierroute preloading (#2653)
Hi @NiteCrwlr , just pushed commit 087c00a276623adad6b87242bc58f7c0b4d8ff33 as a possible fix for this bug. For us it worked since we were able to reproduce the situation by having a lot of entries in the carrierroute table with prob = 0. -- 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/2653#issuecomment-797594239___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] Issue with commit 087c00a2766
Hello Daniel, I see my recent commit https://github.com/kamailio/kamailio/commit/087c00a276623adad6b87242bc58f7c0b4d8ff33 fails CI. However, https://travis-ci.org/github/kamailio/kamailio/jobs/762621150 suggests it is some Docker problem. Do I need to take some action? Thank you, Lucian ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:087c00a2: carrierroute: replace faulty warning mechanism
Module: kamailio Branch: master Commit: 087c00a276623adad6b87242bc58f7c0b4d8ff33 URL: https://github.com/kamailio/kamailio/commit/087c00a276623adad6b87242bc58f7c0b4d8ff33 Author: Lucian Balaceanu Committer: Lucian Balaceanu Date: 2021-03-12T17:58:41+02:00 carrierroute: replace faulty warning mechanism - warning log for the same carrier/domain having routes with only 0 probability is now triggered through counting probabilities per carrier and domain - kudos also go to Huseyin Dikme - GH #2653 --- Modified: src/modules/carrierroute/cr_data.c Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/cr_db.h Modified: src/modules/carrierroute/cr_domain.h --- Diff: https://github.com/kamailio/kamailio/commit/087c00a276623adad6b87242bc58f7c0b4d8ff33.diff Patch: https://github.com/kamailio/kamailio/commit/087c00a276623adad6b87242bc58f7c0b4d8ff33.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Renaming userblacklist to userblocklist (#2544)
Merged #2544 into master. -- 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/2544#event-3978848224___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Renaming userblacklist to userblocklist (#2544)
:) My bad -- 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/2544#issuecomment-724694264___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Renaming userblacklist to userblocklist (#2544)
Merged #2544 into master. -- 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/2544#event-3978847246___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Renaming userblacklist to userblocklist (#2544)
Closed #2544. -- 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/2544#event-3978834797___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Renaming userblacklist to userblocklist (#2544)
Thank you. Closing the PR. -- 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/2544#issuecomment-724692518___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:b1af4ec9: kamctl: regenerated db schema for userblocklist
Module: kamailio Branch: master Commit: b1af4ec9f976febd2efb5e657938ff731d8151df URL: https://github.com/kamailio/kamailio/commit/b1af4ec9f976febd2efb5e657938ff731d8151df Author: Lucian Balaceanu Committer: Lucian Balaceanu Date: 2020-11-09T13:42:44+02:00 kamctl: regenerated db schema for userblocklist --- Added: utils/kamctl/db_berkeley/kamailio/globalblocklist Added: utils/kamctl/db_berkeley/kamailio/userblocklist Added: utils/kamctl/db_redis/kamailio/globalblocklist Added: utils/kamctl/db_redis/kamailio/userblocklist Added: utils/kamctl/db_sqlite/userblocklist-create.sql Added: utils/kamctl/dbtext/kamailio/globalblocklist Added: utils/kamctl/dbtext/kamailio/userblocklist Added: utils/kamctl/mongodb/kamailio/globalblocklist.json Added: utils/kamctl/mongodb/kamailio/userblocklist.json Added: utils/kamctl/mysql/userblocklist-create.sql Added: utils/kamctl/oracle/userblocklist-create.sql Added: utils/kamctl/postgres/userblocklist-create.sql Added: utils/kamctl/xhttp_pi/userblocklist-mod Added: utils/kamctl/xhttp_pi/userblocklist-table Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/b1af4ec9f976febd2efb5e657938ff731d8151df.diff Patch: https://github.com/kamailio/kamailio/commit/b1af4ec9f976febd2efb5e657938ff731d8151df.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:719c2987: kamctl: rename userblacklist to userblocklist
Module: kamailio
Branch: master
Commit: 719c2987fcd02186554ed880c75a8e229804c8f8
URL:
https://github.com/kamailio/kamailio/commit/719c2987fcd02186554ed880c75a8e229804c8f8
Author: Lucian Balaceanu
Committer: Lucian Balaceanu
Date: 2020-11-09T11:51:11+02:00
kamctl: rename userblacklist to userblocklist
---
Modified: utils/kamctl/kamdbctl.base
---
Diff:
https://github.com/kamailio/kamailio/commit/719c2987fcd02186554ed880c75a8e229804c8f8.diff
Patch:
https://github.com/kamailio/kamailio/commit/719c2987fcd02186554ed880c75a8e229804c8f8.patch
---
diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base
index 3846196b20..4cfd11c4f9 100644
--- a/utils/kamctl/kamdbctl.base
+++ b/utils/kamctl/kamdbctl.base
@@ -39,7 +39,7 @@ STANDARD_TABLES=${STANDARD_TABLES:-'version acc dbaliases
domain domain_attrs
usr_preferences aliases silo dialog dialog_vars dispatcher
dialplan
acc_cdrs topos_d topos_t'}
EXTRA_TABLES=${EXTRA_TABLES:-'imc_members imc_rooms cpl sip_trace domainpolicy
- carrierroute carrier_name domain_name carrierfailureroute
userblacklist
+ carrierroute carrier_name domain_name carrierfailureroute
userblocklist
globalblacklist htable purplemap uacreg pl_pipes mtree mtrees
sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine
dr_gateways dr_rules dr_gw_lists dr_groups secfilter'}
@@ -76,7 +76,7 @@ STANDARD_MODULES=${STANDARD_MODULES:-'standard acc lcr domain
group
PRESENCE_MODULES=${PRESENCE_MODULES:-'presence rls'}
EXTRA_MODULES=${EXTRA_MODULES:-'imc cpl siptrace domainpolicy carrierroute
- drouting userblacklist htable purple uac pipelimit mtree sca
mohqueue
+ drouting userblocklist htable purple uac pipelimit mtree sca
mohqueue
rtpproxy rtpengine secfilter'}
DBUID_MODULES=${UID_MODULES:-'uid_auth_db uid_avp_db uid_domain uid_gflags
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:879ca70d: src/lib/srdb1/schema: replacing denomination to blocklist/allowlist
Module: kamailio Branch: master Commit: 879ca70de76b5171706b38a65b49e1061af0e225 URL: https://github.com/kamailio/kamailio/commit/879ca70de76b5171706b38a65b49e1061af0e225 Author: Lucian Balaceanu Committer: Lucian Balaceanu Date: 2020-11-06T19:09:25+02:00 src/lib/srdb1/schema: replacing denomination to blocklist/allowlist --- Modified: src/lib/srdb1/schema/globalblocklist.xml Modified: src/lib/srdb1/schema/kamailio-userblocklist.xml Modified: src/lib/srdb1/schema/userblocklist.xml --- Diff: https://github.com/kamailio/kamailio/commit/879ca70de76b5171706b38a65b49e1061af0e225.diff Patch: https://github.com/kamailio/kamailio/commit/879ca70de76b5171706b38a65b49e1061af0e225.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:15dd032c: userblocklist: renaming userblacklist module
Module: kamailio Branch: master Commit: 15dd032c7cd4d3029aa9e0100a3d52e24ab9c2ae URL: https://github.com/kamailio/kamailio/commit/15dd032c7cd4d3029aa9e0100a3d52e24ab9c2ae Author: Lucian Balaceanu Committer: Lucian Balaceanu Date: 2020-11-06T18:13:30+02:00 userblocklist: renaming userblacklist module --- Added: src/modules/userblocklist/Makefile Added: src/modules/userblocklist/README Added: src/modules/userblocklist/db.c Added: src/modules/userblocklist/db.h Added: src/modules/userblocklist/db_userblocklist.c Added: src/modules/userblocklist/db_userblocklist.h Added: src/modules/userblocklist/doc/Makefile Added: src/modules/userblocklist/doc/userblocklist.xml Added: src/modules/userblocklist/doc/userblocklist_admin.xml Added: src/modules/userblocklist/userblocklist.c Modified: src/Makefile.groups Removed: src/modules/userblacklist/Makefile Removed: src/modules/userblacklist/README Removed: src/modules/userblacklist/db.c Removed: src/modules/userblacklist/db.h Removed: src/modules/userblacklist/db_userblacklist.c Removed: src/modules/userblacklist/db_userblacklist.h Removed: src/modules/userblacklist/doc/Makefile Removed: src/modules/userblacklist/doc/userblacklist.xml Removed: src/modules/userblacklist/doc/userblacklist_admin.xml Removed: src/modules/userblacklist/userblacklist.c --- Diff: https://github.com/kamailio/kamailio/commit/15dd032c7cd4d3029aa9e0100a3d52e24ab9c2ae.diff Patch: https://github.com/kamailio/kamailio/commit/15dd032c7cd4d3029aa9e0100a3d52e24ab9c2ae.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:33392275: src/lib/srdb1/schema: renaming userblacklist to userblocklist
Module: kamailio Branch: master Commit: 333922750e71af0af21db741de440a25443083e2 URL: https://github.com/kamailio/kamailio/commit/333922750e71af0af21db741de440a25443083e2 Author: Lucian Balaceanu Committer: Lucian Balaceanu Date: 2020-11-06T19:04:54+02:00 src/lib/srdb1/schema: renaming userblacklist to userblocklist --- Added: src/lib/srdb1/schema/globalblocklist.xml Added: src/lib/srdb1/schema/kamailio-userblocklist.xml Added: src/lib/srdb1/schema/userblocklist.xml Removed: src/lib/srdb1/schema/globalblacklist.xml Removed: src/lib/srdb1/schema/kamailio-userblacklist.xml Removed: src/lib/srdb1/schema/userblacklist.xml --- Diff: https://github.com/kamailio/kamailio/commit/333922750e71af0af21db741de440a25443083e2.diff Patch: https://github.com/kamailio/kamailio/commit/333922750e71af0af21db741de440a25443083e2.patch --- diff --git a/src/lib/srdb1/schema/globalblacklist.xml b/src/lib/srdb1/schema/globalblocklist.xml similarity index 100% rename from src/lib/srdb1/schema/globalblacklist.xml rename to src/lib/srdb1/schema/globalblocklist.xml diff --git a/src/lib/srdb1/schema/kamailio-userblacklist.xml b/src/lib/srdb1/schema/kamailio-userblocklist.xml similarity index 100% rename from src/lib/srdb1/schema/kamailio-userblacklist.xml rename to src/lib/srdb1/schema/kamailio-userblocklist.xml diff --git a/src/lib/srdb1/schema/userblacklist.xml b/src/lib/srdb1/schema/userblocklist.xml similarity index 100% rename from src/lib/srdb1/schema/userblacklist.xml rename to src/lib/srdb1/schema/userblocklist.xml ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Renaming userblacklist to userblocklist (#2544)
@lbalaceanu pushed 1 commit. b1af4ec9f976febd2efb5e657938ff731d8151df kamctl: regenerated db schema for userblocklist -- You are receiving this because you are subscribed to this thread. View it on GitHub: https://github.com/kamailio/kamailio/pull/2544/files/719c2987fcd02186554ed880c75a8e229804c8f8..b1af4ec9f976febd2efb5e657938ff731d8151df ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Renaming userblacklist to userblocklist (#2544)
@lbalaceanu pushed 1 commit. 719c2987fcd02186554ed880c75a8e229804c8f8 kamctl: rename userblacklist to userblocklist -- You are receiving this because you are subscribed to this thread. View it on GitHub: https://github.com/kamailio/kamailio/pull/2544/files/879ca70de76b5171706b38a65b49e1061af0e225..719c2987fcd02186554ed880c75a8e229804c8f8 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] Renaming userblacklist to userblocklist (#2544)
!-- Kamailio Pull Request Template -- !-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with git cherry-pick -x ... - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -- Pre-Submission Checklist !-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -- !-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-- !-- If youre unsure about any of these, dont hesitate to ask on sr-dev mailing list -- - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) Checklist: !-- Go over all points below, and after creating the PR, tick the checkboxes that apply -- - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue # (replace with an open issue number) Description !-- Describe your changes in detail -- You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2544 -- Commit Summary -- * userblocklist: renaming userblacklist module * src/lib/srdb1/schema: renaming userblacklist to userblocklist * src/lib/srdb1/schema: replacing denomination to blocklist/allowlist -- File Changes -- M src/Makefile.groups (2) R src/lib/srdb1/schema/globalblocklist.xml (18) R src/lib/srdb1/schema/kamailio-userblocklist.xml (4) R src/lib/srdb1/schema/userblocklist.xml (22) D src/modules/userblacklist/db_userblacklist.c (116) D src/modules/userblacklist/db_userblacklist.h (100) R src/modules/userblocklist/Makefile (2) R src/modules/userblocklist/README (348) R src/modules/userblocklist/db.c (38) R src/modules/userblocklist/db.h (10) A src/modules/userblocklist/db_userblocklist.c (116) A src/modules/userblocklist/db_userblocklist.h (100) R src/modules/userblocklist/doc/Makefile (2) R src/modules/userblocklist/doc/userblocklist.xml (4) R src/modules/userblocklist/doc/userblocklist_admin.xml (270) R src/modules/userblocklist/userblocklist.c (404) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2544.patch https://github.com/kamailio/kamailio/pull/2544.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/2544 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:134bf80b: carrierroute: terminology changes
Module: kamailio
Branch: master
Commit: 134bf80ba553f6855b39bdb957edfb489e4b1d39
URL:
https://github.com/kamailio/kamailio/commit/134bf80ba553f6855b39bdb957edfb489e4b1d39
Author: Lucian Balaceanu
Committer: Lucian Balaceanu
Date: 2020-10-16T12:48:25+03:00
carrierroute: terminology changes
---
Modified: src/modules/carrierroute/carrierroute.c
Modified: src/modules/carrierroute/cr_func.c
Modified: src/modules/carrierroute/doc/carrierroute_admin.xml
Modified: src/modules/carrierroute/doc/carrierroute_db.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/134bf80ba553f6855b39bdb957edfb489e4b1d39.diff
Patch:
https://github.com/kamailio/kamailio/commit/134bf80ba553f6855b39bdb957edfb489e4b1d39.patch
---
diff --git a/src/modules/carrierroute/carrierroute.c
b/src/modules/carrierroute/carrierroute.c
index 79f8f2e2dc..74705caa25 100644
--- a/src/modules/carrierroute/carrierroute.c
+++ b/src/modules/carrierroute/carrierroute.c
@@ -27,7 +27,7 @@
/*!
* \defgroup carrierroute CARRIERROUTE :: The Kamailio carrierroute Module
- * The module provides routing, balancing and blacklisting capabilities.
+ * The module provides routing, balancing and blocklisting capabilities.
* It reads routing entries from a database source or from a config file
* at Kamailio startup. It can uses one routing tree (for one carrier),
* or if needed for every user a different routing tree (unique for each
carrier)
diff --git a/src/modules/carrierroute/cr_func.c
b/src/modules/carrierroute/cr_func.c
index c4ce4d52a0..46c6902684 100644
--- a/src/modules/carrierroute/cr_func.c
+++ b/src/modules/carrierroute/cr_func.c
@@ -402,7 +402,7 @@ static int actually_rewrite(const struct route_rule *rs,
str *dest,
memcpy(p, AT_SIGN.s, AT_SIGN.len);
p += AT_SIGN.len;
}
- /* this could be an error, or a blacklisted destination */
+ /* this could be an error, or a blocklisted destination */
if (rs->host.len == 0) {
*p = '\0';
return -1;
diff --git a/src/modules/carrierroute/doc/carrierroute_admin.xml
b/src/modules/carrierroute/doc/carrierroute_admin.xml
index dee8d006f5..3b883d7515 100644
--- a/src/modules/carrierroute/doc/carrierroute_admin.xml
+++ b/src/modules/carrierroute/doc/carrierroute_admin.xml
@@ -13,9 +13,9 @@
Overview
- A module which provides routing, balancing and blacklisting
capabilities.
+ A module which provides routing, balancing and blocklisting
capabilities.
- The module provides routing, balancing and blacklisting
capabilities.
+ The module provides routing, balancing and blocklisting
capabilities.
It reads routing entries from a database source or from a
config file at
startup. It can uses one routing tree (for one carrier), or if
needed for every user
a different routing tree (unique for each carrier) for number
prefix based routing.
diff --git a/src/modules/carrierroute/doc/carrierroute_db.xml
b/src/modules/carrierroute/doc/carrierroute_db.xml
index f755d08a40..fdc0ddfc45 100644
--- a/src/modules/carrierroute/doc/carrierroute_db.xml
+++ b/src/modules/carrierroute/doc/carrierroute_db.xml
@@ -168,7 +168,7 @@ modparam("carrierroute", "carrierroute_strip_col", "strip")
carrierroute_rewrite_host_col (string)
Name of column contains the rewrite prefixes. Here you can define a
rewrite prefix
- for the localpart of the SIP URI. An empty field
represents a blacklist entry, anything else
+ for the localpart of the SIP URI. An empty field
represents a blocklist entry, anything else
is put as domain part into the Request URI of the SIP
message.
Set carrierroute_rewrite_host_col
parameter
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.3:9f8b5648: p_usrloc: reworking mdb_availability_control
Module: kamailio Branch: 5.3 Commit: 9f8b564800aa029f1d374c502c8c96272e5ea68a URL: https://github.com/kamailio/kamailio/commit/9f8b564800aa029f1d374c502c8c96272e5ea68a Author: Lucian Balaceanu Committer: Lucian Balaceanu Date: 2020-07-17T13:04:32+03:00 p_usrloc: reworking mdb_availability_control - simplify general implementation - avoid deadlock due to a process trying to acquire same lock twice (cherry picked from commit 5789c506d022dd5713072cd1fcc07a25f42e098c) (cherry picked from commit ffb0576bd7d93303fb1068a332d9477a4d04471b) --- Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_db_watch.c Modified: src/modules/p_usrloc/ul_db_watch.h --- Diff: https://github.com/kamailio/kamailio/commit/9f8b564800aa029f1d374c502c8c96272e5ea68a.diff Patch: https://github.com/kamailio/kamailio/commit/9f8b564800aa029f1d374c502c8c96272e5ea68a.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.4:ffb0576b: p_usrloc: reworking mdb_availability_control
Module: kamailio Branch: 5.4 Commit: ffb0576bd7d93303fb1068a332d9477a4d04471b URL: https://github.com/kamailio/kamailio/commit/ffb0576bd7d93303fb1068a332d9477a4d04471b Author: Lucian Balaceanu Committer: Lucian Balaceanu Date: 2020-07-17T13:02:16+03:00 p_usrloc: reworking mdb_availability_control - simplify general implementation - avoid deadlock due to a process trying to acquire same lock twice (cherry picked from commit 5789c506d022dd5713072cd1fcc07a25f42e098c) --- Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_db_watch.c Modified: src/modules/p_usrloc/ul_db_watch.h --- Diff: https://github.com/kamailio/kamailio/commit/ffb0576bd7d93303fb1068a332d9477a4d04471b.diff Patch: https://github.com/kamailio/kamailio/commit/ffb0576bd7d93303fb1068a332d9477a4d04471b.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] p_usrloc: reworking mdb_availability_control (#2399)
Thank you. -- 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/2399#issuecomment-659932871___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] p_usrloc: reworking mdb_availability_control (#2399)
Merged #2399 into master. -- 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/2399#event-3556814952___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:5789c506: p_usrloc: reworking mdb_availability_control
Module: kamailio Branch: master Commit: 5789c506d022dd5713072cd1fcc07a25f42e098c URL: https://github.com/kamailio/kamailio/commit/5789c506d022dd5713072cd1fcc07a25f42e098c Author: Lucian Balaceanu Committer: Lucian Balaceanu Date: 2020-07-14T11:49:21+03:00 p_usrloc: reworking mdb_availability_control - simplify general implementation - avoid deadlock due to a process trying to acquire same lock twice --- Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_db_watch.c Modified: src/modules/p_usrloc/ul_db_watch.h --- Diff: https://github.com/kamailio/kamailio/commit/5789c506d022dd5713072cd1fcc07a25f42e098c.diff Patch: https://github.com/kamailio/kamailio/commit/5789c506d022dd5713072cd1fcc07a25f42e098c.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] p_usrloc: reworking mdb_availability_control (#2399)
Hi, If there are no comments, I will later on merge the pull requests. @miconda, should I also backport this to 5.3, 5.4 since this also fixes a previously possible deadlock due to acquiring a lock twice? Thank you, Lucian -- 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/2399#issuecomment-658074551___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] p_usrloc: reworking mdb_availability_control (#2399)
- simplify general implementation - avoid deadlock due to a process trying to acquire same lock twice !-- Kamailio Pull Request Template -- !-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with git cherry-pick -x ... - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -- Pre-Submission Checklist !-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -- !-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-- !-- If youre unsure about any of these, dont hesitate to ask on sr-dev mailing list -- - [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: !-- Go over all points below, and after creating the PR, tick the checkboxes that apply -- - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue # (replace with an open issue number) Description !-- Describe your changes in detail -- On a timer, checking the availability of the master db used for writing and setting a status variable accordingly. In case the mdb_availability_control option is set, this status variable is consulted with no synchronization by each process when trying to do a write to the master db. As error mitigation, in case the per process handle associated with master db is NULL, p_usrlock recreates it. In case the per process handle is not NULL, Kamailio will try to recreate a broken connection by itself. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2399 -- Commit Summary -- * p_usrloc: reworking mdb_availability_control -- File Changes -- M src/modules/p_usrloc/p_usrloc_mod.c (23) M src/modules/p_usrloc/p_usrloc_mod.h (6) M src/modules/p_usrloc/ul_db.c (70) M src/modules/p_usrloc/ul_db_watch.c (15) M src/modules/p_usrloc/ul_db_watch.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2399.patch https://github.com/kamailio/kamailio/pull/2399.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/2399 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Adding CDR as JSON functionality (#2107)
Merged #2107 into master. -- 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/2107#event-2806912669___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:e3fe8e7f: acc: adding CDR engine functionality
Module: kamailio Branch: master Commit: e3fe8e7f88c53e8ce69d776e21b78531d604783d URL: https://github.com/kamailio/kamailio/commit/e3fe8e7f88c53e8ce69d776e21b78531d604783d Author: Lucian Balaceanu Committer: Lucian Balaceanu Date: 2019-11-07T15:46:13+02:00 acc: adding CDR engine functionality - the engine allows the extension of the acc module for anyone wanting to add another format (e.g. JSON) or another backend for CDRs --- Modified: src/modules/acc/acc_api.h Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_cdr.h Modified: src/modules/acc/acc_logic.c Modified: src/modules/acc/acc_logic.h Modified: src/modules/acc/acc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e3fe8e7f88c53e8ce69d776e21b78531d604783d.diff Patch: https://github.com/kamailio/kamailio/commit/e3fe8e7f88c53e8ce69d776e21b78531d604783d.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:09f1c59b: acc_json: adding CDR as JSON functionality
Module: kamailio Branch: master Commit: 09f1c59bfef99867e4a006ba882ba13951b01276 URL: https://github.com/kamailio/kamailio/commit/09f1c59bfef99867e4a006ba882ba13951b01276 Author: Lucian Balaceanu Committer: Lucian Balaceanu Date: 2019-11-13T11:52:17+02:00 acc_json: adding CDR as JSON functionality --- Modified: src/modules/acc_json/acc_json_mod.c Modified: src/modules/acc_json/acc_json_mod.h Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/09f1c59bfef99867e4a006ba882ba13951b01276.diff Patch: https://github.com/kamailio/kamailio/commit/09f1c59bfef99867e4a006ba882ba13951b01276.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Adding CDR as JSON functionality (#2107)
Should we then merge and close the pull request? -- 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/2107#issuecomment-554919680___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Adding CDR as JSON functionality (#2107)
Hi guys, I modified the commits to contain the CDR writing to the message queue as well. Please let me know what you think. -- 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/2107#issuecomment-553365305___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Adding CDR as JSON functionality (#2107)
@lbalaceanu pushed 2 commits. e3fe8e7f88c53e8ce69d776e21b78531d604783d acc: adding CDR engine functionality 09f1c59bfef99867e4a006ba882ba13951b01276 acc_json: adding CDR as JSON functionality -- You are receiving this because you are subscribed to this thread. View it on GitHub: https://github.com/kamailio/kamailio/pull/2107/files/26a4a942ffc272503d42b6f48084d6b4fee3e3df..09f1c59bfef99867e4a006ba882ba13951b01276 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Adding CDR as JSON functionality (#2107)
Hi, Please allow one or two days before merging, so that I can also add the mqueue thing. Thank you -- 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/2107#issuecomment-550190948___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] Adding CDR as JSON functionality (#2107)
!-- Kamailio Pull Request Template -- !-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with git cherry-pick -x ... - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -- Pre-Submission Checklist !-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -- !-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-- !-- If youre unsure about any of these, dont hesitate to ask on sr-dev mailing list -- - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) Checklist: !-- Go over all points below, and after creating the PR, tick the checkboxes that apply -- - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue # (replace with an open issue number) Description !-- Describe your changes in detail -- These commits create a CDR addressed engine, similar to the one that acc module exports for acc message accounting. Such an engine made an extension module like acc_json possible. This CDR engine is then used in acc_json to write the functionality for logging CDRs in JSON format. I have added functions to the API exported by acc module instead of creating another separate CDR API, as I thought this is cleaner. I only implemented the acc_json logging to syslog (no message queue support yet). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2107 -- Commit Summary -- * acc: adding CDR engine functionality * acc_json: adding CDR as JSON functionality -- File Changes -- M src/modules/acc/acc_api.h (38) M src/modules/acc/acc_cdr.c (41) M src/modules/acc/acc_cdr.h (6) M src/modules/acc/acc_logic.c (10) M src/modules/acc/acc_logic.h (2) M src/modules/acc/acc_mod.c (93) M src/modules/acc_json/acc_json_mod.c (131) M src/modules/acc_json/acc_json_mod.h (4) M src/modules/acc_json/doc/acc_json_admin.xml (54) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2107.patch https://github.com/kamailio/kamailio/pull/2107.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/2107 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] Generating CDRs in JSON format
Hello guys, I am trying to get the CDRs generated in JSON format just as acc_json module does for transactions accounting, but for now I didn't find a way to do this directly from Kamailio. Please correct me if I am wrong. As far as I understood from the code, acc_json and other modules extending the acc itself are based on the acc_engine structure that contains different function pointers. acc module, by means of acc_run_engines() then calls the appropriate functions in various places. The programming solutions are at least: * extend inside the acc module itself the (log_)write_cdr() function to offer on demand JSON output -- simple to implement, breaks the adaptability given until now by the acc engines * create a sort of an acc_engine for CDRs as well and have this called from an external module (acc_json module) Is there an implementation preference you see in order to attain this CDR as JSON? Do you have any suggestions? Thank you, Lucian Balaceanu ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Crash in pdb module (#1985)
Closed #1985. -- 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/1985#event-2441499485___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Crash in pdb module (#1985)
Issue seems to appear only when mixing v0 server and v1 client. Closing bug as your fixes are enough. -- 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/1985#issuecomment-505949753___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Crash in pdb module (#1985)
Hi @miconda ; Can you please give more info as to how the coredump was obtained, I mean on the server side? I think that the only way one can get there is mixing a version "0" utils/pdbt server with a version 1 kamailio pdb client. Your fix should of course -- 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/1985#issuecomment-505077806___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Crash in pdb module (#1985)
Thank you, looking on this. -- 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/1985#issuecomment-503515926___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] pdb: fix SIGABRT in case of too long uris (#1693)
Merged #1693 into master. -- 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/1693#event-1934367108___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:783763e8: pdb: fix SIGABRT in case of too long uris
Module: kamailio
Branch: master
Commit: 783763e8accef47aa563cd17d1e170250268751c
URL:
https://github.com/kamailio/kamailio/commit/783763e8accef47aa563cd17d1e170250268751c
Author: Lucian Balaceanu
Committer: Lucian Balaceanu
Date: 2018-10-29T11:54:45+02:00
pdb: fix SIGABRT in case of too long uris
buf in pdb_msg_dbg should correctly accomodate for pdb_bdy size
pdb_hdr + pdb_bdy should add to pdb_hdr.length (max 255)
---
Modified: src/modules/pdb/common.h
Modified: src/modules/pdb/pdb.c
---
Diff:
https://github.com/kamailio/kamailio/commit/783763e8accef47aa563cd17d1e170250268751c.diff
Patch:
https://github.com/kamailio/kamailio/commit/783763e8accef47aa563cd17d1e170250268751c.patch
---
diff --git a/src/modules/pdb/common.h b/src/modules/pdb/common.h
index 1ba16cdf98..7c52c97ce0 100644
--- a/src/modules/pdb/common.h
+++ b/src/modules/pdb/common.h
@@ -35,7 +35,8 @@
#define OTHER_CARRIERID 1000
#define MAX_CARRIERID 1000
#define NULL_CARRIERID -1001
-#define PAYLOADSIZE 256
+/* hdr size + PAYLOADSIZE must add to 255 (uint8_t pdb_hdr.length) */
+#define PAYLOADSIZE 249
#define IS_VALID_PDB_CARRIERID(id) ((id>=MIN_PDB_CARRIERID) &&
(id<=MAX_PDB_CARRIERID))
diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c
index 8f2f80c326..eb59656734 100644
--- a/src/modules/pdb/pdb.c
+++ b/src/modules/pdb/pdb.c
@@ -145,7 +145,7 @@ static struct server_list_t *server_list;
/* debug function for the new client <-> server protocol */
static void pdb_msg_dbg(struct pdb_msg msg, char *dbg_msg) {
int i;
-char buf[PAYLOADSIZE];
+char buf[PAYLOADSIZE * 3 + 1];
char *ptr = buf;
for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) {
@@ -265,7 +265,7 @@ static int pdb_query(struct sip_msg *_msg, struct
multiparam_t *_number, struct
/* prepare request */
reqlen = number.len + 1; /* include null termination */
- if (reqlen > sizeof(struct pdb_bdy)) {
+ if (reqlen > PAYLOADSIZE) {
LM_ERR("number too long '%.*s'.\n", number.len, number.s);
return -1;
}
@@ -305,6 +305,7 @@ static int pdb_query(struct sip_msg *_msg, struct
multiparam_t *_number, struct
break;
}
+ memset(, 0, sizeof(struct pdb_msg));
/* wait for response */
for (;;) {
if (gettimeofday(, NULL) != 0) {
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] pdb: fix SIGABRT in case of too long uris (#1693)
buf in pdb_msg_dbg should correctly accomodate for pdb_bdy size pdb_hdr + pdb_bdy should add to pdb_hdr.length (max 255) Pre-Submission Checklist - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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: - [x ] PR should be backported to stable branches - [x ] Tested changes locally - [ ] Related to issue # (replace with an open issue number) Description Can I also port this back to 4.4? Thank you. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1693 -- Commit Summary -- * pdb: fix SIGABRT in case of too long uris -- File Changes -- M src/modules/pdb/common.h (3) M src/modules/pdb/pdb.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1693.patch https://github.com/kamailio/kamailio/pull/1693.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/1693 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] Remove check for msg->msg_flags inside corex module ?
Thank you for the answer. We are doing some tests and if they prove
meaningful I'll drop a line about this corex_lib append_branch.
Have a nice day,
Lucian
On 13.07.2018 15:09, Daniel-Constantin Mierla wrote:
Hello,
well, not sure at this moment because would take some time to analyze
what execution paths can end up there. I did look and I saw that
path_vec field is cloned in shm, so doing pkg_free() on that value will
fail.
If it ends up to that code when the value is not the cloned one, then it
should be ok. On the other hand, the shm clone flag can be set even when
path_vec points to a pkg address to due execution on a faked request.
Because of these cases, I just added a helper function to check if a
pointer is inside shared memory, see:
*
https://github.com/kamailio/kamailio/commit/1a20bcaa35db4aa80d6460dfb0fb9c70026248c9
Maybe this is safer overall and we can change in other parts where we
rely on some tricks to see if it is pkg or shm -- in many cases related
to processing in context of transaction/tm module, pkg needs to be free
and shm is cloned in a continuous block to be freed at once.
If you find this solution acceptable, then you can go ahead and push a
commit using shm_address_in(). That might be safe to be added in
reset_path_vector() as well, to avoid troubles if someone calls it for a
shm cloned shm structure.
Cheers,
Daniel
On 13.07.18 13:06, Lucian Balaceanu wrote:
Hi guys,
Seeing the https://github.com/kamailio/kamailio/pull/1144 about fixing
a memory leak in the tm module due to incorrectly using FL_SHM_CLONE
when freing path_vec memory, isn't there a case that a similar patch
should be applied to corex/corex_lib.c ?
Inside corex_append_branch(..) function:
/* if this is a cloned message, don't free the path vector as it was
copied into shm memory and will be freed as contiguous block*/
if (!(msg->msg_flags_SHM_CLONE)) {
if(msg->path_vec.s!=0)
pkg_free(msg->path_vec.s);
msg->path_vec.s = 0;
msg->path_vec.len = 0;
}
Maybe we should switch to:
if(msg->path_vec.s!=0)
pkg_free(msg->path_vec.s);
msg->path_vec.s = 0;
msg->path_vec.len = 0;
If you agree this is the case, I will prepare a pull request.
Thank you,
Lucian
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] Remove check for msg->msg_flags inside corex module ?
Hi guys,
Seeing the https://github.com/kamailio/kamailio/pull/1144 about fixing a
memory leak in the tm module due to incorrectly using FL_SHM_CLONE when
freing path_vec memory, isn't there a case that a similar patch should
be applied to corex/corex_lib.c ?
Inside corex_append_branch(..) function:
/* if this is a cloned message, don't free the path vector as it was
copied into shm memory and will be freed as contiguous block*/
if (!(msg->msg_flags_SHM_CLONE)) {
if(msg->path_vec.s!=0)
pkg_free(msg->path_vec.s);
msg->path_vec.s = 0;
msg->path_vec.len = 0;
}
Maybe we should switch to:
if(msg->path_vec.s!=0)
pkg_free(msg->path_vec.s);
msg->path_vec.s = 0;
msg->path_vec.len = 0;
If you agree this is the case, I will prepare a pull request.
Thank you,
Lucian
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] Remove check for msg->msg_flags inside corex module ?
Hi guys,
Seeing the https://github.com/kamailio/kamailio/pull/1144 about fixing a
memory leak in the tm module due to incorrectly using FL_SHM_CLONE when
freing path_vec memory, isn't there a case that a similar patch should
be applied to corex/corex_lib.c ?
Inside corex_append_branch(..) function:
/* if this is a cloned message, don't free the path vector as it was
copied into shm memory and will be freed as contiguous block*/
if (!(msg->msg_flags_SHM_CLONE)) {
if(msg->path_vec.s!=0)
pkg_free(msg->path_vec.s);
msg->path_vec.s = 0;
msg->path_vec.len = 0;
}
Maybe we should switch to:
if(msg->path_vec.s!=0)
pkg_free(msg->path_vec.s);
msg->path_vec.s = 0;
msg->path_vec.len = 0;
If you agree this is the case, I will prepare a pull request.
Thank you,
Lucian
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] p_usrloc: new parameter "mdb_availability_control" has been created. (#1529)
Merged #1529. -- 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/1529#event-1641923369___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] p_usrloc: new parameter "mdb_availability_control" has been created. (#1529)
lbalaceanu commented on this pull request.
> @@ -149,6 +152,25 @@ void check_dbs(unsigned int ticks, void *param){
lock_release(list_lock);
}
+void check_master_db(int dbm_write_default) {
+ if(mdb_availability_control) {
+ if(mdb.write.dbh){
Is it necessary to close the connection each time when verifying it?
> @@ -677,6 +677,26 @@ modparam("usrloc", "db_update_as_insert", 1)
...
modparam("p_usrloc", "default_db_url", "mysql://ser:ser@localhost/ser")
...
+
Since this is related to write_on_master_db, please move this documentation
under the write_on_master_db parameter.
> @@ -102,13 +102,16 @@ int ul_db_child_init(void) {
if(ul_db_child_locnr_init() == -1) return -1;
LM_INFO("location number is %d\n", max_loc_nr);
- if(db_master_write){
+lock_get(_on_master_db_shared->lock);
Check whether in ul_db_init() you need to acquire locks at all. It seems like
this function is called one time only, before any fork is done, so most
probably no synchronisation is needed. Same for lock release.
--
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/1529#pullrequestreview-122112955___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] p_usrloc: new parameter "mdb_availability_control" has been created. (#1529)
lbalaceanu commented on this pull request.
I will continue the review tomorrow.
> @@ -307,6 +309,13 @@ static int mod_init(void)
}
#endif
+ if((write_on_master_db_shared = shm_malloc(sizeof(dbm_write_t))) ==
NULL) {
Make sure to shm_free this allocated memory.
> @@ -123,5 +123,11 @@ extern int connection_expires;
extern int alg_location;
extern int max_loc_nr;
+typedef struct dbm_write {
Structure name must be a noun.
> @@ -96,7 +96,10 @@ void check_dbs(unsigned int ticks, void *param){
ul_db_handle_list_t * tmp2, * new_element;
int found;
int i;
-
+
+ if(mdb_availability_control) {
mdb_availability_control is also checked inside check_master_db() function.
--
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/1529#pullrequestreview-121849062___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:6770fe86: carrierroute: fixed duplicate options definition error when parsing src file
Module: kamailio
Branch: 5.1
Commit: 6770fe866dc6ed301b536a6132dc50e9844e720e
URL:
https://github.com/kamailio/kamailio/commit/6770fe866dc6ed301b536a6132dc50e9844e720e
Author: Lucian Balaceanu <lucian.balace...@1and1.ro>
Committer: Lucian Balaceanu <lucian.balace...@1and1.ro>
Date: 2018-04-04T14:04:55+03:00
carrierroute: fixed duplicate options definition error when parsing src file
- added logic to reset_prefix_opts to reset all target_options fields
(including "visited")
(cherry picked from commit dc8faaf57a9c85b7133f112bdedd328a9520eb73)
---
Modified: src/modules/carrierroute/cr_config.c
---
Diff:
https://github.com/kamailio/kamailio/commit/6770fe866dc6ed301b536a6132dc50e9844e720e.diff
Patch:
https://github.com/kamailio/kamailio/commit/6770fe866dc6ed301b536a6132dc50e9844e720e.patch
---
diff --git a/src/modules/carrierroute/cr_config.c
b/src/modules/carrierroute/cr_config.c
index 40523d9544..920ae4142c 100644
--- a/src/modules/carrierroute/cr_config.c
+++ b/src/modules/carrierroute/cr_config.c
@@ -97,6 +97,9 @@ static int init_target_opts(){
}
static void reset_prefix_opts(){
+ memset(&(target_options[PO_MAX_TARGETS].value),'\0', sizeof(union
opt_data));
+ prefix_options[PO_MAX_TARGETS].visited = 0;
+ prefix_options[PO_MAX_TARGETS].no_elems = 0;
prefix_options[PO_MAX_TARGETS].value.int_data=-1;
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio start failed as carrierrouter (#1492)
Closed #1492. -- 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/1492#event-1556172938___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio start failed as carrierrouter (#1492)
I have pushed https://github.com/kamailio/kamailio/commit/dc8faaf57a9c85b7133f112bdedd328a9520eb73 on the master branch. For me it solved the problem. Could you confirm that this is also the case for you so that we can close the issue? -- 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/1492#issuecomment-378515303___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:dc8faaf5: carrierroute: fixed duplicate options definition error when parsing src file
Module: kamailio
Branch: master
Commit: dc8faaf57a9c85b7133f112bdedd328a9520eb73
URL:
https://github.com/kamailio/kamailio/commit/dc8faaf57a9c85b7133f112bdedd328a9520eb73
Author: Lucian Balaceanu <lucian.balace...@1and1.ro>
Committer: Lucian Balaceanu <lucian.balace...@1and1.ro>
Date: 2018-04-04T10:52:56+03:00
carrierroute: fixed duplicate options definition error when parsing src file
- added logic to reset_prefix_opts to reset all target_options fields
(including "visited")
---
Modified: src/modules/carrierroute/cr_config.c
---
Diff:
https://github.com/kamailio/kamailio/commit/dc8faaf57a9c85b7133f112bdedd328a9520eb73.diff
Patch:
https://github.com/kamailio/kamailio/commit/dc8faaf57a9c85b7133f112bdedd328a9520eb73.patch
---
diff --git a/src/modules/carrierroute/cr_config.c
b/src/modules/carrierroute/cr_config.c
index 40523d9544..920ae4142c 100644
--- a/src/modules/carrierroute/cr_config.c
+++ b/src/modules/carrierroute/cr_config.c
@@ -97,6 +97,9 @@ static int init_target_opts(){
}
static void reset_prefix_opts(){
+ memset(&(target_options[PO_MAX_TARGETS].value),'\0', sizeof(union
opt_data));
+ prefix_options[PO_MAX_TARGETS].visited = 0;
+ prefix_options[PO_MAX_TARGETS].no_elems = 0;
prefix_options[PO_MAX_TARGETS].value.int_data=-1;
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio start failed as carrierrouter (#1492)
The problem is with the reset of a prefix options structure. This is due to a recent change in the code. I will come up with a fix. -- 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/1492#issuecomment-378493514___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:cb6df953: rtpengine: adding aggressive_redetection param
Module: kamailio
Branch: master
Commit: cb6df95387186fab8670d17cfd8040de1b7f641e
URL:
https://github.com/kamailio/kamailio/commit/cb6df95387186fab8670d17cfd8040de1b7f641e
Author: Lucian Balaceanu <lucian.balace...@1and1.ro>
Committer: Lucian Balaceanu <lucian.balace...@1and1.ro>
Date: 2018-01-12T13:36:34+02:00
rtpengine: adding aggressive_redetection param
---
Modified: src/modules/rtpengine/config.c
Modified: src/modules/rtpengine/config.h
Modified: src/modules/rtpengine/doc/rtpengine_admin.xml
Modified: src/modules/rtpengine/rtpengine.c
---
Diff:
https://github.com/kamailio/kamailio/commit/cb6df95387186fab8670d17cfd8040de1b7f641e.diff
Patch:
https://github.com/kamailio/kamailio/commit/cb6df95387186fab8670d17cfd8040de1b7f641e.patch
---
diff --git a/src/modules/rtpengine/config.c b/src/modules/rtpengine/config.c
index f2aa4efc0a..946df8a30c 100644
--- a/src/modules/rtpengine/config.c
+++ b/src/modules/rtpengine/config.c
@@ -32,6 +32,7 @@
struct cfg_group_rtpengine default_rtpengine_cfg = {
60, /* default disable timeout in seconds */
+ 1, /* default aggressive_redetection enabled */
1000, /* default wait timeout in milliseconds */
MAX_RTPP_TRIED_NODES,
5, /* rtprengine retries */
@@ -42,6 +43,8 @@ void *rtpengine_cfg = _rtpengine_cfg;
cfg_def_t rtpengine_cfg_def[] = {
{"rtpengine_disable_tout", CFG_VAR_INT | CFG_ATOMIC, 0, 0,
0, 0,
"The time after which rtpengine will try to communicate to an
RTP proxy after it has been marked disabled automatically. "},
+ {"aggressive_redetection", CFG_VAR_INT | CFG_ATOMIC, 0, 1,
0, 0,
+ "Determines if the sip proxy should force a query of all nodes
when all RTP proxies seem unavailable."},
{"rtpengine_tout_ms", CFG_VAR_INT | CFG_ATOMIC, 0, 0,
0, 0,
"The total number of nodes inside a set to be queried before
giving up establishing a session"},
{"queried_nodes_limit", CFG_VAR_INT | CFG_ATOMIC, 0,
MAX_RTPP_TRIED_NODES, 0, 0,
diff --git a/src/modules/rtpengine/config.h b/src/modules/rtpengine/config.h
index ab383bc69b..d6c35b71ac 100644
--- a/src/modules/rtpengine/config.h
+++ b/src/modules/rtpengine/config.h
@@ -28,6 +28,7 @@
struct cfg_group_rtpengine {
unsigned intrtpengine_disable_tout;
+ unsigned intaggressive_redetection;
unsigned intrtpengine_tout_ms;
unsigned intqueried_nodes_limit;
unsigned intrtpengine_retr;
diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml
b/src/modules/rtpengine/doc/rtpengine_admin.xml
index 4133eb93c2..bc31168f63 100644
--- a/src/modules/rtpengine/doc/rtpengine_admin.xml
+++ b/src/modules/rtpengine/doc/rtpengine_admin.xml
@@ -194,6 +194,33 @@ modparam("rtpengine", "rtpengine_sock",
...
modparam("rtpengine", "rtpengine_disable_tout", 20)
...
+
+
+
+
+ aggressive_redetection
(integer)
+
+ This parameter determines what happens when all potential
rtpengines are found
+ to be unreachable. If enabled, the sip server will send pings
to all rtpengines,
+ else no rtpengine will pe queried until its
rtpengine_disable_tout timeout passes.
+
+
+
+ Default value is 1.
+
+
+
+ Can be set at runtime, e.g.:
+
+ $ cfg.set_now_int rtpengine
aggressive_redetection 0
+
+
+
+ Set aggressive_redetection
parameter
+
+...
+modparam("rtpengine", "aggressive_redetection", 0)
+...
diff --git a/src/modules/rtpengine/rtpengine.c
b/src/modules/rtpengine/rtpengine.c
index 5b82988229..6ad0c16d7e 100644
--- a/src/modules/rtpengine/rtpengine.c
+++ b/src/modules/rtpengine/rtpengine.c
@@ -336,6 +336,7 @@ static param_export_t params[] = {
{"rtpengine_sock",PARAM_STRING|USE_FUNC_PARAM,
(void*)rtpengine_set_store },
{"rtpengine_disable_tout",INT_PARAM,
_rtpengine_cfg.rtpengine_disable_tout },
+ {"aggressive_redetection",INT_PARAM,
_rtpengine_cfg.aggressive_redetection },
{"rtpengine_retr",INT_PARAM,
_rtpengine_cfg.rtpengine_retr },
{"queried_nodes_limit", INT_PARAM,
_rtpengine_cfg.queried_nodes_limit},
{"rtpengine_tout_ms", INT_PARAM,
_rtpengine_cfg.rtpengine_tout_ms },
@@ -2610,6 +2611,10 @@ select_rtpp_node_new(str callid, str viabranch, int
Re: [sr-dev] [kamailio/kamailio] p_usrloc: Fix #1265: missing columns in location.sql file. (#1266)
Hello Daniel, location.sql is the only changed file. I see in the src/lib/srdb1/schema/location.sql that this is documented as belonging to usrloc and that the columns are present there. Should I create a similar xml for p_usrloc used tables? Thank you -- 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/1266#issuecomment-335179910___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:b8d5c7fb: p_usrloc: location.sql missing INSTANCE_COL
Module: kamailio Branch: master Commit: b8d5c7fbe994bb581c1e78285f08ec1980f6b89f URL: https://github.com/kamailio/kamailio/commit/b8d5c7fbe994bb581c1e78285f08ec1980f6b89f Author: Lucian Balaceanu <lucian.balace...@1and1.ro> Committer: Lucian Balaceanu <lucian.balace...@1and1.ro> Date: 2017-10-09T16:05:01+03:00 p_usrloc: location.sql missing INSTANCE_COL --- Modified: src/modules/p_usrloc/location.sql --- Diff: https://github.com/kamailio/kamailio/commit/b8d5c7fbe994bb581c1e78285f08ec1980f6b89f.diff Patch: https://github.com/kamailio/kamailio/commit/b8d5c7fbe994bb581c1e78285f08ec1980f6b89f.patch --- diff --git a/src/modules/p_usrloc/location.sql b/src/modules/p_usrloc/location.sql index e729c0f94e..9f39dd4218 100644 --- a/src/modules/p_usrloc/location.sql +++ b/src/modules/p_usrloc/location.sql @@ -17,6 +17,7 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INT(11) DEFAULT NULL, +instance VARCHAR(255) DEFAULT NULL, reg_id INTEGER DEFAULT 0 NOT NULL ) ENGINE=MyISAM; ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] p_usrloc: location.sql missing RUID_COL and REG_ID_COL (#1265)
Hello, p_usrloc has not been kept up to date with latest usrloc and as such for now I cannot tell you if the seemingly superset of columns in the usrloc-create.sql does it. If we only had one sql, the patching would also have to be done in the unlikely case that usrloc would delete fields in the usrloc-create.sql imho. Thanks -- 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/1265#issuecomment-335147189___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] p_usrloc: Fix #1265: missing columns in location.sql file. (#1266)
Thank you for your fix. -- 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/1266#issuecomment-335145249___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] p_usrloc: location.sql missing RUID_COL and REG_ID_COL (#1265)
Closed #1265 via 9be2a96651f743af0a22d0534ee9fc90e857d484. -- 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/1265#event-1284021531___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] p_usrloc: Fix #1265: missing columns in location.sql file. (#1266)
Merged #1266. -- 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/1266#event-1284021462___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] carrierroute: warning for the same carrier/domain having routes with only 0 probability (#1233)
Merged #1233. -- 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/1233#event-1245345074___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] carrierroute: warning for the same carrier/domain having routes with only 0 probability (#1232)
lbalaceanu commented on this pull request.
> @@ -352,6 +353,7 @@ int load_route_data_db(struct route_data_t * rd) {
}
}
int n = 0;
+ boolean query_done = true;
Please change query_done to false here and adapt the code accordingly. The name
of the variable should reflect the value it holds.
--
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/1232#pullrequestreview-62101949___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:43a12b88: p_usrloc: value checks for db_ops_ruid, db_update_as_insert
Module: kamailio
Branch: master
Commit: 43a12b88aa7ae018d92815628debe4c924e2b58f
URL:
https://github.com/kamailio/kamailio/commit/43a12b88aa7ae018d92815628debe4c924e2b58f
Author: Lucian Balaceanu <lucian.balace...@1and1.ro>
Committer: Lucian Balaceanu <lucian.balace...@1and1.ro>
Date: 2017-09-11T10:18:17+03:00
p_usrloc: value checks for db_ops_ruid, db_update_as_insert
---
Modified: src/modules/p_usrloc/config.c
---
Diff:
https://github.com/kamailio/kamailio/commit/43a12b88aa7ae018d92815628debe4c924e2b58f.diff
Patch:
https://github.com/kamailio/kamailio/commit/43a12b88aa7ae018d92815628debe4c924e2b58f.patch
---
diff --git a/src/modules/p_usrloc/config.c b/src/modules/p_usrloc/config.c
index fd04ca63e5..b1b1417fd4 100644
--- a/src/modules/p_usrloc/config.c
+++ b/src/modules/p_usrloc/config.c
@@ -46,9 +46,9 @@ cfg_def_t p_usrloc_cfg_def[] = {
" Specifies the error value on which a database shall be turned
off. "},
{"failover_level", CFG_VAR_INT | CFG_ATOMIC, 0, 0,
0, 0,
"Specifies the manner a failover is done (1 = turn off, 2 =
find a spare) "},
- {"db_ops_ruid", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0,
+ {"db_ops_ruid", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0,
"Set this if you want to update / delete from DB using ruid
value "},
- {"db_update_as_insert", CFG_VAR_INT | CFG_ATOMIC, 0, 0,
0, 0,
+ {"db_update_as_insert", CFG_VAR_INT | CFG_ATOMIC, 0, 1,
0, 0,
"Set this parameter if you want to do INSERT DB operations
instead of UPDATE DB operations. "},
{0, 0, 0, 0, 0, 0}
};
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:fda5be33: p_usrloc: add config framework support for certain parameters
Module: kamailio Branch: master Commit: fda5be331d24342beb5b50e7171b4a3be9c5b4fc URL: https://github.com/kamailio/kamailio/commit/fda5be331d24342beb5b50e7171b4a3be9c5b4fc Author: Lucian Balaceanu <lucian.balace...@1and1.ro> Committer: Lucian Balaceanu <lucian.balace...@1and1.ro> Date: 2017-09-05T14:21:40+03:00 p_usrloc: add config framework support for certain parameters The following params are now configurable via kamcmd cfg: expire_time, db_err_threshold, failover_level, db_ops_ruid, db_update_as_insert --- Added: src/modules/p_usrloc/config.c Added: src/modules/p_usrloc/config.h Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ucontact.c Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_db_failover.c Modified: src/modules/p_usrloc/ul_db_handle.c Modified: src/modules/p_usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/fda5be331d24342beb5b50e7171b4a3be9c5b4fc.diff Patch: https://github.com/kamailio/kamailio/commit/fda5be331d24342beb5b50e7171b4a3be9c5b4fc.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:d58fdb7c: p_usrloc: fix dereference before null check in code path
Module: kamailio
Branch: master
Commit: d58fdb7c4e2e96a1bb2c64a47cc2b17e4bd03b4e
URL:
https://github.com/kamailio/kamailio/commit/d58fdb7c4e2e96a1bb2c64a47cc2b17e4bd03b4e
Author: Lucian Balaceanu <lucian.balace...@1and1.ro>
Committer: Lucian Balaceanu <lucian.balace...@1and1.ro>
Date: 2017-08-03T10:28:28+03:00
p_usrloc: fix dereference before null check in code path
---
Modified: src/modules/p_usrloc/ul_db_query.c
---
Diff:
https://github.com/kamailio/kamailio/commit/d58fdb7c4e2e96a1bb2c64a47cc2b17e4bd03b4e.diff
Patch:
https://github.com/kamailio/kamailio/commit/d58fdb7c4e2e96a1bb2c64a47cc2b17e4bd03b4e.patch
---
diff --git a/src/modules/p_usrloc/ul_db_query.c
b/src/modules/p_usrloc/ul_db_query.c
index 6185e35d2f..eff45a07e1 100644
--- a/src/modules/p_usrloc/ul_db_query.c
+++ b/src/modules/p_usrloc/ul_db_query.c
@@ -37,13 +37,15 @@ int db_query(ul_db_handle_t * handle, db1_con_t *** _r_h,
db_func_t ** _r_f,
int i;
int err[DB_NUM];
int ret = -1;
- order_dbs(handle, order);
- memset(err, 0 , sizeof(int) * DB_NUM);
if(!handle || !table || !table->s || !_r_h) {
LM_ERR("NULL pointer in parameter.\n");
return -1;
}
+
+ order_dbs(handle, order);
+ memset(err, 0 , sizeof(int) * DB_NUM);
+
i = 0;
do {
LM_DBG("now trying id %i, db %i.\n", handle->id,
handle->db[order[i]].no);
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:f567695d: p_usrloc: remove unnecessary increment
Module: kamailio
Branch: master
Commit: f567695de9ecbb5a5bffe4e212a294df2753a519
URL:
https://github.com/kamailio/kamailio/commit/f567695de9ecbb5a5bffe4e212a294df2753a519
Author: Lucian Balaceanu <lucian.balace...@1and1.ro>
Committer: Lucian Balaceanu <lucian.balace...@1and1.ro>
Date: 2017-08-03T10:28:28+03:00
p_usrloc: remove unnecessary increment
---
Modified: src/modules/p_usrloc/ul_db_watch.c
---
Diff:
https://github.com/kamailio/kamailio/commit/f567695de9ecbb5a5bffe4e212a294df2753a519.diff
Patch:
https://github.com/kamailio/kamailio/commit/f567695de9ecbb5a5bffe4e212a294df2753a519.patch
---
diff --git a/src/modules/p_usrloc/ul_db_watch.c
b/src/modules/p_usrloc/ul_db_watch.c
index 903abb0b39..d736f942c9 100644
--- a/src/modules/p_usrloc/ul_db_watch.c
+++ b/src/modules/p_usrloc/ul_db_watch.c
@@ -145,7 +145,6 @@ void check_dbs(unsigned int ticks, void *param){
ul_db_check(handles->handle);
}
tmp = tmp->next;
- i++;
}
lock_release(list_lock);
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
