sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
312 discussions

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: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: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

← Newer
1
...
10
11
12
13
14
15
16
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2021