sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
538 discussions

git:master:0923baa4: kazoo: add msgid to hash logging

by GitHub

Module: kamailio Branch: master Commit: 0923baa48edb1f4064bec4f6eea420073c8f5b7c URL: https://github.com/kamailio/kamailio/commit/0923baa48edb1f4064bec4f6eea4200… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: GitHub <noreply(a)github.com> Date: 2017-01-18T09:31:08Z kazoo: add msgid to hash logging --- Modified: src/modules/kazoo/kz_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/0923baa48edb1f4064bec4f6eea4200… Patch: https://github.com/kamailio/kamailio/commit/0923baa48edb1f4064bec4f6eea4200… --- diff --git a/src/modules/kazoo/kz_hash.c b/src/modules/kazoo/kz_hash.c index 16f92c2..00bea4e 100644 --- a/src/modules/kazoo/kz_hash.c +++ b/src/modules/kazoo/kz_hash.c @@ -181,7 +181,7 @@ kz_amqp_cmd_ptr kz_cmd_retrieve(str* message_id) p = kz_search_cmd_table(message_id, hash_code); if(p== NULL) { - LM_DBG("command pointer hash entry not found\n"); + LM_DBG("command pointer hash entry not found - %s\n", message_id->s); lock_release(&kz_cmd_htable[hash_code].lock); return NULL; } @@ -195,7 +195,7 @@ kz_amqp_cmd_ptr kz_cmd_retrieve(str* message_id) } if(prev_p->next== NULL) { - LM_ERR("command pointer not found\n"); + LM_DBG("command pointer hash entry not found - %s\n", message_id->s); lock_release(&kz_cmd_htable[hash_code].lock); return NULL; }

7 years, 10 months

[kamailio/kamailio] kazoo: fix kz_amqp_get_zones (#939)

by lazedo

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/939 -- Commit Summary -- * kazoo: add msgid to hash logging * kazoo: fix kz_amqp_get_zones -- File Changes -- M src/modules/kazoo/kz_amqp.c (4) M src/modules/kazoo/kz_hash.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/939.patch https://github.com/kamailio/kamailio/pull/939.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/939

7 years, 10 months

git:master:a136a32d: Merge pull request #914 from kamailio/lazedo-patch-1

by GitHub

Module: kamailio Branch: master Commit: a136a32d4a7930809a4935341f057e02ecd21495 URL: https://github.com/kamailio/kamailio/commit/a136a32d4a7930809a4935341f057e0… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: GitHub <noreply(a)github.com> Date: 2017-01-18T13:08:21Z Merge pull request #914 from kamailio/lazedo-patch-1 presence: allow control of subscription deletion --- Modified: src/modules/presence/doc/presence_admin.xml Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/a136a32d4a7930809a4935341f057e0… Patch: https://github.com/kamailio/kamailio/commit/a136a32d4a7930809a4935341f057e0… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 91ebe24..2f68df8 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -780,6 +780,14 @@ modparam("presence", "subs_remove_match", 1) the priority of the presence document is based on timestamp, so newer documents have higher priority.</para> </listitem> + <listitem> + <para><emphasis>delete_subscription</emphasis> - integer value to + give extra control of deleting the subscription after processing of + event_route[presence:notify-reply]. If value = 1, it deletes the subscription. + If xavp_cfg parameter is set but this attribute is not in the avp, + the subscription is not deleted. this does apply for code 404 and 481 + where subscription is deleted.</para> + </listitem> </itemizedlist> <para> Default value is <emphasis>empty</emphasis> (not set). diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 265b1d1..c9b40fc 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1830,6 +1830,23 @@ void run_notify_reply_event(struct cell *t, struct tmcb_params *ps) } +int pres_get_delete_sub(void) +{ + sr_xavp_t *vavp = NULL; + str vname = str_init("delete_subscription"); + + if(pres_xavp_cfg.s==NULL || pres_xavp_cfg.len<=0) { + return 0; + } + + vavp = xavp_get_child_with_ival(&pres_xavp_cfg, &vname); + if(vavp!=NULL) { + return (int)vavp->val.v.i; + } + + return 0; +} + void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) { subs_t* subs; @@ -1847,7 +1864,10 @@ void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) run_notify_reply_event(t, ps); - if(ps->code == 404 || ps->code == 481 || (ps->code == 408 && timeout_rm_subs)) { + if(ps->code == 404 + || ps->code == 481 + || (ps->code == 408 && timeout_rm_subs) + || pres_get_delete_sub()) { delete_subs(&subs->pres_uri, &subs->event->name, &subs->to_tag, &subs->from_tag, &subs->callid); }

7 years, 10 months

git:master:7d31f6fc: presence: documentation for delete_subscription

by GitHub

Module: kamailio Branch: master Commit: 7d31f6fc7b57706ccb7f4dc9d82b8793633ee3b0 URL: https://github.com/kamailio/kamailio/commit/7d31f6fc7b57706ccb7f4dc9d82b879… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: GitHub <noreply(a)github.com> Date: 2017-01-18T09:45:54Z presence: documentation for delete_subscription --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d31f6fc7b57706ccb7f4dc9d82b879… Patch: https://github.com/kamailio/kamailio/commit/7d31f6fc7b57706ccb7f4dc9d82b879… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 6292340..a9c7cae 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -780,6 +780,14 @@ modparam("presence", "subs_remove_match", 1) the priority of the presence document is based on timestamp, so newer documents have higher priority.</para> </listitem> + <listitem> + <para><emphasis>delete_subscription</emphasis> - integer value to + give extra control of deleting the subscription after processing of + event_route[presence:notify-reply]. If value = 1, it deletes the subscription. + If xavp_cfg parameter is set but this attribute is not in the avp, + the subscription is not deleted. this does apply for code 404 and 481 + where subscription is deleted.</para> + </listitem> </itemizedlist> <para> Default value is <emphasis>empty</emphasis> (not set).

7 years, 10 months

git:master:1dfe265a: presence: allow control of subscription deletion

by GitHub

Module: kamailio Branch: master Commit: 1dfe265ad2fc8c166c27aabf924d581ac5be81af URL: https://github.com/kamailio/kamailio/commit/1dfe265ad2fc8c166c27aabf924d581… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: GitHub <noreply(a)github.com> Date: 2017-01-05T16:18:14Z presence: allow control of subscription deletion use the configuration xavp to control subscription deletion after notify searches for `delete_subscription` value in the configuration xavp --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/1dfe265ad2fc8c166c27aabf924d581… Patch: https://github.com/kamailio/kamailio/commit/1dfe265ad2fc8c166c27aabf924d581… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index aaa4b51..c1636c7 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1818,6 +1818,23 @@ void run_notify_reply_event(struct cell *t, struct tmcb_params *ps) } +int pres_get_delete_sub(void) +{ + sr_xavp_t *vavp = NULL; + str vname = str_init("delete_subscription"); + + if(pres_xavp_cfg.s==NULL || pres_xavp_cfg.len<=0) { + return 0; + } + + vavp = xavp_get_child_with_ival(&pres_xavp_cfg, &vname); + if(vavp!=NULL) { + return (int)vavp->val.v.i; + } + + return 0; +} + void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) { subs_t* subs; @@ -1835,7 +1852,10 @@ void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) run_notify_reply_event(t, ps); - if(ps->code == 404 || ps->code == 481 || (ps->code == 408 && timeout_rm_subs)) { + if(ps->code == 404 + || ps->code == 481 + || (ps->code == 408 && timeout_rm_subs) + || pres_get_delete_sub()) { delete_subs(&subs->pres_uri, &subs->event->name, &subs->to_tag, &subs->from_tag, &subs->callid); }

7 years, 10 months

[kamailio/kamailio] presence: allow control of subscription deletion (#914)

by lazedo

use the configuration xavp to control subscription deletion after notify searches for `delete_subscription` value in the configuration xavp You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/914 -- Commit Summary -- * presence: allow control of subscription deletion -- File Changes -- M src/modules/presence/notify.c (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/914.patch https://github.com/kamailio/kamailio/pull/914.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/914

7 years, 10 months

git:master:f3c553a5: Reuse PERLLDOPTS in db_perlvdb

by Fabrice Fontaine

Module: kamailio Branch: master Commit: f3c553a55d7f468d6575f46c4a330cad8167cf56 URL: https://github.com/kamailio/kamailio/commit/f3c553a55d7f468d6575f46c4a330ca… Author: Fabrice Fontaine <fabrice.fontaine(a)orange.com> Committer: Fabrice Fontaine <fabrice.fontaine(a)orange.com> Date: 2017-01-17T20:35:24+01:00 Reuse PERLLDOPTS in db_perlvdb PERLLDOPTS is already used in app_perl module. Reuse this variable in db_perlvdb module instead of always setting LIBS to (shell perl -MExtUtils::Embed -e ldopts) Indeed, this will not work when cross-compiling (the value will be retrieved for the host perl and not the target perl) Signed-off-by: Fabrice Fontaine <fabrice.fontaine(a)orange.com> --- Modified: src/modules/db_perlvdb/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/f3c553a55d7f468d6575f46c4a330ca… Patch: https://github.com/kamailio/kamailio/commit/f3c553a55d7f468d6575f46c4a330ca… --- diff --git a/src/modules/db_perlvdb/Makefile b/src/modules/db_perlvdb/Makefile index 47830a2..0a062bc 100644 --- a/src/modules/db_perlvdb/Makefile +++ b/src/modules/db_perlvdb/Makefile @@ -4,7 +4,11 @@ include ../../Makefile.defs auto_gen= NAME=db_perlvdb.so -LIBS:=$(shell perl -MExtUtils::Embed -e ldopts) +ifeq ($(PERLLDOPTS),) + LIBS:=$(shell perl -MExtUtils::Embed -e ldopts) +else + LIBS+=$(PERLLDOPTS) +endif PERL_DEFS:=$(shell perl -MExtUtils::Embed -e ccopts) DEFS+=$(PERL_DEFS)

7 years, 10 months

git:master:6208c36b: Merge pull request #934 from ffontaine/master

by GitHub

Module: kamailio Branch: master Commit: 6208c36bd1ca8807c12411e21b136e7c410760f3 URL: https://github.com/kamailio/kamailio/commit/6208c36bd1ca8807c12411e21b136e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-01-18T14:08:06+01:00 Merge pull request #934 from ffontaine/master Reuse PERLLDOPTS in db_perlvdb --- Modified: src/modules/db_perlvdb/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/6208c36bd1ca8807c12411e21b136e7… Patch: https://github.com/kamailio/kamailio/commit/6208c36bd1ca8807c12411e21b136e7… --- diff --git a/src/modules/db_perlvdb/Makefile b/src/modules/db_perlvdb/Makefile index 47830a2..0a062bc 100644 --- a/src/modules/db_perlvdb/Makefile +++ b/src/modules/db_perlvdb/Makefile @@ -4,7 +4,11 @@ include ../../Makefile.defs auto_gen= NAME=db_perlvdb.so -LIBS:=$(shell perl -MExtUtils::Embed -e ldopts) +ifeq ($(PERLLDOPTS),) + LIBS:=$(shell perl -MExtUtils::Embed -e ldopts) +else + LIBS+=$(PERLLDOPTS) +endif PERL_DEFS:=$(shell perl -MExtUtils::Embed -e ccopts) DEFS+=$(PERL_DEFS)

7 years, 10 months

[kamailio/kamailio] Reuse PERLLDOPTS in db_perlvdb (#934)

by Fabrice Fontaine

PERLLDOPTS is already used in app_perl module. Reuse this variable in db_perlvdb module instead of always setting LIBS to (shell perl -MExtUtils::Embed -e ldopts) Indeed, this will not work when cross-compiling (the value will be retrieved for the host perl and not the target perl) Signed-off-by: Fabrice Fontaine <fabrice.fontaine(a)orange.com> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/934 -- Commit Summary -- * Reuse PERLLDOPTS in db_perlvdb -- File Changes -- M src/modules/db_perlvdb/Makefile (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/934.patch https://github.com/kamailio/kamailio/pull/934.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/934

7 years, 10 months

Planning the release of v4.4.5

by Daniel-Constantin Mierla

Hello, I am considering to release v4.4.5 with latest fixes from branch 4.4 later this week, on Wednesday or Thursday (Jan 19 or 20). As usual, if anyone has fixes that were not backported yet, do it if you are a developer or write to sr-dev to be sure it is not missed. Sumbit also the new issues you are ware of and they are not on the bug tracker. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

7 years, 10 months

← Newer
1
...
15
16
17
18
19
20
21
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017