sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
270 discussions

git:5.4:e4eda3f5: textops: docs update to state regex params expect posix format

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: e4eda3f5131e2788670a1f9f8342a2889e9b1107 URL: https://github.com/kamailio/kamailio/commit/e4eda3f5131e2788670a1f9f8342a28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:27:36+01:00 textops: docs update to state regex params expect posix format (cherry picked from commit b19aab7fe00f72d0c9e54a7a106ec7a065a3d02b) (cherry picked from commit a78acd8f40ed38b161a075bef74febd93acb092c) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e4eda3f5131e2788670a1f9f8342a28… Patch: https://github.com/kamailio/kamailio/commit/e4eda3f5131e2788670a1f9f8342a28… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 55e7cf36aa..c0791ab00c 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -19,9 +19,15 @@ The module implements text based operations over the SIP message processed by &kamailio;. SIP is a text based protocol and the module provides a large set of very useful functions to manipulate the - message at text level, e.g., regular expression search and replace, - Perl-like substitutions, checks for method type, header presence, - insert of new header and date, etc. + message at text level, e.g., regular expression search, replace + or substitutions, checks for method type, header presence, + insert of new header and date, string comparisons, multi-part body + operations, etc. + </para> + <para> + If not stated otherwise, the regular expressions parameters for search, + replace or substitute have to be in POSIX format. For PCRE regular + expression matching, see the pcre or dialplan modules. </para> </section> <section> @@ -555,7 +561,7 @@ replace_hdrs_str("&kamailio;", "&kamailio; SIP Proxy", "a"); <function moreinfo="none">subst('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like). + Replaces re with repl. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -692,7 +698,7 @@ if (subst_user('/(.*)3642$/$avp(user_prefix)\13642/')){$ <function moreinfo="none">subst_body('/re/repl/flags')</function> </title> <para> - Replaces re with repl (sed or perl like) in the body of the message. + Replaces re with repl in the body of the message. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -732,7 +738,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; <function moreinfo="none">subst_hf(hf, subexp, flags)</function> </title> <para> - Perl-like substitutions in the body of a header field. + Substitutions in the body of a header field. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist>

2 years, 8 months

git:5.4:eb163386: async: docs - added section ids for parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: eb1633863b28089681707c9cd27842a9109fea51 URL: https://github.com/kamailio/kamailio/commit/eb1633863b28089681707c9cd27842a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:27:19+01:00 async: docs - added section ids for parameters (cherry picked from commit ed3b2506e13214d25a3dd78e487ed35ed13053ac) (cherry picked from commit 4dd8c636701c778f50d11a37265e9b6300f45ecb) --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/eb1633863b28089681707c9cd27842a… Patch: https://github.com/kamailio/kamailio/commit/eb1633863b28089681707c9cd27842a… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 5e9277a194c..a56c60d7d2f 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -68,7 +68,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="async.p.workers"> <title><varname>workers</varname> (int)</title> <para> Number of worker processes to be started to handle the asynchronous @@ -88,7 +88,7 @@ modparam("async", "workers", 2) </programlisting> </example> </section> - <section> + <section id="async.p.ms_timer"> <title><varname>ms_timer</varname> (int)</title> <para> Enables millisecond timer for async_ms_sleep() and async_ms_route() functions.

2 years, 8 months

