sr-dev April 2018

sr-dev@lists.kamailio.org

19 participants
256 discussions

git:5.1:db8fa7d5: pkg/alpine: version set to 5.1.3
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: db8fa7d50cc420c0def4e56e1e1d85db33065cc8 URL: https://github.com/kamailio/kamailio/commit/db8fa7d50cc420c0def4e56e1e1d85d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T12:35:41+02:00 pkg/alpine: version set to 5.1.3 --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/db8fa7d50cc420c0def4e56e1e1d85d… Patch: https://github.com/kamailio/kamailio/commit/db8fa7d50cc420c0def4e56e1e1d85d… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 1e98751427..5ba6f7398e 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.1.1 +pkgver=5.1.3 pkgrel=0 # If building from a git snapshot, specify the gitcommit

1 0

git:5.1:39b73a0f: pkg/kamailio/deb: version 5.1.3
by Victor Seva 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: 39b73a0f765f189219e06eafc0e041da20ca0688 URL: https://github.com/kamailio/kamailio/commit/39b73a0f765f189219e06eafc0e041d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-04-24T10:35:55+02:00 pkg/kamailio/deb: version 5.1.3 --- 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/39b73a0f765f189219e06eafc0e041d… Patch: https://github.com/kamailio/kamailio/commit/39b73a0f765f189219e06eafc0e041d… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2

1 0

Planning the release of Kamailio v5.1.3
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Hello, I am considering to package a new release from branch 5.1, respectively v5.1.3 sometime next week, likely on Tuesday or Wednesday (April 24 or 25). I any issue is not yet reported on github tracker, do it as soon as possible to have a chance to be investigated. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

2 3

git:master:ffa9bcc7: pv: new variable $mbu - updated msg buffer
by Daniel-Constantin Mierla 23 Apr '18

23 Apr '18

Module: kamailio Branch: master Commit: ffa9bcc79d0cafdfad47aac1ff3ffa09842ae22d URL: https://github.com/kamailio/kamailio/commit/ffa9bcc79d0cafdfad47aac1ff3ffa0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-23T09:22:23+02:00 pv: new variable $mbu - updated msg buffer - get the message buffer after applying changes - the original buffer stays unchanged --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/ffa9bcc79d0cafdfad47aac1ff3ffa0… Patch: https://github.com/kamailio/kamailio/commit/ffa9bcc79d0cafdfad47aac1ff3ffa0… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 1bc2af1e8e..d03a52409a 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -263,6 +263,9 @@ static pv_export_t mod_pvs[] = { {{"mb", (sizeof("mb")-1)}, /* */ PVT_OTHER, pv_get_msg_buf, 0, 0, 0, 0, 0}, + {{"mbu", (sizeof("mbu")-1)}, /* */ + PVT_OTHER, pv_get_msg_buf_updated, 0, + 0, 0, 0, 0}, {{"mf", (sizeof("mf")-1)}, /* */ PVT_OTHER, pv_get_flags, pv_set_mflags, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 098d5435c2..8d8f35f250 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -33,6 +33,7 @@ #include "../../core/tcp_conn.h" #include "../../core/pvapi.h" #include "../../core/trim.h" +#include "../../core/msg_translator.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_uri.h" @@ -518,6 +519,45 @@ int pv_get_msg_buf(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &s); } + +static str _ksr_pv_msg_buf_updated = STR_NULL; +int pv_get_msg_buf_updated(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + dest_info_t send_info; + + if(msg==NULL) + return -1; + + if(_ksr_pv_msg_buf_updated.s!=NULL) { + pkg_free(_ksr_pv_msg_buf_updated.s); + _ksr_pv_msg_buf_updated.s = NULL; + _ksr_pv_msg_buf_updated.len = 0; + } + + init_dest_info(&send_info); + send_info.proto = PROTO_UDP; + if(msg->first_line.type == SIP_REPLY) { + _ksr_pv_msg_buf_updated.s = generate_res_buf_from_sip_res(msg, + (unsigned int*)&_ksr_pv_msg_buf_updated.len, + BUILD_NO_VIA1_UPDATE); + } else if(msg->first_line.type == SIP_REQUEST) { + _ksr_pv_msg_buf_updated.s = build_req_buf_from_sip_req(msg, + (unsigned int*)&_ksr_pv_msg_buf_updated.len, + &send_info, + BUILD_NO_PATH|BUILD_NO_LOCAL_VIA|BUILD_NO_VIA1_UPDATE); + } else { + return pv_get_null(msg, param, res); + } + + if(_ksr_pv_msg_buf_updated.s == NULL) { + LM_ERR("couldn't update msg buffer content\n"); + _ksr_pv_msg_buf_updated.len = 0; + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &_ksr_pv_msg_buf_updated); +} + int pv_get_msg_len(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 148e87f269..453c1c3197 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -94,6 +94,9 @@ int pv_get_cseq_body(struct sip_msg *msg, pv_param_t *param, int pv_get_msg_buf(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_msg_buf_updated(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_msg_len(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 22 Apr '18

