- sr-dev - kamailio.org

git:5.7:85e3a2bc: pkg/docker: submodule update [skip ci]
by Sergey Safarov 20 Jun '23

20 Jun '23

Module: kamailio Branch: 5.7 Commit: 85e3a2bce7ba4d8c6e9c167c732dad11706f99d3 URL: https://github.com/kamailio/kamailio/commit/85e3a2bce7ba4d8c6e9c167c732dad1… Author: Kaufman <bkaufman(a)nexvortex.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-06-20T09:02:10+03:00 pkg/docker: submodule update [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/85e3a2bce7ba4d8c6e9c167c732dad1… Patch: https://github.com/kamailio/kamailio/commit/85e3a2bce7ba4d8c6e9c167c732dad1… --- diff --git a/pkg/docker b/pkg/docker index d34e8eed77..5c45c0f887 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit d34e8eed77428f84ef15c57bd7402e5161b6021f +Subproject commit 5c45c0f8871ceebb1a8f5308653bca924afb0d6f

1 0

git:5.7:3e510ac6: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 19 Jun '23

19 Jun '23

Module: kamailio Branch: 5.7 Commit: 3e510ac68a4b9bc99b6ade5cb7cc862adcbb9eb9 URL: https://github.com/kamailio/kamailio/commit/3e510ac68a4b9bc99b6ade5cb7cc862… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-19T14:17:02+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_usrloc_scscf/README Modified: src/modules/mqueue/README --- Diff: https://github.com/kamailio/kamailio/commit/3e510ac68a4b9bc99b6ade5cb7cc862… Patch: https://github.com/kamailio/kamailio/commit/3e510ac68a4b9bc99b6ade5cb7cc862… --- diff --git a/src/modules/ims_usrloc_scscf/README b/src/modules/ims_usrloc_scscf/README index 384d9ee6742..d128b226b00 100644 --- a/src/modules/ims_usrloc_scscf/README +++ b/src/modules/ims_usrloc_scscf/README @@ -39,7 +39,7 @@ Yasin Caner 3.11. matching_mode (int) 3.12. cseq_delay (int) 3.13. fetch_rows(int) - 3.14. hash_size (string) + 3.14. hash_size (int) 3.15. subs_hash_size (int) 3.16. contacts_hash_size (integer) 3.17. nat_bflag (integer) @@ -108,7 +108,7 @@ Chapter 1. Admin Guide 3.11. matching_mode (int) 3.12. cseq_delay (int) 3.13. fetch_rows(int) - 3.14. hash_size (string) + 3.14. hash_size (int) 3.15. subs_hash_size (int) 3.16. contacts_hash_size (integer) 3.17. nat_bflag (integer) @@ -157,7 +157,7 @@ Chapter 1. Admin Guide 3.11. matching_mode (int) 3.12. cseq_delay (int) 3.13. fetch_rows(int) - 3.14. hash_size (string) + 3.14. hash_size (int) 3.15. subs_hash_size (int) 3.16. contacts_hash_size (integer) 3.17. nat_bflag (integer) @@ -315,7 +315,7 @@ st/scscf") ... modparam("ims_usrloc_scscf", "fetch_rows", 3000) -3.14. hash_size (string) +3.14. hash_size (int) The number of entries of the hash table used by usrloc diff --git a/src/modules/mqueue/README b/src/modules/mqueue/README index a8981a68aee..3db56e8f54b 100644 --- a/src/modules/mqueue/README +++ b/src/modules/mqueue/README @@ -176,12 +176,12 @@ val character varying(4096) DEFAULT "" NOT NULL + size: size of the queue. Specifies the maximum number of items in queue. If exceeded the oldest one is removed. If not set the queue will be limitless. - + dbmode: If set to 1, the content of the queue is written to - database table when the SIP server is stopped (i.e., ensure - persistency over restarts). If set to 2, it is written at - shutdown but not read at startup. If set to 3, it is read at - sartup but not written at shutdown. Default value is 0 (no db - table interaction). + + dbmode: If set to 1, the content of the queue is read from + database at startup and is written to database table when the + SIP server is stopped (i.e., ensure persistency over + restarts). If set to 2, it is read at startup but not written + at shutdown. If set to 3, it is written at shutdown but not + read at startup. Default value is 0 (no db table interaction). + addmode: how to add new (key,value) pairs. o 0: Will push all new (key,value) pairs at the end of the queue. (default)

1 0

git: new commits in branch 5.7
by Daniel-Constantin Mierla 19 Jun '23

19 Jun '23

- URL: https://github.com/kamailio/kamailio/commit/408643ec916bc00f9f9447952e553d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:36:53+02:00 ipops: create container items if not found for srv and naptr functions - GH #3419 (cherry picked from commit 7971d825361bee29d65fcea69f2978d7af31eeaa) - URL: https://github.com/kamailio/kamailio/commit/e95a79eef0589be2f7d0470bfe6ba19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:37:32+02:00 siprepo: check if list is set on insert (cherry picked from commit 423a818cf6e8f6d672630a0365e13877a173508f) - URL: https://github.com/kamailio/kamailio/commit/c29d5299650ddabb9a5b61c7b6a72a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:38:05+02:00 cdp: reworked switch for setting x->state = ACC_CC_ST_DISCON (cherry picked from commit cb6332982edff5fd2f10b6ee41c22388cc9a39b3) - URL: https://github.com/kamailio/kamailio/commit/3b6d0bd508d62b6f6cd0176551311d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:38:31+02:00 cfgt: reworked test on dest.s for freeing (cherry picked from commit b2f99145fa7f4088c80dd3e759372445f93f5492) - URL: https://github.com/kamailio/kamailio/commit/febfc9722f83d992a3c1643fa373468… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:40:03+02:00 sst: fix condition on sst_min_se for sst_check_min() (cherry picked from commit a059af04ac47fd31238ca4f22ad868529e035c43) - URL: https://github.com/kamailio/kamailio/commit/b68cb1ace4d44ba0a471a9fd9a6138f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:40:34+02:00 async: use _async_timer_exec_last_slot = UINT_MAX for initial value (cherry picked from commit bc544daea2ee4bb568cf0314f6d32b8aa0c81ecc) - URL: https://github.com/kamailio/kamailio/commit/9c78c0f55dc2aefa53872b26162ddae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:40:47+02:00 ims_usrloc_scscf: docs - type int for hash_size parameter (cherry picked from commit 1217c9098bc8790e659959a7df97e441e84b54ff) - URL: https://github.com/kamailio/kamailio/commit/cd665a135e0046b915af7afd9135a2c… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-06-19T13:42:43+02:00 mqueue: fix support for db_text - db_operations are safe only after db mod_init() - closes #3474 (cherry picked from commit 848d55388dda0c135820d9f24950561946249bbc) - URL: https://github.com/kamailio/kamailio/commit/14638ef43f9b2ef710ae3a6464fb5db… Author: Akash Gupta <listen2akash(a)gmail.com> Date: 2023-06-19T13:43:28+02:00 tool: port the route_graph.py script to python version 3.x (cherry picked from commit fa2a69e2ae919b7ba221e87e2001bde83113ce2a) - URL: https://github.com/kamailio/kamailio/commit/4f3c32e48b79688ab905802c173b981… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2023-06-19T13:44:05+02:00 tools: use python3 for route_graph.py tool, for old systems with both python2/python3, fix file closing (cherry picked from commit 7b1fe0483b684693c7baea9b62b471b64c6e22a9) - URL: https://github.com/kamailio/kamailio/commit/c6af81fad763114c1cec74927787388… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:44:17+02:00 Makefile: fixed paths for init.d scripts install on debian and centos - GH #3476 (cherry picked from commit c285b16bc066ca4236ee00cf3e7fb24539fa9f2b) - URL: https://github.com/kamailio/kamailio/commit/39262e50389d41c50d0e6ff2ae2b0a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:48:26+02:00 dialplan: restructured condition on input and output params (cherry picked from commit f99b116e876170709ad364ac2b8093969a939d4a) - URL: https://github.com/kamailio/kamailio/commit/a8094a3b0bb73be70500b4cbbfb2e99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:52:30+02:00 auth_diameter: free req in some cases of errors (cherry picked from commit fb19f0ea4c656afe7b60788efb8804e552fd37f9) - URL: https://github.com/kamailio/kamailio/commit/faf7941042c1e00a68f6ac36d14568b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:55:14+02:00 cdp: check setsockopt() return code (cherry picked from commit 39f09877e650d66e820ca7eb0d61416818d174fc) - URL: https://github.com/kamailio/kamailio/commit/91cb5d0adf887db6a34e2a394ab34aa… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-06-19T13:58:05+02:00 mqueue: fix documentation to match the code (cherry picked from commit 23d43645332451ec1ec6dab11da777f9c3bfe304) - URL: https://github.com/kamailio/kamailio/commit/8087b2fed765115bf0fd238c0c987fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:59:13+02:00 core: kemi - propagate bool as a return value type - some scripting languages differentiate bool false|true vs int 0|1 values (cherry picked from commit f36744cf15c7fcddc7422f97a508cad600ca7d98)

