sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
489 discussions

git:master:df1f22fc: textops: docs for str_find() and str_ifind()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: df1f22fc2948071d7f77533cec337c45080d3a85 URL: https://github.com/kamailio/kamailio/commit/df1f22fc2948071d7f77533cec337c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-30T09:25:36+02:00 textops: docs for str_find() and str_ifind() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/df1f22fc2948071d7f77533cec337c4… Patch: https://github.com/kamailio/kamailio/commit/df1f22fc2948071d7f77533cec337c4… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index c41859f731..6f3ab09f9a 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1760,6 +1760,52 @@ if (ends_with("$rU", "8800")) </example> </section> + <section id="textops.f.str_find"> + <title> + <function moreinfo="none">str_find(str1, str2)</function> + </title> + <para> + The function returns <emphasis>true</emphasis> (greater than 0) if + the str2 string is found in str1, case sensitive comparison. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>str_find</function> usage</title> + <programlisting format="linespecific"> +... +if (str_find("$rU", "8800")) { + # do interesting stuff here +} +... +</programlisting> + </example> + </section> + + <section id="textops.f.str_ifind"> + <title> + <function moreinfo="none">str_ifind(str1, str2)</function> + </title> + <para> + The function returns <emphasis>true</emphasis> (greater than 0) if + the str2 string is found in str1, case insensitive comparison. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>str_ifind</function> usage</title> + <programlisting format="linespecific"> +... +if (str_ifind("$rU", "Alice")) { + # do interesting stuff here +} +... +</programlisting> + </example> + </section> + <section id="textops.f.set_body_multipart"> <title> <function moreinfo="none">set_body_multipart([txt,content_type][,boundary])</function>

3 years, 8 months

git:master:38922466: textops: added functions to find a string inside another one

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 389224660bc748b7e9f69fadcbbed0faf8a44b5a URL: https://github.com/kamailio/kamailio/commit/389224660bc748b7e9f69fadcbbed0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-30T08:50:54+02:00 textops: added functions to find a string inside another one --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/389224660bc748b7e9f69fadcbbed0f… Patch: https://github.com/kamailio/kamailio/commit/389224660bc748b7e9f69fadcbbed0f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 1b045dc89c..3d90e97a90 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -137,6 +137,8 @@ static int cmp_str_f(struct sip_msg *msg, char *str1, char *str2 ); static int cmp_istr_f(struct sip_msg *msg, char *str1, char *str2 ); static int starts_with_f(struct sip_msg *msg, char *str1, char *str2 ); static int ends_with_f(struct sip_msg *msg, char *str1, char *str2 ); +static int str_find_f(sip_msg_t *msg, char *str1, char *str2 ); +static int str_ifind_f(sip_msg_t *msg, char *str1, char *str2 ); static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo); static int remove_hf_exp_f(sip_msg_t* msg, char* ematch, char* eskip); static int is_present_hf_re_f(struct sip_msg* msg, char* key, char* foo); @@ -324,6 +326,12 @@ static cmd_export_t cmds[]={ {"ends_with", (cmd_function)ends_with_f, 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"str_find", (cmd_function)str_find_f, 2, + fixup_spve_spve, 0, + ANY_ROUTE}, + {"str_ifind", (cmd_function)str_ifind_f, 2, + fixup_spve_spve, 0, + ANY_ROUTE}, {"is_audio_on_hold", (cmd_function)is_audio_on_hold_f, 0, 0, 0, ANY_ROUTE}, @@ -4271,6 +4279,78 @@ static int ki_ends_with(sip_msg_t *msg, str *vstr, str *vsuffix ) return -2; } +static int ki_str_find(sip_msg_t *msg, str *txt, str *needle) +{ + char *p; + + if(txt==NULL || needle==NULL) { + return -1; + } + + if(needle->len > txt->len) { + return -1; + } + p = str_search(txt, needle); + if(p==NULL) { + return -1; + } + + return (int)(1 + p - txt->s); +} + +static int str_find_f(struct sip_msg *msg, char *str1, char *str2 ) +{ + str s1; + str s2; + + if(fixup_get_svalue(msg, (gparam_p)str1, &s1)!=0) { + LM_ERR("cannot get first parameter\n"); + return -8; + } + if(fixup_get_svalue(msg, (gparam_p)str2, &s2)!=0) { + LM_ERR("cannot get second parameter\n"); + return -8; + } + + return ki_str_find(msg, &s1, &s2); +} + +static int ki_str_ifind(sip_msg_t *msg, str *txt, str *needle) +{ + char *p; + + if(txt==NULL || needle==NULL) { + return -1; + } + + if(needle->len > txt->len) { + return -1; + } + p = str_casesearch(txt, needle); + if(p==NULL) { + return -1; + } + + return (int)(1 + p - txt->s); +} + +static int str_ifind_f(sip_msg_t *msg, char *str1, char *str2 ) +{ + str s1; + str s2; + + if(fixup_get_svalue(msg, (gparam_p)str1, &s1)!=0) { + LM_ERR("cannot get first parameter\n"); + return -8; + } + if(fixup_get_svalue(msg, (gparam_p)str2, &s2)!=0) { + LM_ERR("cannot get second parameter\n"); + return -8; + } + + return ki_str_ifind(msg, &s1, &s2); +} + static int ki_is_audio_on_hold(sip_msg_t *msg) { int sdp_session_num = 0, sdp_stream_num; @@ -5019,6 +5099,16 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("str_find"), + SR_KEMIP_INT, ki_str_find, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("textops"), str_init("str_ifind"), + SR_KEMIP_INT, ki_str_ifind, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("is_audio_on_hold"), SR_KEMIP_INT, ki_is_audio_on_hold, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