22 Apr '18

- URL: https://github.com/kamailio/kamailio/commit/95db7165963d12ba8660bb947910146… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:21:26+02:00 dispatcher: exported more functions to kemi interface (cherry picked from commit 55ed25e1413c2fa5340138b7703c73db1df967de) - URL: https://github.com/kamailio/kamailio/commit/3e7d1a914769a96373cb2d003acb05f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:23:09+02:00 etc/kamailio.cfg: do not relay to foreign network if auth is not enabled - anyone can use a local account and flood external systems (cherry picked from commit 41f41d6d2850cdd5ab1a1b5d55bbb7ebd697ff7a) - URL: https://github.com/kamailio/kamailio/commit/a76ee50d96b7a713065c8e823ea8b4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:23:57+02:00 tm: removed inline for exported functions to config - they are assigned to a structure field, cannot be optimized for inline execution, avoid warnings in static analysis (cherry picked from commit 04d5a6a0ee8c230423b7bc7be0afe5d568fe8555) - URL: https://github.com/kamailio/kamailio/commit/fff68b42d62f9e5d1ef28f06a1f84e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:24:16+02:00 auth_diameter: updated application name (cherry picked from commit 7228a9e413f7d51411961b8ece7281ecf597a9e2) - URL: https://github.com/kamailio/kamailio/commit/d6aabb749d1be55ae2f2b4c65840242… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:24:32+02:00 cnxcc: updated application name in example (cherry picked from commit bb0940fd01a0188bc82d0608ac054fec5715ac56) - URL: https://github.com/kamailio/kamailio/commit/70dc29bffaa92d06edb84891f9e548b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:24:45+02:00 p_usrloc: updated path to db scripts in docs (cherry picked from commit a8827449e4c3c43e3f25abb7f5b27b2e1d1ab1b7) - URL: https://github.com/kamailio/kamailio/commit/e160730c2b6d2ec69ece0ac5d560d0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:24:59+02:00 rtpproxy: small updates to example cfg (cherry picked from commit 6162a74ad858c6a7421f461cd1483cc8d69c12c1) - URL: https://github.com/kamailio/kamailio/commit/87fb715ff3a0d687aefba01567f08e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:25:11+02:00 speeddial: updates to db url example (cherry picked from commit ea18525e27120943204a75470855a35fbc8cc46a) - URL: https://github.com/kamailio/kamailio/commit/c459054927fd0c805d7d090c3636600… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:25:22+02:00 uri_db: updated database name in docs (cherry picked from commit ae1367bf3a6706b9db742ff6e20e6d11f79d5b02) - URL: https://github.com/kamailio/kamailio/commit/760aee932aafc7f4c0207c10aabb5a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:25:58+02:00 core: check for result of dlopen() pointers (cherry picked from commit a3d9816d3881eb9743a14cb1306533469a821d47) - URL: https://github.com/kamailio/kamailio/commit/2a7fbdea7516896fb06b351caece3f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:26:51+02:00 phonenum: fixed lenght in pv name comparisons (cherry picked from commit 2196c677785fc4df4f4f1c03831eff679dcd5363) - URL: https://github.com/kamailio/kamailio/commit/1b571a66a48794e69593227f19d44f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:27:02+02:00 phonenum: build cctel from formatted number (cherry picked from commit 54c6a03704767a3dc15eb633ce1628e93c99a8ff) - URL: https://github.com/kamailio/kamailio/commit/4fb73546fd94f43e48de03025260639… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:27:16+02:00 phonenum: docs - updated pv names to match c code (cherry picked from commit 70a61e0bfa0640fbba8d6cfe57f6ad4c6a431b84) - URL: https://github.com/kamailio/kamailio/commit/19b23dac012b17d783f8db1f0b43a28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:28:19+02:00 rr: docs - added section ids (cherry picked from commit 7907cd15b5aacef8990e50dc19055a4e9b8e4359) - URL: https://github.com/kamailio/kamailio/commit/e4f1a229068e0cd774a32b4db4431aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:29:07+02:00 jsonrpcs: example accessing the jsonrpc response for jsonrpc_exec() (cherry picked from commit 0fcac52fc9e6445f986c9a5a9ee1b5230030035b) - URL: https://github.com/kamailio/kamailio/commit/7153e802288112658c6012488867596… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-22T08:30:36+02:00 ipops: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) (cherry picked from commit 3848b5286b74894ed162e1aae8c80ee3d703c21f) - URL: https://github.com/kamailio/kamailio/commit/4b9a95275c9f0b445f19b02ee60eec4… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-22T08:30:47+02:00 nat_traversal: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) (cherry picked from commit 32f1671bee21d5f8d52b5febf50ddc7b26f6919a) - URL: https://github.com/kamailio/kamailio/commit/742f4924eb515d6b481b8295fb611e7… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-22T08:30:57+02:00 nathelper: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) (cherry picked from commit 804d6b85bdbe55b32edacdbd895b0ad763bf619f) - URL: https://github.com/kamailio/kamailio/commit/9be00ceba0d814f6ad973279fc386d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:31:37+02:00 dialog: skip printing profiles and vars in terminated state for rpc dialog list - they can be delelted at that point, not being referenced by the same field (cherry picked from commit 8bc037bc87ced907b8b2e59a2c5fcb45291836fd) - URL: https://github.com/kamailio/kamailio/commit/0abe8f957e6c1242ab0962be8b66be9… Author: Guillaume Bour <guillaume.bour(a)diabolocom.com> Date: 2018-04-22T08:32:07+02:00 keepalive: cleanup rpc output (#1476) (cherry picked from commit b8a75c1c4fda079515606eb59273945842aff1be) - URL: https://github.com/kamailio/kamailio/commit/a0f8f33c5197b4fee5c2dedc85abbdb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:32:55+02:00 app_lua: test if number of parameters is enough for kemi funtions (cherry picked from commit cc661d776621a5f2d4370eb364402c2a53242cc7) - URL: https://github.com/kamailio/kamailio/commit/1fd326b2d4ff0480b24f993f66c376b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:33:08+02:00 dispatcher: fixed kemi exports param types (cherry picked from commit 1d1eeafc88979df41e2dcb6f2c8b41d16695fd7d) - URL: https://github.com/kamailio/kamailio/commit/43819d7d5acd4be0f2615e523c8f17a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:33:22+02:00 sqlops: proper function prototypes for kemi exports to get num rows and cols (cherry picked from commit 684f98ace6ec50d5c52b8f6e14fe184079a6206f) - URL: https://github.com/kamailio/kamailio/commit/300c0f4d026157728e9c0d5152a070b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:33:53+02:00 topos: skip local generated request not part of a dialog (cherry picked from commit 6d2312b8b0913f2f48e0f951c9578924e1d14f1d) - URL: https://github.com/kamailio/kamailio/commit/d7c1754c57443b81925ffb6e09a7e3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:34:19+02:00 ipops: mask subnet address when comparing - allow using full ip address when specifying subnet parameter - more flexibility on using values from sip message - GH #1250 (cherry picked from commit 1f675c68b3ed2b2e0a497fecd942c9213f0de058) - URL: https://github.com/kamailio/kamailio/commit/055bbcddbc072545f32698ebeeb15c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:34:32+02:00 ipops: use proper variable for ipv6 subnet comparison (cherry picked from commit 162c304d1264044ac1a46a379b75bafb4c91bcfd) - URL: https://github.com/kamailio/kamailio/commit/c9f6db1bfeb0381a76a30f1df38f538… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:34:43+02:00 ipops: mask subnet address for ipv6 comparison - coherent with ipv4 behaviour (cherry picked from commit a5dd60c8d7e04731f12108838a3c82149e04ef9c) - URL: https://github.com/kamailio/kamailio/commit/e4dc6ccbc9b9e63ea4300098952cd7b… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2018-04-22T08:36:31+02:00 rtpengine: Add description for metadata flag (cherry picked from commit 1e712ed93aef8ab96ee7a9760f89ebc0fd02caff) - URL: https://github.com/kamailio/kamailio/commit/1eea8119c3dc5478f1e8974bd7cccab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:37:08+02:00 dialog: added missing documentation for end_timeout parameter (cherry picked from commit 65df297db29192b2214a737208518db5cc7bff84) - URL: https://github.com/kamailio/kamailio/commit/f9e0bc365c60cada649fc3e6b7d9054… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:39:09+02:00 topos: reuse uuid for requests withing dialog - related to GH #1496 (cherry picked from commit 63e5a1f6d3f801136180bf2cb8a042d8af779f65) - URL: https://github.com/kamailio/kamailio/commit/0ca60d730a6c4a81706940190aa9da8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:39:32+02:00 nat_traversal: use the new function names for basic timer processes (cherry picked from commit 3d9dffd4b01fb1486d64824f971dbb1be112cdb6) - URL: https://github.com/kamailio/kamailio/commit/11ee34a0edca1eaf942fdf9825f1a75… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-04-22T08:39:55+02:00 ndb_mongodb: fix deprecation warning Since 1.5.0 mongoc_collection_find() is deprecated > http://mongoc.org/libmongoc/1.5.0/mongoc_collection_find.html (cherry picked from commit c70d831aee5a95613de69568d8f1863788e0a074) - URL: https://github.com/kamailio/kamailio/commit/7b35a9e194b51ec9b2b5a2a70bedce4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:40:08+02:00 lcr: docs - added many section ids (cherry picked from commit 681a104eeed6982d17b15701491bdff35662bf82) - URL: https://github.com/kamailio/kamailio/commit/ffa97a1b920df367e23f88cd6c6a4bd… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-04-22T08:40:26+02:00 dialog: restore keep-alive after restart (cherry picked from commit a821ff61029a4e8a9f220d60f95bd7b5a545f9b4) - URL: https://github.com/kamailio/kamailio/commit/b89f643e12ac6359b4ffd9c173fee48… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-04-22T08:40:49+02:00 dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value (cherry picked from commit ad427fc19c56110f66df86b7b49e23c00313610a) - URL: https://github.com/kamailio/kamailio/commit/5bbb6a41467575a1ccfdb3a103d1d8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:41:02+02:00 counters: docs - format section ids (cherry picked from commit 4bab8e5587f59132afb21e29c5a08e71df3c6f8b) - URL: https://github.com/kamailio/kamailio/commit/b422e257333b403e88ac16c714662fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:41:12+02:00 drouting: docs - added several section ids (cherry picked from commit c5764f003c8f425c881cda7dc73ee5eab0e71825)