1 0

git:master:bfc5d4bd: dialplan: set right input/output pv references
by Daniel-Constantin Mierla 19 Jun '23

19 Jun '23

Module: kamailio Branch: master Commit: bfc5d4bdcdd1ce60359d1a2e6a097f312879799f URL: https://github.com/kamailio/kamailio/commit/bfc5d4bdcdd1ce60359d1a2e6a097f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-19T13:50:28+02:00 dialplan: set right input/output pv references --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/bfc5d4bdcdd1ce60359d1a2e6a097f3… Patch: https://github.com/kamailio/kamailio/commit/bfc5d4bdcdd1ce60359d1a2e6a097f3… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index b5286d2b613..680d40641c8 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -858,12 +858,12 @@ static int ki_dp_translate( } if(input_spv == NULL || input_spv->len <= 0) { - pvs_o = pv_cache_get(&dp_default_param_s); + pvs_i = pv_cache_get(&dp_default_param_s); } else { pvs_i = pv_cache_get(input_spv); } if(output_spv == NULL || output_spv->len <= 0) { - pvs_i = pv_cache_get(&dp_default_param_s); + pvs_o = pv_cache_get(&dp_default_param_s); } else { pvs_o = pv_cache_get(output_spv); }

1 0

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

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:10a95d7c: modules: readme files regenerated - cfgt ... [skip ci]
by Kamailio Dev 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: 10a95d7c327a4bb83645723781d5885839f6fd0b URL: https://github.com/kamailio/kamailio/commit/10a95d7c327a4bb83645723781d5885… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-14T11:46:19+02:00 modules: readme files regenerated - cfgt ... [skip ci] --- Modified: src/modules/cfgt/README --- Diff: https://github.com/kamailio/kamailio/commit/10a95d7c327a4bb83645723781d5885… Patch: https://github.com/kamailio/kamailio/commit/10a95d7c327a4bb83645723781d5885… --- diff --git a/src/modules/cfgt/README b/src/modules/cfgt/README index 6cad032f141..7133ef3d643 100644 --- a/src/modules/cfgt/README +++ b/src/modules/cfgt/README @@ -28,6 +28,8 @@ Victor Seva 3.1. basedir (string) 3.2. mask (int) 3.3. callid_prefix (string) + 3.4. skip_unknown (int) + 3.5. route_log (int) 4. RPC Commands @@ -43,6 +45,8 @@ Victor Seva 1.1. Set cfgtrace parameter 1.2. Set mask parameter 1.3. Set callid_prefix parameter + 1.4. Set skip_unknown parameter + 1.5. Set route_log parameter Chapter 1. Admin Guide @@ -59,6 +63,8 @@ Chapter 1. Admin Guide 3.1. basedir (string) 3.2. mask (int) 3.3. callid_prefix (string) + 3.4. skip_unknown (int) + 3.5. route_log (int) 4. RPC Commands @@ -99,6 +105,8 @@ Chapter 1. Admin Guide 3.1. basedir (string) 3.2. mask (int) 3.3. callid_prefix (string) + 3.4. skip_unknown (int) + 3.5. route_log (int) 3.1. basedir (string) @@ -145,6 +153,30 @@ modparam("cfgt", "mask", 12) modparam("cfgt", "callid_prefix", "TEST-ID%") ... +3.4. skip_unknown (int) + + If enabled, value different from 0, cfgt will not generate the report + of any message that doesn't match the callid_prefix. + + Default value is ��0��, false. + + Example 1.4. Set skip_unknown parameter +... +modparam("cfgt", "skip_unknown", "1") +... + +3.5. route_log (int) + + If enabled, value different from 0, cfgt will log (WARN) the execution + time of routes. + + Default value is ��0��, false. + + Example 1.5. Set route_log parameter +... +modparam("cfgt", "route_log", "1") +... + 4. RPC Commands 4.1. cfgt.mask

1 0

git:master:60485701: pv_headers: rework pvh_remove_header_param, take two
by Victor Seva 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: 60485701ea3c065e657206ebcb6dbfa212adf1d4 URL: https://github.com/kamailio/kamailio/commit/60485701ea3c065e657206ebcb6dbfa… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-14T11:43:43+02:00 pv_headers: rework pvh_remove_header_param, take two * pvh_set_xavi changes/removes xavi, so we need the new value * after pvh_remove_header, search for the header again --- Modified: src/modules/pv_headers/pv_headers.c Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_xavp.c Modified: src/modules/pv_headers/pvh_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/60485701ea3c065e657206ebcb6dbfa… Patch: https://github.com/kamailio/kamailio/commit/60485701ea3c065e657206ebcb6dbfa…

1 0

git:master:1ce15ab7: cfgt: route_log modparam
by Victor Seva 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: 1ce15ab7094d3b13bf6db3cabb86bcdbab969d88 URL: https://github.com/kamailio/kamailio/commit/1ce15ab7094d3b13bf6db3cabb86bcd… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-14T11:30:40+02:00 cfgt: route_log modparam If enabled, cfgt will log (WARN) the execution time of routes. --- Modified: src/modules/cfgt/cfgt_int.c Modified: src/modules/cfgt/cfgt_int.h Modified: src/modules/cfgt/cfgt_mod.c Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1ce15ab7094d3b13bf6db3cabb86bcd… Patch: https://github.com/kamailio/kamailio/commit/1ce15ab7094d3b13bf6db3cabb86bcd…

1 0

git:master:dd9c891b: cfgt: don't dump same node
by Victor Seva 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: dd9c891bafe8de5dace630d676f9ea697152a4de URL: https://github.com/kamailio/kamailio/commit/dd9c891bafe8de5dace630d676f9ea6… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-14T11:30:06+02:00 cfgt: don't dump same node --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/dd9c891bafe8de5dace630d676f9ea6… Patch: https://github.com/kamailio/kamailio/commit/dd9c891bafe8de5dace630d676f9ea6… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 2480f4b66f1..6dba3a1dc94 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -32,6 +32,7 @@ #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" #include "../../core/parser/msg_parser.h" +#include "../../core/script_cb.h" #include "cfgt_int.h" #include "cfgt_json.h" @@ -460,11 +461,25 @@ void _cfgt_print_node(cfgt_node_p node, int json) int _cfgt_set_dump(struct sip_msg *msg, cfgt_node_p node, str *flow) { + int len; + char v; srjson_t *f, *vars; if(node == NULL || flow == NULL) return -1; + /* don't generate two same nodes */ + if((len = srjson_GetArraySize(&node->jdoc, node->flow)) >= 1) { + f = srjson_GetArrayItem(&node->jdoc, node->flow, len - 1); + STR_VTOZ(flow->s[flow->len], v); + f = srjson_GetObjectItem(&node->jdoc, f, flow->s); + STR_ZTOV(flow->s[flow->len], v); + if(f != NULL) { + LM_DBG("node[%.*s] flow already there\n", flow->len, flow->s); + return 0; + } + } + vars = srjson_CreateObject(&node->jdoc); if(vars == NULL) { LM_ERR("cannot create json object\n"); @@ -763,11 +778,35 @@ int cfgt_msgin(sr_event_param_t *evp) return -1; } +static inline void print_cb_flags(unsigned int flags) +{ + LM_DBG("flags:"); + if(flags & REQUEST_CB) + LM_DBG("REQUEST_CB"); + if(flags & FAILURE_CB) + LM_DBG("FAILURE_CB"); + if(flags & ONREPLY_CB) + LM_DBG("ONREPLY_CB"); + if(flags & BRANCH_CB) + LM_DBG("BRANCH_CB"); + if(flags & ONSEND_CB) + LM_DBG("ONSEND_CB"); + if(flags & ERROR_CB) + LM_DBG("ERROR_CB"); + if(flags & LOCAL_CB) + LM_DBG("LOCAL_CB"); + if(flags & EVENT_CB) + LM_DBG("EVENT_CB"); + if(flags & BRANCH_FAILURE_CB) + LM_DBG("BRANCH_FAILURE_CB"); +} + int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar) { str unknown = {"unknown", 7}; int get_hdr_result = 0, res; + print_cb_flags(flags); if(_cfgt_node) { if(_cfgt_node->msgid == 0) { LM_DBG("new node\n"); @@ -812,7 +851,7 @@ int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar) int cfgt_post(struct sip_msg *msg, unsigned int flags, void *bar) { str flowname = STR_NULL; - + print_cb_flags(flags); if(_cfgt_node) { if(cfgt_skip_unknown && strncmp(_cfgt_node->uuid.s, "unknown", 7) == 0) {

