January 2023 - sr-dev - kamailio.org

git:5.5:0622ff34: p_usrloc: fix default transaction isolation level (gh #3324)
by Henning Westerholt 09 Jan '23

09 Jan '23

Module: kamailio Branch: 5.5 Commit: 0622ff34dcdded39de06986e36f4758a8319e050 URL: https://github.com/kamailio/kamailio/commit/0622ff34dcdded39de06986e36f4758… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-01-09T07:59:32Z p_usrloc: fix default transaction isolation level (gh #3324) (cherry picked from commit ff647697724decb7440dfe3758857a06ab008979) (cherry picked from commit af7d9413385cd03da918777072e7246863849dbb) --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/0622ff34dcdded39de06986e36f4758… Patch: https://github.com/kamailio/kamailio/commit/0622ff34dcdded39de06986e36f4758… --- diff --git a/src/modules/p_usrloc/doc/p_usrloc_admin.xml b/src/modules/p_usrloc/doc/p_usrloc_admin.xml index 80d4233eeb9..2d8c6eb9762 100644 --- a/src/modules/p_usrloc/doc/p_usrloc_admin.xml +++ b/src/modules/p_usrloc/doc/p_usrloc_admin.xml @@ -472,14 +472,14 @@ modparam("p_usrloc", "db_use_transactions", "0") </para> <para> <emphasis> - Default value is <quote>READ UNCOMMITED</quote>. + Default value is <quote>READ UNCOMMITTED</quote>. </emphasis> </para> <example> <title>Set <varname>db_transaction_level</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITED") +modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITTED") ... </programlisting> </example> diff --git a/src/modules/p_usrloc/p_usrloc_mod.h b/src/modules/p_usrloc/p_usrloc_mod.h index 24368cf4705..6b0929f39bb 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.h +++ b/src/modules/p_usrloc/p_usrloc_mod.h @@ -61,7 +61,7 @@ #define DB_RETRY 10 #define DB_DEFAULT_POLICY 0 #define DEFAULT_FAILOVER_LEVEL 1 -#define DB_DEFAULT_TRANSACTION_LEVEL "READ UNCOMMITED" +#define DB_DEFAULT_TRANSACTION_LEVEL "READ UNCOMMITTED" #define DB_DEFAULT_CONNECTION_EXPIRES 300 #define DEFAULT_DB_TYPE "single" #define DEFAULT_DOMAIN_DB "location=cluster,cfa=single"

1 0

git:5.6:af7d9413: p_usrloc: fix default transaction isolation level (gh #3324)
by Henning Westerholt 09 Jan '23

09 Jan '23

Module: kamailio Branch: 5.6 Commit: af7d9413385cd03da918777072e7246863849dbb URL: https://github.com/kamailio/kamailio/commit/af7d9413385cd03da918777072e7246… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-01-09T07:59:04Z p_usrloc: fix default transaction isolation level (gh #3324) (cherry picked from commit ff647697724decb7440dfe3758857a06ab008979) --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/af7d9413385cd03da918777072e7246… Patch: https://github.com/kamailio/kamailio/commit/af7d9413385cd03da918777072e7246… --- diff --git a/src/modules/p_usrloc/doc/p_usrloc_admin.xml b/src/modules/p_usrloc/doc/p_usrloc_admin.xml index ca8faa827f9..cab0c3878af 100644 --- a/src/modules/p_usrloc/doc/p_usrloc_admin.xml +++ b/src/modules/p_usrloc/doc/p_usrloc_admin.xml @@ -472,14 +472,14 @@ modparam("p_usrloc", "db_use_transactions", "0") </para> <para> <emphasis> - Default value is <quote>READ UNCOMMITED</quote>. + Default value is <quote>READ UNCOMMITTED</quote>. </emphasis> </para> <example> <title>Set <varname>db_transaction_level</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITED") +modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITTED") ... </programlisting> </example> diff --git a/src/modules/p_usrloc/p_usrloc_mod.h b/src/modules/p_usrloc/p_usrloc_mod.h index bfdcc2f45ca..800a71851a8 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.h +++ b/src/modules/p_usrloc/p_usrloc_mod.h @@ -61,7 +61,7 @@ #define DB_RETRY 10 #define DB_DEFAULT_POLICY 0 #define DEFAULT_FAILOVER_LEVEL 1 -#define DB_DEFAULT_TRANSACTION_LEVEL "READ UNCOMMITED" +#define DB_DEFAULT_TRANSACTION_LEVEL "READ UNCOMMITTED" #define DB_DEFAULT_CONNECTION_EXPIRES 300 #define DEFAULT_DB_TYPE "single" #define DEFAULT_DOMAIN_DB "location=cluster,cfa=single"

1 0

[kamailio/kamailio] Invalid default transaction isolation level in p_usrloc (Issue #3324)
by Дилян Палаузов 09 Jan '23

09 Jan '23

The default transaction level in p_usrloc is `READ UNCOMMITED`. Since the correct spelling is `commiTTed`, this default transaction level `read uncommiTed` is not accepted by databases. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3324 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3324(a)github.com>

2 2

git:master:ff647697: p_usrloc: fix default transaction isolation level (gh #3324)
by Henning Westerholt 09 Jan '23

09 Jan '23

Module: kamailio Branch: master Commit: ff647697724decb7440dfe3758857a06ab008979 URL: https://github.com/kamailio/kamailio/commit/ff647697724decb7440dfe3758857a0… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-01-09T07:57:26Z p_usrloc: fix default transaction isolation level (gh #3324) --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/ff647697724decb7440dfe3758857a0… Patch: https://github.com/kamailio/kamailio/commit/ff647697724decb7440dfe3758857a0… --- diff --git a/src/modules/p_usrloc/doc/p_usrloc_admin.xml b/src/modules/p_usrloc/doc/p_usrloc_admin.xml index 6153dbcb00..37c84bf20b 100644 --- a/src/modules/p_usrloc/doc/p_usrloc_admin.xml +++ b/src/modules/p_usrloc/doc/p_usrloc_admin.xml @@ -472,14 +472,14 @@ modparam("p_usrloc", "db_use_transactions", "0") </para> <para> <emphasis> - Default value is <quote>READ UNCOMMITED</quote>. + Default value is <quote>READ UNCOMMITTED</quote>. </emphasis> </para> <example> <title>Set <varname>db_transaction_level</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITED") +modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITTED") ... </programlisting> </example> diff --git a/src/modules/p_usrloc/p_usrloc_mod.h b/src/modules/p_usrloc/p_usrloc_mod.h index bfdcc2f45c..800a71851a 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.h +++ b/src/modules/p_usrloc/p_usrloc_mod.h @@ -61,7 +61,7 @@ #define DB_RETRY 10 #define DB_DEFAULT_POLICY 0 #define DEFAULT_FAILOVER_LEVEL 1 -#define DB_DEFAULT_TRANSACTION_LEVEL "READ UNCOMMITED" +#define DB_DEFAULT_TRANSACTION_LEVEL "READ UNCOMMITTED" #define DB_DEFAULT_CONNECTION_EXPIRES 300 #define DEFAULT_DB_TYPE "single" #define DEFAULT_DOMAIN_DB "location=cluster,cfa=single"

1 0

git:master:5fbc0c6b: xmlrpc: check if rpc command has execution limit with delta interval
by Daniel-Constantin Mierla 09 Jan '23

09 Jan '23

Module: kamailio Branch: master Commit: 5fbc0c6b88b171bb04e98d4319e57e6c2c6ed0d8 URL: https://github.com/kamailio/kamailio/commit/5fbc0c6b88b171bb04e98d4319e57e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-09T08:45:01+01:00 xmlrpc: check if rpc command has execution limit with delta interval --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/5fbc0c6b88b171bb04e98d4319e57e6… Patch: https://github.com/kamailio/kamailio/commit/5fbc0c6b88b171bb04e98d4319e57e6… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index fcd93e5001..96da9872b9 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -70,6 +70,7 @@ #include "../../core/script_cb.h" /* exec_*_script_cb */ #include "../../core/route.h" /* route_get */ #include "../../core/sip_msg_clone.h" /* sip_msg_shm_clone */ +#include "../../core/rpc_lookup.h" #include "../../core/kemi.h" #include "http.h" @@ -2601,20 +2602,27 @@ static int process_xmlrpc(sip_msg_t* msg) */ static int ki_dispatch_rpc(sip_msg_t* msg) { - rpc_export_t* exp; + rpc_exportx_t* exp; int ret = 1; + unsigned int rdata; if (init_context(&ctx, msg) < 0) goto skip; - exp = find_rpc_export(ctx.method, 0); - if (!exp || !exp->function) { + exp = rpc_lookupx(ctx.method, strlen(ctx.method), &rdata); + if (!exp || !exp->r.function) { rpc_fault(&ctx, 500, "Method Not Found"); goto skip; } - ctx.flags = exp->flags; - if ((exp->flags & RET_ARRAY) && + if (rdata & RPC_EXEC_DELTA) { + LM_ERR("execution of command [%s] is limited by delta [%d]\n", + ctx.method, ksr_rpc_exec_delta); + rpc_fault(&ctx, 500, "Command Executed Too Fast"); + goto skip; + } + ctx.flags = exp->r.flags; + if ((exp->r.flags & RET_ARRAY) && add_xmlrpc_reply(&ctx.reply, &array_prefix) < 0) goto skip; - exp->function(&func_param, &ctx); + exp->r.function(&func_param, &ctx); skip: /* The function may have sent the reply itself */

1 0

git:master:67f27ea2: clt: check if rpc command has execution limit with delta interval
by Daniel-Constantin Mierla 09 Jan '23

09 Jan '23

Module: kamailio Branch: master Commit: 67f27ea223a20721ac288508635b5148e6264d56 URL: https://github.com/kamailio/kamailio/commit/67f27ea223a20721ac288508635b514… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-07T12:45:01+01:00 clt: check if rpc command has execution limit with delta interval --- Modified: src/modules/ctl/binrpc_run.c Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/67f27ea223a20721ac288508635b514… Patch: https://github.com/kamailio/kamailio/commit/67f27ea223a20721ac288508635b514…

1 0

Re: [SR-Users] pkg memory leak when acc module cdr_enabled
by Henning Westerholt 06 Jan '23

06 Jan '23

(adding sr-dev) Hi Alex, the memory allocator of glibc was not really efficient regarding the particular needs of a SIP server (allocation of many small string objects). That has probably improved in the last years, also system performance just got much faster. Other programs/tools also use their own allocators, e.g. Firefox, Rust [1] for jemalloc. There is some (not really well tested) support in the core for using the system memory allocator by the #define SYS_MALLOC. It probably needs to be set in Makefile.defs, also deactivating the other PKG memory managers, but did not looked into it right now. Cheers, Henning [1] https://news.ycombinator.com/item?id=8612645 -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com -----Original Message----- From: Alex Balashov <abalashov(a)evaristesys.com> Sent: Thursday, January 5, 2023 3:59 PM To: Henning Westerholt <hw(a)gilawa.com> Cc: Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> Subject: Re: [SR-Users] pkg memory leak when acc module cdr_enabled > On Jan 5, 2023, at 9:40 AM, Henning Westerholt <hw(a)gilawa.com> wrote: > > Hello Alex, > > there might be some performance implications by switching to system malloc. There is also easier debugging by internal Kamailio memory manager support. > > In this particular example with the leak, Kamailio would use in the end all of the system memory, and the machine out of memory killer will then randomly processes. So the limited memory pool also helps to protect the system against this kind of leaks. I am in no position to assess the relative efficiencies of various memory allocators. But it seems a bit extraordinary to suppose that a custom allocator is more efficient than the general-purpose libc allocator, although it's obviously possible; some application-specific optimised allocators clearly make this argument (i.e. Redis + jemalloc). Also, I wonder if the answer to this has changed over 20 years. Unbounded allocation from leaks can certainly be a problem. But rendering a process useless by running out of (much more limited) package memory (much more quickly) can also be a problem. :-) -- Alex -- Alex Balashov Principal Consultant Evariste Systems LLC Web: https://evaristesys.com Tel: +1-706-510-6800

3 4

[kamailio/kamailio] tls.reload during TLS relaying in sipp test will cause memory coruption of tls module (Issue #3305)
by JiangHai2011 06 Jan '23

06 Jan '23

### Description during sipp "tls caller and tls callee" test, do tls.reload repeatedly, the sipp tls connection will be disconnected and tls.reload will report error and can not be recovered ### Troubleshooting #### Reproduction (1)write a simple request_route logic in kamailio.cfg, as follows: request_route { add_local_rport(); $du = "sip:192.168.131.190:1001;transport=tls"; forward(); } (2)start sipp caller to kamailio tls:0.0.0.0:5061 and kamailio will relay this request to callee (3)at the same time, in another console, run the following cmds: ((i = 0)); while true; do /opt/kamailio/sbin/kamcmd tls.reload && echo $i && ((i = i+1)); done; #### Debugging Data None #### Log Messages tls.reload will report the following error, and it can not work again until kamailio is restarted: error: 500 - Error while loading TLS configuration file (consult server log) at the same time, sipp tls connection is disconnected by kamailio, some error is shown in the kamailo.log: -------------------------------------------------------------------------------------------------------- Dec 14 10:59:54 localhost sipproxy[64723]: ERROR: tls [tls_server.c:1330]: tls_h_read_f(): protocol level error Dec 14 10:59:54 localhost sipproxy[64723]: ERROR: tls [tls_server.c:1334]: tls_h_read_f(): src addr: 192.168.131.190:59545 Dec 14 10:59:54 localhost sipproxy[64723]: ERROR: tls [tls_server.c:1337]: tls_h_read_f(): dst addr: 192.168.131.190:5061 Dec 14 10:59:54 localhost sipproxy[64723]: ERROR: <core> [core/tcp_read.c:1478]: tcp_read_req(): ERROR: tcp_read_req: error reading - c: 0x7f3f67c89ba8 r: 0x7f3f67c89cd0 (-1) -------------------------------------------------------------------------------------------------------- #### SIP Traffic  ``` ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.2 (x86_64/linux) 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 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: unknown compiled on 10:03:56 Dec 14 2022 with gcc 4.9.4 ``` * **Operating System**:  ``` Linux localhost.localdomain 3.10.0-327.el7.x86_64 #1 SMP Thu Nov 19 22:10:57 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3305 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3305(a)github.com>

4 16

git:5.6:efd90dc3: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 06 Jan '23

06 Jan '23

Module: kamailio Branch: 5.6 Commit: efd90dc303221208a714ecc69daf744c39d47f0d URL: https://github.com/kamailio/kamailio/commit/efd90dc303221208a714ecc69daf744… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-01-06T12:47:01+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_python/README Modified: src/modules/app_python3/README --- Diff: https://github.com/kamailio/kamailio/commit/efd90dc303221208a714ecc69daf744… Patch: https://github.com/kamailio/kamailio/commit/efd90dc303221208a714ecc69daf744… --- diff --git a/src/modules/app_python/README b/src/modules/app_python/README index a1269d14f0e..a9d0b02890d 100644 --- a/src/modules/app_python/README +++ b/src/modules/app_python/README @@ -77,6 +77,10 @@ Chapter 1. Admin Guide module, look at the files inside source tree located at 'modules/app_python/python_examples/'. + As python2 is deprecated in Debian and other distributions, please use + the ��app_python3�� module instead. This module will be removed future + releases. + 2. Dependencies 2.1. Kamailio Modules diff --git a/src/modules/app_python3/README b/src/modules/app_python3/README index 49bc5774445..914350572b6 100644 --- a/src/modules/app_python3/README +++ b/src/modules/app_python3/README @@ -87,6 +87,11 @@ Chapter 1. Admin Guide module, look at the files inside the source tree located at 'modules/app_python3/python_examples/'. + Note: if symbols exported to KEMI (module or function names) conflict + with Python's reserved keywords, use the 'getattr()' function or the + '__dict__' attribute for 'KSR' (e.g., + 'KSR.__dict__["async"].task_route("myroute")'). + 2. Dependencies 2.1. Kamailio Modules @@ -190,9 +195,9 @@ python_exec("my_python_function", "$rU"); in each worker when it next invokes a Python method. The module uses a worker process lock to prevent recursive reloads. - This function only reloads the user script and creates a new script - object. It does not reinitialize the interpreter. E.g., references in - the old module remain if not redefined by the new version. + This function only reloads (re-executes) the user script and creates a + new script object. It does not reinitialize the interpreter (references + in the old module remain if not redefined by the new version). Name: app_python.reload @@ -203,6 +208,24 @@ python_exec("my_python_function", "$rU"); kamcmd app_python.reload ... + Note that reload is done for the Python script provided as parameter to + this Kamailio module. To reload the Python libraries imported in this + script, use something like: +... +import mod1 +... +import modN +from importlib import reload + +def mod_init(): + reload(mod1) + ... + reload(modN) + return kamailio() +... + + Where "modX" are the modules imported at the top. + 5.2. app_python.api_list List the functions available via Kemi framework.

1 0

[kamailio/kamailio] uri_param_rm function not working (Issue #3321)
by iliesh 06 Jan '23

06 Jan '23

### Description I have the following URI: ```INVITE sip:123456789;phone-context=+1@192.168.1.1;transport=udp;user=phone SIP/2.0``` I want to remove the phone-context parameter from the URI, so I've tried to use the function: ```uri_param_rm``` from the siputils package: ``` if (uri_param_rm("phone-context")) { t_relay_to_udp("192.168.1.2", "5060"); exit; } ``` But this doesn't change anything, this parameter is still present in the URI. I tried to use ```msg_apply_changes``` (just in case) function before relaying it - the result it the same, the parameter is still there. Also, I've noticed that this function is not working either: ``` if (uri_param_any("phone-context")) { xlog("L_INFO", "Phone Context"); } ``` while this one: ```get_uri_param("phone-context", "$var(phoneCtx)");``` - seems to be working fine. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.2 (x86_64/linux) e292ba ``` * **Operating System**:  ``` CentOS 7 X64 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3321 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3321(a)github.com>

3 4

git: new commits in branch 5.6
by Daniel-Constantin Mierla 06 Jan '23

06 Jan '23

- URL: https://github.com/kamailio/kamailio/commit/0637f42a63b79053fb7114690e21637… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2023-01-06T12:09:30+01:00 app_python: add a note that python2 is deprecated and app_python3 should be used (cherry picked from commit 7306e7683fd50420e93b44ec5593705194bf3616) - URL: https://github.com/kamailio/kamailio/commit/b2f0545ec4b596767aad280ee07fd6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:09:52+01:00 cdp: use empty string for debug messages when value is not set (cherry picked from commit d39f12ced4c79f3b7d60b5477f5065d9589547e8) - URL: https://github.com/kamailio/kamailio/commit/fecfac448f594283c5d5a9470359cb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:10:07+01:00 ims_registrar_pcscf: go to error to free variables on failure cases (cherry picked from commit 609962b49a79dc5650f72470f4b03746d2e6db46) - URL: https://github.com/kamailio/kamailio/commit/fc2f1b72781e3782b020978e9c188a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:10:23+01:00 core: dns cache - check pointer and small formatting (cherry picked from commit 611cfede181f4cd61f576068708975efe5f66ffc) - URL: https://github.com/kamailio/kamailio/commit/0ead35429a85800105178f7a8427d94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:10:42+01:00 keepalive: removed redundant checks (cherry picked from commit cbe6cef58da8de7efa18c4e34458a81176d23e42) - URL: https://github.com/kamailio/kamailio/commit/ace6ec13df233c5d6c55b5e62711888… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:10:58+01:00 nats: safety check on nats_workers inside mod destroy (cherry picked from commit bc97b7adf77406dfc08b57b4a7df912a76d324e5) - URL: https://github.com/kamailio/kamailio/commit/46cd2b6732a1bcd49c31a4a4a1173d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:11:09+01:00 kex: added fixup free functions to module exports (cherry picked from commit c8bd10f791ef7aa48a16104472b039a8ca1a53c5) - URL: https://github.com/kamailio/kamailio/commit/6d19964651f72715eb643775f97db80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:11:42+01:00 acc: free core attributes for cdrs sent to log file (cherry picked from commit 932062fc84048eaa38144cf0bbfa7a2cae95a258) - URL: https://github.com/kamailio/kamailio/commit/f625473cceabd94fcc12df387d71399… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:11:52+01:00 acc: init to 0 the arrays allocated for accounting (cherry picked from commit 721ec276f2bfcc18236e0b9de1f5552f505f0cda) - URL: https://github.com/kamailio/kamailio/commit/b78a813f0409cec8c58420f0bd43058… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:12:38+01:00 pv: check for contact address in pv_get_hfl() (cherry picked from commit b411303502282b2f4d32ad299ed5bcfd0852e902) - URL: https://github.com/kamailio/kamailio/commit/53f6395131ed53bf2d019dfb784d4cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:12:49+01:00 rtp_media_server: removed lib bcunit linking - not required for the code - tested on debian 11 (cherry picked from commit 38f17e622e8539883a7213acce3aed0635b11aff) - URL: https://github.com/kamailio/kamailio/commit/e48730f897ec66aad1d87b75ef419f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:13:04+01:00 pv: set str type for $hfl() (cherry picked from commit 51fc76737319f9b06ee4aa86e8c15c3fd5b62248) - URL: https://github.com/kamailio/kamailio/commit/85c7085068bf6ea602b0553874030ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:13:17+01:00 nats: safety check for nats_workers and nats_pub_workers on mod destroy (cherry picked from commit 51d2f707562f70749dd02727a34dc5e4fa20712e) - URL: https://github.com/kamailio/kamailio/commit/373c53ea9d28d3af9af051cc36a3d6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:13:25+01:00 nats: init global variables (cherry picked from commit 619ff95d760c9b98df515ddccc5aa1e39275beeb) - URL: https://github.com/kamailio/kamailio/commit/2d8be55fec53d08b384896b0d380ccf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:13:34+01:00 nats: formatted module exports structures (cherry picked from commit d5afbf0fb2f006d38fdfe32f6d2094638ad938b0) - URL: https://github.com/kamailio/kamailio/commit/eb661123481af272e5854e5f0ce0a09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:13:42+01:00 rtp_media_server: init global variables (cherry picked from commit 3bcef382b810b4cd2a5a03b079086fee3bbbe187) - URL: https://github.com/kamailio/kamailio/commit/c0f29178edac11519650f55236cf3d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:13:54+01:00 siputils: export add_uri_param() to kemi (cherry picked from commit ad4faf03628db45d30f27358b81afd8e0bee03c0) - URL: https://github.com/kamailio/kamailio/commit/72a09f0fc3912e07d2d624079945d78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:14:12+01:00 app_python3: note about kemi symbols and python reserved words (cherry picked from commit 0d6d434a92ae69cf1e503f07ffa6f46a9948593e) - URL: https://github.com/kamailio/kamailio/commit/a0e89d8fad7e764478b0ff69e1fe335… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:14:31+01:00 secsipid: iterate through all Identity headers (cherry picked from commit cd3b776649e652b5d27b2718c22f08736b1e9e84) - URL: https://github.com/kamailio/kamailio/commit/bea811e2a6e8b12f8491b7e46bcc58a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:14:44+01:00 secsipid: debug message if identity header is not found (cherry picked from commit 0920aa1a27565bc52fd1ff9f4b9fc31dbd0d2a75) - URL: https://github.com/kamailio/kamailio/commit/a2c4e0efdb03ba31ddb295fbfd2d95a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:14:50+01:00 secsipid: ensure headers are parsed (cherry picked from commit a0d9deb9f852f887bed7c0809f3056b5f75379c8) - URL: https://github.com/kamailio/kamailio/commit/af3a249364b20e46cc80a6ae6ea8c04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:14:59+01:00 websocket: more details on debig messages (cherry picked from commit e7bd1570e3788e9d04047b4d1d00cb8bd8b172d3) - URL: https://github.com/kamailio/kamailio/commit/645f3ed8dbb6260aae870629e026d31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:15:23+01:00 app_python3: docs - added note about how Python modules used in script can be reloaded (cherry picked from commit 34d60608bea449ab7258a5d88894651303b80adf) - URL: https://github.com/kamailio/kamailio/commit/caf8465d6f56c5891b8398814d3e66a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:17:03+01:00 sipcapture: debug message with header offset and address family (cherry picked from commit 7f258d97431a9a4bccf8155def52c9e9070c9f1d) - URL: https://github.com/kamailio/kamailio/commit/3bddd542cdd7a6f56e6dee9a7db526a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:17:41+01:00 core: safety check for freeaddrinfo() param on log_init() - GH #3281 (cherry picked from commit 6438573ce2d138d83cc1fa7cd88834c48d623ac6) - URL: https://github.com/kamailio/kamailio/commit/7e12f4f5951ebcd40bc7779b6c7bf71… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2023-01-06T12:19:14+01:00 tm: cleanup parsed body at the end t_continue_helper - if t_suspend and t_continue are used for replies and in the called route in t_continue the body of the sip message is parsed the pkg memory of the parsed body is leaked (cherry picked from commit f409a8c9f6fde33eaf8b428887e219b56740b0a5) - URL: https://github.com/kamailio/kamailio/commit/0ba02031953029c3e4820264503400c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:19:37+01:00 core: tcp - debug message on no connect (cherry picked from commit 5fee7d818f18afcab4d2e17231d2e4eab79b7b48) - URL: https://github.com/kamailio/kamailio/commit/74fdd2e61043df0961bb19f46a56a52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:21:46+01:00 cplc: removed unused function (cherry picked from commit 0f3ce4029ee1f52804566dc945c7e0914f01405d) - URL: https://github.com/kamailio/kamailio/commit/1f3ad963636e62431d7ec8c113c90e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:21:54+01:00 core: utils/tmrec - removed unused function (cherry picked from commit a33c9bb24f01195c5654e9699079eb3d4548692e) - URL: https://github.com/kamailio/kamailio/commit/6178db33a2df671133eba654b856c0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:22:52+01:00 xmlrpc: coherent check of RET_ARRAY as a flag (cherry picked from commit 7364a8a67e19960d51a632108f39d7d2d289f8ce) - URL: https://github.com/kamailio/kamailio/commit/4cea7dc033e34d019a7018d5b0eef39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T12:23:06+01:00 core: rpc - removed old todo, whitespacing and define guards coherence (cherry picked from commit 7a3573002fddffd74999c4cd5a859a4019d0227a)

1 0

[kamailio/kamailio] Permissions module `reload_delta` is not scoped to individual tables. (Issue #3318)
by Ben Kaufman 06 Jan '23

06 Jan '23

### Description The permissions module has two reload RPC commands, `permissions.addressReload` which reloads the `address` table, and `permissions.trustedReload`, which reloads the `trusted` table. The module parameter `reload_delta` exists to prevent concurrent reloading of a single table: > ##### 3.25. reload_delta (int) > The number of seconds that have to be waited before executing a new RPC reload. By default there is a rate limiting of maximum one reload in five seconds. > > If set to 0, no rate limit is configured. Note carefully: use this configuration only in tests environments because executing two RPC reloads of the same table at the same time can cause to kamailio to crash. If one of the reload rpc commands is issues (i.e. `permissions.addressReload`), then the OTHER reload command (`permissions.trustedReload`) will be blocked, despite acting against two separate tables. ### Troubleshooting Reproduced the issue. #### Reproduction _(DB config for permissions module omitted for brevity)_ ``` loadmodule "rtimer.so" loadmodule "permissions.so" loadmodule "jsonrpcs" modparamx("rtimer", "timer", "name=permissions_reload;mode=0;interval=300") modparam("rtimer", "exec", "timer=permissions_reload;route=RELOAD_PERMISSIONS") route[RELOAD_PERMISSIONS] { xnotice("Reloading trusted records\n"); jsonrpc_exec('{"jsonrpc": "2.0", "method": "permissions.trustedReload", "id": 1}'); xalert("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); xnotice("Reloading addresses\n"); jsonrpc_exec('{"jsonrpc": "2.0", "method": "permissions.addressReload", "id": 1}'); xalert("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); } ``` #### Debugging Data The above config yields output like this: ``` 2(8) NOTICE: <script>: Reloading trusted records 2(8) ALERT: <script>: jsonrpc response code: 200 - the body is: { "jsonrpc": "2.0", "result": "Reload OK", "id": 1 } 2(8) NOTICE: <script>: Reloading addresses 2(8) ERROR: permissions [rpc.c:42]: rpc_check_reload(): ongoing reload 2(8) ALERT: <script>: jsonrpc response code: 500 - the body is: { "jsonrpc": "2.0", "error": { "code": 500, "message": "ongoing reload" }, "id": 1 } ``` ### Possible Solutions Ideally each reload would be tracked separately. This could possibly involve separate `reload_delta` parameters for each table (although it seems excessive to change the interface). It's also possible that this behavior is by design, in which case, clarification of the documentation for the `reload_delta` parameter would be nice. ### Additional Information Problem occurs in kamailio 5.6.2. Likely within all version since the `reload_delta` parameter was added. * **Operating System**: Tested in Alpine, but OS seems irrelevant. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3318 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3318(a)github.com>

4 8

git:master:2442d074: jansson: avoid warning when long and long long have same size
by Daniel-Constantin Mierla 06 Jan '23

06 Jan '23

Module: kamailio Branch: master Commit: 2442d0748ef079c2152461792c64fc391e4def83 URL: https://github.com/kamailio/kamailio/commit/2442d0748ef079c2152461792c64fc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T09:27:05+01:00 jansson: avoid warning when long and long long have same size --- Modified: src/modules/jansson/jansson_utils.c --- Diff: https://github.com/kamailio/kamailio/commit/2442d0748ef079c2152461792c64fc3… Patch: https://github.com/kamailio/kamailio/commit/2442d0748ef079c2152461792c64fc3… --- diff --git a/src/modules/jansson/jansson_utils.c b/src/modules/jansson/jansson_utils.c index 813757030b..27ca34c9bb 100644 --- a/src/modules/jansson/jansson_utils.c +++ b/src/modules/jansson/jansson_utils.c @@ -111,7 +111,8 @@ int jansson_to_xval(sr_xval_t *val, char** freeme, json_t* v) { }else if(json_is_integer(v)) { #if JSON_INTEGER_IS_LONG_LONG long long value = json_integer_value(v); - if ((value > LONG_MAX) || (value < LONG_MIN)) { + if ((sizeof(long) < sizeof(long long)) + && ((value > LONG_MAX) || (value < LONG_MIN))) { char* svalue = NULL; if (asprintf(&svalue, "%"JSON_INTEGER_FORMAT, value) < 0) { ERR("asprintf failed\n");

1 0

git:master:e638232f: jansson: use JSON_INTEGER_IS_LONG_LONG macro for type of json integer field
by Daniel-Constantin Mierla 06 Jan '23

06 Jan '23

Module: kamailio Branch: master Commit: e638232ff51793d683868a4cc7beba8014fcba47 URL: https://github.com/kamailio/kamailio/commit/e638232ff51793d683868a4cc7beba8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-06T08:03:27+01:00 jansson: use JSON_INTEGER_IS_LONG_LONG macro for type of json integer field --- Modified: src/modules/jansson/jansson_utils.c --- Diff: https://github.com/kamailio/kamailio/commit/e638232ff51793d683868a4cc7beba8… Patch: https://github.com/kamailio/kamailio/commit/e638232ff51793d683868a4cc7beba8… --- diff --git a/src/modules/jansson/jansson_utils.c b/src/modules/jansson/jansson_utils.c index f7afa4980c1..813757030b0 100644 --- a/src/modules/jansson/jansson_utils.c +++ b/src/modules/jansson/jansson_utils.c @@ -109,6 +109,7 @@ int jansson_to_xval(sr_xval_t *val, char** freeme, json_t* v) { val->v.s.s = value; val->v.s.len = strlen(value); }else if(json_is_integer(v)) { +#if JSON_INTEGER_IS_LONG_LONG long long value = json_integer_value(v); if ((value > LONG_MAX) || (value < LONG_MIN)) { char* svalue = NULL; @@ -124,6 +125,10 @@ int jansson_to_xval(sr_xval_t *val, char** freeme, json_t* v) { val->type = SR_XTYPE_LONG; val->v.l = (long)value; } +#else + val->type = SR_XTYPE_LONG; + val->v.l = (long)json_integer_value(v); +#endif }else if(json_is_null(v)) { val->type = SR_XTYPE_NULL; }else {

1 0

git:master:10c0c188: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: 10c0c1889be5b1aed27a41a87c45b5c5e8a92cf3 URL: https://github.com/kamailio/kamailio/commit/10c0c1889be5b1aed27a41a87c45b5c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-01-05T15:01:40+01:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/10c0c1889be5b1aed27a41a87c45b5c… Patch: https://github.com/kamailio/kamailio/commit/10c0c1889be5b1aed27a41a87c45b5c… --- diff --git a/src/modules/permissions/README b/src/modules/permissions/README index 86823d3ce1..41da6798a2 100644 --- a/src/modules/permissions/README +++ b/src/modules/permissions/README @@ -1069,6 +1069,10 @@ if (allow_trusted("$si", "any", "$ai")) { Parameters: none + This RPC command is exported with "RPC_EXEC_DELTA" flag, therefore its + execution rate can be restricted to specific time intervals by setting + the "rpc_exec_delta" core parameter. + 5.2. permissions.addressDump Causes the permissions module to dump the contents of cache memory @@ -1113,6 +1117,10 @@ if (allow_trusted("$si", "any", "$ai")) { Parameters: none + This RPC command is exported with "RPC_EXEC_DELTA" flag, therefore its + execution rate can be restricted to specific time intervals by setting + the "rpc_exec_delta" core parameter. + 5.8. permissions.trustedDump Causes the permissions module to dump contents of the trusted database diff --git a/src/modules/tls/README b/src/modules/tls/README index 006ec9f3cc..3fb1520c10 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -1643,6 +1643,10 @@ verify_client = optional_no_ca are not terminated and they continue to use the old certificates. The new configuration will be used for new connections. + This RPC command is exported with "RPC_EXEC_DELTA" flag, therefore its + execution rate can be restricted to specific time intervals by setting + the "rpc_exec_delta" core parameter. + Parameters: * None.

1 0

git:master:09bbe96a: permissions: docs - note that rpc reload commands are exported with RPC_EXEC_DELTA flag
by Daniel-Constantin Mierla 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: 09bbe96a32f70ff7328eac431ea2efb48a3a8175 URL: https://github.com/kamailio/kamailio/commit/09bbe96a32f70ff7328eac431ea2efb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-05T15:00:17+01:00 permissions: docs - note that rpc reload commands are exported with RPC_EXEC_DELTA flag --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/09bbe96a32f70ff7328eac431ea2efb… Patch: https://github.com/kamailio/kamailio/commit/09bbe96a32f70ff7328eac431ea2efb… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index 9336112cec..745a1de115 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -1330,6 +1330,11 @@ if (allow_trusted("$si", "any", "$ai")) { paramenter. By default is allowed maximum one reload in five seconds. </para> <para>Parameters: <emphasis>none</emphasis></para> + <para> + This RPC command is exported with "RPC_EXEC_DELTA" flag, therefore its + execution rate can be restricted to specific time intervals by setting + the "rpc_exec_delta" core parameter. + </para> </section> <section id ="permissions.r.addressDump"> @@ -1413,6 +1418,11 @@ if (allow_trusted("$si", "any", "$ai")) { paramenter. By default is allowed maximum one reload in five seconds. </para> <para>Parameters: <emphasis>none</emphasis></para> + <para> + This RPC command is exported with "RPC_EXEC_DELTA" flag, therefore its + execution rate can be restricted to specific time intervals by setting + the "rpc_exec_delta" core parameter. + </para> </section> <section id ="permissions.r.trustedDump"> <title>

1 0

git:master:5d9ed676: tls: docs - note that rpc reload command is exported with RPC_EXEC_DELTA flag
by Daniel-Constantin Mierla 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: 5d9ed676dad76729253ee734d20a805e2a0dcc5c URL: https://github.com/kamailio/kamailio/commit/5d9ed676dad76729253ee734d20a805… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-05T14:59:37+01:00 tls: docs - note that rpc reload command is exported with RPC_EXEC_DELTA flag --- Modified: src/modules/tls/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/5d9ed676dad76729253ee734d20a805… Patch: https://github.com/kamailio/kamailio/commit/5d9ed676dad76729253ee734d20a805… --- diff --git a/src/modules/tls/doc/rpc.xml b/src/modules/tls/doc/rpc.xml index 8f3070648b..30c67d5c8f 100644 --- a/src/modules/tls/doc/rpc.xml +++ b/src/modules/tls/doc/rpc.xml @@ -58,6 +58,11 @@ terminated and they continue to use the old certificates. The new configuration will be used for new connections. </para> + <para> + This RPC command is exported with "RPC_EXEC_DELTA" flag, therefore its + execution rate can be restricted to specific time intervals by setting + the "rpc_exec_delta" core parameter. + </para> <para>Parameters: </para> <itemizedlist> <listitem><para>

1 0

git:master:a71a6ed6: core: rpc - support for executing commands with a delta interval limit
by Daniel-Constantin Mierla 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: a71a6ed626266db8265a7a88375be5ef3b2be495 URL: https://github.com/kamailio/kamailio/commit/a71a6ed626266db8265a7a88375be5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:18:51+01:00 core: rpc - support for executing commands with a delta interval limit - RPC_EXEC_DELTA flag has to be set on RPC command export --- Modified: src/core/rpc.h Modified: src/core/rpc_lookup.c Modified: src/core/rpc_lookup.h --- Diff: https://github.com/kamailio/kamailio/commit/a71a6ed626266db8265a7a88375be5e… Patch: https://github.com/kamailio/kamailio/commit/a71a6ed626266db8265a7a88375be5e…

2 1

[kamailio/kamailio] Topos: Added support for Call-ID mask (PR #3322)
by Harish S 05 Jan '23

05 Jan '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3322 -- Commit Summary -- * Add receive-from option * Update rtpengine.c * Update rtpengine.c * Update rtpengine.c * Update rtpengine.c * Update received-from=IP * Update received-from * Merge branch 'kamailio:master' into master * topos:Addde support for Call-ID mask -- File Changes -- M src/modules/topos/doc/topos_admin.xml (54) M src/modules/topos/topos_mod.c (7) A src/modules/topos/tps_mask.c (189) A src/modules/topos/tps_mask.h (36) M src/modules/topos/tps_msg.c (174) M src/modules/topos/tps_msg.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3322.patch https://github.com/kamailio/kamailio/pull/3322.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3322 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3322(a)github.com>

2 6

git:master:d0b1d6cc: permissions: set the RPC_EXEC_DELTA flag for RPC reload commands
by Daniel-Constantin Mierla 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: d0b1d6cc15b1c4e98ac65e4d90c6f53f2da63218 URL: https://github.com/kamailio/kamailio/commit/d0b1d6cc15b1c4e98ac65e4d90c6f53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-05T13:16:27+01:00 permissions: set the RPC_EXEC_DELTA flag for RPC reload commands --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/d0b1d6cc15b1c4e98ac65e4d90c6f53… Patch: https://github.com/kamailio/kamailio/commit/d0b1d6cc15b1c4e98ac65e4d90c6f53… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 6f1b36cf23..cffa419d4e 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -1031,8 +1031,8 @@ static const char* rpc_test_uri_doc[2] = { }; rpc_export_t permissions_rpc[] = { - {"permissions.trustedReload", rpc_trusted_reload, rpc_trusted_reload_doc, 0}, - {"permissions.addressReload", rpc_address_reload, rpc_address_reload_doc, 0}, + {"permissions.trustedReload", rpc_trusted_reload, rpc_trusted_reload_doc, RPC_EXEC_DELTA}, + {"permissions.addressReload", rpc_address_reload, rpc_address_reload_doc, RPC_EXEC_DELTA}, {"permissions.trustedDump", rpc_trusted_dump, rpc_trusted_dump_doc, 0}, {"permissions.addressDump", rpc_address_dump, rpc_address_dump_doc, RET_ARRAY}, {"permissions.subnetDump", rpc_subnet_dump, rpc_subnet_dump_doc, RET_ARRAY},

1 0

git:master:bb0c0867: core: replaced RET_ARRAY flag with RPC_RET_ARRAY
by Daniel-Constantin Mierla 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: bb0c08676ccf33fabd7a0de27129c2ad98ac2208 URL: https://github.com/kamailio/kamailio/commit/bb0c08676ccf33fabd7a0de27129c2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-05T12:22:31+01:00 core: replaced RET_ARRAY flag with RPC_RET_ARRAY --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/bb0c08676ccf33fabd7a0de27129c2a… Patch: https://github.com/kamailio/kamailio/commit/bb0c08676ccf33fabd7a0de27129c2a…

1 0

git:master:a49dcf0c: tls: set RPC_EXEC_DELTA flag for tls.reload rpc command
by Daniel-Constantin Mierla 05 Jan '23

05 Jan '23

Module: kamailio Branch: master Commit: a49dcf0cee005585222dacaa25d5d97e4934245e URL: https://github.com/kamailio/kamailio/commit/a49dcf0cee005585222dacaa25d5d97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-05T11:15:07+01:00 tls: set RPC_EXEC_DELTA flag for tls.reload rpc command - related to GH #3319 --- Modified: src/modules/tls/tls_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/a49dcf0cee005585222dacaa25d5d97… Patch: https://github.com/kamailio/kamailio/commit/a49dcf0cee005585222dacaa25d5d97… --- diff --git a/src/modules/tls/tls_rpc.c b/src/modules/tls/tls_rpc.c index b0e590dede..566191a876 100644 --- a/src/modules/tls/tls_rpc.c +++ b/src/modules/tls/tls_rpc.c @@ -279,7 +279,7 @@ static void tls_options(rpc_t* rpc, void* c) rpc_export_t tls_rpc[] = { - {"tls.reload", tls_reload, tls_reload_doc, 0}, + {"tls.reload", tls_reload, tls_reload_doc, RPC_EXEC_DELTA}, {"tls.list", tls_list, tls_list_doc, RET_ARRAY}, {"tls.info", tls_info, tls_info_doc, 0}, {"tls.options",tls_options, tls_options_doc, 0},

1 0

git:master:6c3cff35: jsonrpcs: check if rpc command has execution limit with delta interval
by Daniel-Constantin Mierla 04 Jan '23

04 Jan '23

Module: kamailio Branch: master Commit: 6c3cff35a2ae2c29a93f0c2bd8507ccbed00464c URL: https://github.com/kamailio/kamailio/commit/6c3cff35a2ae2c29a93f0c2bd8507cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:26:22+01:00 jsonrpcs: check if rpc command has execution limit with delta interval --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6c3cff35a2ae2c29a93f0c2bd8507cc… Patch: https://github.com/kamailio/kamailio/commit/6c3cff35a2ae2c29a93f0c2bd8507cc… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index a966f6438ee..801eae441f1 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -1271,11 +1271,12 @@ static void mod_destroy(void) */ static int ki_jsonrpcs_dispatch(sip_msg_t* msg) { - rpc_export_t* rpce; + rpc_exportx_t* rpce; jsonrpc_ctx_t* ctx; int ret = 0; srjson_t *nj = NULL; str val; + unsigned int rdata; if(!IS_HTTP(msg)) { LM_DBG("Got non HTTP msg\n"); @@ -1332,20 +1333,26 @@ static int ki_jsonrpcs_dispatch(sip_msg_t* msg) val.s = nj->valuestring; val.len = strlen(val.s); ctx->method = val.s; - rpce = find_rpc_export(ctx->method, 0); - if (!rpce || !rpce->function) { + rpce = rpc_lookupx(val.s, val.len, &rdata); + if (!rpce || !rpce->r.function) { LM_ERR("method callback not found [%.*s]\n", val.len, val.s); jsonrpc_fault(ctx, 500, "Method Not Found"); goto send_reply; } - ctx->flags = rpce->flags; + if (rdata & RPC_EXEC_DELTA) { + LM_ERR("execution of command [%.*s] is limited by delta [%d]\n", + val.len, val.s, ksr_rpc_exec_delta); + jsonrpc_fault(ctx, 500, "Command Executed Too Fast"); + goto send_reply; + } + ctx->flags = rpce->r.flags; nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "params"); if(nj!=NULL && nj->type!=srjson_Array && nj->type!=srjson_Object) { LM_ERR("params field is not an array or object\n"); goto send_reply; } if(nj!=NULL) ctx->req_node = nj->child; - rpce->function(&func_param, ctx); + rpce->r.function(&func_param, ctx); send_reply: if (!ctx->reply_sent && !(ctx->flags&JSONRPC_DELAYED_REPLY_F)) { @@ -1367,12 +1374,13 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) int jsonrpc_exec_ex(str *cmd, str *rpath) { - rpc_export_t* rpce; + rpc_exportx_t* rpce; jsonrpc_ctx_t* ctx; int ret; srjson_t *nj = NULL; str val; str scmd; + unsigned int rdata = 0; scmd = *cmd; @@ -1441,20 +1449,26 @@ int jsonrpc_exec_ex(str *cmd, str *rpath) val.s = nj->valuestring; val.len = strlen(val.s); ctx->method = val.s; - rpce = find_rpc_export(ctx->method, 0); - if (!rpce || !rpce->function) { + rpce = rpc_lookupx(val.s, val.len, &rdata); + if (!rpce || !rpce->r.function) { LM_ERR("method callback not found [%.*s]\n", val.len, val.s); jsonrpc_fault(ctx, 500, "Method Not Found"); goto send_reply; } - ctx->flags = rpce->flags; + if (rdata & RPC_EXEC_DELTA) { + LM_ERR("execution of command [%.*s] is limited by delta [%d]\n", + val.len, val.s, ksr_rpc_exec_delta); + jsonrpc_fault(ctx, 500, "Command Executed Too Fast"); + goto send_reply; + } + ctx->flags = rpce->r.flags; nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "params"); if(nj!=NULL && nj->type!=srjson_Array && nj->type!=srjson_Object) { LM_ERR("params field is not an array or object\n"); goto send_reply; } if(nj!=NULL) ctx->req_node = nj->child; - rpce->function(&func_param, ctx); + rpce->r.function(&func_param, ctx); ret = 1; send_reply:

1 0

git:master:cc482ee9: xhttp_rpc: updates to use the new structure from rpc_sarray
by Daniel-Constantin Mierla 04 Jan '23

04 Jan '23

Module: kamailio Branch: master Commit: cc482ee970ef1abd3cabd15aa5907ad995e57cfe URL: https://github.com/kamailio/kamailio/commit/cc482ee970ef1abd3cabd15aa5907ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:25:05+01:00 xhttp_rpc: updates to use the new structure from rpc_sarray --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c Modified: src/modules/xhttp_rpc/xhttp_rpc_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/cc482ee970ef1abd3cabd15aa5907ad… Patch: https://github.com/kamailio/kamailio/commit/cc482ee970ef1abd3cabd15aa5907ad…

1 0

git:master:8b311277: core: export core rpc commands later when shm is initialized
by Daniel-Constantin Mierla 04 Jan '23

04 Jan '23

Module: kamailio Branch: master Commit: 8b3112774fe08f5b6d808ee916431c3331a2e819 URL: https://github.com/kamailio/kamailio/commit/8b3112774fe08f5b6d808ee916431c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:23:24+01:00 core: export core rpc commands later when shm is initialized --- Modified: src/core/globals.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/8b3112774fe08f5b6d808ee916431c3… Patch: https://github.com/kamailio/kamailio/commit/8b3112774fe08f5b6d808ee916431c3… --- diff --git a/src/core/globals.h b/src/core/globals.h index 8d72807aee..109e4474cf 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -233,6 +233,8 @@ extern char *ksr_stats_namesep; extern str ksr_ipv6_hex_style; extern int ksr_local_rport; +extern int ksr_rpc_exec_delta; + #ifdef USE_DNS_CACHE extern int dns_cache_init; /* if 0, the DNS cache is not initialized at startup */ extern unsigned int dns_timer_interval; /* gc timer interval in s */ diff --git a/src/main.c b/src/main.c index f2ffe02665..07b89604f8 100644 --- a/src/main.c +++ b/src/main.c @@ -2430,7 +2430,6 @@ int main(int argc, char** argv) if (pv_init_api()<0) goto error; if (pv_register_core_vars()!=0) goto error; if (init_rpcs()<0) goto error; - if (register_core_rpcs()!=0) goto error; /* Fix the value of cfg_file variable.*/ if (fix_cfg_file() < 0) goto error; @@ -2762,6 +2761,8 @@ int main(int argc, char** argv) if (pv_reinit_buffer()<0) goto error; + if (register_core_rpcs()!=0) goto error; + if (ksr_route_locks_set_init()<0) goto error;

1 0

git:master:017089c0: core: new rpc command core.echo_delta
by Daniel-Constantin Mierla 04 Jan '23

04 Jan '23

Module: kamailio Branch: master Commit: 017089c04f2d6876fcb43ea494f287e687efc5d9 URL: https://github.com/kamailio/kamailio/commit/017089c04f2d6876fcb43ea494f287e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:22:00+01:00 core: new rpc command core.echo_delta - example of rpc command exported with RPC_EXEC_DELTA flag --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/017089c04f2d6876fcb43ea494f287e… Patch: https://github.com/kamailio/kamailio/commit/017089c04f2d6876fcb43ea494f287e… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 3c9f08e332..c89111d39e 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -240,7 +240,7 @@ static void system_listMethods(rpc_t* rpc, void* c) int i; for(i=0; i<rpc_sarray_crt_size; i++){ - if (rpc->add(c, "s", rpc_sarray[i]->name) < 0) return; + if (rpc->add(c, "s", rpc_sarray[i]->r.name) < 0) return; } } @@ -326,6 +326,20 @@ static void core_echo(rpc_t* rpc, void* c) } +static const char* core_echo_delta_doc[] = { + "Returns back its parameters with execution delta limit.", /* Documentation string */ + 0 /* Method signature(s) */ +}; + + +static void core_echo_delta(rpc_t* rpc, void* c) +{ + char* string = 0; + while((rpc->scan(c, "*.s", &string)>0)) + rpc->add(c, "s", string); +} + + static const char* core_version_doc[] = { "Returns the version string of the server.", /* Documentation string */ 0 /* Method signature(s) */ @@ -1114,6 +1128,8 @@ static rpc_export_t core_rpc_methods[] = { RET_ARRAY}, {"core.echo", core_echo, core_echo_doc, RET_ARRAY}, + {"core.echo_delta", core_echo_delta, core_echo_delta_doc, + RET_ARRAY|RPC_EXEC_DELTA}, {"core.version", core_version, core_version_doc, 0 }, {"core.flags", core_flags, core_flags_doc,

1 0

git:master:e65c5784: core: new parameter rpc_exec_delta to set rpc command delta interval execution
by Daniel-Constantin Mierla 04 Jan '23

04 Jan '23

Module: kamailio Branch: master Commit: e65c5784fee4952d1260016b1f1d94177f8f405d URL: https://github.com/kamailio/kamailio/commit/e65c5784fee4952d1260016b1f1d941… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:20:35+01:00 core: new parameter rpc_exec_delta to set rpc command delta interval execution - value is seconds - default is 0 (no delta interval execution) --- Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/e65c5784fee4952d1260016b1f1d941… Patch: https://github.com/kamailio/kamailio/commit/e65c5784fee4952d1260016b1f1d941… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index d4379da3fc..e0500769bb 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -500,6 +500,8 @@ LATENCY_LIMIT_DB latency_limit_db LATENCY_LIMIT_ACTION latency_limit_action LATENCY_LIMIT_CFG latency_limit_cfg +RPC_EXEC_DELTA_CFG "rpc_exec_delta" + URI_HOST_EXTRA_CHARS "uri_host_extra_chars" HDR_NAME_EXTRA_CHARS "hdr_name_extra_chars" @@ -1041,6 +1043,7 @@ IMPORTFILE "import_file" <INITIAL>{LATENCY_LIMIT_DB} { count(); yylval.strval=yytext; return LATENCY_LIMIT_DB;} <INITIAL>{LATENCY_LIMIT_ACTION} { count(); yylval.strval=yytext; return LATENCY_LIMIT_ACTION;} <INITIAL>{LATENCY_LIMIT_CFG} { count(); yylval.strval=yytext; return LATENCY_LIMIT_CFG;} +<INITIAL>{RPC_EXEC_DELTA_CFG} { count(); yylval.strval=yytext; return RPC_EXEC_DELTA_CFG;} <INITIAL>{CFG_DESCRIPTION} { count(); yylval.strval=yytext; return CFG_DESCRIPTION; } <INITIAL>{LOADMODULE} { count(); yylval.strval=yytext; return LOADMODULE; } <INITIAL>{LOADMODULEX} { count(); yylval.strval=yytext; return LOADMODULEX; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 230be193dd..43804b0706 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -529,6 +529,7 @@ extern char *default_routename; %token LATENCY_LIMIT_DB %token LATENCY_LIMIT_ACTION %token LATENCY_LIMIT_CFG +%token RPC_EXEC_DELTA_CFG %token MSG_TIME %token ONSEND_RT_REPLY %token URI_HOST_EXTRA_CHARS @@ -1967,6 +1968,8 @@ assign_stm: | LATENCY_LIMIT_ACTION EQUAL error { yyerror("number expected"); } | LATENCY_LIMIT_CFG EQUAL NUMBER { default_core_cfg.latency_limit_cfg=$3; } | LATENCY_LIMIT_CFG EQUAL error { yyerror("number expected"); } + | RPC_EXEC_DELTA_CFG EQUAL NUMBER { ksr_rpc_exec_delta=$3; } + | RPC_EXEC_DELTA_CFG EQUAL error { yyerror("number expected"); } | MSG_TIME EQUAL NUMBER { sr_msg_time=$3; } | MSG_TIME EQUAL error { yyerror("number expected"); } | ONSEND_RT_REPLY EQUAL NUMBER { onsend_route_reply=$3; }

1 0

Job offer Kamailio/VoIP developer
by Henning Westerholt 03 Jan '23

03 Jan '23

Hello and Happy New Year, we are looking for a new Kamailio & VoIP developer colleague to join and grow our international team. More detail about the position can be found at: https://gilawa.com/en/about/careers If you are interested, please send me a (direct) email. Please include the information described in the linked job description. Best regards, Henning Westerholt -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

git:master:6a5483a1: core: rpc - removed define switch for copying rpc export
by Daniel-Constantin Mierla 03 Jan '23

03 Jan '23

Module: kamailio Branch: master Commit: 6a5483a1767f689bc5ad261e2ead86da33c0dc73 URL: https://github.com/kamailio/kamailio/commit/6a5483a1767f689bc5ad261e2ead86d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-03T11:17:28+01:00 core: rpc - removed define switch for copying rpc export - set for many years without change --- Modified: src/core/rpc_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/6a5483a1767f689bc5ad261e2ead86d… Patch: https://github.com/kamailio/kamailio/commit/6a5483a1767f689bc5ad261e2ead86d… --- diff --git a/src/core/rpc_lookup.c b/src/core/rpc_lookup.c index 5203609db3..f1e6e06617 100644 --- a/src/core/rpc_lookup.c +++ b/src/core/rpc_lookup.c @@ -29,8 +29,6 @@ #define RPC_HASH_SIZE 32 #define RPC_SARRAY_SIZE 32 /* initial size */ -#define RPC_COPY_EXPORT - static struct str_hash_table rpc_hash_table; /* array of pointer to rpc exports, sorted after their name @@ -97,21 +95,15 @@ static int rpc_hash_add(struct rpc_export* rpc) doc1_len=rpc->doc_str[1]?strlen(rpc->doc_str[1]):0; /* alloc everything into one block */ -#ifdef RPC_COPY_EXPORT e=pkg_malloc(ROUND_POINTER(sizeof(struct str_hash_entry)) +ROUND_POINTER(sizeof(*rpc))+2*sizeof(char*)+ +name_len+1+doc0_len+(rpc->doc_str[0]!=0) +doc1_len+(rpc->doc_str[1]!=0) ); -#else /* RPC_COPY_EXPORT */ - e=pkg_malloc(ROUND_POINTER(sizeof(struct str_hash_entry))); -#endif /* RPC_COPY_EXPORT */ - if (e==0){ PKG_MEM_ERROR; goto error; } -#ifdef RPC_COPY_EXPORT n_rpc=(rpc_export_t*)((char*)e+ ROUND_POINTER(sizeof(struct str_hash_entry))); /* copy rpc into n_rpc */ @@ -135,9 +127,6 @@ static int rpc_hash_add(struct rpc_export* rpc) }else{ n_rpc->doc_str[1]=0; } -#else /* RPC_COPY_EXPORT */ - n_rpc=rpc; -#endif /* RPC_COPY_EXPORT */ e->key.s=(char*)n_rpc->name; e->key.len=name_len;

1 0

git:master:7a357300: core: rpc - removed old todo, whitespacing and define guards coherence
by Daniel-Constantin Mierla 03 Jan '23

03 Jan '23

Module: kamailio Branch: master Commit: 7a3573002fddffd74999c4cd5a859a4019d0227a URL: https://github.com/kamailio/kamailio/commit/7a3573002fddffd74999c4cd5a859a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-03T11:06:00+01:00 core: rpc - removed old todo, whitespacing and define guards coherence --- Modified: src/core/rpc.h Modified: src/core/rpc_lookup.c Modified: src/core/rpc_lookup.h --- Diff: https://github.com/kamailio/kamailio/commit/7a3573002fddffd74999c4cd5a859a4… Patch: https://github.com/kamailio/kamailio/commit/7a3573002fddffd74999c4cd5a859a4…

1 0

Happy New Year 2023!
by Daniel-Constantin Mierla 01 Jan '23

01 Jan '23

A Happy, Peaceful And Prosperous Year 2023 to everyone using Kamailio and helping to improve the project! Looking forward to meeting many of you around this world during 2023 and collaborating in a friendly environment! Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2023