sr-dev October 2021

sr-dev@lists.kamailio.org

19 participants
245 discussions

git:master:c9b6d3c6: pkg/kamailio/obs: updated modules list
by Sergey Safarov 29 Oct '21

29 Oct '21

Module: kamailio Branch: master Commit: c9b6d3c62636bfc654227f97b5ce54d0b1b909e4 URL: https://github.com/kamailio/kamailio/commit/c9b6d3c62636bfc654227f97b5ce54d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-10-29T18:28:39+03:00 pkg/kamailio/obs: updated modules list --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/c9b6d3c62636bfc654227f97b5ce54d… Patch: https://github.com/kamailio/kamailio/commit/c9b6d3c62636bfc654227f97b5ce54d… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index b68df0eef5..5e15376879 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -214,6 +214,7 @@ Conflicts: kamailio-auth-ephemeral < %ver, kamailio-bdb < %ver Conflicts: kamailio-carrierroute < %ver, kamailio-cpl < %ver Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver +Conflicts: kamailio-http_client < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lost < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver @@ -225,6 +226,7 @@ Conflicts: kamailio-python < %ver Conflicts: kamailio-radius < %ver, kamailio-redis < %ver Conflicts: kamailio-regex < %ver, kamailio-ruby < %ver Conflicts: kamailio-sctp < %ver, kamailio-secfilter < %ver, kamailio-sipdump < %ver +Conflicts: kamailio-slack < %ver Conflicts: kamailio-snmpstats < %ver, kamailio-sqlang < %ver, kamailio-sqlite < %ver Conflicts: kamailio-tls < %ver, kamailio-unixodbc < %ver Conflicts: kamailio-utils < %ver, kamailio-websocket < %ver @@ -906,6 +908,23 @@ Requires: kamailio = %ver This module serializes SIP message attributes into a JSON document +%package slack +Summary: Slack integration module for Kamailio +Group: %{PKGGROUP} + +Requires: kamailio = %ver, kamailio-http_client = %ver +%if 0%{?suse_version} +Requires: libcurl4 +BuildRequires: libcurl-devel +%else +Requires: libcurl +BuildRequires: libcurl-devel +%endif + +%description slack +This module provides integration with Slack over webhooks. + + %package smsops Summary: Tools for handling SMS packets in SIP messages Group: %{PKGGROUP} @@ -1458,11 +1477,11 @@ fi %doc %{_docdir}/kamailio/modules/README.kemix %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.lrkproxy -%doc %{_docdir}/kamailio/modules/README.malloc_test %doc %{_docdir}/kamailio/modules/README.mangler %doc %{_docdir}/kamailio/modules/README.matrix %doc %{_docdir}/kamailio/modules/README.maxfwd %doc %{_docdir}/kamailio/modules/README.mediaproxy +%doc %{_docdir}/kamailio/modules/README.misctest %doc %{_docdir}/kamailio/modules/README.mohqueue %doc %{_docdir}/kamailio/modules/README.mqueue %doc %{_docdir}/kamailio/modules/README.msilo @@ -1477,6 +1496,7 @@ fi %doc %{_docdir}/kamailio/modules/README.permissions %doc %{_docdir}/kamailio/modules/README.pike %doc %{_docdir}/kamailio/modules/README.pipelimit +%doc %{_docdir}/kamailio/modules/README.posops %doc %{_docdir}/kamailio/modules/README.prefix_route %doc %{_docdir}/kamailio/modules/README.print %doc %{_docdir}/kamailio/modules/README.print_lib @@ -1617,11 +1637,11 @@ fi %{_libdir}/kamailio/modules/kemix.so %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/lrkproxy.so -%{_libdir}/kamailio/modules/malloc_test.so %{_libdir}/kamailio/modules/mangler.so %{_libdir}/kamailio/modules/matrix.so %{_libdir}/kamailio/modules/maxfwd.so %{_libdir}/kamailio/modules/mediaproxy.so +%{_libdir}/kamailio/modules/misctest.so %{_libdir}/kamailio/modules/mohqueue.so %{_libdir}/kamailio/modules/mqueue.so %{_libdir}/kamailio/modules/msilo.so @@ -1636,6 +1656,7 @@ fi %{_libdir}/kamailio/modules/permissions.so %{_libdir}/kamailio/modules/pike.so %{_libdir}/kamailio/modules/pipelimit.so +%{_libdir}/kamailio/modules/posops.so %{_libdir}/kamailio/modules/prefix_route.so %{_libdir}/kamailio/modules/print.so %{_libdir}/kamailio/modules/print_lib.so @@ -2182,6 +2203,12 @@ fi %{_libdir}/kamailio/modules/sipjson.so +%files slack +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.slack +%{_libdir}/kamailio/modules/slack.so + + %files snmpstats %defattr(-,root,root) %{_docdir}/kamailio/modules/README.snmpstats