git:5.5:84c08aca: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.5 Commit: 84c08acade0e548de11867866ec52223295c2f4a URL: https://github.com/kamailio/kamailio/commit/84c08acade0e548de11867866ec5222… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-06T14:31:24+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/84c08acade0e548de11867866ec5222… Patch: https://github.com/kamailio/kamailio/commit/84c08acade0e548de11867866ec5222… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 5ccd4af6c7..0b0d385a3e 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -55,7 +55,7 @@ Daniel-Constantin Mierla 3.26. contact_flows_avp (string) 3.27. fr_timer_avp (string) 3.28. fr_inv_timer_avp (string) - 3.29. unmatched_cancel (string) + 3.29. unmatched_cancel (integer) 3.30. ruri_matching (integer) 3.31. via1_matching (integer) 3.32. callid_matching (integer) @@ -317,7 +317,7 @@ Chapter 1. Admin Guide 3.26. contact_flows_avp (string) 3.27. fr_timer_avp (string) 3.28. fr_inv_timer_avp (string) - 3.29. unmatched_cancel (string) + 3.29. unmatched_cancel (integer) 3.30. ruri_matching (integer) 3.31. via1_matching (integer) 3.32. callid_matching (integer) @@ -693,7 +693,7 @@ failure_route["serial"] 3.26. contact_flows_avp (string) 3.27. fr_timer_avp (string) 3.28. fr_inv_timer_avp (string) - 3.29. unmatched_cancel (string) + 3.29. unmatched_cancel (integer) 3.30. ruri_matching (integer) 3.31. via1_matching (integer) 3.32. callid_matching (integer) @@ -1290,7 +1290,7 @@ modparam("tm", "fr_inv_timer_avp", "$avp(my_fr_inv_timer)") modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") ... -3.29. unmatched_cancel (string) +3.29. unmatched_cancel (integer) This parameter selects between forwarding CANCELs that do not match any transaction statefully (0, default value), statelessly (1) or dropping @@ -1307,7 +1307,7 @@ modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") Example 1.29. Set unmatched_cancel parameter ... -modparam("tm", "unmatched_cancel", "2") +modparam("tm", "unmatched_cancel", 2) ... 3.30. ruri_matching (integer)

2 years, 8 months

git:5.5:7b371b77: db_redis: don't leave unconsumed redis replies in case of error on update

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 7b371b77702471e62d8bd2ee957c44df73f1db80 URL: https://github.com/kamailio/kamailio/commit/7b371b77702471e62d8bd2ee957c44d… Author: Andrii Pogrebennyk <andrii(a)ng-voice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:24:45+01:00 db_redis: don't leave unconsumed redis replies in case of error on update Execute db_redis_consume_replies on failed update same as in db_redis_insert: if db_redis_perform_update encounters an error it was leaving unconsumed data thus causing unexpected reply later on when reading from the same connection. (cherry picked from commit bbd7b2ed5827252680e9d8949c193699da0a76b2) --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/7b371b77702471e62d8bd2ee957c44d… Patch: https://github.com/kamailio/kamailio/commit/7b371b77702471e62d8bd2ee957c44d… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index c9a25adf36d..ac1bd2b9467 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -2249,6 +2249,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con db_redis_key_free(&all_type_keys); db_redis_key_free(&new_type_keys); + db_redis_consume_replies(con); return 0; error: @@ -2260,6 +2261,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con db_redis_key_free(&type_keys); db_redis_key_free(&set_keys); db_redis_key_free(&new_type_keys); + db_redis_consume_replies(con); return -1; }

2 years, 8 months

git:5.5:fcc065f0: dispatcher: Not possible to deactivate probing of destination by reload

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: fcc065f0cd873d9880a5b9a170a305c858b95753 URL: https://github.com/kamailio/kamailio/commit/fcc065f0cd873d9880a5b9a170a305c… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:24:28+01:00 dispatcher: Not possible to deactivate probing of destination by reload If ds_probing_mode is set to 3, flag in the dispatcher entry needs to include 8 for probing to happen. Changing a destination to not include this anymore while the destination do not respond to OPTIONS will cause the probing flag to be re-added because of the delayed response. A restart will fix it. We need to check against the probing flag in the CB function to determine if we should continue probing this destination. If probing is deativated while waiting for a reply, we should abort. (cherry picked from commit 429fea8069f0753e6b8dbfbfaf36701e30af6dda) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/fcc065f0cd873d9880a5b9a170a305c… Patch: https://github.com/kamailio/kamailio/commit/fcc065f0cd873d9880a5b9a170a305c… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 674678417d..936c7f2993 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3503,6 +3503,11 @@ static void ds_options_callback( } } + /* Check if in the meantime someone disabled probing of the target through RPC, MI or reload */ + if(ds_probing_mode == DS_PROBE_ONLYFLAGGED && !(ds_get_state(group, &uri) & DS_PROBING_DST)) { + return; + } + /* ps->code contains the result-code of the request. * * We accept both a "200 OK" or the configured reply as a valid response */

2 years, 8 months

git:5.5:a2969015: Fix TM Module Doc unmatched_cancel param

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: a2969015b92667a728c0ec8df64adb99859b5f84 URL: https://github.com/kamailio/kamailio/commit/a2969015b92667a728c0ec8df64adb9… Author: Zion Dials <me(a)ziondials.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:24:08+01:00 Fix TM Module Doc unmatched_cancel param (cherry picked from commit c060e9000f9c6cca98e23bef7aa8c295c8863de6) --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/a2969015b92667a728c0ec8df64adb9… Patch: https://github.com/kamailio/kamailio/commit/a2969015b92667a728c0ec8df64adb9… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 3fdb0a7a497..247d6ad5e6d 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -876,7 +876,7 @@ modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") </section> <section id="tm.p.unmatched_cancel"> - <title><varname>unmatched_cancel</varname> (string)</title> + <title><varname>unmatched_cancel</varname> (integer)</title> <para> This parameter selects between forwarding CANCELs that do not match any transaction statefully (0, @@ -899,7 +899,7 @@ modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") <title>Set <varname>unmatched_cancel</varname> parameter</title> <programlisting> ... -modparam("tm", "unmatched_cancel", "2") +modparam("tm", "unmatched_cancel", 2) ... </programlisting> </example>

2 years, 8 months

git:5.5:68a69467: core: clarification for -b cli parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 68a694676df0e0a0d0a8d0180ebc39f9893b49bc URL: https://github.com/kamailio/kamailio/commit/68a694676df0e0a0d0a8d0180ebc39f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-06T14:23:41+01:00 core: clarification for -b cli parameter (cherry picked from commit f068a9ad1892777bfb9a6d1bcfd17a291578c6b6) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/68a694676df0e0a0d0a8d0180ebc39f… Patch: https://github.com/kamailio/kamailio/commit/68a694676df0e0a0d0a8d0180ebc39f… --- diff --git a/src/main.c b/src/main.c index 7630fcfeff..4075d9cdce 100644 --- a/src/main.c +++ b/src/main.c @@ -169,8 +169,8 @@ Options:\n\ default is yes.\n\ -A define Add config pre-processor define (e.g., -A WITH_AUTH,\n\ -A 'FLT_ACC=1', -A 'DEFVAL=\"str-val\"')\n\ - -b nr Maximum receive buffer size which will not be exceeded by\n\ - auto-probing procedure even if OS allows\n\ + -b nr Maximum OS UDP receive buffer size which will not be exceeded by\n\ + auto-probing-and-increase procedure even if OS allows\n\ -c Check configuration file for syntax errors\n\ --cfg-print Print configuration file evaluating includes and ifdefs\n\ -d Debugging level control (multiple -d to increase the level from 0)\n\

2 years, 8 months

git:master:2eed551e: db_cluster: Fix spelling errors

by Olle E. Johansson

Module: kamailio Branch: master Commit: 2eed551ed55fcd2bc190e1045da377f6b1e4d22d URL: https://github.com/kamailio/kamailio/commit/2eed551ed55fcd2bc190e1045da377f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2021-12-06T13:12:23+01:00 db_cluster: Fix spelling errors --- Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_data.c --- Diff: https://github.com/kamailio/kamailio/commit/2eed551ed55fcd2bc190e1045da377f… Patch: https://github.com/kamailio/kamailio/commit/2eed551ed55fcd2bc190e1045da377f… --- diff --git a/src/modules/db_cluster/dbcl_api.c b/src/modules/db_cluster/dbcl_api.c index 838f2a24c2..d1906e0f9d 100644 --- a/src/modules/db_cluster/dbcl_api.c +++ b/src/modules/db_cluster/dbcl_api.c @@ -72,7 +72,7 @@ extern int dbcl_max_query_length; cls->usedcon = cls->rlist[i].clist[j];\ return 0;\ } else {\ - LM_DBG("serial operation - failre on cluster"\ + LM_DBG("serial operation - failure on cluster"\ " [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ sec = get_ticks() - sec;\ @@ -105,7 +105,7 @@ extern int dbcl_max_query_length; cls->rlist[i].crt = (j+1) % cls->rlist[i].clen;\ return 0;\ } else {\ - LM_DBG("round robin operation - failre on cluster"\ + LM_DBG("round robin operation - failure on cluster"\ " [%.*s] (%d/%d)\n",\ cls->name.len, cls->name.s, i, j);\ sec = get_ticks() - sec;\ @@ -409,7 +409,7 @@ db1_con_t* db_cluster_init(const str* _dburl) LM_DBG("initializing with cluster [%.*s]\n", _dburl->len, _dburl->s); if(_dburl->len<10 || strncmp(_dburl->s, "cluster://", 10)!=0) { - LM_ERR("invlaid url for cluster module [%.*s]\n", + LM_ERR("invalid url for cluster module [%.*s]\n", _dburl->len, _dburl->s); return NULL; } @@ -433,7 +433,7 @@ db1_con_t* db_cluster_init(const str* _dburl) cls->ref++; h = (db1_con_t*)pkg_malloc(sizeof(db1_con_t)); if (h==NULL) { - LM_ERR("out of pkg\n"); + LM_ERR("out of pkg memory\n"); return NULL; } memset(h, 0, sizeof(db1_con_t)); diff --git a/src/modules/db_cluster/dbcl_data.c b/src/modules/db_cluster/dbcl_data.c index 02a3e7cbbe..6ff994974e 100644 --- a/src/modules/db_cluster/dbcl_data.c +++ b/src/modules/db_cluster/dbcl_data.c @@ -298,7 +298,7 @@ int dbcl_cls_set_connections(dbcl_cls_t *cls, str *cons) pit->name.len, pit->name.s, i, cls->rlist[i].clen); cls->rlist[i].clen++; } else { - LM_WARN("too many read connections in cluster - con-id [%.*s]\n", + LM_WARN("too many read connections in cluster - connection id [%.*s]\n", pit->name.len, pit->name.s); } if(s.s[2]<'0' || s.s[2]>'9')