1 0

git:master:b5ea290b: cfgt: skip_unknown modparam
by Victor Seva 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: b5ea290be4a5f92cd24dd39cbefe2987ed577d19 URL: https://github.com/kamailio/kamailio/commit/b5ea290be4a5f92cd24dd39cbefe298… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-14T11:25:28+02:00 cfgt: skip_unknown modparam If enabled, value different from 0, cfgt will not generate the report of any message that doesn't match the callid_prefix. --- Modified: src/modules/cfgt/cfgt_int.c Modified: src/modules/cfgt/cfgt_mod.c Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b5ea290be4a5f92cd24dd39cbefe298… Patch: https://github.com/kamailio/kamailio/commit/b5ea290be4a5f92cd24dd39cbefe298… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 2509b3eb6e7..2480f4b66f1 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -43,6 +43,7 @@ cfgt_hash_p _cfgt_uuid = NULL; str cfgt_hdr_prefix = {"NGCP%", 5}; str cfgt_basedir = {"/tmp", 4}; int cfgt_mask = CFGT_DP_ALL; +int cfgt_skip_unknown = 0; int not_sip = 0; int _cfgt_get_filename(int msgid, str uuid, str *dest, int *dir); @@ -385,6 +386,10 @@ void cfgt_save_node(cfgt_node_p node) str dest = STR_NULL; int dir = 0; struct stat sb; + if(cfgt_skip_unknown && strncmp(_cfgt_node->uuid.s, "unknown", 7) == 0) { + LM_DBG("skip unknown\n"); + return; + } if(_cfgt_get_filename(node->msgid, node->uuid, &dest, &dir) < 0) { LM_ERR("can't build filename\n"); return; @@ -658,6 +663,9 @@ int cfgt_process_route(struct sip_msg *msg, struct action *a) LM_ERR("node empty\n"); return -1; } + if(cfgt_skip_unknown && strncmp(_cfgt_node->uuid.s, "unknown", 7) == 0) { + return 0; + } if(a->rname == NULL) { LM_DBG("no routename. type:%d\n", a->type); return 0; @@ -806,6 +814,10 @@ int cfgt_post(struct sip_msg *msg, unsigned int flags, void *bar) str flowname = STR_NULL; if(_cfgt_node) { + if(cfgt_skip_unknown + && strncmp(_cfgt_node->uuid.s, "unknown", 7) == 0) { + return 1; + } LM_DBG("dump last flow\n"); if(_cfgt_node->route == NULL && strncmp(_cfgt_node->uuid.s, "unknown", 7) == 0) @@ -844,6 +856,10 @@ int cfgt_msgout(sr_event_param_t *evp) } if(_cfgt_node) { + if(cfgt_skip_unknown + && strncmp(_cfgt_node->uuid.s, "unknown", 7) == 0) { + return 0; + } jobj = srjson_CreateStr(&_cfgt_node->jdoc, buf->s, buf->len); if(jobj == NULL) { LM_ERR("cannot create json object\n"); diff --git a/src/modules/cfgt/cfgt_mod.c b/src/modules/cfgt/cfgt_mod.c index 728d22813c8..7dec36ae064 100644 --- a/src/modules/cfgt/cfgt_mod.c +++ b/src/modules/cfgt/cfgt_mod.c @@ -42,6 +42,7 @@ unsigned int init_flag = 0; extern int cfgt_mask; extern str cfgt_basedir; extern str cfgt_hdr_prefix; +extern int cfgt_skip_unknown; /* clang-format off */ /*! \brief * Exported functions @@ -58,6 +59,7 @@ static param_export_t params[] = { {"basedir", PARAM_STR, &cfgt_basedir}, {"mask", INT_PARAM, &cfgt_mask}, {"callid_prefix", PARAM_STR, &cfgt_hdr_prefix}, + {"skip_unknown", INT_PARAM, &cfgt_skip_unknown}, {0, 0, 0} }; diff --git a/src/modules/cfgt/doc/cfgt_admin.xml b/src/modules/cfgt/doc/cfgt_admin.xml index 2a2b158e57d..84d3df612e6 100644 --- a/src/modules/cfgt/doc/cfgt_admin.xml +++ b/src/modules/cfgt/doc/cfgt_admin.xml @@ -143,6 +143,26 @@ modparam("cfgt", "mask", 12) # using '%' as delimiter modparam("cfgt", "callid_prefix", "TEST-ID%") ... +</programlisting> + </example> + </section> + <section id="cfg.p.skip_unknown"> + <title><varname>skip_unknown</varname> (int)</title> + <para> + If enabled, value different from 0, cfgt will not generate the report + of any message that doesn't match the callid_prefix. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>, false. + </emphasis> + </para> + <example> + <title>Set <varname>skip_unknown</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("cfgt", "skip_unknown", "1") +... </programlisting> </example> </section>

