sr-dev July 2021

sr-dev@lists.kamailio.org

13 participants
227 discussions

[kamailio/kamailio] kazoo : fix routing of reply events (#2786)

by kageds

success events should be routed to onreply_route[] failure events should be routed to failure_route[]   #### 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) - [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 - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Kazoo cfg files use onreply_route[] and failure_route[] to handle the replies from AMQP and the module was sending the replies to the main route and therefore the scripts were not receiving the responses You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2786 -- Commit Summary -- * kazoo : fix routing of reply events -- File Changes -- M src/modules/kazoo/kz_amqp.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2786.patch https://github.com/kamailio/kamailio/pull/2786.diff -- 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/pull/2786

3 years, 3 months

[kamailio/kamailio] filter_body() fails when there isn't a space after "Content-Type:" (#2748)

by duarterocha91

I've made some testing and found that filter_body() fails when body is something like "Content-Type:application\/sdp\r\n\r\n". If i use this correction to add a space the filter works correctly : replace_body_all("Content-Type:application\/sdp\r\n\r\n","Content-Type: application/sdp\r\n\r\n"); #Makes the changes to the message persistent, returns 1 if sucessful, 0 if it fails if(msg_apply_changes()) { xnotice("Kamailio_Log : reply_route : Changes to message applied"); } I looked into the textops.c and found this line which i think might be the problem : while (find_line_start("Content-Type: ", 14, &start, &len)) If more info is needed please let me know. Cheers -- 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/2748

3 years, 3 months

[kamailio/kamailio] SDP filtering issues with sdpops module (#2755)

by Alessio Garzi

In order to filter some specific codes from the SDP I am using this functions from sdpops module - sdp_keep_codecs_by_name() - sdp_remove_codecs_by_name() - sdp_keep_codecs_by_id - sdp_remove_codecs_by_id and since they use the same code for filtering the problem I am going to describe affects all of them. Let's say I have this data inside my SDP ``` ... a=rtcp-xr:rcvr-rtt=all:10000 stat-summary=loss,dup,jitt,TTL voip-metrics m=audio 7078 RTP/AVPF 96 97 98 0 8 3 9 18 101 99 100 a=rtpmap:96 opus/48000/2 a=fmtp:96 useinbandfec=1 a=rtpmap:97 speex/16000 a=fmtp:97 vbr=on a=rtpmap:98 speex/8000 a=fmtp:98 vbr=on a=fmtp:18 annexb=yes a=rtpmap:101 telephone-event/48000 a=rtpmap:99 telephone-event/16000 a=rtpmap:100 telephone-event/8000 a=rtcp-fb:* trr-int 1000 a=rtcp-fb:* ccm tmmbr m=video 9078 RTP/AVPF 96 97 a=rtpmap:96 VP8/90000 a=rtpmap:97 H264/90000 a=fmtp:97 profile-level-id=42801F a=rtcp-fb:* trr-int 1000 a=rtcp-fb:* ccm tmmbr a=rtcp-fb:96 nack pli a=rtcp-fb:96 nack sli a=rtcp-fb:96 ack rpsi a=rtcp-fb:96 ccm fir a=rtcp-fb:97 nack pli a=rtcp-fb:97 ccm fir ``` The sdp_keep_codecs_by_id (and I assume all other analog filter functions) correctly detects 2 SDP sessions, one for the audio and one for the video. Now, let's say we want to allow only PCMA,PCMU,GSM,telephone-event ( id 8,0,3,100,99,101 ), this means for example that 96 and 97 codecs have to be stripped. For this reason the functions sdp_remove_str_codec_id_attrs() and sdp_remove_str_codec_id() are executed passing the correct id we want to filter. The sdp_remove_str_codec_id_attrs() will then remove the corresponding lines from the SDP but ONLY IF relative to rtpmap and fmtp. This means that a=rtcp* lines will not be filtered even if they are relative to a filtered codec and this is not what the user expects. Interestingly the sdp_remove_str_codec_id_attrs() function delete the lines only if there is a match with the sdp_payload_attr linked list. https://github.com/kamailio/kamailio/blob/758c85a09ebb2848d0fd2ee82c48784b8… This linked list is built at core level and only exposes rtp_payload and fmtp_string as described here. https://github.com/kamailio/kamailio/blob/758c85a09ebb2848d0fd2ee82c48784b8… So, in other words, the sdpops module has no clue of "a=rtcp-fb*" attributes and cannot be implemented to filter them in a neat way. Another issue arises for the "m=video 9078 RTP/AVPF 96 97" line. Here, since we are filtering 96 and 97, the line remains without ids, maybe it would be better to delete the whole line? The final result after applying my filter is the following ``` m=video 23088 RTP/AVPF a=rtcp-fb:* trr-int 1000 a=rtcp-fb:* ccm tmmbr a=rtcp-fb:96 nack pli a=rtcp-fb:96 nack sli a=rtcp-fb:96 ack rpsi a=rtcp-fb:96 ccm fir a=rtcp-fb:97 nack pli a=rtcp-fb:97 ccm fir ``` -- 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/2755

3 years, 3 months

[kamailio/kamailio] db_redis connection broken after idle serveral minutes if redis server with timeout setting (#2764)

by FredWH

### Description db_redis connection broken after idle several minutes if redis server with timeout setting ### Troubleshooting #### Reproduction 1. configure Redis server with timeout 600. (10 minutes) 2. configure Kamailio with db_redis module and usrloc module modparam("usrloc", "db_url", "REDIS_CONNECT") 3. at client side, try to register, then close client tool. 4. after idle for 10+ minutes, no any registion, reopen client tool and try to register, <- register failed. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  db_redis [redis_dbase.c:2504]: db_redis_insert(): Failed to fetch type entry: Broken pipe db_redis [redis_dbase.c:2568]: db_redis_insert(): failed to do the insert usrloc [ucontact.c:687]: db_insert_ucontact(): inserting contact in db failed 1001 (uloc-60b45e88-1c5d-d) usrloc [urecord.c:601]: insert_ucontact(): failed to insert in database registrar [save.c:537]: insert_contacts(): failed to insert contact sl [sl_funcs.c:414]: sl_reply_error(): stateless error reply used: I'm terribly sorry, server error occurred (1/SL) #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.5.0 (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, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 8.3.0 PS: 5.4.5 has the same issue. * **Operating System**:  Debian 10.9 Linux test1 4.19.0-16-cloud-amd64 #1 SMP Debian 4.19.181-1 (2021-03-19) x86_64 GNU/Linux -- 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/2764

3 years, 3 months

[kamailio/kamailio] db_redis: fix broken pipe issue, if redis server with timeout setting. (#2791)

by FredWH

- issue #2764   #### Pre-Submission Checklist    - [ ] 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/2791 -- Commit Summary -- * db_redis: fix broken pipe issue, if redis server with timeout setting. -- File Changes -- M src/modules/db_redis/redis_connection.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2791.patch https://github.com/kamailio/kamailio/pull/2791.diff -- 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/pull/2791

3 years, 3 months

[kamailio/kamailio] add debuginfo on dist other then x86 (#2789)

by sergey-safarov

### Description I want to debug `Kamailio` using `GDB` and compiled sources on `aarch64` architecture (`t4g` AWS instance). But produces object files do not contain debug info. Then executed ``` make -n ``` And found that no `-g` options used during compilation. I have specified `CFLAGS` and `CPPFLAGS` but with wont help. ### Expected behavior On all dist used `-g` compilation flag by default. If I have specified `CFLAGS` and `CPPFLAGS` as environment variables, then these flags used by GCC during compilation. #### Actual observed behavior `-g` flag do not used by default on `aarch64` architecture. `CFLAGS` and `CPPFLAGS` as environment variables do not used during compilation time. ### Additional info as hotfix I have used this patch ```diff diff --git a/src/Makefile.defs b/src/Makefile.defs index 027c985798..c91c34a7bb 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -885,7 +885,7 @@ endif ifeq ($(ARCH), aarch64) use_fast_lock=yes - C_DEFS+=-DNOSMP # memory barriers not implemented for arm + C_DEFS+= -g -DNOSMP # memory barriers not implemented for arm endif ifeq ($(ARCH), ppc) ``` -- 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/2789

3 years, 3 months

git:master:c503d2bd: core: parse to compare header names

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c503d2bd31a580138a67f1d4a265ccde5791d271 URL: https://github.com/kamailio/kamailio/commit/c503d2bd31a580138a67f1d4a265ccd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-31T12:04:24+02:00 core: parse to compare header names --- Modified: src/core/strutils.c --- Diff: https://github.com/kamailio/kamailio/commit/c503d2bd31a580138a67f1d4a265ccd… Patch: https://github.com/kamailio/kamailio/commit/c503d2bd31a580138a67f1d4a265ccd… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index ff394e5470..7b6a40ee3e 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -25,6 +25,7 @@ #include "parser/parse_uri.h" #include "parser/parse_param.h" +#include "parser/parse_hname2.h" #include "dprint.h" #include "ut.h" @@ -455,22 +456,61 @@ int cmpi_str(str *s1, str *s2) int cmp_hdrname_str(str *s1, str *s2) { str n1, n2; + hdr_field_t hf1, hf2; + n1 = *s1; n2 = *s2; trim_trailing(&n1); trim_trailing(&n2); - /* todo: parse hdr name and compare with short/long alternative */ + + parse_hname2_str(&n1, &hf1); + parse_hname2_str(&n2, &hf2); + if(hf1.type==HDR_ERROR_T || hf2.type==HDR_ERROR_T) { + LM_ERR("error parsing header names [%.*s] [%.*s]\n", n1.len, n1.s, + n2.len, n2.s); + return -4; + } + + if(hf1.type!=HDR_OTHER_T) { + if(hf1.type==hf2.type) { + return 0; + } else { + return 2; + } + } else if(hf1.type!=HDR_OTHER_T) { + return 2; + } return cmpi_str(&n1, &n2); } int cmp_hdrname_strzn(str *s1, char *s2, size_t len) { str n1, n2; + hdr_field_t hf1, hf2; + n1 = *s1; n2.s = s2; n2.len = len; trim_trailing(&n1); trim_trailing(&n2); + + parse_hname2_str(&n1, &hf1); + parse_hname2_str(&n2, &hf2); + if(hf1.type==HDR_ERROR_T || hf2.type==HDR_ERROR_T) { + LM_ERR("error parsing header names [%.*s] [%.*s]\n", n1.len, n1.s, + n2.len, n2.s); + return -4; + } + + if(hf1.type!=HDR_OTHER_T) { + if(hf1.type==hf2.type) { + return 0; + } else { + return 2; + } + } else if(hf1.type!=HDR_OTHER_T) { + return 2; + } return cmpi_str(&n1, &n2); }

3 years, 3 months

git:master:2c3df626: modules: readme files regenerated - siputils ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 2c3df6265314bc7728c151d0d7353d8162b26a58 URL: https://github.com/kamailio/kamailio/commit/2c3df6265314bc7728c151d0d7353d8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-30T20:31:13+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/2c3df6265314bc7728c151d0d7353d8… Patch: https://github.com/kamailio/kamailio/commit/2c3df6265314bc7728c151d0d7353d8…

3 years, 3 months

git:master:988b70c6: siputils: added cmp_hdr_name(hname1, hname2)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 988b70c6a8653b39753f09e8003477eadae36740 URL: https://github.com/kamailio/kamailio/commit/988b70c6a8653b39753f09e8003477e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T16:04:30+02:00 siputils: added cmp_hdr_name(hname1, hname2) --- Modified: src/modules/siputils/doc/siputils_admin.xml Modified: src/modules/siputils/sipops.c Modified: src/modules/siputils/sipops.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/988b70c6a8653b39753f09e8003477e… Patch: https://github.com/kamailio/kamailio/commit/988b70c6a8653b39753f09e8003477e… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index b1dffa1c3e..2b7ac27951 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -921,7 +921,7 @@ if(cmp_uri("$ru", "sip:kamailio@kamailio.org")) <function moreinfo="none">cmp_aor(str1, str2)</function> </title> <para> - The function returns <emphasis>true</emphasis> if + The function returns <emphasis>true</emphasis> if the two parameters matches as AoR. The parameters have to be SIP URIs. </para> @@ -937,6 +937,29 @@ if(cmp_aor("$rU(a)KaMaIlIo.org", "sip:kamailio@$fd")) # do interesting stuff here } ... +</programlisting> + </example> + </section> + <section id="siputils.f.cmp_hdr_name"> + <title> + <function moreinfo="none">cmp_hdr_name(str1, str2)</function> + </title> + <para> + The function returns <emphasis>true</emphasis> (return code 1) if + the two parameters matches as header names. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>cmp_hdr_name</function> usage</title> + <programlisting format="linespecific"> +... +if(cmp_hdr_name("$var(hname)", "From")) +{ + # do interesting stuff here +} +... </programlisting> </example> </section> diff --git a/src/modules/siputils/sipops.c b/src/modules/siputils/sipops.c index fb1040c6ba..4cba3c3181 100644 --- a/src/modules/siputils/sipops.c +++ b/src/modules/siputils/sipops.c @@ -88,6 +88,34 @@ int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2) return -2; } +int ki_cmp_hdr_name(sip_msg_t *msg, str *shname1, str *shname2) +{ + int ret; + + ret = cmp_hdrname_str(shname1, shname2); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + +int w_cmp_hdr_name(sip_msg_t *msg, char *hname1, char *hname2) +{ + str shname1; + str shname2; + + if(fixup_get_svalue(msg, (gparam_p)hname1, &shname1)!=0) { + LM_ERR("cannot get first parameter\n"); + return -8; + } + if(fixup_get_svalue(msg, (gparam_p)hname2, &shname2)!=0) { + LM_ERR("cannot get second parameter\n"); + return -8; + } + return ki_cmp_hdr_name(msg, &shname1, &shname2); +} + int w_is_gruu(sip_msg_t *msg, char *uri1, char *p2) { str s1, *s2; diff --git a/src/modules/siputils/sipops.h b/src/modules/siputils/sipops.h index 97d885c71c..9926358e0a 100644 --- a/src/modules/siputils/sipops.h +++ b/src/modules/siputils/sipops.h @@ -36,6 +36,8 @@ int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2); int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2); +int ki_cmp_hdr_name(sip_msg_t *msg, str *shname1, str *shname2); +int w_cmp_hdr_name(sip_msg_t *msg, char *hname1, char *hname2); int w_is_gruu(sip_msg_t *msg, char *uri1, char *p2); int w_is_supported(sip_msg_t *msg, char *_option, char *p2); int w_is_first_hop(sip_msg_t *msg, char *p1, char *p2); diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 3dc7188fa8..a23408ab79 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -166,6 +166,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"cmp_aor", (cmd_function)w_cmp_aor, 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"cmp_hdr_name", (cmd_function)w_cmp_hdr_name, 2, fixup_spve_spve, + 0, ANY_ROUTE}, {"is_rpid_user_e164", (cmd_function)is_rpid_user_e164, 0, 0, 0, REQUEST_ROUTE}, {"append_rpid_hf", (cmd_function)append_rpid_hf, 0, 0, @@ -738,6 +740,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("cmp_hdr_name"), + SR_KEMIP_INT, ki_cmp_hdr_name, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

3 years, 3 months

git:5.5:5ecf17bc: sworker: KSR.sworker.active() exported to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 5ecf17bc2d308141534bdaf3a312704daf0db850 URL: https://github.com/kamailio/kamailio/commit/5ecf17bc2d308141534bdaf3a312704… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T13:33:06+02:00 sworker: KSR.sworker.active() exported to kemi - equivalent to existing sworker_active() config function (cherry picked from commit 9f140ce93b1f6db649cd0e8eda26444d6b186231) --- Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5ecf17bc2d308141534bdaf3a312704… Patch: https://github.com/kamailio/kamailio/commit/5ecf17bc2d308141534bdaf3a312704… --- diff --git a/src/modules/sworker/sworker_mod.c b/src/modules/sworker/sworker_mod.c index 33ee3361bd..e6dce05c9b 100644 --- a/src/modules/sworker/sworker_mod.c +++ b/src/modules/sworker/sworker_mod.c @@ -196,6 +196,17 @@ static int w_sworker_task(sip_msg_t *msg, char *pgname, char *p2) return ki_sworker_task(msg, &gname); } +/** + * + */ +static int ki_sworker_active(sip_msg_t *msg) +{ + if(_sworker_active==0) { + return -1; + } + return 1; +} + /** * */ @@ -217,6 +228,11 @@ static sr_kemi_t sr_kemi_sworker_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sworker"), str_init("active"), + SR_KEMIP_INT, ki_sworker_active, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

3 years, 3 months

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2021