1 0

git:master:22f93ba6: pv: exported xavp_params_implode() to kemi
by Daniel-Constantin Mierla 22 Apr '18

22 Apr '18

Module: kamailio Branch: master Commit: 22f93ba67e4ee1f517c0e66138e2ba7c2d6db885 URL: https://github.com/kamailio/kamailio/commit/22f93ba67e4ee1f517c0e66138e2ba7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T07:58:36+02:00 pv: exported xavp_params_implode() to kemi --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/22f93ba67e4ee1f517c0e66138e2ba7… Patch: https://github.com/kamailio/kamailio/commit/22f93ba67e4ee1f517c0e66138e2ba7… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index bdb4e17834..1bc2af1e8e 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1119,6 +1119,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_params_implode"), + SR_KEMIP_INT, ki_xavp_params_implode, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("evalx"), SR_KEMIP_INT, ki_pv_evalx, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:5fb231b6: core: add extra via params from xavp
by Daniel-Constantin Mierla 22 Apr '18

22 Apr '18

Module: kamailio Branch: master Commit: 5fb231b69f150494a8d51e2581635e98520866ad URL: https://github.com/kamailio/kamailio/commit/5fb231b69f150494a8d51e2581635e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-21T21:16:04+02:00 core: add extra via params from xavp --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/5fb231b69f150494a8d51e2581635e9… Patch: https://github.com/kamailio/kamailio/commit/5fb231b69f150494a8d51e2581635e9… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 5d7c1866e5..22122768a1 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -103,6 +103,8 @@ #include "parser/parse_param.h" #include "forward.h" #include "str_list.h" +#include "pvapi.h" +#include "xavp.h" #include "rand/kam_rand.h" #define append_str_trans(_dest,_src,_len,_msg) \ @@ -2849,6 +2851,7 @@ char* create_via_hf( unsigned int *len, struct hostport hp; char sbuf[24]; int slen; + str xparams; #if defined USE_TCP || defined USE_SCTP char* id_buf; unsigned int id_len; @@ -2931,6 +2934,29 @@ char* create_via_hf( unsigned int *len, } } + /* test and add xavp params */ + if(msg && (msg->msg_flags&FL_ADD_XAVP_VIA) && _ksr_xavp_via_params.len>0) { + xparams.s = pv_get_buffer(); + xparams.len = xavp_serialize_fields(&_ksr_xavp_via_params, + xparams.s, pv_get_buffer_size()); + if(xparams.len>0) { + via = (char*)pkg_malloc(extra_params.len+xparams.len+1); + if(via==0) { + LM_ERR("building xavps params failed\n"); + if (extra_params.s) pkg_free(extra_params.s); + return 0; + } + if(extra_params.len != 0) { + memcpy(via, extra_params.s, extra_params.len); + pkg_free(extra_params.s); + } + memcpy(via + extra_params.len, xparams.s, xparams.len); + extra_params.s = via; + extra_params.len += xparams.len; + extra_params.s[extra_params.len] = '\0'; + } + } + set_hostport(&hp, msg); via = via_builder( len, send_info, branch, extra_params.len?&extra_params:0, &hp);

