Re: [sr-dev] [kamailio/kamailio] Problem with topos together with track_cseq_updates (#1038)
I was not able to identify a dedicated fix with this issue. The best would be if you try to reproduce it with the newest release in the 5.1 branch or (even better) with current master. -- 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/1038#issuecomment-369732286___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:41156083: README.md: change kamailio twitter handle to the new one
Module: kamailio Branch: master Commit: 4115608372a2a5c7c1c97067ecc8fbd2f07c1026 URL: https://github.com/kamailio/kamailio/commit/4115608372a2a5c7c1c97067ecc8fbd2f07c1026 Author: Henning WesterholtCommitter: Henning Westerholt Date: 2018-03-01T21:40:05+01:00 README.md: change kamailio twitter handle to the new one --- Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/4115608372a2a5c7c1c97067ecc8fbd2f07c1026.diff Patch: https://github.com/kamailio/kamailio/commit/4115608372a2a5c7c1c97067ecc8fbd2f07c1026.patch --- diff --git a/README.md b/README.md index 6cc093737d..8005030775 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ An open IRC discussion channel is managed by the community: News: * https://www.kamailio.org/w/category/news/ - * Twitter @kamailioproject + * Twitter @kamailio ## Travis-CI - Testing Build Environment ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] sqlops: sqlops_do_query - Make result parameter optional in C API (#1467)
You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1467 -- Commit Summary -- * sqlops: sqlops_do_query - Make result parameter optional in C API -- File Changes -- M src/modules/sqlops/sql_api.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1467.patch https://github.com/kamailio/kamailio/pull/1467.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/1467 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] json: add new function json_get_string() to return string value witho… (#1466)
adds new function to resolve #1452 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1466 -- Commit Summary -- * json: add new function json_get_string() to return string value without quotes -- File Changes -- M src/modules/json/doc/json_admin.xml (19) M src/modules/json/json_funcs.c (20) M src/modules/json/json_funcs.h (7) M src/modules/json/json_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1466.patch https://github.com/kamailio/kamailio/pull/1466.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/1466 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:bf92f37d: ChangeLog: content prepared for v5.1.2
Module: kamailio Branch: 5.1 Commit: bf92f37d0b1bc02142c8e3a967510eb21fe31d65 URL: https://github.com/kamailio/kamailio/commit/bf92f37d0b1bc02142c8e3a967510eb21fe31d65 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-01T17:19:21+01:00 ChangeLog: content prepared for v5.1.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/bf92f37d0b1bc02142c8e3a967510eb21fe31d65.diff Patch: https://github.com/kamailio/kamailio/commit/bf92f37d0b1bc02142c8e3a967510eb21fe31d65.patch --- diff --git a/ChangeLog b/ChangeLog index 8e972a735d..70152dd6bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,16 @@ = Changes Since Version 5.1.1 === +commit fbea348d0b2a09a08a4a9de4e9ebf65f689d63c5 +Author: AnthonyA +Date: Thu Mar 1 21:28:21 2018 +0800 + +app_python: KEMI accept int-int-str for t_continue + +- t_continue() needs int-int-str arguments; enable in apy_kemi.c + +(cherry picked from commit 0ca711665e1299269ca2ca1e566af6e40749f22a) + commit e4b76b0eb7637e404611b28dad1f063f1433bc9e Author: Daniel-Constantin Mierla Date: Thu Mar 1 16:40:18 2018 +0100 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:fbea348d: app_python: KEMI accept int-int-str for t_continue
Module: kamailio Branch: 5.1 Commit: fbea348d0b2a09a08a4a9de4e9ebf65f689d63c5 URL: https://github.com/kamailio/kamailio/commit/fbea348d0b2a09a08a4a9de4e9ebf65f689d63c5 Author: AnthonyACommitter: Daniel-Constantin Mierla Date: 2018-03-01T17:11:04+01:00 app_python: KEMI accept int-int-str for t_continue - t_continue() needs int-int-str arguments; enable in apy_kemi.c (cherry picked from commit 0ca711665e1299269ca2ca1e566af6e40749f22a) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/fbea348d0b2a09a08a4a9de4e9ebf65f689d63c5.diff Patch: https://github.com/kamailio/kamailio/commit/fbea348d0b2a09a08a4a9de4e9ebf65f689d63c5.patch --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index e221c1d9ac..79e55e3da3 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -288,6 +288,16 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) } LM_DBG("params[%d] for: %.*s are int-int-int: [%d] [%d] [%d]\n", i, fname.len, fname.s, vps[0].n, vps[1].n, vps[2].n); + } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR) { + if(!PyArg_ParseTuple(args, "iis:kemi-param-nns", [0].n, +[1].n, [2].s.s)) { + LM_ERR("unable to retrieve int-int-str params %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are int-int-str: [%d] [%d] [%.*s]\n", i, + fname.len, fname.s, vps[0].n, vps[1].n, vps[2].s.len, vps[2].s.s); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "isi:kemi-param-nsn", [0].n, ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] cannot load app_perl (#1465)
Issue not reproduce to when used `kamailio/kamailio:5.1.1-stretch` docker image. Think issue related to Alpine dist. -- 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/1465#issuecomment-369644312___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] cannot load app_perl (#1465)
### Description i wants load this [config](https://github.com/nemergent/NG112LIS/blob/master/kamailio.cfg) on docker image `kamailio/kamailio-ci:5.1-alpine.debug` During config parsing i got error 0(10) ERROR: [core/sr_module.c:636]: load_module(): Symbol not found: exports 0(10) CRITICAL: [core/cfg.y:3446]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 300, column 12-24: failed to load module ### Troubleshooting I checked symbol inside `app_perl.so` and cannot find `exports` ``` @a7c6ee5895f8:/usr/lib/kamailio/modules$ readelf -all /usr/lib/kamailio/modules/app_perl.so | grep export 00218d00 000b0006 R_X86_64_GLOB_DAT find_export + 0 00218db8 00210006 R_X86_64_GLOB_DAT find_export_record + 0 11: 0 NOTYPE GLOBAL DEFAULT UND find_export 33: 0 NOTYPE GLOBAL DEFAULT UND find_export_record 97: 002190c096 OBJECT GLOBAL DEFAULT 18 _app_perl_exports ``` When make same test for other module then this sympols is exists ``` @a7c6ee5895f8:/usr/lib/kamailio/modules$ readelf -all /usr/lib/kamailio/modules/kazoo.so | grep export 002586a8 00120006 R_X86_64_GLOB_DAT find_export + 0 18: 0 NOTYPE GLOBAL DEFAULT UND find_export 187: 0025926096 OBJECT GLOBAL DEFAULT 21 exports ``` Reproduction start docker container ``` docker run --entrypoint=sh -it kamailio/kamailio-ci:5.1-alpine.debug ``` install tools ``` apk add wget binutils ``` copy config ``` wget https://raw.githubusercontent.com/nemergent/NG112LIS/master/kamailio.cfg -o /etc/kamailio/kamailio.cfg ``` start kamaillio and fix errors ``` kamailio -DD -E ``` Debugging Data none Log Messages ``` 0(10) ERROR: [core/sr_module.c:636]: load_module(): Symbol not found: exports 0(10) CRITICAL: [core/cfg.y:3446]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 300, column 12-24: failed to load module 0(10) ERROR: [core/modparam.c:152]: set_mod_param_regex(): No module matching found ``` SIP Traffic none ### Possible Solutions not known ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` @a7c6ee5895f8:/usr/lib/kamailio/modules$ kamailio -v version: kamailio 5.2.0-dev1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 15:02:10 Mar 1 2018 with gcc 6.4.0 ``` * **Operating System**: Fedora 27 + docker 1.12 ``` Linux a7c6ee5895f8 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64 Linux ``` -- 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/1465___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] app_python: kemi accept int-int-str for t_continue (#1463)
Merged #1463. -- 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/1463#event-1499328323___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:0ca71166: app_python: KEMI accept int-int-str for t_continue
Module: kamailio Branch: master Commit: 0ca711665e1299269ca2ca1e566af6e40749f22a URL: https://github.com/kamailio/kamailio/commit/0ca711665e1299269ca2ca1e566af6e40749f22a Author: AnthonyACommitter: Daniel-Constantin Mierla Date: 2018-03-01T16:59:45+01:00 app_python: KEMI accept int-int-str for t_continue - t_continue() needs int-int-str arguments; enable in apy_kemi.c --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/0ca711665e1299269ca2ca1e566af6e40749f22a.diff Patch: https://github.com/kamailio/kamailio/commit/0ca711665e1299269ca2ca1e566af6e40749f22a.patch --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 6dba098ab7..9a683250de 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -265,6 +265,16 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) } LM_DBG("params[%d] for: %.*s are int-int-int: [%d] [%d] [%d]\n", i, fname.len, fname.s, vps[0].n, vps[1].n, vps[2].n); + } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR) { + if(!PyArg_ParseTuple(args, "iis:kemi-param-nns", [0].n, +[1].n, [2].s.s)) { + LM_ERR("unable to retrieve int-int-str params %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are int-int-str: [%d] [%d] [%.*s]\n", i, + fname.len, fname.s, vps[0].n, vps[1].n, vps[2].s.len, vps[2].s.s); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "isi:kemi-param-nsn", [0].n, ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:9aa1028a: ChangeLog: content updated for v5.1.2
Module: kamailio Branch: 5.1 Commit: 9aa1028a8d6da9ca9738ab814f9915de4b45bbd0 URL: https://github.com/kamailio/kamailio/commit/9aa1028a8d6da9ca9738ab814f9915de4b45bbd0 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-01T16:42:46+01:00 ChangeLog: content updated for v5.1.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/9aa1028a8d6da9ca9738ab814f9915de4b45bbd0.diff Patch: https://github.com/kamailio/kamailio/commit/9aa1028a8d6da9ca9738ab814f9915de4b45bbd0.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:e4b76b0e: Makefile.defs: version set to 5.1.2
Module: kamailio Branch: 5.1 Commit: e4b76b0eb7637e404611b28dad1f063f1433bc9e URL: https://github.com/kamailio/kamailio/commit/e4b76b0eb7637e404611b28dad1f063f1433bc9e Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-01T16:40:18+01:00 Makefile.defs: version set to 5.1.2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e4b76b0eb7637e404611b28dad1f063f1433bc9e.diff Patch: https://github.com/kamailio/kamailio/commit/e4b76b0eb7637e404611b28dad1f063f1433bc9e.patch --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5bfc0bf792..b7346a71fe 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 1 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory manager switcher ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:9ec0cc9d: pkg/rpms: updated version to 5.1.2 in spec files
Module: kamailio Branch: 5.1 Commit: 9ec0cc9d4a4ca70ce2ef13d6830cb5e30f4112c5 URL: https://github.com/kamailio/kamailio/commit/9ec0cc9d4a4ca70ce2ef13d6830cb5e30f4112c5 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-01T16:01:35+01:00 pkg/rpms: updated version to 5.1.2 in spec files --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/openbsd/Makefile Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE Modified: pkg/kamailio/solaris/pkginfo --- Diff: https://github.com/kamailio/kamailio/commit/9ec0cc9d4a4ca70ce2ef13d6830cb5e30f4112c5.diff Patch: https://github.com/kamailio/kamailio/commit/9ec0cc9d4a4ca70ce2ef13d6830cb5e30f4112c5.patch --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index d6df4c05a6..4a3538f927 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver5.1.1 +%define ver5.1.2 %define rel0%{dist} diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 147908d046..c0e030af4c 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,5 +1,5 @@ %define namekamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel dev6%{dist} %bcond_with dnssec diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 224094e16b..c6a8ce986f 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver5.1.1 +%define ver5.1.2 %define rel0%{dist} diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 68be69c6c8..23de6c2bc4 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define namekamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0%{dist} %if 0%{?fedora} == 25 diff --git a/pkg/kamailio/openbsd/Makefile b/pkg/kamailio/openbsd/Makefile index 3c8053f984..3c53ad1ef9 100644 --- a/pkg/kamailio/openbsd/Makefile +++ b/pkg/kamailio/openbsd/Makefile @@ -12,7 +12,7 @@ COMMENT-carrierroute =kamailio carrierroute module COMMENT-snmpstats =kamailio snmpstats module COMMENT-perl = kamailio perl modules -VERSION = 5.1.1 +VERSION = 5.1.2 DISTNAME = kamailio-${VERSION} PKGNAME-main = kamailio-${VERSION} PKGNAME-mysql =kamailio-mysql-${VERSION} diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 23f6de0c0c..1f89b9e128 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define namekamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index a0da154b3c..2b05409df5 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define namekamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index b6e3ef0282..6d9d1bc690 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define namekamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index dd5325ee76..a6d52e9513 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define namekamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index c679d99f22..bff991171c 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define namekamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops diff --git a/pkg/kamailio/solaris/pkginfo b/pkg/kamailio/solaris/pkginfo index 66f5c4cbc7..6b800c12c5 100644
Re: [sr-dev] Planing next Kamailio releases - v4.4.7 v5.0.6 and v5.1.2
Hello, I waited a bit longer today to see if the work on db_mongodb can be concluded for use with mongo server 3.6.x and now that is finished, so I am starting to package v5.1.2 very soon. Until the announcement is out, any commit to that branch should be announced first on sr-dev mailing list or irc channel and wait for an ack. Cheers, Daniel On 27.02.18 08:59, Daniel-Constantin Mierla wrote: > Hello, > > later today I am planning to release v5.0.6, so as usual, until the > announcement is sent, any commits to branch 5.0 should be announced on > sr-dev mailing list or ping me via irc #kamailio channel. > > The v5.1.2 likely to be released on Thursday. > > Cheers, > Daniel > > > On 26.02.18 09:06, Daniel-Constantin Mierla wrote: >> Hello, >> >> short message to say that I am planning to do v4.4.7 release later >> today. Until the release is out, any commits to branch 4.4 should be >> announced on sr-dev mailing list. >> >> Cheers, >> Daniel >> >> On 20.02.18 09:10, Daniel-Constantin Mierla wrote: >>> Hello, >>> >>> I am considering to do releases from last three stable branches during >>> next week. >>> >>> v4.4.7 is going to be released out of latest code in branch 4.4 to mark >>> the end of official maintenance for series v4.4.x. The version 4.4.0 was >>> released in March 2016, so it had more or less two years of maintenance. >>> Commits can still go in 4.4 branch if developers wants to push there, >>> end of official maintenance means that there is no plan to do packaging >>> and release another version from the branch in the future, so you will >>> have to build it from sources or generate packages yourself. >>> >>> v5.0.6 and v5.1.2 are the usual minor releases we do from the last two >>> stable branches. >>> >>> If there are any issues you are aware of and not reported on bug >>> tracker, create the items as soon as possible to get a better chance to >>> review and eventually fix. >>> >>> Cheers, >>> Daniel >>> -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - March 5-7, 2018, Berlin - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:49dee7f4: db_mongodb: use projection iterator to convert bson for result
Module: kamailio Branch: 5.1 Commit: 49dee7f498e1001ce3e29c1691a7ec322392baca URL: https://github.com/kamailio/kamailio/commit/49dee7f498e1001ce3e29c1691a7ec322392baca Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-01T15:52:38+01:00 db_mongodb: use projection iterator to convert bson for result (cherry picked from commit 899ab355fb58e22eaa02336e9b5b1f2f53dba375) --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/49dee7f498e1001ce3e29c1691a7ec322392baca.diff Patch: https://github.com/kamailio/kamailio/commit/49dee7f498e1001ce3e29c1691a7ec322392baca.patch --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index aba482d352..b1c9ac2bb7 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -506,6 +506,7 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, const char *colname; bson_type_t coltype; bson_iter_t riter; + bson_iter_t titer; bson_iter_t citer; bson_iter_t *piter; db_val_t* dval; @@ -520,14 +521,27 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, } if(mgres->colsdoc==NULL) { cdoc = (bson_t*)_rdoc; + if (!bson_iter_init (, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } } else { cdoc = (bson_t*)mgres->colsdoc; + if (!bson_iter_init (, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } + if(!bson_iter_find(, "projection") + || !BSON_ITER_HOLDS_DOCUMENT ()) { + LM_ERR("failed to find projection field\n"); + return -3; + } + if(!bson_iter_recurse (, )) { + LM_ERR("failed to init projection iterator\n"); + return -3; + } } - if (!bson_iter_init (, cdoc)) { - LM_ERR("failed to initialize columns iterator\n"); - return -3; - } if(mgres->colsdoc) { if (!bson_iter_init (, _rdoc)) { LM_ERR("failed to initialize result iterator\n"); ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:ece17dee: db_mongodb: iterate on projection fields for matching cols in result
Module: kamailio Branch: 5.1 Commit: ece17deeba435ed19c16fc2a227d351fd6013f86 URL: https://github.com/kamailio/kamailio/commit/ece17deeba435ed19c16fc2a227d351fd6013f86 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-01T15:52:29+01:00 db_mongodb: iterate on projection fields for matching cols in result (cherry picked from commit aab4f5db964bf1980729ed8b7770f550bb86b72b) --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/ece17deeba435ed19c16fc2a227d351fd6013f86.diff Patch: https://github.com/kamailio/kamailio/commit/ece17deeba435ed19c16fc2a227d351fd6013f86.patch --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index 1e790b8b9d..aba482d352 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -316,10 +316,12 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) int col; db_mongodb_result_t *mgres; bson_iter_t riter; + bson_iter_t titer; bson_iter_t citer; bson_t *cdoc; const char *colname; bson_type_t coltype; + int cdocproj; if ((!_h) || (!_r)) { LM_ERR("invalid parameter\n"); @@ -338,8 +340,10 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) return -1; } cdoc = mgres->rdoc; + cdocproj = 0; } else { cdoc = mgres->colsdoc; + cdocproj = 1; } RES_COL_N(_r) = mgres->nrcols; if (!RES_COL_N(_r)) { @@ -355,9 +359,25 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) return -3; } - if (!bson_iter_init (, cdoc)) { - LM_ERR("failed to initialize columns iterator\n"); - return -3; + if(cdocproj == 1) { + if (!bson_iter_init (, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } + if(!bson_iter_find(, "projection") + || !BSON_ITER_HOLDS_DOCUMENT ()) { + LM_ERR("failed to find projection field\n"); + return -3; + } + if(!bson_iter_recurse (, )) { + LM_ERR("failed to init projection iterator\n"); + return -3; + } + } else { + if (!bson_iter_init (, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } } if(mgres->colsdoc) { if (!bson_iter_init (, mgres->rdoc)) { ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:cc92737d: db_mongodb: create projection field to set the list of returned column
Module: kamailio Branch: 5.1 Commit: cc92737d06359d1812ec7bed22e4c253ae7ba2e9 URL: https://github.com/kamailio/kamailio/commit/cc92737d06359d1812ec7bed22e4c253ae7ba2e9 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-01T15:52:06+01:00 db_mongodb: create projection field to set the list of returned column (cherry picked from commit d50498cf483cd22ac4e62af5aaa86fc27654f640) --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/cc92737d06359d1812ec7bed22e4c253ae7ba2e9.diff Patch: https://github.com/kamailio/kamailio/commit/cc92737d06359d1812ec7bed22e4c253ae7ba2e9.patch --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index 57f11dc930..1e790b8b9d 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -825,6 +825,7 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op km_mongodb_con_t *mgcon; mongoc_client_t *client; bson_t *seldoc = NULL; + bson_t bcols; char *cname; char b1; char *jstr; @@ -904,14 +905,23 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op LM_ERR("cannot initialize columns bson document\n"); goto error; } + if(!bson_append_document_begin (mgcon->colsdoc, "projection", 10, + )) { + LM_ERR("failed to start projection of fields\n"); + goto error; + } for(i = 0; i < _nc; i++) { - if(!bson_append_int32(mgcon->colsdoc, _c[i]->s, _c[i]->len, 1)) + if(!bson_append_int32(, _c[i]->s, _c[i]->len, 1)) { LM_ERR("failed to append int to columns bson %.*s = %d [%d]\n", _c[i]->len, _c[i]->s, 1, i); goto error; } } + if(!bson_append_document_end (mgcon->colsdoc, )) { + LM_ERR("failed to end projection of fields\n"); + goto error; + } if(is_printable(L_DBG)) { jstr = bson_as_json (mgcon->colsdoc, NULL); LM_DBG("columns filter: %s\n", jstr); ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:3d3798d1: misc/examples: added log_prefix to basic and oob examples
Module: kamailio Branch: 5.1 Commit: 3d3798d192c782eb2c4796b758831a7a33ec1ac4 URL: https://github.com/kamailio/kamailio/commit/3d3798d192c782eb2c4796b758831a7a33ec1ac4 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-01T15:51:55+01:00 misc/examples: added log_prefix to basic and oob examples (cherry picked from commit b32c5fc2582bd590b4385f28630c96cacfed3a86) --- Modified: misc/examples/pkg/kamailio-basic.cfg Modified: misc/examples/pkg/kamailio-oob.cfg --- Diff: https://github.com/kamailio/kamailio/commit/3d3798d192c782eb2c4796b758831a7a33ec1ac4.diff Patch: https://github.com/kamailio/kamailio/commit/3d3798d192c782eb2c4796b758831a7a33ec1ac4.patch --- diff --git a/misc/examples/pkg/kamailio-basic.cfg b/misc/examples/pkg/kamailio-basic.cfg index c53fe8af5c..0ae1b16134 100644 --- a/misc/examples/pkg/kamailio-basic.cfg +++ b/misc/examples/pkg/kamailio-basic.cfg @@ -103,6 +103,7 @@ memdbg=5 memlog=5 log_facility=LOG_LOCAL0 +log_prefix="{$mt $hdr(CSeq) $ci} " fork=yes children=4 diff --git a/misc/examples/pkg/kamailio-oob.cfg b/misc/examples/pkg/kamailio-oob.cfg index c76d5c47d7..0e0206643f 100644 --- a/misc/examples/pkg/kamailio-oob.cfg +++ b/misc/examples/pkg/kamailio-oob.cfg @@ -157,6 +157,7 @@ memdbg=5 memlog=5 log_facility=LOG_LOCAL0 +log_prefix="{$mt $hdr(CSeq) $ci} " fork=yes children=4 @@ -171,7 +172,7 @@ children=4 /* add local domain aliases */ #alias="sip.mydomain.com" -/* uncomment and configure the following line if you want Kamailio to +/* uncomment and configure the following line if you want Kamailio to bind on a specific interface/port/proto (default bind on all available) */ #listen=udp:10.0.0.10:5060 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:654aa457: rtpengine: added support for DTLS transports
Module: kamailio Branch: 5.1 Commit: 654aa457ecec7d35061dbb151fd786a303cba473 URL: https://github.com/kamailio/kamailio/commit/654aa457ecec7d35061dbb151fd786a303cba473 Author: Jerzy PtakCommitter: Daniel-Constantin Mierla Date: 2018-03-01T10:28:34+01:00 rtpengine: added support for DTLS transports - added ability to explicitly request DTLS transports: UDP/TLS/RTP/SAVP and UDP/TLS/RTP/SAVPF (cherry picked from commit 99695c2827d0ff6e3d25f144678f07548016415d) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/654aa457ecec7d35061dbb151fd786a303cba473.diff Patch: https://github.com/kamailio/kamailio/commit/654aa457ecec7d35061dbb151fd786a303cba473.patch --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 4133eb93c2..9ae72a58bd 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2159,7 +2159,7 @@ rtpengine_offer(); substitutions (c=, m=, etc) are unaffected by this flag. - RTP, SRTP, AVP, AVPF - These flags control the + RTP, SRTP, DTLS, AVP, AVPF - These flags control the transport protocol that should be used towards the recipient of the . If none of them are specified, the protocol given in the is left untouched. Otherwise, the SRTP flag indicates that @@ -2169,8 +2169,8 @@ rtpengine_offer(); should be used. See also the next set of flags below. - RTP/AVP, RTP/SAVP, RTP/AVPF, RTP/SAVPF - these serve as - an alternative, more explicit way to select between the different protocols + RTP/AVP, RTP/SAVP, UDP/TLS/RTP/SAVP, RTP/AVPF, RTP/SAVPF, UDP/TLS/RTP/SAVPF - these + serve as an alternative, more explicit way to select between the different protocols and profiles supported by the proxy. For example, giving the flag RTP/SAVPF has the same effect as giving the two flags SRTP AVPF. diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 1b3429d3cd..3d4d17718a 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1871,6 +1871,8 @@ static const char *transports[] = { [0x01] = "RTP/SAVP", [0x02] = "RTP/AVPF", [0x03] = "RTP/SAVPF", + [0x04] = "UDP/TLS/RTP/SAVP", + [0x06] = "UDP/TLS/RTP/SAVPF", }; static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enum rtpe_operation *op, @@ -1946,6 +1948,8 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu ng_flags->transport |= 0x101; else if (str_eq(, "AVPF")) ng_flags->transport |= 0x102; + else if (str_eq(, "DTLS")) + ng_flags->transport |= 0x104; else goto generic; goto next; @@ -2048,6 +2052,23 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu goto next; } break; + + case 16: + if (str_eq(, "UDP/TLS/RTP/SAVP")) + ng_flags->transport = 0x104; + else + goto generic; + goto next; + break; + + case 17: + if (str_eq(, "UDP/TLS/RTP/SAVPF")) + ng_flags->transport = 0x106; + else + goto generic; + goto next; + break; + } generic: @@ -2148,7 +2169,7 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ bencode_dictionary_add(ng_flags.dict, "replace", ng_flags.replace); if ((ng_flags.transport & 0x100)) bencode_dictionary_add_string(ng_flags.dict, "transport-protocol", -
Re: [sr-dev] [kamailio/kamailio] Strange behaviour with JSON module (#1452)
not an ideal solution but this is how i address the problem: ``` json_get_field("$var(result)", "status", "$var(status)"); $var(status) = $(var(status){s.strip,1}); #strip quotes $var(status) = $(var(status){s.striptail,1}); #strip quotes ``` -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1452#issuecomment-369610245___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Add /var/run management to systemd script (#1464)
This should probably go into `/usr/lib/tmpfiles.d/kamailio.conf`. rtpproxy does this: ``` /cat /usr/lib/tmpfiles.d/rtpproxy.conf d /var/run/rtpproxy 0755 rtpproxy rtpproxy ``` -- 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/1464#issuecomment-369605401___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] Add /var/run management to systemd script (#1464)
Hi, Would be nice if you could add `/var/run` management to the systemd script provided with the repo install. You know, something along the lines of: ``` ExecStartPre=-/usr/bin/mkdir /var/run/kamailio ExecStartPre=/usr/bin/chown -R kamailio:daemon /var/run/kamailio/ ``` -- 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/1464___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] app_python: kemi accept int-int-str for t_continue (#1463)
Pre-Submission Checklist - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue # (replace with an open issue number) Description app_python: kemi add int-int-str to accept list of wrapper arguments - used, for example, by the t_continue() wrapper You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1463 -- Commit Summary -- * app_python: KEMI accept int-int-str for t_continue -- File Changes -- M src/modules/app_python/apy_kemi.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1463.patch https://github.com/kamailio/kamailio/pull/1463.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/1463 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:899ab355: db_mongodb: use projection iterator to convert bson for result
Module: kamailio Branch: master Commit: 899ab355fb58e22eaa02336e9b5b1f2f53dba375 URL: https://github.com/kamailio/kamailio/commit/899ab355fb58e22eaa02336e9b5b1f2f53dba375 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-01T14:28:47+01:00 db_mongodb: use projection iterator to convert bson for result --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/899ab355fb58e22eaa02336e9b5b1f2f53dba375.diff Patch: https://github.com/kamailio/kamailio/commit/899ab355fb58e22eaa02336e9b5b1f2f53dba375.patch --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index aba482d352..b1c9ac2bb7 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -506,6 +506,7 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, const char *colname; bson_type_t coltype; bson_iter_t riter; + bson_iter_t titer; bson_iter_t citer; bson_iter_t *piter; db_val_t* dval; @@ -520,14 +521,27 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, } if(mgres->colsdoc==NULL) { cdoc = (bson_t*)_rdoc; + if (!bson_iter_init (, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } } else { cdoc = (bson_t*)mgres->colsdoc; + if (!bson_iter_init (, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } + if(!bson_iter_find(, "projection") + || !BSON_ITER_HOLDS_DOCUMENT ()) { + LM_ERR("failed to find projection field\n"); + return -3; + } + if(!bson_iter_recurse (, )) { + LM_ERR("failed to init projection iterator\n"); + return -3; + } } - if (!bson_iter_init (, cdoc)) { - LM_ERR("failed to initialize columns iterator\n"); - return -3; - } if(mgres->colsdoc) { if (!bson_iter_init (, _rdoc)) { LM_ERR("failed to initialize result iterator\n"); ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:aab4f5db: db_mongodb: iterate on projection fields for matching cols in result
Module: kamailio Branch: master Commit: aab4f5db964bf1980729ed8b7770f550bb86b72b URL: https://github.com/kamailio/kamailio/commit/aab4f5db964bf1980729ed8b7770f550bb86b72b Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-01T12:56:18+01:00 db_mongodb: iterate on projection fields for matching cols in result --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/aab4f5db964bf1980729ed8b7770f550bb86b72b.diff Patch: https://github.com/kamailio/kamailio/commit/aab4f5db964bf1980729ed8b7770f550bb86b72b.patch --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index 1e790b8b9d..aba482d352 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -316,10 +316,12 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) int col; db_mongodb_result_t *mgres; bson_iter_t riter; + bson_iter_t titer; bson_iter_t citer; bson_t *cdoc; const char *colname; bson_type_t coltype; + int cdocproj; if ((!_h) || (!_r)) { LM_ERR("invalid parameter\n"); @@ -338,8 +340,10 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) return -1; } cdoc = mgres->rdoc; + cdocproj = 0; } else { cdoc = mgres->colsdoc; + cdocproj = 1; } RES_COL_N(_r) = mgres->nrcols; if (!RES_COL_N(_r)) { @@ -355,9 +359,25 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) return -3; } - if (!bson_iter_init (, cdoc)) { - LM_ERR("failed to initialize columns iterator\n"); - return -3; + if(cdocproj == 1) { + if (!bson_iter_init (, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } + if(!bson_iter_find(, "projection") + || !BSON_ITER_HOLDS_DOCUMENT ()) { + LM_ERR("failed to find projection field\n"); + return -3; + } + if(!bson_iter_recurse (, )) { + LM_ERR("failed to init projection iterator\n"); + return -3; + } + } else { + if (!bson_iter_init (, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } } if(mgres->colsdoc) { if (!bson_iter_init (, mgres->rdoc)) { ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] app_python: implement reloading of script (#1462)
Thanks! -- 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/1462#issuecomment-369530639___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] app_python: implement reloading of script (#1462)
Merged #1462. -- 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/1462#event-1498564903___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] pkg/docker: Updated reference to packaging scripts (#1457)
Merged #1457. -- 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/1457#event-1498563228___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:5b58c2b0: app_python: implement reloading of script
Module: kamailio Branch: master Commit: 5b58c2b0b0bc9014d248ec60e3fe942863f7fe2a URL: https://github.com/kamailio/kamailio/commit/5b58c2b0b0bc9014d248ec60e3fe942863f7fe2a Author: AntonyACommitter: Daniel-Constantin Mierla Date: 2018-03-01T10:24:44+01:00 app_python: implement reloading of script - implements reloading of script - the version is incremented by RPC and the version check is performed in each worker on the next invocation of a Python method --- Modified: src/modules/app_python/app_python_mod.c Modified: src/modules/app_python/apy_kemi.c Modified: src/modules/app_python/doc/app_python_admin.xml Modified: src/modules/app_python/python_exec.c --- Diff: https://github.com/kamailio/kamailio/commit/5b58c2b0b0bc9014d248ec60e3fe942863f7fe2a.diff Patch: https://github.com/kamailio/kamailio/commit/5b58c2b0b0bc9014d248ec60e3fe942863f7fe2a.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:a4c5397f: pkg/docker: Updated reference to packaging scripts
Module: kamailio Branch: 5.1 Commit: a4c5397f87daa2513ed9fdc4f8f8d532cc10852e URL: https://github.com/kamailio/kamailio/commit/a4c5397f87daa2513ed9fdc4f8f8d532cc10852e Author: Sergey SafarovCommitter: Daniel-Constantin Mierla Date: 2018-03-01T10:23:55+01:00 pkg/docker: Updated reference to packaging scripts --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/a4c5397f87daa2513ed9fdc4f8f8d532cc10852e.diff Patch: https://github.com/kamailio/kamailio/commit/a4c5397f87daa2513ed9fdc4f8f8d532cc10852e.patch --- diff --git a/pkg/docker b/pkg/docker index d5eef889b8..dee22bb1ec 16 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit d5eef889b8be77c90a4ab1eac29e240132499060 +Subproject commit dee22bb1ec7bda31723349f37602a5ac6ef8445a ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] presence: test if event is dialog to avoid unnecessary xml parsing (#1453)
Merged #1453. -- 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/1453#event-1498562868___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:6d0f8994: presence: test if event is dialog to avoid unnecessary xml parsing
Module: kamailio Branch: master Commit: 6d0f8994611b50faa7ef7d1299acf0c390a2eed1 URL: https://github.com/kamailio/kamailio/commit/6d0f8994611b50faa7ef7d1299acf0c390a2eed1 Author: Claudiu BorigaCommitter: Daniel-Constantin Mierla Date: 2018-03-01T10:23:44+01:00 presence: test if event is dialog to avoid unnecessary xml parsing --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/6d0f8994611b50faa7ef7d1299acf0c390a2eed1.diff Patch: https://github.com/kamailio/kamailio/commit/6d0f8994611b50faa7ef7d1299acf0c390a2eed1.patch --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 785c58546d..497bfa95ea 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -734,17 +734,18 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, goto error; } } + if (presentity->event->evp->type == EVENT_DIALOG) { + check_if_dialog(*body, _dialog, _id); + if (dialog_id) { + if (delete_presentity_if_dialog_id_exists(presentity, dialog_id) < 0) { + free(dialog_id); + dialog_id = NULL; + goto error; + } - check_if_dialog(*body, _dialog, _id); - if ( dialog_id ) { - if (delete_presentity_if_dialog_id_exists(presentity, dialog_id) < 0) { free(dialog_id); dialog_id = NULL; - goto error; } - - free(dialog_id); - dialog_id = NULL; } LM_DBG("inserting %d cols into table\n",n_query_cols); ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] app_python: implement reloading of script (#1462)
Pre-Submission Checklist - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue # (replace with an open issue number) Description Script reloading for app_python. - implements reloading of script - the version is incremented by RPC and the version check is performed in each worker on the next invocation of a Python method You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1462 -- Commit Summary -- * app_python: implement reloading of script -- File Changes -- M src/modules/app_python/app_python_mod.c (270) M src/modules/app_python/apy_kemi.c (44) M src/modules/app_python/doc/app_python_admin.xml (10) M src/modules/app_python/python_exec.c (74) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1462.patch https://github.com/kamailio/kamailio/pull/1462.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/1462 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:b62d6235: db_redis: Update schema definition
Module: kamailio Branch: master Commit: b62d623578737a85dd18cacc66f4e71232b463aa URL: https://github.com/kamailio/kamailio/commit/b62d623578737a85dd18cacc66f4e71232b463aa Author: Andreas GranigCommitter: Andreas Granig Date: 2018-03-01T09:59:34+01:00 db_redis: Update schema definition --- Modified: utils/kamctl/db_redis/kamailio/lcr_rule Modified: utils/kamctl/db_redis/kamailio/location Modified: utils/kamctl/db_redis/kamailio/presentity Modified: utils/kamctl/db_redis/kamailio/rtpengine Modified: utils/kamctl/db_redis/kamailio/subscriber Modified: utils/kamctl/db_redis/kamailio/uacreg --- Diff: https://github.com/kamailio/kamailio/commit/b62d623578737a85dd18cacc66f4e71232b463aa.diff Patch: https://github.com/kamailio/kamailio/commit/b62d623578737a85dd18cacc66f4e71232b463aa.patch --- diff --git a/utils/kamctl/db_redis/kamailio/lcr_rule b/utils/kamctl/db_redis/kamailio/lcr_rule index 97eb9bed6e..b34558ce87 100644 --- a/utils/kamctl/db_redis/kamailio/lcr_rule +++ b/utils/kamctl/db_redis/kamailio/lcr_rule @@ -1,2 +1,2 @@ -id/int,lcr_id/int,prefix/string,from_uri/string,request_uri/string,stopper/int,enabled/int, -2 +id/int,lcr_id/int,prefix/string,from_uri/string,request_uri/string,mt_tvalue/string,stopper/int,enabled/int, +3 diff --git a/utils/kamctl/db_redis/kamailio/location b/utils/kamctl/db_redis/kamailio/location index cacabc7827..9ca18f2fb0 100644 --- a/utils/kamctl/db_redis/kamailio/location +++ b/utils/kamctl/db_redis/kamailio/location @@ -1,2 +1,2 @@ id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/int,q/double,callid/string,cseq/int,last_modified/int,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, -8 +9 diff --git a/utils/kamctl/db_redis/kamailio/presentity b/utils/kamctl/db_redis/kamailio/presentity index bc2ee48d14..214539497d 100644 --- a/utils/kamctl/db_redis/kamailio/presentity +++ b/utils/kamctl/db_redis/kamailio/presentity @@ -1,2 +1,2 @@ -id/int,username/string,domain/string,event/string,etag/string,expires/int,received_time/int,body/string,sender/string,priority/int, -4 +id/int,username/string,domain/string,event/string,etag/string,expires/int,received_time/int,body/string,sender/string,priority/int,ruid/string, +5 diff --git a/utils/kamctl/db_redis/kamailio/rtpengine b/utils/kamctl/db_redis/kamailio/rtpengine index ec0479c2bb..b3ebac8c27 100644 --- a/utils/kamctl/db_redis/kamailio/rtpengine +++ b/utils/kamctl/db_redis/kamailio/rtpengine @@ -1,2 +1,2 @@ -setid/int,url/string,weight/int,disabled/int, +id/int,setid/int,url/string,weight/int,disabled/int,stamp/int, 1 diff --git a/utils/kamctl/db_redis/kamailio/subscriber b/utils/kamctl/db_redis/kamailio/subscriber index 0126ec30c2..912a3e 100644 --- a/utils/kamctl/db_redis/kamailio/subscriber +++ b/utils/kamctl/db_redis/kamailio/subscriber @@ -1,2 +1,2 @@ -id/int,username/string,domain/string,password/string,email_address/string,ha1/string,ha1b/string,rpid/string, -6 +id/int,username/string,domain/string,password/string,ha1/string,ha1b/string,email_address/string,rpid/string, +7 diff --git a/utils/kamctl/db_redis/kamailio/uacreg b/utils/kamctl/db_redis/kamailio/uacreg index 9dd23848e3..383fa88c43 100644 --- a/utils/kamctl/db_redis/kamailio/uacreg +++ b/utils/kamctl/db_redis/kamailio/uacreg @@ -1,2 +1,2 @@ -id/int,l_uuid/string,l_username/string,l_domain/string,r_username/string,r_domain/string,realm/string,auth_username/string,auth_password/string,auth_proxy/string,expires/int,flags/int,reg_delay/int, -2 +id/int,l_uuid/string,l_username/string,l_domain/string,r_username/string,r_domain/string,realm/string,auth_username/string,auth_password/string,auth_ha1/string,auth_proxy/string,expires/int,flags/int,reg_delay/int, +3 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:c827d37a: pkg/kamailio/deb: version set to 5.1.2
Module: kamailio Branch: 5.1 Commit: c827d37a229ea5b38e41fdabe9d1dcd3725dec9c URL: https://github.com/kamailio/kamailio/commit/c827d37a229ea5b38e41fdabe9d1dcd3725dec9c Author: Victor SevaCommitter: Victor Seva Date: 2018-03-01T09:12:07+01:00 pkg/kamailio/deb: version set to 5.1.2 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/c827d37a229ea5b38e41fdabe9d1dcd3725dec9c.diff Patch: https://github.com/kamailio/kamailio/commit/c827d37a229ea5b38e41fdabe9d1dcd3725dec9c.patch --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index 798ee4ecce..9c72d55ad4 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.2) unstable; urgency=medium + + * version set to 5.1.2 + + -- Victor Seva Thu, 01 Mar 2018 09:11:41 +0100 + kamailio (5.1.1) unstable; urgency=medium * version set to 5.1.1 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 798ee4ecce..9c72d55ad4 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.2) unstable; urgency=medium + + * version set to 5.1.2 + + -- Victor Seva Thu, 01 Mar 2018 09:11:41 +0100 + kamailio (5.1.1) unstable; urgency=medium * version set to 5.1.1 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 798ee4ecce..9c72d55ad4 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.2) unstable; urgency=medium + + * version set to 5.1.2 + + -- Victor Seva Thu, 01 Mar 2018 09:11:41 +0100 + kamailio (5.1.1) unstable; urgency=medium * version set to 5.1.1 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 798ee4ecce..9c72d55ad4 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.2) unstable; urgency=medium + + * version set to 5.1.2 + + -- Victor Seva Thu, 01 Mar 2018 09:11:41 +0100 + kamailio (5.1.1) unstable; urgency=medium * version set to 5.1.1 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 798ee4ecce..9c72d55ad4 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.2) unstable; urgency=medium + + * version set to 5.1.2 + + -- Victor Seva Thu, 01 Mar 2018 09:11:41 +0100 + kamailio (5.1.1) unstable; urgency=medium * version set to 5.1.1 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 798ee4ecce..9c72d55ad4 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.2) unstable; urgency=medium + + * version set to 5.1.2 + + -- Victor Seva Thu, 01 Mar 2018 09:11:41 +0100 + kamailio (5.1.1) unstable; urgency=medium * version set to 5.1.1 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 798ee4ecce..9c72d55ad4 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.2) unstable; urgency=medium + + * version set to 5.1.2 + + -- Victor Seva Thu, 01 Mar 2018 09:11:41 +0100 + kamailio (5.1.1) unstable; urgency=medium * version set to 5.1.1 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 798ee4ecce..9c72d55ad4 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.2) unstable; urgency=medium + + * version set to 5.1.2 + + -- Victor Seva Thu, 01 Mar 2018 09:11:41 +0100 + kamailio (5.1.1) unstable; urgency=medium * version set to 5.1.1 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 798ee4ecce..9c72d55ad4 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.2) unstable; urgency=medium + + * version set to 5.1.2 + + -- Victor Seva Thu, 01 Mar 2018 09:11:41 +0100 + kamailio (5.1.1) unstable; urgency=medium * version set to 5.1.1 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org