3 years, 8 months

[kamailio/kamailio] Kamailio 5.4.2 - CentOS 7 - qm_free(): BUG: freeing already freed pointer, called from core: core/usr_avp.c: destroy_avp_list_unsafe (#2620)

by Ryan Gehrig

Hi, Same issue with @farnk05 on https://github.com/kamailio/kamailio/issues/2224 Wanted to open a fresh issue to not reopen an old one. This is on kamailio 5.4.2, which appears to have these fixes from https://github.com/kamailio/kamailio/issues/2224#issuecomment-602730307 in them when I checked the src files. ``` $ sudo rpm -qi kamailio |grep Date Install Date: Fri 20 Nov 2020 12:03:26 AM PST Build Date : Tue 27 Oct 2020 05:37:31 AM PDT ``` ``` $ sudo rpm -qa | grep kamailio kamailio-mysql-5.4.2-0.el7.x86_64 kamailio-tls-5.4.2-0.el7.x86_64 kamailio-5.4.2-0.el7.x86_64 kamailio-websocket-5.4.2-0.el7.x86_64 kamailio-tcpops-5.4.2-0.el7.x86_64 kamailio-statsd-5.4.2-0.el7.x86_64 ``` Package Source: https://rpm.kamailio.org/centos/7/5.4/5.4.2/x86_64/ OS: RHEL 7.6.1810 Mem mgr: default/qm SHM is 4096, PKG is 1024 (system has 16gb ram, 4 core Intel Skylake CPU on a KVM. There are a few variations we see with the qm_free errors, here are the most common we see when kamailio segfaults, and we have to let systemd restart it, or Monit as we now have to have Monit check for CRITICAL messages since kamailio segfaults so often. ``` /usr/sbin/kamailio[32734]: CRITICAL: <core> [core/mem/q_malloc.c:521]: qm_free(): BUG: freeing already freed pointer (0x7f0da5012fc0), called from core: core/usr_avp.c: destroy_avp_list_unsafe(626), first free core: core/usr_avp.c: destroy_avp_list_unsafe(626) - ignoring /usr/sbin/kamailio[32734]: CRITICAL: <core> [core/mem/q_malloc.c:521]: qm_free(): BUG: freeing already freed pointer (0x7f0da5012fc0), called from core: core/usr_avp.c: destroy_avp_list_unsafe(626), first free core: core/usr_avp.c: destroy_avp_list_unsafe(626) - ignoring ... ``` ``` /usr/sbin/kamailio[32733]: CRITICAL: dialog [dlg_profile.c:574]: set_dlg_profile(): BUG - dialog not found in a non REQUEST route (1) /usr/sbin/kamailio[32733]: CRITICAL: dialog [dlg_profile.c:574]: set_dlg_profile(): BUG - dialog not found in a non REQUEST route (1) /usr/sbin/kamailio[6160]: CRITICAL: <core> [core/mem/q_malloc.c:521]: qm_free(): BUG: freeing already freed pointer (0x7ff00842e320), called from tm: h_table.c: free_cell_helper(189), first free core: core/usr_avp.c: destroy_avp_list_unsafe(626) - ignoring ``` GDB as requested in the other Issue (note gdb was run on another VM, not the main system, hopefully that is not an issue: ``` $ gdb /usr/sbin/kamailio /core-kamailio-11-995-992-11912-1612143069 GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-114.el7 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/lib/debug/usr/sbin/kamailio.debug...done. done. [New LWP 11912] warning: .dynamic section for "/lib64/libc.so.6" is not at the expected address (wrong library or version mismatch?) [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by '/usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamai'. Program terminated with signal 11, Segmentation fault. #0 0x00000000006024be in destroy_avp_list_unsafe (list=0x7fdc559d4fd8) at core/usr_avp.c:625 625 avp = avp->next; Missing separate debuginfos, use: debuginfo-install glibc-2.17-260.el7_6.6.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-37.el7_6.x86_64 libcom_err-1.42.9-13.el7.x86_64 libgcc-4.8.5-36.el7_6.2.x86_64 libmaxminddb-1.2.0-1.el7.x86_64 libselinux-2.5-14.1.el7.x86_64 libstdc++-4.8.5-36.el7_6.2.x86_64 libunistring-0.9.3-9.el7.x86_64 mariadb-libs-5.5.60-1.el7_5.x86_64 openssl-libs-1.0.2k-16.el7_6.1.x86_64 pcre-8.32-17.el7.x86_64 zlib-1.2.7-18.el7.x86_64 (gdb) frame 0 #0 0x00000000006024be in destroy_avp_list_unsafe (list=0x7fdc559d4fd8) at core/usr_avp.c:625 625 avp = avp->next; (gdb) list 620 avp_t *avp, *foo; 621 622 avp = *list; 623 while( avp ) { 624 foo = avp; 625 avp = avp->next; 626 shm_free_unsafe( foo ); 627 } 628 *list = 0; 629 } (gdb) p *p_entry No symbol "p_entry" in current context. (gdb) p *l No symbol "l" in current context. (gdb) No symbol "l" in current context. (gdb) p *lh No symbol "lh" in current context. (gdb) p *lh No symbol "lh" in current context. (gdb) frame 1 #1 0x00007fdd56fb8f92 in free_cell_helper (dead_cell=0x7fdc559d4dd8, silent=0, fname=0x7fdd570d1363 "timer.c", fline=643) at h_table.c:255 255 destroy_avp_list_unsafe(&dead_cell->uri_avps_from); (gdb) #1 0x00007fdd56fb8f92 in free_cell_helper (dead_cell=0x7fdc559d4dd8, silent=0, fname=0x7fdd570d1363 "timer.c", fline=643) at h_table.c:255 255 destroy_avp_list_unsafe(&dead_cell->uri_avps_from); (gdb) list 250 if(dead_cell->user_avps_from) 251 destroy_avp_list_unsafe(&dead_cell->user_avps_from); 252 if(dead_cell->user_avps_to) 253 destroy_avp_list_unsafe(&dead_cell->user_avps_to); 254 if(dead_cell->uri_avps_from) 255 destroy_avp_list_unsafe(&dead_cell->uri_avps_from); 256 if(dead_cell->uri_avps_to) 257 destroy_avp_list_unsafe(&dead_cell->uri_avps_to); 258 if(dead_cell->xavps_list) 259 xavp_destroy_list_unsafe(&dead_cell->xavps_list); (gdb) p *dlg No symbol "dlg" in current context. (gdb) p *msg No symbol "msg" in current context. (gdb) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2620

3 years, 8 months

git:master:686bad20: modules: readme files regenerated - dmq ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 686bad209b3f445d8ab81643bd82648a12d72f1d URL: https://github.com/kamailio/kamailio/commit/686bad209b3f445d8ab81643bd82648… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-29T16:31:11+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/686bad209b3f445d8ab81643bd82648… Patch: https://github.com/kamailio/kamailio/commit/686bad209b3f445d8ab81643bd82648… --- diff --git a/src/modules/dmq/README b/src/modules/dmq/README index 085fe3c9df..7daadc857d 100644 --- a/src/modules/dmq/README +++ b/src/modules/dmq/README @@ -222,7 +222,10 @@ modparam("dmq", "server_address", "sip:10.0.0.20:5061;transport=tls") 3.2. notification_address(str) The address of another DMQ node from which the local node should - retrieve initial information about all other nodes. + retrieve initial information about all other nodes. This parameter can + be specified multiple times in the configuration, to configure multiple + notification servers. If you configure multiple notification servers, + the multi_notify parameter needs to be disabled. Default value is “NULL”. @@ -247,7 +250,8 @@ modparam("dmq", "notification_channel", "peers") 3.4. multi_notify(int) Enables the ability to resolve multiple IPv4/IPv6 addresses for a - single notification address. + single notification address. Please note that this mode is not + supported if you specify multiple notification address parameter. A value of zero resolves to the first IP address found. A non-zero value resolves to all IP addresses associated with the host. This

3 years, 8 months

git:master:678f9c6a: dmq: add support to specify a notification address multiple times in the cfg

by Henning Westerholt

Module: kamailio Branch: master Commit: 678f9c6ad8a8118741a921fcc01f9b23b5702c6e URL: https://github.com/kamailio/kamailio/commit/678f9c6ad8a8118741a921fcc01f9b2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-03-29T14:25:18Z dmq: add support to specify a notification address multiple times in the cfg - add support to specify a notification address multiple times in the cfg, e.g.: - modparam("dmq", "notification_address", "sip:10.0.0.1:5060") - modparam("dmq", "notification_address", "sip:10.0.0.2:5060") etc.. - this can be used to easily configure multiple notification server - it is an alternative to the multi_notify mode and do not work together with it --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmq.h Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/doc/dmq_admin.xml Modified: src/modules/dmq/notification_peer.c Modified: src/modules/dmq/notification_peer.h --- Diff: https://github.com/kamailio/kamailio/commit/678f9c6ad8a8118741a921fcc01f9b2… Patch: https://github.com/kamailio/kamailio/commit/678f9c6ad8a8118741a921fcc01f9b2…

3 years, 8 months

git:master:981701d4: modules: readme files regenerated - path ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 981701d4ffa8bce2be3768f43cbde0f5344390fc URL: https://github.com/kamailio/kamailio/commit/981701d4ffa8bce2be3768f43cbde0f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-29T15:31:11+02:00 modules: readme files regenerated - path ... [skip ci] --- Modified: src/modules/path/README --- Diff: https://github.com/kamailio/kamailio/commit/981701d4ffa8bce2be3768f43cbde0f… Patch: https://github.com/kamailio/kamailio/commit/981701d4ffa8bce2be3768f43cbde0f…

3 years, 8 months

git:master:54036506: path: docs for received_name parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 54036506a005d30e0ea2685ac99d004b416bf0f3 URL: https://github.com/kamailio/kamailio/commit/54036506a005d30e0ea2685ac99d004… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-29T15:28:10+02:00 path: docs for received_name parameter --- Modified: src/modules/path/doc/path_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/54036506a005d30e0ea2685ac99d004… Patch: https://github.com/kamailio/kamailio/commit/54036506a005d30e0ea2685ac99d004… --- diff --git a/src/modules/path/doc/path_admin.xml b/src/modules/path/doc/path_admin.xml index 14c600f2a6..8c4dc8d9fd 100644 --- a/src/modules/path/doc/path_admin.xml +++ b/src/modules/path/doc/path_admin.xml @@ -168,6 +168,26 @@ modparam("path", "use_received", 1) ... modparam("path", "received_format", 1) ... +</programlisting> + </example> + </section> + <section id="path.p.received_name"> + <title><varname>received_name</varname> (str)</title> + <para> + Set the name of the header parameter to add the + <quote>received</quote> value. + </para> + <para> + <emphasis> + Default value is "received". + </emphasis> + </para> + <example> + <title>Set <varname>received_name</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("path", "received_name", "rcv") +... </programlisting> </example> </section>

3 years, 8 months

git:master:6b607182: path: option to set received param name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6b607182678a5913b1e07c0e32725cb89b399501 URL: https://github.com/kamailio/kamailio/commit/6b607182678a5913b1e07c0e32725cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-29T15:25:21+02:00 path: option to set received param name --- Modified: src/modules/path/path.c Modified: src/modules/path/path_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6b607182678a5913b1e07c0e32725cb… Patch: https://github.com/kamailio/kamailio/commit/6b607182678a5913b1e07c0e32725cb…

3 years, 8 months

git:master:0f0a56ad: path: removed svn id header

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0f0a56ad5c97a611fab64fc9b9eba304643dcec8 URL: https://github.com/kamailio/kamailio/commit/0f0a56ad5c97a611fab64fc9b9eba30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-29T15:04:38+02:00 path: removed svn id header --- Modified: src/modules/path/path_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0f0a56ad5c97a611fab64fc9b9eba30… Patch: https://github.com/kamailio/kamailio/commit/0f0a56ad5c97a611fab64fc9b9eba30… --- diff --git a/src/modules/path/path_mod.c b/src/modules/path/path_mod.c index cc27d1a457..c7a2b637ac 100644 --- a/src/modules/path/path_mod.c +++ b/src/modules/path/path_mod.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Path handling for intermediate proxies * * Copyright (C) 2006 Inode GmbH (Andreas Granig <andreas.granig(a)inode.info>) @@ -17,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */

3 years, 8 months

git:5.3:57529832: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.3 Commit: 575298326cc2de40123262497dcc9baece74715a URL: https://github.com/kamailio/kamailio/commit/575298326cc2de40123262497dcc9ba… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-29T15:01:37+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/htable/README Modified: src/modules/registrar/README Modified: src/modules/rtpengine/README Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/575298326cc2de40123262497dcc9ba… Patch: https://github.com/kamailio/kamailio/commit/575298326cc2de40123262497dcc9ba…

3 years, 8 months

← Newer
1
...
13
14
15
16
17
18
19
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021