sr-dev August 2024

sr-dev@lists.kamailio.org

10 participants
162 discussions

git:master:ab59aace: textops: docs for subst_v(...) function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ab59aace74cca90be6d341a3f96e72693e939992 URL: https://github.com/kamailio/kamailio/commit/ab59aace74cca90be6d341a3f96e726… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-02T11:42:07+02:00 textops: docs for subst_v(...) function --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ab59aace74cca90be6d341a3f96e726… Patch: https://github.com/kamailio/kamailio/commit/ab59aace74cca90be6d341a3f96e726… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 9c121e51c70..57414c05e81 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -809,6 +809,44 @@ if ( subst_hf("From", "/:test@/:best@/", "a") ) { /*....*/ }; </example> </section> + <section id="textops.f.subst_v"> + <title> + <function moreinfo="none">subst_hf(itext, subexp, ovp)</function> + </title> + <para> + Sed-like substitution subexp applied to itext, with result stored in opv. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>itext</emphasis> - input text, it can contain variables. + </para> + </listitem> + <listitem> + <para><emphasis>subexp</emphasis> - substitution expression + in the same format as of the 'subst' function parameter, it can + contain variables. + </para> + </listitem> + <listitem> + <para><emphasis>opv</emphasis> - variable name where to store the + result. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>subst_v</function> usage</title> + <programlisting format="linespecific"> +... +subst_v("$var(x)", "/:test@/:best@/", "$var(r)"); +... +</programlisting> + </example> + </section> + <section id="textops.f.set_body"> <title> <function moreinfo="none">set_body(txt, content_type)</function>

5 months, 1 week