1 0

git:5.4:106997d1: pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1
by Sergey Safarov 29 Oct '21

29 Oct '21

Module: kamailio Branch: 5.4 Commit: 106997d1d1924c987f7e6d2ff32c4d40d7ee0e10 URL: https://github.com/kamailio/kamailio/commit/106997d1d1924c987f7e6d2ff32c4d4… Author: SPChan <shihping.chan(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-10-29T18:20:25+03:00 pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1 (cherry picked from commit ecc2cc69b08e797ca954af233c229ed44475ce33) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/106997d1d1924c987f7e6d2ff32c4d4… Patch: https://github.com/kamailio/kamailio/commit/106997d1d1924c987f7e6d2ff32c4d4… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 695c46797c..f99f13696d 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -217,6 +217,11 @@ %define _rundir %{_localstatedir}/run %endif +# build with openssl 1.1.1 on RHEL 7 based dists +%if 0%{?rhel} == 7 +%bcond_with openssl11 +%endif + # redefine buggy openSUSE Leap _sharedstatedir macro. More info at https://bugzilla.redhat.com/show_bug.cgi?id=183370 %if 0%{?suse_version} == 1315 %define _sharedstatedir /var/lib @@ -324,8 +329,13 @@ Account transaction information in a JSON dictionary. %package auth-ephemeral Summary: Functions for authentication using ephemeral credentials Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description auth-ephemeral Functions for authentication using ephemeral credentials. @@ -410,9 +420,14 @@ Requires: openssl BuildRequires: openssl-devel %endif %if 0%{?rhel} == 7 +%if %{with openssl11} +Requires: openssl11-libs +BuildRequires: openssl11-devel +%else Requires: openssl-libs BuildRequires: openssl-devel %endif +%endif %if 0%{?fedora} Requires: openssl-libs BuildRequires: openssl-devel @@ -706,8 +721,13 @@ MySQL database connectivity for Kamailio. %package outbound Summary: Outbound (RFC 5626) support for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description outbound RFC 5626, "Managing Client-Initiated Connections in the Session Initiation @@ -985,8 +1005,13 @@ SQLite database connectivity for Kamailio. %package tls Summary: TLS transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description tls TLS transport for Kamailio. @@ -1041,8 +1066,13 @@ Non-SIP utitility functions for Kamailio. %package websocket Summary: WebSocket transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: libunistring, openssl11, kamailio = %ver +BuildRequires: libunistring-devel, openssl11-devel +%else Requires: libunistring, openssl, kamailio = %ver BuildRequires: libunistring-devel, openssl-devel +%endif %description websocket WebSocket transport for Kamailio. @@ -1139,6 +1169,9 @@ make cfg prefix=/usr \ make make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ jabber ndb_cassandra osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif @@ -1231,6 +1264,9 @@ rm -rf %{buildroot} make install make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ iptrtpproxy jabber osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif

1 0

git:master:375f86b6: posops: safety check for change anchor
by Daniel-Constantin Mierla 29 Oct '21

29 Oct '21

