- sr-dev - kamailio.org

git:5.4:eb163386: async: docs - added section ids for parameters
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

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.

1 0

git:5.4:e4eda3f5: textops: docs update to state regex params expect posix format
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

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>

1 0

git:5.5:84c08aca: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 06 Dec '21

06 Dec '21

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)

1 0

git:5.5:7b371b77: db_redis: don't leave unconsumed redis replies in case of error on update
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

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; }

1 0

git:5.5:68a69467: core: clarification for -b cli parameter
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

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\

1 0

git:5.5:a2969015: Fix TM Module Doc unmatched_cancel param
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

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>

1 0

git:5.5:fcc065f0: dispatcher: Not possible to deactivate probing of destination by reload
by Daniel-Constantin Mierla 06 Dec '21

06 Dec '21

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 */

1 0

git:master:2eed551e: db_cluster: Fix spelling errors
by Olle E. Johansson 06 Dec '21

06 Dec '21

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')

1 0

git:master:3e36a56f: modules: readme files regenerated - lrkproxy ... [skip ci]
by Kamailio Dev 05 Dec '21

05 Dec '21

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

1 0

git:master:17ff51f2: lrkproxy: small changes in documentation
by Henning Westerholt 05 Dec '21

05 Dec '21

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>

1 0

git:master:3c905ec2: lrkproxy:some features add to lrkproxy module
by Mojtaba Esfandiari.S 05 Dec '21

05 Dec '21

Module: kamailio Branch: master Commit: 3c905ec289c2779b969f185021518f3532ce6833 URL: https://github.com/kamailio/kamailio/commit/3c905ec289c2779b969f185021518f3… Author: Mojtaba Esfandiari.S <mespio(a)gmail.com> Committer: Mojtaba Esfandiari.S <mespio(a)gmail.com> Date: 2021-12-04T00:41:51+03:30 lrkproxy:some features add to lrkproxy module add 'gt' option for optimization port resource allocation add 'custom_sdp_ip_avp' option for handling NAT client --- Modified: src/modules/lrkproxy/README Modified: src/modules/lrkproxy/doc/lrkproxy_admin.xml Modified: src/modules/lrkproxy/lrkproxy.c Modified: src/modules/lrkproxy/lrkproxy_funcs.c Modified: src/modules/lrkproxy/lrkproxy_funcs.h Modified: src/modules/lrkproxy/lrkproxy_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/3c905ec289c2779b969f185021518f3… Patch: https://github.com/kamailio/kamailio/commit/3c905ec289c2779b969f185021518f3…

2 1

git:master:986b9bea: pkg/kamailio/deb: fix bookworm and sid build
by Victor Seva 04 Dec '21

04 Dec '21

Module: kamailio Branch: master Commit: 986b9bea258864bf40606afe9761dc17dead6476 URL: https://github.com/kamailio/kamailio/commit/986b9bea258864bf40606afe9761dc1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-04T17:01:55+01:00 pkg/kamailio/deb: fix bookworm and sid build * no python2 and dh-systemd package available --- Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/debian/backports/bookworm Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules --- Diff: https://github.com/kamailio/kamailio/commit/986b9bea258864bf40606afe9761dc1… Patch: https://github.com/kamailio/kamailio/commit/986b9bea258864bf40606afe9761dc1…

1 0

DMQ + Presence issue (Notify generated by both server)
by Hardik Patel 03 Dec '21

03 Dec '21

Hello Team, We are using Kamailio 5.4.7 (DMQ + Presence) modules. We want to replicate all subscribe from server-1(Presence) to server-2(Presence).Replication worked perfectly fine but we noticed that after replicate the subscribe event both the presence server are generating the NOTIFY which should not. Can you please guide us where we made the mistake or how we can just replicate the subscribe information to other server using DMQ module? Please find the configuration SERVER-1 (Presence) ======================== ### presence_dialoginfo params ### modparam("presence_dialoginfo", "force_single_dialog", 1) ######## presence params ######### modparam("presence", "db_table_lock_type", 0) modparam("presence", "db_url", DBURL_LOCAL) modparam("presence", "db_update_period", 30) modparam("presence", "send_fast_notify", 1) modparam("presence", "clean_period", 100) modparam("presence", "subs_db_mode", 3) modparam("presence", "timeout_rm_subs", 0) //new/ modparam("presence", "notifier_poll_rate", 20) //new// modparam("presence", "waitn_time",1) modparam("presence", "fetch_rows", 1000) modparam("presence", "presentity_table", "presentity") modparam("presence", "active_watchers_table", "active_watchers") modparam("presence", "watchers_table", "watchers") modparam("presence", "max_expires", 3600) modparam("presence", "server_address", "sip:presence@VAR_LOCAL_IP:SIP_PORT") modparam("presence", "notifier_processes", 0) modparam("presence", "publ_cache", 1) modparam("presence", "subs_htable_size", 15) modparam("presence", "pres_htable_size", 15) modparam("presence", "delete_same_subs", 1) modparam("presence", "timer_mode", 0) modparam("presence", "force_delete", 1) modparam("presence", "enable_dmq", 1) ######## presence_xml params ###### modparam("presence_xml", "db_url", DBURL_LOCAL) modparam("presence_xml", "force_active", 1) #modparam("presence_xml", "disable_presence",1) #--- dmq db param ---- modparam("dmq","server_address","sip:VAR_LOCAL_IP:SIP_PORT") modparam("dmq", "notification_address", DMQ_NOTIFY_ADDR1) modparam("dmq", "num_workers", 4) modparam("dmq", "multi_notify", 1) modparam("dmq", "ping_interval", 60) if(is_method("KDMQ")) { dmq_handle_message(); } route[HANDLE_PRESENCE] { if (! t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { if ($hdr(Event) == "message-summary") { if($hdr(P-Flags)=~"1") { remove_hf("Event"); append_hf("Event: dialog\r\n"); msg_apply_changes(); remove_hf("Content-Type"); append_hf("Content-Type: application/dialog-info+xml\r\n"); msg_apply_changes(); } } if((search_hf("To", "queue+", "a")) && is_present_hf("SIP-If-Match")){ remove_hf("SIP-If-Match"); msg_apply_changes(); } xlog("L_ERR","(xhttp:request) : HANDLE_PUBLISH_FUN \n"); handle_publish(); t_release(); } else if( is_method("SUBSCRIBE")) { handle_subscribe(); if(!dmq_is_from_node()) dmq_t_replicate(); t_release(); } exit; } SERVER-2 (Presence) ====================== ### presence_dialoginfo params ### modparam("presence_dialoginfo", "force_single_dialog", 1) ######## presence params ######### modparam("presence", "db_table_lock_type", 0) modparam("presence", "db_url", DBURL_LOCAL) modparam("presence", "db_update_period", 30) modparam("presence", "send_fast_notify", 1) modparam("presence", "clean_period", 100) modparam("presence", "subs_db_mode", 3) modparam("presence", "timeout_rm_subs", 0) //new/ modparam("presence", "notifier_poll_rate", 20) //new// modparam("presence", "waitn_time",1) modparam("presence", "fetch_rows", 1000) modparam("presence", "presentity_table", "presentity") modparam("presence", "active_watchers_table", "active_watchers") modparam("presence", "watchers_table", "watchers") modparam("presence", "max_expires", 3600) modparam("presence", "server_address", "sip:presence@VAR_LOCAL_IP:SIP_PORT") modparam("presence", "notifier_processes", 0) modparam("presence", "publ_cache", 1) modparam("presence", "subs_htable_size", 15) modparam("presence", "pres_htable_size", 15) modparam("presence", "delete_same_subs", 1) modparam("presence", "timer_mode", 0) modparam("presence", "force_delete", 1) modparam("presence", "enable_dmq", 1) ######## presence_xml params ###### modparam("presence_xml", "db_url", DBURL_LOCAL) modparam("presence_xml", "force_active", 1) #modparam("presence_xml", "disable_presence",1) #--- dmq db param ---- modparam("dmq","server_address","sip:VAR_LOCAL_IP:SIP_PORT") modparam("dmq", "notification_address", DMQ_NOTIFY_ADDR1) modparam("dmq", "num_workers", 4) modparam("dmq", "multi_notify", 1) modparam("dmq", "ping_interval", 60) if(is_method("KDMQ")) { dmq_handle_message(); } route[HANDLE_PRESENCE] { if (! t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { if ($hdr(Event) == "message-summary") { if($hdr(P-Flags)=~"1") { remove_hf("Event"); append_hf("Event: dialog\r\n"); msg_apply_changes(); remove_hf("Content-Type"); append_hf("Content-Type: application/dialog-info+xml\r\n"); msg_apply_changes(); } } if((search_hf("To", "queue+", "a")) && is_present_hf("SIP-If-Match")){ remove_hf("SIP-If-Match"); msg_apply_changes(); } xlog("L_ERR","(xhttp:request) : HANDLE_PUBLISH_FUN \n"); handle_publish(); t_release(); } else if( is_method("SUBSCRIBE")) { handle_subscribe(); if(!dmq_is_from_node()) dmq_t_replicate(); t_release(); } exit; } version: kamailio 5.4.7 (x86_64/linux) a19fe1 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a19fe1 compiled on 00:05:09 Oct 21 2021 with gcc 8.3.0 -- Hardik Patel

1 0

git:master:3e4e5958: tsilo: reworked checking ruri and contact parameters
by Daniel-Constantin Mierla 03 Dec '21

03 Dec '21

Module: kamailio Branch: master Commit: 3e4e59584f3e8a2fea1d9167eaf42eda8cc5653b URL: https://github.com/kamailio/kamailio/commit/3e4e59584f3e8a2fea1d9167eaf42ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-03T13:02:45+01:00 tsilo: reworked checking ruri and contact parameters - removed module name from log messages --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/3e4e59584f3e8a2fea1d9167eaf42ed… Patch: https://github.com/kamailio/kamailio/commit/3e4e59584f3e8a2fea1d9167eaf42ed…

1 0

[kamailio/kamailio] sqlite: module group creation (PR #2952)
by jailbird777 03 Dec '21

03 Dec '21

- Add sqlite as an option to Makefile.groups - Add sqlite to INSTALL documentation - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] 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 - [X] 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 db_sqlite couldn't be enable previously using group_include=sqlite. This fixes that. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2952 -- Commit Summary -- * sqlite: module group creation -- File Changes -- M INSTALL (10) M src/Makefile.groups (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2952.patch https://github.com/kamailio/kamailio/pull/2952.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/2952

2 1

git:master:e976054f: sqlite: module group creation
by Daniel-Constantin Mierla 03 Dec '21

03 Dec '21

Module: kamailio Branch: master Commit: e976054f71692b536f59a81347e8254886f08a69 URL: https://github.com/kamailio/kamailio/commit/e976054f71692b536f59a81347e8254… Author: JailBird <jailbird(a)fdf.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-03T13:02:06+01:00 sqlite: module group creation - Add sqlite as an option to Makefile.groups - Add sqlite to INSTALL documentation --- Modified: INSTALL Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/e976054f71692b536f59a81347e8254… Patch: https://github.com/kamailio/kamailio/commit/e976054f71692b536f59a81347e8254… --- diff --git a/INSTALL b/INSTALL index 63c03062f4..7982d1d380 100644 --- a/INSTALL +++ b/INSTALL @@ -102,6 +102,7 @@ Requirements: - python and devel headers for the Python module - jdk and gcj for Java module - the jansson library for the jansson module used for JSON document handling +- libsqlite3 if you need SQLite support (the db_sqlite module) Some modules have other requirements on third-party libraries. This is documented in the README for the specific module. @@ -120,6 +121,7 @@ OS Notes: - expat-1.95.8 (/usr/ports/textproc/expat2) for libexpat - libxml2-2.6.18 (/usr/ports/textproc/libxml2) for libxml2 - radiusclient-0.4.7 (/usr/ports/net/radiusclient) for libradiusclient-ng + - sqlite3-3.35.5 (/usr/ports/databases/sqlite3) for libsqlite3 NOTE: you'll need to add radiusclient_ng=4 to the gmake command line if you use the 0.4.* version. @@ -135,6 +137,7 @@ OS Notes: http://download.berlios.de/radiusclient-ng/radiusclient-ng-0.5.1.tar.gz (you need to download and install it, since there is no "official" openbsd port for it) for libradiusclient-ng + - sqlite3-3.35.5 (/usr/ports/databases/sqlite3) for libsqlite3 Compile example (all the modules and SIP server core in a tar.gz): gmake bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius pa" @@ -145,6 +148,7 @@ OS Notes: - expat-1.95.8nb2 (/usr/pkgsrc/textproc/expat) for libexpat - libxml2-2.6.19 (/usr/pkgsrc/textproc/libxml2) for libxml2 - radiusclient-ng-0.5.1 (see OpenBSD) + - sqlite3-3.36.0 (/usr/pkgsrc/databases/sqlite3) for libsqlite Compile example (all the modules and SIP server in a tar.gz): gmake bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius pa" @@ -172,6 +176,7 @@ OS Notes: - libexpat1-dev for libexpat - libxml2-dev for libxml2 - libradiusclient-ng-dev for libradiusclient + - libsqlite3-dev for libsqlite - other libraries are needed for some other modules, see README of the module you want to use Kamailio have APT deb repositories that allow you to @@ -258,8 +263,8 @@ Including groups of modules: - db - Modules in this group use databases and need a database driver to run. Included are drivers for the text mode db (dbtext) and for dumping - large amount of data to files (db_flatstore). See also the mysql or - postgres groups. + large amount of data to files (db_flatstore). See also the mysql, + postgres, or sqlite groups. - standard_dep - Modules in this group are considered a standard part of Kamailio (due to widespread usage) but they have dependencies that must be satisfied @@ -290,6 +295,7 @@ are grouped based on Debian packaging rules. For example: mysql - Include all the db modules dependent and the MySQL db driver postgres - Include all the db modules and the PostgreSQL db driver + sqlite - Include all the db modules and the SQLite db driver radius - Include all modules on radiusclient presence - Include all the presence modules diff --git a/src/Makefile.groups b/src/Makefile.groups index 62a585cafb..c388489a66 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -319,6 +319,10 @@ module_group_mysql=$(module_group_mysql_driver) $(module_group_db) module_group_postgres_driver=$(mod_list_postgres) module_group_postgres=$(module_group_postgres_driver) $(module_group_db) +# For sqlite +module_group_sqlite_driver=$(mod_list_sqlite) +module_group_sqlite=$(module_group_sqlite_driver) $(module_group_db) + # For radius module_group_radius=$(mod_list_radius)

1 0

git:master:f01a00bf: pkg/kamailio/deb: Add bookworm support
by Victor Seva 03 Dec '21

03 Dec '21

Module: kamailio Branch: master Commit: f01a00bf86bbdd09e26ba08f0da8ec89172a5eb8 URL: https://github.com/kamailio/kamailio/commit/f01a00bf86bbdd09e26ba08f0da8ec8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-12-03T11:01:35+01:00 pkg/kamailio/deb: Add bookworm support --- Added: pkg/kamailio/deb/bookworm/changelog Added: pkg/kamailio/deb/bookworm/compat Added: pkg/kamailio/deb/bookworm/control Added: pkg/kamailio/deb/bookworm/copyright Added: pkg/kamailio/deb/bookworm/kamailio-autheph-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-berkeley-bin.dirs Added: pkg/kamailio/deb/bookworm/kamailio-dnssec-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-outbound-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-websocket-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio.README.Debian Added: pkg/kamailio/deb/bookworm/kamailio.default Added: pkg/kamailio/deb/bookworm/kamailio.examples Added: pkg/kamailio/deb/bookworm/kamailio.init Added: pkg/kamailio/deb/bookworm/kamailio.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio.postinst Added: pkg/kamailio/deb/bookworm/kamailio.service Added: pkg/kamailio/deb/bookworm/rules Added: pkg/kamailio/deb/bookworm/source.lintian-overrides Added: pkg/kamailio/deb/bookworm/source/format Added: pkg/kamailio/deb/bookworm/watch Added: pkg/kamailio/deb/debian/backports/bookworm --- Diff: https://github.com/kamailio/kamailio/commit/f01a00bf86bbdd09e26ba08f0da8ec8… Patch: https://github.com/kamailio/kamailio/commit/f01a00bf86bbdd09e26ba08f0da8ec8…

1 0

[kamailio/kamailio] add dlg.stats_active parameter to filter dialogs that belongs to the server (Issue #2920)
by Victor Seva 01 Dec '21

01 Dec '21

### Description If two kamailio servers share the same dialog db table, on restart, they both load all dialogues info stored in db into memory and dlg.stats_alive returns the same amount of alive dialogues on both serves. ### Expected behavior I would expect that dlg.stats_alive would return just the dialogues info that belongs to the server ( socket_info is not empty ) ### Possible Solutions Introduce an optional parameter to the RPC command to filter just the dialogues that belongs to the server -- 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/2920

2 2

[kamailio/kamailio] Loose Route Problem with uac_reg_request_to()/uac_auth() in combination with topos/topos_redis (Issue #2961)
by Emil Kroymann 01 Dec '21

01 Dec '21

We use Kamailio 5.5.0 and topos/topos_redis as well as the uac module to register with sipconnect 1.1 based trunks. When we want to originate a call via such a trunk, we encounter the following problem with ACK routing. 200 OK sent by Trunk `U 217.10.68.150:5060 -> 172.31.16.103:5060 #7583 SIP/2.0 200 OK. Via: SIP/2.0/UDP 3.67.244.157:5060;branch=z9hG4bK496f.744a3c48b24be1ba5fdda68cf5fe3878.1. Record-Route: <sip:172.20.40.8;lr>. Record-Route: <sip:217.10.68.150;lr>. Call-ID: 7cd83e052202a97f4e28728276e0c758@35.157.121.101:5060. From: "01705441258" <sip:2908206t0@sipconnect.sipgate.de>;tag=as010d26b4. To: <sip:+493046996025@voip.sandbox.aaron.ai>;tag=221f5413-4c48-4f53-97e8-d96ea6413f26. CSeq: 102 INVITE. Allow: OPTIONS, SUBSCRIBE, NOTIFY, PUBLISH, INVITE, ACK, BYE, CANCEL, UPDATE, MESSAGE, REFER. Contact: <sip:217.10.77.61:5060>. Supported: replaces. Content-Type: application/sdp. Content-Length: 242. .. v=0. o=- 56188352 56188354 IN IP4 212.9.44.180. s=sGW. c=IN IP4 212.9.44.180. t=0 0. m=audio 27558 RTP/AVP 8 101. a=maxptime:150. a=rtpmap:8 PCMA/8000. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-16. a=sendrecv. a=rtcp:27559. a=ptime:20. ` ACK sent by Kamailio `ACK sip:217.10.68.150:5060 SIP/2.0. Via: SIP/2.0/UDP 3.67.244.157:5060;branch=z9hG4bK496f.af6a45e3907d2bea8ea65cc42f223fb2.0. Max-Forwards: 69. From: "01705441258" <sip:01705441258@35.157.121.101>;tag=as010d26b4. To: <sip:+493046996025@voip.sandbox.aaron.ai:5060>;tag=221f5413-4c48-4f53-97e8-d96ea6413f26. Call-ID: 7cd83e052202a97f4e28728276e0c758@35.157.121.101:5060. CSeq: 102 ACK. User-Agent: Asterisk PBX 13.38.1. Content-Length: 0. Route: <sip:217.10.68.150;lr>. Route: <sip:172.20.40.8;lr>. Contact: <sip:btpsh-61a6122b-a-1@3.67.244.157>. .. ` The ACK is not accepted by the trunk, because the R-URI does not contain the address fromt the 200 OK/Contact. 200 OK is then retransmitted by the trunk. [kamailio-uac-topos-bug-report.zip](https://github.com/kamailio/kamailio/fil… -- 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/2961

2 2

git:master:d6a34eee: core: reworked string-number conversion to catch out of limits values
by Daniel-Constantin Mierla 01 Dec '21

01 Dec '21

Module: kamailio Branch: master Commit: d6a34eee893a47450650ea29671e80dbffc03c8f URL: https://github.com/kamailio/kamailio/commit/d6a34eee893a47450650ea29671e80d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-01T09:34:28+01:00 core: reworked string-number conversion to catch out of limits values --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/d6a34eee893a47450650ea29671e80d… Patch: https://github.com/kamailio/kamailio/commit/d6a34eee893a47450650ea29671e80d… --- diff --git a/src/core/ut.h b/src/core/ut.h index 9b899a94e7..44bd0e75c7 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -627,37 +627,43 @@ static inline void strlower(str* _s) } } - -#define str2unval(_s, _r, _vmax) do { \ - int i; \ - if (_r == NULL) return -1; \ +#define str2unval(_s, _r, _vtype, _vmax) do { \ + _vtype limitmul; \ + int i, c, limitrst; \ + if((_s == NULL) || (_r == NULL) || (_s->len < 0) || (_s->s == NULL)) { \ + return -1; \ + } \ *_r = 0; \ - if (_s == NULL) return -1; \ - if (_s->len < 0) return -1; \ - if (_s->s == NULL) return -1; \ - for(i = 0; i < _s->len; i++) { \ - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ - if(*_r > _vmax/10) { \ - return -1; \ - } \ - *_r *= 10; \ - if(*_r > _vmax - (_s->s[i] - '0')) { \ - return -1; \ - } \ - *_r += _s->s[i] - '0'; \ - } else { \ + i = 0; \ + if (_s->s[0] == '+') { \ + i++; \ + } \ + limitmul = _vmax / 10; \ + limitrst = _vmax % 10; \ + for(; i < _s->len; i++) { \ + c = (unsigned char)_s->s[i]; \ + if (c < '0' || c > '9') { \ + return -1; \ + } \ + c -= '0'; \ + if (*_r > limitmul || (*_r == limitmul && c > limitrst)) { \ + *_r = _vmax; \ return -1; \ + } else { \ + *_r *= 10; \ + *_r += c; \ } \ } \ return 0; \ } while(0) + /* * Convert an str to unsigned long */ static inline int str2ulong(str* _s, unsigned long* _r) { - str2unval(_s, _r, ULONG_MAX); + str2unval(_s, _r, long, ULONG_MAX); } /* @@ -665,56 +671,69 @@ static inline int str2ulong(str* _s, unsigned long* _r) */ static inline int str2int(str* _s, unsigned int* _r) { - str2unval(_s, _r, UINT_MAX); + str2unval(_s, _r, int, UINT_MAX); } -#define str2snval(_s, _r, _vmin, _vmax) do { \ - int i; \ - int sign; \ - long long ll; \ - if (_s == NULL) return -1; \ - if (_r == NULL) return -1; \ - if (_s->len < 0) return -1; \ - if (_s->s == NULL) return -1; \ + +#define str2snval(_s, _r, _vtype, _vmin, _vmax) do { \ + _vtype limitmul; \ + int i, c, neg, limitrst; \ + if((_s == NULL) || (_r == NULL) || (_s->len < 0) || (_s->s == NULL)) { \ + return -1; \ + } \ *_r = 0; \ - sign = 1; \ + neg = 0; \ i = 0; \ if (_s->s[0] == '+') { \ i++; \ } else if (_s->s[0] == '-') { \ - sign = -1; \ + neg = 1; \ i++; \ } \ + limitmul = neg ? _vmin : _vmax; \ + limitrst = limitmul % 10; \ + limitmul /= 10; \ + if (neg) { \ + if (limitrst > 0) { \ + limitrst -= 10; \ + limitmul += 1; \ + } \ + limitrst = -limitrst; \ + } \ for(; i < _s->len; i++) { \ - if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ - if(*_r > _vmax/10) { \ + c = (unsigned char)_s->s[i]; \ + if (c < '0' || c > '9') { \ + return -1; \ + } \ + c -= '0'; \ + if (neg) { \ + if (*_r < limitmul || (*_r == limitmul && c > limitrst)) { \ + *_r = _vmin; \ return -1; \ + } else { \ + *_r *= 10; \ + *_r -= c; \ } \ - *_r *= 10; \ - if(*_r > _vmax - (_s->s[i] - '0')) { \ + } else { \ + if (*_r > limitmul || (*_r == limitmul && c > limitrst)) { \ + *_r = _vmax; \ return -1; \ + } else { \ + *_r *= 10; \ + *_r += c; \ } \ - *_r += _s->s[i] - '0'; \ - } else { \ - return -1; \ } \ } \ - if(sign < 0) { \ - ll = (long long)(*_r) * sign; \ - if(ll < _vmin) { \ - return -1; \ - } \ - *_r *= sign; \ - } \ return 0; \ } while(0) + /* * Convert an str to signed long */ static inline int str2slong(str* _s, long* _r) { - str2snval(_s, _r, LONG_MIN, LONG_MAX); + str2snval(_s, _r, long, LONG_MIN, LONG_MAX); } @@ -723,7 +742,7 @@ static inline int str2slong(str* _s, long* _r) */ static inline int str2sint(str* _s, int* _r) { - str2snval(_s, _r, INT_MIN, INT_MAX); + str2snval(_s, _r, int, INT_MIN, INT_MAX); }

1 0

[kamailio/kamailio] sipt: added one function and 8 pseudo-variables (#2841)
by MikhailKalashnikov 30 Nov '21

30 Nov '21

- sipt_has_isup_body() - $sipt(redirection_information.reason) - $sipt(redirection_information.original_reason) - $sipt(redirecting_number.nai) - $sipt(redirecting_number) - $sipt(original_called_number.nai) - $sipt(original_called_number) - $sipt(generic_number.nai) - $sipt(generic_number)   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2841 -- Commit Summary -- * sipt: added one function and 8 pseudo-variables -- File Changes -- M src/modules/sipt/doc/sipt_admin.xml (95) M src/modules/sipt/sipt.c (358) M src/modules/sipt/ss7.h (14) M src/modules/sipt/ss7_parser.c (208) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2841.patch https://github.com/kamailio/kamailio/pull/2841.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/2841

4 20

git:master:94d1eecc: core: added #!defenvs preprocessor directive
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 94d1eecc618067bb04ed36deaf0ceee4e3bff06b URL: https://github.com/kamailio/kamailio/commit/94d1eecc618067bb04ed36deaf0ceee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T11:15:30+01:00 core: added #!defenvs preprocessor directive - similar to #!defenv, but the value is enclosed in double quotes to make it covenient to be used as a string token --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/94d1eecc618067bb04ed36deaf0ceee… Patch: https://github.com/kamailio/kamailio/commit/94d1eecc618067bb04ed36deaf0ceee… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 06c87361a7..551cfab014 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -129,7 +129,7 @@ /* start conditions */ %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P -%x PVARID INCLF IMPTF EVRTNAME CFGPRINTMODE CFGPRINTLOADMOD DEFENV_ID +%x PVARID INCLF IMPTF EVRTNAME CFGPRINTMODE CFGPRINTLOADMOD DEFENV_ID DEFENVS_ID %x LINECOMMENT DEFINE_ID DEFINE_EOL DEFINE_DATA IFDEF_ID IFDEF_EOL IFDEF_SKIP /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ @@ -565,6 +565,7 @@ ENDIF endif TRYDEF "trydefine"|"trydef" REDEF "redefine"|"redef" DEFENV defenv +DEFENVS defenvs /* else is already defined */ @@ -1449,7 +1450,28 @@ IMPORTFILE "import_file" <DEFENV_ID>[^ \t\r\n]+ { /* get the define id of environment variable */ count(); ksr_cfg_print_part(yytext); - if(pp_define_env(yytext, yyleng) < 0) { + if(pp_define_env(yytext, yyleng, KSR_PPDEF_NORMAL) < 0) { + LM_CRIT("error at %s line %d\n", (finame)?finame:"cfg", line); + ksr_exit(-1); + } + state = INITIAL; + ksr_cfg_print_initial_state(); +} + +<INITIAL,CFGPRINTMODE>{PREP_START}{DEFENVS} { count(); + ksr_cfg_print_part(yytext); + state = DEFINE_S; + BEGIN(DEFENVS_ID); +} + +<DEFENVS_ID>[ \t]* { /* eat the whitespace */ + count(); + ksr_cfg_print_part(yytext); + } +<DEFENVS_ID>[^ \t\r\n]+ { /* get the define id of environment variable */ + count(); + ksr_cfg_print_part(yytext); + if(pp_define_env(yytext, yyleng, KSR_PPDEF_QUOTED) < 0) { LM_CRIT("error at %s line %d\n", (finame)?finame:"cfg", line); ksr_exit(-1); } @@ -2060,7 +2082,7 @@ int pp_define_set(int len, char *text, int mode) return 0; } -int pp_define_env(const char *text, int len) +int pp_define_env(const char *text, int len, int qmode) { char *r; str defname; @@ -2093,7 +2115,7 @@ int pp_define_env(const char *text, int len) LM_ERR("cannot set define name [%s]\n", (char*)text); return -1; } - if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_NORMAL)<0) { + if(pp_define_set(defvalue.len, defvalue.s, qmode)<0) { LM_ERR("cannot set define value [%s]\n", (char*)text); return -1; } diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 17b19380bc..a8d27f7083 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -45,7 +45,7 @@ int pp_define(int len, const char *text); int pp_define_set(int len, char *text, int mode); int pp_define_set_type(int type); str *pp_define_get(int len, const char * text); -int pp_define_env(const char * text, int len); +int pp_define_env(const char * text, int len, int qmode); void pp_ifdef_level_update(int val); int pp_ifdef_level_check(void);

1 0

[kamailio/kamailio] db_redis: don't leave unconsumed redis replies in case of error (PR #2960)
by Andrew Pogrebennyk 30 Nov '21

30 Nov '21

- 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.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2960 -- Commit Summary -- * db_redis: don't leave unconsumed redis replies in case of error on update -- File Changes -- M src/modules/db_redis/redis_dbase.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2960.patch https://github.com/kamailio/kamailio/pull/2960.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/2960

3 2

git:master:e97ae3e6: Merge pull request #2960 from apogrebennyk/apogrebennyk/db_redis_update
by GitHub 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: e97ae3e621b2e7f28bd01069a9fbdd77ea16663f URL: https://github.com/kamailio/kamailio/commit/e97ae3e621b2e7f28bd01069a9fbdd7… Author: Andreas Granig <agranig(a)linguin.org> Committer: GitHub <noreply(a)github.com> Date: 2021-11-30T11:03:07+01:00 Merge pull request #2960 from apogrebennyk/apogrebennyk/db_redis_update db_redis: don't leave unconsumed redis replies in case of error --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/e97ae3e621b2e7f28bd01069a9fbdd7… Patch: https://github.com/kamailio/kamailio/commit/e97ae3e621b2e7f28bd01069a9fbdd7… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index f7e26e693e..a53d1a3443 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; }

1 0

git:master:bbd7b2ed: db_redis: don't leave unconsumed redis replies in case of error on update
by Andrii Pogrebennyk 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: bbd7b2ed5827252680e9d8949c193699da0a76b2 URL: https://github.com/kamailio/kamailio/commit/bbd7b2ed5827252680e9d8949c19369… Author: Andrii Pogrebennyk <andrii(a)ng-voice.com> Committer: Andrii Pogrebennyk <andrii(a)ng-voice.com> Date: 2021-11-28T08:34:36+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. --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/bbd7b2ed5827252680e9d8949c19369… Patch: https://github.com/kamailio/kamailio/commit/bbd7b2ed5827252680e9d8949c19369… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index f7e26e693e..a53d1a3443 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; }

1 0

[kamailio/kamailio] pv: extend $cnt to work with $xavp (PR #2940)
by Nicolas C 30 Nov '21

30 Nov '21

As suggested in previous PR (#2936). This is much more flexible as it can also handle sub XAVPs, and indexes. This ended up being more complicated than I anticipated, but I wanted to handle all possible cases. The tests I performed are detailled after, they should cover every possible use case. #### Type Of Change - [x] New feature (non-breaking change which adds new functionality) #### Checklist: - [x] Tested changes locally #### Description Allows counting XAVPs with `$cnt($xavp(...))` In addition to the `$cnt($avp(...))` - which is not modified. /* Usage: * * $cnt($xavp(key[*])) : number of XAVPs "key". * $cnt($xavp(key[n]=>sub[*])) : number of children "sub" in XAVP "key[n]". * $cnt($xavp(key[*]=>sub[*])) : total number of children "sub" in all XAVPs "key". * * $cnt($xavp(key[n])) : 1 or 0 (if this index exists or not). * $cnt($xavp(key[-n])) : same but with reverse indexing (-1 is the last index). * * $cnt($xavp(key[*]=>sub[n])) : number of children "sub[n]" that exist in all XAPVs "key". * * $cnt($xavp(key)) is the same as $cnt($xavp(key[*])). * $cnt($xavp(key=>sub)) is the same as $cnt($xavp(key[*]=>sub[*])). * * Note: Usually for a XAVP no index means "index 0", not all. * But this would be less intuitive in our case for counting. */ #### Tests I tried to be exhaustive. All the test cases below do work as expected. ``` $xavp(case1) = "case1.value1"; $xavp(case1) = "case1.value2"; $xavp(case1) = "case1.value3"; $xavp(case2=>sub1) = "case2.value1 sub1.value1"; $xavp(case2[0]=>sub1) = "case2.value1 sub1.value2"; $xavp(case2[0]=>sub1) = "case2.value1 sub1.value3"; $xavp(case2[0]=>sub2) = "case2.value1 sub2.value1"; $xavp(case2[0]=>sub2) = "case2.value1 sub2.value2"; # => will become case2[1] after adding the next entry $xavp(case2=>sub1) = "case2.value2 sub1.value1"; $xavp(case2[0]=>sub1) = "case2.value2 sub1.value2"; xlog("L_INFO", "----------- TESTS $$cnt($$xavp...) - root XAVPs with no sub XAVPs\n"); xlog("L_INFO", "xavp(case1[0]) : value = $xavp(case1[0]) : cnt (expect: 1) = $cnt($xavp(case1[0]))\n"); xlog("L_INFO", "xavp(case1[1]) : value = $xavp(case1[1]) : cnt (expect: 1) = $cnt($xavp(case1[1]))\n"); xlog("L_INFO", "xavp(case1[-1]) : value = $xavp(case1[-1]) : cnt (expect: 1) = $cnt($xavp(case1[-1]))\n"); xlog("L_INFO", "xavp(case1[-2]) : value = $xavp(case1[-2]) : cnt (expect: 1) = $cnt($xavp(case1[-2]))\n"); xlog("L_INFO", "xavp(case1[-66]) : value = $xavp(case1[-66]) : cnt (expect: 0) = $cnt($xavp(case1[-66]))\n"); xlog("L_INFO", "xavp(case1[66]) : value = $xavp(case1[66]) : cnt (expect: 0) = $cnt($xavp(case1[66]))\n"); xlog("L_INFO", "xavp(case1[*]) : cnt (expect: 3) = $cnt($xavp(case1[*]))\n"); xlog("L_INFO", "xavp(case1) : cnt (expect: 3) = $cnt($xavp(case1))\n"); xlog("L_INFO", "xavp(case1=>sub) : cnt (expect: 0) = $cnt($xavp(case1=>sub))\n"); xlog("L_INFO", "xavp(case1[0]=>sub) : cnt (expect: 0) = $cnt($xavp(case1[0]=>sub))\n"); xlog("L_INFO", "xavp(case1[0]=>sub[0]) : value = $xavp(case1[0]=>sub[0]) : cnt (expect: 0) = $cnt($xavp(case1[0]=>sub[0]))\n"); xlog("L_INFO", "----------- TESTS $$cnt($$xavp...) - root XAVPs using single index\n"); xlog("L_INFO", "xavp(case2[1]=>sub1[0]) : value = $xavp(case2[1]=>sub1[0]) : cnt (expect: 1) = $cnt($xavp(case2[1]=>sub1[0]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub1[-1]) : value = $xavp(case2[1]=>sub1[-1]) : cnt (expect: 1) = $cnt($xavp(case2[1]=>sub1[-1]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub1[3]) : value = $xavp(case2[1]=>sub1[3]) : cnt (expect: 0) = $cnt($xavp(case2[1]=>sub1[3]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub1[*]) : cnt (expect: 3) = $cnt($xavp(case2[1]=>sub1[*]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub1) : cnt (expect: 3) = $cnt($xavp(case2[1]=>sub1))\n"); xlog("L_INFO", "xavp(case2[1]=>sub2[*]) : cnt (expect: 2) = $cnt($xavp(case2[1]=>sub2[*]))\n"); xlog("L_INFO", "xavp(case2[1]=>sub2) : cnt (expect: 2) = $cnt($xavp(case2[1]=>sub2))\n"); xlog("L_INFO", "xavp(case2[66]=>sub1) : cnt (expect: 0) = $cnt($xavp(case2[66]=>sub1))\n"); xlog("L_INFO", "xavp(case2[66]=>sub1[0]) : cnt (expect: 0) = $cnt($xavp(case2[66]=>sub1[0]))\n"); xlog("L_INFO", "----------- TESTS $$cnt($$xavp...) - root XAVPs using all index\n"); xlog("L_INFO", "xavp(case2=>sub1) : cnt (expect: 5) = $cnt($xavp(case2=>sub1))\n"); xlog("L_INFO", "xavp(case2=>sub1[*]) : cnt (expect: 5) = $cnt($xavp(case2=>sub1[*]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1) : cnt (expect: 5) = $cnt($xavp(case2[*]=>sub1))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1[*]) : cnt (expect: 5) = $cnt($xavp(case2[*]=>sub1[*]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1) : cnt (expect: 5) = $cnt($xavp(case2[*]=>sub1))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1[0]) : cnt (expect: 2) = $cnt($xavp(case2[*]=>sub1[0]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1[2]) : cnt (expect: 1) = $cnt($xavp(case2[*]=>sub1[2]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub1[-1]) : cnt (expect: 2) = $cnt($xavp(case2[*]=>sub1[-1]))\n"); xlog("L_INFO", "xavp(case2[*]=>sub2) : cnt (expect: 2) = $cnt($xavp(case2[*]=>sub2))\n"); xlog("L_INFO", "xavp(case2[*]=>sub2[*]) : cnt (expect: 2) = $cnt($xavp(case2[*]=>sub2[*]))\n"); #xlog("L_INFO", "----------- TESTS $$cnt(...) - parsing errors\n"); # parsing error => server fails to start #xlog("L_INFO", "PARSE ERROR: $cnt($xavu(test))\n"); #xlog("L_INFO", "PARSE ERROR: $cnt($var(test))\n"); #xlog("L_INFO", "PARSE ERROR: $cnt($unknown(test))\n"); ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2940 -- Commit Summary -- * pv: extend $cnt to work with $xavp -- File Changes -- M src/modules/pv/pv_core.c (156) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2940.patch https://github.com/kamailio/kamailio/pull/2940.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/2940

2 2

git:master:2af28f2e: pv: extend $cnt to work with $xavp
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 2af28f2e303b5eaa3738d045269fb94e8b059904 URL: https://github.com/kamailio/kamailio/commit/2af28f2e303b5eaa3738d045269fb94… Author: Nicolas C <nchaigne(a)capgemini.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T10:09:24+01:00 pv: extend $cnt to work with $xavp As suggested in previous PR (#2936). This is much more flexible as we also handle sub XAVPs and indexes. --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/2af28f2e303b5eaa3738d045269fb94… Patch: https://github.com/kamailio/kamailio/commit/2af28f2e303b5eaa3738d045269fb94…

1 0

git:master:557952f0: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 557952f00bff4e9e70a41cad0be22c2f545f3c22 URL: https://github.com/kamailio/kamailio/commit/557952f00bff4e9e70a41cad0be22c2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-30T08:46:13+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/557952f00bff4e9e70a41cad0be22c2… Patch: https://github.com/kamailio/kamailio/commit/557952f00bff4e9e70a41cad0be22c2… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index eb59dec135..c06ccdd6ec 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -899,8 +899,9 @@ modparam("presence", "timer_mode", 0) 3.38. subs_respond_200 (integer) Specify the response code for accepted SUBSCRIBE requests. If set to 0, - 202 Accepted will be returned. If set to 1, 200 OK will be returned - instead, in conformance to RFC6665 which prohibits 202 responses. + "202 Accepted" will be returned (default behaviour till version 5.5). + If set to 1, "200 OK" will be returned instead, in conformance to + RFC6665, which prohibits 202 responses. Default value is 1.

1 0

git:master:1ef34045: presence: docs - note the version for default behaviour change on 202 reply
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 1ef340457d0bddd8b15be2195c0a9d5d79f88d12 URL: https://github.com/kamailio/kamailio/commit/1ef340457d0bddd8b15be2195c0a9d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T08:33:34+01:00 presence: docs - note the version for default behaviour change on 202 reply --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1ef340457d0bddd8b15be2195c0a9d5… Patch: https://github.com/kamailio/kamailio/commit/1ef340457d0bddd8b15be2195c0a9d5… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 764aa26a56..25e43ef0b6 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -983,10 +983,10 @@ modparam("presence", "timer_mode", 0) <section id="presence.p.subs_respond_200"> <title><varname>subs_respond_200</varname> (integer)</title> <para> - Specify the response code for accepted SUBSCRIBE requests. - If set to 0, 202 Accepted will be returned. - If set to 1, 200 OK will be returned instead, in conformance to RFC6665 - which prohibits 202 responses. + Specify the response code for accepted SUBSCRIBE requests. If set to 0, + "202 Accepted" will be returned (default behaviour till version 5.5). If set + to 1, "200 OK" will be returned instead, in conformance to RFC6665, which + prohibits 202 responses. </para> <para> <emphasis>

1 0

git:master:7a01a991: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 7a01a991b9012918130b131336a988a5f9fc4285 URL: https://github.com/kamailio/kamailio/commit/7a01a991b9012918130b131336a988a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-30T08:31:19+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/7a01a991b9012918130b131336a988a… Patch: https://github.com/kamailio/kamailio/commit/7a01a991b9012918130b131336a988a… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index 94dd0adcd6..eb59dec135 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -902,11 +902,11 @@ modparam("presence", "timer_mode", 0) 202 Accepted will be returned. If set to 1, 200 OK will be returned instead, in conformance to RFC6665 which prohibits 202 responses. - Default value is 0. + Default value is 1. Example 1.38. Set subs_respond_200 parameter ... -modparam("presence", "subs_respond_200", 1) +modparam("presence", "subs_respond_200", 0) ... 4. Functions

1 0

[kamailio/kamailio] presence: return 200 instead of 202 by default (PR #2949)
by Laurențiu Nicola 30 Nov '21

30 Nov '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #2930 #### Description See https://github.com/kamailio/kamailio/pull/2930#issuecomment-971748854. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2949 -- Commit Summary -- * presence: return 200 instead of 202 by default -- File Changes -- M src/modules/presence/doc/presence_admin.xml (4) M src/modules/presence/presence.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2949.patch https://github.com/kamailio/kamailio/pull/2949.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/2949

2 2

git:master:22dd8c88: presence: return 200 instead of 202 by default
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 22dd8c88f854cb507b0af07ec8712ff3e74c510d URL: https://github.com/kamailio/kamailio/commit/22dd8c88f854cb507b0af07ec8712ff… Author: LaurenÈiu Nicola <lnicola(a)dend.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T08:25:18+01:00 presence: return 200 instead of 202 by default --- Modified: src/modules/presence/doc/presence_admin.xml Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/22dd8c88f854cb507b0af07ec8712ff… Patch: https://github.com/kamailio/kamailio/commit/22dd8c88f854cb507b0af07ec8712ff… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 18d276b73d..764aa26a56 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -990,14 +990,14 @@ modparam("presence", "timer_mode", 0) </para> <para> <emphasis> - Default value is 0. + Default value is 1. </emphasis> </para> <example> <title>Set <varname>subs_respond_200</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("presence", "subs_respond_200", 1) +modparam("presence", "subs_respond_200", 0) ... </programlisting> </example> diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 3e1e347490..da253acbac 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -166,7 +166,7 @@ int pres_retrieve_order = 0; str pres_retrieve_order_by = str_init("priority"); int pres_enable_dmq = 0; int pres_delete_same_subs = 0; -int pres_subs_respond_200 = 0; +int pres_subs_respond_200 = 1; int pres_db_table_lock_type = 1; db_locking_t pres_db_table_lock = DB_LOCKING_WRITE;

1 0

[kamailio/kamailio] dispatcher: Not possible to deactivate probing of destination by reload (PR #2959)
by mtryfoss 30 Nov '21

30 Nov '21

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. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2959 -- Commit Summary -- * dispatcher: Not possible to deactivate probing of destination by reload -- File Changes -- M src/modules/dispatcher/dispatch.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2959.patch https://github.com/kamailio/kamailio/pull/2959.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/2959

2 2

git:master:429fea80: dispatcher: Not possible to deactivate probing of destination by reload
by Daniel-Constantin Mierla 30 Nov '21

30 Nov '21

Module: kamailio Branch: master Commit: 429fea8069f0753e6b8dbfbfaf36701e30af6dda URL: https://github.com/kamailio/kamailio/commit/429fea8069f0753e6b8dbfbfaf36701… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-30T08:24:03+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. --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/429fea8069f0753e6b8dbfbfaf36701… Patch: https://github.com/kamailio/kamailio/commit/429fea8069f0753e6b8dbfbfaf36701… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index dd3c93f9a8..661b4a9533 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3529,6 +3529,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 */

1 0

git:master:96a285db: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: 96a285dbb193a7eb7b4080963bee69bce859abd8 URL: https://github.com/kamailio/kamailio/commit/96a285dbb193a7eb7b4080963bee69b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-29T17:46:20+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/96a285dbb193a7eb7b4080963bee69b… Patch: https://github.com/kamailio/kamailio/commit/96a285dbb193a7eb7b4080963bee69b… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 2af6b9a703..dbe63719e2 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) @@ -319,7 +319,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) @@ -696,7 +696,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) @@ -1294,7 +1294,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 @@ -1311,7 +1311,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)

1 0

[kamailio/kamailio] Fix TM Module Doc unmatched_cancel param from string to integer (PR #2958)
by Zion Dials 29 Nov '21

29 Nov '21

Currently, the documentation states the unmatched_cancel parameter accepts a string input, but it only accepts an integer input. Fixing documentation to match the code's expectations. https://github.com/kamailio/kamailio/blob/b6cebaa76eaa4b98bbba6e271c50dbfa1… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2958 -- Commit Summary -- * Fix TM Module Doc unmatched_cancel param -- File Changes -- M src/modules/tm/doc/params.xml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2958.patch https://github.com/kamailio/kamailio/pull/2958.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/2958

2 2

git:master:c060e900: Fix TM Module Doc unmatched_cancel param
by Henning Westerholt 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: c060e9000f9c6cca98e23bef7aa8c295c8863de6 URL: https://github.com/kamailio/kamailio/commit/c060e9000f9c6cca98e23bef7aa8c29… Author: Zion Dials <me(a)ziondials.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2021-11-29T17:44:21+01:00 Fix TM Module Doc unmatched_cancel param --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/c060e9000f9c6cca98e23bef7aa8c29… Patch: https://github.com/kamailio/kamailio/commit/c060e9000f9c6cca98e23bef7aa8c29… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 8614fdac85..ee305b891c 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>

1 0

[kamailio/kamailio] asan: probable stack-buffer-overflow (Issue #2953)
by sergey-safarov 29 Nov '21

29 Nov '21

### Description Kamailio (744bc8f9e12b698cd6b8bc5ef63c84df7a3aea90) compiled with ASAN. During the start, I got the message ``` 0(52607) INFO: <core> [core/tcp_main.c:4997]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(52607) WARNING: <core> [core/daemonize.c:348]: daemonize(): pid file contains old pid, replacing pid 0(52607) INFO: cfgutils [cfgutils.c:869]: mod_init(): no hash_file given, disable hash functionality ================================================================= ==52607==ERROR: AddressSanitizer: stack-buffer-overflow on address 0xffffc6e64058 at pc 0x000000d02d10 bp 0xffffc6e63dc0 sp 0xffffc6e63de0 READ of size 4 at 0xffffc6e64058 thread T0 #0 0xd02d0f in fixup_get_param_type core/sr_module.c:1061 #1 0xd13a33 in fixup_var_pve_str_12 core/sr_module.c:1474 #2 0xffffa8ca8203 in redirect_init /usr/src/debug/kamailio-5.6.0-dev2.0.el8.centos.aarch64/src/modules/uac_redirect/uac_redirect.c:278 #3 0xd0021f (/usr/sbin/kamailio+0xd0021f) #4 0xcfefef (/usr/sbin/kamailio+0xcfefef) #5 0xcfefef (/usr/sbin/kamailio+0xcfefef) #6 0xcfefef (/usr/sbin/kamailio+0xcfefef) #7 0xcfefef (/usr/sbin/kamailio+0xcfefef) #8 0xcfefef (/usr/sbin/kamailio+0xcfefef) #9 0xcfefef (/usr/sbin/kamailio+0xcfefef) #10 0xcfefef (/usr/sbin/kamailio+0xcfefef) #11 0xcfefef (/usr/sbin/kamailio+0xcfefef) #12 0xcfefef (/usr/sbin/kamailio+0xcfefef) #13 0xcfefef (/usr/sbin/kamailio+0xcfefef) #14 0xcfefef (/usr/sbin/kamailio+0xcfefef) #15 0xcfefef (/usr/sbin/kamailio+0xcfefef) #16 0xcfefef (/usr/sbin/kamailio+0xcfefef) #17 0xcfefef (/usr/sbin/kamailio+0xcfefef) #18 0xcfefef (/usr/sbin/kamailio+0xcfefef) #19 0xcfefef (/usr/sbin/kamailio+0xcfefef) #20 0xcfefef (/usr/sbin/kamailio+0xcfefef) #21 0xcfefef (/usr/sbin/kamailio+0xcfefef) #22 0xcfefef (/usr/sbin/kamailio+0xcfefef) #23 0xcfefef (/usr/sbin/kamailio+0xcfefef) #24 0xcfefef (/usr/sbin/kamailio+0xcfefef) #25 0xcfefef (/usr/sbin/kamailio+0xcfefef) #26 0xcfefef (/usr/sbin/kamailio+0xcfefef) #27 0xcfefef (/usr/sbin/kamailio+0xcfefef) #28 0xcfefef (/usr/sbin/kamailio+0xcfefef) #29 0xcfefef (/usr/sbin/kamailio+0xcfefef) #30 0xcfefef (/usr/sbin/kamailio+0xcfefef) #31 0xcfefef (/usr/sbin/kamailio+0xcfefef) #32 0xcfefef (/usr/sbin/kamailio+0xcfefef) #33 0xcfefef (/usr/sbin/kamailio+0xcfefef) #34 0xcfefef (/usr/sbin/kamailio+0xcfefef) #35 0xd015ab in init_modules (/usr/sbin/kamailio+0xd015ab) #36 0x49fa6b in main (/usr/sbin/kamailio+0x49fa6b) #37 0xfffface10de3 in __libc_start_main (/lib64/libc.so.6+0x20de3) #38 0x4204eb (/usr/sbin/kamailio+0x4204eb) Address 0xffffc6e64058 is located in stack of thread T0 at offset 88 in frame #0 0xffffa8ca70e7 in redirect_init /usr/src/debug/kamailio-5.6.0-dev2.0.el8.centos.aarch64/src/modules/uac_redirect/uac_redirect.c:265 This frame has 8 object(s): [32, 40) 'filter' [96, 104) 'p' <== Memory access at offset 88 underflows this variable [160, 224) '__kld' [256, 320) '__kld' [352, 416) '__kld' [448, 512) '__kld' [544, 608) '__kld' [640, 704) '__kld' HINT: this may be a false positive if your program uses some custom stack unwind mechanism or swapcontext (longjmp and C++ exceptions *are* supported) SUMMARY: AddressSanitizer: stack-buffer-overflow core/sr_module.c:1061 in fixup_get_param_type Shadow bytes around the buggy address: 0x200ff8dcc7b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x200ff8dcc7c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x200ff8dcc7d0: 00 00 00 00 00 00 00 00 f1 f1 f1 f1 00 00 00 00 0x200ff8dcc7e0: 00 00 00 00 f3 f3 f3 f3 00 00 00 00 00 00 00 00 0x200ff8dcc7f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 =>0x200ff8dcc800: f1 f1 f1 f1 00 f2 f2 f2 f2 f2 f2[f2]00 f2 f2 f2 0x200ff8dcc810: f2 f2 f2 f2 00 00 00 00 00 00 00 00 f2 f2 f2 f2 0x200ff8dcc820: 00 00 00 00 00 00 00 00 f2 f2 f2 f2 00 00 00 00 0x200ff8dcc830: 00 00 00 00 f2 f2 f2 f2 00 00 00 00 00 00 00 00 0x200ff8dcc840: f2 f2 f2 f2 00 00 00 00 00 00 00 00 f2 f2 f2 f2 0x200ff8dcc850: 00 00 00 00 00 00 00 00 f3 f3 f3 f3 00 00 00 00 Shadow byte legend (one shadow byte represents 8 application bytes): Addressable: 00 Partially addressable: 01 02 03 04 05 06 07 Heap left redzone: fa Freed heap region: fd Stack left redzone: f1 Stack mid redzone: f2 Stack right redzone: f3 Stack after return: f5 Stack use after scope: f8 Global redzone: f9 Global init order: f6 Poisoned by user: f7 Container overflow: fc Array cookie: ac Intra object redzone: bb ASan internal: fe Left alloca redzone: ca Right alloca redzone: cb ==52607==ABORTING ``` I do not know this is important or not. ASAN reports ``` HINT: this may be a false positive if your program uses some custom stack unwind mechanism or swapcontext (longjmp and C++ exceptions *are* supported) ``` -- 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/2953

2 2

[kamailio/kamailio] asan: shift exponent is too large for 32-bit type 'int' (Issue #2954)
by sergey-safarov 29 Nov '21

29 Nov '21

### Description Kamailio compiled with ASAN. During Kamailio start I see messages ``` core/flags.c:46:18: runtime error: shift exponent 4294967295 is too large for 32-bit type 'int' ``` and ``` nat_traversal.c:1293:27: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' ``` tested on current master -- 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/2954

2 3

git:master:1a406e09: core: flags - use unsigned literal for bit shifting operations
by Daniel-Constantin Mierla 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: 1a406e093ea7ac07428c92aec21ac67f8caa1093 URL: https://github.com/kamailio/kamailio/commit/1a406e093ea7ac07428c92aec21ac67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-29T11:25:08+01:00 core: flags - use unsigned literal for bit shifting operations --- Modified: src/core/flags.c --- Diff: https://github.com/kamailio/kamailio/commit/1a406e093ea7ac07428c92aec21ac67… Patch: https://github.com/kamailio/kamailio/commit/1a406e093ea7ac07428c92aec21ac67… --- diff --git a/src/core/flags.c b/src/core/flags.c index 551eefe2ee..207849c198 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -43,12 +43,12 @@ static flag_t sflags = 0; int setflag( struct sip_msg* msg, flag_t flag ) { - msg->flags |= 1 << flag; + msg->flags |= 1u << flag; return 1; } int resetflag( struct sip_msg* msg, flag_t flag ) { - msg->flags &= ~ (1 << flag); + msg->flags &= ~ (1u << flag); return 1; } @@ -58,7 +58,7 @@ int resetflags( struct sip_msg* msg, flag_t flags ) { } int isflagset( struct sip_msg* msg, flag_t flag ) { - return (msg->flags & (1<<flag)) ? 1 : -1; + return (msg->flags & (1u<<flag)) ? 1 : -1; } int flag_in_range( flag_t flag ) { @@ -79,21 +79,21 @@ int setsflagsval(flag_t val) int setsflag(flag_t flag) { - sflags |= 1 << flag; + sflags |= 1u << flag; return 1; } int resetsflag(flag_t flag) { - sflags &= ~ (1 << flag); + sflags &= ~ (1u << flag); return 1; } int issflagset(flag_t flag) { - return (sflags & (1<<flag)) ? 1 : -1; + return (sflags & (1u<<flag)) ? 1 : -1; } @@ -126,7 +126,7 @@ static unsigned char registered_flags[MAX_FLAG+1]; void init_named_flags() { int r; - + for (r=0; r<FLAGS_NAME_HASH_ENTRIES; r++) clist_init(&name2flags[r], next, prev); } @@ -149,7 +149,7 @@ inline static struct flag_entry* flag_search(struct flag_hash_head* lst, char* name, int len) { struct flag_entry* fe; - + clist_foreach(lst, fe, next){ if ((fe->name.len==len) && (memcmp(fe->name.s, name, len)==0)){ /* found */ @@ -176,7 +176,7 @@ inline static struct flag_entry* get_flag_entry(char* name, int len) int get_flag_no(char* name, int len) { struct flag_entry* fe; - + fe=get_flag_entry(name, len); return (fe)?fe->no:-1; } @@ -184,7 +184,7 @@ int get_flag_no(char* name, int len) /* resgiter a new flag name and associates it with pos - * pos== -1 => any position will do + * pos== -1 => any position will do * returns flag pos on success (>=0) * -1 flag is an alias for an already existing flag * -2 flag already registered @@ -199,7 +199,7 @@ int register_flag(char* name, int pos) static unsigned int crt_flag=0; unsigned int last_flag; unsigned int h; - + len=strlen(name); h=get_hash1_raw(name, len) & (FLAGS_NAME_HASH_ENTRIES-1); /* check if the name already exists */ @@ -235,7 +235,7 @@ int register_flag(char* name, int pos) } } registered_flags[pos]++; - + e=pkg_malloc(sizeof(struct flag_entry)); if (e==0){ PKG_MEM_ERROR; @@ -259,7 +259,7 @@ int setxflag(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - msg->xflags[fi] |= 1 << fb; + msg->xflags[fi] |= 1u << fb; return 1; } @@ -272,7 +272,7 @@ int resetxflag(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - msg->xflags[fi] &= ~ (1 << fb); + msg->xflags[fi] &= ~ (1u << fb); return 1; } @@ -285,5 +285,5 @@ int isxflagset(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - return (msg->xflags[fi] & (1<<fb)) ? 1 : -1; + return (msg->xflags[fi] & (1u<<fb)) ? 1 : -1; }

1 0

git:master:bcd59d73: core: protect for int value overflow on string convert
by Daniel-Constantin Mierla 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: bcd59d73e2fc5ae8e14cad520e726ef431f0563f URL: https://github.com/kamailio/kamailio/commit/bcd59d73e2fc5ae8e14cad520e726ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-29T11:25:08+01:00 core: protect for int value overflow on string convert --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/bcd59d73e2fc5ae8e14cad520e726ef… Patch: https://github.com/kamailio/kamailio/commit/bcd59d73e2fc5ae8e14cad520e726ef… --- diff --git a/src/core/ut.h b/src/core/ut.h index 385db99ca7..1dd0706f59 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -662,9 +662,10 @@ static inline int str2int(str* _s, unsigned int* _r) str2unval(_s, _r); } -#define str2snval(_s, _r) do { \ +#define str2snval(_s, _r, _vmin, _vmax) do { \ int i; \ int sign; \ + long long ll; \ if (_s == NULL) return -1; \ if (_r == NULL) return -1; \ if (_s->len < 0) return -1; \ @@ -680,13 +681,25 @@ static inline int str2int(str* _s, unsigned int* _r) } \ for(; i < _s->len; i++) { \ if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ + if(*_r > _vmax/10) { \ + return -1; \ + } \ *_r *= 10; \ + if(*_r > _vmax - (_s->s[i] - '0')) { \ + return -1; \ + } \ *_r += _s->s[i] - '0'; \ } else { \ return -1; \ } \ } \ - *_r *= sign; \ + if(sign < 0) { \ + ll = (long long)(*_r) * sign; \ + if(ll < _vmin) { \ + return -1; \ + } \ + *_r *= sign; \ + } \ return 0; \ } while(0) @@ -695,7 +708,7 @@ static inline int str2int(str* _s, unsigned int* _r) */ static inline int str2slong(str* _s, long* _r) { - str2snval(_s, _r); + str2snval(_s, _r, LONG_MIN, LONG_MAX); } @@ -704,7 +717,7 @@ static inline int str2slong(str* _s, long* _r) */ static inline int str2sint(str* _s, int* _r) { - str2snval(_s, _r); + str2snval(_s, _r, INT_MIN, INT_MAX); }

1 0

git:master:0afc10d9: core: protect for unsigned int value overflow on string convert
by Daniel-Constantin Mierla 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: 0afc10d9b1b3f65b92d649d530b6363476b3d03b URL: https://github.com/kamailio/kamailio/commit/0afc10d9b1b3f65b92d649d530b6363… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-29T11:25:08+01:00 core: protect for unsigned int value overflow on string convert --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/0afc10d9b1b3f65b92d649d530b6363… Patch: https://github.com/kamailio/kamailio/commit/0afc10d9b1b3f65b92d649d530b6363… --- diff --git a/src/core/ut.h b/src/core/ut.h index 1dd0706f59..9b899a94e7 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -628,7 +628,7 @@ static inline void strlower(str* _s) } -#define str2unval(_s, _r) do { \ +#define str2unval(_s, _r, _vmax) do { \ int i; \ if (_r == NULL) return -1; \ *_r = 0; \ @@ -637,7 +637,13 @@ static inline void strlower(str* _s) if (_s->s == NULL) return -1; \ for(i = 0; i < _s->len; i++) { \ if ((_s->s[i] >= '0') && (_s->s[i] <= '9')) { \ + if(*_r > _vmax/10) { \ + return -1; \ + } \ *_r *= 10; \ + if(*_r > _vmax - (_s->s[i] - '0')) { \ + return -1; \ + } \ *_r += _s->s[i] - '0'; \ } else { \ return -1; \ @@ -651,7 +657,7 @@ static inline void strlower(str* _s) */ static inline int str2ulong(str* _s, unsigned long* _r) { - str2unval(_s, _r); + str2unval(_s, _r, ULONG_MAX); } /* @@ -659,7 +665,7 @@ static inline int str2ulong(str* _s, unsigned long* _r) */ static inline int str2int(str* _s, unsigned int* _r) { - str2unval(_s, _r); + str2unval(_s, _r, UINT_MAX); } #define str2snval(_s, _r, _vmin, _vmax) do { \

1 0

git:master:8c30109d: nat_traversal: declare flag literal as unsigned
by Daniel-Constantin Mierla 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: 8c30109df0b479cc3fce39a765717149e9c70ddf URL: https://github.com/kamailio/kamailio/commit/8c30109df0b479cc3fce39a76571714… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-29T11:25:08+01:00 nat_traversal: declare flag literal as unsigned - GH #2954 --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/8c30109df0b479cc3fce39a76571714… Patch: https://github.com/kamailio/kamailio/commit/8c30109df0b479cc3fce39a76571714… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index edaa6dfe3d..58d1b78c70 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -85,7 +85,7 @@ MODULE_VERSION /* WARNING: Keep this aligned with parser/msg_parser.h! */ -#define FL_DO_KEEPALIVE (1 << 31) +#define FL_DO_KEEPALIVE (1u << 31) #define HASH_SIZE 512

1 0

git:master:1ba6f2fa: modules: readme files regenerated - uac_redirect ... [skip ci]
by Kamailio Dev 26 Nov '21

26 Nov '21

Module: kamailio Branch: master Commit: 1ba6f2fa77459ed1fcec04f446fe9e8c210b94d6 URL: https://github.com/kamailio/kamailio/commit/1ba6f2fa77459ed1fcec04f446fe9e8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-26T22:46:22+01:00 modules: readme files regenerated - uac_redirect ... [skip ci] --- Modified: src/modules/uac_redirect/README --- Diff: https://github.com/kamailio/kamailio/commit/1ba6f2fa77459ed1fcec04f446fe9e8… Patch: https://github.com/kamailio/kamailio/commit/1ba6f2fa77459ed1fcec04f446fe9e8… --- diff --git a/src/modules/uac_redirect/README b/src/modules/uac_redirect/README index 88e9e22859..812755bc5d 100644 --- a/src/modules/uac_redirect/README +++ b/src/modules/uac_redirect/README @@ -212,8 +212,7 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") Its values may be: * acc_log_request * acc_db_request - * acc_rad_request - * acc_diam_request + * acc_request The default value is “acc_log_request”.

1 0

git:master:35767f38: acc: expose accounting functions via inter-module api
by Daniel-Constantin Mierla 26 Nov '21

26 Nov '21

Module: kamailio Branch: master Commit: 35767f387bbcd2766bf7a4ff1345183612219225 URL: https://github.com/kamailio/kamailio/commit/35767f387bbcd2766bf7a4ff1345183… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-25T13:36:59+01:00 acc: expose accounting functions via inter-module api --- Modified: src/modules/acc/acc_api.h Modified: src/modules/acc/acc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/35767f387bbcd2766bf7a4ff1345183… Patch: https://github.com/kamailio/kamailio/commit/35767f387bbcd2766bf7a4ff1345183… --- diff --git a/src/modules/acc/acc_api.h b/src/modules/acc/acc_api.h index 0a6df2e32c..04b893483b 100644 --- a/src/modules/acc/acc_api.h +++ b/src/modules/acc/acc_api.h @@ -146,8 +146,16 @@ typedef acc_extra_t* (*parse_extra_f)(char *extra_str); typedef int (*register_cdr_engine_f)(cdr_engine_t *eng); typedef int (*cdr_api_exec_f)(struct dlg_cell *dlg, struct sip_msg *rq, cdr_engine_t *eng, acc_param_t* comment); +typedef int (*acc_log_request_f)(sip_msg_t *msg, str *comment); +typedef int (*acc_db_request_f)(sip_msg_t *msg, str *comment, str *dbtable); +typedef int (*acc_request_f)(sip_msg_t *msg, str *comment, str *dbtable); + + /* the acc API */ typedef struct acc_api { + acc_log_request_f acc_log_request; + acc_db_request_f acc_db_request; + acc_request_f acc_request; leg_info_f get_leg_info; core2strar_f get_core_attrs; extra2strar_f get_extra_attrs; diff --git a/src/modules/acc/acc_mod.c b/src/modules/acc/acc_mod.c index 5afcab113b..801a908025 100644 --- a/src/modules/acc/acc_mod.c +++ b/src/modules/acc/acc_mod.c @@ -644,6 +644,12 @@ static int bind_acc(acc_api_t* api) return -1; } + memset(api, 0, sizeof(acc_api_t)); + + api->acc_log_request = ki_acc_log_request; + api->acc_db_request = ki_acc_db_request; + api->acc_request = ki_acc_request; + api->register_engine = acc_register_engine; api->get_leg_info = get_leg_info; api->get_core_attrs = core2strar;

1 0

git:master:a0ef1ccd: uac_redirect: use inter-module acc api instead of config export lookup
by Daniel-Constantin Mierla 26 Nov '21

26 Nov '21

Module: kamailio Branch: master Commit: a0ef1ccd17368775d68f8687f25b0d72656ac273 URL: https://github.com/kamailio/kamailio/commit/a0ef1ccd17368775d68f8687f25b0d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-26T15:32:54+01:00 uac_redirect: use inter-module acc api instead of config export lookup - use acc functions via inter-module acc api, intead of config file function export lookup, to get the right signature and avoid workaround of fixing a modparam like a function param and improper access of expected fields by offset - GH #2953 --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml Modified: src/modules/uac_redirect/rd_funcs.c Modified: src/modules/uac_redirect/rd_funcs.h Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/a0ef1ccd17368775d68f8687f25b0d7… Patch: https://github.com/kamailio/kamailio/commit/a0ef1ccd17368775d68f8687f25b0d7…

1 0

[kamailio/kamailio] Config errors (Issue #2957)
by SerhiiZahuba 26 Nov '21

26 Nov '21

Perhaps I am doing something wrong? New installation, new config file and when starting the server I see an error 1) parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 165, column 1-5: syntax error 164 / * LOG Levels: 3 = DBG, 2 = INFO, 1 = NOTICE, 0 = WARN, -1 = ERR, ... * / 165 debug = DBGLEVEL 166 2) /usr/local/etc/kamailio/kamailio.cfg, line 34, column 1-9: syntax error 32 # *** To enable authentication execute: 33 #mysql 34 WITH_AUTH Where can there be an error if this file is downloaded from your server? Please tell me this is driving me crazy. -- 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/2957

2 4

parse error in core/receive.c
by Juha Heinanen 26 Nov '21

26 Nov '21

Is it only me who gets this with master? -- Juha CC (gcc) [pres-serv] core/receive.o In file included from core/ut.h:42, from core/ip_addr.h:39, from core/receive.h:32, from core/receive.c:34: core/receive.c: In function 'receive_msg': core/receive.c:376:5: error: expected ')' before 'ip_addr2a' 376 | ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, | ^~~~~~~~~ core/dprint.h:317:30: note: in definition of macro 'LOG_FX' 317 | _ksr_slog_func(&__kld, fmt, ## args); \ | ^~~ core/dprint.h:351:4: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ...

1 1

[kamailio/kamailio] cannot adopt OIDs in KAMAILIO-SIP-COMMON-MIB (Issue #2955)
by abonela 25 Nov '21

25 Nov '21

Please try to fill this template as much as possible for any issue. It helps the developers to troubleshoot the issue. we have configured snmp module following https://www.kamailio.org/dokuwiki/doku.php/utils:kamailio-and-snmp ### Description  we could able to poll or snmpwalk most of the OIDs in KAMAILIO-REG-MIB , KAMAILIO-SIP-SERVER-MIB but having issues below from KAMAILIO-SIP-COMMON-MIB snmpd[358730]: Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatsMethod ::= { kamailioSIPMethodStatsEntry 1 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatsOutbounds ::= { kamailioSIPMethodStatsEntry 2 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatsInbounds ::= { kamailioSIPMethodStatsEntry 3 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeMethod ::= { kamailioSIPStatusCodesEntry 1 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeValue ::= { kamailioSIPStatusCodesEntry 2 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeIns ::= { kamailioSIPStatusCodesEntry 3 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeOuts ::= { kamailioSIPStatusCodesEntry 4 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeRowStatus ::= { kamailioSIPStatusCodesEntry 5 } ### Troubleshooting root@host# snmpwalk -v2c -c public localhost .1.3.6.1.4.1.34352.3.1.1.1.4.1.1.2.0 SNMPv2-SMI::enterprises.34352.3.1.1.1.4.1.1.2.0 = No Such Object available on this agent at this OID root@host# snmpwalk -v2c -c public localhost .1.3.6.1.4.1.34352.3.1.1.1.4.1.1.2 SNMPv2-SMI::enterprises.34352.3.1.1.1.4.1.1.2 = No Such Object available on this agent at this OID #### Reproduction using snmpwalk or snmget to any of the above mentioned kamailioSIPStats* OIDs will do ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.1 (x86_64/linux) 307af8-dirty ``` * **Operating System**:  ``` No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.2 LTS Release: 20.04 Codename: focal ``` -- 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/2955

2 2

[kamailio/kamailio] OpenSSL:It(PTHREAD_PROCESS_SHARED) is not initialized, which may cause the Kamailio worker process to block (Issue #2956)
by 陈庆毅 25 Nov '21

25 Nov '21

why the process sharing option (PTHREAD_PROCESS_SHARED) was not used for initialization, which might cause the Kamailio worker process to block -- 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/2956

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev