sr-dev June 2019

sr-dev@lists.kamailio.org

19 participants
216 discussions

git:master:d21b22c0: rls: docs for rpc command rls.update_subs
by Daniel-Constantin Mierla 22 Jun '19

22 Jun '19

Module: kamailio Branch: master Commit: d21b22c0542715e572025581b0cb47d8c5bebb2f URL: https://github.com/kamailio/kamailio/commit/d21b22c0542715e572025581b0cb47d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-22T16:39:46+02:00 rls: docs for rpc command rls.update_subs --- Modified: src/modules/rls/doc/rls_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d21b22c0542715e572025581b0cb47d… Patch: https://github.com/kamailio/kamailio/commit/d21b22c0542715e572025581b0cb47d… --- diff --git a/src/modules/rls/doc/rls_admin.xml b/src/modules/rls/doc/rls_admin.xml index 69d898d226..ab3b2d1664 100644 --- a/src/modules/rls/doc/rls_admin.xml +++ b/src/modules/rls/doc/rls_admin.xml @@ -775,6 +775,36 @@ Within event_route[xhttp:request]: <programlisting format="linespecific"> ... &kamcmd; rls.cleanup +... + </programlisting> + </section> + <section id="rls.rpc.update_subs"> + <title>rls.update_subs</title> + <para> + Manually triggers updates to resource list subscriptions (for example, + after the contents of a resource list has changes). + </para> + <para> + Name: <emphasis>rls.cleanup</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>uri - the uri of the user who made the change + and whose resource list subscriptions should be + updated</para> + </listitem> + <listitem> + <para>event - the event package (e.g. presence). + </para> + </listitem> + </itemizedlist> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +&kamcmd; rls.update_subs sip:alice@domain.com presence ... </programlisting> </section>

1 0

git:master:15070284: rls: added rpc command rls.update_subs
by Daniel-Constantin Mierla 22 Jun '19

22 Jun '19

Module: kamailio Branch: master Commit: 1507028464a724cc5628144c4017e01494a2fbb4 URL: https://github.com/kamailio/kamailio/commit/1507028464a724cc5628144c4017e01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-22T16:39:46+02:00 rls: added rpc command rls.update_subs --- Modified: src/modules/rls/rls.c --- Diff: https://github.com/kamailio/kamailio/commit/1507028464a724cc5628144c4017e01… Patch: https://github.com/kamailio/kamailio/commit/1507028464a724cc5628144c4017e01… --- diff --git a/src/modules/rls/rls.c b/src/modules/rls/rls.c index 00dc87e548..19ecce0ca2 100644 --- a/src/modules/rls/rls.c +++ b/src/modules/rls/rls.c @@ -1085,8 +1085,46 @@ static const char* rls_rpc_cleanup_doc[2] = { 0 }; +static void rls_rpc_update_subs(rpc_t* rpc, void* ctx) +{ + str uri = {0, 0}; + str event = {0, 0}; + int pn = 0; + + LM_DBG("executing update subs\n"); + pn = rpc->scan(ctx, "SS", &uri, &event); + if(pn < 2) { + rpc->fault(ctx, 500, "Not enough parameters"); + return; + } + + if(uri.s == NULL || uri.len == 0) { + LM_ERR("empty uri\n"); + rpc->fault(ctx, 500, "Empty URI"); + return; + } + + if(event.s == NULL || event.len == 0) { + LM_ERR("empty event parameter\n"); + rpc->fault(ctx, 500, "Empty event parameter"); + return; + } + LM_DBG("uri '%.*s' - event '%.*s'\n", uri.len, uri.s, event.len, event.s); + + if(ki_rls_update_subs(NULL, &uri, &event)<0) { + rpc->fault(ctx, 500, "Processing failure"); + return; + } +} + +static const char* rls_rpc_update_subs_doc[2] = { + "Trigger rls cleanup.", + 0 +}; + rpc_export_t rls_rpc[] = { {"rls.cleanup", rls_rpc_cleanup, rls_rpc_cleanup_doc, 0}, + {"rls.update_subs", rls_rpc_update_subs, rls_rpc_update_subs_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:46084c89: rls: Makefile - link agaist libicu on macos/darwin
by Daniel-Constantin Mierla 22 Jun '19

22 Jun '19

Module: kamailio Branch: master Commit: 46084c898d0598e94c7f22ab03d321e037fd7f55 URL: https://github.com/kamailio/kamailio/commit/46084c898d0598e94c7f22ab03d321e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-22T16:39:46+02:00 rls: Makefile - link agaist libicu on macos/darwin - libxml2 needs it but its pkg-config doesn't list it --- Modified: src/modules/rls/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/46084c898d0598e94c7f22ab03d321e… Patch: https://github.com/kamailio/kamailio/commit/46084c898d0598e94c7f22ab03d321e… --- diff --git a/src/modules/rls/Makefile b/src/modules/rls/Makefile index 33ed9f4a39..b62be93d4c 100644 --- a/src/modules/rls/Makefile +++ b/src/modules/rls/Makefile @@ -10,6 +10,12 @@ NAME=rls.so ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(OS), darwin) +ICU_BUILDER = $(shell \ + if pkg-config --exists icu-uc; then \ + echo 'pkg-config icu-uc'; \ + fi) +endif endif ifneq ($(XML2CFG),) @@ -21,6 +27,11 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(ICU_BUILDER),) + DEFS += $(shell $(ICU_BUILDER) --cflags ) + LIBS += $(shell $(ICU_BUILDER) --libs) +endif + DEFS+= SERLIBPATH=../../lib

1 0

async_task_push(): async task pushed, but no async workers - ignoring
by Yebe Keffa 21 Jun '19

21 Jun '19

