sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
368 discussions

git:master:3fc1da64: presence: added enable_dmq parameter to module docs
by Charles Chance 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 3fc1da644a6b375fc45ea17cbcf81643f70db545 URL: https://github.com/kamailio/kamailio/commit/3fc1da644a6b375fc45ea17cbcf8164… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)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/3fc1da644a6b375fc45ea17cbcf8164… Patch: https://github.com/kamailio/kamailio/commit/3fc1da644a6b375fc45ea17cbcf8164… --- 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 @@ <emphasis>tm</emphasis>. </para> </listitem> + <listitem> + <para> + <emphasis>dmq (only if replication is enabled)</emphasis>. + </para> + </listitem> </itemizedlist> </para> </section> @@ -897,6 +902,33 @@ modparam("presence", "retrieve_order_by", "priority, received_time") </example> </section> +<section id="presence.p.enable_dmq"> + <title><varname>enable_dmq</varname> (integer)</title> + <para> + 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). + </para> + <para> + <emphasis> + If this parameter is enabled, the DMQ module must be loaded first - otherwise, startup will fail. + </emphasis> + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>enable_dmq</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("presence", "enable_dmq", 1) + ... + </programlisting> + </example> +</section> + </section> <section>

1 0

git:master:a4034c1d: kamctl: regenerated db scripts to include presentity ruid column
by Charles Chance 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: a4034c1d087b1c87f4dd712554a2a6f6fa184d86 URL: https://github.com/kamailio/kamailio/commit/a4034c1d087b1c87f4dd712554a2a6f… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)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/a4034c1d087b1c87f4dd712554a2a6f… Patch: https://github.com/kamailio/kamailio/commit/a4034c1d087b1c87f4dd712554a2a6f…

1 0

git:master:acd42263: schema: add ruid column to presentity table
by Charles Chance 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: acd42263ea1e648f2f5789f993a63de1f05f8b1b URL: https://github.com/kamailio/kamailio/commit/acd42263ea1e648f2f5789f993a63de… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)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/acd42263ea1e648f2f5789f993a63de… Patch: https://github.com/kamailio/kamailio/commit/acd42263ea1e648f2f5789f993a63de… --- 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 @@ <table id="presentity" xmlns:db="http://docbook.org/ns/docbook"> <name>presentity</name> - <version>4</version> + <version>5</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para> @@ -98,6 +98,14 @@ <description>Priority of the record</description> </column> + <column id="ruid"> + <name>ruid</name> + <type>string</type> + <size>64</size> + <null/> + <description>Record internal unique id</description> + </column> + <index> <name>presentity_idx</name> <colref linkend="username"/> @@ -107,6 +115,12 @@ <unique/> </index> + <index> + <name>ruid_idx</name> + <colref linkend="ruid"/> + <unique/> + </index> + <index> <name>presentity_expires</name> <colref linkend="expires"/>

1 0

git:master:b7a5016c: presence: dmq integration
by Charles Chance 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: b7a5016cdbdb068fe23dc1a5d74aa01643c8ec20 URL: https://github.com/kamailio/kamailio/commit/b7a5016cdbdb068fe23dc1a5d74aa01… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)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/b7a5016cdbdb068fe23dc1a5d74aa01… Patch: https://github.com/kamailio/kamailio/commit/b7a5016cdbdb068fe23dc1a5d74aa01…

1 0

[kamailio/kamailio] presence: dmq integration (#1402)
by Charles Chance 25 Jan '18

25 Jan '18

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

3 14

git:master:97fd1100: Merge pull request #1410 from christoph-v/missing_record_route_assignment
by GitHub 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 97fd1100b0bb4a33ad010d270404c25b3849873b URL: https://github.com/kamailio/kamailio/commit/97fd1100b0bb4a33ad010d270404c25… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-25T16:58:26+01:00 Merge pull request #1410 from christoph-v/missing_record_route_assignment ims_usrloc_scscf: missing assignment of record_route --- Modified: src/modules/ims_usrloc_scscf/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/97fd1100b0bb4a33ad010d270404c25… Patch: https://github.com/kamailio/kamailio/commit/97fd1100b0bb4a33ad010d270404c25… --- diff --git a/src/modules/ims_usrloc_scscf/subscribe.c b/src/modules/ims_usrloc_scscf/subscribe.c index 227d06d51a..a5bdf699d5 100644 --- a/src/modules/ims_usrloc_scscf/subscribe.c +++ b/src/modules/ims_usrloc_scscf/subscribe.c @@ -346,6 +346,7 @@ int update_subscriber(impurecord_t* urec, reg_subscriber** _reg_subscriber, int subs.callid = rs->call_id; subs.expires = rs->expires - act_time; subs.contact = rs->watcher_contact; + subs.record_route = rs->record_route; hash_code = core_hash(&subs.callid, &subs.to_tag, sub_dialog_hash_size);

1 0

git:master:595b8fe0: ims_usrloc_scscf: missing assignment of record_route
by Christoph Valentin 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 595b8fe06165328366865328e43c14a9ca23c386 URL: https://github.com/kamailio/kamailio/commit/595b8fe06165328366865328e43c14a… Author: Christoph Valentin <christoph.valentin(a)kapsch.net> Committer: Christoph Valentin <christoph.valentin(a)kapsch.net> Date: 2018-01-25T13:37:59+01:00 ims_usrloc_scscf: missing assignment of record_route In update_subscriber() function, when the rs is assigned to the subs, it is missing the record_route component, which leads to core dump in some scenarios. --- Modified: src/modules/ims_usrloc_scscf/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/595b8fe06165328366865328e43c14a… Patch: https://github.com/kamailio/kamailio/commit/595b8fe06165328366865328e43c14a… --- diff --git a/src/modules/ims_usrloc_scscf/subscribe.c b/src/modules/ims_usrloc_scscf/subscribe.c index 227d06d51a..a5bdf699d5 100644 --- a/src/modules/ims_usrloc_scscf/subscribe.c +++ b/src/modules/ims_usrloc_scscf/subscribe.c @@ -346,6 +346,7 @@ int update_subscriber(impurecord_t* urec, reg_subscriber** _reg_subscriber, int subs.callid = rs->call_id; subs.expires = rs->expires - act_time; subs.contact = rs->watcher_contact; + subs.record_route = rs->record_route; hash_code = core_hash(&subs.callid, &subs.to_tag, sub_dialog_hash_size);

1 0

[kamailio/kamailio] ims_usrloc_scscf: missing assignment of record_route (#1410)
by Christoph VALENTIN 25 Jan '18

25 Jan '18

In update_subscriber() function, when the rs is assigned to the subs, it is missing the record_route component, which leads to core dump in some scenarios.   #### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Without this bugfix, a core dump can happen during SIP REGISTER in S-CSCF. Reason: the record_route component was forgotten to be assigned when assigning rs to Subs in the update_subscriber() function. This assignment was added. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1410 -- Commit Summary -- * ims_usrloc_scscf: missing assignment of record_route -- File Changes -- M src/modules/ims_usrloc_scscf/subscribe.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1410.patch https://github.com/kamailio/kamailio/pull/1410.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/1410

2 1

git:master:6d67bf0e: Merge pull request #1411 from christoph-v/wrong_query_buffer_assignment
by GitHub 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 6d67bf0ed3451fa16bf98d0984af85f25c4c1b56 URL: https://github.com/kamailio/kamailio/commit/6d67bf0ed3451fa16bf98d0984af85f… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-25T16:57:56+01:00 Merge pull request #1411 from christoph-v/wrong_query_buffer_assignment ims_usrloc_scscf: assignment of length missing for query_buffer in db_link_contact_to_impu() --- Modified: src/modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/6d67bf0ed3451fa16bf98d0984af85f… Patch: https://github.com/kamailio/kamailio/commit/6d67bf0ed3451fa16bf98d0984af85f… --- diff --git a/src/modules/ims_usrloc_scscf/usrloc_db.c b/src/modules/ims_usrloc_scscf/usrloc_db.c index e1a7d4287e..b5301e0a3b 100644 --- a/src/modules/ims_usrloc_scscf/usrloc_db.c +++ b/src/modules/ims_usrloc_scscf/usrloc_db.c @@ -1079,7 +1079,7 @@ int db_link_contact_to_impu(impurecord_t* _r, ucontact_t* _c) { } - query_buffer_len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); + query_buffer.len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); LM_DBG("QUERY IS [%.*s] and len is %d\n", query_buffer.len, query_buffer.s, query_buffer.len); if (ul_dbf.raw_query(ul_dbh, &query_buffer, &rs) != 0) {

1 0

git:master:11c179ab: ims_usrloc_scscf: assignment of length missing for query_buffer in
by Christoph Valentin 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 11c179ab232222f1c78f19557032afd49bef7324 URL: https://github.com/kamailio/kamailio/commit/11c179ab232222f1c78f19557032afd… Author: Christoph Valentin <christoph.valentin(a)kapsch.net> Committer: Christoph Valentin <christoph.valentin(a)kapsch.net> Date: 2018-01-25T13:13:07+01:00 ims_usrloc_scscf: assignment of length missing for query_buffer in db_link_contact_to_impu() When writing to query_buffer with the help of the snprintf() function, the result of the functio is written to variable query_buffer_len instead of to the query_buffer.len itself. This leads to core dump in some cases. Replaced "_" by "." in "query_buffer_len =" --- Modified: src/modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/11c179ab232222f1c78f19557032afd… Patch: https://github.com/kamailio/kamailio/commit/11c179ab232222f1c78f19557032afd… --- diff --git a/src/modules/ims_usrloc_scscf/usrloc_db.c b/src/modules/ims_usrloc_scscf/usrloc_db.c index e1a7d4287e..b5301e0a3b 100644 --- a/src/modules/ims_usrloc_scscf/usrloc_db.c +++ b/src/modules/ims_usrloc_scscf/usrloc_db.c @@ -1079,7 +1079,7 @@ int db_link_contact_to_impu(impurecord_t* _r, ucontact_t* _c) { } - query_buffer_len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); + query_buffer.len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); LM_DBG("QUERY IS [%.*s] and len is %d\n", query_buffer.len, query_buffer.s, query_buffer.len); if (ul_dbf.raw_query(ul_dbh, &query_buffer, &rs) != 0) {

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2018