sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
309 discussions

git:master:34300dd8: modules: readme files regenerated - permissions ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 34300dd8db7d52c639307f4121f8e61619a53f99 URL: https://github.com/kamailio/kamailio/commit/34300dd8db7d52c639307f4121f8e61… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-15T10:46:22+01:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/34300dd8db7d52c639307f4121f8e61… Patch: https://github.com/kamailio/kamailio/commit/34300dd8db7d52c639307f4121f8e61…

2 years, 6 months

[kamailio/kamailio] permissions: crash during a RPC reload of trusted (Issue #2909)

by Victor Seva

### Description We are having several customers with crashes during calls to RPC `permissions.trustedReload` even after introducing the basic safety for concurrent RPC reload https://github.com/kamailio/kamailio/commit/c87f5202d778cf110ce0fbbc554310c… ### Possible solution It seems that we need to implement locking in order to be sure the memory is not gone in the middle of a read. #### Reproduction It's quite difficult to reproduce since `match_hash_table` call has to happen during a RPC reload #### Debugging Data ``` (gdb) bt full #0 match_hash_table (table=<optimized out>, msg=msg@entry=0x7fc3d800a808, src_ip_c_str=src_ip_c_str@entry=0x7fc3d7f217b8 "A.A.A.A", proto=proto@entry=1, from_uri=from_uri@entry=0x7fc3d7f1b750 "sip:fake@B.B.B.B") at hash.c:280 __func__ = "match_hash_table" ruri = <optimized out> ruri_string = "sip:41584006001@B.B.B.B:5060\000\264{\224\377\177\000\000\000\240\200\331\302\177\000\000\300\000\000\000\000\000\000\000\332\003\000\000\000\000\000\000\300\067~\372PV\000\000\000\220 \324m,\233߁\260\341D\334\302\177\000\000\260go\372PV\000\000P\343!\332\302\177\000\000\004\340{\372PV\000\000`;~\372PV\000\000\300\067~\372PV\000\000@\024\000\000\000\000\000\000`\342!\332\302\177\000\000\001\00 0\000\000\000\000\000\000\310\066\204\331\302\177\000\000\000\240\200\331\302\177\000\000\300\000\000\000\000\000\000\000\300\067~\372PV\000\000`;~\372PV\000\000\332\003\000\000\000\000\000\000\000"... preg = {__buffer = 0x0, __allocated = 0, __used = 224, __syntax = 16843462, __fastmap = 0x0, __translate = 0x0, re_nsub = 0, __can_be_null = 0, __regs_allocated = 0, __fastmap_accurate = 1, __no_sub = 1, __not_bol = 0, __not_eol = 0, __newline_anchor = 0} np = 0x455449564e492035 src_ip = {s = 0x7fc3d7f217b8 "A.A.A.A", len = <optimized out>} val = <optimized out> count = 0 #1 0x00007fc3d2362765 in allow_trusted (msg=msg@entry=0x7fc3d800a808, src_ip=0x7fc3d7f217b8 "A.A.A.A", proto=proto@entry=1, from_uri=from_uri@entry=0x7fc3d7f1b750 "sip:fake@B.B.B.B") at trusted.c:499 __func__ = "allow_trusted" result = <optimized out> res = 0x0 keys = {0x7fc3d7f1b750} vals = {{type = 3595139888, nul = 32707, free = -671045624, val = {int_val = -1803829520, ll_val = 140735684525808, double_val = 6.9532666868153257e-310, time_val = 140735684525808, string_val = 0x7fff947bbef0 "\001", str_val = {s = 0x7fff947bbef0 "\001", len = -94468017}, blob_val = {s = 0x7fff947bbef0 "\001", len = -94468017}, bitmap_val = 2491137776, uint_val = 2491137776, ull_val = 140735684525808}}} cols = {0x0, 0x5650fa650c25 <pv_printf+229>, 0x7fff947bb670, 0x0} #2 0x00007fc3d2363ef3 in allow_trusted_furi (_msg=_msg@entry=0x7fc3d800a808, _src_ip_sp=_src_ip_sp@entry=0x7fc3d6494340 "xEI\326\303\177", _proto_sp=_proto_sp@entry=0x7fc3d64925e0 "\330\375H\326\303\177", from_uri=0x7fc3d7f1b750 "sip:fake@B.B.B.B") at trusted.c:590 src_ip = {s = 0x7fc3d7f217b8 "A.A.A.A", len = 11} proto = {s = 0x7fc3d7f27820 "udp", len = 3} proto_int = 1 __func__ = "allow_trusted_furi" #3 0x00007fc3d23647d0 in allow_trusted_3 (_msg=0x7fc3d800a808, _src_ip_sp=0x7fc3d6494340 "xEI\326\303\177", _proto_sp=0x7fc3d64925e0 "\330\375H\326\303\177", _from_uri=<optimized out>) at trusted.c:634 from_uri = {s = 0x7fc3d7f1b750 "sip:fake@B.B.B.B", len = 34} __func__ = "allow_trusted_3" #4 0x00005650fa513319 in do_action (h=h@entry=0x7fff947bbef0, a=a@entry=0x7fc3d6497b30, msg=msg@entry=0x7fc3d800a808) at core/action.c:1085 ``` -- 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/2909

2 years, 6 months

[kamailio/kamailio] permissions: implement lock for trusted hash (PR #2910)

by Victor Seva

#### 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 - [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:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #2909 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2910 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2910/commits/0b424ca7b7a8ac7f2e3e…">permissions: implement lock for trusted hash</a> -- File Changes -- M src/modules/permissions/permissions.c (6) M src/modules/permissions/rpc.c (6) M src/modules/permissions/trusted.c (16) M src/modules/permissions/trusted.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2910.patch https://github.com/kamailio/kamailio/pull/2910.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/2910

2 years, 6 months

git:master:ea4c09d8: permissions: add trusted_cleanup_interval documentation [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: ea4c09d8a93cf7f79901628573a62e2571781d88 URL: https://github.com/kamailio/kamailio/commit/ea4c09d8a93cf7f79901628573a62e2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-15T10:35:54+01:00 permissions: add trusted_cleanup_interval documentation [skip ci] --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ea4c09d8a93cf7f79901628573a62e2… Patch: https://github.com/kamailio/kamailio/commit/ea4c09d8a93cf7f79901628573a62e2… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index e3b65816e5..2c55f246c7 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -869,6 +869,27 @@ modparam("permissions", "load_backends", 1) <programlisting format="linespecific"> ... modparam("permissions", "reload_delta", 1) +... + </programlisting> + </example> + </section> + <section id ="permissions.p.trusted_cleanup_interval"> + <title><varname>trusted_cleanup_interval</varname> (int)</title> + <para> + If module parameter <varname>db_mode</varname> is set to 1 a cleanup timer + is set to the trusted_cleanup_interval value in seconds. + This process will cleanup the previous values from memory after a RPC reload. + </para> + <para> + <emphasis> + Default value is <quote>60</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>trusted_cleanup_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("permissions", "trusted_cleanup_interval", 120) ... </programlisting> </example>

2 years, 6 months

git:master:0a6a750a: permissions: trusted_cleanup_interval

by Victor Seva

Module: kamailio Branch: master Commit: 0a6a750a96b620b3024acd391436a94def3133e1 URL: https://github.com/kamailio/kamailio/commit/0a6a750a96b620b3024acd391436a94… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-15T10:35:54+01:00 permissions: trusted_cleanup_interval cleanup old data of trusted hash_table by timer function. --- Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/permissions.h Modified: src/modules/permissions/trusted.c --- Diff: https://github.com/kamailio/kamailio/commit/0a6a750a96b620b3024acd391436a94… Patch: https://github.com/kamailio/kamailio/commit/0a6a750a96b620b3024acd391436a94… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 12ab2d889a..d5655206e4 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -61,6 +61,7 @@ static char* perm_deny_suffix = ".deny"; /* for allow_trusted and allow_address function */ str perm_db_url = {NULL, 0}; /* Don't connect to the database by default */ int perm_reload_delta = 5; +int perm_trusted_table_interval = 60; /* for allow_trusted function */ int perm_db_mode = DISABLE_CACHE; /* Database usage mode: 0=no cache, 1=cache */ @@ -188,6 +189,7 @@ static param_export_t params[] = { {"max_subnets", PARAM_INT, &_perm_max_subnets }, {"load_backends", PARAM_INT, &_perm_load_backends }, {"reload_delta", PARAM_INT, &perm_reload_delta }, + {"trusted_cleanup_interval", PARAM_INT, &perm_trusted_table_interval }, {0, 0, 0} }; diff --git a/src/modules/permissions/permissions.h b/src/modules/permissions/permissions.h index 2a417ffd58..c08666a1c0 100644 --- a/src/modules/permissions/permissions.h +++ b/src/modules/permissions/permissions.h @@ -60,6 +60,7 @@ extern str perm_mask_col; /* Name of mask column */ extern str perm_port_col; /* Name of port column */ extern int perm_peer_tag_mode; /* Matching mode */ extern int perm_reload_delta; /* seconds between RPC reloads */ +extern int perm_trusted_table_interval; /* interval of timer to clean old trusted data */ /* backends to be loaded */ #define PERM_LOAD_ADDRESSDB (1<<0) diff --git a/src/modules/permissions/trusted.c b/src/modules/permissions/trusted.c index 7714a32461..49e871a125 100644 --- a/src/modules/permissions/trusted.c +++ b/src/modules/permissions/trusted.c @@ -166,6 +166,7 @@ int reload_trusted_table(void) return 1; } +void perm_ht_timer(unsigned int ticks, void *); /* * Initialize data structures @@ -224,6 +225,9 @@ int init_trusted(void) goto error; } + if(register_timer(perm_ht_timer, NULL, perm_trusted_table_interval) < 0) + goto error; + perm_dbf.close(perm_db_handle); perm_db_handle = 0; } @@ -280,6 +284,22 @@ int init_child_trusted(int rank) } +void perm_ht_timer(unsigned int ticks, void *param) { + if(perm_rpc_reload_time == NULL) + return; + + if(*perm_rpc_reload_time != 0 + && *perm_rpc_reload_time > time(NULL) - perm_trusted_table_interval) + return; + + LM_DBG("cleaning old trusted table\n"); + if (*perm_trust_table == perm_trust_table_1) { + empty_hash_table(perm_trust_table_2); + } else { + empty_hash_table(perm_trust_table_1); + } +} + /* * Close connections and release memory */

2 years, 6 months

git:master:fae3611c: permissions: don't remove old data at the end of the reload process

by Victor Seva

Module: kamailio Branch: master Commit: fae3611c873738d42a979d96e0d0b47af726bc47 URL: https://github.com/kamailio/kamailio/commit/fae3611c873738d42a979d96e0d0b47… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-15T10:35:54+01:00 permissions: don't remove old data at the end of the reload process --- Modified: src/modules/permissions/trusted.c --- Diff: https://github.com/kamailio/kamailio/commit/fae3611c873738d42a979d96e0d0b47… Patch: https://github.com/kamailio/kamailio/commit/fae3611c873738d42a979d96e0d0b47… --- diff --git a/src/modules/permissions/trusted.c b/src/modules/permissions/trusted.c index 2f9c7d42a4..7714a32461 100644 --- a/src/modules/permissions/trusted.c +++ b/src/modules/permissions/trusted.c @@ -59,7 +59,6 @@ int reload_trusted_table(void) db_val_t* val; struct trusted_list **new_hash_table; - struct trusted_list **old_hash_table; int i; int priority; @@ -160,9 +159,7 @@ int reload_trusted_table(void) perm_dbf.free_result(perm_db_handle, res); - old_hash_table = *perm_trust_table; *perm_trust_table = new_hash_table; - empty_hash_table(old_hash_table); LM_DBG("trusted table reloaded successfully.\n");

2 years, 6 months

[kamailio/kamailio] nats module subscriber issue when connected to more "nats_urls" (Issue #2916)

by Stefan Mititelu

### Description, Troubleshooting, Reproduction I have 3 go nats servers running and the following kamailio config for nats: ``` modparam("nats", "nats_url", "nats://127.0.0.1:4222") modparam("nats", "nats_url", "nats://127.0.0.2:4222") modparam("nats", "nats_url", "nats://127.0.0.3:4222") modparam("nats", "subject_queue_group", "foo:2020") ... event_route[nats:foo] { xlog("L_ERR", "==============> received $natsData"); } ``` I try to publish using some nats publisher (e.g. nats.c example/libuv-pub.c), and nothing gets printed in event route: ``` ./pub -s nats://127.0.0.1:4222 -txt "aaaaaaaaaaaa" -count 1 // event route log NOT printed ./pub -s nats://127.0.0.2:4222 -txt "aaaaaaaaaaaa" -count 1 // event route log NOT printed ``` However, if I try to publish on the last server "127.0.0.3", log *is* printed: ``` ./pub -s nats://127.0.0.3:4222 -txt "aaaaaaaaaaaa" -count 1 // event route log IS printed ``` I expected to see 1 log message for each of the above publish(es). Found this while implementing and testing #2915 Thanks, Stefan -- 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/2916

2 years, 6 months

[kamailio/kamailio] asan: left shift of 255 by 24 places cannot be represented in type 'int' (Issue #2926)

by sergey-safarov

``` [root@sbc-stage config]# kamcmd cfg.seti core debug 2 ../../src/modules/ctl/binrpc.h:219:34: runtime error: left shift of 255 by 24 places cannot be represented in type 'int' ``` Daniel @miconda could you look. -- 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/2926

2 years, 6 months

[kamailio/kamailio] Selective tracing of locally generated messages (Issue #2933)

by xaled1

For selectively tracing sip messages *sent* by kamailio, we successfully use onsend_route: but this works for forwarded requests/responses only. For locally generated messages, there does not seem to be a reliable method: – tm:local-request: message is usually not final, not executed for locally generated ACK and CANCEL – tm:local-response: works for responses only (triggered *after* sending) – sl:local-response: works for responses only (triggered *after* sending) We also tried event_route[network:msg], but sip_trace() does not work there (msg not parsed/available?). Might it be possible to add a core option "onsend_route_localsrc", that can be enabled to make kamailio trigger onsend_route also for locally generated requests (and also locally generated responses, if "onsend_route_reply" is enabled)? -- 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/2933

2 years, 6 months

git:master:b3e8d030: ctl: use unsigned int for bit left shifting

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b3e8d03038402dec78b4845255f34862407983c9 URL: https://github.com/kamailio/kamailio/commit/b3e8d03038402dec78b4845255f3486… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-14T20:23:08+01:00 ctl: use unsigned int for bit left shifting - deal with runtime error: left shift of X by N places cannot be represented in type 'int' --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/b3e8d03038402dec78b4845255f3486… Patch: https://github.com/kamailio/kamailio/commit/b3e8d03038402dec78b4845255f3486… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index bd7e2cb9c5..cb7204fffd 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -215,12 +215,15 @@ inline static unsigned char* binrpc_write_int( unsigned char* p, int i, int *len) { int size; + unsigned int u; - for (size=4; size && ((i & (0xffu<<24))==0); i<<=8, size--); + u = (unsigned int)i; + + for (size=4; size && ((u & (0xffu<<24))==0); u<<=8, size--); *len=size; for(; (p<end) && (size); p++, size--){ - *p=(unsigned char)(i>>24); - i<<=8; + *p=(unsigned char)(u>>24); + u<<=8; } return p; } @@ -515,24 +518,28 @@ static inline int binrpc_addfault( struct binrpc_pkt* pkt, static inline unsigned char* binrpc_read_int( int* i, int len, - unsigned char* s, + unsigned char* s, unsigned char* end, int *err ) { unsigned char* start; - + unsigned int u; + start=s; *i=0; + u = 0; *err=0; for(;len>0; len--, s++){ if (s>=end){ *err=E_BINRPC_MORE_DATA; + *i = (int)u; return start; } - *i<<=8; - *i|=*s; + u<<=8; + u|=*s; }; + *i = (int)u; return s; }

2 years, 6 months

← Newer
1
...
19
20
21
22
23
24
25
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2021