1 0

git:master:af6c8088: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 20 Apr '18

20 Apr '18

Module: kamailio Branch: master Commit: af6c8088d5e07c8487bc6eda6c528deaa15df0a5 URL: https://github.com/kamailio/kamailio/commit/af6c8088d5e07c8487bc6eda6c528de… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-20T12:47:01+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/af6c8088d5e07c8487bc6eda6c528de… Patch: https://github.com/kamailio/kamailio/commit/af6c8088d5e07c8487bc6eda6c528de…

1 0

git:master:42c8595e: pv: docs for xavp_params_implode(...) function
by Daniel-Constantin Mierla 20 Apr '18

20 Apr '18

Module: kamailio Branch: master Commit: 42c8595e58e31806ecfc6201d47d7c5957e7522c URL: https://github.com/kamailio/kamailio/commit/42c8595e58e31806ecfc6201d47d7c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-20T12:38:17+02:00 pv: docs for xavp_params_implode(...) function --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/42c8595e58e31806ecfc6201d47d7c5… Patch: https://github.com/kamailio/kamailio/commit/42c8595e58e31806ecfc6201d47d7c5… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 61209f1898..f5faa0ab11 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -292,6 +292,37 @@ xavp_params_explode("a=b;c=d;e=d", "x"); # $xavp(x=>a) = "b"; # $xavp(x=>c) = "d"; # $xavp(x=>e) = "f"; +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_params_implode"> + <title> + <function moreinfo="none">xavp_params_implode(xname, pvname)</function> + </title> + <para> + Serialize the subfields in an XAVP to a parameters string format. + </para> + <para> + The first parameter has to be the name of XAVP (only the string + name, not the in $xavp(name)). The second parameter + is the name of output variable (in full name, like $var(output)). + </para> + <para> + The value is stored as string type. + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_params_implode</function> usage</title> + <programlisting format="linespecific"> +... +$xavp(x=>e) = "f"; +$xavp(x[0]=>c) = "d"; +$xavp(x[0]=>a) = "b"; +xavp_params_implode("x", "$var(out)"); +# results in: $var(out) is "a=b;c=d;e=f;" ... </programlisting> </example>