Module: kamailio Branch: master Commit: 375f86b69e11cf835ae919873d3cd56f32d589c8 URL: https://github.com/kamailio/kamailio/commit/375f86b69e11cf835ae919873d3cd56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-29T13:28:07+02:00 posops: safety check for change anchor --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/375f86b69e11cf835ae919873d3cd56… Patch: https://github.com/kamailio/kamailio/commit/375f86b69e11cf835ae919873d3cd56… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 5710b83da2..465d6490ed 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -186,6 +186,10 @@ static int ki_posops_pos_append(sip_msg_t *msg, int idx, str *val) } anchor = anchor_lump(msg, offset, 0, 0); + if(anchor == NULL) { + LM_ERR("failed to create the anchor\n"); + return -1; + } if (insert_new_lump_after(anchor, val->s, val->len, 0) == 0) { LM_ERR("unable to add lump\n"); return -1; @@ -241,6 +245,10 @@ static int ki_posops_pos_insert(sip_msg_t *msg, int idx, str *val) } anchor = anchor_lump(msg, offset, 0, 0); + if(anchor == NULL) { + LM_ERR("failed to create the anchor\n"); + return -1; + } if (insert_new_lump_before(anchor, val->s, val->len, 0) == 0) { LM_ERR("unable to add lump\n"); return -1;

1 0

git:master:6cd61dfa: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 29 Oct '21

29 Oct '21

Module: kamailio Branch: master Commit: 6cd61dfa949ae6288f480efcb72fdb8bb344d93f URL: https://github.com/kamailio/kamailio/commit/6cd61dfa949ae6288f480efcb72fdb8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-29T12:46:23+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/6cd61dfa949ae6288f480efcb72fdb8… Patch: https://github.com/kamailio/kamailio/commit/6cd61dfa949ae6288f480efcb72fdb8… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index a9caf8951f..4944f8abaa 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -489,6 +489,7 @@ Chapter 1. Admin Guide The following modules must be loaded before this module: * tm module - (optional) if you want to have rtpengine_manage() fully functional + lwsc module - (optional) if you plan to use “wsapi” parameter 3.2. External Libraries or Applications

1 0

git:master:a602c26f: rtpengine: update dependencies
by Victor Seva 29 Oct '21

29 Oct '21

Module: kamailio Branch: master Commit: a602c26fe3c83a0f1b825927be145459a08730e2 URL: https://github.com/kamailio/kamailio/commit/a602c26fe3c83a0f1b825927be14545… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-29T12:35:25+02:00 rtpengine: update dependencies lwsc module is needed if wsapi parameter is set https://lists.kamailio.org/pipermail/sr-users/2021-October/113494.html --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a602c26fe3c83a0f1b825927be14545… Patch: https://github.com/kamailio/kamailio/commit/a602c26fe3c83a0f1b825927be14545… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index c3201bbf37..234fd1fa21 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -120,6 +120,10 @@ <emphasis>tm module</emphasis> - (optional) if you want to have rtpengine_manage() fully functional </para> + <para> + <emphasis>lwsc module</emphasis> - (optional) if you plan to use + <quote>wsapi</quote> parameter + </para> </listitem> </itemizedlist> </para>

1 0

