[sr-dev] Re: [kamailio/kamailio] dispatcher: add option to retain existing latency stats when reloading destinations (PR #3534)
Thanks @henningw! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3534#issuecomment-1681988641 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] dispatcher: add option to retain existing latency stats when reloading destinations (PR #3534)
@charlesrchance pushed 1 commit. 011dca2e5a07d76b46e86c7fa4ac4fbe3a5851a0 dispatcher: add option to retain existing latency stats when reloading destinations -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3534/files/852dc0848843b2886da3edfa9d1fd96c04e182aa..011dca2e5a07d76b46e86c7fa4ac4fbe3a5851a0 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] dispatcher: add option to retain existing latency stats when reloading destinations (PR #3534)
@charlesrchance pushed 1 commit. 852dc0848843b2886da3edfa9d1fd96c04e182aa dispatcher: add option to retain existing latency stats when reloading destinations -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3534/files/c91cf41c07a465715db41c6e5038853b53c923af..852dc0848843b2886da3edfa9d1fd96c04e182aa 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] dispatcher: add option to retain existing latency stats when reloading destinations (PR #3534)
Thanks! I agree...happy to make it the default if others think the same, but we never quite know how it's already being used and who relies on a reload to actually reset the stats. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3534#issuecomment-1671236937 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] dispatcher: add option to retain existing latency stats when reloading destinations (PR #3534)
@charlesrchance pushed 1 commit. c91cf41c07a465715db41c6e5038853b53c923af dispatcher: add option to retain existing latency stats when reloading destinations -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3534/files/0b62aff26c8ff93be053338c7916385b6f4f8ecb..c91cf41c07a465715db41c6e5038853b53c923af 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] dispatcher: add option to retain existing latency stats when reloading destinations (PR #3534)
@charlesrchance pushed 1 commit. 0b62aff26c8ff93be053338c7916385b6f4f8ecb dispatcher: add option to retain existing latency stats when reloading destinations -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3534/files/6abea9f424b98ffa71471b21de021bba091054dd..0b62aff26c8ff93be053338c7916385b6f4f8ecb 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] dispatcher: add option to retain existing latency stats when reloading destinations (PR #3534)
@charlesrchance pushed 1 commit. 6abea9f424b98ffa71471b21de021bba091054dd dispatcher: add option to retain existing latency stats when reloading destinations -- View it on GitHub: https://github.com/kamailio/kamailio/pull/3534/files/1534bce84779117f7815893953f7e8b6098da9dd..6abea9f424b98ffa71471b21de021bba091054dd 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] dispatcher: add option to retain existing latency stats when reloading destinations (PR #3534)
!-- 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 -- - [ ] 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 -- Added new module param to enable retention of call stats for existing destinations when reloading the list from file or database. Also updated to retain stats for other destinations when adding/removing individual ones via RPC. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3534 -- Commit Summary -- * dispatcher: add option to retain existing latency stats when reloading destinations -- File Changes -- M src/modules/dispatcher/dispatch.c (63) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/dispatcher.c (2) M src/modules/dispatcher/doc/dispatcher_admin.xml (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3534.patch https://github.com/kamailio/kamailio/pull/3534.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3534 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] [kamailio/kamailio] core: use third array element when generating totag suffix (#2696)
!-- 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 -- Since totag suffix generation was updated in 5.3 to increase randomness, the third element of the array in both parts - via1 branch and call-id - have never been included. The result is that for any given host/port the generated totag is always the same, causing issues with some UAs - specifically relating to presence subscriptions in the cases identified. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2696 -- Commit Summary -- * core: use third array element when generating totag suffix -- File Changes -- M src/core/tags.h (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2696.patch https://github.com/kamailio/kamailio/pull/2696.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/2696 ___ 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] dmq_usrloc: output AoR on warning message (#1929)
Merged #1929 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/1929#event-2285475262___ 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] dmq_usrloc: output AoR on warning message (#1929)
Looks good, 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/pull/1929#issuecomment-484475139___ 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] Infinite loop inside htable module during dmq synch (#1863)
Closed #1863. -- 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/1863#event-2172429887___ 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] Infinite loop inside htable module during dmq synch (#1863)
Fix has been merged/backported. Please reopen if still experiencing issues. -- 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/1863#issuecomment-468454254___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.2:cb58a13f: htable: fix infinite loop during dmq sync of large tables
Module: kamailio
Branch: 5.2
Commit: cb58a13f3a7594e721c08ef9aff458108e05db57
URL:
https://github.com/kamailio/kamailio/commit/cb58a13f3a7594e721c08ef9aff458108e05db57
Author: Charles Chance
Committer: Charles Chance
Date: 2019-02-28T19:17:36Z
htable: fix infinite loop during dmq sync of large tables
- reported by Enrico Bandiera (GH #1863)
(cherry picked from commit a176ad4fb4167e21b01974e6a5caba330b1d7e14)
---
Modified: src/modules/htable/ht_dmq.c
---
Diff:
https://github.com/kamailio/kamailio/commit/cb58a13f3a7594e721c08ef9aff458108e05db57.diff
Patch:
https://github.com/kamailio/kamailio/commit/cb58a13f3a7594e721c08ef9aff458108e05db57.patch
---
diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c
index 986c2c769a..1f27e97684 100644
--- a/src/modules/htable/ht_dmq.c
+++ b/src/modules/htable/ht_dmq.c
@@ -139,36 +139,43 @@ static int ht_dmq_cell_group_flush(dmq_node_t* node) {
srjson_doc_t *jdoc = _dmq_jdoc_cell_group.jdoc;
srjson_t *jdoc_cells = ht_dmq_jdoc_cell_group.jdoc_cells;
+ int ret = 0;
srjson_AddItemToObject(jdoc, jdoc->root, "cells", jdoc_cells);
- LM_DBG("json[%s]\n", srjson_PrintUnformatted(jdoc, jdoc->root));
+ LM_DBG("jdoc size[%d]\n", ht_dmq_jdoc_cell_group.size);
jdoc->buf.s = srjson_PrintUnformatted(jdoc, jdoc->root);
if(jdoc->buf.s==NULL) {
LM_ERR("unable to serialize data\n");
- return -1;
+ ret = -1;
+ goto cleanup;
}
jdoc->buf.len = strlen(jdoc->buf.s);
LM_DBG("sending serialized data %.*s\n", jdoc->buf.len, jdoc->buf.s);
if (ht_dmq_send(>buf, node)!=0) {
LM_ERR("unable to send data\n");
- return -1;
+ ret = -1;
}
- LM_DBG("jdoc size[%d]\n", ht_dmq_jdoc_cell_group.size);
+cleanup:
+
+ srjson_DeleteItemFromObject(jdoc, jdoc->root, "cells");
+ ht_dmq_jdoc_cell_group.count = 0;
+ ht_dmq_jdoc_cell_group.size = dmq_cell_group_empty_size;
+
+ if(jdoc->buf.s!=NULL) {
+ jdoc->free_fn(jdoc->buf.s);
+ jdoc->buf.s = NULL;
+ }
- srjson_Delete(jdoc, jdoc_cells);
ht_dmq_jdoc_cell_group.jdoc_cells =
srjson_CreateArray(_dmq_jdoc_cell_group.jdoc);
if (ht_dmq_jdoc_cell_group.jdoc_cells==NULL) {
LM_ERR("cannot re-create json cells array! \n");
- return -1;
+ ret = -1;
}
- ht_dmq_jdoc_cell_group.count = 0;
- ht_dmq_jdoc_cell_group.size = dmq_cell_group_empty_size;
-
- return 0;
+ return ret;
}
static void ht_dmq_cell_group_destroy() {
___
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] htable: fix infinite loop during dmq sync of large tables (#1872)
Merged #1872 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/1872#event-2172034830___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:a176ad4f: htable: fix infinite loop during dmq sync of large tables
Module: kamailio
Branch: master
Commit: a176ad4fb4167e21b01974e6a5caba330b1d7e14
URL:
https://github.com/kamailio/kamailio/commit/a176ad4fb4167e21b01974e6a5caba330b1d7e14
Author: Charles Chance
Committer: Charles Chance
Date: 2019-02-21T19:27:32Z
htable: fix infinite loop during dmq sync of large tables
- reported by Enrico Bandiera (GH #1863)
---
Modified: src/modules/htable/ht_dmq.c
---
Diff:
https://github.com/kamailio/kamailio/commit/a176ad4fb4167e21b01974e6a5caba330b1d7e14.diff
Patch:
https://github.com/kamailio/kamailio/commit/a176ad4fb4167e21b01974e6a5caba330b1d7e14.patch
---
diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c
index 986c2c769a..1f27e97684 100644
--- a/src/modules/htable/ht_dmq.c
+++ b/src/modules/htable/ht_dmq.c
@@ -139,36 +139,43 @@ static int ht_dmq_cell_group_flush(dmq_node_t* node) {
srjson_doc_t *jdoc = _dmq_jdoc_cell_group.jdoc;
srjson_t *jdoc_cells = ht_dmq_jdoc_cell_group.jdoc_cells;
+ int ret = 0;
srjson_AddItemToObject(jdoc, jdoc->root, "cells", jdoc_cells);
- LM_DBG("json[%s]\n", srjson_PrintUnformatted(jdoc, jdoc->root));
+ LM_DBG("jdoc size[%d]\n", ht_dmq_jdoc_cell_group.size);
jdoc->buf.s = srjson_PrintUnformatted(jdoc, jdoc->root);
if(jdoc->buf.s==NULL) {
LM_ERR("unable to serialize data\n");
- return -1;
+ ret = -1;
+ goto cleanup;
}
jdoc->buf.len = strlen(jdoc->buf.s);
LM_DBG("sending serialized data %.*s\n", jdoc->buf.len, jdoc->buf.s);
if (ht_dmq_send(>buf, node)!=0) {
LM_ERR("unable to send data\n");
- return -1;
+ ret = -1;
}
- LM_DBG("jdoc size[%d]\n", ht_dmq_jdoc_cell_group.size);
+cleanup:
+
+ srjson_DeleteItemFromObject(jdoc, jdoc->root, "cells");
+ ht_dmq_jdoc_cell_group.count = 0;
+ ht_dmq_jdoc_cell_group.size = dmq_cell_group_empty_size;
+
+ if(jdoc->buf.s!=NULL) {
+ jdoc->free_fn(jdoc->buf.s);
+ jdoc->buf.s = NULL;
+ }
- srjson_Delete(jdoc, jdoc_cells);
ht_dmq_jdoc_cell_group.jdoc_cells =
srjson_CreateArray(_dmq_jdoc_cell_group.jdoc);
if (ht_dmq_jdoc_cell_group.jdoc_cells==NULL) {
LM_ERR("cannot re-create json cells array! \n");
- return -1;
+ ret = -1;
}
- ht_dmq_jdoc_cell_group.count = 0;
- ht_dmq_jdoc_cell_group.size = dmq_cell_group_empty_size;
-
- return 0;
+ return ret;
}
static void ht_dmq_cell_group_destroy() {
___
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] htable: fix infinite loop during dmq sync of large tables (#1872)
Thanks @miconda -- 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/1872#issuecomment-468398828___ 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] htable: fix infinite loop during dmq sync of large tables (#1872)
Thanks @giacomovaccavonage - ok to backport, too? -- 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/1872#issuecomment-468353044___ 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] Infinite loop inside htable module during dmq synch (#1863)
@paolovisintin - as soon as the above PR (#1872) is merged (will also be backported). -- 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/1863#issuecomment-468347911___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] htable: fix infinite loop during dmq sync of large tables (#1872)
- reported by Enrico Bandiera (GH #1863) Pre-Submission Checklist - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) Checklist: - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #1863 (replace with an open issue number) Description You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1872 -- Commit Summary -- * htable: fix infinite loop during dmq sync of large tables -- File Changes -- M src/modules/htable/ht_dmq.c (27) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1872.patch https://github.com/kamailio/kamailio/pull/1872.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/1872 ___ 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] Infinite loop inside htable module during dmq synch (#1863)
I've been unable to reproduce myself, so if you're also unable to then I think it's good to merge - I'll submit the PR now. -- 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/1863#issuecomment-468004132___ 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] Infinite loop inside htable module during dmq synch (#1863)
Thanks for testing so extensively! My (limited) understanding is that the call to srjson_DeleteItemFromObject() - by virtue of its internal call to srjson_Delete() - takes care of freeing the entire "cells" structure. I will do some testing here to be sure there is no leak but in the meantime, can you confirm whether you see the memory increase linearly in line with the number of times you launch a new Kamailio instance? For example, if you increase from 100 to 200 times, does the memory usage then settle at 2.7%? -- 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/1863#issuecomment-466468137___ 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] Infinite loop inside htable module during dmq synch (#1863)
Please can you try with the above and confirm whether or not it is fixed? -- 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/1863#issuecomment-466135406___ 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] Infinite loop inside htable module during dmq synch (#1863)
Thanks for reporting - I will take a look and fix accordingly. -- 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/1863#issuecomment-466022037___ 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] dmq: wait for a 2nd failed ping before deleting a node (#1840)
I am against backporting because it changes current behaviour and is not strictly a bug fix. For master, I would still prefer the option to preserve current behaviour (with modparam) in case it is essential for some users to fail quickly. -- 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/1840#issuecomment-461397862___ 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] dmq: wait for a 2nd failed ping before deleting a node (#1840)
Looks good - thanks! Would it be sensible to add a module parameter to configure the number of failed pings before a node is considered dead (defaulting to 1 to preserve current behaviour)? -- 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/1840#issuecomment-461374995___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:57f87fcb: htable: added startup synchronization over dmq
Module: kamailio Branch: master Commit: 57f87fcb3a973735681dba5c9e9484c5664db3aa URL: https://github.com/kamailio/kamailio/commit/57f87fcb3a973735681dba5c9e9484c5664db3aa Author: Charles Chance Committer: Charles Chance Date: 2018-09-28T19:09:28+02:00 htable: added startup synchronization over dmq --- Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/57f87fcb3a973735681dba5c9e9484c5664db3aa.diff Patch: https://github.com/kamailio/kamailio/commit/57f87fcb3a973735681dba5c9e9484c5664db3aa.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] htable: added startup synchronization over dmq (#1667)
Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #260 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1667 -- Commit Summary -- * htable: added startup synchronization over dmq -- File Changes -- M src/modules/htable/doc/htable_admin.xml (22) M src/modules/htable/ht_dmq.c (395) M src/modules/htable/ht_dmq.h (6) M src/modules/htable/htable.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1667.patch https://github.com/kamailio/kamailio/pull/1667.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/1667 ___ 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] dmq: add optional parameter to dmq_handle_message() (#1626)
Merged #1626 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/1626#event-1821270633___ 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] dmq: add optional parameter to dmq_handle_message() (#1626)
Very cool! It is definitely useful. However, I have one very small comment. I'm not sure what value it adds allowing the config to determine the returned value - only that the function returns without exiting. Possibly just semantics right now, but it could potentially restrict future module development - or not, but better to be safe. Would it still serve its purpose if the parameter was renamed to something like "return" or "continue" and only return 1 if set or 0 if not? Again, nice use case :) -- 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/1626#issuecomment-417745593___ 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] core: update first line parser to recognize new method IDs (#1611)
Merged #1611. -- 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/1611#event-1767974220___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:e79257c4: core: update first line parser to recognize new method IDs
Module: kamailio
Branch: master
Commit: e79257c4cbdf1954fddec1c06f3c1cfa34037293
URL:
https://github.com/kamailio/kamailio/commit/e79257c4cbdf1954fddec1c06f3c1cfa34037293
Author: Charles Chance
Committer: Charles Chance
Date: 2018-08-02T16:02:32+01:00
core: update first line parser to recognize new method IDs
- bring up to date with new methods added in 4fe95ab
---
Modified: src/core/parser/parse_fline.c
Modified: src/core/parser/parse_fline.h
---
Diff:
https://github.com/kamailio/kamailio/commit/e79257c4cbdf1954fddec1c06f3c1cfa34037293.diff
Patch:
https://github.com/kamailio/kamailio/commit/e79257c4cbdf1954fddec1c06f3c1cfa34037293.patch
---
diff --git a/src/core/parser/parse_fline.c b/src/core/parser/parse_fline.c
index 04758b2751..e6b93aca58 100644
--- a/src/core/parser/parse_fline.c
+++ b/src/core/parser/parse_fline.c
@@ -125,6 +125,11 @@ char* parse_first_line(char* buffer, unsigned int len,
struct msg_start* fl)
else IFISMETHOD( UPDATE, 'U')
else IFISMETHOD( REFER, 'R')
else IFISMETHOD( PUBLISH, 'P')
+ else IFISMETHOD( KDMQ, 'K')
+ else IFISMETHOD( GET, 'G')
+ else IFISMETHOD( POST, 'P')
+ else IFISMETHOD( PUT, 'P')
+ else IFISMETHOD( DELETE, 'D')
/* if you want to add another method XXX, include METHOD_XXX in
H-file (this is the value which you will take later in
processing and define XXX_LEN as length of method name;
diff --git a/src/core/parser/parse_fline.h b/src/core/parser/parse_fline.h
index b10c02bc83..2add9b0efb 100644
--- a/src/core/parser/parse_fline.h
+++ b/src/core/parser/parse_fline.h
@@ -67,6 +67,11 @@
#define UPDATE_LEN 6
#define REFER_LEN 5
#define PUBLISH_LEN 7
+#define KDMQ_LEN 4
+#define GET_LEN 3
+#define POST_LEN 4
+#define PUT_LEN 3
+#define DELETE_LEN 6
typedef struct msg_start {
short type; /*!< Type of the
message - request/response */
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] core: update first line parser to recognize new method IDs (#1611)
- bring up to date with new methods added in 4fe95ab You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1611 -- Commit Summary -- * core: update first line parser to recognize new method IDs -- File Changes -- M src/core/parser/parse_fline.c (5) M src/core/parser/parse_fline.h (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1611.patch https://github.com/kamailio/kamailio/pull/1611.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/1611 ___ 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] RPC command stats.get_statistics randomly reporting 9223372036854776000 for current active/early dialogs (#1591)
Having made some tests around this, whilst I have not yet been able to reproduce the negative counter issue, I do think there needs to be some further thought around dialog replication. First thing to note - stats are not affected by replicated dialogs, so I don't think DMQ is _directly_ responsible for the negative counting. However - and this may be _indirectly_ related - if a node is restarted, any dialogs owned by it at the time will be forever 'stuck'. This is owing to the fact that in its current implementation, the dialog owner is responsible for triggering update/removal across the rest of the cluster. If the owner no longer exists - or has been restarted and has no idea that it was once the owner of some/all of the dialogs it receives in its initial re-sync - then this link is broken permanently. It is further compounded by the fact these orphaned dialogs never (in my tests, anyway) timeout. I need to spend some more time on the DMQ side, since this is the first time I have looked at it properly. In the meantime, @joelsdc, regarding your issue: 1. Do you have database enabled alongside DMQ replication or was it only for testing? I suspect this is where the recent 38 'expired' dialogs came from - conversely, the earlier 'bad' dialogs you mentioned were likely a result of the owning node having been restarted (these would not have been included in the 'expired' counter). 2. Are you expecting the stats counters (the original ones, not the new 'dlg.stats_active') to reflect all dialogs across the cluster or just those handled directly by the local instance? -- 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/1591#issuecomment-409205552___ 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:e2eda137: dialog: unset DMQ flag on replicated dialog removal
Module: kamailio Branch: 5.1 Commit: e2eda1376def48ab1c78db7a766c1811d19205be URL: https://github.com/kamailio/kamailio/commit/e2eda1376def48ab1c78db7a766c1811d19205be Author: Charles Chance Committer: Charles Chance Date: 2018-07-26T13:54:31+01:00 dialog: unset DMQ flag on replicated dialog removal - prevents looping back to other nodes - reported by Patrick Murphy on sr-users list (cherry picked from commit a84a3ea618f0e602a8892c37fce7f4e72ab7371c) --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/e2eda1376def48ab1c78db7a766c1811d19205be.diff Patch: https://github.com/kamailio/kamailio/commit/e2eda1376def48ab1c78db7a766c1811d19205be.patch --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 8ed9dce1d3..0cfd8a522e 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -365,6 +365,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no } /* prevent DB sync */ dlg->dflags |= DLG_FLAG_NEW; + dlg->iflags &= ~DLG_IFLAG_DMQ_SYNC; unref++; break; ___ 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] dialog: unset DMQ flag on replicated dialog removal (#1601)
Merged #1601. -- 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/1601#event-1754936050___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:a84a3ea6: dialog: unset DMQ flag on replicated dialog removal
Module: kamailio Branch: master Commit: a84a3ea618f0e602a8892c37fce7f4e72ab7371c URL: https://github.com/kamailio/kamailio/commit/a84a3ea618f0e602a8892c37fce7f4e72ab7371c Author: Charles Chance Committer: Charles Chance Date: 2018-07-26T12:07:33+01:00 dialog: unset DMQ flag on replicated dialog removal - prevents looping back to other nodes - reported by Patrick Murphy on sr-users list --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/a84a3ea618f0e602a8892c37fce7f4e72ab7371c.diff Patch: https://github.com/kamailio/kamailio/commit/a84a3ea618f0e602a8892c37fce7f4e72ab7371c.patch --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 8ed9dce1d3..0cfd8a522e 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -365,6 +365,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no } /* prevent DB sync */ dlg->dflags |= DLG_FLAG_NEW; + dlg->iflags &= ~DLG_IFLAG_DMQ_SYNC; unref++; break; ___ 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] dialog: unset DMQ flag on replicated dialog removal (#1601)
Thanks @miconda -- 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/1601#issuecomment-408086506___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] dialog: unset DMQ flag on replicated dialog removal (#1601)
- prevents looping back to other nodes - reported by Patrick Murphy on sr-users list (https://lists.kamailio.org/pipermail/sr-users/2018-July/102322.html) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1601 -- Commit Summary -- * dialog: unset DMQ flag on replicated dialog removal -- File Changes -- M src/modules/dialog/dlg_dmq.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1601.patch https://github.com/kamailio/kamailio/pull/1601.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/1601 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:b0e5768e: dmq: allow startup even if initial nodelist is empty
Module: kamailio
Branch: master
Commit: b0e5768ebc62bcf1f08246ec613de1ba71d6365e
URL:
https://github.com/kamailio/kamailio/commit/b0e5768ebc62bcf1f08246ec613de1ba71d6365e
Author: Charles Chance
Committer: Charles Chance
Date: 2018-07-25T14:01:19+01:00
dmq: allow startup even if initial nodelist is empty
---
Modified: src/modules/dmq/dmq.c
---
Diff:
https://github.com/kamailio/kamailio/commit/b0e5768ebc62bcf1f08246ec613de1ba71d6365e.diff
Patch:
https://github.com/kamailio/kamailio/commit/b0e5768ebc62bcf1f08246ec613de1ba71d6365e.patch
---
diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c
index f1e9090afa..b374b8de31 100644
--- a/src/modules/dmq/dmq.c
+++ b/src/modules/dmq/dmq.c
@@ -301,9 +301,8 @@ static int child_init(int rank)
notification_node =
add_server_and_notify(_notification_address);
if(!notification_node) {
- LM_ERR("cannot retrieve initial nodelist from
%.*s\n",
+ LM_WARN("cannot retrieve initial nodelist from
%.*s\n",
STR_FMT(_notification_address));
- return -1;
}
}
return 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:bca756f8: dmq: include non-active nodes when requesting initial node list
Module: kamailio
Branch: master
Commit: bca756f88ce36ab3c7297c7bc4d2cab9009b09fe
URL:
https://github.com/kamailio/kamailio/commit/bca756f88ce36ab3c7297c7bc4d2cab9009b09fe
Author: Charles Chance
Committer: Charles Chance
Date: 2018-07-25T14:01:19+01:00
dmq: include non-active nodes when requesting initial node list
---
Modified: src/modules/dmq/notification_peer.c
---
Diff:
https://github.com/kamailio/kamailio/commit/bca756f88ce36ab3c7297c7bc4d2cab9009b09fe.diff
Patch:
https://github.com/kamailio/kamailio/commit/bca756f88ce36ab3c7297c7bc4d2cab9009b09fe.patch
---
diff --git a/src/modules/dmq/notification_peer.c
b/src/modules/dmq/notification_peer.c
index c8e659c721..c1deb80536 100644
--- a/src/modules/dmq/notification_peer.c
+++ b/src/modules/dmq/notification_peer.c
@@ -570,8 +570,8 @@ int request_nodelist(dmq_node_t *node, int forward)
LM_ERR("no notification body\n");
return -1;
}
- ret = bcast_dmq_message(dmq_notification_peer, body, NULL,
- _callback, forward,
_content_type);
+ ret = bcast_dmq_message1(dmq_notification_peer, body, NULL,
+ _callback, forward,
_content_type, 1);
pkg_free(body->s);
pkg_free(body);
return ret;
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:3d2b3868: dmq: improve bus stability and reduce unnecessary state transfer
Module: kamailio Branch: master Commit: 3d2b3868e01bab478408d9f0619db2c9918b72b0 URL: https://github.com/kamailio/kamailio/commit/3d2b3868e01bab478408d9f0619db2c9918b72b0 Author: Charles Chance Committer: Charles Chance Date: 2018-07-25T14:01:19+01:00 dmq: improve bus stability and reduce unnecessary state transfer - prevents split cluster in certain scenarios (e.g. GH issue #1349) - add 'pending' state for new, locally added nodes, until confirmed - continue to probe nodes marked as inactive/disabled so that they are eventually removed (but still exclude from normal replication) --- Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmq_funcs.h Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/3d2b3868e01bab478408d9f0619db2c9918b72b0.diff Patch: https://github.com/kamailio/kamailio/commit/3d2b3868e01bab478408d9f0619db2c9918b72b0.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] coredumps possibly generated by DMQ in kamailio v5.1.4 (#1594)
@miconda - from core2 it looks to me like kamailio was in the process of shutting down and the KDMQ message was to notify others of its new 'disabled' status (dmq.c:329). This is clearly done in main process - is there an alternative? Does module load order have any impact on the order in which they're destroyed? -- 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/1594#issuecomment-406257601___ 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] coredumps possibly generated by DMQ in kamailio v5.1.4 (#1594)
@miconda - apologies, somehow missed this - doesn't appear to be directly related to dmq though from what I can tell? -- 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/1594#issuecomment-406238320___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] dmq server address question
On Tue, 20 Feb 2018 at 09:11, Juha Heinanen <j...@tutpro.com> wrote: > Charles Chance writes: > > > You’re not missing anything. DMQ only works with UDP. > > So no security over the Internet if TLS is not available? IPSec doesn't > sound like a good idea. I suppose it was only intended to be used over a private network. If you really have no alternative then I can recommend Tinc as nice, simple solution. Cheers, Charles -- *Charles Chance* Managing Director t. 0330 120 1200m. 07932 063 891 -- Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, Birmingham Science Park, Birmingham B7 4BB. ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] dmq server address question
Hi Juha,
You’re not missing anything. DMQ only works with UDP.
I agree the parameter naming is confusing - I have an improvements branch
that I’ve been working on recently and it includes some updates to
documentation. I will make sure this is one of them :)
Cheers,
Charles
On Tue, 20 Feb 2018 at 05:49, Juha Heinanen <j...@tutpro.com> wrote:
> I tried to configure dmq module according to README, but got this kind
> of error:
>
> Feb 20 07:32:55 rautu /usr/bin/pres-serv[17983]: ERROR: dmq [dmq.c:228]:
> mod_init(): server_uri is not a socket the proxy is listening on
>
> In the config I have:
>
> modparam("dmq", "server_address", "sip:192.26.133.10:5080")
>
> and just above the error message there is this in syslog:
>
> Feb 20 07:32:55 rautu pres-serv[17959]: Listening on
> Feb 20 07:32:55 rautu pres-serv[17959]: tcp: 192.26.133.10
> [192.26.133.10]:5080
>
> i.e., server is listening on the same ip/port as in server_address.
>
> I tried also by configuring
>
> modparam("dmq", "server_address", "tcp:192.26.133.10:5080")
>
> since "sip" is not a transport protocol of a socket, but that was
> rejected with "server address invalid" error message.
>
> It is confusing that error message refers to server_uri, when modparam
> is called server_address.
>
> I must be missing something. Any ideas what it is?
>
> -- Juha
>
> ___________
> Kamailio (SER) - Development Mailing List
> sr-dev@lists.kamailio.org
> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
>
--
*Charles Chance*
Managing Director
t. 0330 120 1200m. 07932 063 891
--
Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street,
Birmingham Science Park, Birmingham B7 4BB.
___
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] dmq_usrloc: contacts not deleted while 0x04 flag set in save() function (#1445)
It looks like the new register has been received on server2 but the original one was received on server1 - therefore the presence of the FL_RPL flag is preventing the update from being replicated. This was intended behaviour at the time of 4.4. As of b5f94a9 (currently only in 5.1 and above), FL_RPL has been removed and this behaviour modified so that updates made locally on any server are always replicated to others. Can you try with a later version and let me know if you still see the same? -- 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/1445#issuecomment-366278775___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:fab3f881: presence: delay freeing generated etag string
Module: kamailio Branch: master Commit: fab3f881634b1233e6c5446ffafbd30ab07c0bc6 URL: https://github.com/kamailio/kamailio/commit/fab3f881634b1233e6c5446ffafbd30ab07c0bc6 Author: Charles Chance <charles.cha...@sipcentric.com> Committer: Charles Chance <charles.cha...@sipcentric.com> Date: 2018-02-09T09:37:24Z presence: delay freeing generated etag string - it may still be needed for replication --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/fab3f881634b1233e6c5446ffafbd30ab07c0bc6.diff Patch: https://github.com/kamailio/kamailio/commit/fab3f881634b1233e6c5446ffafbd30ab07c0bc6.patch --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 1c7c4240b9..514e89036c 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1100,10 +1100,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } if (sent_reply) *sent_reply= 1; - if(etag.s) - pkg_free(etag.s); - etag.s= NULL; - goto done; } } @@ -1232,10 +1228,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } if (sent_reply) *sent_reply= 1; - if(etag.s) - pkg_free(etag.s); - etag.s= NULL; - if(!body) goto done; } @@ -1266,6 +1258,10 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, pres_dmq_replicate_presentity(presentity, body, new_t, _etag, sphere, _ruid, NULL); } + if(etag.s) + pkg_free(etag.s); + etag.s= NULL; + if(cur_ruid.s) pkg_free(cur_ruid.s); cur_ruid.s= NULL; ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] presence: delay freeing generated etag string (#1435)
This is a minor bugfix for earlier commit (b7a5016). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1435 -- Commit Summary -- * presence: delay freeing generated etag string -- File Changes -- M src/modules/presence/presentity.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1435.patch https://github.com/kamailio/kamailio/pull/1435.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/1435 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:51255069: presence: presentity table version updated to 5
Module: kamailio Branch: master Commit: 51255069963e57ed5e49766ff41126e19b9f5cb8 URL: https://github.com/kamailio/kamailio/commit/51255069963e57ed5e49766ff41126e19b9f5cb8 Author: Charles Chance <charles.cha...@sipcentric.com> Committer: Charles Chance <charles.cha...@sipcentric.com> Date: 2018-02-01T09:52:06Z presence: presentity table version updated to 5 --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/51255069963e57ed5e49766ff41126e19b9f5cb8.diff Patch: https://github.com/kamailio/kamailio/commit/51255069963e57ed5e49766ff41126e19b9f5cb8.patch --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index adb0f909b5..4ba309d6b9 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -78,7 +78,7 @@ MODULE_VERSION #define S_TABLE_VERSION 3 -#define P_TABLE_VERSION 4 +#define P_TABLE_VERSION 5 #define ACTWATCH_TABLE_VERSION 12 char *log_buf = NULL; ___ 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] presence: add API endpoints to update presentity and notify watchers (#1417)
> the last 2 parameters are option, yet you have no way of knowing that by > looking at the API function. Then there are, of course, the docs :) No worries, anyway - it was just an observation - it was by no means supposed to detract from your contribution. I'll leave it for others now to comment/review further. -- 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/1417#issuecomment-361699292___ 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] presence: add API endpoints to update presentity and notify watchers (#1417)
To me, adding a separate function for an extra two params is bloating the code.
The final two params are a direct passthrough, anyway. So your function simply
becomes:
```
int _api_pres_refresh_watchers(str *pres, str *event, int type, str *file_uri,
str *filename)
{
return pres_refresh_watchers(pres, event, type, file_uri, filename);
}
```
Compared with:
```
int _api_pres_refresh_watchers(str *pres, str *event, int type)
{
return pres_refresh_watchers(pres, event, type, NULL, NULL);
}
int _api_pres_refresh_watchers_file(str *pres, str *event, int type, str
*file_uri, str *filename)
{
return pres_refresh_watchers(pres, event, type, file_uri, filename);
}
```
Plus you consider others' needs in future and not just your own right now.
Just my opinion - perhaps others think differently.
--
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/1417#issuecomment-361693961___
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] presence: add API endpoints to update presentity and notify watchers (#1417)
Nice...why not include the last two params now, though, for completeness? Then it's just a question of the docs - seems to be a lot of API functions missing already, so could be a good time to bring them up to date. What do others 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/1417#issuecomment-361689125___ 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] presence: add API endpoints to update presentity and notify watchers (#1417)
Yes, looks better now The same applies to the other new function - it can be replaced by a call to existing function pres_refresh_watchers(), passing type=1 and last two parameters NULL. -- 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/1417#issuecomment-361670815___ 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] presence: add API endpoints to update presentity and notify watchers (#1417)
No worries - the existing function will work with only a minimal set of non-null parameters and will also take care of dmq replication at the same time. -- 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/1417#issuecomment-361358409___ 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] presence: add API endpoints to update presentity and notify watchers (#1417)
Is there a reason for presentity updates made in this way not to be replicated (if enable_dmq = 1)? Also, why not re-use the existing update_presentity() function instead of creating a new function to do the same thing? -- 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/1417#issuecomment-361355078___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:3fc1da64: presence: added enable_dmq parameter to module docs
Module: kamailio
Branch: master
Commit: 3fc1da644a6b375fc45ea17cbcf81643f70db545
URL:
https://github.com/kamailio/kamailio/commit/3fc1da644a6b375fc45ea17cbcf81643f70db545
Author: Charles Chance <charles.cha...@sipcentric.com>
Committer: Charles Chance <charles.cha...@sipcentric.com>
Date: 2018-01-24T14:21:30Z
presence: added enable_dmq parameter to module docs
---
Modified: src/modules/presence/doc/presence_admin.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/3fc1da644a6b375fc45ea17cbcf81643f70db545.diff
Patch:
https://github.com/kamailio/kamailio/commit/3fc1da644a6b375fc45ea17cbcf81643f70db545.patch
---
diff --git a/src/modules/presence/doc/presence_admin.xml
b/src/modules/presence/doc/presence_admin.xml
index 0bedc37741..aa10dff34c 100644
--- a/src/modules/presence/doc/presence_admin.xml
+++ b/src/modules/presence/doc/presence_admin.xml
@@ -62,6 +62,11 @@
tm.
+
+
+ dmq (only if replication is
enabled).
+
+
@@ -897,6 +902,33 @@ modparam("presence", "retrieve_order_by", "priority,
received_time")
+
+ enable_dmq (integer)
+
+ If set to 1, will enable DMQ replication of presentities
between nodes. Use this instead of a shared DB
+ to share state across a cluster and update local watchers in
realtime (subs_db_mode < 3) or on next
+ notifier run (subs_db_mode = 3).
+
+
+
+ If this parameter is enabled, the DMQ module must be
loaded first - otherwise, startup will fail.
+
+
+
+
+ Default value is 0.
+
+
+
+ Set enable_dmq parameter
+
+ ...
+ modparam("presence", "enable_dmq", 1)
+ ...
+
+
+
+
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:a4034c1d: kamctl: regenerated db scripts to include presentity ruid column
Module: kamailio Branch: master Commit: a4034c1d087b1c87f4dd712554a2a6f6fa184d86 URL: https://github.com/kamailio/kamailio/commit/a4034c1d087b1c87f4dd712554a2a6f6fa184d86 Author: Charles Chance <charles.cha...@sipcentric.com> Committer: Charles Chance <charles.cha...@sipcentric.com> Date: 2018-01-24T14:20:53Z kamctl: regenerated db scripts to include presentity ruid column --- Modified: utils/kamctl/db_berkeley/kamailio/presentity Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/dbtext/kamailio/presentity Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/presentity.json Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/oracle/presence-create.sql Modified: utils/kamctl/postgres/presence-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/presence-mod Modified: utils/kamctl/xhttp_pi/presence-table --- Diff: https://github.com/kamailio/kamailio/commit/a4034c1d087b1c87f4dd712554a2a6f6fa184d86.diff Patch: https://github.com/kamailio/kamailio/commit/a4034c1d087b1c87f4dd712554a2a6f6fa184d86.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:acd42263: schema: add ruid column to presentity table
Module: kamailio Branch: master Commit: acd42263ea1e648f2f5789f993a63de1f05f8b1b URL: https://github.com/kamailio/kamailio/commit/acd42263ea1e648f2f5789f993a63de1f05f8b1b Author: Charles Chance <charles.cha...@sipcentric.com> Committer: Charles Chance <charles.cha...@sipcentric.com> Date: 2018-01-24T14:19:20Z schema: add ruid column to presentity table --- Modified: src/lib/srdb1/schema/pr_presentity.xml --- Diff: https://github.com/kamailio/kamailio/commit/acd42263ea1e648f2f5789f993a63de1f05f8b1b.diff Patch: https://github.com/kamailio/kamailio/commit/acd42263ea1e648f2f5789f993a63de1f05f8b1b.patch --- diff --git a/src/lib/srdb1/schema/pr_presentity.xml b/src/lib/srdb1/schema/pr_presentity.xml index c994a62c9c..3d525f7f92 100644 --- a/src/lib/srdb1/schema/pr_presentity.xml +++ b/src/lib/srdb1/schema/pr_presentity.xml @@ -9,7 +9,7 @@ http://docbook.org/ns/docbook;> presentity -4 +5 _TABLE_TYPE; @@ -98,6 +98,14 @@ Priority of the record + +ruid +string +64 + +Record internal unique id + + presentity_idx @@ -107,6 +115,12 @@ + +ruid_idx + + + + presentity_expires ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:b7a5016c: presence: dmq integration
Module: kamailio Branch: master Commit: b7a5016cdbdb068fe23dc1a5d74aa01643c8ec20 URL: https://github.com/kamailio/kamailio/commit/b7a5016cdbdb068fe23dc1a5d74aa01643c8ec20 Author: Charles Chance <charles.cha...@sipcentric.com> Committer: Charles Chance <charles.cha...@sipcentric.com> Date: 2018-01-24T14:17:37Z presence: dmq integration - initial implementation - replication of presentity updates over DMQ - adds ruid column for matching across cluster --- Added: src/modules/presence/presence_dmq.c Added: src/modules/presence/presence_dmq.h Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h Modified: src/modules/presence/Makefile Modified: src/modules/presence/notify.c Modified: src/modules/presence/notify.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/presentity.h Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/b7a5016cdbdb068fe23dc1a5d74aa01643c8ec20.diff Patch: https://github.com/kamailio/kamailio/commit/b7a5016cdbdb068fe23dc1a5d74aa01643c8ec20.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] presence: dmq integration (#1402)
@charlesrchance pushed 2 commits. 125759a Revert "kamctl: regenerated db scripts to include presentity ruid column" 125fcf5 kamctl: regenerated db scripts to include presentity ruid column -- You are receiving this because you are subscribed to this thread. View it on GitHub: https://github.com/kamailio/kamailio/pull/1402/files/e60c4a823c26bc4f1268613c8666260693d458fe..125fcf57dd590e8871479a59158370a9d9f016aa ___ 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] presence: dmq integration (#1402)
@charlesrchance pushed 3 commits. c21cae5 schema: add ruid column to presentity table 0c2a427 kamctl: regenerated db scripts to include presentity ruid column e60c4a8 presence: added enable_dmq parameter to module docs -- You are receiving this because you are subscribed to this thread. View it on GitHub: https://github.com/kamailio/kamailio/pull/1402/files/d6f618e35940263dc992e1b9e61b4be19528a08a..e60c4a823c26bc4f1268613c8666260693d458fe ___ 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] presence: dmq integration (#1402)
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/pull/1402#issuecomment-359867760___ 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] presence: dmq integration (#1402)
Thanks - I planned to document the parameter prior to merging. The DB schema definition for presently table needs updating too - where should this be done? -- 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/1402#issuecomment-359827835___ 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] presence: dmq integration (#1402)
Closed in error! -- 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/1402#issuecomment-357802408___ 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] presence: dmq integration (#1402)
Reopened #1402. -- 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/1402#event-1425136332___ 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] presence: dmq integration (#1402)
Closed #1402. -- 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/1402#event-1425129677___ 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] presence: dmq integration (#1402)
Also need to update database schema definition for presentity table. -- 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/1402#issuecomment-357787546___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] presence: dmq integration (#1402)
Enabled via module parameter. First commit: - initial implementation - replication of presentity updates over DMQ - adds ruid column for matching across cluster Tested and in use across small production cluster (‘dialog’ and ‘message-summary’ events). Need to update docs prior to merging but raising PR first to hear any feedback. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1402 -- Commit Summary -- * presence: dmq integration -- File Changes -- M src/modules/dmq/dmq.c (2) M src/modules/dmq/dmqnode.c (8) M src/modules/dmq/dmqnode.h (2) M src/modules/presence/Makefile (1) M src/modules/presence/notify.c (1) M src/modules/presence/notify.h (1) M src/modules/presence/presence.c (20) M src/modules/presence/presence.h (4) A src/modules/presence/presence_dmq.c (489) A src/modules/presence/presence_dmq.h (50) M src/modules/presence/presentity.c (270) M src/modules/presence/presentity.h (8) M src/modules/presence/publish.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1402.patch https://github.com/kamailio/kamailio/pull/1402.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/1402 ___ 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] sequence breaking DMQ bus (#1349)
@jchavanton - would you mind running some tests again with 851e610 to see if there is an improvement? -- 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/1349#issuecomment-353100886___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:6234a3c7: usrloc: copy server_id when updating contact in memory
Module: kamailio Branch: 5.0 Commit: 6234a3c73f5311a5e67e20cc13e660d80187b0db URL: https://github.com/kamailio/kamailio/commit/6234a3c73f5311a5e67e20cc13e660d80187b0db Author: Charles Chance <charles.cha...@sipcentric.com> Committer: Charles Chance <charles.cha...@sipcentric.com> Date: 2017-12-14T09:39:27Z usrloc: copy server_id when updating contact in memory (cherry picked from commit 282cb4395b5c31476f97a168f509b2904727e88a) --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/6234a3c73f5311a5e67e20cc13e660d80187b0db.diff Patch: https://github.com/kamailio/kamailio/commit/6234a3c73f5311a5e67e20cc13e660d80187b0db.patch --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index 630a4bd8c5..b0a6f046c7 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -308,6 +308,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->last_keepalive = _ci->last_modified; _c->flags = _ci->flags; _c->cflags = _ci->cflags; + _c->server_id = _ci->server_id; _c->tcpconn_id = _ci->tcpconn_id; return 0; ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:620b326b: registrar: added server_id to pv attributes
Module: kamailio
Branch: 5.0
Commit: 620b326b35e3b836e816422dbf0a236185040db3
URL:
https://github.com/kamailio/kamailio/commit/620b326b35e3b836e816422dbf0a236185040db3
Author: Charles Chance <charles.cha...@sipcentric.com>
Committer: Charles Chance <charles.cha...@sipcentric.com>
Date: 2017-12-14T09:41:19Z
registrar: added server_id to pv attributes
(cherry picked from commit 616a89f281bfe77c4d31719dc3d7bd27de5c6bac)
---
Modified: src/modules/registrar/doc/registrar_admin.xml
Modified: src/modules/registrar/regpv.c
---
Diff:
https://github.com/kamailio/kamailio/commit/620b326b35e3b836e816422dbf0a236185040db3.diff
Patch:
https://github.com/kamailio/kamailio/commit/620b326b35e3b836e816422dbf0a236185040db3.patch
---
diff --git a/src/modules/registrar/doc/registrar_admin.xml
b/src/modules/registrar/doc/registrar_admin.xml
index 98a21dccea..709f8a9484 100644
--- a/src/modules/registrar/doc/registrar_admin.xml
+++ b/src/modules/registrar/doc/registrar_admin.xml
@@ -1598,7 +1598,11 @@ event_route[usrloc:contact-expired] {
conid - TCP socket
internal connection ID ($null if UDP)
-
+
+
+ server_id -
server_id value
+
+
The pseudo-variable accepts positive index
value to access
diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c
index 8e9146b1ce..7edfd87275 100644
--- a/src/modules/registrar/regpv.c
+++ b/src/modules/registrar/regpv.c
@@ -273,6 +273,9 @@ int pv_get_ulc(struct sip_msg *msg, pv_param_t *param,
if (c->sock && (c->sock->proto == PROTO_TCP ||
c->sock->proto == PROTO_TLS || c->sock->proto == PROTO_WS || c->sock->proto ==
PROTO_WSS))
return pv_get_sintval(msg, param, res,
c->tcpconn_id);
break;
+ case 22: /* server_id */
+ return pv_get_uintval(msg, param, res, c->server_id);
+ break;
}
return pv_get_null(msg, param, res);
@@ -400,6 +403,10 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in)
rp->attr = 20;
else goto error;
break;
+ case 9:
+ if(strncmp(pa.s, "server_id", 9)==0)
+ rp->attr = 22;
+ break;
case 10:
if(strncmp(pa.s, "user_agent", 10)==0)
rp->attr = 12;
___
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] sequence breaking DMQ bus (#1349)
Thanks for reporting and for taking the time to test different scenarios. Using your examples I will try to reproduce locally but out of interest, do you observe the same behaviour if notification address is an FQDN resolving to multiple IPs? -- 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/1349#issuecomment-349255804___ 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] v5.0.4: nathelper: dont ping replicated aor's (#1299)
No problem, thanks for confirming. Will close this now - feel free to reopen if necessary. -- 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/1299#issuecomment-344209615___ 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] v5.0.4: nathelper: dont ping replicated aor's (#1299)
Closed #1299. -- 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/1299#event-1340519143___ 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] usrloc: copy server_id when updating contact in memory (#1309)
@miconda - is it too late to backport this to 5.0 now that 5.1 branch has been started? -- 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/1309#issuecomment-343907531___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:282cb439: usrloc: copy server_id when updating contact in memory
Module: kamailio Branch: master Commit: 282cb4395b5c31476f97a168f509b2904727e88a URL: https://github.com/kamailio/kamailio/commit/282cb4395b5c31476f97a168f509b2904727e88a Author: Charles Chance <charles.cha...@sipcentric.com> Committer: Charles Chance <charles.cha...@sipcentric.com> Date: 2017-11-09T15:11:03Z usrloc: copy server_id when updating contact in memory --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/282cb4395b5c31476f97a168f509b2904727e88a.diff Patch: https://github.com/kamailio/kamailio/commit/282cb4395b5c31476f97a168f509b2904727e88a.patch --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index 54cac0e4e0..a43c5c6c00 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -308,6 +308,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->last_keepalive = _ci->last_modified; _c->flags = _ci->flags; _c->cflags = _ci->cflags; + _c->server_id = _ci->server_id; _c->tcpconn_id = _ci->tcpconn_id; return 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] registrar: added server_id to ulc pv attributes (#1310)
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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) Checklist: - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue # (replace with an open issue number) Description You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1310 -- Commit Summary -- * registrar: added server_id to pv attributes -- File Changes -- M src/modules/registrar/doc/registrar_admin.xml (6) M src/modules/registrar/regpv.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1310.patch https://github.com/kamailio/kamailio/pull/1310.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/1310 ___ 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] v5.0.4: nathelper: dont ping replicated aor's (#1299)
Thanks for testing and confirming. Two out of the three patches are in the 5.0 branch now. I expect the third to be in today or early next week. As for the $ulc pv, I’ll take a look later today and report back here. -- 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/1299#issuecomment-343441988___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:93d063ba: usrloc: add more attributes to the result of ul.dump
Module: kamailio
Branch: 5.0
Commit: 93d063ba0d278a609c714a62ddbeec33162099b4
URL:
https://github.com/kamailio/kamailio/commit/93d063ba0d278a609c714a62ddbeec33162099b4
Author: shuntongzhang <shuntongzh...@gmail.com>
Committer: Charles Chance <charles.cha...@sipcentric.com>
Date: 2017-11-09T15:16:01Z
usrloc: add more attributes to the result of ul.dump
(cherry picked from commit a57465ff47d46fb5d64c692a72f42767598adbb4)
---
Modified: src/modules/usrloc/ul_rpc.c
---
Diff:
https://github.com/kamailio/kamailio/commit/93d063ba0d278a609c714a62ddbeec33162099b4.diff
Patch:
https://github.com/kamailio/kamailio/commit/93d063ba0d278a609c714a62ddbeec33162099b4.patch
---
diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c
index 7411be6b93..6133db8acd 100644
--- a/src/modules/usrloc/ul_rpc.c
+++ b/src/modules/usrloc/ul_rpc.c
@@ -180,14 +180,29 @@ int rpc_dump_contact(rpc_t* rpc, void* ctx, void *ih,
ucontact_t* c)
rpc->fault(ctx, 500, "Internal error adding reg_id");
return -1;
}
+if(rpc->struct_add(vh, "d", "Server-Id", c->server_id)<0)
+ {
+ rpc->fault(ctx, 500, "Internal error adding server_id");
+ return -1;
+ }
+if(rpc->struct_add(vh, "d", "Tcpconn-Id", c->tcpconn_id)<0)
+ {
+ rpc->fault(ctx, 500, "Internal error adding tcpconn_id");
+ return -1;
+ }
+if(rpc->struct_add(vh, "d", "Keepalive", c->keepalive)<0)
+ {
+ rpc->fault(ctx, 500, "Internal error adding keepalive");
+ return -1;
+ }
if(rpc->struct_add(vh, "d", "Last-Keepalive", (int)c->last_keepalive)<0)
{
- rpc->fault(ctx, 500, "Internal error adding reg_id");
+ rpc->fault(ctx, 500, "Internal error adding last_keepalive");
return -1;
}
if(rpc->struct_add(vh, "d", "Last-Modified", (int)c->last_modified)<0)
{
- rpc->fault(ctx, 500, "Internal error adding reg_id");
+ rpc->fault(ctx, 500, "Internal error adding last_modified");
return -1;
}
return 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] usrloc: copy server_id when updating contact in memory (#1309)
You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1309 -- Commit Summary -- * usrloc: copy server_id when updating contact in memory -- File Changes -- M src/modules/usrloc/ucontact.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1309.patch https://github.com/kamailio/kamailio/pull/1309.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/1309 ___ 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] usrloc: add more attributes to the result of ul.dump (a57465f)
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/commit/a57465ff47d46fb5d64c692a72f42767598adbb4#commitcomment-25509582___ 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] usrloc: add more attributes to the result of ul.dump (a57465f)
@miconda - am I ok to backport 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/commit/a57465ff47d46fb5d64c692a72f42767598adbb4#commitcomment-25509380___ 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] v5.0.4: nathelper: dont ping replicated aor's (#1299)
This is because usrloc only stores the server_id on initial insert of a contact, not on subsequent updates/refreshes. The following patch should fix: [usrloc_5_0_patch.txt](https://github.com/kamailio/kamailio/files/1457907/usrloc_5_0_patch.txt) -- 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/1299#issuecomment-343171972___ 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] v5.0.4: nathelper: dont ping replicated aor's (#1299)
Ok - there were some attributes missing in the usrloc rpc output in 5.0 - updated in master, here: https://github.com/kamailio/kamailio/commit/a57465ff47d46fb5d64c692a72f42767598adbb4 I have tested and it is fine to apply this patch to 5.0 - please apply and post again the output afterwards. -- 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/1299#issuecomment-343133562___ 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] v5.0.4: nathelper: dont ping replicated aor's (#1299)
I suspect, given that the server_id is not showing in the usrloc dump, this is
exactly why the server_id filtering is not working.
We need to understand first why server_id is not present, before moving on to
the keepalives.
I have run a test locally with two registrar nodes (server_ids 1 and 2) and two
subscribers, each registering to a different node.
Output of ul.dump on one of the nodes:
```
{
Domains: {
Domain: {
Domain: location
Size: 1024
AoRs: {
Info: {
AoR: 123456
HashID: 924664970
Contacts: {
Contact: {
Address:
sip:123456@10.8.0.151:5066
Expires: 33
Q: -1.00
Call-ID:
863771482-506...@ba.i.a.bfb
CSeq: 21177
User-Agent: Grandstream
GXP2160 1.0.5.33
Received: [not set]
Path: [not set]
State: CS_NEW
Flags: 0
CFlags: 0
Socket: [not set]
Methods: 7135
Ruid:
uloc-1-5a007f47-206b-11
Instance:
Reg-Id: 4
Server-Id: 1
Tcpconn-Id: -1
Keepalive: 0
Last-Keepalive:
1510225981
Last-Modified:
1510225981
}
}
}
Info: {
AoR: 123457
HashID: 924664971
Contacts: {
Contact: {
Address:
sip:123457@10.8.0.135:5066
Expires: 37
Q: -1.00
Call-ID:
1296753078-506...@ba.i.a.bdf
CSeq: 2000
User-Agent: Grandstream
GXP2100 1.0.8.4
Received: [not set]
Path: [not set]
State: CS_NEW
Flags: 0
CFlags: 0
Socket:
udp:10.28.0.21:5060
Methods: 7135
Ruid:
uloc-2-5a007f22-17c4-1
Instance:
Reg-Id: 4
Server-Id: 2
Tcpconn-Id: -1
Keepalive: 0
Last-Keepalive:
1510225985
Last-Modified:
1510225985
}
}
}
}
Stats: {
Records: 2
Max-Slots: 1
}
}
}
}
```
As you can see, server_id is present in both contacts and showing the correct
value(s).
Can you paste the output (or a snippet) of the same command on one of your
nodes?
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it
Re: [sr-dev] [kamailio/kamailio] v5.0.4: nathelper: dont ping replicated aor's (#1299)
Did you clear the records after setting server_id? It seems usrloc only stores server_id on initial insert of a contact, not on subsequent updates/refreshes. -- 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/1299#issuecomment-343107285___ 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] dmq: let server_address & notification_address can use the same IP and port (#1308)
Do you have the multi_notify modparam set? In the special case you mention, why set the notification address at all if it’s pointing to itself and you already know this will not be added as a peer? -- 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/1308#issuecomment-343106488___ 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] v5.0.4: nathelper: dont ping replicated aor's (#1299)
Which DB mode are you using? Can you see the server_id using `kamcmd ul.dump`? -- 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/1299#issuecomment-343104020___ 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] dmq: let server_address & notification_address can use the same IP and port (#1308)
‘’’
modparam("dmq", "server_address", "sip:10.6.1.200:5260")
modparam("dmq", "notification_address", "sip:ka.ns.com:5260")
‘’’
^^ this will work just fine as it is, provided ka.ns.com resolves to all four
nodes - or at least one other than itself.
Why, in your second example, does it only resolve to itself?
--
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/1308#issuecomment-343087498___
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] dmq: let server_address & notification_address can use the same IP and port (#1308)
Hi - I still don't understand why this is necessary. What combination of server/notification address values causes issues for 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/1308#issuecomment-342778215___ 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] v5.0.4: nathelper: dont ping replicated aor's (#1299)
The patch is made against the current master (development) branch - there have been some other changes to the same file since the 5.0 branch which will prevent the patch being applied directly to the old version. It can be backported eventually but in the meantime, are you able to test with the 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/issues/1299#issuecomment-342551796___ 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] v5.0.4: nathelper: dont ping replicated aor's (#1299)
Yes, it is ready to use - just set the core parameter server_id on each server and enable server_id filtering in nathelper and it will work in the same way as with shared DB. -- 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/1299#issuecomment-342411278___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:684059ca: dmq_usrloc: include server_id in replicated contacts
Module: kamailio
Branch: master
Commit: 684059ca5bb76e2006a9560ac1efa8c3540d3a58
URL:
https://github.com/kamailio/kamailio/commit/684059ca5bb76e2006a9560ac1efa8c3540d3a58
Author: Charles Chance <charles.cha...@sipcentric.com>
Committer: Charles Chance <charles.cha...@sipcentric.com>
Date: 2017-11-06T15:39:41Z
dmq_usrloc: include server_id in replicated contacts
---
Modified: src/modules/dmq_usrloc/usrloc_sync.c
---
Diff:
https://github.com/kamailio/kamailio/commit/684059ca5bb76e2006a9560ac1efa8c3540d3a58.diff
Patch:
https://github.com/kamailio/kamailio/commit/684059ca5bb76e2006a9560ac1efa8c3540d3a58.patch
---
diff --git a/src/modules/dmq_usrloc/usrloc_sync.c
b/src/modules/dmq_usrloc/usrloc_sync.c
index de01bc2062..1a7eef0ab8 100644
--- a/src/modules/dmq_usrloc/usrloc_sync.c
+++ b/src/modules/dmq_usrloc/usrloc_sync.c
@@ -323,12 +323,12 @@ static int usrloc_dmq_execute_action(srjson_t
*jdoc_action, dmq_node_t* node) {
static ucontact_info_t ci;
srjson_t *it = NULL;
unsigned int action, expires, cseq, flags, cflags, q, last_modified,
-methods, reg_id;
+methods, reg_id, server_id;
str aor=STR_NULL, ruid=STR_NULL, received=STR_NULL, instance=STR_NULL;
static str c=STR_NULL, callid=STR_NULL, path=STR_NULL,
user_agent=STR_NULL;
action = expires = cseq = flags = cflags = q = last_modified
- = methods = reg_id = 0;
+ = methods = reg_id = server_id = 0;
for(it=jdoc_action; it; it = it->next) {
if (it->string == NULL) continue;
@@ -375,6 +375,8 @@ static int usrloc_dmq_execute_action(srjson_t *jdoc_action,
dmq_node_t* node) {
methods = SRJSON_GET_UINT(it);
} else if (strcmp(it->string, "reg_id")==0) {
reg_id = SRJSON_GET_UINT(it);
+} else if (strcmp(it->string, "server_id")==0) {
+server_id = SRJSON_GET_UINT(it);
} else {
LM_ERR("unrecognized field in json object\n");
}
@@ -394,6 +396,7 @@ static int usrloc_dmq_execute_action(srjson_t *jdoc_action,
dmq_node_t* node) {
ci.methods = methods;
ci.instance = instance;
ci.reg_id = reg_id;
+ ci.server_id = server_id;
ci.tcpconn_id = -1;
ci.last_modified = last_modified;
@@ -646,7 +649,7 @@ int usrloc_dmq_send_multi_contact(ucontact_t* ptr, str aor,
int action, dmq_node
return -1;
}
LM_DBG("group size[%d]\n", jdoc_contact_group.size);
- jdoc_contact_group.size += 188; // json overhead
("":{"action":,"aor":"","ruid":"","c":""...)
+ jdoc_contact_group.size += 201; // json overhead
("":{"action":,"aor":"","ruid":"","c":""...)
srjson_AddNumberToObject(jdoc, jdoc_contact, "action", action);
jdoc_contact_group.size += snprintf(NULL,0,"%d", action);
@@ -683,6 +686,8 @@ int usrloc_dmq_send_multi_contact(ucontact_t* ptr, str aor,
int action, dmq_node
jdoc_contact_group.size += snprintf(NULL,0,"%u", ptr->methods);
srjson_AddNumberToObject(jdoc, jdoc_contact, "reg_id", ptr->reg_id);
jdoc_contact_group.size += snprintf(NULL,0,"%d", ptr->reg_id);
+srjson_AddNumberToObject(jdoc, jdoc_contact, "server_id",
ptr->server_id);
+jdoc_contact_group.size += snprintf(NULL,0,"%d", ptr->server_id);
char idx[5];
jdoc_contact_group.count++;
@@ -729,6 +734,7 @@ int usrloc_dmq_send_contact(ucontact_t* ptr, str aor, int
action, dmq_node_t* no
srjson_AddNumberToObject(, jdoc.root, "last_modified",
ptr->last_modified);
srjson_AddNumberToObject(, jdoc.root, "methods", ptr->methods);
srjson_AddNumberToObject(, jdoc.root, "reg_id", ptr->reg_id);
+srjson_AddNumberToObject(, jdoc.root, "server_id",
ptr->server_id);
jdoc.buf.s = srjson_PrintUnformatted(, jdoc.root);
if(jdoc.buf.s==NULL) {
___
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] v5.0.4: nathelper: dont ping replicated aor's (#1299)
It's a nice idea, but to implement would be quite complex/involved. Firstly, there would likely need to be the concept of a master node along with some mechanism for voting/election. Also, there would need to be changes across all 4 modules (dmq, dmq_usrloc, usrloc and nathelper) to make it work. On top of that, we'd need to consider what happens when a node is restored and takes back its IP. In any case, to select the correct node to take over keepalives, we'd need to know where the IP had been (re)assigned. In your current setup, how do you decide which host takes over the IP (if at all) in the event of a failure? -- 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/1299#issuecomment-341771689___ 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] v5.0.4: nathelper: dont ping replicated aor's (#1299)
I don't think this is a DMQ issue specifically, but more a question of what should happen in *any* replicated situation (including shared DB). Perhaps the solution is, indeed, for nathelper to compare the received socket on the contact against the local socket(s) and either send or not send the keepalive accordingly. I'm not sure if this is already the case since I haven't checked the code, but I assume not given the observed behaviour. Alternatively, given that functionality already exists in nathelper for filtering on server_id in DB mode, we should also add the server_id to the contact in memory and include it in the replicated copy. The question remains, however, in the event of a node going down, which node is going to take over the keepalives and how will it know to do so? Again, this applies to shared DB as much as it does in-memory/DMQ. Either way, I'm happy to add any necessary mods to dmq/dmq_usrloc modules. -- 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/1299#issuecomment-341713760___ 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] dialog: remove replicated dialog from profile as soon as gets to term… (#1284)
Merged #1284. -- 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/1284#event-1313674781___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] dialog: remove replicated dialog from profile as soon as gets to term… (#1284)
…inated state - matches local (non-replicated) behaviour introduced in edf61ac You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1284 -- Commit Summary -- * dialog: remove replicated dialog from profile as soon as gets to terminated state -- File Changes -- M src/modules/dialog/dlg_dmq.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1284.patch https://github.com/kamailio/kamailio/pull/1284.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/1284 ___ 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] dmq: update output format of dmq.list_nodes (#1139)
Merged #1139. -- 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/1139#event-1099860073___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:b5f94a95: dmq_usrloc: always replicate contact updates made locally
Module: kamailio Branch: master Commit: b5f94a9596721acb1f49e4ab011ddfd6333b7936 URL: https://github.com/kamailio/kamailio/commit/b5f94a9596721acb1f49e4ab011ddfd6333b7936 Author: Charles Chance <charles.cha...@sipcentric.com> Committer: Charles Chance <charles.cha...@sipcentric.com> Date: 2017-05-27T11:18:36+01:00 dmq_usrloc: always replicate contact updates made locally - fixes issue reported by shuntongzh...@gmail.com on sr-dev - we no longer set FL_RPL since it is otherwise meaningless - dmq replicated contacts are no different now to those from a shared DB --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/b5f94a9596721acb1f49e4ab011ddfd6333b7936.diff Patch: https://github.com/kamailio/kamailio/commit/b5f94a9596721acb1f49e4ab011ddfd6333b7936.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