2 years, 8 months

git:master:3e36a56f: modules: readme files regenerated - lrkproxy ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3e36a56fa6e04d68227bc4098689be3771ec8995 URL: https://github.com/kamailio/kamailio/commit/3e36a56fa6e04d68227bc4098689be3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-12-05T21:01:20+01:00 modules: readme files regenerated - lrkproxy ... [skip ci] --- Modified: src/modules/lrkproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/3e36a56fa6e04d68227bc4098689be3… Patch: https://github.com/kamailio/kamailio/commit/3e36a56fa6e04d68227bc4098689be3… --- diff --git a/src/modules/lrkproxy/README b/src/modules/lrkproxy/README index 8de720a1c7..373201433b 100644 --- a/src/modules/lrkproxy/README +++ b/src/modules/lrkproxy/README @@ -88,7 +88,7 @@ Chapter 1. Admin Guide 1. Overview This is a module that enables media streams to be relayed via - pylrkproxy engine that exist in: + pylrkproxy engine. This engine can be found at: https://github.com/mojtabaesfandiari/pylrkproxy It does relaying audio streams between peers in PREROUTING netfilter-hooking section in kernel-space linux. The LRKProxy architecture is composed of two @@ -133,7 +133,7 @@ Chapter 1. Admin Guide IMPORTANT: This module does not support balancing inside a set like as is done RTPProxy module based on the weight of each rtpproxy from the - set. The balancing would be run on different machine + set. The balancing would be run on different machine. 4. Dependencies

2 years, 8 months

git:master:17ff51f2: lrkproxy: small changes in documentation

by Henning Westerholt

Module: kamailio Branch: master Commit: 17ff51f205a9c311e9dd2908d370957faf770ea5 URL: https://github.com/kamailio/kamailio/commit/17ff51f205a9c311e9dd2908d370957… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-12-05T19:56:53Z lrkproxy: small changes in documentation --- Modified: src/modules/lrkproxy/doc/lrkproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/17ff51f205a9c311e9dd2908d370957… Patch: https://github.com/kamailio/kamailio/commit/17ff51f205a9c311e9dd2908d370957… --- diff --git a/src/modules/lrkproxy/doc/lrkproxy_admin.xml b/src/modules/lrkproxy/doc/lrkproxy_admin.xml index 2a0beb401d..728e3ea64b 100644 --- a/src/modules/lrkproxy/doc/lrkproxy_admin.xml +++ b/src/modules/lrkproxy/doc/lrkproxy_admin.xml @@ -18,7 +18,7 @@ <title>Overview</title> <para> This is a module that enables media streams to be relayed via - pylrkproxy engine that exist in: + pylrkproxy engine. This engine can be found at: https://github.com/mojtabaesfandiari/pylrkproxy It does relaying audio streams between peers in PREROUTING netfilter-hooking section in kernel-space linux. @@ -77,7 +77,7 @@ </para> <para> IMPORTANT: This module does not support balancing inside a set like as is done RTPProxy module based on - the weight of each rtpproxy from the set. The balancing would be run on different machine + the weight of each rtpproxy from the set. The balancing would be run on different machine. </para> </section>

2 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021