sr-dev March 2018

sr-dev@lists.kamailio.org

17 participants
328 discussions

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

Planing next Kamailio releases - v4.4.7 v5.0.6 and v5.1.2
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

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

1 3

[kamailio/kamailio] Strange behaviour with JSON module (#1452)
by Thomas Carvello 01 Mar '18

01 Mar '18

### Description  ### Troubleshooting #### Reproduction Hello, i have an issue with the JSON module . i have JSON response from a HTTP request to process in my script: {"status":"SUCCESS"} i use the command HTTP_query: _http_query("http://xxxxx", "$var(result)");_ then i try to parse my result: _json_get_field("$var(result)", "status", "$var(status)");_ But when i log my result: _xlog("L_INFO", "$var(status)");_ i have a wrong output: _INFO: <script>: "SUCCESS"_ double quote is embedded in the string variable which is wrong because this not part of my json value. Is there any way to fix this behaviour or having a new function in order to retrieve the right value of my json field? Thank you for your help. -- 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/1452

4 4

git:master:899ab355: db_mongodb: use projection iterator to convert bson for result
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: master Commit: 899ab355fb58e22eaa02336e9b5b1f2f53dba375 URL: https://github.com/kamailio/kamailio/commit/899ab355fb58e22eaa02336e9b5b1f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/899ab355fb58e22eaa02336e9b5b1f2… Patch: https://github.com/kamailio/kamailio/commit/899ab355fb58e22eaa02336e9b5b1f2… --- 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:master:aab4f5db: db_mongodb: iterate on projection fields for matching cols in result
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: master Commit: aab4f5db964bf1980729ed8b7770f550bb86b72b URL: https://github.com/kamailio/kamailio/commit/aab4f5db964bf1980729ed8b7770f55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/aab4f5db964bf1980729ed8b7770f55… Patch: https://github.com/kamailio/kamailio/commit/aab4f5db964bf1980729ed8b7770f55… --- 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:master:5218edfe: modules: readme files regenerated - app_python ... [skip ci]
by Kamailio Dev 01 Mar '18

01 Mar '18

Module: kamailio Branch: master Commit: 5218edfe606437924e24ca693f5b3776fef0e551 URL: https://github.com/kamailio/kamailio/commit/5218edfe606437924e24ca693f5b377… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-01T10:31:38+01:00 modules: readme files regenerated - app_python ... [skip ci] --- Modified: src/modules/app_python/README --- Diff: https://github.com/kamailio/kamailio/commit/5218edfe606437924e24ca693f5b377… Patch: https://github.com/kamailio/kamailio/commit/5218edfe606437924e24ca693f5b377… --- diff --git a/src/modules/app_python/README b/src/modules/app_python/README index cd5af6994f..a1269d14f0 100644 --- a/src/modules/app_python/README +++ b/src/modules/app_python/README @@ -167,11 +167,8 @@ python_exec("my_python_function", "$rU"); 5.1. app_python.reload - IMPORTANT: not functional yet (can crash a running instance, use it - only for testing). - - Marks the need to reload the js script. The actual reload is done by - every working process when the next call to KEMI config is executed. + Marks the need to reload the Python script. The actual reload is done + by each worker when the next Python method is invoked. Name: app_python.reload

1 0

git:master:5b58c2b0: app_python: implement reloading of script
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: master Commit: 5b58c2b0b0bc9014d248ec60e3fe942863f7fe2a URL: https://github.com/kamailio/kamailio/commit/5b58c2b0b0bc9014d248ec60e3fe942… Author: AntonyA <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/5b58c2b0b0bc9014d248ec60e3fe942… Patch: https://github.com/kamailio/kamailio/commit/5b58c2b0b0bc9014d248ec60e3fe942…

1 0

[kamailio/kamailio] app_python: implement reloading of script (#1462)
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 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

2 2

git:5.1:a4c5397f: pkg/docker: Updated reference to packaging scripts
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: a4c5397f87daa2513ed9fdc4f8f8d532cc10852e URL: https://github.com/kamailio/kamailio/commit/a4c5397f87daa2513ed9fdc4f8f8d53… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/a4c5397f87daa2513ed9fdc4f8f8d53… Patch: https://github.com/kamailio/kamailio/commit/a4c5397f87daa2513ed9fdc4f8f8d53… --- diff --git a/pkg/docker b/pkg/docker index d5eef889b8..dee22bb1ec 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit d5eef889b8be77c90a4ab1eac29e240132499060 +Subproject commit dee22bb1ec7bda31723349f37602a5ac6ef8445a

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2018