[kamailio/kamailio] Memory leak in tcpconn_new() kamailio 5.5.2 (#2880)
by Nacho G. 29 Oct '21

29 Oct '21

### Description  I found a memory leak which is causing some issues for us in our production. I think I was able to reproduce it and determine that this is happening when we set up an MSRP connection, and that connection is closed due to inactivity (for example when `tcp_connection_lifetime` is triggered). This issue is the same one than #2875 but with latest supported Kamailio version. ### Troubleshooting #### Reproduction  In this environment we have a WebRTC SIP client, connected to Kamailio and a second party using SIP, both sending messages each via MSRP protocol. Web Client and SIP client establish a session normally, all fine here, they can communicate. At this point we have this status: ``` TESTER|centos8.4|tester21 [2021-10-11][12:49:24] [/home/vagrant]$ sudo netstat -natp | grep 10.22.22 tcp 0 0 10.22.22.21:5060 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:10000 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:8080 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:10001 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:10002 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:8080 10.22.22.1:58530 ESTABLISHED 14653/kamailio tcp 0 0 10.22.22.21:10000 10.22.22.190:42530 ESTABLISHED 14714/kamailio tcp 0 0 10.22.22.21:8080 10.22.22.1:58532 ESTABLISHED 14704/kamailio TESTER|centos8.4|tester21 [2021-10-11][12:49:39] [/home/vagrant]$ kamcmd -s udp:127.0.0.1:2046 mod.stats core all | grep tcp tcpconn_new(1134): 199392 init_tcp(4962): 8192 init_tcp(4956): 32768 init_tcp(4947): 8 init_tcp(4940): 8 init_tcp(4933): 8 init_tcp(4927): 8 init_tcp(4915): 8 ``` In order to trigger this failure much faster, I set `tcp_connection_lifetime=60`. Then we just wait 60 seconds to let the TCP connections closed. Then we finish the session, and stop our WebClient registering, so all connections are cleaned up. ``` TESTER|centos8.4|tester21 [2021-10-11][12:50:33] [/home/vagrant]$ sudo netstat -natp | grep 10.22.22 tcp 0 0 10.22.22.21:5060 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:10000 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:8080 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:10001 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:10002 0.0.0.0:* LISTEN 14714/kamailio TESTER|centos8.4|tester21 [2021-10-11][12:51:34] [/home/vagrant]$ kamcmd -s udp:127.0.0.1:2046 mod.stats core all | grep tcp tcpconn_new(1134): 66464 init_tcp(4962): 8192 init_tcp(4956): 32768 init_tcp(4947): 8 init_tcp(4940): 8 init_tcp(4933): 8 init_tcp(4927): 8 init_tcp(4915): 8 ``` As you can see there are no connections but there is memory allocated by `tcpconn_new`. I know this is related to the MSRP because we noticed our SIP Web Client is not closing the socket, so we just wait for Kamailio to close it. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` 2021-07-25T23:54:41Z ERROR ERROR: <core> [mem/f_malloc.c:415]: fm_search_defrag(): fm_search_defrag(0x7f39a284c000, 66288); Free fragment not found! 2021-07-25T23:54:41Z ERROR ERROR: <core> [mem/f_malloc.c:498]: fm_malloc(): fm_malloc(0x7f39a284c000, 66288) called from core: tcp_main.c: tcpconn_new(957), module: core; Free fragment not found! 2021-07-25T23:54:41Z ERROR ERROR: <core> [tcp_main.c:959]: tcpconn_new(): mem. allocation failure 2021-07-25T23:54:41Z ERROR ERROR: <core> [tcp_main.c:3985]: handle_new_connect(): tcpconn_new failed, closing socket ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: intcc 5.5.2 (x86_64/linux) 55e232 flags: , EXTRA_DEBUGUSE_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, DBG_QM_MALLOC, 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: 55e232 compiled on 12:15:14 Oct 11 2021 with gcc 8.4.1 ``` * **Operating System**:  ``` TESTER|centos8.4|tester21 [2021-10-11][13:52:47] [/home/vagrant]$ uname -a Linux tester21 4.18.0-305.19.1.el8_4.x86_64 #1 SMP Wed Sep 15 15:39:39 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux centos 8 ``` -- 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/2880

3 3

git:5.4:9ed21cd1: pv_headers: don't try to replace header
by Victor Seva 29 Oct '21

29 Oct '21

Module: kamailio Branch: 5.4 Commit: 9ed21cd119739bb2768518d15fef98b65f5eaa45 URL: https://github.com/kamailio/kamailio/commit/9ed21cd119739bb2768518d15fef98b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-29T12:06:13+02:00 pv_headers: don't try to replace header Multiple headers where not removed if new value was just one header. (cherry picked from commit 09981c41cb6685fa18f61b9e7d66339917c4f097) --- Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_hdr.c Modified: src/modules/pv_headers/pvh_hdr.h --- Diff: https://github.com/kamailio/kamailio/commit/9ed21cd119739bb2768518d15fef98b… Patch: https://github.com/kamailio/kamailio/commit/9ed21cd119739bb2768518d15fef98b… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 90feddeefde..fcc5b6a00b9 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -272,12 +272,6 @@ int pvh_apply_headers(struct sip_msg *msg) } if(!str_hash_case_get(&rm_hdrs, sub->name.s, sub->name.len)) { - if(!pvh_avp_is_null(sub) && xavi_count(&sub->name, &sub) == 1) { - LM_DBG("replace header[%s]: %s\n", sub->name.s, sub->val.v.s.s); - pvh_real_hdr_replace(msg, &sub->name, &sub->val.v.s); - pvh_str_hash_add_key(&rm_hdrs, &sub->name); - continue; - } LM_DBG("remove header[%s]: %s\n", sub->name.s, sub->val.v.s.s); pvh_real_hdr_del_by_name(msg, &sub->name); pvh_str_hash_add_key(&rm_hdrs, &sub->name); diff --git a/src/modules/pv_headers/pvh_hdr.c b/src/modules/pv_headers/pvh_hdr.c index d83a646c0db..31c09b4b5da 100644 --- a/src/modules/pv_headers/pvh_hdr.c +++ b/src/modules/pv_headers/pvh_hdr.c @@ -131,80 +131,6 @@ int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue) return 1; } -int pvh_real_hdr_replace(struct sip_msg *msg, str *hname, str *hvalue) -{ - struct lump *anchor = NULL; - hdr_field_t *hf = NULL; - str new_h = STR_NULL; - int new = 1; - - if(hname->s == NULL || hvalue->s == NULL) { - LM_ERR("header name/value cannot be empty"); - return -1; - } - - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->name.len == hname->len - && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { - if(hf->body.len == hvalue->len - && strncasecmp(hf->body.s, hvalue->s, hvalue->len) == 0) { - return 1; - } - new = 0; - break; - } - if(!hf->next) - break; - } - - if(hf == NULL) { - LM_ERR("unable to find header lump\n"); - return -1; - } - - if(new == 0) { - if((anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0)) == 0) { - LM_ERR("unable to delete header lump\n"); - return -1; - } - } else { - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); - } - - if(anchor == 0) { - LM_ERR("unable to find header lump\n"); - return -1; - } - - if(pvh_create_hdr_str(hname, hvalue, &new_h) <= 0) - return -1; - - if(insert_new_lump_after(anchor, new_h.s, new_h.len, 0) == 0) { - LM_ERR("cannot insert header lump\n"); - pkg_free(new_h.s); - return -1; - } - - LM_DBG("%s header: %.*s\n", new ? "append" : "replace", new_h.len, new_h.s); - - return 1; -} - -int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname) -{ - hdr_field_t *hf = NULL; - - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->name.len == hname->len - && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { - LM_DBG("remove header[%.*s]: %.*s\n", hf->name.len, hf->name.s, - hf->body.len, hf->body.s); - del_lump(msg, hf->name.s - msg->buf, hf->len, 0); - } - } - return 1; -} - int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname) { hdr_field_t *hf = NULL; diff --git a/src/modules/pv_headers/pvh_hdr.h b/src/modules/pv_headers/pvh_hdr.h index 4f869538238..a5ad4157f9d 100644 --- a/src/modules/pv_headers/pvh_hdr.h +++ b/src/modules/pv_headers/pvh_hdr.h @@ -38,7 +38,6 @@ void pvh_hdrs_set_applied(struct sip_msg *msg); void pvh_hdrs_reset_flags(struct sip_msg *msg); int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue); -int pvh_real_hdr_replace(struct sip_msg *msg, str *hname, str *hvalue); int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname); int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname); int pvh_real_replace_reply_reason(struct sip_msg *msg, str *value);

1 0

git:5.5:e2b6cc87: pv_headers: don't try to replace header
by Victor Seva 29 Oct '21

29 Oct '21

Module: kamailio Branch: 5.5 Commit: e2b6cc878088b0af2d76a2bce87c341946c36cbf URL: https://github.com/kamailio/kamailio/commit/e2b6cc878088b0af2d76a2bce87c341… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-29T12:02:18+02:00 pv_headers: don't try to replace header Multiple headers where not removed if new value was just one header. (cherry picked from commit 09981c41cb6685fa18f61b9e7d66339917c4f097) --- Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_hdr.c Modified: src/modules/pv_headers/pvh_hdr.h --- Diff: https://github.com/kamailio/kamailio/commit/e2b6cc878088b0af2d76a2bce87c341… Patch: https://github.com/kamailio/kamailio/commit/e2b6cc878088b0af2d76a2bce87c341… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 7afc39d1a8..01a7d3d211 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -276,12 +276,6 @@ int pvh_apply_headers(struct sip_msg *msg) } if(!str_hash_case_get(&rm_hdrs, sub->name.s, sub->name.len)) { - if(!pvh_avp_is_null(sub) && xavi_count(&sub->name, &sub) == 1) { - LM_DBG("replace header[%s]: %s\n", sub->name.s, sub->val.v.s.s); - pvh_real_hdr_replace(msg, &sub->name, &sub->val.v.s); - pvh_str_hash_add_key(&rm_hdrs, &sub->name); - continue; - } LM_DBG("remove header[%s]: %s\n", sub->name.s, sub->val.v.s.s); pvh_real_hdr_del_by_name(msg, &sub->name); pvh_str_hash_add_key(&rm_hdrs, &sub->name); diff --git a/src/modules/pv_headers/pvh_hdr.c b/src/modules/pv_headers/pvh_hdr.c index d83a646c0d..31c09b4b5d 100644 --- a/src/modules/pv_headers/pvh_hdr.c +++ b/src/modules/pv_headers/pvh_hdr.c @@ -131,80 +131,6 @@ int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue) return 1; } -int pvh_real_hdr_replace(struct sip_msg *msg, str *hname, str *hvalue) -{ - struct lump *anchor = NULL; - hdr_field_t *hf = NULL; - str new_h = STR_NULL; - int new = 1; - - if(hname->s == NULL || hvalue->s == NULL) { - LM_ERR("header name/value cannot be empty"); - return -1; - } - - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->name.len == hname->len - && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { - if(hf->body.len == hvalue->len - && strncasecmp(hf->body.s, hvalue->s, hvalue->len) == 0) { - return 1; - } - new = 0; - break; - } - if(!hf->next) - break; - } - - if(hf == NULL) { - LM_ERR("unable to find header lump\n"); - return -1; - } - - if(new == 0) { - if((anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0)) == 0) { - LM_ERR("unable to delete header lump\n"); - return -1; - } - } else { - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); - } - - if(anchor == 0) { - LM_ERR("unable to find header lump\n"); - return -1; - } - - if(pvh_create_hdr_str(hname, hvalue, &new_h) <= 0) - return -1; - - if(insert_new_lump_after(anchor, new_h.s, new_h.len, 0) == 0) { - LM_ERR("cannot insert header lump\n"); - pkg_free(new_h.s); - return -1; - } - - LM_DBG("%s header: %.*s\n", new ? "append" : "replace", new_h.len, new_h.s); - - return 1; -} - -int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname) -{ - hdr_field_t *hf = NULL; - - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->name.len == hname->len - && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { - LM_DBG("remove header[%.*s]: %.*s\n", hf->name.len, hf->name.s, - hf->body.len, hf->body.s); - del_lump(msg, hf->name.s - msg->buf, hf->len, 0); - } - } - return 1; -} - int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname) { hdr_field_t *hf = NULL; diff --git a/src/modules/pv_headers/pvh_hdr.h b/src/modules/pv_headers/pvh_hdr.h index 4f86953823..a5ad4157f9 100644 --- a/src/modules/pv_headers/pvh_hdr.h +++ b/src/modules/pv_headers/pvh_hdr.h @@ -38,7 +38,6 @@ void pvh_hdrs_set_applied(struct sip_msg *msg); void pvh_hdrs_reset_flags(struct sip_msg *msg); int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue); -int pvh_real_hdr_replace(struct sip_msg *msg, str *hname, str *hvalue); int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname); int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname); int pvh_real_replace_reply_reason(struct sip_msg *msg, str *value);

1 0

git:master:09981c41: pv_headers: don't try to replace header
by Victor Seva 29 Oct '21

29 Oct '21

Module: kamailio Branch: master Commit: 09981c41cb6685fa18f61b9e7d66339917c4f097 URL: https://github.com/kamailio/kamailio/commit/09981c41cb6685fa18f61b9e7d66339… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-29T08:43:45+02:00 pv_headers: don't try to replace header Multiple headers where not removed if new value was just one header. --- Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_hdr.c Modified: src/modules/pv_headers/pvh_hdr.h --- Diff: https://github.com/kamailio/kamailio/commit/09981c41cb6685fa18f61b9e7d66339… Patch: https://github.com/kamailio/kamailio/commit/09981c41cb6685fa18f61b9e7d66339… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 7afc39d1a8..01a7d3d211 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -276,12 +276,6 @@ int pvh_apply_headers(struct sip_msg *msg) } if(!str_hash_case_get(&rm_hdrs, sub->name.s, sub->name.len)) { - if(!pvh_avp_is_null(sub) && xavi_count(&sub->name, &sub) == 1) { - LM_DBG("replace header[%s]: %s\n", sub->name.s, sub->val.v.s.s); - pvh_real_hdr_replace(msg, &sub->name, &sub->val.v.s); - pvh_str_hash_add_key(&rm_hdrs, &sub->name); - continue; - } LM_DBG("remove header[%s]: %s\n", sub->name.s, sub->val.v.s.s); pvh_real_hdr_del_by_name(msg, &sub->name); pvh_str_hash_add_key(&rm_hdrs, &sub->name); diff --git a/src/modules/pv_headers/pvh_hdr.c b/src/modules/pv_headers/pvh_hdr.c index d83a646c0d..31c09b4b5d 100644 --- a/src/modules/pv_headers/pvh_hdr.c +++ b/src/modules/pv_headers/pvh_hdr.c @@ -131,80 +131,6 @@ int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue) return 1; } -int pvh_real_hdr_replace(struct sip_msg *msg, str *hname, str *hvalue) -{ - struct lump *anchor = NULL; - hdr_field_t *hf = NULL; - str new_h = STR_NULL; - int new = 1; - - if(hname->s == NULL || hvalue->s == NULL) { - LM_ERR("header name/value cannot be empty"); - return -1; - } - - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->name.len == hname->len - && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { - if(hf->body.len == hvalue->len - && strncasecmp(hf->body.s, hvalue->s, hvalue->len) == 0) { - return 1; - } - new = 0; - break; - } - if(!hf->next) - break; - } - - if(hf == NULL) { - LM_ERR("unable to find header lump\n"); - return -1; - } - - if(new == 0) { - if((anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0)) == 0) { - LM_ERR("unable to delete header lump\n"); - return -1; - } - } else { - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); - } - - if(anchor == 0) { - LM_ERR("unable to find header lump\n"); - return -1; - } - - if(pvh_create_hdr_str(hname, hvalue, &new_h) <= 0) - return -1; - - if(insert_new_lump_after(anchor, new_h.s, new_h.len, 0) == 0) { - LM_ERR("cannot insert header lump\n"); - pkg_free(new_h.s); - return -1; - } - - LM_DBG("%s header: %.*s\n", new ? "append" : "replace", new_h.len, new_h.s); - - return 1; -} - -int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname) -{ - hdr_field_t *hf = NULL; - - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->name.len == hname->len - && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { - LM_DBG("remove header[%.*s]: %.*s\n", hf->name.len, hf->name.s, - hf->body.len, hf->body.s); - del_lump(msg, hf->name.s - msg->buf, hf->len, 0); - } - } - return 1; -} - int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname) { hdr_field_t *hf = NULL; diff --git a/src/modules/pv_headers/pvh_hdr.h b/src/modules/pv_headers/pvh_hdr.h index 4f86953823..a5ad4157f9 100644 --- a/src/modules/pv_headers/pvh_hdr.h +++ b/src/modules/pv_headers/pvh_hdr.h @@ -38,7 +38,6 @@ void pvh_hdrs_set_applied(struct sip_msg *msg); void pvh_hdrs_reset_flags(struct sip_msg *msg); int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue); -int pvh_real_hdr_replace(struct sip_msg *msg, str *hname, str *hvalue); int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname); int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname); int pvh_real_replace_reply_reason(struct sip_msg *msg, str *value);

1 0

[kamailio/kamailio] pua_dialoginfo: generate uuid as id instead of use callid value (PR #2908)
by Victor Seva 29 Oct '21

29 Oct '21

#### 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 - [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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2906 #### Description This change solves the issue of parallel forking, subscriber was receiving NOTIFY messages with the same id for different branches fixes #2906 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2908 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2908/commits/8a924ee177b4764cd5da…">pua_dialoginfo: generate uuid as id instead of use callid value</a> -- File Changes -- M src/modules/pua_dialoginfo/Makefile (11) M src/modules/pua_dialoginfo/dialog_publish.c (18) M src/modules/pua_dialoginfo/pua_dialoginfo.c (47) M src/modules/pua_dialoginfo/pua_dialoginfo.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2908.patch https://github.com/kamailio/kamailio/pull/2908.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/2908

2 5

← Newer
1
...
10
11
12
13
14
15
16
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2021