Re: [sr-dev] [kamailio/kamailio] dmq_usrloc: sync with multi contacts per message (#1054)

[Charles Chance]

Are there other changes you'd like to make to this PR?

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/1054#issuecomment-291784434___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] dmq_usrloc: sync with multi contacts per message (#1054)

[Charles Chance]

I am reviewing the patch currently but as for limiting to 60KB, I'm not sure 
that for this application it is necessary. It will be difficult to be 100% 
accurate, anyway, since you only have control over the body - therefore, the 
only option is to assume a sensible size for the rest of the message and set 
that aside in your calculation.

I think Kamailio handles fragmentation just fine and since this is really just 
a few packets on startup/initial sync, I don't think we need to be concerned 
about it (although it may be worth a mention in the readme). Others may have a 
different opinion of course.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/1054#issuecomment-291624187___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] Enabling DMQ cause high CPU usage (#822)

[Charles Chance]

Fixed in 71a88212 - please re-open if the issue remains after testing.

-- 
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/822#issuecomment-290176026___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] Enabling DMQ cause high CPU usage (#822)

[Charles Chance]

Closed #822.

-- 
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/822#event-1020940437___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] dmq: remove worker lock (#1046)

[Charles Chance]

Thanks - this has now been incorporated into 71a88212

-- 
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/1046#issuecomment-290175395___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] dmq: remove worker lock (#1046)

[Charles Chance]

Closed #1046.

-- 
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/1046#event-1020936981___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:71a88212: dmq: add option for non-locking workers

[Charles Chance]

Module: kamailio
Branch: master
Commit: 71a882122c2e6a9c61f25cb34bfd4fef75c65fe0
URL: 
https://github.com/kamailio/kamailio/commit/71a882122c2e6a9c61f25cb34bfd4fef75c65fe0

Author: Charles Chance <charles.cha...@sipcentric.com>
Committer: Charles Chance <charles.cha...@sipcentric.com>
Date: 2017-03-29T19:05:50+01:00

dmq: add option for non-locking workers

- fixes high CPU condition on some systems (e.g. FreeBSD)
- reported by @soapnix, GH #822
- incorporates patch by Tom Beard (@tombeard)

---

Modified: src/modules/dmq/README
Modified: src/modules/dmq/dmq.c
Modified: src/modules/dmq/dmq.h
Modified: src/modules/dmq/doc/dmq_admin.xml
Modified: src/modules/dmq/worker.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/71a882122c2e6a9c61f25cb34bfd4fef75c65fe0.diff
Patch: 
https://github.com/kamailio/kamailio/commit/71a882122c2e6a9c61f25cb34bfd4fef75c65fe0.patch


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] Enabling DMQ cause high CPU usage (#822)

[Charles Chance]

Yes, I would be happier implementing that way, since the lock method is better 
in most situations.

If no-one has any objections or reasons not to, then I shall proceed on that 
basis and make the necessary changes this evening.

-- 
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/822#issuecomment-290096859___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] Enabling DMQ cause high CPU usage (#822)

[Charles Chance]

Thanks, @tombeard - it works and appears safe. However, in my own (Centos) 
tests, CPU utilisation when workers are idle is noticeably higher than before.

Increasing the sleep duration helps - so if it is implemented this way then it 
should be exposed as a mod param with a sensible default.

Personally, it seems like a (mostly) unnecessary trade-off between CPU cycles 
and job-processing delay, for what appears to be a limited number of cases 
(FreeBSD only one reported to my knowledge). Mutex by default for the remainder 
seems to be both more efficient and 'real-time'.

If everyone else agrees the alternative approach is better all round, then I am 
happy to merge once the sleep duration has been made configurable. It would 
still be good to hear @miconda's thoughts on making this a compile-time 
decision, though.

-- 
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/822#issuecomment-290075638___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] Enabling DMQ cause high CPU usage (#822)

[Charles Chance]

Ok, I'll refine and push for testing tomorrow. Thanks for the input @tombeard.

-- 
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/822#issuecomment-289917098___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] Enabling DMQ cause high CPU usage (#822)

[Charles Chance]

@tombeard thanks - I guess not! Pull request?

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/822#issuecomment-289914479___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:666ebb63: dmq: attempt to re-initialize if node becomes detatched from cluster

[Charles Chance]

Module: kamailio
Branch: master
Commit: 666ebb63aecf2254b8efeae261452fc75c6d3aed
URL: 
https://github.com/kamailio/kamailio/commit/666ebb63aecf2254b8efeae261452fc75c6d3aed

Author: Charles Chance <charles.cha...@sipcentric.com>
Committer: Charles Chance <charles.cha...@sipcentric.com>
Date: 2017-03-28T21:28:35+01:00

dmq: attempt to re-initialize if node becomes detatched from cluster

- issue reported by José Seabra on sr-users mailing list

---

Modified: src/modules/dmq/dmq_funcs.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/666ebb63aecf2254b8efeae261452fc75c6d3aed.diff
Patch: 
https://github.com/kamailio/kamailio/commit/666ebb63aecf2254b8efeae261452fc75c6d3aed.patch

---

diff --git a/src/modules/dmq/dmq_funcs.c b/src/modules/dmq/dmq_funcs.c
index 57c8c88..622ec42 100644
--- a/src/modules/dmq/dmq_funcs.c
+++ b/src/modules/dmq/dmq_funcs.c
@@ -459,12 +459,28 @@ void ping_servers(unsigned int ticks, void *param) {
str* body;
int ret;
LM_DBG("ping_servers\n");
+
+   if (!node_list->nodes || (node_list->nodes->local && 
!node_list->nodes->next)) {
+   LM_DBG("node list is empty - attempt to rebuild from 
notification address\n");
+   *dmq_init_callback_done = 0;
+   if(dmq_notification_address.s) {
+   notification_node = 
add_server_and_notify(_notification_address);
+   if(!notification_node) {
+   LM_ERR("cannot retrieve initial nodelist from 
%.*s\n",
+   STR_FMT(_notification_address));
+   }
+   } else {
+   LM_ERR("no notification address");
+   }
+   return;
+   }
+
body = build_notification_body();
if (!body) {
LM_ERR("could not build notification body\n");
return;
}
-   ret = bcast_dmq_message(dmq_notification_peer, body, notification_node,
+   ret = bcast_dmq_message(dmq_notification_peer, body, NULL,
_callback, 1, _content_type);
pkg_free(body->s);
pkg_free(body);


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] Enabling DMQ cause high CPU usage (#822)

[Charles Chance]

Revisiting this now after a busy few months.

@miconda - is it better in your opinion to introduce new locking method 
completely, or only in the presence of a compile-time flag?

-- 
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/822#issuecomment-289887727___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:4.4:aa27479a: presence: delay aux_body_processing until after subscription has been updated

[Charles Chance]

Module: kamailio
Branch: 4.4
Commit: aa27479ad204b6826aea03d777af9401ffd26a11
URL: 
https://github.com/kamailio/kamailio/commit/aa27479ad204b6826aea03d777af9401ffd26a11

Author: Charles Chance <charles.cha...@sipcentric.com>
Committer: Charles Chance <charles.cha...@sipcentric.com>
Date: 2017-01-17T22:46:57Z

presence: delay aux_body_processing until after subscription has been updated

- fixes out-of-sequence version when subs_db_mode <> 3 and fast_notify is 
enabled

---

Modified: modules/presence/notify.c
Modified: modules/presence/notify.h
Modified: modules/presence/presence.c
Modified: modules/presence/subscribe.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/aa27479ad204b6826aea03d777af9401ffd26a11.diff
Patch: 
https://github.com/kamailio/kamailio/commit/aa27479ad204b6826aea03d777af9401ffd26a11.patch


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] presence: delay aux_body_processing until after subscription has been updated (#917)

[Charles Chance]

Hello again - given today's announcement of upcoming 4.4.5 release in the next 
couple of days, I would ask anyone with any issues to report it here, 
otherwise, I will backport tomorrow evening to ensure it is included in the 
release.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/917#issuecomment-272837839___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] presence: delay aux_body_processing until after subscription has been updated (#917)

[Charles Chance]

Ok, I will wait another couple of weeks. We have it already in production since 
last week, so if no other issue reported by end of January I will assume it is 
safe to backport.

-- 
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/917#issuecomment-272691269___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] presence: delay aux_body_processing until after subscription has been updated (#917)

[Charles Chance]

@miconda - is it OK to backport to 4.4?

-- 
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/917#issuecomment-271850901___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] presence: delay aux_body_processing until after subscription has been updated (#917)

[Charles Chance]

Thanks - can it be backported also?

Charles

On 9 January 2017 at 10:41, Charles Chance <notificati...@github.com> wrote:

> Merged #917 <https://github.com/kamailio/kamailio/pull/917>.
>
> —
> You are receiving this because you are subscribed to this thread.
> Reply to this email directly, view it on GitHub
> <https://github.com/kamailio/kamailio/pull/917#event-915742731>, or mute
> the thread
> <https://github.com/notifications/unsubscribe-auth/AF36ZQObSz41XCs7ZaS7mOM2AP70WVIiks5rQg7PgaJpZM4LdPm5>
> .
>
> ___
> sr-dev mailing list
> sr-dev@lists.sip-router.org
> http://lists.sip-router.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.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] presence: delay aux_body_processing until after subscription has been updated (#917)

[Charles Chance]

Merged #917.

-- 
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/917#event-915742731___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:b429f625: presence: delay aux_body_processing until after subscription has been updated

[Charles Chance]

Module: kamailio
Branch: master
Commit: b429f625ba409cb668b00155996a5f4a4f1733d8
URL: 
https://github.com/kamailio/kamailio/commit/b429f625ba409cb668b00155996a5f4a4f1733d8

Author: Charles Chance <charles.cha...@sipcentric.com>
Committer: Charles Chance <charles.cha...@sipcentric.com>
Date: 2017-01-06T23:21:52Z

presence: delay aux_body_processing until after subscription has been updated

- fixes out-of-sequence version when subs_db_mode <> 3 and fast_notify is 
enabled

---

Modified: src/modules/presence/notify.c
Modified: src/modules/presence/notify.h
Modified: src/modules/presence/presence.c
Modified: src/modules/presence/subscribe.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/b429f625ba409cb668b00155996a5f4a4f1733d8.diff
Patch: 
https://github.com/kamailio/kamailio/commit/b429f625ba409cb668b00155996a5f4a4f1733d8.patch


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] [kamailio/kamailio] presence: delay aux_body_processing until after subscription has been updated (#917)

[Charles Chance]

Fixes out-of-sequence version when subs_db_mode <> 3 and fast_notify is enabled.

Version is incremented only when copy is updated in memory. Therefore, 
currently:

On SUBSCRIBE, subscription is updated first, so NOTIFY body contains newly 
incremented version.

But on PUBLISH, aux_body_processing is called first, so NOTIFY body contains 
previously stored version.
You can view, comment on, or merge this pull request online at:

  https://github.com/kamailio/kamailio/pull/917

-- Commit Summary --

  * presence: delay aux_body_processing until after subscription has been 
updated

-- File Changes --

M src/modules/presence/notify.c (42)
M src/modules/presence/notify.h (2)
M src/modules/presence/presence.c (2)
M src/modules/presence/subscribe.c (8)

-- Patch Links --

https://github.com/kamailio/kamailio/pull/917.patch
https://github.com/kamailio/kamailio/pull/917.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/917
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] Enabling DMQ cause high CPU usage (#822)

[Charles Chance]

Thanks, @miconda, will take a look.

-- 
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/822#issuecomment-259144332___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] Enabling DMQ cause high CPU usage (#822)

[Charles Chance]

Apologies, I have been away for a couple of weeks. DMQ does indeed use mutexes 
to trigger processing of a new task by its workers.

Your log shows everything is as expected with DMQ - i.e. with no other traffic, 
a lock is acquired/released once every minute with each peer notification (node 
ping). There is nothing else unusual about your log (or GDB output) that I can 
see.

So it does seem likely that something in the way these locks are being 
implemented is causing the high load on your particular system. Maybe someone 
else can suggest another alternative, if enabling POSIX semaphores has not 
resolved the issue 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/issues/822#issuecomment-255786283___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] dmq_usrloc has "location" table name hardcoded (#796)

[Charles Chance]

Please try with b747d469e6c9d12be5e4541c41346b73f9bc1199, which introduces a 
new parameter "usrloc_domain".

I will try to enhance further at a later date to allow for multiple domains.

-- 
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/796#issuecomment-249597329___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:b747d469: Add modparam to specify the usrloc domain to synchronize.

[Charles Chance]

Module: kamailio
Branch: master
Commit: b747d469e6c9d12be5e4541c41346b73f9bc1199
URL: 
https://github.com/kamailio/kamailio/commit/b747d469e6c9d12be5e4541c41346b73f9bc1199

Author: Charles Chance <charles.cha...@sipcentric.com>
Committer: Charles Chance <charles.cha...@sipcentric.com>
Date: 2016-09-26T16:00:42+01:00

Add modparam to specify the usrloc domain to synchronize.

- TODO: allow multiple comma-separated domains

---

Modified: modules/dmq_usrloc/dmq_usrloc.c
Modified: modules/dmq_usrloc/usrloc_sync.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/b747d469e6c9d12be5e4541c41346b73f9bc1199.diff
Patch: 
https://github.com/kamailio/kamailio/commit/b747d469e6c9d12be5e4541c41346b73f9bc1199.patch

---

diff --git a/modules/dmq_usrloc/dmq_usrloc.c b/modules/dmq_usrloc/dmq_usrloc.c
index 6000b2a..d026cd2 100644
--- a/modules/dmq_usrloc/dmq_usrloc.c
+++ b/modules/dmq_usrloc/dmq_usrloc.c
@@ -38,6 +38,7 @@ int dmq_usrloc_enable = 0;
 int _dmq_usrloc_sync = 1;
 int _dmq_usrloc_batch_size = 0;
 int _dmq_usrloc_batch_usleep = 0;
+str _dmq_usrloc_domain = str_init("location");
 
 usrloc_api_t dmq_ul;
 
@@ -48,6 +49,7 @@ static param_export_t params[] = {
{"sync",   INT_PARAM, &_dmq_usrloc_sync},
{"batch_size",   INT_PARAM, &_dmq_usrloc_batch_size},
{"batch_usleep", INT_PARAM, &_dmq_usrloc_batch_usleep},
+   {"usrloc_domain", PARAM_STR, &_dmq_usrloc_domain},
{0, 0, 0}
 };
 
diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c
index 86e34ac..c256af4 100644
--- a/modules/dmq_usrloc/usrloc_sync.c
+++ b/modules/dmq_usrloc/usrloc_sync.c
@@ -47,6 +47,7 @@ int usrloc_dmq_send_contact(ucontact_t* ptr, str aor, int 
action, dmq_node_t* no
 extern int _dmq_usrloc_sync;
 extern int _dmq_usrloc_batch_size;
 extern int _dmq_usrloc_batch_usleep;
+extern str _dmq_usrloc_domain;
 
 static int add_contact(str aor, ucontact_info_t* ci)
 {
@@ -56,7 +57,7 @@ static int add_contact(str aor, ucontact_info_t* ci)
str contact;
int res;
 
-   if (dmq_ul.get_udomain("location", &_d) < 0) {
+   if (dmq_ul.get_udomain(_dmq_usrloc_domain.s, &_d) < 0) {
LM_ERR("Failed to get domain\n");
return -1;
}
@@ -109,7 +110,7 @@ static int delete_contact(str aor, ucontact_info_t* ci)
urecord_t* r;
ucontact_t* c;
 
-if (dmq_ul.get_udomain("location", &_d) < 0) {
+if (dmq_ul.get_udomain(_dmq_usrloc_domain.s, &_d) < 0) {
 LM_ERR("Failed to get domain\n");
 return -1;
 }
@@ -159,7 +160,7 @@ void usrloc_get_all_ucontact(dmq_node_t* node)
goto done;
}
 
-   if (dmq_ul.get_udomain("location", &_d) < 0) {
+   if (dmq_ul.get_udomain(_dmq_usrloc_domain.s, &_d) < 0) {
LM_ERR("Failed to get domain\n");
goto done;
}


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:af2f5007: Update documentation to include new usrloc_domain parameter.

[Charles Chance]

Module: kamailio
Branch: master
Commit: af2f50071db80d22ebd790608ea409ed4cc36c04
URL: 
https://github.com/kamailio/kamailio/commit/af2f50071db80d22ebd790608ea409ed4cc36c04

Author: Charles Chance <charles.cha...@sipcentric.com>
Committer: Charles Chance <charles.cha...@sipcentric.com>
Date: 2016-09-26T16:00:42+01:00

Update documentation to include new usrloc_domain parameter.

---

Modified: modules/dmq_usrloc/README
Modified: modules/dmq_usrloc/doc/dmq_usrloc_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/af2f50071db80d22ebd790608ea409ed4cc36c04.diff
Patch: 
https://github.com/kamailio/kamailio/commit/af2f50071db80d22ebd790608ea409ed4cc36c04.patch

---

diff --git a/modules/dmq_usrloc/README b/modules/dmq_usrloc/README
index 1d57c90..cbdebc8 100644
--- a/modules/dmq_usrloc/README
+++ b/modules/dmq_usrloc/README
@@ -31,12 +31,15 @@ Andrey Rybkin
   3.3. batch_size (int)
   3.4. batch_usleep (int)
 
+4. usrloc_domain (string)
+
List of Examples
 
1.1. Set enable parameter
1.2. Set sync parameter
1.3. Set batch size parameter
1.4. Set batch_usleep parameter
+   1.5. Set usrloc_domain parameter
 
 Chapter 1. Admin Guide
 
@@ -54,6 +57,8 @@ Chapter 1. Admin Guide
 3.3. batch_size (int)
 3.4. batch_usleep (int)
 
+   4. usrloc_domain (string)
+
 1. Overview
 
The module adds user location (usrloc) records replication between
@@ -134,3 +139,14 @@ modparam("dmq_usrloc", "batch_size", 4000)
 ...
 modparam("dmq_usrloc", "batch_usleep", 1000)
 ...
+
+4. usrloc_domain (string)
+
+   The usrloc domain to synchronize.
+
+   Default value is “location”.
+
+   Example 1.5. Set usrloc_domain parameter
+...
+modparam("dmq_usrloc", "usrloc_domain", "my_domain")
+...
diff --git a/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml 
b/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml
index 3c0e2b1..49ffb57 100644
--- a/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml
+++ b/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml
@@ -179,5 +179,25 @@ modparam("dmq_usrloc", "batch_usleep", 1000)


 
+   
+   usrloc_domain (string)
+   
+   The usrloc domain to synchronize.
+   
+   
+   
+   Default value is location.
+   
+   
+   
+   Set usrloc_domain parameter
+   
+...
+modparam("dmq_usrloc", "usrloc_domain", "my_domain")
+...
+
+   
+   
+
 
 


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Presence notify - duplicate aux body processing?

[Charles Chance]

Hi All,

Whilst attempting to track down the source of an issue introduced at some
point since 4.2.1, I came across the following and would appreciate a
second opinion.

In send_notify_request() function (/modules/presence/notify.c), the aux
body processing function attached to the event is called:

> /* call aux_body_processing if exists */
> if(subs->event->aux_body_processing)
> {
> aux_body = subs->event->aux_body_processing(subs, notify_body);
> if(aux_body) {
> free_notify_body(notify_body, subs->event);
> notify_body = aux_body;
> }
> }


However, by the time we reach this function, aux body processing will
already have been completed (specifically in the publ_notify() or
query_db_notify() functions of the same file).

If I remove the duplicate function call, the issue goes away - but I'm
reluctant to submit a pull request which reverts an earlier commit, unless
I can understand the reason for the change in the first place. Especially
since it was made a year ago.

Is anyone able to explain what I'm missing?

Cheers,

Charles

-- 
*** We're rebranding! Learn more here 
 ***

www.sipcentric.com

Follow us on twitter @sipcentric 

Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] Presence notify - duplicate aux body processing?

[Charles Chance]

Hi Luis,

I really appreciate your reply.

My issue is the one you have also observed yourself - incorrect notify
version for dbmode <> 3 - and tried to fix recently with this commit:

https://github.com/kamailio/kamailio/commit/6dd065629604a32081d5e7b63bbbd292f56aaf23

and subsequently with these commits:

https://github.com/kamailio/kamailio/commit/412f155ede8587c1d439503cd7d0e783bc3c0d6b
https://github.com/kamailio/kamailio/commit/b6b7de8832e4ab22ef2c00ebb2c1e1b6ced9ff35
https://github.com/kamailio/kamailio/commit/adcad3445b33d917ef13e4419310b5b11d472fe1


However, for us at least, the issue remains and I believe it was introduced
by the original commit - and if we revert it the problem disappears - so
IMO the fix would be to address it at source.

As it stands, the aux body processing appears still to be duplicated
depending on the configuration. So, maybe now the solution is to remove the
previous aux body processing in the publ_notify() and query_db_notify()
functions?

Does this make sense? Please correct me if I am wrong.

Thanks again,

Charles


On 14 January 2016 at 21:28, Luis Azedo <l...@2600hz.com> wrote:

> the commit was introduced because of dbmode = 3
> > pres_timer_send_notify
> > process_dialogs
> > notifier_notify
> > notify
> > send_notify_request
>
> and then gets the body and processes the aux_body_processing
>
> *notify_body = get_p_notify_body(subs->pres_uri,*
> *subs->event, NULL, (subs->contact.s)?>contact:NULL);*
> if(notify_body == NULL || notify_body->s== NULL)
> {
> LM_DBG("Could not get the notify_body\n");
> }
> else
> {
> */* call aux_body_processing if exists */*
> *if(subs->event->aux_body_processing)*
> *{*
> *aux_body = subs->event->aux_body_processing(subs, notify_body);*
>
>
> but you haven't detailed your issue, so i'm not sure how to help you.
>
> Best
>
> --
> *From:* sr-dev [sr-dev-boun...@lists.sip-router.org] on behalf of Charles
> Chance [charles.cha...@sipcentric.com]
> *Sent:* Thursday, January 14, 2016 7:35 AM
> *To:* sr-dev
> *Subject:* [sr-dev] Presence notify - duplicate aux body processing?
>
> Hi All,
>
> Whilst attempting to track down the source of an issue introduced at some
> point since 4.2.1, I came across the following and would appreciate a
> second opinion.
>
> In send_notify_request() function (/modules/presence/notify.c), the aux
> body processing function attached to the event is called:
>
>> /* call aux_body_processing if exists */
>> if(subs->event->aux_body_processing)
>> {
>> aux_body = subs->event->aux_body_processing(subs, notify_body);
>> if(aux_body) {
>> free_notify_body(notify_body, subs->event);
>> notify_body = aux_body;
>> }
>> }
>
>
> However, by the time we reach this function, aux body processing will
> already have been completed (specifically in the publ_notify() or
> query_db_notify() functions of the same file).
>
> If I remove the duplicate function call, the issue goes away - but I'm
> reluctant to submit a pull request which reverts an earlier commit, unless
> I can understand the reason for the change in the first place. Especially
> since it was made a year ago.
>
> Is anyone able to explain what I'm missing?
>
> Cheers,
>
> Charles
>
> *** We're rebranding! Learn more here
> <http://www.sipcentric.com/2015/07/were-rebranding/> ***
>
> www.sipcentric.com
>
> Follow us on twitter @sipcentric <http://twitter.com/sipcentric>
>
> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered
> office: Faraday Wharf, Innovation Birmingham Campus, Holt Street,
> Birmingham Science Park, Birmingham B7 4BB.
>
> ___
> sr-dev mailing list
> sr-dev@lists.sip-router.org
> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
>
>


-- 
*Charles Chance*
Managing Director

t. 0121 285 4400m. 07932 063 891

-- 
*** We're rebranding! Learn more here 
<http://www.sipcentric.com/2015/07/were-rebranding/> ***

www.sipcentric.com

Follow us on twitter @sipcentric <http://twitter.com/sipcentric>

Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] git:master:b6b7de88: presence_dialoginfo : aux_body should return xmldoc instead of char

[Charles Chance]

Thanks Luis.

If it's been like it for all this time then perhaps some other change
recently has exasperated the issue, since it only became noticeable for us
after upgrading to 4.3. It had been fine - or at least not noticeable - for
several years prior to that, with the same setup everywhere (db mode 2).

Anyway, thanks for fixing!

Cheers,
Charles
On 18 Dec 2015 12:47 am, "Luis Azedo" <l...@2600hz.com> wrote:

> Hi Charles,
>
> i'm not entirely sure but it seems that its been like this for a long time
> time (2008 with little changes in 2012). i usually make use of notifier
> workers (db mode = 3) where this was no issue.
>
> i received a report about the versioning, identified the code path (it was
> db_mode = 2  even tho the notifier_processes were 5) which was different ,
> identified the issue and corrected it. sorry for the false start on the
> correction, i was fooled by travis and misread the return type which lead
> to crashing.
>
> Best
>
> --
> *From:* sr-dev [sr-dev-boun...@lists.sip-router.org] on behalf of Charles
> Chance [charles.cha...@sipcentric.com]
> *Sent:* Thursday, December 17, 2015 4:11 PM
> *To:* sr-dev
> *Subject:* Re: [sr-dev] git:master:b6b7de88: presence_dialoginfo :
> aux_body should return xmldoc instead of char
>
> Hi Luis,
>
> It would be interesting to understand where the issue with document
> versioning was first introduced - it was working fine prior to 4.3 as far
> as I can tell.
>
> We noticed some weirdness with BLF after upgrading to 4.3.4 on some
> production machines and soon realised it was due to the version being
> incorrect - however, these recent patches have only led to other
> issues/crashes in our offline tests today.
>
> Can you shed any light on when it might have been introduced? I've not had
> much chance look myself but happy to spend some time over the weekend.
>
> Cheers,
> Charles
>
>
> On 17 Dec 2015 10:09 pm, "Luis Azedo" <l...@2600hz.com> wrote:
>
>> Module: kamailio
>> Branch: master
>> Commit: b6b7de8832e4ab22ef2c00ebb2c1e1b6ced9ff35
>> URL:
>> https://github.com/kamailio/kamailio/commit/b6b7de8832e4ab22ef2c00ebb2c1e1b6ced9ff35
>>
>> Author: Luis Azedo <l...@2600hz.com>
>> Committer: Luis Azedo <l...@2600hz.com>
>> Date: 2015-12-17T21:02:43Z
>>
>> presence_dialoginfo : aux_body should return xmldoc instead of char
>>
>> ---
>>
>> Modified: modules/presence/notify.c
>> Modified: modules/presence_dialoginfo/notify_body.c
>>
>> ---
>>
>> Diff:
>> https://github.com/kamailio/kamailio/commit/b6b7de8832e4ab22ef2c00ebb2c1e1b6ced9ff35.diff
>> Patch:
>> https://github.com/kamailio/kamailio/commit/b6b7de8832e4ab22ef2c00ebb2c1e1b6ced9ff35.patch
>>
>> ---
>>
>> diff --git a/modules/presence/notify.c b/modules/presence/notify.c
>> index efb8a48..f6a0ba9 100644
>> --- a/modules/presence/notify.c
>> +++ b/modules/presence/notify.c
>> @@ -1535,8 +1535,7 @@ int send_notify_request(subs_t* subs, subs_t *
>> watcher_subs,
>> {
>> aux_body =
>> subs->event->aux_body_processing(subs, notify_body);
>> if(aux_body) {
>> -
>>  xmlFree(notify_body->s);
>> -
>>  pkg_free(notify_body);
>> +
>>  free_notify_body(notify_body, subs->event);
>> notify_body =
>> aux_body;
>> }
>> }
>> diff --git a/modules/presence_dialoginfo/notify_body.c
>> b/modules/presence_dialoginfo/notify_body.c
>> index e6dc050..710fe91 100644
>> --- a/modules/presence_dialoginfo/notify_body.c
>> +++ b/modules/presence_dialoginfo/notify_body.c
>> @@ -595,5 +595,18 @@ str *dlginfo_body_setversion(subs_t *subs, str
>> *body) {
>> memcpy(version_start, version, version_len);
>> memset(version_start + version_len, ' ', 12 - version_len);
>>
>> +   xmlDocPtr doc = xmlReadMemory(aux_body->s, aux_body->len,
>> "noname.xml", NULL, 0);
>> +if (doc == NULL) {
>> +   LM_ERR("error allocation xmldoc\n");
>> +   pkg_free(aux_body->s);
>> +   pkg_free(aux_body);
>> +   return NULL;
>> +   }
>> +   pkg_free(aux_body->s);
>> +xmlDocDumpFormatMemory(doc,(xmlChar**)(void*)_body->s,
>> _body->len, 1);
&

Re: [sr-dev] git:master:b6b7de88: presence_dialoginfo : aux_body should return xmldoc instead of char

[Charles Chance]

Hi Luis,

It would be interesting to understand where the issue with document
versioning was first introduced - it was working fine prior to 4.3 as far
as I can tell.

We noticed some weirdness with BLF after upgrading to 4.3.4 on some
production machines and soon realised it was due to the version being
incorrect - however, these recent patches have only led to other
issues/crashes in our offline tests today.

Can you shed any light on when it might have been introduced? I've not had
much chance look myself but happy to spend some time over the weekend.

Cheers,
Charles


On 17 Dec 2015 10:09 pm, "Luis Azedo"  wrote:

> Module: kamailio
> Branch: master
> Commit: b6b7de8832e4ab22ef2c00ebb2c1e1b6ced9ff35
> URL:
> https://github.com/kamailio/kamailio/commit/b6b7de8832e4ab22ef2c00ebb2c1e1b6ced9ff35
>
> Author: Luis Azedo 
> Committer: Luis Azedo 
> Date: 2015-12-17T21:02:43Z
>
> presence_dialoginfo : aux_body should return xmldoc instead of char
>
> ---
>
> Modified: modules/presence/notify.c
> Modified: modules/presence_dialoginfo/notify_body.c
>
> ---
>
> Diff:
> https://github.com/kamailio/kamailio/commit/b6b7de8832e4ab22ef2c00ebb2c1e1b6ced9ff35.diff
> Patch:
> https://github.com/kamailio/kamailio/commit/b6b7de8832e4ab22ef2c00ebb2c1e1b6ced9ff35.patch
>
> ---
>
> diff --git a/modules/presence/notify.c b/modules/presence/notify.c
> index efb8a48..f6a0ba9 100644
> --- a/modules/presence/notify.c
> +++ b/modules/presence/notify.c
> @@ -1535,8 +1535,7 @@ int send_notify_request(subs_t* subs, subs_t *
> watcher_subs,
> {
> aux_body =
> subs->event->aux_body_processing(subs, notify_body);
> if(aux_body) {
> -
>  xmlFree(notify_body->s);
> -
>  pkg_free(notify_body);
> +
>  free_notify_body(notify_body, subs->event);
> notify_body =
> aux_body;
> }
> }
> diff --git a/modules/presence_dialoginfo/notify_body.c
> b/modules/presence_dialoginfo/notify_body.c
> index e6dc050..710fe91 100644
> --- a/modules/presence_dialoginfo/notify_body.c
> +++ b/modules/presence_dialoginfo/notify_body.c
> @@ -595,5 +595,18 @@ str *dlginfo_body_setversion(subs_t *subs, str *body)
> {
> memcpy(version_start, version, version_len);
> memset(version_start + version_len, ' ', 12 - version_len);
>
> +   xmlDocPtr doc = xmlReadMemory(aux_body->s, aux_body->len,
> "noname.xml", NULL, 0);
> +if (doc == NULL) {
> +   LM_ERR("error allocation xmldoc\n");
> +   pkg_free(aux_body->s);
> +   pkg_free(aux_body);
> +   return NULL;
> +   }
> +   pkg_free(aux_body->s);
> +xmlDocDumpFormatMemory(doc,(xmlChar**)(void*)_body->s,
> _body->len, 1);
> +
> +xmlCleanupParser();
> +xmlMemoryDump();
> +
> return aux_body;
>  }
>
>
> ___
> sr-dev mailing list
> sr-dev@lists.sip-router.org
> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
>

-- 
*** We're rebranding! Learn more here 
 ***

www.sipcentric.com

Follow us on twitter @sipcentric 

Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [SR-Users] Releasing Kamailio v4.3.2

[Charles Chance]

Hi Daniel,

Do you have a moment to comment on this related question:
http://lists.sip-router.org/pipermail/sr-dev/2015-September/030663.html?

Cheers,
Charles
On 10 Sep 2015 08:21, "Daniel-Constantin Mierla"  wrote:

> Hello,
>
> short note to remind that today kamailio v4.3.1 will be released. If
> there is anything to push to branch 4.3, write first to sr-dev -- once
> the announcement is done, commits to branch 4.3 can go as usual.
>
> Cheers,
> Daniel
>
> On 07/09/15 10:27, Daniel-Constantin Mierla wrote:
> > Hello,
> >
> > I am considering to release a new version from branch 4.3 later this
> > week, on Thursday, September 10. If there are issues not yet reported,
> > then use github tracker to do it:
> >
> >   - https://github.com/kamailio/kamailio/issues
> >
> > Cheers,
> > Daniel
> >
>
> --
> Daniel-Constantin Mierla
> http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda
> Book: SIP Routing With Kamailio - http://www.asipto.com
> Kamailio Advanced Training, Sep 28-30, 2015, in Berlin -
> http://asipto.com/u/kat
>
>
> ___
> SIP Express Router (SER) and Kamailio (OpenSER) - sr-users mailing list
> sr-us...@lists.sip-router.org
> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users
>

-- 
*** We're rebranding! Learn more here 
 ***

www.sipcentric.com

Follow us on twitter @sipcentric 

Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:4.3:24b347a5: dmq_usrloc: implement deleted contact replication

[Charles Chance]

Module: kamailio
Branch: 4.3
Commit: 24b347a5fca61d13a0765dbf1b3c8207caf3b45d
URL: 
https://github.com/kamailio/kamailio/commit/24b347a5fca61d13a0765dbf1b3c8207caf3b45d

Author: Charles Chance <charles.cha...@sipcentric.com>
Committer: Charles Chance <charles.cha...@sipcentric.com>
Date: 2015-09-10T12:46:53+01:00

dmq_usrloc: implement deleted contact replication

(cherry picked from commit edc25d7373f9560d09a35640ab19741f19b97040)

---

Modified: modules/dmq_usrloc/usrloc_sync.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/24b347a5fca61d13a0765dbf1b3c8207caf3b45d.diff
Patch: 
https://github.com/kamailio/kamailio/commit/24b347a5fca61d13a0765dbf1b3c8207caf3b45d.patch

---

diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c
index f5ef20f..e4a9ed7 100644
--- a/modules/dmq_usrloc/usrloc_sync.c
+++ b/modules/dmq_usrloc/usrloc_sync.c
@@ -95,6 +95,30 @@ static int add_contact(str aor, ucontact_info_t* ci)
return -1;
 }
 
+static int delete_contact(str aor, ucontact_info_t* ci)
+{
+   udomain_t* _d;
+   urecord_t* r;
+   ucontact_t* c;
+
+   dmq_ul.get_udomain("location", &_d);
+
+   if (dmq_ul.get_urecord_by_ruid(_d, dmq_ul.get_aorhash(),
+   >ruid, , ) != 0) {
+   LM_WARN("AOR/Contact not found\n");
+   return -1;
+   }
+   if (dmq_ul.delete_ucontact(r, c) != 0) {
+   dmq_ul.unlock_udomain(_d, );
+   LM_WARN("could not delete contact\n");
+   return -1;
+   }
+   dmq_ul.release_urecord(r);
+   dmq_ul.unlock_udomain(_d, );
+
+   return 0;
+}
+
 void usrloc_get_all_ucontact(dmq_node_t* node)
 {
int rval, len=0;
@@ -364,6 +388,7 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, 
peer_reponse_t* resp, dmq_node_t*
break;
case DMQ_RM:
LM_DBG("Received DMQ_RM. Delete 
contact info...\n");
+   delete_contact(aor, );
break;
case DMQ_SYNC:
LM_DBG("Received DMQ_SYNC. 
Sending all contacts...\n");
@@ -517,8 +542,7 @@ void dmq_ul_cb_contact(ucontact_t* ptr, int type, void* 
param)

usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE, 0);

break;
case UL_CONTACT_DELETE:
-   
//usrloc_dmq_send_contact(ptr, aor, DMQ_RM);
-   
LM_DBG("Contact <%.*s> deleted\n", aor.len, aor.s);
+   
usrloc_dmq_send_contact(ptr, aor, DMQ_RM, 0);

break;
case UL_CONTACT_EXPIRE:

//usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE);


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:4.3:3fc2d2ce: dmq_usrloc: check existence of usrloc domain before continuing.

[Charles Chance]

Module: kamailio
Branch: 4.3
Commit: 3fc2d2ceafa33153e9c046f192dc41baae14f3ec
URL: 
https://github.com/kamailio/kamailio/commit/3fc2d2ceafa33153e9c046f192dc41baae14f3ec

Author: Charles Chance <charles.cha...@sipcentric.com>
Committer: Charles Chance <charles.cha...@sipcentric.com>
Date: 2015-09-10T12:50:04+01:00

dmq_usrloc: check existence of usrloc domain before continuing.

---

Modified: modules/dmq_usrloc/usrloc_sync.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/3fc2d2ceafa33153e9c046f192dc41baae14f3ec.diff
Patch: 
https://github.com/kamailio/kamailio/commit/3fc2d2ceafa33153e9c046f192dc41baae14f3ec.patch

---

diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c
index e4a9ed7..40e89d3 100644
--- a/modules/dmq_usrloc/usrloc_sync.c
+++ b/modules/dmq_usrloc/usrloc_sync.c
@@ -101,7 +101,10 @@ static int delete_contact(str aor, ucontact_info_t* ci)
urecord_t* r;
ucontact_t* c;
 
-   dmq_ul.get_udomain("location", &_d);
+   if (dmq_ul.get_udomain("location", &_d) < 0) {
+   LM_ERR("Failed to get domain\n");
+   return -1;
+   }
 
if (dmq_ul.get_urecord_by_ruid(_d, dmq_ul.get_aorhash(),
>ruid, , ) != 0) {


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [SR-Users] Releasing Kamailio v4.3.2

[Charles Chance]

Of course, sorry - the commit is here:
https://github.com/kamailio/kamailio/commit/edc25d7373f9560d09a35640ab19741f19b97040
.

Will also require the second part of:
https://github.com/kamailio/kamailio/commit/c7f94fd94500270828fcc4cb3011c60c67a8936b
.

It is implementing the replication of usrloc "delete" event - which appears
to have been allowed for in the original code, but never completed.

Cheers,
Charles


On 10 September 2015 at 11:43, Daniel-Constantin Mierla <mico...@gmail.com>
wrote:

> Hi Charles,
>
> can you send quickly what is the commit id in question? Being caught on
> some other backports, it will take a while to read the whole thread and
> figure out the details -- sometime looking at code is faster to decide is a
> new feature or not.
>
> Cheers,
> Daniel
>
> On 10/09/15 11:26, Charles Chance wrote:
>
> Hi Daniel,
>
> Do you have a moment to comment on this related question:
> http://lists.sip-router.org/pipermail/sr-dev/2015-September/030663.html?
>
> Cheers,
> Charles
> On 10 Sep 2015 08:21, "Daniel-Constantin Mierla" <mico...@gmail.com>
> wrote:
>
>> Hello,
>>
>> short note to remind that today kamailio v4.3.1 will be released. If
>> there is anything to push to branch 4.3, write first to sr-dev -- once
>> the announcement is done, commits to branch 4.3 can go as usual.
>>
>> Cheers,
>> Daniel
>>
>> On 07/09/15 10:27, Daniel-Constantin Mierla wrote:
>> > Hello,
>> >
>> > I am considering to release a new version from branch 4.3 later this
>> > week, on Thursday, September 10. If there are issues not yet reported,
>> > then use github tracker to do it:
>> >
>> >   - https://github.com/kamailio/kamailio/issues
>> >
>> > Cheers,
>> > Daniel
>> >
>>
>> --
>> Daniel-Constantin Mierla
>> http://twitter.com/#!/miconda - <http://www.linkedin.com/in/miconda>
>> http://www.linkedin.com/in/miconda
>> Book: SIP Routing With Kamailio - http://www.asipto.com
>> Kamailio Advanced Training, Sep 28-30, 2015, in Berlin -
>> <http://asipto.com/u/kat>http://asipto.com/u/kat
>>
>>
>> ___
>> SIP Express Router (SER) and Kamailio (OpenSER) - sr-users mailing list
>> sr-us...@lists.sip-router.org
>> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users
>>
>
> *** We're rebranding! Learn more here
> <http://www.sipcentric.com/2015/07/were-rebranding/> ***
>
> www.sipcentric.com
>
> Follow us on twitter @sipcentric <http://twitter.com/sipcentric>
>
> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered
> office: Faraday Wharf, Innovation Birmingham Campus, Holt Street,
> Birmingham Science Park, Birmingham B7 4BB.
>
>
> --
> Daniel-Constantin Mierlahttp://twitter.com/#!/miconda - 
> http://www.linkedin.com/in/miconda
> Book: SIP Routing With Kamailio - http://www.asipto.com
> Kamailio Advanced Training, Sep 28-30, 2015, in Berlin - 
> http://asipto.com/u/kat
>
>


-- 
*Charles Chance*
Managing Director

t. 0121 285 4400m. 07932 063 891

-- 
*** We're rebranding! Learn more here 
<http://www.sipcentric.com/2015/07/were-rebranding/> ***

www.sipcentric.com

Follow us on twitter @sipcentric <http://twitter.com/sipcentric>

Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] dmq_usrloc replication and max_contacts (Kamailio v4.3.1) (#265)

[Charles Chance]

This is now in 4.3.

Cheers,
Charles

On 8 September 2015 at 10:38, Charles Chance <charles.cha...@sipcentric.com>
wrote:

> Hi,
>
> I'm happy to backport, but it depends whether others see this as a new
> feature or a bug fix.
>
> Personally I believe it is essential for the originally intended
> behaviour, but maybe someone else can comment?
>
> Cheers,
> Charles
>
> Charles Chance
> Managing Director
>
> t. 0121 285 4400  m. 07932 063 891
> On 8 Sep 2015 05:42, "Paul Arnold" <p...@barfoo.net> wrote:
>
>> Hi,
>>
>> Is there any chance that edc25d7 will be backported to the 4.3 branch?
>> It would be nice to have it in the upcoming 4.3.2 release.
>>
>> thanks,
>> Paul
>>
>> On 9 August 2015 at 03:33, Charles Chance <notificati...@github.com>
>> wrote:
>> >
>> > Hi,
>> >
>> > Can you try with edc25d7, and confirm whether you still observe the
>> same behaviour?
>> >
>> > Also make sure max_contacts is set the same on all nodes.
>> >
>> > Cheers,
>> > Charles
>> >
>> > —
>> > Reply to this email directly or view it on GitHub.
>> >
>> >
>> > ___
>> > sr-dev mailing list
>> > sr-dev@lists.sip-router.org
>> > http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
>> >
>>
>> ___
>> sr-dev mailing list
>> sr-dev@lists.sip-router.org
>> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
>>
>


-- 
*Charles Chance*
Managing Director

t. 0121 285 4400m. 07932 063 891

-- 
*** We're rebranding! Learn more here 
<http://www.sipcentric.com/2015/07/were-rebranding/> ***

www.sipcentric.com

Follow us on twitter @sipcentric <http://twitter.com/sipcentric>

Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [SR-Users] Releasing Kamailio v4.3.2

[Charles Chance]

Thanks Daniel - will be back to a desk in the next 30 minutes so should be
enough time to get it in before packaging begins.

Cheers,
Charles
On 10 Sep 2015 11:54, "Daniel-Constantin Mierla" <mico...@gmail.com> wrote:

> Btw, if your decision is to backport, go ahead, packaging of 4.3.2 likely
> to start in one hour or so.
>
> Cheers,
> Daniel
>
> On 10/09/15 12:53, Daniel-Constantin Mierla wrote:
>
> It doesn't change the config or database to have a deeper investigation,
> therefore if it solving something that currently doesn't work properly,
> then all is ok to backport. To me it looks like making that dmq location
> replication work, because removing a contact is part of the normal
> registration processing, so personally I am fine backporting.
>
> Cheers,
> Daniel
>
> On 10/09/15 12:49, Charles Chance wrote:
>
> Of course, sorry - the commit is here:
> https://github.com/kamailio/kamailio/commit/edc25d7373f9560d09a35640ab19741f19b97040.
>
>
> Will also require the second part of:
> https://github.com/kamailio/kamailio/commit/c7f94fd94500270828fcc4cb3011c60c67a8936b
> .
>
> It is implementing the replication of usrloc "delete" event - which
> appears to have been allowed for in the original code, but never completed.
>
> Cheers,
> Charles
>
>
> On 10 September 2015 at 11:43, Daniel-Constantin Mierla <mico...@gmail.com
> > wrote:
>
>> Hi Charles,
>>
>> can you send quickly what is the commit id in question? Being caught on
>> some other backports, it will take a while to read the whole thread and
>> figure out the details -- sometime looking at code is faster to decide is a
>> new feature or not.
>>
>> Cheers,
>> Daniel
>>
>> On 10/09/15 11:26, Charles Chance wrote:
>>
>> Hi Daniel,
>>
>> Do you have a moment to comment on this related question:
>> http://lists.sip-router.org/pipermail/sr-dev/2015-September/030663.html?
>>
>> Cheers,
>> Charles
>> On 10 Sep 2015 08:21, "Daniel-Constantin Mierla" <mico...@gmail.com>
>> wrote:
>>
>>> Hello,
>>>
>>> short note to remind that today kamailio v4.3.1 will be released. If
>>> there is anything to push to branch 4.3, write first to sr-dev -- once
>>> the announcement is done, commits to branch 4.3 can go as usual.
>>>
>>> Cheers,
>>> Daniel
>>>
>>> On 07/09/15 10:27, Daniel-Constantin Mierla wrote:
>>> > Hello,
>>> >
>>> > I am considering to release a new version from branch 4.3 later this
>>> > week, on Thursday, September 10. If there are issues not yet reported,
>>> > then use github tracker to do it:
>>> >
>>> >   - https://github.com/kamailio/kamailio/issues
>>> >
>>> > Cheers,
>>> > Daniel
>>> >
>>>
>>> --
>>> Daniel-Constantin Mierla
>>> http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda
>>> Book: SIP Routing With Kamailio - http://www.asipto.com
>>> Kamailio Advanced Training, Sep 28-30, 2015, in Berlin -
>>> http://asipto.com/u/kat
>>>
>>>
>>> ___
>>> SIP Express Router (SER) and Kamailio (OpenSER) - sr-users mailing list
>>> sr-us...@lists.sip-router.org
>>> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users
>>>
>>
>> *** We're rebranding! Learn more here
>> <http://www.sipcentric.com/2015/07/were-rebranding/> ***
>>
>> www.sipcentric.com
>>
>> Follow us on twitter @sipcentric <http://twitter.com/sipcentric>
>>
>> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered
>> office: Faraday Wharf, Innovation Birmingham Campus, Holt Street,
>> Birmingham Science Park, Birmingham B7 4BB.
>>
>>
>> --
>> Daniel-Constantin Mierlahttp://twitter.com/#!/miconda - 
>> http://www.linkedin.com/in/miconda
>> Book: SIP Routing With Kamailio - http://www.asipto.com
>> Kamailio Advanced Training, Sep 28-30, 2015, in Berlin - 
>> http://asipto.com/u/kat
>>
>>
>
>
> --
> *Charles Chance*
> Managing Director
>
> t. 0121 285 4400m. 07932 063 891
>
> *** We're rebranding! Learn more here
> <http://www.sipcentric.com/2015/07/were-rebranding/> ***
>
> www.sipcentric.com
>
> Follow us on twitter @sipcentric <http://twitter.com/sipcentric>
>
> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered
> office: Faraday Wha

Re: [sr-dev] [kamailio] dmq_usrloc replication and max_contacts (Kamailio v4.3.1) (#265)

[Charles Chance]

Hi,

I'm happy to backport, but it depends whether others see this as a new
feature or a bug fix.

Personally I believe it is essential for the originally intended behaviour,
but maybe someone else can comment?

Cheers,
Charles

Charles Chance
Managing Director

t. 0121 285 4400  m. 07932 063 891
On 8 Sep 2015 05:42, "Paul Arnold" <p...@barfoo.net> wrote:

> Hi,
>
> Is there any chance that edc25d7 will be backported to the 4.3 branch?
> It would be nice to have it in the upcoming 4.3.2 release.
>
> thanks,
> Paul
>
> On 9 August 2015 at 03:33, Charles Chance <notificati...@github.com>
> wrote:
> >
> > Hi,
> >
> > Can you try with edc25d7, and confirm whether you still observe the same
> behaviour?
> >
> > Also make sure max_contacts is set the same on all nodes.
> >
> > Cheers,
> > Charles
> >
> > —
> > Reply to this email directly or view it on GitHub.
> >
> >
> > ___
> > sr-dev mailing list
> > sr-dev@lists.sip-router.org
> > http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
> >
>
> ___
> sr-dev mailing list
> sr-dev@lists.sip-router.org
> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
>

-- 
*** We're rebranding! Learn more here 
<http://www.sipcentric.com/2015/07/were-rebranding/> ***

www.sipcentric.com

Follow us on twitter @sipcentric <http://twitter.com/sipcentric>

Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] nathelper sending keep alives on nodes where contact replicated using dmq_usrloc (#310)

[Charles Chance]

I missed this originally and although I've not looked closely at it yet, a 
quick alternative might be to use the nat_traversal module's keepalive 
mechanism instead, directly on the edge proxies. Works for us at least.


---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/310#issuecomment-138500280___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:4.3:feaed398: dmq_usrloc: check existence of usrloc domain before continuing.

[Charles Chance]

Module: kamailio
Branch: 4.3
Commit: feaed39802a86b1701f3db4aff0e64bed9d1cd04
URL: 
https://github.com/kamailio/kamailio/commit/feaed39802a86b1701f3db4aff0e64bed9d1cd04

Author: Charles Chance <charles.cha...@sipcentric.com>
Committer: Charles Chance <charles.cha...@sipcentric.com>
Date: 2015-09-07T13:02:02+01:00

dmq_usrloc: check existence of usrloc domain before continuing.

- avoids crash caused by passing null pointer to get_urecord_by_ruid().
- eventually need to implement multi-domain replication but usrloc API needs 
enhancing first.

---

Modified: modules/dmq_usrloc/usrloc_sync.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/feaed39802a86b1701f3db4aff0e64bed9d1cd04.diff
Patch: 
https://github.com/kamailio/kamailio/commit/feaed39802a86b1701f3db4aff0e64bed9d1cd04.patch

---

diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c
index 3bd0c24..f5ef20f 100644
--- a/modules/dmq_usrloc/usrloc_sync.c
+++ b/modules/dmq_usrloc/usrloc_sync.c
@@ -51,7 +51,10 @@ static int add_contact(str aor, ucontact_info_t* ci)
str contact;
int res;
 
-   dmq_ul.get_udomain("location", &_d);
+if (dmq_ul.get_udomain("location", &_d) < 0) {
+LM_ERR("Failed to get domain\n");
+return -1;
+}
res = dmq_ul.get_urecord(_d, , );
if (res < 0) {
LM_ERR("failed to retrieve record from usrloc\n");
@@ -116,6 +119,12 @@ void usrloc_get_all_ucontact(dmq_node_t* node)
 LM_ERR("dmq_ul.get_all_ucontacts is NULL\n");
 goto done;
   }
+
+   if (dmq_ul.get_udomain("location", &_d) < 0) {
+   LM_ERR("Failed to get domain\n");
+   goto done;
+   }
+
rval = dmq_ul.get_all_ucontacts(buf, len, 0, 0, 1);
if (rval<0) {
LM_ERR("failed to fetch contacts\n");
@@ -161,8 +170,6 @@ void usrloc_get_all_ucontact(dmq_node_t* node)
 memcpy( , cp, sizeof(aorhash));
 cp = (char*)cp + sizeof(aorhash);
 
-dmq_ul.get_udomain("location", &_d);
-
 res = dmq_ul.get_urecord_by_ruid(_d, aorhash, , , );
 aor = r->aor;
 if (res > 0) {


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:c7f94fd9: dmq_usrloc: check existence of usrloc domain before continuing.

[Charles Chance]

Module: kamailio
Branch: master
Commit: c7f94fd94500270828fcc4cb3011c60c67a8936b
URL: 
https://github.com/kamailio/kamailio/commit/c7f94fd94500270828fcc4cb3011c60c67a8936b

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-08-28T07:58:13+01:00

dmq_usrloc: check existence of usrloc domain before continuing.

---

Modified: modules/dmq_usrloc/usrloc_sync.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/c7f94fd94500270828fcc4cb3011c60c67a8936b.diff
Patch: 
https://github.com/kamailio/kamailio/commit/c7f94fd94500270828fcc4cb3011c60c67a8936b.patch

---

diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c
index 172d188..06ef6b6 100644
--- a/modules/dmq_usrloc/usrloc_sync.c
+++ b/modules/dmq_usrloc/usrloc_sync.c
@@ -51,7 +51,10 @@ static int add_contact(str aor, ucontact_info_t* ci)
str contact;
int res;
 
-   dmq_ul.get_udomain(location, _d);
+if (dmq_ul.get_udomain(location, _d)  0) {
+LM_ERR(Failed to get domain\n);
+return -1;
+}
res = dmq_ul.get_urecord(_d, aor, r);
if (res  0) {
LM_ERR(failed to retrieve record from usrloc\n);
@@ -98,7 +101,10 @@ static int delete_contact(str aor, ucontact_info_t* ci)
urecord_t* r;
ucontact_t* c;
 
-   dmq_ul.get_udomain(location, _d);
+if (dmq_ul.get_udomain(location, _d)  0) {
+LM_ERR(Failed to get domain\n);
+return -1;
+}
 
if (dmq_ul.get_urecord_by_ruid(_d, dmq_ul.get_aorhash(aor),
ci-ruid, r, c) != 0) {


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:7b357914: dmq_usrloc: fix indentation

[Charles Chance]

Module: kamailio
Branch: master
Commit: 7b35791472620bee9f489b80f3528ce00ffbd688
URL: 
https://github.com/kamailio/kamailio/commit/7b35791472620bee9f489b80f3528ce00ffbd688

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-08-24T18:41:12+01:00

dmq_usrloc: fix indentation

---

Modified: modules/dmq_usrloc/usrloc_sync.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/7b35791472620bee9f489b80f3528ce00ffbd688.diff
Patch: 
https://github.com/kamailio/kamailio/commit/7b35791472620bee9f489b80f3528ce00ffbd688.patch


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:9c943031: dmq_usrloc: check existence of usrloc domain before continuing.

[Charles Chance]

Module: kamailio
Branch: master
Commit: 9c943031f29889c21b25b49b5dd267f4b2460bae
URL: 
https://github.com/kamailio/kamailio/commit/9c943031f29889c21b25b49b5dd267f4b2460bae

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-08-24T18:17:23+01:00

dmq_usrloc: check existence of usrloc domain before continuing.

- avoids crash caused by passing null pointer to get_urecord_by_ruid().
- eventually need to implement multi-domain replication but usrloc API needs 
enhancing first.

---

Modified: modules/dmq_usrloc/usrloc_sync.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/9c943031f29889c21b25b49b5dd267f4b2460bae.diff
Patch: 
https://github.com/kamailio/kamailio/commit/9c943031f29889c21b25b49b5dd267f4b2460bae.patch

---

diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c
index dd87721..792f86e 100644
--- a/modules/dmq_usrloc/usrloc_sync.c
+++ b/modules/dmq_usrloc/usrloc_sync.c
@@ -140,6 +140,12 @@ void usrloc_get_all_ucontact(dmq_node_t* node)
 LM_ERR(dmq_ul.get_all_ucontacts is NULL\n);
 goto done;
   }
+
+   if (dmq_ul.get_udomain(location, _d)  0) {
+   LM_ERR(Failed to get domain\n);
+   goto done;
+   }
+
rval = dmq_ul.get_all_ucontacts(buf, len, 0, 0, 1, 0);
if (rval0) {
LM_ERR(failed to fetch contacts\n);
@@ -185,8 +191,6 @@ void usrloc_get_all_ucontact(dmq_node_t* node)
 memcpy( aorhash, cp, sizeof(aorhash));
 cp = (char*)cp + sizeof(aorhash);
 
-dmq_ul.get_udomain(location, _d);
-
 res = dmq_ul.get_urecord_by_ruid(_d, aorhash, ruid, r, ptr);
 aor = r-aor;
 if (res  0) {


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] dmq_usrloc replication and max_contacts (Kamailio v4.3.1) (#265)

[Charles Chance]

Just looking into this now but I am struggling to reproduce the issue - can you 
confirm you are still seeing it with the 0x04 flag on save() and that all 
instances are running the most up-to-date version (with delete replication)?

---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/265#issuecomment-134342738___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] dmq_usrloc replication and max_contacts (Kamailio v4.3.1) (#265)

[Charles Chance]

I'm happy to leave it open since the issue is still there if overwriting
contacts (that is, passing 0x04 flag to registrar save function).

On 11 August 2015 at 23:16, 00Asgaroth00 notificati...@github.com wrote:

 Hi,

 Do you want to keep this issue open for the save flag 0x04 replace action
 in dmq_usrloc or do you want to close this one and open a new one for the
 replace action.

 FYI, for anyone else looking at this bug report, the particular issue I
 was experiencing was resolved by either not specifying a flag to save() or
 using the 0x01 flag and ensuring max_contacts was set properly.

 —
 Reply to this email directly or view it on GitHub
 https://github.com/kamailio/kamailio/issues/265#issuecomment-130093889.

 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev




-- 
*Charles Chance*
Managing Director

t. 0121 285 4400m. 07932 063 891

-- 
*** We're rebranding! Learn more here 
http://www.sipcentric.com/2015/07/were-rebranding/ ***

www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] dmq_usrloc replication and max_contacts (Kamailio v4.3.1) (#265)

[Charles Chance]

I'm happy to leave it open since the issue is still there if overwriting 
contacts (that is, passing 0x04 flag to registrar save function).

---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/265#issuecomment-130101793___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] dmq_usrloc replication results in garbled AOR's on client nodes (#237)

[Charles Chance]

Hi,

It seems 
https://github.com/kamailio/kamailio/commit/99f7d67b20c011e78c277a44ea8cd4d6a820806f
 has fixed the issue and has been confirmed elsewhere.

Please feel free to reopen if your tests show otherwise.

Cheers,
Charles


---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/237#issuecomment-122066338___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] dmq_usrloc replication results in garbled AOR's on client nodes (#237)

[Charles Chance]

Closed #237.

---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/237#event-357881520___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] Crash on start up synchronisation with dmq_usrloc (#244)

[Charles Chance]

Fixed in 
https://github.com/kamailio/kamailio/commit/bc01d8d6c6abfc7912a27df3ac23bffd818758e9.

Also backported to 4.3.

---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/244#issuecomment-122062804___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] Crash on start up synchronisation with dmq_usrloc (#244)

[Charles Chance]

Closed #244.

---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/244#event-357873600___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:4.3:5304da51: dmq_usrloc: don't destroy json doc before we're done with it.

[Charles Chance]

Module: kamailio
Branch: 4.3
Commit: 5304da51e32ba79dbe6bdd60d848c4d4f5afd9bd
URL: 
https://github.com/kamailio/kamailio/commit/5304da51e32ba79dbe6bdd60d848c4d4f5afd9bd

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-07-16T20:25:30+01:00

dmq_usrloc: don't destroy json doc before we're done with it.

(cherry picked from commit 99f7d67b20c011e78c277a44ea8cd4d6a820806f)

---

Modified: modules/dmq_usrloc/usrloc_sync.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/5304da51e32ba79dbe6bdd60d848c4d4f5afd9bd.diff
Patch: 
https://github.com/kamailio/kamailio/commit/5304da51e32ba79dbe6bdd60d848c4d4f5afd9bd.patch

---

diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c
index e68949c..7d1cf45 100644
--- a/modules/dmq_usrloc/usrloc_sync.c
+++ b/modules/dmq_usrloc/usrloc_sync.c
@@ -328,7 +328,6 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, 
peer_reponse_t* resp, dmq_node_t*
LM_ERR(unrecognized field in json object\n);
}
}
-   srjson_DestroyDoc(jdoc);
memset( ci, 0, sizeof(ucontact_info_t));
ci.ruid = ruid;
ci.c = c;
@@ -367,16 +366,19 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, 
peer_reponse_t* resp, dmq_node_t*
default:  goto invalid;
}
 
+   srjson_DestroyDoc(jdoc);
resp-reason = dmq_200_rpl;
resp-resp_code = 200;
return 0;
 
 invalid:
+   srjson_DestroyDoc(jdoc);
resp-reason = dmq_400_rpl;
resp-resp_code = 400;
return 0;
 
 error:
+   srjson_DestroyDoc(jdoc);
resp-reason = dmq_500_rpl;
resp-resp_code = 500;
return 0;


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:4.3:785ab99f: dmq_usrloc: use new version of serialized structure returned by usrloc (now includes received address)

[Charles Chance]

Module: kamailio
Branch: 4.3
Commit: 785ab99f18627f1173c9e1714551577c901f04ed
URL: 
https://github.com/kamailio/kamailio/commit/785ab99f18627f1173c9e1714551577c901f04ed

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-07-16T20:29:56+01:00

dmq_usrloc: use new version of serialized structure returned by usrloc (now 
includes received address)

(cherry picked from commit bc01d8d6c6abfc7912a27df3ac23bffd818758e9)

---

Modified: modules/dmq_usrloc/usrloc_sync.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/785ab99f18627f1173c9e1714551577c901f04ed.diff
Patch: 
https://github.com/kamailio/kamailio/commit/785ab99f18627f1173c9e1714551577c901f04ed.patch

---

diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c
index 7d1cf45..3bd0c24 100644
--- a/modules/dmq_usrloc/usrloc_sync.c
+++ b/modules/dmq_usrloc/usrloc_sync.c
@@ -96,7 +96,7 @@ void usrloc_get_all_ucontact(dmq_node_t* node)
 {
int rval, len=0;
void *buf, *cp;
-   str c;
+   str c, recv;
str path;
str ruid;
unsigned int aorhash;
@@ -145,6 +145,9 @@ void usrloc_get_all_ucontact(dmq_node_t* node)
 break;
 c.s = (char*)cp + sizeof(c.len);
 cp =  (char*)cp + sizeof(c.len) + c.len;
+memcpy((recv.len), cp, sizeof(recv.len));
+recv.s = (char*)cp + sizeof(recv.len);
+cp =  (char*)cp + sizeof(recv.len) + recv.len;
 memcpy( send_sock, cp, sizeof(send_sock));
 cp = (char*)cp + sizeof(send_sock);
 memcpy( flags, cp, sizeof(flags));


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] Crash on start up synchronisation with dmq_usrloc (#244)

[Charles Chance]

Hi Paul,

I've just committed another fix 
(https://github.com/kamailio/kamailio/commit/bc01d8d6c6abfc7912a27df3ac23bffd818758e9)
 if you could test and confirm.

Cheers,
Charles


---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/244#issuecomment-121534770___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] Crash on start up synchronisation with dmq_usrloc (#244)

[Charles Chance]

Hi,

Please test using latest master at 
https://github.com/kamailio/kamailio/commit/99f7d67b20c011e78c277a44ea8cd4d6a820806f
 and if it resolves the issue I will backport to 4.3.

Cheers,
Charles


---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/244#issuecomment-121508281___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] dmq_usrloc replication results in garbled AOR's on client nodes (#237)

[Charles Chance]

Hi, I'll have some time later today to look at it but it's unlikely to be a 
missing module.

---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/237#issuecomment-121196392___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] dmq_usrloc replication results in garbled AOR's on client nodes (#237)

[Charles Chance]

Hi, I have just committed the below patch - can you confirm the issue is 
resolved?

https://github.com/kamailio/kamailio/commit/99f7d67b20c011e78c277a44ea8cd4d6a820806f

Cheers,
Charles


---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/237#issuecomment-121408675___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:99f7d67b: dmq_usrloc: don't destroy json doc before we're done with it.

[Charles Chance]

Module: kamailio
Branch: master
Commit: 99f7d67b20c011e78c277a44ea8cd4d6a820806f
URL: 
https://github.com/kamailio/kamailio/commit/99f7d67b20c011e78c277a44ea8cd4d6a820806f

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-07-14T22:59:10+01:00

dmq_usrloc: don't destroy json doc before we're done with it.

---

Modified: modules/dmq_usrloc/usrloc_sync.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/99f7d67b20c011e78c277a44ea8cd4d6a820806f.diff
Patch: 
https://github.com/kamailio/kamailio/commit/99f7d67b20c011e78c277a44ea8cd4d6a820806f.patch

---

diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c
index 20dbbf0..b826802 100644
--- a/modules/dmq_usrloc/usrloc_sync.c
+++ b/modules/dmq_usrloc/usrloc_sync.c
@@ -328,7 +328,6 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, 
peer_reponse_t* resp, dmq_node_t*
LM_ERR(unrecognized field in json object\n);
}
}
-   srjson_DestroyDoc(jdoc);
memset( ci, 0, sizeof(ucontact_info_t));
ci.ruid = ruid;
ci.c = c;
@@ -367,16 +366,19 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, 
peer_reponse_t* resp, dmq_node_t*
default:  goto invalid;
}
 
+   srjson_DestroyDoc(jdoc);
resp-reason = dmq_200_rpl;
resp-resp_code = 200;
return 0;
 
 invalid:
+   srjson_DestroyDoc(jdoc);
resp-reason = dmq_400_rpl;
resp-resp_code = 400;
return 0;
 
 error:
+   srjson_DestroyDoc(jdoc);
resp-reason = dmq_500_rpl;
resp-resp_code = 500;
return 0;


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] Add option to disable delete queries in usrloc module. (#165)

[Charles Chance]

Hi,

The timer to delete records only runs if modparam timer_interval is greater 
than 0, so the new parameter is not required in this case.

Admittedly this is not documented, so the readme does need updating :)

Cheers,
Charles

---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/165#issuecomment-104030385___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] Add option to disable delete queries in usrloc module. (#165)

[Charles Chance]

According to the module code, you should also ensure timer_procs modparam is 
set to 0 (default):

/* Register cache timer */
if(ul_timer_procs=0)
{
if (timer_interval  0)
register_timer(ul_core_timer, 0, timer_interval);
}
else
register_sync_timers(ul_timer_procs);


---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/165#issuecomment-104037793___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:c55ec2ba: dmq: resolve multiple IPv4/IPv6 addresses for a single notification address

[Charles Chance]

Module: kamailio
Branch: master
Commit: c55ec2ba2dcbcfda504339bfd8070b000c9bee52
URL: 
https://github.com/kamailio/kamailio/commit/c55ec2ba2dcbcfda504339bfd8070b000c9bee52

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-04-21T22:22:58+01:00

dmq: resolve multiple IPv4/IPv6 addresses for a single notification address

- optionally enabled by new parameter multi_notify
- includes addresses from DNS SRV records, A and  records
- patch provided by Robert Boisvert on sr-dev list

---

Modified: modules/dmq/dmq.c
Modified: modules/dmq/dmq.h
Modified: modules/dmq/doc/dmq_admin.xml
Modified: modules/dmq/notification_peer.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/c55ec2ba2dcbcfda504339bfd8070b000c9bee52.diff
Patch: 
https://github.com/kamailio/kamailio/commit/c55ec2ba2dcbcfda504339bfd8070b000c9bee52.patch


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:8ac3d00f: dmq: regenerate readme

[Charles Chance]

Module: kamailio
Branch: master
Commit: 8ac3d00f64f9bcd011be3ce088010d9f6e18cd1f
URL: 
https://github.com/kamailio/kamailio/commit/8ac3d00f64f9bcd011be3ce088010d9f6e18cd1f

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-04-21T22:22:58+01:00

dmq: regenerate readme

---

Modified: modules/dmq/README

---

Diff:  
https://github.com/kamailio/kamailio/commit/8ac3d00f64f9bcd011be3ce088010d9f6e18cd1f.diff
Patch: 
https://github.com/kamailio/kamailio/commit/8ac3d00f64f9bcd011be3ce088010d9f6e18cd1f.patch


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:8e955bad: dmq: check for duplicate nodes when multi_notify enabled

[Charles Chance]

Module: kamailio
Branch: master
Commit: 8e955bad80bbc8d05ed71dca00f51dbad684f1ae
URL: 
https://github.com/kamailio/kamailio/commit/8e955bad80bbc8d05ed71dca00f51dbad684f1ae

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-04-21T22:22:58+01:00

dmq: check for duplicate nodes when multi_notify enabled

- also avoids adding self if we are one of the resolved IPs

---

Modified: modules/dmq/notification_peer.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/8e955bad80bbc8d05ed71dca00f51dbad684f1ae.diff
Patch: 
https://github.com/kamailio/kamailio/commit/8e955bad80bbc8d05ed71dca00f51dbad684f1ae.patch

---

diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c
index 416b6e1..3abefde 100644
--- a/modules/dmq/notification_peer.c
+++ b/modules/dmq/notification_peer.c
@@ -315,9 +315,11 @@ dmq_node_t* add_server_and_notify(str *paddr)
for (index = 0; index  host_cnt; index++) {
pstr-s = puri_list [index];
pstr-len = strlen (puri_list [index]);
-   pnode = add_dmq_node (node_list, pstr);
-   if (pnode  !pfirst)
-   { pfirst = pnode; }
+   if (!find_dmq_node_uri(node_list, pstr)) { // check for 
duplicates
+   pnode = add_dmq_node (node_list, pstr);
+   if (pnode  !pfirst)
+   { pfirst = pnode; }
+   }
}
}
 


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] Proposed Change to DMQ Notification Address Resolution

[Charles Chance]

Hi Bob,

Sorry for the delay.

It all seems fine - the patch did not apply against the master branch, so I
added it manually. I'm not sure we need the extra module parameter though,
since it doesn't break existing functionality if only a single DNS record
is present or an IP address is specified directly. Did you have a reason
for adding the parameter?

I can either push directly to master, or if you'd prefer you can create a
pull request (again, master, not 4.2).

Cheers,

Charles


On 23 March 2015 at 15:59, Charles Chance charles.cha...@sipcentric.com
wrote:

 Hi Bob,

 Thanks for your patch. At quick glance it looks great but I will take a
 closer look over the next 24 hours and report back.

 It is in my opinion a worthwhile addition and your time is very much
 appreciated.

 Kind regards,

 Charles


 On 20 March 2015 at 20:46, Robert Boisvert rdboisv...@gmail.com wrote:

 Charles,

 I coded and tested the attached patch based on 4.2.3 code.  So as not to
 disturb current functionality, I add a modparam called multi_notify.
 When set to a non-zero value it loads all IPs returned by the SIP URI,
 including those provided by DNS SRV records.

 With regard to your point about the notifications being sent to all nodes
 in the cluster, I noticed that if hosts A, B and C send notifications to D
 and D is not available when the cluster starts DMQ will not function even
 if D comes up some time later.  However, if I create a SRV record or A
 records that resolve to hosts D and E and send notifications to that group
 with multi_notify set to 1 then the cluster will always function as long
 as one either D or E is functional.  Even in a well-designed network
 servers may be unavailable for a period of time so this redundancy allows
 functionality to be preserved during downtime.

 We are having good success with this current patch and would like to
 request that it be mainstreamed.

 Thanks for considering this request and for your help,
 Bob

 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev




 --
 *Charles Chance*
 Managing Director

 t. 0121 285 4400m. 07932 063 891




-- 
*Charles Chance*
Managing Director

t. 0121 285 4400m. 07932 063 891

-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] Proposed Change to DMQ Notification Address Resolution

[Charles Chance]

Hi Bob,

Thanks for your patch. At quick glance it looks great but I will take a
closer look over the next 24 hours and report back.

It is in my opinion a worthwhile addition and your time is very much
appreciated.

Kind regards,

Charles


On 20 March 2015 at 20:46, Robert Boisvert rdboisv...@gmail.com wrote:

 Charles,

 I coded and tested the attached patch based on 4.2.3 code.  So as not to
 disturb current functionality, I add a modparam called multi_notify.
 When set to a non-zero value it loads all IPs returned by the SIP URI,
 including those provided by DNS SRV records.

 With regard to your point about the notifications being sent to all nodes
 in the cluster, I noticed that if hosts A, B and C send notifications to D
 and D is not available when the cluster starts DMQ will not function even
 if D comes up some time later.  However, if I create a SRV record or A
 records that resolve to hosts D and E and send notifications to that group
 with multi_notify set to 1 then the cluster will always function as long
 as one either D or E is functional.  Even in a well-designed network
 servers may be unavailable for a period of time so this redundancy allows
 functionality to be preserved during downtime.

 We are having good success with this current patch and would like to
 request that it be mainstreamed.

 Thanks for considering this request and for your help,
 Bob

 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev




-- 
*Charles Chance*
Managing Director

t. 0121 285 4400m. 07932 063 891

-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] kamailio doesn't provide number of registered users stat when usrloc in db_mode=3 (#113)

[Charles Chance]

It is not a bug. From the docs:

3.20. db_mode (integer)

...

3 - DB-Only scheme. No memory cache is kept, all operations being directly
performed with the database...

snip

...The lack of memory caching also disable the statistics exports.
On 19 Mar 2015 15:38, mading087 notificati...@github.com wrote:

 Running latest 4.2 with usrloc in db_mode=3. It seems kamctl stats
 usrloc or kamctl ul show always shows 0 registered users even when there
 are registered users (location table has entries).
 This looks like a bug?

 —
 Reply to this email directly or view it on GitHub
 https://github.com/kamailio/kamailio/issues/113.

 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev



-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.


---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/113#issuecomment-83641974___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] Proposed Change to DMQ Notification Address Resolution

[Charles Chance]

Hello Bob,

As previously stated, it is a needed improvement.

My time is heavily consumed right now, so your patch will be gratefully
received.

My only comment would be that once connected to the cluster, notifications
are sent to all nodes anyway, not just the one specified in the
notification address parameter. So practically, the only need for resolving
multiple records is on start-up to find the first available node. Upon
contact with that node, a list of the other nodes is returned, all of which
are stored and included in subsequent notifications - this is fairly
fault-tolerant, providing your network is well designed. It is not tolerant
of network splits etc, where it could be possible to end up with two or
more separated clusters or split-brain type situations. However, to
overcome that, I think we're looking at a *major* redesign - far more than
can be achieved with multiple notification addresses. We'd also likely need
to consider quorum, voting a primary/master etc. to do it properly.

Otherwise, it is a welcome addition in my opinion.

Cheers,

Charles


On 5 March 2015 at 21:41, Robert Boisvert rdboisv...@gmail.com wrote:

 DMQ Developers,

 Our team would like to setup a DMQ bus
 http://kamailio.org/docs/modules/4.2.x/modules/dmq.html#idp2640048 that
 contains more than one notification address
 http://kamailio.org/docs/modules/4.2.x/modules/dmq.html#dmq.p.notification_address
 to support a high availability, fault-tolerant system where multiple
 servers are used to maintain the list of DMQ nodes.  The failure of any one
 DMQ node or the startup order should not cause the DMQ bus to lose track of
 available nodes.  As nodes go offline and online the DMQ bus should be
 updated using information from the active nodes.   To do this we propose
 changing the way DMQ uses the notification address.

 Currently the notification address resolves a DNS name to a single IP
 address even if a SRV record or multiple A/ records are available.  The
 proposal is to use all the A/ records or SRV targets returned from a
 DNS name query as notification addresses.

 Do you have any comments, concerns, suggestions, or recommendations
 regarding this proposal?  Your input is definitely welcome.

 Thank you,
 Bob

 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev



-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Registrar: check local path - backport?

[Charles Chance]

Hi,

Is it OK to backport the above (
https://github.com/kamailio/kamailio/commit/635f23b12eff2431ca9a14bb39f4204dc2a7227b)
to 4.2?

The patch preserves existing behaviour, having optional parameter to enable
(default disabled).

Cheers,

Charles

-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] Registrar: check local path - backport?

[Charles Chance]

Hi Daniel,

Understood, no problem.

Thanks,

Charles
 On 10 Feb 2015 09:23, Daniel-Constantin Mierla mico...@gmail.com wrote:

  Hello,

 this is rather a new feature than a fix. It is also not solving issues
 with broken devices out there. I won't push new code in stable branches on
 very used modules like registrar. A new major release should be out in few
 months.

 Cheers,
 Daniel

 On 10/02/15 10:18, Charles Chance wrote:

 Hi,

  Is it OK to backport the above (
 https://github.com/kamailio/kamailio/commit/635f23b12eff2431ca9a14bb39f4204dc2a7227b)
 to 4.2?

  The patch preserves existing behaviour, having optional parameter to
 enable (default disabled).

  Cheers,

  Charles


 www.sipcentric.com

 Follow us on twitter @sipcentric http://twitter.com/sipcentric

 Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered
 office: Faraday Wharf, Innovation Birmingham Campus, Holt Street,
 Birmingham Science Park, Birmingham B7 4BB.

 ___
 sr-dev mailing 
 listsr-...@lists.sip-router.orghttp://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev


 --
 Daniel-Constantin Mierlahttp://twitter.com/#!/miconda - 
 http://www.linkedin.com/in/miconda
 Kamailio World Conference, May 27-29, 2015
 Berlin, Germany - http://www.kamailioworld.com


 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev



-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:ff114281: dmq: add branches when replicating to multiple nodes

[Charles Chance]

Module: kamailio
Branch: master
Commit: ff114281fc2f523ed7bf87ea31448ce7327fdf93
URL: 
https://github.com/kamailio/kamailio/commit/ff114281fc2f523ed7bf87ea31448ce7327fdf93

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-02-06T10:59:35Z

dmq: add branches when replicating to multiple nodes

- reported by Leonardo Arena

---

Modified: modules/dmq/dmq_funcs.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/ff114281fc2f523ed7bf87ea31448ce7327fdf93.diff
Patch: 
https://github.com/kamailio/kamailio/commit/ff114281fc2f523ed7bf87ea31448ce7327fdf93.patch

---

diff --git a/modules/dmq/dmq_funcs.c b/modules/dmq/dmq_funcs.c
index b31deba..a3611e8 100644
--- a/modules/dmq/dmq_funcs.c
+++ b/modules/dmq/dmq_funcs.c
@@ -24,6 +24,7 @@
 
 #include dmq_funcs.h
 #include notification_peer.h
+#include ../../dset.h
 
 /**
  * @brief register a DMQ peer
@@ -385,6 +386,7 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s)
dmq_node_t* node;
struct socket_info* sock;
int i = 0;
+   int first = 1;
 
/* avoid loops - do not replicate if message has come from another node
 * (override if optional parameter is set)
@@ -413,10 +415,22 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s)
node = node-next;
continue;
}
+
+   if (!first) {
+   if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, sock, 
0, 0, 0, 0) == -1) {
+   LM_ERR(failed to append a branch\n);
+   node = node-next;
+   continue;
+   }
+   } else {
+   first = 0;
+   }
+
if(tmb.t_replicate(msg, node-orig_uri)  0) {
LM_ERR(error calling t_replicate\n);
goto error;
}
+
node = node-next;
}
lock_release(node_list-lock);


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:4.2:5e07d01a: dmq: add branches when replicating to multiple nodes

[Charles Chance]

Module: kamailio
Branch: 4.2
Commit: 5e07d01aaae15d3441876d8ee154a53484d08682
URL: 
https://github.com/kamailio/kamailio/commit/5e07d01aaae15d3441876d8ee154a53484d08682

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-02-06T12:53:57Z

dmq: add branches when replicating to multiple nodes

- reported by Leonardo Arena

(cherry picked from commit ff114281fc2f523ed7bf87ea31448ce7327fdf93)

---

Modified: modules/dmq/dmq_funcs.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/5e07d01aaae15d3441876d8ee154a53484d08682.diff
Patch: 
https://github.com/kamailio/kamailio/commit/5e07d01aaae15d3441876d8ee154a53484d08682.patch

---

diff --git a/modules/dmq/dmq_funcs.c b/modules/dmq/dmq_funcs.c
index 7430193..2ec32d2 100644
--- a/modules/dmq/dmq_funcs.c
+++ b/modules/dmq/dmq_funcs.c
@@ -24,6 +24,7 @@
 
 #include dmq_funcs.h
 #include notification_peer.h
+#include ../../dset.h
 
 /**
  * @brief register a DMQ peer
@@ -385,6 +386,7 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s)
dmq_node_t* node;
struct socket_info* sock;
int i = 0;
+   int first = 1;
 
/* avoid loops - do not replicate if message has come from another node
 * (override if optional parameter is set)
@@ -413,10 +415,22 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s)
 node = node-next;
continue;
}
+
+   if (!first) {
+   if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, sock, 
0, 0, 0, 0) == -1) {
+   LM_ERR(failed to append a branch\n);
+   node = node-next;
+   continue;
+   }
+   } else {
+   first = 0;
+   }
+
if(tmb.t_replicate(msg, node-orig_uri)  0) {
LM_ERR(error calling t_replicate\n);
goto error;
}
+
node = node-next;
}
lock_release(node_list-lock);


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] Append branches in module

[Charles Chance]

Hi Daniel,

I believe this is expected, since we are simply replicating the original
message to other (multiple, hence the additional branches) nodes so they
have a copy. Should we in fact change the r-uri in this case? I'm not sure.
It all seems to test ok.

All the best,

Charles
 On 5 Feb 2015 09:41, Daniel-Constantin Mierla mico...@gmail.com wrote:

  Hello,

 haven't looked at the whole function, but what you are using now is adding
 the r-uri as a branch. Do you want that? At the end it might be that the
 r-ruri and the last branch have the same address.

 You can look inside registrar module at lookup() function to see how first
 location record is added as r-uri and the rest as branches.

 Cheers,
 Daniel

 On 04/02/15 13:29, Charles Chance wrote:

 Hi All,

  Can anyone confirm, is this safe? Primary use case is replication of
 REGISTER after local save().


  diff --git a/modules/dmq/dmq_funcs.c b/modules/dmq/dmq_funcs.c
 index b31deba..a3611e8 100644
 --- a/modules/dmq/dmq_funcs.c
 +++ b/modules/dmq/dmq_funcs.c
 @@ -24,6 +24,7 @@

  #include dmq_funcs.h
  #include notification_peer.h
 +#include ../../dset.h

  /**
   * @brief register a DMQ peer
 @@ -385,6 +386,7 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s)
 dmq_node_t* node;
 struct socket_info* sock;
 int i = 0;
 +   int first = 1;

 /* avoid loops - do not replicate if message has come from another
 node
  * (override if optional parameter is set)
 @@ -413,10 +415,22 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s)
 node = node-next;
 continue;
 }
 +
 +   if (!first) {
 +   if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0,
 sock, 0, 0, 0, 0) == -1) {
 +   LM_ERR(failed to append a branch\n);
 +   node = node-next;
 +   continue;
 +   }
 +   } else {
 +   first = 0;
 +   }
 +
 if(tmb.t_replicate(msg, node-orig_uri)  0) {
 LM_ERR(error calling t_replicate\n);
 goto error;
 }
 +
 node = node-next;
 }
 lock_release(node_list-lock);


  Many thanks,

  Charles


 www.sipcentric.com

 Follow us on twitter @sipcentric http://twitter.com/sipcentric

 Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered
 office: Faraday Wharf, Innovation Birmingham Campus, Holt Street,
 Birmingham Science Park, Birmingham B7 4BB.

 ___
 sr-dev mailing 
 listsr-...@lists.sip-router.orghttp://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev


 --
 Daniel-Constantin Mierlahttp://twitter.com/#!/miconda - 
 http://www.linkedin.com/in/miconda
 Kamailio World Conference, May 27-29, 2015
 Berlin, Germany - http://www.kamailioworld.com


 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev



-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] Append branches in module

[Charles Chance]

Hi,

No, the original r-uri is untouched. We loop over each node, adding a
branch then calling t_replicate() from the tm API, passing the destination
uri as a parameter.

We have to add a branch for each replication node, otherwise tm complains
there are none available.
The API method t_replicate() maps to t_replicate_uri(), which eventually
calls t_relay_to(), setting the replicate/local_trans bit so that replies
are ignored.

Cheers,

Charles


On 5 Feb 2015 10:54, Daniel-Constantin Mierla mico...@gmail.com wrote:

  Hello,

 so how is the full code for this case, first you change the r-uri and then
 call append_branch()?

 Cheers,
 Daniel

 On 05/02/15 11:46, Charles Chance wrote:

 Hi Daniel,

 I believe this is expected, since we are simply replicating the original
 message to other (multiple, hence the additional branches) nodes so they
 have a copy. Should we in fact change the r-uri in this case? I'm not sure.
 It all seems to test ok.

 All the best,

 Charles
  On 5 Feb 2015 09:41, Daniel-Constantin Mierla mico...@gmail.com
 wrote:

  Hello,

 haven't looked at the whole function, but what you are using now is
 adding the r-uri as a branch. Do you want that? At the end it might be that
 the r-ruri and the last branch have the same address.

 You can look inside registrar module at lookup() function to see how
 first location record is added as r-uri and the rest as branches.

 Cheers,
 Daniel

 On 04/02/15 13:29, Charles Chance wrote:

 Hi All,

  Can anyone confirm, is this safe? Primary use case is replication of
 REGISTER after local save().


  diff --git a/modules/dmq/dmq_funcs.c b/modules/dmq/dmq_funcs.c
 index b31deba..a3611e8 100644
 --- a/modules/dmq/dmq_funcs.c
 +++ b/modules/dmq/dmq_funcs.c
 @@ -24,6 +24,7 @@

  #include dmq_funcs.h
  #include notification_peer.h
 +#include ../../dset.h

  /**
   * @brief register a DMQ peer
 @@ -385,6 +386,7 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s)
 dmq_node_t* node;
 struct socket_info* sock;
 int i = 0;
 +   int first = 1;

 /* avoid loops - do not replicate if message has come from
 another node
  * (override if optional parameter is set)
 @@ -413,10 +415,22 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char*
 s)
 node = node-next;
 continue;
 }
 +
 +   if (!first) {
 +   if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0,
 sock, 0, 0, 0, 0) == -1) {
 +   LM_ERR(failed to append a branch\n);
 +   node = node-next;
 +   continue;
 +   }
 +   } else {
 +   first = 0;
 +   }
 +
 if(tmb.t_replicate(msg, node-orig_uri)  0) {
 LM_ERR(error calling t_replicate\n);
 goto error;
 }
 +
 node = node-next;
 }
 lock_release(node_list-lock);


  Many thanks,

  Charles


 www.sipcentric.com

 Follow us on twitter @sipcentric http://twitter.com/sipcentric

 Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered
 office: Faraday Wharf, Innovation Birmingham Campus, Holt Street,
 Birmingham Science Park, Birmingham B7 4BB.

 ___
 sr-dev mailing 
 listsr-...@lists.sip-router.orghttp://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev


 --
 Daniel-Constantin Mierlahttp://twitter.com/#!/miconda - 
 http://www.linkedin.com/in/miconda
 Kamailio World Conference, May 27-29, 2015
 Berlin, Germany - http://www.kamailioworld.com


 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev


 www.sipcentric.com

 Follow us on twitter @sipcentric http://twitter.com/sipcentric

 Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered
 office: Faraday Wharf, Innovation Birmingham Campus, Holt Street,
 Birmingham Science Park, Birmingham B7 4BB.


 --
 Daniel-Constantin Mierlahttp://twitter.com/#!/miconda - 
 http://www.linkedin.com/in/miconda
 Kamailio World Conference, May 27-29, 2015
 Berlin, Germany - http://www.kamailioworld.com



-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Append branches in module

[Charles Chance]

Hi All,

Can anyone confirm, is this safe? Primary use case is replication of
REGISTER after local save().


diff --git a/modules/dmq/dmq_funcs.c b/modules/dmq/dmq_funcs.c
index b31deba..a3611e8 100644
--- a/modules/dmq/dmq_funcs.c
+++ b/modules/dmq/dmq_funcs.c
@@ -24,6 +24,7 @@

 #include dmq_funcs.h
 #include notification_peer.h
+#include ../../dset.h

 /**
  * @brief register a DMQ peer
@@ -385,6 +386,7 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s)
dmq_node_t* node;
struct socket_info* sock;
int i = 0;
+   int first = 1;

/* avoid loops - do not replicate if message has come from another
node
 * (override if optional parameter is set)
@@ -413,10 +415,22 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s)
node = node-next;
continue;
}
+
+   if (!first) {
+   if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0,
sock, 0, 0, 0, 0) == -1) {
+   LM_ERR(failed to append a branch\n);
+   node = node-next;
+   continue;
+   }
+   } else {
+   first = 0;
+   }
+
if(tmb.t_replicate(msg, node-orig_uri)  0) {
LM_ERR(error calling t_replicate\n);
goto error;
}
+
node = node-next;
}
lock_release(node_list-lock);


Many thanks,

Charles

-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:9876a9cd: dmq: fix indentation

[Charles Chance]

Module: kamailio
Branch: master
Commit: 9876a9cd1fbb66bbce3f01f015a52bf331deee59
URL: 
https://github.com/kamailio/kamailio/commit/9876a9cd1fbb66bbce3f01f015a52bf331deee59

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-02-04T12:09:25Z

dmq: fix indentation

---

Modified: modules/dmq/dmq_funcs.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/9876a9cd1fbb66bbce3f01f015a52bf331deee59.diff
Patch: 
https://github.com/kamailio/kamailio/commit/9876a9cd1fbb66bbce3f01f015a52bf331deee59.patch

---

diff --git a/modules/dmq/dmq_funcs.c b/modules/dmq/dmq_funcs.c
index 7430193..b31deba 100644
--- a/modules/dmq/dmq_funcs.c
+++ b/modules/dmq/dmq_funcs.c
@@ -408,9 +408,9 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s)
 *   - ourself
 *   - any inactive nodes
 */
-if(node-local || node-status != DMQ_NODE_ACTIVE) {
-LM_DBG(skipping node %.*s\n, 
STR_FMT(node-orig_uri));
-node = node-next;
+   if(node-local || node-status != DMQ_NODE_ACTIVE) {
+   LM_DBG(skipping node %.*s\n, 
STR_FMT(node-orig_uri));
+   node = node-next;
continue;
}
if(tmb.t_replicate(msg, node-orig_uri)  0) {


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] git:master:10250429: dmq: do not parse From header again, since it was done already prior to cloning msg.

[Charles Chance]

Hmm, you may have a point - working backwards, we only call
parse_headers(msg, HDR_EOH_F, 0) - which does not include From header,
right?

On 30 January 2015 at 15:00, Daniel-Constantin Mierla mico...@gmail.com
wrote:

 parse_from_header() should do nothing if the From header is found parsed.
 I am not sure if this alone is solving the issue properly. Maybe the From
 was not parsed in the first place, before cloning...

 Cheers,
 Daniel

 On Fri, Jan 30, 2015 at 3:09 PM, Charles Chance 
 charles.cha...@sipcentric.com wrote:

 Module: kamailio
 Branch: master
 Commit: 102504294f9edaaee9d4baea873d4ed9151b8fed
 URL:
 https://github.com/kamailio/kamailio/commit/102504294f9edaaee9d4baea873d4ed9151b8fed

 Author: Charles Chance charles.cha...@sipcentric.com
 Committer: Charles Chance charles.cha...@sipcentric.com
 Date: 2015-01-30T14:08:01Z

 dmq: do not parse From header again, since it was done already prior to
 cloning msg.

 - introduces a memory leak if not manually freed
 - but there is no need to parse it again anyway
 - discovered by Andrey Rybkin

 ---

 Modified: modules/dmq/worker.c

 ---

 Diff:
 https://github.com/kamailio/kamailio/commit/102504294f9edaaee9d4baea873d4ed9151b8fed.diff
 Patch:
 https://github.com/kamailio/kamailio/commit/102504294f9edaaee9d4baea873d4ed9151b8fed.patch

 ---

 diff --git a/modules/dmq/worker.c b/modules/dmq/worker.c
 index 8426730..ca1b3dc 100644
 --- a/modules/dmq/worker.c
 +++ b/modules/dmq/worker.c
 @@ -91,11 +91,11 @@ void worker_loop(int id)
 current_job = job_queue_pop(worker-queue);
 /* job_queue_pop might return NULL if queue is
 empty */
 if(current_job) {
 -   /* extract the from uri */
 -   if (parse_from_header(current_job-msg) 
 0) {
 -   LM_ERR(bad sip message or
 missing From hdr\n);
 -   } else {
 +   /* attempt to identify node based on from
 uri */
 +   if (current_job-msg-from-parsed) {
 dmq_node =
 find_dmq_node_uri(node_list, ((struct
 to_body*)current_job-msg-from-parsed)-uri);
 +   } else {
 +   LM_ERR(bad sip message or
 missing From hdr\n);
 }

 ret_value =
 current_job-f(current_job-msg, peer_response, dmq_node);


 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev




 --
 Daniel-Constantin Mierla - http://www.asipto.com
 http://twitter.com/#!/miconda - http://www.linkedin.com/in/micond
 http://www.linkedin.com/in/miconda

 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev




-- 
*Charles Chance*
Managing Director

t. 0121 285 4400m. 07932 063 891

-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:3ae78d88: Revert dmq: do not parse From header again, since it was done already prior to cloning msg.

[Charles Chance]

Module: kamailio
Branch: master
Commit: 3ae78d88678a64fe59a925c8e3e257e046464c97
URL: 
https://github.com/kamailio/kamailio/commit/3ae78d88678a64fe59a925c8e3e257e046464c97

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-01-30T16:27:29Z

Revert dmq: do not parse From header again, since it was done already prior to 
cloning msg.

This reverts commit 102504294f9edaaee9d4baea873d4ed9151b8fed.

---

Modified: modules/dmq/worker.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/3ae78d88678a64fe59a925c8e3e257e046464c97.diff
Patch: 
https://github.com/kamailio/kamailio/commit/3ae78d88678a64fe59a925c8e3e257e046464c97.patch

---

diff --git a/modules/dmq/worker.c b/modules/dmq/worker.c
index ca1b3dc..8426730 100644
--- a/modules/dmq/worker.c
+++ b/modules/dmq/worker.c
@@ -91,11 +91,11 @@ void worker_loop(int id)
current_job = job_queue_pop(worker-queue);
/* job_queue_pop might return NULL if queue is empty */
if(current_job) {
-   /* attempt to identify node based on from uri */
-   if (current_job-msg-from-parsed) {
-   dmq_node = find_dmq_node_uri(node_list, 
((struct to_body*)current_job-msg-from-parsed)-uri);
-   } else {
+   /* extract the from uri */
+   if (parse_from_header(current_job-msg)  0) {
LM_ERR(bad sip message or missing From 
hdr\n);
+   } else {
+   dmq_node = find_dmq_node_uri(node_list, 
((struct to_body*)current_job-msg-from-parsed)-uri);
}
 
ret_value = current_job-f(current_job-msg, 
peer_response, dmq_node);


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] dmq: fix memory leak (#59)

[Charles Chance]

Having investigated further, the code which calls parse_from_header() is new - 
introduced for the purpose of letting the callback function know about the 
sending node - and I had wrongly assumed we were already parsing the From 
header prior to cloning. So apologies - I would say this is OK to merge.

---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/59#issuecomment-72228618___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:10250429: dmq: do not parse From header again, since it was done already prior to cloning msg.

[Charles Chance]

Module: kamailio
Branch: master
Commit: 102504294f9edaaee9d4baea873d4ed9151b8fed
URL: 
https://github.com/kamailio/kamailio/commit/102504294f9edaaee9d4baea873d4ed9151b8fed

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-01-30T14:08:01Z

dmq: do not parse From header again, since it was done already prior to cloning 
msg.

- introduces a memory leak if not manually freed
- but there is no need to parse it again anyway
- discovered by Andrey Rybkin

---

Modified: modules/dmq/worker.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/102504294f9edaaee9d4baea873d4ed9151b8fed.diff
Patch: 
https://github.com/kamailio/kamailio/commit/102504294f9edaaee9d4baea873d4ed9151b8fed.patch

---

diff --git a/modules/dmq/worker.c b/modules/dmq/worker.c
index 8426730..ca1b3dc 100644
--- a/modules/dmq/worker.c
+++ b/modules/dmq/worker.c
@@ -91,11 +91,11 @@ void worker_loop(int id)
current_job = job_queue_pop(worker-queue);
/* job_queue_pop might return NULL if queue is empty */
if(current_job) {
-   /* extract the from uri */
-   if (parse_from_header(current_job-msg)  0) {
-   LM_ERR(bad sip message or missing From 
hdr\n);
-   } else {
+   /* attempt to identify node based on from uri */
+   if (current_job-msg-from-parsed) {
dmq_node = find_dmq_node_uri(node_list, 
((struct to_body*)current_job-msg-from-parsed)-uri);
+   } else {
+   LM_ERR(bad sip message or missing From 
hdr\n);
}
 
ret_value = current_job-f(current_job-msg, 
peer_response, dmq_node);


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] dmq: fix memory leak (#59)

[Charles Chance]

Thanks for clarifying, Daniel.

As the From header is parsed prior to cloning (and therefore included in the 
clone), it is pointless to parse it again and have to manually clean it up 
later - so this part of the code needs changing anyway.

I have added a commit to master relating to the above - Andrey, can you confirm 
if this also fixes the leak you observed?


---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/59#issuecomment-72206321___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] dmq: fix memory leak (#59)

[Charles Chance]

Have you observed a leak here? According to the documentation for 
sip_msg_shm_clone() [1]:

org_msg is cloned along with most of its headers and lumps into one shm memory 
block (so that a shm_free() on the result will free everything).

1. 
http://rpm.kamailio.org/doxygen/sip-router/branch/master/sip__msg__clone_8c.html

---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/59#issuecomment-72184412___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] dmq: fix memory leak (#59)

[Charles Chance]

The problem may be earlier in worker_loop():

 95 if (parse_from_header(current_job-msg)  
0) {
 96 LM_ERR(bad sip message or missing 
From hdr\n);
 97 } else {
 98 dmq_node = 
find_dmq_node_uri(node_list, ((struct 
to_body*)current_job-msg-from-parsed)-uri);
 99 }

The msg has already been cloned and as I understand it, we should not parse a 
cloned msg since doing so will link pkg structures to shm msg.

As we already pre-parsed the msg prior to cloning it (when adding the job to 
the worker queue), the parsed from header should already be available to us.


---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/59#issuecomment-72187202___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:4.2:120bf4a4: dmq: force to send replicated messages from configured server address - as reported on list by Victor Kustov

[Charles Chance]

Module: kamailio
Branch: 4.2
Commit: 120bf4a4f6854592bd910334d4d0bd97c9f94974
URL: 
https://github.com/kamailio/kamailio/commit/120bf4a4f6854592bd910334d4d0bd97c9f94974

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-01-09T15:55:20Z

dmq: force to send replicated messages from configured server address - as 
reported on list by Victor Kustov

(cherry picked from commit 7b5f79f9f384bfe3c16c399184281ebe63bb7785)

---

Modified: modules/dmq/dmq_funcs.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/120bf4a4f6854592bd910334d4d0bd97c9f94974.diff
Patch: 
https://github.com/kamailio/kamailio/commit/120bf4a4f6854592bd910334d4d0bd97c9f94974.patch

---

diff --git a/modules/dmq/dmq_funcs.c b/modules/dmq/dmq_funcs.c
index 4b323c2..7430193 100644
--- a/modules/dmq/dmq_funcs.c
+++ b/modules/dmq/dmq_funcs.c
@@ -383,6 +383,7 @@ int cfg_dmq_bcast_message(struct sip_msg* msg, char* peer, 
char* body, char* con
 int cfg_dmq_t_replicate(struct sip_msg* msg, char* s)
 {
dmq_node_t* node;
+   struct socket_info* sock;
int i = 0;
 
/* avoid loops - do not replicate if message has come from another node
@@ -394,6 +395,12 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s)
return -1;
}
 
+   /* TODO - backup/restore original send socket */
+   sock = lookup_local_socket(dmq_server_socket);
+   if (sock) {
+   set_force_socket(msg, sock);
+   }
+
lock_get(node_list-lock);
node = node_list-nodes;
while(node) {


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:4.2:840d15e0: dmq: Don't delete the original notification_peer on timeout

[Charles Chance]

Module: kamailio
Branch: 4.2
Commit: 840d15e03523413282426135175e25761488bcac
URL: 
https://github.com/kamailio/kamailio/commit/840d15e03523413282426135175e25761488bcac

Author: Alex Hermann a...@speakup.nl
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-01-09T15:56:51Z

dmq: Don't delete the original notification_peer on timeout

(cherry picked from commit e73aa4032873b3fca88bb809d6d4ce4f28c0f237)
(cherry picked from commit 69dc8ec9fce8628cdf9bf39f7a25136544ae9a29)

---

Modified: modules/dmq/notification_peer.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/840d15e03523413282426135175e25761488bcac.diff
Patch: 
https://github.com/kamailio/kamailio/commit/840d15e03523413282426135175e25761488bcac.patch

---

diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c
index 85584d2..2acb9a8 100644
--- a/modules/dmq/notification_peer.c
+++ b/modules/dmq/notification_peer.c
@@ -296,9 +296,12 @@ int notification_resp_callback_f(struct sip_msg* msg, int 
code,
if(code == 408) {
/* deleting node - the server did not respond */
LM_ERR(deleting server %.*s because of failed request\n, 
STR_FMT(node-orig_uri));
+   if (STR_EQ(node-orig_uri, dmq_notification_address)) {
+   LM_ERR(not deleting notification_peer\n);
+   return 0;
+   }
ret = del_dmq_node(node_list, node);
LM_DBG(del_dmq_node returned %d\n, ret);
}
return 0;
 }
-


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] Registrar - check for local path

[Charles Chance]

Yes, given that it is possible to do between branches of the same repo, I
vote for it being preferred also.

Thanks again,

Charles
 On 9 Jan 2015 18:21, Daniel-Constantin Mierla mico...@gmail.com wrote:


 On 09/01/15 19:00, Charles Chance wrote:

 Hey Victor,

 On 9 January 2015 at 17:57, Victor Seva 
 linuxman...@torreviejawireless.org wrote:

 On 01/09/2015 06:54 PM, Charles Chance wrote:
  Would anyone like to review the final changes, before I merge them into
  master?

 I usually use pull-request to get some feedback. Just my 2 cents.


  Thanks - are pull requests the preferred choice now we're on GitHub?

   For external contributors (no direct commit access), probably is more
 convenient due to the option to review and make comments inline the patch.

 Otherwise, it can be from case to case, more or less the preference of the
 developer. If it something that needs a larger review, probably the pull
 request web interface on github offers more tools and ensures that the
 discussion is not lost on mailing list. Practically is like alternative to
 what we used to open a bug tracker item for a patch.

 It seems it allows to do pull requests even from branches of kamailio
 project, as I can see you did the pull request already.  I expected that it
 required to fork the repository on personal github account, do changes and
 then make the pull request. That would have been heavy in my opinion for
 devs with commit access.

 Given the above, I would consider pull requests as 'preferred' instead of
 opening tracker issues with patches. But again, not enforced (or at least
 not now, until majority considers is the best to do).

 Cheers,
 Daniel

 --
 Daniel-Constantin Mierlahttp://twitter.com/#!/miconda - 
 http://www.linkedin.com/in/miconda


 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev



-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] [kamailio] registrar: check for local path on lookup (#23)

[Charles Chance]

When performing a lookup, the Path (if present) is evaluated and if the first 
hop is local we skip it to avoid unnecessary looping.

It is useful if multiple servers are sharing a common database, each saving 
contacts with their local address as the Path.
You can merge this Pull Request by running:

  git pull https://github.com/kamailio/kamailio cchance/registrar

Or you can view, comment on it, or merge it online at:

  https://github.com/kamailio/kamailio/pull/23

-- Commit Summary --

  * registrar: add optional check for local path during lookup()
  * registrar: update documentation to include path_check_local parameter

-- File Changes --

M modules/registrar/doc/registrar_admin.xml (26)
M modules/registrar/lookup.c (74)
M modules/registrar/reg_mod.c (2)
M modules/registrar/reg_mod.h (1)

-- Patch Links --

https://github.com/kamailio/kamailio/pull/23.patch
https://github.com/kamailio/kamailio/pull/23.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/23
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:887167f8: Merge pull request #23 from kamailio/cchance/registrar

[Charles Chance]

Module: kamailio
Branch: master
Commit: 887167f8e34286e0bb069ddcbdbb260331909eed
URL: 
https://github.com/kamailio/kamailio/commit/887167f8e34286e0bb069ddcbdbb260331909eed

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-01-09T19:17:57Z

Merge pull request #23 from kamailio/cchance/registrar

registrar: check for local path on lookup

---

Modified: modules/registrar/doc/registrar_admin.xml
Modified: modules/registrar/lookup.c
Modified: modules/registrar/reg_mod.c
Modified: modules/registrar/reg_mod.h

---

Diff:  
https://github.com/kamailio/kamailio/commit/887167f8e34286e0bb069ddcbdbb260331909eed.diff
Patch: 
https://github.com/kamailio/kamailio/commit/887167f8e34286e0bb069ddcbdbb260331909eed.patch


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:635f23b1: registrar: add optional check for local path during lookup()

[Charles Chance]

Module: kamailio
Branch: master
Commit: 635f23b12eff2431ca9a14bb39f4204dc2a7227b
URL: 
https://github.com/kamailio/kamailio/commit/635f23b12eff2431ca9a14bb39f4204dc2a7227b

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-01-09T17:16:07Z

registrar: add optional check for local path during lookup()

- when performing a lookup the Path (if present) is evaluated
 and if the first hop is local we skip it to avoid looping.
- useful if multiple servers are sharing a common database,
 each saving contacts with their local address as the Path.

---

Modified: modules/registrar/lookup.c
Modified: modules/registrar/reg_mod.c
Modified: modules/registrar/reg_mod.h

---

Diff:  
https://github.com/kamailio/kamailio/commit/635f23b12eff2431ca9a14bb39f4204dc2a7227b.diff
Patch: 
https://github.com/kamailio/kamailio/commit/635f23b12eff2431ca9a14bb39f4204dc2a7227b.patch


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] Registrar - check for local path

[Charles Chance]

Hey Victor,

On 9 January 2015 at 17:57, Victor Seva linuxman...@torreviejawireless.org
wrote:

 On 01/09/2015 06:54 PM, Charles Chance wrote:
  Would anyone like to review the final changes, before I merge them into
  master?

 I usually use pull-request to get some feedback. Just my 2 cents.


Thanks - are pull requests the preferred choice now we're on GitHub?

-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] Registrar - check for local path

[Charles Chance]

Hello,

Would anyone like to review the final changes, before I merge them into
master?

I have created personal branch cchance/registrar, with the relevant commits
being:

https://github.com/kamailio/kamailio/commit/635f23b12eff2431ca9a14bb39f4204dc2a7227b
https://github.com/kamailio/kamailio/commit/4ff2c48d66a3bce2c491b44d0f1b5e939e5508ff

Thanks in advance,

Charles


On 15 December 2014 at 12:58, Charles Chance charles.cha...@sipcentric.com
wrote:


 On 14 December 2014 at 21:40, Daniel-Constantin Mierla mico...@gmail.com
 wrote:

  Hello,

 looking at the patch, I see that the block for parsing first path uri:

 +if (parse_uri(path_dst.s, path_dst.len, path_uri)  0){
 +LM_ERR(failed to parse the Path URI\n);
 +ret = -3;
 +goto done;
 +}


 Is done outside of parameter check:


  +   if (path_check_local  0


 But seems to be used only inside it (when the parameter is set 0). It
 should be moved inside that IF, to avoid parsing the path uri when the
 parameter is not set, because that happens for each lookup.


 Yes, spotted that one already and it has been moved inside the parameter
 check.



 Another thing that has to be double-checked: you change the value of
 ptr-path.s if there is a match of local URI for first path. That can mess
 the structure from usrloc, if it needs to do a free later or is a pointer
 inside shared memory that is going to be used later -- practically the
 pointer is no longer at the beginning of allocated memory. I didn't have
 time to look deeper in usrloc and all its db modes (iirc, for db-only, the
 location record is temporarily built in memory and freed). The best and
 safest for the future is to make a copy of the path str and work with it
 inside the function where you need to change it

 str path_str;

 ...
 path_str = ptr-path;
 // and use path_str instead of ptr-path from here on
 ...


 Sorry, oversight on my part, will make a copy and work with that instead.



 The new parameter has to be documented in the readme as well.


 Of course :)

 Thanks for your time,

 Charles



-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:d28fdbb8: htable: regenerated readme

[Charles Chance]

Module: kamailio
Branch: master
Commit: d28fdbb810fff638a1e0acce2dc1e3e5377ead37
URL: 
https://github.com/kamailio/kamailio/commit/d28fdbb810fff638a1e0acce2dc1e3e5377ead37

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-01-09T17:08:46Z

htable: regenerated readme

---

Modified: modules/htable/README

---

Diff:  
https://github.com/kamailio/kamailio/commit/d28fdbb810fff638a1e0acce2dc1e3e5377ead37.diff
Patch: 
https://github.com/kamailio/kamailio/commit/d28fdbb810fff638a1e0acce2dc1e3e5377ead37.patch


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:95a7d147: htable: update documentation to reiterate importance of loading DMQ module first if enable_dmq is set

[Charles Chance]

Module: kamailio
Branch: master
Commit: 95a7d14716bdcc7c8fd27bcf8f2449e719a02eac
URL: 
https://github.com/kamailio/kamailio/commit/95a7d14716bdcc7c8fd27bcf8f2449e719a02eac

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-01-09T17:06:14Z

htable: update documentation to reiterate importance of loading DMQ module 
first if enable_dmq is set

- previously only mentioned in module dependency section

---

Modified: modules/htable/doc/htable_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/95a7d14716bdcc7c8fd27bcf8f2449e719a02eac.diff
Patch: 
https://github.com/kamailio/kamailio/commit/95a7d14716bdcc7c8fd27bcf8f2449e719a02eac.patch

---

diff --git a/modules/htable/doc/htable_admin.xml 
b/modules/htable/doc/htable_admin.xml
index 2e78d0c..9007813 100644
--- a/modules/htable/doc/htable_admin.xml
+++ b/modules/htable/doc/htable_admin.xml
@@ -633,6 +633,11 @@ modparam(htable, db_expires, 1)
table definition (size, autoexpire etc.) is identical 
across all instances.
/para
para
+   emphasis
+   Important: If this parameter is enabled, the DMQ module 
must be loaded first - otherwise, startup will fail.
+   /emphasis
+   /para
+   para
Currently, values are not replicated on load from DB as 
it is expected 
that in these cases, all servers will load their values 
from the same DB.
/para


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio] registrar: check for local path on lookup (#23)

[Charles Chance]

Merged #23.

---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/23#event-216695228___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:4ff2c48d: registrar: update documentation to include path_check_local parameter

[Charles Chance]

Module: kamailio
Branch: master
Commit: 4ff2c48d66a3bce2c491b44d0f1b5e939e5508ff
URL: 
https://github.com/kamailio/kamailio/commit/4ff2c48d66a3bce2c491b44d0f1b5e939e5508ff

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-01-09T17:22:59Z

registrar: update documentation to include path_check_local parameter

---

Modified: modules/registrar/doc/registrar_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/4ff2c48d66a3bce2c491b44d0f1b5e939e5508ff.diff
Patch: 
https://github.com/kamailio/kamailio/commit/4ff2c48d66a3bce2c491b44d0f1b5e939e5508ff.patch

---

diff --git a/modules/registrar/doc/registrar_admin.xml 
b/modules/registrar/doc/registrar_admin.xml
index c7d5b98..f1c9dc5 100644
--- a/modules/registrar/doc/registrar_admin.xml
+++ b/modules/registrar/doc/registrar_admin.xml
@@ -630,6 +630,32 @@ modparam(registrar, path_use_received, 1)
/example
/section
 
+   section id=registrar.p.path_check_local
+   titlevarnamepath_check_local/varname (integer)/title
+   para
+   If set to 1, when performing a lookup the Path (if present) is 
evaluated
+   and if the first hop is local (according to 
quotemyself/quote test), we
+   skip it to avoid unnecessary looping.
+   /para
+   para
+   This is useful if multiple servers are sharing a common 
location database,
+   each saving contacts with their local address as the Path.
+   /para
+   para
+   emphasis
+   Default value is 0 (disabled).
+   /emphasis
+   /para
+   example
+   titleSet varnamepath_check_local/varname parameter/title
+   programlisting format=linespecific
+...
+modparam(registrar, path_check_local, 1)
+...
+   /programlisting
+   /example
+   /section
+
section id=registrar.p.reg_callid_avp
titlevarnamereg_callid_avp/varname (string)/title
para


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:fe95e1ee: registrar: regenerated README

[Charles Chance]

Module: kamailio
Branch: master
Commit: fe95e1ee9350cc64b6dd9739fffc4d8d19037db0
URL: 
https://github.com/kamailio/kamailio/commit/fe95e1ee9350cc64b6dd9739fffc4d8d19037db0

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-01-09T20:48:19Z

registrar: regenerated README

---

Modified: modules/registrar/README

---

Diff:  
https://github.com/kamailio/kamailio/commit/fe95e1ee9350cc64b6dd9739fffc4d8d19037db0.diff
Patch: 
https://github.com/kamailio/kamailio/commit/fe95e1ee9350cc64b6dd9739fffc4d8d19037db0.patch


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] git:4.2:6a9133a1: dmq: reverted dmq to the state of v4.2.1

[Charles Chance]

Perfect, thanks.

Charles

On 9 January 2015 at 14:05, Daniel-Constantin Mierla mico...@gmail.com
wrote:

  Hi Charles,

 you can pick them back if you tested and all went fine. I did backports
 analyzing the patches, but obviously some were causing issues and decide to
 revert rather than add something wrong.

 Cheers,
 Daniel


 On 09/01/15 14:57, Charles Chance wrote:

 Hi Daniel,

  Can the following be reinstated in 4.2, since they don't cause any
 issues that I know of?


 https://github.com/kamailio/kamailio/commit/7b5f79f9f384bfe3c16c399184281ebe63bb7785

 https://github.com/kamailio/kamailio/commit/69dc8ec9fce8628cdf9bf39f7a25136544ae9a29

  The side effects you refer to all appear to relate to the init_callback
 stuff.

  Cheers,
 Charles


 On 8 January 2015 at 17:05, Daniel-Constantin Mierla mico...@gmail.com
 wrote:

 Module: kamailio
 Branch: 4.2
 Commit: 6a9133a119cd2556cdfc5260b5c3442fe2290584
 URL:
 https://github.com/kamailio/kamailio/commit/6a9133a119cd2556cdfc5260b5c3442fe2290584

 Author: Daniel-Constantin Mierla mico...@gmail.com
 Committer: Daniel-Constantin Mierla mico...@gmail.com
 Date: 2015-01-08T17:52:24+01:00

 dmq: reverted dmq to the state of v4.2.1

 - some of the tunings in master introduced side effects

 ---

 Modified: modules/dmq/dmq.c
 Modified: modules/dmq/dmq_funcs.c
 Modified: modules/dmq/notification_peer.c
 Modified: modules/dmq/notification_peer.h
 Modified: modules/dmq/peer.c
 Modified: modules/dmq/peer.h
 Modified: modules/dmq/worker.c

 ---

 Diff:
 https://github.com/kamailio/kamailio/commit/6a9133a119cd2556cdfc5260b5c3442fe2290584.diff
 Patch:
 https://github.com/kamailio/kamailio/commit/6a9133a119cd2556cdfc5260b5c3442fe2290584.patch


 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev




 www.sipcentric.com

 Follow us on twitter @sipcentric http://twitter.com/sipcentric

 Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered
 office: Faraday Wharf, Innovation Birmingham Campus, Holt Street,
 Birmingham Science Park, Birmingham B7 4BB.

 ___
 sr-dev mailing 
 listsr-...@lists.sip-router.orghttp://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev


 --
 Daniel-Constantin Mierlahttp://twitter.com/#!/miconda - 
 http://www.linkedin.com/in/miconda


 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev



-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:8d7b9db5: pua_dialoginfo: do not free dlginfo_cell too early

[Charles Chance]

Module: kamailio
Branch: master
Commit: 8d7b9db5d3b290c9f180dac8610a61a7cee9d192
URL: 
https://github.com/kamailio/kamailio/commit/8d7b9db5d3b290c9f180dac8610a61a7cee9d192

Author: Charles Chance charles.cha...@sipcentric.com
Committer: Charles Chance charles.cha...@sipcentric.com
Date: 2015-01-09T14:20:07Z

pua_dialoginfo: do not free dlginfo_cell too early

- it is required later in the dialog callbacks
- it will be freed anyway during dialog destruction

---

Modified: modules/pua_dialoginfo/pua_dialoginfo.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/8d7b9db5d3b290c9f180dac8610a61a7cee9d192.diff
Patch: 
https://github.com/kamailio/kamailio/commit/8d7b9db5d3b290c9f180dac8610a61a7cee9d192.patch

---

diff --git a/modules/pua_dialoginfo/pua_dialoginfo.c 
b/modules/pua_dialoginfo/pua_dialoginfo.c
index 6761a72..7bed1998 100644
--- a/modules/pua_dialoginfo/pua_dialoginfo.c
+++ b/modules/pua_dialoginfo/pua_dialoginfo.c
@@ -598,7 +598,6 @@ __dialog_created(struct dlg_cell *dlg, int type, struct 
dlg_cb_params *_params)
(include_req_uri)?(dlg-req_uri):(dlg-to_uri),
(dlg-callid), 1, dlginfo-lifetime,
0, 0, 0, 0, (send_publish_flag==-1)?1:0);
-   free_dlginfo_cell(dlginfo);
 
 }
 


___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] git:4.2:6a9133a1: dmq: reverted dmq to the state of v4.2.1

[Charles Chance]

Hi Daniel,

Can the following be reinstated in 4.2, since they don't cause any issues
that I know of?

https://github.com/kamailio/kamailio/commit/7b5f79f9f384bfe3c16c399184281ebe63bb7785
https://github.com/kamailio/kamailio/commit/69dc8ec9fce8628cdf9bf39f7a25136544ae9a29

The side effects you refer to all appear to relate to the init_callback
stuff.

Cheers,
Charles


On 8 January 2015 at 17:05, Daniel-Constantin Mierla mico...@gmail.com
wrote:

 Module: kamailio
 Branch: 4.2
 Commit: 6a9133a119cd2556cdfc5260b5c3442fe2290584
 URL:
 https://github.com/kamailio/kamailio/commit/6a9133a119cd2556cdfc5260b5c3442fe2290584

 Author: Daniel-Constantin Mierla mico...@gmail.com
 Committer: Daniel-Constantin Mierla mico...@gmail.com
 Date: 2015-01-08T17:52:24+01:00

 dmq: reverted dmq to the state of v4.2.1

 - some of the tunings in master introduced side effects

 ---

 Modified: modules/dmq/dmq.c
 Modified: modules/dmq/dmq_funcs.c
 Modified: modules/dmq/notification_peer.c
 Modified: modules/dmq/notification_peer.h
 Modified: modules/dmq/peer.c
 Modified: modules/dmq/peer.h
 Modified: modules/dmq/worker.c

 ---

 Diff:
 https://github.com/kamailio/kamailio/commit/6a9133a119cd2556cdfc5260b5c3442fe2290584.diff
 Patch:
 https://github.com/kamailio/kamailio/commit/6a9133a119cd2556cdfc5260b5c3442fe2290584.patch


 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev




-- 
*Charles Chance*
Managing Director

t. 0121 285 4400m. 07932 063 891

-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] Trunk: DMQ and hashtables - won't start and crashes

[Charles Chance]

On 8 January 2015 at 12:08, Olle E. Johansson o...@edvina.net wrote:


 On 08 Jan 2015, at 11:29, Daniel-Constantin Mierla mico...@gmail.com
 wrote:

  Hello,

 also besides the log messages, for the crash case, the backtrace would be
 useful...

 Will hunt for that.


 Cheers,
 Daniel

 On 08/01/15 09:38, Charles Chance wrote:

 Hey Olle,

 Anything in the log?

 Listening on
  udp: 192.168.40.15:5060
 Aliases:

 WARNING: no fork mode
  0(60369) INFO: cfgutils [cfgutils.c:891]: mod_init(): no hash_file given,
 disable hash functionality
  0(60369) ERROR: dmq [dmq_funcs.c:35]: register_dmq_peer(): peer list not
 initialized
  0(60369) ERROR: htable [ht_dmq.c:69]: ht_dmq_initialize(): error in
 register_dmq_peer
  0(60369) ERROR: htable [htable.c:213]: mod_init(): failed to initialize
 dmq integration
  0(60369) ERROR: core [sr_module.c:945]: init_mod(): Error while
 initializing module htable (/usr/local/lib64/kamailio/modules/htable.so)
 ERROR: error while initializing modules


Are there any earlier errors relating to DMQ module initialization?

On my local instance, if I switch the order of loading modules such that
htable is loaded before dmq, I can replicate the issue...

Jan  8 12:59:20 kamailio01 /usr/local/sbin/kamailio[28945]: ERROR: dmq
[dmq_funcs.c:35]: register_dmq_peer(): peer list not initialized
Jan  8 12:59:20 kamailio01 /usr/local/sbin/kamailio[28945]: ERROR: htable
[ht_dmq.c:69]: ht_dmq_initialize(): error in register_dmq_peer
Jan  8 12:59:20 kamailio01 /usr/local/sbin/kamailio[28945]: ERROR: htable
[htable.c:213]: mod_init(): failed to initialize dmq integration
Jan  8 12:59:20 kamailio01 /usr/local/sbin/kamailio[28945]: ERROR: core
[sr_module.c:945]: init_mod(): Error while initializing module htable
(/usr/local/lib64/kamailio/modules/htable.so)

...which of course is expected. But in your case, you have confirmed that
you are loading dmq first, so there must be some other issue.

If you start without htable-dmq integration enabled, what is the result of
kamcmd dmq.list_nodes?

Cheers,
Charles

-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] Trunk: DMQ and hashtables - won't start and crashes

[Charles Chance]

Hey Olle,

Anything in the log?

Are you loading dmq before htable? What are your values for dmq modparams?

Does dmq_send_message() work in default route?

Cheers,

Charles
 On 8 Jan 2015 07:57, Olle E. Johansson o...@edvina.net wrote:

 Using trunk code, I can get DMQ to work by itself. I have three test
 servers that I take up and down and it seems to work.

 As soon as I enable DMQ in htable, without enabling any replication of any
 hash table, Kamailio refuse to start. Seems to be a chicken-and-egg issue,
 maybe loading order? I could not find a solution.

 Also, without enabling DMQ, if I use dmq_send_message() in htable:init
 event route Kamailio crashes.

 This is all on my OS/X system with latest git code.
 /O
 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev


-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] git:master:cc5f96f9: dmq: safety check for peer_list when calling the callbacks

[Charles Chance]

Hi Daniel,

Thanks for your reply.

On 8 January 2015 at 15:15, Daniel-Constantin Mierla mico...@gmail.com
wrote:

  Hi Charles,

 perhaps Olle can give more details about how he is running it. I was on an
 irc-like chat with him reporting and testing, as I wanted to see if there
 is anything that can be fixed before building v4.2.2.


Will try to investigate further.


 On the other hand, not initializong peer_list and dmq_init_callback_done
 to NULL and accessing them without check is exposing at list the problem
 from destroy() function. Kamailio calls destroy even if the module was not
 initialized. Not initializing dmq_init_callback_done at declaration to NULL
 results in a random value for it (C doesn't do implicit initialization),
 practically shm freeing an invalid pointer in destroy function.


Agreed - should be done anyway, regardless of whether it is related or not
to the reported issue.

Best,
Charles




 On 08/01/15 16:02, Charles Chance wrote:

 Hi Daniel,

  I was wondering, did you find some way in which this was causing the
 issue?

  Theoretically, if the module is loaded successfully then peer_list
 cannot be null...

  (dmq.c)

  static int mod_init(void)
  {
  ...
  /* load peer list - the list containing the module callbacks for
 dmq */
 peer_list = init_peer_list();
 if(peer_list==NULL) {
 LM_ERR(cannot initialize peer list\n);
 return -1;
 }
  ...

  Also, peer_list should always contain the local notification peer, added
 during startup and prior to run_init_callbacks() ever being called:

  ...
  /**
  * add the dmq notification peer.
  * the dmq is a peer itself so that it can receive node
 notifications
  */
 if(add_notification_peer()0) {
 LM_ERR(cannot add notification peer\n);
 return -1;
 }
  ...


  Am I missing something obvious?

  Best,
 Charles


 On 8 January 2015 at 13:21, Daniel-Constantin Mierla mico...@gmail.com
 wrote:

 Module: kamailio
 Branch: master
 Commit: cc5f96f9c847d285085b0b9809ff0db76ea0a835
 URL:
 https://github.com/kamailio/kamailio/commit/cc5f96f9c847d285085b0b9809ff0db76ea0a835

 Author: Daniel-Constantin Mierla mico...@gmail.com
 Committer: Daniel-Constantin Mierla mico...@gmail.com
 Date: 2015-01-08T14:20:58+01:00

 dmq: safety check for peer_list when calling the callbacks

 - can result in crashing if it is not set
 - reported by Olle E. Johansson

 ---

 Modified: modules/dmq/notification_peer.c

 ---

 Diff:
 https://github.com/kamailio/kamailio/commit/cc5f96f9c847d285085b0b9809ff0db76ea0a835.diff
 Patch:
 https://github.com/kamailio/kamailio/commit/cc5f96f9c847d285085b0b9809ff0db76ea0a835.patch

 ---

 diff --git a/modules/dmq/notification_peer.c
 b/modules/dmq/notification_peer.c
 index 1d804bd..b493717 100644
 --- a/modules/dmq/notification_peer.c
 +++ b/modules/dmq/notification_peer.c
 @@ -173,6 +173,10 @@ int extract_node_list(dmq_node_list_t* update_list,
 struct sip_msg* msg)
  int run_init_callbacks() {
 dmq_peer_t* crt;

 +   if(peer_list==0) {
 +   LM_WARN(peer list is null\n);
 +   return 0;
 +   }
 crt = peer_list-peers;
 while(crt) {
 if (crt-init_callback) {


 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev




 www.sipcentric.com

 Follow us on twitter @sipcentric http://twitter.com/sipcentric

 Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered
 office: Faraday Wharf, Innovation Birmingham Campus, Holt Street,
 Birmingham Science Park, Birmingham B7 4BB.

 ___
 sr-dev mailing 
 listsr-...@lists.sip-router.orghttp://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev


 --
 Daniel-Constantin Mierlahttp://twitter.com/#!/miconda - 
 http://www.linkedin.com/in/miconda


 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev



-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] git:master:cc5f96f9: dmq: safety check for peer_list when calling the callbacks

[Charles Chance]

Hi Daniel,

I was wondering, did you find some way in which this was causing the issue?

Theoretically, if the module is loaded successfully then peer_list cannot
be null...

(dmq.c)

static int mod_init(void)
{
...
/* load peer list - the list containing the module callbacks for
dmq */
peer_list = init_peer_list();
if(peer_list==NULL) {
LM_ERR(cannot initialize peer list\n);
return -1;
}
...

Also, peer_list should always contain the local notification peer, added
during startup and prior to run_init_callbacks() ever being called:

...
/**
 * add the dmq notification peer.
 * the dmq is a peer itself so that it can receive node
notifications
 */
if(add_notification_peer()0) {
LM_ERR(cannot add notification peer\n);
return -1;
}
...


Am I missing something obvious?

Best,
Charles


On 8 January 2015 at 13:21, Daniel-Constantin Mierla mico...@gmail.com
wrote:

 Module: kamailio
 Branch: master
 Commit: cc5f96f9c847d285085b0b9809ff0db76ea0a835
 URL:
 https://github.com/kamailio/kamailio/commit/cc5f96f9c847d285085b0b9809ff0db76ea0a835

 Author: Daniel-Constantin Mierla mico...@gmail.com
 Committer: Daniel-Constantin Mierla mico...@gmail.com
 Date: 2015-01-08T14:20:58+01:00

 dmq: safety check for peer_list when calling the callbacks

 - can result in crashing if it is not set
 - reported by Olle E. Johansson

 ---

 Modified: modules/dmq/notification_peer.c

 ---

 Diff:
 https://github.com/kamailio/kamailio/commit/cc5f96f9c847d285085b0b9809ff0db76ea0a835.diff
 Patch:
 https://github.com/kamailio/kamailio/commit/cc5f96f9c847d285085b0b9809ff0db76ea0a835.patch

 ---

 diff --git a/modules/dmq/notification_peer.c
 b/modules/dmq/notification_peer.c
 index 1d804bd..b493717 100644
 --- a/modules/dmq/notification_peer.c
 +++ b/modules/dmq/notification_peer.c
 @@ -173,6 +173,10 @@ int extract_node_list(dmq_node_list_t* update_list,
 struct sip_msg* msg)
  int run_init_callbacks() {
 dmq_peer_t* crt;

 +   if(peer_list==0) {
 +   LM_WARN(peer list is null\n);
 +   return 0;
 +   }
 crt = peer_list-peers;
 while(crt) {
 if (crt-init_callback) {


 ___
 sr-dev mailing list
 sr-dev@lists.sip-router.org
 http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev




-- 
*Charles Chance*
Managing Director

t. 0121 285 4400m. 07932 063 891

-- 
www.sipcentric.com

Follow us on twitter @sipcentric http://twitter.com/sipcentric

Sipcentric Ltd. Company registered in England  Wales no. 7365592. Registered 
office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, 
Birmingham Science Park, Birmingham B7 4BB.
___
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev