sr-dev June 2023

sr-dev@lists.kamailio.org

10 participants
311 discussions

git:master:f36744cf: core: kemi - propagate bool as a return value type
by Daniel-Constantin Mierla 19 Jun '23

19 Jun '23

Module: kamailio Branch: master Commit: f36744cf15c7fcddc7422f97a508cad600ca7d98 URL: https://github.com/kamailio/kamailio/commit/f36744cf15c7fcddc7422f97a508cad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:18:59+02:00 core: kemi - propagate bool as a return value type - some scripting languages differentiate bool false|true vs int 0|1 values --- Modified: src/core/kemiexec.c --- Diff: https://github.com/kamailio/kamailio/commit/f36744cf15c7fcddc7422f97a508cad… Patch: https://github.com/kamailio/kamailio/commit/f36744cf15c7fcddc7422f97a508cad… --- diff --git a/src/core/kemiexec.c b/src/core/kemiexec.c index 8e3b096e18..581e174c93 100644 --- a/src/core/kemiexec.c +++ b/src/core/kemiexec.c @@ -40,12 +40,16 @@ static sr_kemi_xval_t _sr_kemi_core_exec_xval; */ static inline sr_kemi_xval_t *sr_kemi_return_int(sr_kemi_t *ket, int ret) { - _sr_kemi_core_exec_xval.vtype = SR_KEMIP_INT; - _sr_kemi_core_exec_xval.v.n = ret; + if(ket->rtype & SR_KEMIP_BOOL) { + _sr_kemi_core_exec_xval.vtype = SR_KEMIP_BOOL; + _sr_kemi_core_exec_xval.v.n = ret; + } else { + _sr_kemi_core_exec_xval.vtype = SR_KEMIP_INT; + _sr_kemi_core_exec_xval.v.n = ret; + } return &_sr_kemi_core_exec_xval; } - /** * */

1 0

git:master:9580adf9: core: kemi - reformat core exports for tool parsing
by Daniel-Constantin Mierla 19 Jun '23

19 Jun '23

Module: kamailio Branch: master Commit: 9580adf9a478f161605a0f663099f4d10c0c93eb URL: https://github.com/kamailio/kamailio/commit/9580adf9a478f161605a0f663099f4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T12:54:48+02:00 core: kemi - reformat core exports for tool parsing --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/9580adf9a478f161605a0f663099f4d… Patch: https://github.com/kamailio/kamailio/commit/9580adf9a478f161605a0f663099f4d…

1 0