git:master:e1954d76: textops: new function subst_v(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e1954d7624eecdc33137d224c248240e2df90703 URL: https://github.com/kamailio/kamailio/commit/e1954d7624eecdc33137d224c248240… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-02T11:36:25+02:00 textops: new function subst_v(...) - perform sed-like substituion over input text and store in a variable --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/e1954d7624eecdc33137d224c248240… Patch: https://github.com/kamailio/kamailio/commit/e1954d7624eecdc33137d224c248240… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 6baf40de6ad..d28d7f508cf 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -100,6 +100,7 @@ static int subst_uri_f(struct sip_msg *, char *, char *); static int subst_user_f(struct sip_msg *, char *, char *); static int subst_body_f(struct sip_msg *, char *, char *); static int subst_hf_f(struct sip_msg *, char *, char *, char *); +static int subst_v_f(struct sip_msg *, char *, char *, char *); static int filter_body_f(struct sip_msg *, char *, char *); static int is_present_hf_f(struct sip_msg *msg, char *str_hf, char *foo); static int search_append_body_f(struct sip_msg *, char *, char *); @@ -252,6 +253,8 @@ static cmd_export_t cmds[] = { {"subst_body", (cmd_function)subst_body_f, 1, fixup_substre, 0, ANY_ROUTE}, {"subst_hf", (cmd_function)subst_hf_f, 3, fixup_subst_hf, 0, ANY_ROUTE}, + {"subst_v", (cmd_function)subst_v_f, 3, fixup_spve2_pvar, + fixup_free_spve2_pvar, ANY_ROUTE}, {"filter_body", (cmd_function)filter_body_f, 1, fixup_str_null, 0, ANY_ROUTE}, {"append_time", (cmd_function)append_time_f, 0, 0, 0, @@ -1527,6 +1530,76 @@ static int subst_body_f(struct sip_msg *msg, char *subst, char *ignored) return subst_body_helper_f(msg, (struct subst_expr *)subst); } +/* sed-perl style re: s/regular expression/replacement/flags, like + * subst but with variables */ +static int subst_v_helper_f( + sip_msg_t *msg, str *itext, str *subex, pv_spec_t *pvd) +{ + str *result; + int nmatches; + struct subst_expr *se; + pv_value_t val; + + if(pvd->setf == NULL) { + LM_ERR("the variable is read only\n"); + return -1; + } + se = subst_parser(subex); + if(se == 0) { + LM_ERR("bad subst re: %.*s\n", subex->len, subex->s); + return -1; + } + /* pkg malloc'ed result */ + result = subst_str(itext->s, msg, se, &nmatches); + if(result == NULL) { + if(nmatches < 0) { + LM_ERR("substitution failed\n"); + } + return -1; + } + memset(&val, 0, sizeof(pv_value_t)); + val.rs.s = result->s; + val.rs.len = result->len; + val.flags = PV_VAL_STR; + pvd->setf(msg, &pvd->pvp, (int)EQ_T, &val); + + pkg_free(result->s); + pkg_free(result); + return 1; +} + +/* sed-perl style re: s/regular expression/replacement/flags, like + * subst but with variables */ +static int ki_subst_v(sip_msg_t *msg, str *itext, str *subex, str *opv) +{ + pv_spec_t *pvd = NULL; + + pvd = pv_cache_get(opv); + if(pvd == NULL) { + LM_ERR("failed to get pv spec\n"); + return -1; + } + return subst_v_helper_f(msg, itext, subex, pvd); +} + +static int subst_v_f(sip_msg_t *msg, char *pitext, char *psubex, char *popv) +{ + str itext = STR_NULL; + str subex = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t *)pitext, &itext) < 0) { + LM_ERR("failed to get header name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t *)psubex, &subex) < 0) { + LM_ERR("failed to get header name\n"); + return -1; + } + + return subst_v_helper_f(msg, &itext, &subex, (pv_spec_t *)popv); +} + + static inline int find_line_start( char *text, unsigned int text_len, char **buf, unsigned int *buf_len) { @@ -5282,6 +5355,11 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("subst_v"), + SR_KEMIP_INT, ki_subst_v, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("remove_hf"), SR_KEMIP_INT, ki_remove_hf, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

5 months, 1 week

[kamailio/kamailio] Mem leak in smsops which leads to the udp receiver process leak memory continuously (Issue #3833)

by paresh-panda

Hi, I am using Kamailio 5.8.1 ( ubuntu 22.04 Jammy 64 Bit),. Below are the observations. I am running a load of 500 3GPP IMS SMS which kamailio decodes and sends to another application over Rabbit MQ (Kazoo Module). **-m 512 -M 256** , using 512 MB Shared memory and 256MB Package Memory. When the load for 20 mins the available Memory drops from **80% to 25%** And I see below error logs > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mem/q_malloc.c:324]: qm_find_free(): qm_find_free(0x7ff912e21010, 192); Free fragment not found! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mem/q_malloc.c:463]: qm_malloc(): qm_malloc(0x7ff912e21010, 192) called from smsops: smsops_impl.c: decode_3gpp_sms(813), module: smsops; Free fragment not found! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mem/q_malloc.c:324]: qm_find_free(): qm_find_free(0x7ff912e21010, 192); Free fragment not found! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mem/q_malloc.c:463]: qm_malloc(): qm_malloc(0x7ff912e21010, 192) called from smsops: smsops_impl.c: decode_3gpp_sms(813), module: smsops; Free fragment not found! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/pvapi.c:1136]: pv_parse_format(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/sr_module.c:1318]: fix_param(): bad PVE format: "PRD-IR92/11 term-Motorola/XT2205-1-T2STS33.105-51-11-1-2-2 device-type/smart-phone" > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mod_fix.c:601]: fixup_spve_null(): Cannot convert function parameter 1 to spve > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): runtime fixup failed for jansson_set param 3 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:539 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/sr_module.c:1208]: fix_param(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mod_fix.c:601]: fixup_spve_null(): Cannot convert function parameter 1 to spve > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): runtime fixup failed for jansson_set param 3 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:540 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/sr_module.c:1208]: fix_param(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/mod_fix.c:601]: fixup_spve_null(): Cannot convert function parameter 1 to spve > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): runtime fixup failed for jansson_set param 3 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:541 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:542 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:543 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:815]: decode_3gpp_sms(): Error allocating 192 bytes! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} smsops [smsops_impl.c:1320]: pv_get_sms(): Error getting/decoding RP-Data from request! > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:555 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1178]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:556 > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/rvalue.c:1321]: rval_get_str(): could not allocate private memory from pkg pool > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1171]: do_action(): failed to convert RVE to string > Apr 29 13:28:53 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[5520]: ERROR: {1 1 MESSAGE 739708-3401(a)192.168.136.152} <core> [core/action.c:1566]: do_action(): run action error at: /etc/kamailio/kamailio.cfg:559 > I am attaching the configuration for reference. Help on this is much appreciated [configfiles.tar.gz](https://github.com/kamailio/kamailio/files/15148792/con… , I am looking into this issue for quite a long time. Thank you! Regards Paresh -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3833 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3833(a)github.com>

5 months, 1 week

git:master:5b2e4d38: Makefile.defs: set -pthread flag always

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5b2e4d38ac3da8693044aa64c1d4e73595d061cf URL: https://github.com/kamailio/kamailio/commit/5b2e4d38ac3da8693044aa64c1d4e73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T12:28:01+02:00 Makefile.defs: set -pthread flag always - needed by the multi-thread udp receiving mode - it was almost always set for libssl tls multi-process mutexes --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/5b2e4d38ac3da8693044aa64c1d4e73… Patch: https://github.com/kamailio/kamailio/commit/5b2e4d38ac3da8693044aa64c1d4e73… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 99157d2c017..1f3e0e81606 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -220,8 +220,8 @@ LIBDL="-ldl" endif ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1) -CC_PMUTEX_OPTS = -pthread -DKSR_PTHREAD_MUTEX_SHARED -LD_PMUTEX_OPTS = -pthread -rdynamic $(LIBDL) -Wl,-Bsymbolic-functions +CC_PMUTEX_OPTS = -DKSR_PTHREAD_MUTEX_SHARED +LD_PMUTEX_OPTS = -rdynamic $(LIBDL) -Wl,-Bsymbolic-functions else CC_PMUTEX_OPTS = LD_PMUTEX_OPTS = @@ -922,8 +922,8 @@ ifeq ($(use_fast_lock), yes) found_lock_method=yes endif -CFLAGS=-g -LDFLAGS=-g +CFLAGS=-g -pthread +LDFLAGS=-g -pthread C_INCLUDES= # setting CFLAGS ifeq ($(mode), release) @@ -1995,7 +1995,6 @@ ifeq ($(OS), freebsd) ifneq ($(found_lock_method), yes) C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems found_lock_method=yes - LIBS+= -pthread endif # check for ver >= 4.1 ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue) @@ -2017,7 +2016,6 @@ ifeq ($(OS), dragonfly) ifneq ($(found_lock_method), yes) C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems found_lock_method=yes - LIBS+= -pthread #dlopen is in libc else LIBS= #dlopen is in libc endif

5 months, 1 week

git:master:6b413cc8: permissions: reworked condition checking group id on db load

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6b413cc8c7f9c6db019c98a28ab07cf902ef505e URL: https://github.com/kamailio/kamailio/commit/6b413cc8c7f9c6db019c98a28ab07cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T08:09:34+02:00 permissions: reworked condition checking group id on db load - ensure it is not null and greater than 0 for both types - update of 6afab49 --- Modified: src/modules/permissions/address.c --- Diff: https://github.com/kamailio/kamailio/commit/6b413cc8c7f9c6db019c98a28ab07cf… Patch: https://github.com/kamailio/kamailio/commit/6b413cc8c7f9c6db019c98a28ab07cf… --- diff --git a/src/modules/permissions/address.c b/src/modules/permissions/address.c index 3f825fba010..05f56d3dc68 100644 --- a/src/modules/permissions/address.c +++ b/src/modules/permissions/address.c @@ -192,8 +192,13 @@ int reload_address_db_table(address_tables_group_t *atg) ROW_N(row + i)); goto dberror; } - if((VAL_TYPE(val) != DB1_INT && VAL_TYPE(val) != DB1_UINT) - || VAL_NULL(val) || (VAL_INT(val) <= 0)) { + if(VAL_NULL(val)) { + LM_DBG("failure during checks of database value 1 (group) in " + "address table\n"); + goto dberror; + } + if(!((VAL_TYPE(val) == DB1_INT && VAL_INT(val) > 0) + || (VAL_TYPE(val) == DB1_UINT && VAL_UINT(val) > 0))) { LM_DBG("failure during checks of database value 1 (group) in " "address table\n"); goto dberror;

5 months, 1 week

[kamailio/kamailio] Uint fixes (PR #3828)

by Tyler Moore

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] 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 Adding support for converting unsigned integers from database tables into kamailio pseudo variables usable in the routing config. This is quite useful when pulling `int unsigned` fields from a database, in modules that support "extra fields" in their module parameters. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3828 -- Commit Summary -- * permissions: fixup uint support in address table reload * htable: add uint support when packing an htable * lib/srdb1: add uint support for db->pv conversions -- File Changes -- M src/lib/srdb1/db_ut.c (4) M src/modules/htable/ht_db.c (6) M src/modules/permissions/address.c (35) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3828.patch https://github.com/kamailio/kamailio/pull/3828.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3828 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3828(a)github.com>

5 months, 1 week

git:master:d90101e1: lib/srdb1: add uint support for db->pv conversions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d90101e1a50ef0c958e8e8a2f361198a28ea336a URL: https://github.com/kamailio/kamailio/commit/d90101e1a50ef0c958e8e8a2f361198… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T08:02:09+02:00 lib/srdb1: add uint support for db->pv conversions - add support for converting unsigned integers into PVs. --- Modified: src/lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/d90101e1a50ef0c958e8e8a2f361198… Patch: https://github.com/kamailio/kamailio/commit/d90101e1a50ef0c958e8e8a2f361198… --- diff --git a/src/lib/srdb1/db_ut.c b/src/lib/srdb1/db_ut.c index 9975672aeea..76210d5691e 100644 --- a/src/lib/srdb1/db_ut.c +++ b/src/lib/srdb1/db_ut.c @@ -596,6 +596,10 @@ int db_val2pv_spec(struct sip_msg *msg, db_val_t *dbval, pv_spec_t *pvs) pv.flags = PV_VAL_INT | PV_TYPE_INT; pv.ri = (long)dbval->val.int_val; break; + case DB1_UINT: + pv.flags = PV_VAL_INT | PV_TYPE_INT; + pv.ri = (long)dbval->val.uint_val; + break; case DB1_DATETIME: pv.flags = PV_VAL_INT | PV_TYPE_INT; pv.ri = (long)dbval->val.time_val;

5 months, 1 week

git:master:772f261f: htable: add uint support when packing an htable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 772f261f91685583af3db7cee2c227336eef7c42 URL: https://github.com/kamailio/kamailio/commit/772f261f91685583af3db7cee2c2273… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T08:02:09+02:00 htable: add uint support when packing an htable - add support for packing unsigned integer values from DB, into hash tables. --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/772f261f91685583af3db7cee2c2273… Patch: https://github.com/kamailio/kamailio/commit/772f261f91685583af3db7cee2c2273… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 7a22ff6c484..8b0c667411d 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -132,6 +132,8 @@ static int ht_pack_values( len += RES_ROWS(db_res)[row].values[c].val.blob_val.len; } else if(RES_ROWS(db_res)[row].values[c].type == DB1_INT) { len += 12; + } else if(RES_ROWS(db_res)[row].values[c].type == DB1_UINT) { + len += 12; } else { LM_ERR("unsupported data type for column %d\n", c); return -1; @@ -165,6 +167,11 @@ static int ht_pack_values( RES_ROWS(db_res)[row].values[c].val.int_val, &iv.len); strncpy(p, iv.s, iv.len); p += iv.len; + } else if(RES_ROWS(db_res)[row].values[c].type == DB1_UINT) { + iv.s = int2str( + RES_ROWS(db_res)[row].values[c].val.uint_val, &iv.len); + strncpy(p, iv.s, iv.len); + p += iv.len; } if(c + 1 < cols) { *p = ht->pack[1];

5 months, 1 week

git:master:5f4f1f02: permissions: fixup uint support in address table reload

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5f4f1f027132a1e4cdc2528a0d65e777a0a01da7 URL: https://github.com/kamailio/kamailio/commit/5f4f1f027132a1e4cdc2528a0d65e77… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T08:02:09+02:00 permissions: fixup uint support in address table reload - add support for converting unsigned integer values directly, in address table rpc reload. --- Modified: src/modules/permissions/address.c --- Diff: https://github.com/kamailio/kamailio/commit/5f4f1f027132a1e4cdc2528a0d65e77… Patch: https://github.com/kamailio/kamailio/commit/5f4f1f027132a1e4cdc2528a0d65e77… --- diff --git a/src/modules/permissions/address.c b/src/modules/permissions/address.c index c05811f73f9..3f825fba010 100644 --- a/src/modules/permissions/address.c +++ b/src/modules/permissions/address.c @@ -192,41 +192,49 @@ int reload_address_db_table(address_tables_group_t *atg) ROW_N(row + i)); goto dberror; } - if((VAL_TYPE(val) != DB1_INT) || VAL_NULL(val) || (VAL_INT(val) <= 0)) { + if((VAL_TYPE(val) != DB1_INT && VAL_TYPE(val) != DB1_UINT) + || VAL_NULL(val) || (VAL_INT(val) <= 0)) { LM_DBG("failure during checks of database value 1 (group) in " "address table\n"); goto dberror; } - if((VAL_TYPE(val + 1) != DB1_STRING) - && (VAL_TYPE(val + 1) != DB1_STR)) { + if((VAL_TYPE(val + 1) != DB1_STRING && VAL_TYPE(val + 1) != DB1_STR) + || VAL_NULL(val + 1)) { LM_DBG("failure during checks of database value 2 (IP address) in " - "address table - not a string value\n"); - goto dberror; - } - if(VAL_NULL(val + 1)) { - LM_DBG("failure during checks of database value 2 (IP address) in " - "address table - NULL value not permitted\n"); + "address table\n"); goto dberror; } - if((VAL_TYPE(val + 2) != DB1_INT) || VAL_NULL(val + 2)) { + if((VAL_TYPE(val + 2) != DB1_INT && VAL_TYPE(val + 2) != DB1_UINT) + || VAL_NULL(val + 2)) { LM_DBG("failure during checks of database value 3 (subnet " "size/CIDR) in address table\n"); goto dberror; } - if((VAL_TYPE(val + 3) != DB1_INT) || VAL_NULL(val + 3)) { + if((VAL_TYPE(val + 3) != DB1_INT && VAL_TYPE(val + 3) != DB1_UINT) + || VAL_NULL(val + 3)) { LM_DBG("failure during checks of database value 4 (port) in " "address table\n"); goto dberror; } + if(VAL_TYPE(val + 4) != DB1_STRING && VAL_TYPE(val + 4) != DB1_STR) { + LM_DBG("failure during checks of database value 5 (tag) in address " + "table\n"); + goto dberror; + } + gid = VAL_UINT(val); ips.s = (char *)VAL_STRING(val + 1); ips.len = strlen(ips.s); mask = VAL_UINT(val + 2); port = VAL_UINT(val + 3); - tagv.s = VAL_NULL(val + 4) ? NULL : (char *)VAL_STRING(val + 4); - if(tagv.s != NULL) { + if(VAL_NULL(val + 4)) { + tagv.s = NULL; + tagv.len = 0; + } else { + tagv.s = (char *)VAL_STRING(val + 4); tagv.len = strlen(tagv.s); } + if(reload_address_insert(atg, gid, &ips, mask, port, &tagv) < 0) { goto dberror; }

5 months, 1 week

git:master:e273fc10: modules: readme files regenerated - msrp ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e273fc10d65b41a407797fef0f9953c1615a88a2 URL: https://github.com/kamailio/kamailio/commit/e273fc10d65b41a407797fef0f9953c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-01T07:31:11+02:00 modules: readme files regenerated - msrp ... [skip ci] --- Modified: src/modules/msrp/README --- Diff: https://github.com/kamailio/kamailio/commit/e273fc10d65b41a407797fef0f9953c… Patch: https://github.com/kamailio/kamailio/commit/e273fc10d65b41a407797fef0f9953c…

5 months, 1 week

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2024