1 0

git:master:d19a68be: pv: new function - xavp_params_implode(xname, pv)
by Daniel-Constantin Mierla 20 Apr '18

20 Apr '18

Module: kamailio Branch: master Commit: d19a68be381fea741afe520340849cafd437d929 URL: https://github.com/kamailio/kamailio/commit/d19a68be381fea741afe520340849ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-20T12:28:39+02:00 pv: new function - xavp_params_implode(xname, pv) - serialize the subbfields of $xavp(xname) in params format (name=value;) and set the output to variable pv --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/d19a68be381fea741afe520340849ca… Patch: https://github.com/kamailio/kamailio/commit/d19a68be381fea741afe520340849ca… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 258be56399..bdb4e17834 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -24,6 +24,7 @@ #include "../../core/sr_module.h" #include "../../core/pvar.h" +#include "../../core/pvapi.h" #include "../../core/lvalue.h" #include "../../core/mod_fix.h" #include "../../core/xavp.h" @@ -528,6 +529,7 @@ static int is_int(struct sip_msg* msg, char* pvar, char* s2); static int pv_typeof(sip_msg_t *msg, char *pv, char *t); static int pv_not_empty(sip_msg_t *msg, char *pv, char *s2); static int w_xavp_params_explode(sip_msg_t *msg, char *pparams, char *pxname); +static int w_xavp_params_implode(sip_msg_t *msg, char *pxname, char *pvname); static int w_sbranch_set_ruri(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_append(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_reset(sip_msg_t *msg, char p1, char *p2); @@ -564,6 +566,9 @@ static cmd_export_t cmds[]={ {"xavp_params_explode", (cmd_function)w_xavp_params_explode, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, + {"xavp_params_implode", (cmd_function)w_xavp_params_implode, + 2, fixup_spve_str, fixup_free_spve_str, + ANY_ROUTE}, {"sbranch_set_ruri", (cmd_function)w_sbranch_set_ruri, 0, 0, 0, ANY_ROUTE }, {"sbranch_append", (cmd_function)w_sbranch_append, 0, 0, 0, @@ -816,6 +821,63 @@ static int ki_xavp_params_explode(sip_msg_t *msg, str *sparams, str *sxname) return 1; } +/** + * + */ +static int ki_xavp_params_implode(sip_msg_t *msg, str *sxname, str *svname) +{ + pv_spec_t *vspec=NULL; + pv_value_t val; + + if(sxname==NULL || sxname->s==NULL || sxname->len<=0) { + LM_ERR("invalid xavp name\n"); + return -1; + } + if(svname==NULL || svname->s==NULL || svname->len<=0) { + LM_ERR("invalid output var name\n"); + return -1; + } + + vspec = pv_cache_get(svname); + if(vspec==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", svname->len, svname->s); + return -1; + } + if(vspec->setf==NULL) { + LM_ERR("read only output variable [%.*s]\n", svname->len, svname->s); + return -1; + } + + val.rs.s = pv_get_buffer(); + val.rs.len = xavp_serialize_fields(sxname, val.rs.s, pv_get_buffer_size()); + if(val.rs.len<=0) { + return -1; + } + + val.flags = PV_VAL_STR; + if(vspec->setf(msg, &vspec->pvp, EQ_T, &val)<0) { + LM_ERR("setting PV failed [%.*s]\n", svname->len, svname->s); + return -1; + } + + return 1; +} + +/** + * + */ +static int w_xavp_params_implode(sip_msg_t *msg, char *pxname, char *pvname) +{ + str sxname; + + if(fixup_get_svalue(msg, (gparam_t*)pxname, &sxname)!=0) { + LM_ERR("cannot get the xavp name\n"); + return -1; + } + + return ki_xavp_params_implode(msg, &sxname, (str*)pvname); +} + /** * */

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2018