Hi i am getting this error in log: [core/async_task.c:244]: async_task_push(): async task pushed, but no async workers - ignoring for kamailio.cfg line: sql_query_async("cb", "DELETE FROM `acc` WHERE sip_code='200' and method='INVITE' "); thank you for your advise Keffa Yebe Diomandé Gérant de NaN.CI E: keffa(a)nan.ci (https://link.getmailspring.com/link/E1B96786-7C2C-4EDA-B9A3-5930CF261DBD@ge…) P: +225 02772222 (tel:+225%2002772222) A: Cocody, Angré, Carrefour GESTOCI (https://link.getmailspring.com/link/E1B96786-7C2C-4EDA-B9A3-5930CF261DBD@ge…) W: https://www.nan.ci (https://link.getmailspring.com/link/E1B96786-7C2C-4EDA-B9A3-5930CF261DBD@ge…)

1 0

git:master:e1ea5743: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 21 Jun '19

21 Jun '19

Module: kamailio Branch: master Commit: e1ea5743fa57b433352270adc6929968a395590c URL: https://github.com/kamailio/kamailio/commit/e1ea5743fa57b433352270adc692996… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-06-21T11:23:12+02:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README Modified: src/modules/rls/README --- Diff: https://github.com/kamailio/kamailio/commit/e1ea5743fa57b433352270adc692996… Patch: https://github.com/kamailio/kamailio/commit/e1ea5743fa57b433352270adc692996… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index 74f1a8f337..18d6d59a21 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -12,8 +12,6 @@ Edited by Anca-Maria Vamanu -Edited by - Juha Heinanen Copyright © 2006 Voice Sistem SRL @@ -92,7 +90,7 @@ Juha Heinanen 7. Events - 7.1. present:notify-reply + 7.1. presence:notify-reply 8. Installation @@ -234,7 +232,7 @@ Chapter 1. Admin Guide 7. Events - 7.1. present:notify-reply + 7.1. presence:notify-reply 8. Installation @@ -388,9 +386,9 @@ modparam("presence", "clean_period", 100) Default value is “0”. Example 1.6. Set cseq_offset parameter - ... - modparam("presence", "cseq_offset", 1) - ... +... +modparam("presence", "cseq_offset", 1) +... 3.7. db_update_period (int) @@ -535,9 +533,9 @@ modparam("presence", "max_expires", 3600) Default value is “0”. Example 1.16. Set min_expires parameter - ... - modparam("presence", "min_expires", 1800) - ... +... +modparam("presence", "min_expires", 1800) +... 3.17. min_expires_action (int) @@ -831,9 +829,9 @@ modparam("presence", "retrieve_order_by", "priority, received_time") Default value is “0”. Example 1.34. Set sip_uri_match parameter - ... - modparam("presence", "sip_uri_match", 1) - ... +... +modparam("presence", "sip_uri_match", 1) +... 3.35. enable_dmq (integer) @@ -848,9 +846,9 @@ modparam("presence", "retrieve_order_by", "priority, received_time") Default value is 0. Example 1.35. Set enable_dmq parameter - ... - modparam("presence", "enable_dmq", 1) - ... +... +modparam("presence", "enable_dmq", 1) +... 4. Functions @@ -950,10 +948,10 @@ if (method=="MESSAGE") { This function can be used from ANY_ROUTE. Example 1.39. pres_has_subscribers usage - ... - if(pres_has_subscribers($var(uri), "message-summary")) - do something...; - ... +... +if(pres_has_subscribers($var(uri), "message-summary")) + # do something...; +... 4.5. pres_refresh_watchers(uri, event, type[, file_uri, filename]) @@ -1060,7 +1058,7 @@ kamcmd presence.refreshWatchers sip:test@kamailio.org presence 1 Access the attributes of handled subscription. It must be used after a successful call of “handle_subscription()” or in the following events. * tm:local-request - before notify is sent - * present:notify-reply - after notify is sent + * presence:notify-reply - after notify is sent The “attr” can be: * uri - subscription presentity uri @@ -1100,7 +1098,7 @@ if(handle_subscription()) Access the reply message received when notifying subscriber. It must be used in the following events. - * present:notify-reply - after notify is sent + * presence:notify-reply - after notify is sent The “attr” can be any pseudo var that accesses attributes of msg @@ -1114,9 +1112,9 @@ event_route[presence:notify-reply] 7. Events - 7.1. present:notify-reply + 7.1. presence:notify-reply -7.1. present:notify-reply +7.1. presence:notify-reply Fired after notify reply is received or timeout. diff --git a/src/modules/rls/README b/src/modules/rls/README index 38b670594c..677046344c 100644 --- a/src/modules/rls/README +++ b/src/modules/rls/README @@ -602,6 +602,8 @@ For rls only: 4.2. rls_handle_notify() + Handle NOTIFY requests. + This function can be used from REQUEST_ROUTE. Example 1.27. rls_handle_notify usage

1 0

git:master:8a909021: presence: docs - aligned examples to avoid large whitespacing
by Daniel-Constantin Mierla 21 Jun '19

21 Jun '19

Module: kamailio Branch: master Commit: 8a909021ccccc321b06b3437d124978bd901ab18 URL: https://github.com/kamailio/kamailio/commit/8a909021ccccc321b06b3437d124978… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-21T11:08:12+02:00 presence: docs - aligned examples to avoid large whitespacing --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8a909021ccccc321b06b3437d124978… Patch: https://github.com/kamailio/kamailio/commit/8a909021ccccc321b06b3437d124978… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 769e30be79..3ff750d633 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -192,10 +192,10 @@ modparam("presence", "clean_period", 100) <example> <title>Set <varname>cseq_offset</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("presence", "cseq_offset", 1) - ... - </programlisting> +... +modparam("presence", "cseq_offset", 1) +... +</programlisting> </example> </section> <section id="presence.p.db_update_period"> @@ -422,10 +422,10 @@ modparam("presence", "max_expires", 3600) <example> <title>Set <varname>min_expires</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("presence", "min_expires", 1800) - ... - </programlisting> +... +modparam("presence", "min_expires", 1800) +... +</programlisting> </example> </section> @@ -895,10 +895,10 @@ modparam("presence", "retrieve_order_by", "priority, received_time") <example> <title>Set <varname>sip_uri_match</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("presence", "sip_uri_match", 1) - ... - </programlisting> +... +modparam("presence", "sip_uri_match", 1) +... +</programlisting> </example> </section> @@ -922,10 +922,10 @@ modparam("presence", "retrieve_order_by", "priority, received_time") <example> <title>Set <varname>enable_dmq</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("presence", "enable_dmq", 1) - ... - </programlisting> +... +modparam("presence", "enable_dmq", 1) +... +</programlisting> </example> </section> @@ -1087,11 +1087,11 @@ if (method=="MESSAGE") { <example> <title><function>pres_has_subscribers</function> usage</title> <programlisting format="linespecific"> - ... - if(pres_has_subscribers($var(uri), "message-summary")) - do something...; - ... - </programlisting> +... +if(pres_has_subscribers($var(uri), "message-summary")) + # do something...; +... +</programlisting> </example> </section> @@ -1208,7 +1208,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); ... &kamcmd; presence.cleanup ... - </programlisting> +</programlisting> </section> <section id="presence.r.refreshWatchers"> <title>presence.refreshWatchers</title> @@ -1264,7 +1264,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); ... &kamcmd; presence.refreshWatchers sip:test@kamailio.org presence 1 ... - </programlisting> +</programlisting> </section> </section> @@ -1399,7 +1399,7 @@ if(handle_subscription()) xlog("presentity=$subs(uri)\n"); } ... - </programlisting> +</programlisting> </example> </section> @@ -1428,7 +1428,7 @@ event_route[presence:notify-reply] xlog("received message = $notify_reply($mb)\n"); } ... - </programlisting> +</programlisting> </example> </section> </section> @@ -1450,7 +1450,7 @@ event_route[presence:notify-reply] xlog("received message = $notify_reply($mb)\n"); } ... - </programlisting> +</programlisting> </example> </section> </section>

1 0

git:master:f005e2ed: presence: docs - fixed name for event route presence:notify-reply
by Daniel-Constantin Mierla 20 Jun '19

20 Jun '19

Module: kamailio Branch: master Commit: f005e2edca8fef350546cb743bf1cb51ee4ddd8d URL: https://github.com/kamailio/kamailio/commit/f005e2edca8fef350546cb743bf1cb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-20T20:35:04+02:00 presence: docs - fixed name for event route presence:notify-reply --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f005e2edca8fef350546cb743bf1cb5… Patch: https://github.com/kamailio/kamailio/commit/f005e2edca8fef350546cb743bf1cb5… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index c535553089..769e30be79 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1283,7 +1283,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); </para> </listitem> <listitem> - <para><emphasis>present:notify-reply</emphasis> - after notify is sent + <para><emphasis>presence:notify-reply</emphasis> - after notify is sent </para> </listitem> </itemizedlist> @@ -1410,7 +1410,7 @@ if(handle_subscription()) It must be used in the following events. <itemizedlist> <listitem> - <para><emphasis>present:notify-reply</emphasis> - after notify is sent + <para><emphasis>presence:notify-reply</emphasis> - after notify is sent </para> </listitem> </itemizedlist> @@ -1436,7 +1436,7 @@ event_route[presence:notify-reply] <section> <title>Events</title> <section> - <title><varname>present:notify-reply</varname></title> + <title><varname>presence:notify-reply</varname></title> <para> Fired after notify reply is received or timeout. </para>

1 0

git:master:50dfec2f: rls: docs - added section ids
by Daniel-Constantin Mierla 20 Jun '19

20 Jun '19

Module: kamailio Branch: master Commit: 50dfec2f2b7a467afe7c935524d0d385e9018f02 URL: https://github.com/kamailio/kamailio/commit/50dfec2f2b7a467afe7c935524d0d38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-20T11:01:09+02:00 rls: docs - added section ids --- Modified: src/modules/rls/doc/rls_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/50dfec2f2b7a467afe7c935524d0d38… Patch: https://github.com/kamailio/kamailio/commit/50dfec2f2b7a467afe7c935524d0d38…

1 0

git:master:08bf7784: presence_xml: removed extra semicolon
by Daniel-Constantin Mierla 20 Jun '19

20 Jun '19

Module: kamailio Branch: master Commit: 08bf7784ea497a78baa63445dd1404dca0abec9d URL: https://github.com/kamailio/kamailio/commit/08bf7784ea497a78baa63445dd1404d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-20T11:00:37+02:00 presence_xml: removed extra semicolon --- Modified: src/modules/presence_xml/xcap_auth.c --- Diff: https://github.com/kamailio/kamailio/commit/08bf7784ea497a78baa63445dd1404d… Patch: https://github.com/kamailio/kamailio/commit/08bf7784ea497a78baa63445dd1404d… --- diff --git a/src/modules/presence_xml/xcap_auth.c b/src/modules/presence_xml/xcap_auth.c index fe05ffe392..0cded997e2 100644 --- a/src/modules/presence_xml/xcap_auth.c +++ b/src/modules/presence_xml/xcap_auth.c @@ -115,7 +115,6 @@ int pres_watcher_allowed(subs_t *subs) } if(strncmp((char *)sub_handling, "block", 5) == 0) { subs->status = TERMINATED_STATUS; - ; subs->reason.s = "rejected"; subs->reason.len = 8; } else if(strncmp((char *)sub_handling, "confirm", 7) == 0) {

1 0

git:master:e9f24ff3: kamctl: fixed c&p error in version command matching
by Daniel-Constantin Mierla 19 Jun '19

19 Jun '19

Module: kamailio Branch: master Commit: e9f24ff3b974f4a2b6e93b6f8c3a3a5863763610 URL: https://github.com/kamailio/kamailio/commit/e9f24ff3b974f4a2b6e93b6f8c3a3a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-19T10:06:32+02:00 kamctl: fixed c&p error in version command matching --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/e9f24ff3b974f4a2b6e93b6f8c3a3a5… Patch: https://github.com/kamailio/kamailio/commit/e9f24ff3b974f4a2b6e93b6f8c3a3a5… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index a6dbd47a2b..aab756a191 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1791,7 +1791,7 @@ ksr_srv() { mecho "list server rpc commands" ctl_cmd_run system.listMethods ;; - rpclist) + version) require_ctlengine mecho "list server version" ctl_cmd_run core.version

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2019