sr-dev March 2018

sr-dev@lists.kamailio.org

17 participants
326 discussions

[kamailio/kamailio] app_python: kemi accept int-int-str for t_continue (#1463)
by aalba6675 01 Mar '18

01 Mar '18

#### 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 #XXXX (replace XXXX 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

2 1

git:master:0ca71166: app_python: KEMI accept int-int-str for t_continue
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: master Commit: 0ca711665e1299269ca2ca1e566af6e40749f22a URL: https://github.com/kamailio/kamailio/commit/0ca711665e1299269ca2ca1e566af6e… Author: AnthonyA <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/0ca711665e1299269ca2ca1e566af6e… Patch: https://github.com/kamailio/kamailio/commit/0ca711665e1299269ca2ca1e566af6e… --- 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", &vps[0].n, + &vps[1].n, &vps[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", &vps[0].n,

1 0

git:5.1:9aa1028a: ChangeLog: content updated for v5.1.2
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: 9aa1028a8d6da9ca9738ab814f9915de4b45bbd0 URL: https://github.com/kamailio/kamailio/commit/9aa1028a8d6da9ca9738ab814f9915d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-01T16:42:46+01:00 ChangeLog: content updated for v5.1.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/9aa1028a8d6da9ca9738ab814f9915d… Patch: https://github.com/kamailio/kamailio/commit/9aa1028a8d6da9ca9738ab814f9915d…

1 0

git:5.1:e4b76b0e: Makefile.defs: version set to 5.1.2
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: e4b76b0eb7637e404611b28dad1f063f1433bc9e URL: https://github.com/kamailio/kamailio/commit/e4b76b0eb7637e404611b28dad1f063… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/e4b76b0eb7637e404611b28dad1f063… Patch: https://github.com/kamailio/kamailio/commit/e4b76b0eb7637e404611b28dad1f063… --- 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

1 0

git:5.1:9ec0cc9d: pkg/rpms: updated version to 5.1.2 in spec files
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: 9ec0cc9d4a4ca70ce2ef13d6830cb5e30f4112c5 URL: https://github.com/kamailio/kamailio/commit/9ec0cc9d4a4ca70ce2ef13d6830cb5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/9ec0cc9d4a4ca70ce2ef13d6830cb5e… Patch: https://github.com/kamailio/kamailio/commit/9ec0cc9d4a4ca70ce2ef13d6830cb5e… --- 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 ver 5.1.1 +%define ver 5.1.2 %define rel 0%{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 name kamailio -%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 ver 5.1.1 +%define ver 5.1.2 %define rel 0%{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 name kamailio -%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 name kamailio -%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 name kamailio -%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 name kamailio -%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 name kamailio -%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 name kamailio -%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 --- a/pkg/kamailio/solaris/pkginfo +++ b/pkg/kamailio/solaris/pkginfo @@ -1,6 +1,6 @@ PKG=Kamailio ARCH=sparc -VERSION=5.1.1 +VERSION=5.1.2 CATEGORY=application EMAIL=miconda(a)gmail.com NAME=Kamailio is a very fast and flexible SIP (RFC3261) proxy server

1 0

git:5.1:49dee7f4: db_mongodb: use projection iterator to convert bson for result
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: 49dee7f498e1001ce3e29c1691a7ec322392baca URL: https://github.com/kamailio/kamailio/commit/49dee7f498e1001ce3e29c1691a7ec3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/49dee7f498e1001ce3e29c1691a7ec3… Patch: https://github.com/kamailio/kamailio/commit/49dee7f498e1001ce3e29c1691a7ec3… --- 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 (&citer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } } else { cdoc = (bson_t*)mgres->colsdoc; + if (!bson_iter_init (&titer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } + if(!bson_iter_find(&titer, "projection") + || !BSON_ITER_HOLDS_DOCUMENT (&titer)) { + LM_ERR("failed to find projection field\n"); + return -3; + } + if(!bson_iter_recurse (&titer, &citer)) { + LM_ERR("failed to init projection iterator\n"); + return -3; + } } - if (!bson_iter_init (&citer, cdoc)) { - LM_ERR("failed to initialize columns iterator\n"); - return -3; - } if(mgres->colsdoc) { if (!bson_iter_init (&riter, _rdoc)) { LM_ERR("failed to initialize result iterator\n");

1 0

git:5.1:ece17dee: db_mongodb: iterate on projection fields for matching cols in result
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: ece17deeba435ed19c16fc2a227d351fd6013f86 URL: https://github.com/kamailio/kamailio/commit/ece17deeba435ed19c16fc2a227d351… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/ece17deeba435ed19c16fc2a227d351… Patch: https://github.com/kamailio/kamailio/commit/ece17deeba435ed19c16fc2a227d351… --- 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 (&citer, cdoc)) { - LM_ERR("failed to initialize columns iterator\n"); - return -3; + if(cdocproj == 1) { + if (!bson_iter_init (&titer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } + if(!bson_iter_find(&titer, "projection") + || !BSON_ITER_HOLDS_DOCUMENT (&titer)) { + LM_ERR("failed to find projection field\n"); + return -3; + } + if(!bson_iter_recurse (&titer, &citer)) { + LM_ERR("failed to init projection iterator\n"); + return -3; + } + } else { + if (!bson_iter_init (&citer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } } if(mgres->colsdoc) { if (!bson_iter_init (&riter, mgres->rdoc)) {

1 0

git:5.1:cc92737d: db_mongodb: create projection field to set the list of returned column
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: cc92737d06359d1812ec7bed22e4c253ae7ba2e9 URL: https://github.com/kamailio/kamailio/commit/cc92737d06359d1812ec7bed22e4c25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/cc92737d06359d1812ec7bed22e4c25… Patch: https://github.com/kamailio/kamailio/commit/cc92737d06359d1812ec7bed22e4c25… --- 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, + &bcols)) { + 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(&bcols, _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, &bcols)) { + 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);

1 0

git:5.1:3d3798d1: misc/examples: added log_prefix to basic and oob examples
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: 3d3798d192c782eb2c4796b758831a7a33ec1ac4 URL: https://github.com/kamailio/kamailio/commit/3d3798d192c782eb2c4796b758831a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/3d3798d192c782eb2c4796b758831a7… Patch: https://github.com/kamailio/kamailio/commit/3d3798d192c782eb2c4796b758831a7… --- 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

1 0

git:5.1:654aa457: rtpengine: added support for DTLS transports
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: 654aa457ecec7d35061dbb151fd786a303cba473 URL: https://github.com/kamailio/kamailio/commit/654aa457ecec7d35061dbb151fd786a… Author: Jerzy Ptak <jerzy.ptak(a)bbitg.co.uk> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/654aa457ecec7d35061dbb151fd786a… Patch: https://github.com/kamailio/kamailio/commit/654aa457ecec7d35061dbb151fd786a… --- 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(); &sdp; substitutions (c=, m=, etc) are unaffected by this flag. </para></listitem> <listitem><para> - <emphasis>RTP, SRTP, AVP, AVPF</emphasis> - These flags control the &rtp; + <emphasis>RTP, SRTP, DTLS, AVP, AVPF</emphasis> - These flags control the &rtp; transport protocol that should be used towards the recipient of the &sdp;. If none of them are specified, the protocol given in the &sdp; is left untouched. Otherwise, the <quote>SRTP</quote> flag indicates that @@ -2169,8 +2169,8 @@ rtpengine_offer(); should be used. See also the next set of flags below. </para></listitem> <listitem><para> - <emphasis>RTP/AVP, RTP/SAVP, RTP/AVPF, RTP/SAVPF</emphasis> - these serve as - an alternative, more explicit way to select between the different &rtp; protocols + <emphasis>RTP/AVP, RTP/SAVP, UDP/TLS/RTP/SAVP, RTP/AVPF, RTP/SAVPF, UDP/TLS/RTP/SAVPF</emphasis> - these + serve as an alternative, more explicit way to select between the different &rtp; protocols and profiles supported by the &rtp; proxy. For example, giving the flag <quote>RTP/SAVPF</quote> has the same effect as giving the two flags <quote>SRTP AVPF</quote>. 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(&key, "AVPF")) ng_flags->transport |= 0x102; + else if (str_eq(&key, "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(&key, "UDP/TLS/RTP/SAVP")) + ng_flags->transport = 0x104; + else + goto generic; + goto next; + break; + + case 17: + if (str_eq(&key, "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", - transports[ng_flags.transport & 0x003]); + transports[ng_flags.transport & 0x007]); if (ng_flags.rtcp_mux && ng_flags.rtcp_mux->child) bencode_dictionary_add(ng_flags.dict, "rtcp-mux", ng_flags.rtcp_mux);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2018