1 0

git:master:c3f2ff65: pua_dialoginfo: fix dlg_var store and retrieval
by Victor Seva 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: c3f2ff656475d85b190f0a2f138b526d9a63e732 URL: https://github.com/kamailio/kamailio/commit/c3f2ff656475d85b190f0a2f138b526… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-14T10:53:34+02:00 pua_dialoginfo: fix dlg_var store and retrieval * pubruri_calle[e|r]_avp can have more than one value. Store values as comma separate strings at pubruri_calle[e|r]_dlg_var * be aware of possible multiple values when restoring values from pubruri_calle[e|r]_dlg_var * alloc string values always for str_list --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/c3f2ff656475d85b190f0a2f138b526… Patch: https://github.com/kamailio/kamailio/commit/c3f2ff656475d85b190f0a2f138b526…

1 0

git:master:c064d547: pkg/docker: submodule update [skip ci]
by Sergey Safarov 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: c064d5473dd679c1eb191ba012522de409b79420 URL: https://github.com/kamailio/kamailio/commit/c064d5473dd679c1eb191ba012522de… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-06-14T11:10:39+03:00 pkg/docker: submodule update [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/c064d5473dd679c1eb191ba012522de… Patch: https://github.com/kamailio/kamailio/commit/c064d5473dd679c1eb191ba012522de… --- diff --git a/pkg/docker b/pkg/docker index d34e8eed774..5c45c0f8871 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit d34e8eed77428f84ef15c57bd7402e5161b6021f +Subproject commit 5c45c0f8871ceebb1a8f5308653bca924afb0d6f

1 0

git:master:768dd96d: pkg/kamailio/alpine: packaged lwsc
by Sergey Safarov 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: 768dd96da6f52e46bc227d9815f7225b33042295 URL: https://github.com/kamailio/kamailio/commit/768dd96da6f52e46bc227d9815f7225… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-06-14T11:10:39+03:00 pkg/kamailio/alpine: packaged lwsc --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/768dd96da6f52e46bc227d9815f7225… Patch: https://github.com/kamailio/kamailio/commit/768dd96da6f52e46bc227d9815f7225… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f895f02ad10..e585cdb66b6 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -31,7 +31,7 @@ makedepends="bison db-dev flex freeradius-client-dev expat-dev confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev - ruby-dev libmaxminddb-dev libunistring-dev mongo-c-driver-dev" + ruby-dev libmaxminddb-dev libunistring-dev mongo-c-driver-dev libwebsockets-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -137,7 +137,7 @@ _mod_list_tls="auth_identity crypto tls" _mod_list_outbound="outbound" # - modules depending on unistring library -_mod_list_websocket="websocket" +_mod_list_websocket="websocket lwsc" # - modules depending on libval-threads libcrypto libsres libpthread _mod_list_dnssec="dnssec"