[kamailio/kamailio] Issue with usrloc 'handle_lost_tcp' and dmq_usrloc 'usrloc_delete' (Issue #3479)
by alternatenetwork 16 Jun '23

16 Jun '23

### Description When a TLS connection is closed and handle_lost_tcp=1 the entry is deleted for usrloc. This deletion is not synced via DMQ even though usrloc_delete=1. There is also an issue on the same server if a re-registration happens right after before the timeout was supposed to expire then $var(sv_res) = 2 even though the usrloc table is empty. So it seems like the way handle_lost_tcp deletes is not deleting fully in registrar. usrloc db_mode is 0 ### Troubleshooting #### Reproduction Setup 2 servers with DMQ and close the TCP connection. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.1 (x86_64/linux) d8f98b 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_BLOCKLIST, 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: d8f98b compiled on 19:05:04 Aug 16 2022 with gcc 8.3.0 ``` * **Operating System**:  ``` Debian 10 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3479 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3479(a)github.com>

2 4

git:master:087369c5: cdp_avp: reformat code files with macros for code generation
by Daniel-Constantin Mierla 16 Jun '23

16 Jun '23

Module: kamailio Branch: master Commit: 087369c56e167995bf390d35651a68febd9c6c82 URL: https://github.com/kamailio/kamailio/commit/087369c56e167995bf390d35651a68f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-16T17:24:29+02:00 cdp_avp: reformat code files with macros for code generation - clang format is not dealing nicely with such cases, disable formatting for those snippets --- Modified: src/modules/cdp_avp/base.h Modified: src/modules/cdp_avp/ccapp.h Modified: src/modules/cdp_avp/epcapp.h Modified: src/modules/cdp_avp/imsapp.h Modified: src/modules/cdp_avp/nasapp.h --- Diff: https://github.com/kamailio/kamailio/commit/087369c56e167995bf390d35651a68f… Patch: https://github.com/kamailio/kamailio/commit/087369c56e167995bf390d35651a68f…

1 0

git:master:3f7ccd57: cdp: check session pointer before use
by Daniel-Constantin Mierla 16 Jun '23

16 Jun '23

Module: kamailio Branch: master Commit: 3f7ccd57857c09cb76d6f21ba3b91b070e80fff8 URL: https://github.com/kamailio/kamailio/commit/3f7ccd57857c09cb76d6f21ba3b91b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-16T09:53:59+02:00 cdp: check session pointer before use --- Modified: src/modules/cdp/session.c --- Diff: https://github.com/kamailio/kamailio/commit/3f7ccd57857c09cb76d6f21ba3b91b0… Patch: https://github.com/kamailio/kamailio/commit/3f7ccd57857c09cb76d6f21ba3b91b0… --- diff --git a/src/modules/cdp/session.c b/src/modules/cdp/session.c index a8a4efb5c49..e6e23fcbcf6 100644 --- a/src/modules/cdp/session.c +++ b/src/modules/cdp/session.c @@ -603,8 +603,8 @@ AAASession *AAAMakeSession(int app_id, int type, str session_id) memcpy(id.s, session_id.s, session_id.len); id.len = session_id.len; s = cdp_new_session(id, type); - s->application_id = app_id; if(s) { + s->application_id = app_id; cdp_add_session(s); } return s;

1 0

git:master:ae1223e4: cdp: fix storage warning on time value
by Daniel-Constantin Mierla 15 Jun '23

15 Jun '23

Module: kamailio Branch: master Commit: ae1223e4236ce730448f32c262afec4c11e30eba URL: https://github.com/kamailio/kamailio/commit/ae1223e4236ce730448f32c262afec4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-15T11:31:59+02:00 cdp: fix storage warning on time value --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/ae1223e4236ce730448f32c262afec4… Patch: https://github.com/kamailio/kamailio/commit/ae1223e4236ce730448f32c262afec4… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 61d932743a..821b3777e8 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -124,8 +124,8 @@ static int make_send_pipe(serviced_peer_t *sp) { local_id++; sp->send_pipe_name.s = shm_malloc(sizeof(PIPE_PREFIX) + 64); - sprintf(sp->send_pipe_name.s, "%s%d_%d_%d", PIPE_PREFIX, getpid(), local_id, - (unsigned int)time(0)); + sprintf(sp->send_pipe_name.s, "%s%d_%d_%u", PIPE_PREFIX, getpid(), local_id, + (unsigned int)(unsigned long long)time(0)); sp->send_pipe_name.len = strlen(sp->send_pipe_name.s); if(mkfifo(sp->send_pipe_name.s, 0666) < 0) {

1 0

git:master:631aab42: cdp: safety check closing fd for error cases
by Daniel-Constantin Mierla 15 Jun '23

15 Jun '23

Module: kamailio Branch: master Commit: 631aab425e1f3908d9e1b044c2a0715f457655ac URL: https://github.com/kamailio/kamailio/commit/631aab425e1f3908d9e1b044c2a0715… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-15T11:31:59+02:00 cdp: safety check closing fd for error cases --- Modified: src/modules/cdp/cdp_mod.c Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/631aab425e1f3908d9e1b044c2a0715… Patch: https://github.com/kamailio/kamailio/commit/631aab425e1f3908d9e1b044c2a0715… --- diff --git a/src/modules/cdp/cdp_mod.c b/src/modules/cdp/cdp_mod.c index 2669a2b93c..8bac55c50d 100644 --- a/src/modules/cdp/cdp_mod.c +++ b/src/modules/cdp/cdp_mod.c @@ -78,7 +78,9 @@ static int w_cdp_has_app2(sip_msg_t *msg, char *vendor, char *appid); static int w_cdp_has_app(sip_msg_t *msg, char *appid, char *param); +/* clang-format off */ #define EXP_FUNC(NAME) {#NAME, (cmd_function)NAME, NO_SCRIPT, 0, 0} +/* clang-format on */ /** * Exported functions. This is the API available for use from other modules. diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 9124c4eef4..61d932743a 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -161,8 +161,10 @@ static void close_send_pipe(serviced_peer_t *sp) { int tmp; if(sp->send_pipe_name.s) { - close(sp->send_pipe_fd); - close(sp->send_pipe_fd_out); + if(sp->send_pipe_fd >= 0) + close(sp->send_pipe_fd); + if(sp->send_pipe_fd_out >= 0) + close(sp->send_pipe_fd_out); tmp = remove(sp->send_pipe_name.s); if(tmp == -1) { LM_ERR("could not remove send pipe\n");

1 0

git:master:41c47363: db_redis: use sscan
by Victor Seva 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: 41c4736367186f43e68361be0460bd590b7660bd URL: https://github.com/kamailio/kamailio/commit/41c4736367186f43e68361be0460bd5… Author: Sipwise Development Team <support(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-14T14:26:28+02:00 db_redis: use sscan --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/41c4736367186f43e68361be0460bd5… Patch: https://github.com/kamailio/kamailio/commit/41c4736367186f43e68361be0460bd5…

1 0

git:master:3a8ebf57: db_redis: graceful scan
by Victor Seva 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: 3a8ebf5717eba0116cb71c7f953e9b7ff60d4b0e URL: https://github.com/kamailio/kamailio/commit/3a8ebf5717eba0116cb71c7f953e9b7… Author: Sipwise Development Team <support(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-14T14:26:27+02:00 db_redis: graceful scan --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/3a8ebf5717eba0116cb71c7f953e9b7… Patch: https://github.com/kamailio/kamailio/commit/3a8ebf5717eba0116cb71c7f953e9b7… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index bda72446d9..eebd7e54ce 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -824,7 +824,7 @@ static int db_redis_scan_query_keys_pattern(km_redis_con_t *con, int l; -#undef USE_SCAN +#define USE_SCAN #ifdef USE_SCAN @@ -832,6 +832,8 @@ static int db_redis_scan_query_keys_pattern(km_redis_con_t *con, unsigned long cursor = 0; unsigned int match_count = match_count_start_val; char match_count_str[16]; + struct timeval start_tv, end_tv; + long tv_diff; do { snprintf(cursor_str, sizeof(cursor_str), "%lu", cursor); @@ -869,8 +871,12 @@ static int db_redis_scan_query_keys_pattern(km_redis_con_t *con, LM_ERR("Failed to add count value to scan query\n"); goto err; } - + gettimeofday(&start_tv, NULL); reply = db_redis_command_argv(con, query_v); + gettimeofday(&end_tv, NULL); + tv_diff = ((long long)end_tv.tv_sec * 1000LL + end_tv.tv_usec / 1000L) + - ((long long)start_tv.tv_sec * 1000LL + + start_tv.tv_usec / 1000L); db_redis_key_free(&query_v); db_redis_check_reply(con, reply, err); if(reply->type != REDIS_REPLY_ARRAY) { @@ -966,11 +972,15 @@ static int db_redis_scan_query_keys_pattern(km_redis_con_t *con, } #ifdef USE_SCAN - // exponential increase and falloff, hovering around 1000 results - if(keys_list->elements > 1300 && match_count > 500) + // exponential increase and falloff, not to exceed ~100 ms query run time + if(tv_diff > 50 && match_count > 10) match_count /= 2; - else if(keys_list->elements < 700 && match_count < 500000) + else if(tv_diff < 25 && match_count < 1000000) match_count *= 2; + if(cursor > 0) { + // give other queries some time to run + usleep(100000); + } #endif db_redis_free_reply(&reply);

1 0

git:master:c5a3c2cd: db_redis: skip empty keys
by Victor Seva 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: c5a3c2cd8c6952356237c235c2ade159c030382b URL: https://github.com/kamailio/kamailio/commit/c5a3c2cd8c6952356237c235c2ade15… Author: Sipwise Development Team <support(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-14T14:26:27+02:00 db_redis: skip empty keys --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/c5a3c2cd8c6952356237c235c2ade15… Patch: https://github.com/kamailio/kamailio/commit/c5a3c2cd8c6952356237c235c2ade15… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 83d11e9b318..bda72446d96 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -700,6 +700,9 @@ static int db_redis_build_query_keys(km_redis_con_t *con, const str *table_name, LM_DBG("no direct entry key found, checking type keys\n"); for(type = table->types; type; type = type->next) { key = type->keys; + /* skip value-less master keys */ + if(!key) + continue; LM_DBG("checking type '%.*s'\n", type->type.len, type->type.s); if(db_redis_find_query_key(key, table_name, table, &type->type, _k, _v, _op, _n, &keyname, &key_found, ts_scan_start)

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
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 June 2023