sr-dev March 2019

sr-dev@lists.kamailio.org

28 participants
322 discussions

git:5.2:ded4f064: core: allow pvar resolve in subsdef
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: 5.2 Commit: ded4f064602d54bdb42b0bde15dda1b886009cd0 URL: https://github.com/kamailio/kamailio/commit/ded4f064602d54bdb42b0bde15dda1b… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:08:50+03:00 core: allow pvar resolve in subsdef --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/ded4f064602d54bdb42b0bde15dda1b… Patch: https://github.com/kamailio/kamailio/commit/ded4f064602d54bdb42b0bde15dda1b… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index d15e0f899e..901c7dc04f 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -32,6 +32,7 @@ #include "dprint.h" #include "ppcfg.h" +#include "fmsg.h" typedef struct _pp_subst_rule { char *indata; @@ -184,7 +185,8 @@ int pp_subst_run(char **data) i = 0; while(pr) { - result=subst_str(*data, 0, + sip_msg_t *fmsg = faked_msg_get_next(); + result=subst_str(*data, fmsg, (struct subst_expr*)pr->ppdata, 0); /* pkg malloc'ed result */ if(result!=NULL) {

1 0

git:master:356f9a83: pkg/kamailio/obs: Added phonenum package
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: master Commit: 356f9a837470434923165b7e3c627658b0c56b60 URL: https://github.com/kamailio/kamailio/commit/356f9a837470434923165b7e3c62765… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:01:02+03:00 pkg/kamailio/obs: Added phonenum package --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/356f9a837470434923165b7e3c62765… Patch: https://github.com/kamailio/kamailio/commit/356f9a837470434923165b7e3c62765… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 0252a19f75..e38d1b9770 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -17,6 +17,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -40,6 +41,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -63,6 +65,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -86,6 +89,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -109,6 +113,7 @@ %bcond_without memcached %bcond_with mongodb %bcond_without perl +%bcond_with phonenum %bcond_with rabbitmq %bcond_with redis %bcond_with ruby @@ -133,6 +138,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -156,6 +162,7 @@ %bcond_without memcached %bcond_with mongodb %bcond_without perl +%bcond_with phonenum %bcond_with rabbitmq %bcond_without redis %bcond_without ruby @@ -179,6 +186,7 @@ %bcond_with memcached %bcond_with mongodb %bcond_with perl +%bcond_with phonenum %bcond_with rabbitmq %bcond_with redis %bcond_with ruby @@ -202,6 +210,7 @@ %bcond_with memcached %bcond_without mongodb %bcond_without perl +%bcond_with phonenum %bcond_with rabbitmq %bcond_without redis %bcond_with ruby @@ -668,6 +677,19 @@ Perl extensions and database driver for Kamailio. %endif +%if %{with phonenum} +%package phonenum +Summary: Phonenum module the Kamailio +Group: %{PKGGROUP} +Requires: kamailio = %ver +Requires: libphonenumber +BuildRequires: libphonenumber-devel libicu-devel protobuf-devel + +%description phonenum +Phonenum module the Kamailio. +%endif + + %package postgresql Summary: PostgreSQL database connectivity for Kamailio Group: %{PKGGROUP} @@ -798,7 +820,6 @@ SCTP transport for Kamailio. Summary: Additional layer of security over our communications Group: %{PKGGROUP} Requires: kamailio = %ver -#BuildRequires: lksctp-tools-devel %description secfilter Additional layer of security over our communications. @@ -1106,6 +1127,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kmysql koutbound \ %if %{with perl} kperl \ +%endif +%if %{with phonenum} + kphonenum \ %endif kpostgres kpresence kpython kradius \ %if %{with redis} @@ -1183,6 +1207,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kmysql koutbound \ %if %{with perl} kperl \ +%endif +%if %{with phonenum} + kphonenum \ %endif kpostgres kpresence kpython kradius \ %if %{with redis} @@ -1855,6 +1882,14 @@ fi %endif +%if %{with phonenum} +%files phonenum +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.phonenum +%{_libdir}/kamailio/modules/phonenum.so +%endif + + %files postgresql %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.db_postgres

1 0

git:master:fc7d03a1: pkg/kamailio/obs: Added Fedora 30 packaging
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: master Commit: fc7d03a17c7d17dcaf11a3c5aa8bf4af7044b7ac URL: https://github.com/kamailio/kamailio/commit/fc7d03a17c7d17dcaf11a3c5aa8bf4a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:01:02+03:00 pkg/kamailio/obs: Added Fedora 30 packaging --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/fc7d03a17c7d17dcaf11a3c5aa8bf4a… Patch: https://github.com/kamailio/kamailio/commit/fc7d03a17c7d17dcaf11a3c5aa8bf4a… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7eba6e29d0..0252a19f75 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -71,6 +71,29 @@ %bcond_without xmlrpc %endif +%if 0%{?fedora} == 30 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without ims +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without mongodb +%bcond_without perl +%bcond_without rabbitmq +%bcond_without redis +%bcond_without ruby +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + %if 0%{?centos_ver} == 6 %define dist_name centos %define dist_version %{?centos} @@ -2087,7 +2110,7 @@ fi %changelog * Sat Mar 30 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 - - Added support of openSUSE:Leap:15.0, openSUSE:Leap:15.1 dists + - Added support of openSUSE:Leap:15.0, openSUSE:Leap:15.1 and Fedora 30 dists * Thu Feb 21 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 - Added secfilter package * Tue Dec 11 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-1

1 0

git:master:45f251ff: pkg/kamailio/obs: Added openSUSE:Leap:15.1 and 15.0 packaging
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: master Commit: 45f251ff673f1a26d184c9f42e6e492b73f57be0 URL: https://github.com/kamailio/kamailio/commit/45f251ff673f1a26d184c9f42e6e492… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:01:02+03:00 pkg/kamailio/obs: Added openSUSE:Leap:15.1 and 15.0 packaging --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/45f251ff673f1a26d184c9f42e6e492… Patch: https://github.com/kamailio/kamailio/commit/45f251ff673f1a26d184c9f42e6e492… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ed0736440a..7eba6e29d0 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1014,6 +1014,7 @@ ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 ln -s ../obs pkg/kamailio/opensuse/1315 ln -s ../obs pkg/kamailio/opensuse/1330 +ln -s ../obs pkg/kamailio/opensuse/1500 ln -s ../obs pkg/kamailio/opensuse/1550 ln -s ../obs pkg/kamailio/centos/6 ln -s ../obs pkg/kamailio/centos/7 @@ -2085,6 +2086,8 @@ fi %changelog +* Sat Mar 30 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 + - Added support of openSUSE:Leap:15.0, openSUSE:Leap:15.1 dists * Thu Feb 21 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 - Added secfilter package * Tue Dec 11 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-1 diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index 41bf5745bd..bec3a6b458 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -15,6 +15,14 @@ <path project="openSUSE:Leap:42.2:Update" repository="standard"/> <arch>x86_64</arch> </repository> + <repository name="openSUSE_Leap_15.1"> + <path project="openSUSE:Leap:15.1" repository="standard"/> + <arch>x86_64</arch> + </repository> + <repository name="openSUSE_Leap_15.0"> + <path project="openSUSE:Leap:15.0" repository="standard"/> + <arch>x86_64</arch> + </repository> <repository name="RHEL_7"> <path project="Fedora:EPEL:7" repository="RHEL"/> <arch>x86_64</arch>

1 0

git:master:df3bdbde: pkg/kamailio/obs: Fixed bogus date in spec file
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: master Commit: df3bdbdeec3b10df69defeec42a7449516110e31 URL: https://github.com/kamailio/kamailio/commit/df3bdbdeec3b10df69defeec42a7449… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:00:59+03:00 pkg/kamailio/obs: Fixed bogus date in spec file --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/df3bdbdeec3b10df69defeec42a7449… Patch: https://github.com/kamailio/kamailio/commit/df3bdbdeec3b10df69defeec42a7449… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7b2d2eb99c..ed0736440a 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2085,7 +2085,7 @@ fi %changelog -* Tue Feb 21 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 +* Thu Feb 21 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 - Added secfilter package * Tue Dec 11 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-1 - Added Ruby package

1 0

git:5.2:f66f2bec: app_lua: use 'us' instead of 'ms' in latency execution time logs
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: 5.2 Commit: f66f2bec4e3de50591e8257b36de695863e740d2 URL: https://github.com/kamailio/kamailio/commit/f66f2bec4e3de50591e8257b36de695… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T15:05:17+01:00 app_lua: use 'us' instead of 'ms' in latency execution time logs - the value is in microseconds (cherry picked from commit e8e115631a804de72a1ec9477e21289e9788744b) --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/f66f2bec4e3de50591e8257b36de695… Patch: https://github.com/kamailio/kamailio/commit/f66f2bec4e3de50591e8257b36de695… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index d223975f04..f44670360f 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1946,7 +1946,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) && lua_getinfo(L, "nSl", &dinfo)>0) { LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms] (%s:%d - %s [%s])\n", + " took too long [%u us] (%s:%d - %s [%s])\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff, @@ -1957,7 +1957,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) } else { LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms]\n", + " took too long [%u us]\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff);

1 0

git:master:e8e11563: app_lua: use 'us' instead of 'ms' in latency execution time logs
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: e8e115631a804de72a1ec9477e21289e9788744b URL: https://github.com/kamailio/kamailio/commit/e8e115631a804de72a1ec9477e21289… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T15:02:47+01:00 app_lua: use 'us' instead of 'ms' in latency execution time logs - the value is in microseconds --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/e8e115631a804de72a1ec9477e21289… Patch: https://github.com/kamailio/kamailio/commit/e8e115631a804de72a1ec9477e21289… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 72cbc7180b..9334a67835 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1956,7 +1956,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) && lua_getinfo(L, "nSl", &dinfo)>0) { LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms] (%s:%d - %s [%s])\n", + " took too long [%u us] (%s:%d - %s [%s])\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff, @@ -1967,7 +1967,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) } else { LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms]\n", + " took too long [%u us]\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff);

1 0

[kamailio/kamailio] Small notes on $http_req(timeout) usage. (#1913)
by Igor Olhovskiy 29 Mar '19

29 Mar '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Just small notes on $http_req(timeout) usage. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1913 -- Commit Summary -- * Notes on use http_req(timeout) * Typo * Fix README -- File Changes -- M src/modules/http_async_client/doc/http_async_client_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1913.patch https://github.com/kamailio/kamailio/pull/1913.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/1913

3 9

git:master:278fd5a8: tcpops: set tcp keepalive values when available per option
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 278fd5a892c14f23e9f2b8d1f3fd3232c1d319f3 URL: https://github.com/kamailio/kamailio/commit/278fd5a892c14f23e9f2b8d1f3fd323… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:15:17+01:00 tcpops: set tcp keepalive values when available per option - cover macos and *bsd for couple of options --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/278fd5a892c14f23e9f2b8d1f3fd323… Patch: https://github.com/kamailio/kamailio/commit/278fd5a892c14f23e9f2b8d1f3fd323… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 9abf34af6e..3f66958b6c 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -130,8 +130,13 @@ int tcpops_acquire_fd_from_tcpmain(int conid, int *fd) return 0; } -#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPIDLE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL) - #warning "TCP keepalive is not fully supported by your platform" +#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL) + #define KSR_TCPOPS_NOKEEPALIVE +#endif + +#ifdef KSR_TCPOPS_NOKEEPALIVE + +#warning "TCP keepalive options not supported by this platform" int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd) { @@ -144,6 +149,7 @@ int tcpops_keepalive_disable(int fd, int closefd) LM_ERR("tcp_keepalive_disable() failed: this module does not support your platform\n"); return -1; } + #else int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd) @@ -156,11 +162,15 @@ int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int close LM_ERR("failed to enable SO_KEEPALIVE: %s\n", strerror(errno)); return -1; } else { - +#ifdef HAVE_TCP_KEEPIDLE if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(idle))<0){ LM_ERR("failed to set keepalive idle interval: %s\n", strerror(errno)); } +#else + #warning "TCP_KEEPIDLE option not supported by this platform" + LM_DBG("TCP_KEEPIDLE option not available - ignoring\n"); +#endif if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(count))<0){

1 0

git:master:c3632f5d: modules: readme files regenerated - http_async_client ... [skip ci]
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: c3632f5d37e3d1ecc9232491c0ec18ccca24f612 URL: https://github.com/kamailio/kamailio/commit/c3632f5d37e3d1ecc9232491c0ec18c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:15:17+01:00 modules: readme files regenerated - http_async_client ... [skip ci] --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/c3632f5d37e3d1ecc9232491c0ec18c… Patch: https://github.com/kamailio/kamailio/commit/c3632f5d37e3d1ecc9232491c0ec18c… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index 1f4540b69e..f2afe6325d 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -425,7 +425,9 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); * method: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified) - * timeout: sets the HTTP timeout + * timeout: sets the HTTP timeout. (Note, this timeout should be + normally less than tm.fr_timer timeout, because transaction timeout + has a higher priority over HTTP timeout) * tls_client_cert: sets the client certificate to use * tls_client_key: sets the client certificate key to use * tls_ca_path: sets the CA certificate path to use

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2019