sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
339 discussions

[kamailio/kamailio] pkg/kamailio/alpine: packaged MongoDB module (#2000)

by sergey-safarov

#### 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

5 years, 2 months

git:master:fa7e915b: pkg/kamailio/alpine: packaged MongoDB module [skip ci]

by sergey-safarov

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"

5 years, 2 months

git:master:6b52ccc6: pkg/docker: updated submodule

by Sergey Safarov

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

5 years, 2 months

[kamailio/kamailio] rtpengine module set_rtpengine_set(set1, set2) issue (#2039)

by juha-h

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

5 years, 2 months

[kamailio/kamailio] modules/rtpengine: set_rtpengine_set fix (#2040)

by juha-h

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

5 years, 2 months

git:master:e4edf538: Merge pull request #2040 from kamailio/set_rtpengine_set

by GitHub

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);

5 years, 2 months

git:master:fe6614fe: modules/rtpengine: set_rtpengine_set fix

by Juha Heinanen

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);

5 years, 2 months

git:master:78a62e19: modules: readme files regenerated - tm ... [skip ci]

by Kamailio Dev

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 ...

5 years, 2 months

git:master:fa3c97a3: tm: docs - note about kemi for on_sl_reply parameter

by Daniel-Constantin Mierla

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>

5 years, 2 months

git:master:ce661240: tm: execute on_sl_reply callback via kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ce6612402f122d38878834f7da70ebf75c12b37b URL: https://github.com/kamailio/kamailio/commit/ce6612402f122d38878834f7da70ebf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-26T15:49:42+02:00 tm: execute on_sl_reply callback via kemi - the value of the parameter on_sl_reply has to be the kemi function name --- Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/ce6612402f122d38878834f7da70ebf… Patch: https://github.com/kamailio/kamailio/commit/ce6612402f122d38878834f7da70ebf… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 1fa7f9dda8..30006ae8a6 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2162,7 +2162,6 @@ enum rps local_reply( struct cell *t, struct sip_msg *p_msg, int branch, */ int reply_received( struct sip_msg *p_msg ) { - int msg_status; int last_uac_status; char *ack; @@ -2192,6 +2191,8 @@ int reply_received( struct sip_msg *p_msg ) struct run_act_ctx ctx; struct run_act_ctx *bctx; sr_kemi_eng_t *keng = NULL; + int ret; + str evname = str_init("on_sl_reply"); /* make sure we know the associated transaction ... */ branch = T_BR_UNDEFINED; @@ -2566,17 +2567,40 @@ int reply_received( struct sip_msg *p_msg ) trans_not_found: /* transaction context was not found */ - if (goto_on_sl_reply) { - /* The script writer has a chance to decide whether to - * forward the reply or not. - * Pre- and post-script callbacks have already - * been execueted by the core. (Miklos) - */ - return run_top_route(onreply_rt.rlist[goto_on_sl_reply], p_msg, 0); - } else { - /* let the core forward the reply */ - return 1; + if(on_sl_reply_name.s!=NULL && on_sl_reply_name.len>0) { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + if (goto_on_sl_reply) { + /* The script writer has a chance to decide whether to + * forward the reply or not. + * Pre- and post-script callbacks have already + * been execueted by the core. (Miklos) + */ + return run_top_route(onreply_rt.rlist[goto_on_sl_reply], p_msg, 0); + } else { + /* let the core forward the reply */ + return 1; + } + } else { + bctx = sr_kemi_act_ctx_get(); + init_run_actions_ctx(&ctx); + sr_kemi_act_ctx_set(&ctx); + ret = sr_kemi_ctx_route(keng, &ctx, p_msg, EVENT_ROUTE, + &on_sl_reply_name, &evname); + sr_kemi_act_ctx_set(bctx); + if(ret<0) { + LM_ERR("error running on sl reply callback\n"); + return -1; + } + if(unlikely(ctx.run_flags & DROP_R_F)) { + LM_DBG("drop flag set - skip forwarding the reply\n"); + return 0; + } + /* let the core forward the reply */ + return 1; + } } + return 1; } diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 105bbaf1f2..99e20afcd3 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -689,6 +689,8 @@ static int script_init( struct sip_msg *foo, unsigned int flags, void *bar) static int mod_init(void) { + sr_kemi_eng_t *keng = NULL; + DBG( "TM - (sizeof cell=%ld, sip_msg=%ld) initializing...\n", (long)sizeof(struct cell), (long)sizeof(struct sip_msg)); @@ -701,10 +703,13 @@ static int mod_init(void) } if(on_sl_reply_name.s!=NULL && on_sl_reply_name.len>0) { - goto_on_sl_reply=route_get(&onreply_rt, on_sl_reply_name.s); - if (goto_on_sl_reply==-1){ - LM_ERR("route get failed for on_sl_reply\n"); - return -1; + keng = sr_kemi_eng_get(); + if(keng==NULL) { + goto_on_sl_reply=route_get(&onreply_rt, on_sl_reply_name.s); + if (goto_on_sl_reply==-1){ + LM_ERR("route get failed for on_sl_reply\n"); + return -1; + } } } if (init_callid() < 0) {

5 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019