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>
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;
}
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 */
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\
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
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>