sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
340 discussions

git:master:b241fc7e: tm: docs - clarifications about event routes
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: b241fc7e1d20098dd8b0666297303fe7255587e8 URL: https://github.com/kamailio/kamailio/commit/b241fc7e1d20098dd8b0666297303fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T09:17:18+02:00 tm: docs - clarifications about event routes --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/b241fc7e1d20098dd8b0666297303fe… Patch: https://github.com/kamailio/kamailio/commit/b241fc7e1d20098dd8b0666297303fe… --- diff --git a/src/modules/tm/doc/event_routes.xml b/src/modules/tm/doc/event_routes.xml index adda5536ed..b969695c9a 100644 --- a/src/modules/tm/doc/event_routes.xml +++ b/src/modules/tm/doc/event_routes.xml @@ -10,20 +10,20 @@ <section id="tm.e.branch-failure"> <title> - <function moreinfo="none">event_route[tm:branch-failure]</function> + <function moreinfo="none">event_route[tm:branch-failure:id]</function> </title> <para> Named branch failure routes can be defined to run when when a failure response is received. This allows handling failures on individual branches, for example, retrying an alternative outbound flow. </para> - <para> - The format of the event_route name is "tm:branch-failure:<name>" - and is enabled with the t_on_branch_failure function. - This event_route uses the BRANCH_FAILURE_ROUTE route type. - </para> + <para> + The format of the event_route name is "tm:branch-failure:<id>" + and is enabled with the t_on_branch_failure function. + This event_route uses the BRANCH_FAILURE_ROUTE route type. + </para> <example> - <title><function>event_route[tm:branch-failure]</function> usage</title> + <title><function>event_route[tm:branch-failure:id]</function> usage</title> <programlisting> ... request_route { @@ -44,7 +44,17 @@ event_route[tm:branch-failure:myroute] { <function moreinfo="none">event_route[tm:local-request]</function> </title> <para> - Executed after the tm module has sent a local generated, transaction stateful request. + Executed when the tm module generates a request, in other words, + the request originates from &kamailio; and a transaction is created + for it. The source of the requests can be tm itself or other modules + that use tm internally (e.g., msilo, uac). The event route is executed + if it is defined in the native &kamailio; config file. To execute + the equivalent callback when using KEMI scripting, see the + 'event_callback' module parameter. + </para> + <para> + The request can still be updated, i.e., changes are possible to + R-URI ($ru), destination URI ($du) or the send socket ($fs). </para> <example> <title><function>event_route[tm:local-request]</function> usage</title> @@ -63,7 +73,8 @@ event_route [tm:local-request] { <function moreinfo="none">event_route[tm:local-response]</function> </title> <para> - Executed after the tm module has sent a local generated, transaction stateful response. + Executed when the tm module is about to send a local generated, + transaction stateful response. </para> <example> <title><function>event_route[tm:local-response]</function> usage</title>

1 0

[kamailio/kamailio] pkg/kamailio/alpine: packaged MongoDB module (#2000)
by sergey-safarov 27 Aug '19

27 Aug '19

#### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ x Related to issue #1995 #### Description Packaged MongoDB driver for Alpine dist Need wait utils merged [PR for alpine dist](https://github.com/alpinelinux/aports/pull/9273) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2000 -- Commit Summary -- * pkg/kamailio/alpine: packaged MongoDB module [skip ci] -- File Changes -- M pkg/kamailio/alpine/APKBUILD (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2000.patch https://github.com/kamailio/kamailio/pull/2000.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/2000

2 3

git:master:fa7e915b: pkg/kamailio/alpine: packaged MongoDB module [skip ci]
by sergey-safarov 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: fa7e915b31965709be6549076f70ff6a65817db0 URL: https://github.com/kamailio/kamailio/commit/fa7e915b31965709be6549076f70ff6… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: sergey-safarov <s.safarov(a)gmail.com> Date: 2019-08-27T09:44:21+03:00 pkg/kamailio/alpine: packaged MongoDB module [skip ci] --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/fa7e915b31965709be6549076f70ff6… Patch: https://github.com/kamailio/kamailio/commit/fa7e915b31965709be6549076f70ff6… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index d82f5a8279..74a6566248 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -31,7 +31,7 @@ makedepends="bison db-dev flex freeradius-client-dev expat-dev confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev - ruby-dev libmaxminddb-dev libunistring-dev" + ruby-dev libmaxminddb-dev libunistring-dev mongo-c-driver-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -253,7 +253,7 @@ _modules="$_module_group_kstandard" for _i in db postgres sqlite dbtext mysql \ cpl xml unixodbc snmpstats xmpp carrierroute \ ldap utils tls presence lua ims outbound debugger \ - extras json websocket authephemeral \ + extras json websocket authephemeral mongodb\ uuid ev memcached redis geoip2 jansson sqlang sipdump \ jsdt http_async kazoo rabbitmq sctp radius perl python \ python3 ruby; do @@ -499,6 +499,11 @@ memcached() { "$_mod_list_memcached" } +mongodb() { + _generic_pkg "MongoDB database connectivity" \ + "$_mod_list_mongodb" +} + rabbitmq() { _generic_pkg "RabbitMQ client for configuration file" \ "$_mod_list_rabbitmq"

1 0

git:master:6b52ccc6: pkg/docker: updated submodule
by Sergey Safarov 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 6b52ccc6176da328205dafcde55a34af59f1729e URL: https://github.com/kamailio/kamailio/commit/6b52ccc6176da328205dafcde55a34a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-08-27T09:40:52+03:00 pkg/docker: updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/6b52ccc6176da328205dafcde55a34a… Patch: https://github.com/kamailio/kamailio/commit/6b52ccc6176da328205dafcde55a34a… --- diff --git a/pkg/docker b/pkg/docker index b92a1c899b..424756ff7a 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 +Subproject commit 424756ff7aca572466a99059f76d44ce57e01646

1 0

[kamailio/kamailio] rtpengine module set_rtpengine_set(set1, set2) issue (#2039)
by juha-h 26 Aug '19

26 Aug '19

My Kamailio master based test sip proxy has two rtpengine sets: ``` # sip-proxy_ctl rtpengine.show all { url: udp:192.26.134.1:6050 set: 0 index: 0 weight: 1 disabled: 0 recheck_ticks: 0 } { url: udp:192.26.134.40:6050 set: 1 index: 1 weight: 1 disabled: 0 recheck_ticks: 0 } ``` Config calls set_rtpengine_set() with two set argument followed by rtpengine_offer(): ``` set_rtpengine_set("1", "0"); rtpengine_offer("..."); ``` Debug shows that sip proxy sends TWO offer commands to the rtpproxy in the first set 1 and NONE to the rtpproxy in the second set 0. Debug at set 1 engine: ``` Aug 19 18:06:08 buster-10-0 rtpengine[1314]: NOTICE: [5e1407211cc50fd9]: Creating new call Aug 19 18:06:08 buster-10-0 rtpengine[1314]: INFO: [5e1407211cc50fd9]: Replying to 'offer' from 192.26.134.1:33284 (elapsed time 0.000812 sec) Aug 19 18:06:08 buster-10-0 rtpengine[1314]: INFO: [5e1407211cc50fd9]: Received command 'offer' from 192.26.134.1:33284 Aug 19 18:06:08 buster-10-0 rtpengine[1314]: INFO: [5e1407211cc50fd9]: Replying to 'offer' from 192.26.134.1:33284 (elapsed time 0.005247 sec) ``` This looks like a bug to me, since according to README, rtpengine should first send the offer to an engine in the first set and then to an engine in the second set. -- 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/2039

1 5

[kamailio/kamailio] modules/rtpengine: set_rtpengine_set fix (#2040)
by juha-h 26 Aug '19

26 Aug '19

WIthout this fix, set_rtpengine_set(set1, set2) sets set1 twice and set2 not at all. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2040 -- Commit Summary -- * modules/rtpengine: set_rtpengine_set fix -- File Changes -- M src/modules/rtpengine/rtpengine.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2040.patch https://github.com/kamailio/kamailio/pull/2040.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/2040

3 5

git:master:e4edf538: Merge pull request #2040 from kamailio/set_rtpengine_set
by GitHub 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: e4edf53858c399e5a3e635d04725a8a137523d15 URL: https://github.com/kamailio/kamailio/commit/e4edf53858c399e5a3e635d04725a8a… Author: juha-h <jh(a)tutpro.com> Committer: GitHub <noreply(a)github.com> Date: 2019-08-26T21:43:53+03:00 Merge pull request #2040 from kamailio/set_rtpengine_set modules/rtpengine: set_rtpengine_set fix --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e4edf53858c399e5a3e635d04725a8a… Patch: https://github.com/kamailio/kamailio/commit/e4edf53858c399e5a3e635d04725a8a… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7a6b73d747..6e436083ec 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3079,6 +3079,15 @@ select_rtpp_node_old(str callid, str viabranch, int do_test, enum rtpe_operation return node; } +unsigned int node_in_set(struct rtpp_node *node, struct rtpp_set *set) { + struct rtpp_node *current = set->rn_first; + while (current) { + if (current->idx == node->idx) return 1; + current = current->rn_next; + } + return 0; +} + /* * Main balancing routine. This DO try to keep the same proxy for * the call if some proxies were disabled or enabled (e.g. kamctl command) @@ -3107,7 +3116,7 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer node = select_rtpp_node_old(callid, viabranch, do_test, op); // check node - if (!node) { + if (!node || (node_in_set(node, active_rtpp_set) == 0)) { // run the selection algorithm node = select_rtpp_node_new(callid, viabranch, do_test, queried_nodes_ptr, queried_nodes);

1 0

git:master:fe6614fe: modules/rtpengine: set_rtpengine_set fix
by Juha Heinanen 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: fe6614feb5f9b062a556de82fd7df6fc12c96471 URL: https://github.com/kamailio/kamailio/commit/fe6614feb5f9b062a556de82fd7df6f… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2019-08-23T10:05:33+03:00 modules/rtpengine: set_rtpengine_set fix --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/fe6614feb5f9b062a556de82fd7df6f… Patch: https://github.com/kamailio/kamailio/commit/fe6614feb5f9b062a556de82fd7df6f… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7a6b73d747..6e436083ec 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3079,6 +3079,15 @@ select_rtpp_node_old(str callid, str viabranch, int do_test, enum rtpe_operation return node; } +unsigned int node_in_set(struct rtpp_node *node, struct rtpp_set *set) { + struct rtpp_node *current = set->rn_first; + while (current) { + if (current->idx == node->idx) return 1; + current = current->rn_next; + } + return 0; +} + /* * Main balancing routine. This DO try to keep the same proxy for * the call if some proxies were disabled or enabled (e.g. kamctl command) @@ -3107,7 +3116,7 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer node = select_rtpp_node_old(callid, viabranch, do_test, op); // check node - if (!node) { + if (!node || (node_in_set(node, active_rtpp_set) == 0)) { // run the selection algorithm node = select_rtpp_node_new(callid, viabranch, do_test, queried_nodes_ptr, queried_nodes);

1 0

git:master:78a62e19: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: 78a62e19955ada9d67245031780bad29035b0ef2 URL: https://github.com/kamailio/kamailio/commit/78a62e19955ada9d67245031780bad2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-26T16:02:22+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/78a62e19955ada9d67245031780bad2… Patch: https://github.com/kamailio/kamailio/commit/78a62e19955ada9d67245031780bad2… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index d9643f2ce1..47598f379e 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1161,8 +1161,11 @@ modparam("tm", "reparse_on_dns_failover", 0) Sets reply route block, to which control is passed when a reply is received that has no associated transaction. The reply is passed to the - core for stateless forwarding after the route block execution unless it - returns 0. + core for stateless forwarding after the route block execution unless + drop is executed (or it returns 0). + + If KEMI is used, the parameter has to be the KEMI function name, which + receives a string parameter with the event name. Example 1.24. Set on_sl_reply parameter ...

1 0

git:master:fa3c97a3: tm: docs - note about kemi for on_sl_reply parameter
by Daniel-Constantin Mierla 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: fa3c97a331b06ea675e830f418771e94375216cc URL: https://github.com/kamailio/kamailio/commit/fa3c97a331b06ea675e830f418771e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-26T15:52:29+02:00 tm: docs - note about kemi for on_sl_reply parameter --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/fa3c97a331b06ea675e830f418771e9… Patch: https://github.com/kamailio/kamailio/commit/fa3c97a331b06ea675e830f418771e9… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index c7923d8c25..e17137c0cd 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -711,7 +711,11 @@ modparam("tm", "reparse_on_dns_failover", 0) Sets reply route block, to which control is passed when a reply is received that has no associated transaction. The reply is passed to the core for stateless forwarding after - the route block execution unless it returns 0. + the route block execution unless drop is executed (or it returns 0). + </para> + <para> + If KEMI is used, the parameter has to be the KEMI function name, which + receives a string parameter with the event name. </para> <example> <title>Set <varname>on_sl_reply</varname> parameter</title> @@ -727,7 +731,7 @@ onreply_route["stateless_replies"] { </programlisting> </example> </section> - + <section id ="tm.p.contacts_avp"> <title><varname>contacts_avp</varname> (string)</title> <para>

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019