1 0

git:master:88bcd44e: cdp: log message when failing to set nonblock on socket
by Daniel-Constantin Mierla 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: 88bcd44e07b43b723bb0ddc7b828f605179ae893 URL: https://github.com/kamailio/kamailio/commit/88bcd44e07b43b723bb0ddc7b828f60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-14T08:44:35+02:00 cdp: log message when failing to set nonblock on socket --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/88bcd44e07b43b723bb0ddc7b828f60… Patch: https://github.com/kamailio/kamailio/commit/88bcd44e07b43b723bb0ddc7b828f60… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index dccfcd5bd29..9124c4eef49 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -949,7 +949,9 @@ int peer_connect(peer *p) { // Connect with timeout int x; x = fcntl(sock, F_GETFL, 0); - fcntl(sock, F_SETFL, x | O_NONBLOCK); + if(fcntl(sock, F_SETFL, x | O_NONBLOCK) < 0) { + LM_WARN("failed to set O_NONBLOCK on socket %d\n", sock); + } int res = connect(sock, ainfo->ai_addr, ainfo->ai_addrlen); if(res < 0) { if(errno == EINPROGRESS) {

1 0

git:master:81ee6f7e: cdp: dedicated log messages for timeout events
by Daniel-Constantin Mierla 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: 81ee6f7e9eb23c24fb06dd2c201f3246d6044c4d URL: https://github.com/kamailio/kamailio/commit/81ee6f7e9eb23c24fb06dd2c201f324… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-14T08:28:58+02:00 cdp: dedicated log messages for timeout events --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/81ee6f7e9eb23c24fb06dd2c201f324… Patch: https://github.com/kamailio/kamailio/commit/81ee6f7e9eb23c24fb06dd2c201f324… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 9419b77134c..2cdba653d56 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -157,6 +157,9 @@ int sm_process( case Timeout: Error(p, p->I_sock); p->state = Closed; + LM_ERR("in state %s timeout event %s\n", + dp_states[p->state], dp_events[event - 101]); + goto error; default: LM_ERR("sm_process(): In state %s invalid event %s\n", dp_states[p->state], dp_events[event - 101]); @@ -344,6 +347,9 @@ int sm_process( if(p->R_sock >= 0) Error(p, p->R_sock); p->state = Closed; + LM_ERR("in state %s timeout event %s\n", + dp_states[p->state], dp_events[event - 101]); + goto error; default: LM_ERR("sm_process(): In state %s invalid event %s\n", dp_states[p->state], dp_events[event - 101]);

1 0

git:master:eaa4b177: cdp: safety check on diameter msg processing
by Daniel-Constantin Mierla 14 Jun '23

14 Jun '23

Module: kamailio Branch: master Commit: eaa4b177652259efda4e61aac9dd039ebde253c9 URL: https://github.com/kamailio/kamailio/commit/eaa4b177652259efda4e61aac9dd039… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-14T08:33:23+02:00 cdp: safety check on diameter msg processing --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/eaa4b177652259efda4e61aac9dd039… Patch: https://github.com/kamailio/kamailio/commit/eaa4b177652259efda4e61aac9dd039… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 2cdba653d56..24d5aed959e 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -1338,6 +1338,11 @@ void Rcv_Process(peer *p, AAAMessage *msg) { AAASession *session = 0; int nput = 0; + + if(!msg) { + return; + } + if(msg->sessionId) session = cdp_get_session(msg->sessionId->data); @@ -1408,8 +1413,7 @@ void Rcv_Process(peer *p, AAAMessage *msg) } if(!nput && !put_task(p, msg)) { LM_ERR("Rcv_Process(): Queue refused task\n"); - if(msg) - AAAFreeMessage(&msg); + AAAFreeMessage(&msg); } //if (msg) LM_ERR("Rcv_Process(): task added to queue command %d, flags %#1x endtoend %u hopbyhop %u\n",msg->commandCode,msg->flags,msg->endtoendId,msg->hopbyhopId);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev