- sr-dev - kamailio.org

git:master:808e58c4: acc: docs - more details about cdr_enable parameter
by Daniel-Constantin Mierla 01 Nov '21

01 Nov '21

Module: kamailio Branch: master Commit: 808e58c4e9b785a58fd5cfd084089a217d0f96c3 URL: https://github.com/kamailio/kamailio/commit/808e58c4e9b785a58fd5cfd084089a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-01T14:05:46+01:00 acc: docs - more details about cdr_enable parameter --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/808e58c4e9b785a58fd5cfd084089a2… Patch: https://github.com/kamailio/kamailio/commit/808e58c4e9b785a58fd5cfd084089a2… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 41935c8dae..93628f4166 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1044,11 +1044,17 @@ modparam("acc", "db_insert_mode", 1) <section id="acc.p.cdr_enable"> <title><varname>cdr_enable</varname> (integer)</title> <para> - Should CDR-based logging be enabled? + Enable CDR reporting - one record per call reported to "acc_cdrs" table, + relying on dialog module. </para> <para> - 0 - off (default). - 1 - on. + The value can be: + <itemizedlist> + <listitem> + <para>0 - off (default).</para> + <para>1 - on.</para> + </listitem> + </itemizedlist> </para> <example> <title>cdr_enable example</title>

1 0

git:master:5265ae27: modules: readme files regenerated - ims_registrar_scscf ... [skip ci]
by Kamailio Dev 01 Nov '21

01 Nov '21

Module: kamailio Branch: master Commit: 5265ae27f1acd82bfebd56ea765b2ad6f22d734b URL: https://github.com/kamailio/kamailio/commit/5265ae27f1acd82bfebd56ea765b2ad… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-01T10:16:21+01:00 modules: readme files regenerated - ims_registrar_scscf ... [skip ci] --- Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/5265ae27f1acd82bfebd56ea765b2ad… Patch: https://github.com/kamailio/kamailio/commit/5265ae27f1acd82bfebd56ea765b2ad… --- diff --git a/src/modules/ims_registrar_scscf/README b/src/modules/ims_registrar_scscf/README index e5bd47f275..74bf059d4d 100644 --- a/src/modules/ims_registrar_scscf/README +++ b/src/modules/ims_registrar_scscf/README @@ -47,7 +47,7 @@ Richard Good 4. Functions - 4.1. save(async_reply_route, domain) + 4.1. save(async_reply_route, domain, mode, flags) 4.2. lookup(domain) 4.3. lookup_path_to_contact(uri) 4.4. unregister(domain) @@ -143,7 +143,7 @@ Chapter 1. Admin Guide 4. Functions - 4.1. save(async_reply_route, domain) + 4.1. save(async_reply_route, domain, mode, flags) 4.2. lookup(domain) 4.3. lookup_path_to_contact(uri) 4.4. unregister(domain) @@ -487,7 +487,7 @@ om") 4. Functions - 4.1. save(async_reply_route, domain) + 4.1. save(async_reply_route, domain, mode, flags) 4.2. lookup(domain) 4.3. lookup_path_to_contact(uri) 4.4. unregister(domain) @@ -501,7 +501,7 @@ om") 4.12. can_publish_reg(domain) 4.13. publish_reg(domain) -4.1. save(async_reply_route, domain) +4.1. save(async_reply_route, domain, mode, flags) The function processes a REGISTER message. It can add, remove or modify usrloc records depending on Contact and Expires HFs in the REGISTER @@ -517,6 +517,9 @@ om") completed. This is required because the save function is executed asynchronously (Diameter). * domain- Logical domain within registrar. + * mode- Optional and unused legacy parameter. + * flags- Optional parameter. Valid values: 0x01 - Realm is not used + when extracting Private Identity from the Authorization header. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE

1 0

[kamailio/kamailio] ims_registrar_scscf: Extend save() with optional flag (PR #2907)
by alexyosifov 01 Nov '21

01 Nov '21

Add a new flag as optional parameter for save() method. The flag contains one value: DO_NOT_USE_REALM_FOR_PRIVATE_IDENTITY 0x01. No changes save() when parameter is not present.   #### 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) - [x] 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 - [ ] 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/2907 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2907/commits/85f4de73ff4dcbbe8d13…">ims_registrar_scscf: Extend save() with optional flag</a> -- File Changes -- M src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c (72) M src/modules/ims_registrar_scscf/save.c (21) M src/modules/ims_registrar_scscf/save.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2907.patch https://github.com/kamailio/kamailio/pull/2907.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/2907

2 5

git:master:be8bfc31: Merge pull request #2907 from alexyosifov/extend_ims_reg_scscf_save
by GitHub 01 Nov '21

01 Nov '21

Module: kamailio Branch: master Commit: be8bfc3107934fae30eaf48434e6dab9be5fbfb8 URL: https://github.com/kamailio/kamailio/commit/be8bfc3107934fae30eaf48434e6dab… Author: carstenbock <carsten(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-01T10:02:21+01:00 Merge pull request #2907 from alexyosifov/extend_ims_reg_scscf_save ims_registrar_scscf: Extend save() with optional flag --- Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c Modified: src/modules/ims_registrar_scscf/save.c Modified: src/modules/ims_registrar_scscf/save.h --- Diff: https://github.com/kamailio/kamailio/commit/be8bfc3107934fae30eaf48434e6dab… Patch: https://github.com/kamailio/kamailio/commit/be8bfc3107934fae30eaf48434e6dab…

1 0

git:master:a627c9a0: ims_registrar_scscf: Extend save() with optional flag
by Aleksandar Yosifov 01 Nov '21

01 Nov '21

Module: kamailio Branch: master Commit: a627c9a04a74b48760441be3411f75325f1cb2f2 URL: https://github.com/kamailio/kamailio/commit/a627c9a04a74b48760441be3411f753… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2021-11-01T10:07:10+02:00 ims_registrar_scscf: Extend save() with optional flag Add a new flag as optional parameter for save() method. The flag contains one value: DO_NOT_USE_REALM_FOR_PRIVATE_IDENTITY 0x01. No changes save() when parameter is not present. --- Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c Modified: src/modules/ims_registrar_scscf/save.c Modified: src/modules/ims_registrar_scscf/save.h --- Diff: https://github.com/kamailio/kamailio/commit/a627c9a04a74b48760441be3411f753… Patch: https://github.com/kamailio/kamailio/commit/a627c9a04a74b48760441be3411f753…

1 0

[kamailio/kamailio] statsd: remove '\r\n' from xlog messages (PR #2911)
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 - [ ] Tested changes locally #### Description When the module is loaded the messages have '\r\n' > INFO: statsd [statsd.c:87]: mod_init(): Statsd init ip value 127.0.0.1 #015 > INFO: statsd [statsd.c:93]: mod_init(): Statsd init port value 8125#015 > INFO: statsd [statsd.c:101]: mod_init(): Statsd: success connection to statsd server while at it, format the code with our clang-format definition You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2911 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2911/commits/fd9409e70401d31b16af…">statsd: clang-format</a> * <a href="https://github.com/kamailio/kamailio/pull/2911/commits/8fca0fb9bf4f83ba67fc…">statsd: remove '\r\n' from xlog messages</a> -- File Changes -- M src/modules/statsd/lib_statsd.c (209) M src/modules/statsd/lib_statsd.h (9) M src/modules/statsd/statsd.c (217) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2911.patch https://github.com/kamailio/kamailio/pull/2911.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/2911

2 2

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 + forking proxy results in wrong blf (Issue #2906)
by Alessio Garzi 29 Oct '21

29 Oct '21

### Description I have a problem with publish/notify messages generated from Kamailio towards a monitoring device after multiple branches has been created. When the call is forked by kamailio, invites are generated towards each callee user agent depending on how many branches we have in the call. When one of the callee user agents sends back 200 ok to enter the conversation, kamailio automatically sends a CANCEL towards the user agents that lost the race condition and didnt take the call. When this happens, a notify is set to the monitoring user agent with the state "terminated" but this is wrong since the call is up and we are in conversation. #### Reproduction 1. set up a monitoring device that subscribes to B events. 2. Register more than one device to B to make kamailio behave like a forking proxy 3. Call B and observe the notify message sent to the monitoring device, in particular the <dialog id="xxx" value ### Possible Solutions I think this can be solved just adding some random uuid inside the xml field sent inside the xml of the NOTIFY message: The random uuid must be different for each branch. ### Additional Information version: kamailio 5.5.1 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, NO_SIG_DEBUG, 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 10.2.1 * **Operating System**: No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye Linux sp1 5.10.0-9-amd64 #1 SMP Debian 5.10.70-1 (2021-09-30) 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/2906

2 1

[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

git:master:6b6fb023: pua_dialoginfo: generate uuid as id instead of use callid value
by Victor Seva 29 Oct '21

29 Oct '21

Module: kamailio Branch: master Commit: 6b6fb023e1a7cbd83a60b788af6d4dec97b7fcfd URL: https://github.com/kamailio/kamailio/commit/6b6fb023e1a7cbd83a60b788af6d4de… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-29T08:17:31+02:00 pua_dialoginfo: generate uuid as id instead of use callid value This change solves the issue of parallel forking, subscriber was receiving NOTIFY messages with the same id for different branches fixes #2906 --- Modified: src/modules/pua_dialoginfo/dialog_publish.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/6b6fb023e1a7cbd83a60b788af6d4de… Patch: https://github.com/kamailio/kamailio/commit/6b6fb023e1a7cbd83a60b788af6d4de…

1 0

git:master:1a30e472: ims_charging: include kemi.h to fix compile warning
by Daniel-Constantin Mierla 28 Oct '21

28 Oct '21

Module: kamailio Branch: master Commit: 1a30e472321c338987575bcc9feb73ad0150afd6 URL: https://github.com/kamailio/kamailio/commit/1a30e472321c338987575bcc9feb73a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-28T20:25:48+02:00 ims_charging: include kemi.h to fix compile warning --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/1a30e472321c338987575bcc9feb73a… Patch: https://github.com/kamailio/kamailio/commit/1a30e472321c338987575bcc9feb73a… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 6458a8070f..0a8c53f9d9 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -7,6 +7,7 @@ #include "../../core/socket_info.h" #include "../../core/timer.h" #include "../../core/locking.h" +#include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" #include "../../modules/ims_dialog/dlg_hash.h"

1 0

[kamailio/kamailio] cannot start on aarch64 with Google ASAN (Issue #2897)
by sergey-safarov 28 Oct '21

28 Oct '21

### Description I have compiled Kamailio on aarch64 hosts with Google ASAN. Also used system memory manager ("make MEMPKG=sys cfg"). During compilation used flags ``` -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment ``` When Kamailio is started with the default config file I get an error ``` core/script_cb.c:85:31: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' ``` As used 64 bit CPU, looks like a strange this error ### Additional Information compiled commit 102d5dab4f45cab238ffeb72e7ddf378c8daa17d * **Operating System**: ``` [root@logger-west kamailio]# uname -a Linux example.com 4.18.0-305.7.1.el8_4.aarch64 #1 SMP Tue Jun 29 21:32:00 UTC 2021 aarch64 aarch64 aarch64 GNU/Linux [root@logger-west kamailio]# lsb_release -a LSB Version: :core-4.1-aarch64:core-4.1-noarch Distributor ID: CentOS Description: CentOS Linux release 8.4.2105 Release: 8.4.2105 Codename: n/a ``` -- 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/2897

2 7

git:master:f7f9ea0f: core: hashes - cast to unsigned int for left shifting
by Daniel-Constantin Mierla 28 Oct '21

28 Oct '21

Module: kamailio Branch: master Commit: f7f9ea0f3cfb8e61a4f2f47a214cb4e89d713da4 URL: https://github.com/kamailio/kamailio/commit/f7f9ea0f3cfb8e61a4f2f47a214cb4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-28T17:54:19+02:00 core: hashes - cast to unsigned int for left shifting --- Modified: src/core/hashes.h --- Diff: https://github.com/kamailio/kamailio/commit/f7f9ea0f3cfb8e61a4f2f47a214cb4e… Patch: https://github.com/kamailio/kamailio/commit/f7f9ea0f3cfb8e61a4f2f47a214cb4e… --- diff --git a/src/core/hashes.h b/src/core/hashes.h index 2afb8361c8..62708bdb35 100644 --- a/src/core/hashes.h +++ b/src/core/hashes.h @@ -273,7 +273,7 @@ static inline unsigned int core_hash(const str *s1, const str *s2, end=s1->s+s1->len; for ( p=s1->s ; p<=(end-4) ; p+=4 ){ - v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + v=((unsigned int)p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; ch_h_inc; } v=0; @@ -283,11 +283,11 @@ static inline unsigned int core_hash(const str *s1, const str *s2, if (s2) { end=s2->s+s2->len; for (p=s2->s; p<=(end-4); p+=4){ - v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + v=((unsigned int)p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; ch_h_inc; } v=0; - for (; p<end ; p++){ v<<=8; v+=*p;} + for (; p<end ; p++){ v<<=8; v+=p[0];} ch_h_inc; } h=((h)+(h>>11))+((h>>13)+(h>>23));

1 0

[kamailio/kamailio] msrp: fix some tcpconn where memory was never cleaned up (PR #2890)
by Nacho G. 27 Oct '21

27 Oct '21

Thanks to Jason Shugart at INdigital. Fix consist of caring of removing references to previously retrieved tcp connections. GH #2880   #### 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 #2880 (replace XXXX with an open issue number) #### Description  Just do some missing `tcpconn_put` calls on MSRP module after a tcpconn_get. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2890 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2890/commits/19714ebaa0f653f65d83…">msrp: fix some tcpconn where memory was never cleaned up</a> -- File Changes -- M src/modules/msrp/msrp_netio.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2890.patch https://github.com/kamailio/kamailio/pull/2890.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/2890

2 5

git:master:77bc4c6c: Merge pull request #2890 from NGSegovia/msrp_tcp_mem_leak
by GitHub 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: 77bc4c6c96cfb2ce5b7086ccfffd19750b085d74 URL: https://github.com/kamailio/kamailio/commit/77bc4c6c96cfb2ce5b7086ccfffd197… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-27T15:18:49+02:00 Merge pull request #2890 from NGSegovia/msrp_tcp_mem_leak msrp: fix some tcpconn where memory was never cleaned up --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/77bc4c6c96cfb2ce5b7086ccfffd197… Patch: https://github.com/kamailio/kamailio/commit/77bc4c6c96cfb2ce5b7086ccfffd197… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index 92f7cf525b..859432aa6d 100644 --- a/src/modules/msrp/msrp_netio.c +++ b/src/modules/msrp/msrp_netio.c @@ -74,6 +74,7 @@ int msrp_relay(msrp_frame_t *mf) char *l; int port; sr_event_param_t evp = {0}; + int ret; if(mf->buf.len>=MSRP_MAX_FRAME_SIZE-1) return -1; @@ -169,12 +170,17 @@ int msrp_relay(msrp_frame_t *mf) wsev.len = p - reqbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); + tcpconn_put(con); return -1; } + + tcpconn_put(con); } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); @@ -195,6 +201,7 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) char *p; char *l; sr_event_param_t evp = {0}; + int ret; /* no reply for a reply */ if(mf->fline.msgtypeid==MSRP_REPLY) @@ -301,7 +308,9 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) wsev.len = p - rplbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(&env->srcinfo, 0, rplbuf, p - rplbuf) < 0) {

1 0

git:master:bf371ccb: msrp: fix some tcpconn where memory was never cleaned up
by Nacho Garcia Segovia 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: bf371ccbfa1c89fefcd9d9322ae75189d97fc862 URL: https://github.com/kamailio/kamailio/commit/bf371ccbfa1c89fefcd9d9322ae7518… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2021-10-22T10:38:48+02:00 msrp: fix some tcpconn where memory was never cleaned up Thanks to Jason Shugart at INdigital. Fix consist of caring of removing references to previously retrieved tcp connections. GH #2880 --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/bf371ccbfa1c89fefcd9d9322ae7518… Patch: https://github.com/kamailio/kamailio/commit/bf371ccbfa1c89fefcd9d9322ae7518… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index 92f7cf525b..859432aa6d 100644 --- a/src/modules/msrp/msrp_netio.c +++ b/src/modules/msrp/msrp_netio.c @@ -74,6 +74,7 @@ int msrp_relay(msrp_frame_t *mf) char *l; int port; sr_event_param_t evp = {0}; + int ret; if(mf->buf.len>=MSRP_MAX_FRAME_SIZE-1) return -1; @@ -169,12 +170,17 @@ int msrp_relay(msrp_frame_t *mf) wsev.len = p - reqbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); + tcpconn_put(con); return -1; } + + tcpconn_put(con); } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); @@ -195,6 +201,7 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) char *p; char *l; sr_event_param_t evp = {0}; + int ret; /* no reply for a reply */ if(mf->fline.msgtypeid==MSRP_REPLY) @@ -301,7 +308,9 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) wsev.len = p - rplbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(&env->srcinfo, 0, rplbuf, p - rplbuf) < 0) {

1 0

git:master:f8c484d4: modules: readme files regenerated - db_cluster ... [skip ci]
by Kamailio Dev 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: f8c484d464fd1de074da334eff5165c38d4c8ebd URL: https://github.com/kamailio/kamailio/commit/f8c484d464fd1de074da334eff5165c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-27T15:01:17+02:00 modules: readme files regenerated - db_cluster ... [skip ci] --- Modified: src/modules/db_cluster/README --- Diff: https://github.com/kamailio/kamailio/commit/f8c484d464fd1de074da334eff5165c… Patch: https://github.com/kamailio/kamailio/commit/f8c484d464fd1de074da334eff5165c… --- diff --git a/src/modules/db_cluster/README b/src/modules/db_cluster/README index 4e52d0ab24..7260f0f1aa 100644 --- a/src/modules/db_cluster/README +++ b/src/modules/db_cluster/README @@ -10,6 +10,10 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> +Frits Wiersma + + <frits.wiersma(a)isp.solcon.nl> + Copyright © 2012 asipto.com __________________________________________________________________ @@ -31,6 +35,12 @@ Daniel-Constantin Mierla 3.4. max_query_length (int) 4. Usage + 5. RPC Commands + + 5.1. dbcl.list_clusters + 5.2. dbcl.list_connections + 5.3. dbcl.disable_connection + 5.4. dbcl.enable_connection List of Examples @@ -58,6 +68,12 @@ Chapter 1. Admin Guide 3.4. max_query_length (int) 4. Usage + 5. RPC Commands + + 5.1. dbcl.list_clusters + 5.2. dbcl.list_connections + 5.3. dbcl.disable_connection + 5.4. dbcl.enable_connection 1. Overview @@ -204,3 +220,58 @@ modparam("acc", "db_url", "cluster://k1") modparam("sqlops", "sqlcon", "ca=>cluster://k1") ... + +5. RPC Commands + + 5.1. dbcl.list_clusters + 5.2. dbcl.list_connections + 5.3. dbcl.disable_connection + 5.4. dbcl.enable_connection + +5.1. dbcl.list_clusters + + Lists all database clusters. + + Name: dbcl.list_clusters + + RPC Command Format: +... +kamcmd dbcl.list_clusters +... + +5.2. dbcl.list_connections + + Lists all database connections of a specific cluster. + + Name: dbcl.list_connections + + RPC Command Format: +... +kamcmd dbcl.list_connections clustername +... + +5.3. dbcl.disable_connection + + Disable a database connection of a specific cluster for a period. The + database connection remains open but will not be used for the specified + period (seconds). The command does not allow to close all database + connections of the specific cluster. If the database connection is + already disabled than the new period will overwrite the old period. + + Name: dbcl.disable_connection + + RPC Command Format: +... +kamcmd dbcl.disable_connection clustername connectionname period +... + +5.4. dbcl.enable_connection + + Enable a database connection of a specific cluster. + + Name: dbcl.enable_connection + + RPC Command Format: +... +kamcmd dbcl.enable_connection clustername connectionname +...

1 0

[kamailio/kamailio] db_cluster: RPC commands to control database connections (PR #2893)
by Frits Wiersma 27 Oct '21

27 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x ] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The database cluster modules (db_cluster) does not allow manual controle over database connections in the cluster. This change adds some rpc commands to allow this. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2893 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2893/commits/a58e7a235c1300cfbdaf…">db_cluster: RPC commands to control database connections</a> -- File Changes -- M src/modules/db_cluster/db_cluster_mod.c (249) M src/modules/db_cluster/dbcl_data.c (33) M src/modules/db_cluster/dbcl_data.h (5) M src/modules/db_cluster/doc/db_cluster.xml (5) M src/modules/db_cluster/doc/db_cluster_admin.xml (61) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2893.patch https://github.com/kamailio/kamailio/pull/2893.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/2893

2 2

git:master:2c2dbcb1: Merge pull request #2893 from CFrits/master
by GitHub 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: 2c2dbcb1336b447322bb74fcbd5303d9acde842c URL: https://github.com/kamailio/kamailio/commit/2c2dbcb1336b447322bb74fcbd5303d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-27T14:52:20+02:00 Merge pull request #2893 from CFrits/master db_cluster: RPC commands to control database connections --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_data.c Modified: src/modules/db_cluster/dbcl_data.h Modified: src/modules/db_cluster/doc/db_cluster.xml Modified: src/modules/db_cluster/doc/db_cluster_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2c2dbcb1336b447322bb74fcbd5303d… Patch: https://github.com/kamailio/kamailio/commit/2c2dbcb1336b447322bb74fcbd5303d…

1 0

git:master:a58e7a23: db_cluster: RPC commands to control database connections
by CFrits 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: a58e7a235c1300cfbdafe22e5c3c830a678d3d26 URL: https://github.com/kamailio/kamailio/commit/a58e7a235c1300cfbdafe22e5c3c830… Author: CFrits <frits.wiersma(a)isp.solcon.nl> Committer: CFrits <frits.wiersma(a)isp.solcon.nl> Date: 2021-10-21T19:44:18+02:00 db_cluster: RPC commands to control database connections - Add rpc commands to list, enable or disable database connections of a cluster. --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_data.c Modified: src/modules/db_cluster/dbcl_data.h Modified: src/modules/db_cluster/doc/db_cluster.xml Modified: src/modules/db_cluster/doc/db_cluster_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a58e7a235c1300cfbdafe22e5c3c830… Patch: https://github.com/kamailio/kamailio/commit/a58e7a235c1300cfbdafe22e5c3c830…

1 0

[kamailio/kamailio] github/workflow: add CIFuzz integration (PR #2903)
by DavidKorczynski 27 Oct '21

27 Oct '21

Add CIFuzz workflow action to have fuzzers build and run on each PR. This is a service offered by OSS-Fuzz, on which Kamailio already runs. Signed-off-by: David Korczynski <david(a)adalogics.com>   #### 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) - [x ] 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  Add CIFuzz Github action to build and run fuzzers on pull requests. This will run the fuzzers for 600 seconds (split between all the fuzzers) in the CI when a pull request is made and is a service by OSS-fuzz. It can help with catching bugs early and catch regressions. Documentation for CIFuzz can be found here: https://google.github.io/oss-fuzz/getting-started/continuous-integration/ You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2903 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2903/commits/f10ba5c9e81f0ae0f2f6…">github/workflow: add CIFuzz integration</a> -- File Changes -- A .github/workflows/cifuzz.yml (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2903.patch https://github.com/kamailio/kamailio/pull/2903.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/2903

2 2

git:master:88af7f7f: Merge pull request #2903 from DavidKorczynski/cifuzz
by GitHub 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: 88af7f7fa91eb864ed57c2331bff05a9062f630e URL: https://github.com/kamailio/kamailio/commit/88af7f7fa91eb864ed57c2331bff05a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-27T14:29:35+02:00 Merge pull request #2903 from DavidKorczynski/cifuzz github/workflow: add CIFuzz integration --- Added: .github/workflows/cifuzz.yml --- Diff: https://github.com/kamailio/kamailio/commit/88af7f7fa91eb864ed57c2331bff05a… Patch: https://github.com/kamailio/kamailio/commit/88af7f7fa91eb864ed57c2331bff05a… --- diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml new file mode 100644 index 0000000000..948ab18b88 --- /dev/null +++ b/.github/workflows/cifuzz.yml @@ -0,0 +1,26 @@ +name: CIFuzz +on: [pull_request] +jobs: + Fuzzing: + runs-on: ubuntu-latest + steps: + - name: Build Fuzzers + id: build + uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master + with: + oss-fuzz-project-name: 'kamailio' + dry-run: false + language: c + - name: Run Fuzzers + uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master + with: + oss-fuzz-project-name: 'kamailio' + fuzz-seconds: 600 + dry-run: false + language: c + - name: Upload Crash + uses: actions/upload-artifact@v1 + if: failure() && steps.build.outcome == 'success' + with: + name: artifacts + path: ./out/artifacts

1 0

git:master:f10ba5c9: github/workflow: add CIFuzz integration
by David Korczynski 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: f10ba5c9e81f0ae0f2f6efc9c721ced5ce5207c0 URL: https://github.com/kamailio/kamailio/commit/f10ba5c9e81f0ae0f2f6efc9c721ced… Author: David Korczynski <david(a)adalogics.com> Committer: David Korczynski <david(a)adalogics.com> Date: 2021-10-27T11:26:15+01:00 github/workflow: add CIFuzz integration Add CIFuzz workflow action to have fuzzers build and run on each PR. This is a service offered by OSS-Fuzz, on which Kamailio already runs. Signed-off-by: David Korczynski <david(a)adalogics.com> --- Added: .github/workflows/cifuzz.yml --- Diff: https://github.com/kamailio/kamailio/commit/f10ba5c9e81f0ae0f2f6efc9c721ced… Patch: https://github.com/kamailio/kamailio/commit/f10ba5c9e81f0ae0f2f6efc9c721ced… --- diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml new file mode 100644 index 0000000000..948ab18b88 --- /dev/null +++ b/.github/workflows/cifuzz.yml @@ -0,0 +1,26 @@ +name: CIFuzz +on: [pull_request] +jobs: + Fuzzing: + runs-on: ubuntu-latest + steps: + - name: Build Fuzzers + id: build + uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master + with: + oss-fuzz-project-name: 'kamailio' + dry-run: false + language: c + - name: Run Fuzzers + uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master + with: + oss-fuzz-project-name: 'kamailio' + fuzz-seconds: 600 + dry-run: false + language: c + - name: Upload Crash + uses: actions/upload-artifact@v1 + if: failure() && steps.build.outcome == 'success' + with: + name: artifacts + path: ./out/artifacts

1 0

git:master:a4b88342: etc: kamailio.cfg - updated version in comments
by Daniel-Constantin Mierla 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: a4b88342d2c715a151ef032996d1b71a482be00b URL: https://github.com/kamailio/kamailio/commit/a4b88342d2c715a151ef032996d1b71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-27T13:24:59+02:00 etc: kamailio.cfg - updated version in comments --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/a4b88342d2c715a151ef032996d1b71… Patch: https://github.com/kamailio/kamailio/commit/a4b88342d2c715a151ef032996d1b71… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index c349fcf65c..56c1ea791e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,6 +1,6 @@ #!KAMAILIO # -# Kamailio SIP Server v5.5 - default configuration script +# Kamailio SIP Server v5.6 - default configuration script # - web: https://www.kamailio.org # - git: https://github.com/kamailio/kamailio #

1 0

TLS trouble
by Lorenzo Campo 26 Oct '21

26 Oct '21

Hi guys, We are quite newby about Kamailio and we are trying to use it as a load balancer. While installing certificates we started having problems. We use Kamailio (vers. 5.5) deployed on a VM (Ubuntu, 20.04 LTS). We cannot connect via TLS Kamailio VM with clients or other TCP VM. Our Kamailio currently exposes only port 5060 in UDP and TCP. Even doing a port scan on localhost, port 5061, used for the TLS protocol, is instead closed. There are 3 things worth noting: - All ports for all protocols are open on the firewall; - Before we set the disable_tcp option to "no", the 5060 was only reachable in UDP; - Even if you put a non-existent certificate, the system does not return an error so we cannot understand if the goodness of the certificates affects the opening of the door. Furthermore, we did not find any different behavior when switching from crt format (key for the private key) to PEM. If someone can help us would be very appreciated. Thank you very much Here is our tls configuration: kamailio.cfg #!define WITH_TLS 1 ... disable_tcp=no auto_aliases=no …. loadmodule "sl.so" loadmodule "tls.so" ... modparam("tls", "private_key", "/etc/kamailio/key.pem") modparam("tls", "certificate", "/etc/kamailio/crt.pem") modparam("tls", "ca_list", "/etc/kamailio/ca.pem") enable_tls=yes tls.config [server:default] method = TLSv1.2+ verify_certificate = no require_certificate = no private_key = /etc/kamailio/kamailio-selfsigned.key certificate = /etc/kamailio/kamailio-selfsigned.pem #ca_list = /etc/kamailio/tls/cacert.pem #crl = /etc/kamailio/tls/crl.pem [client:default] #method = TLSv1.2+ verify_certificate = no require_certificate = no *Sent with Shift <https://tryshift.com/?utm_source=SentWithShift&utm_campaign=Sent+with+Shift…>*

2 1

git:master:b11a9835: etc: kamailio.cfg - added pplsip to user-agent list to drop
by Daniel-Constantin Mierla 26 Oct '21

26 Oct '21

Module: kamailio Branch: master Commit: b11a9835778cd2ddb60e743b8b8b2f1ff54ccdcc URL: https://github.com/kamailio/kamailio/commit/b11a9835778cd2ddb60e743b8b8b2f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-26T08:23:59+02:00 etc: kamailio.cfg - added pplsip to user-agent list to drop --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b11a9835778cd2ddb60e743b8b8b2f1… Patch: https://github.com/kamailio/kamailio/commit/b11a9835778cd2ddb60e743b8b8b2f1… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index be71dbb54a..c349fcf65c 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -615,7 +615,7 @@ route[REQINIT] { } } #!endif - if($ua =~ "friendly|scanner|sipcli|sipvicious|VaxSIPUserAgent") { + if($ua =~ "friendly|scanner|sipcli|sipvicious|VaxSIPUserAgent|pplsip") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit;

1 0

git:master:dfafbf6d: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: dfafbf6dc1269a059b4d7f90274288070cc5e9c9 URL: https://github.com/kamailio/kamailio/commit/dfafbf6dc1269a059b4d7f902742880… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-25T19:31:14+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/dfafbf6dc1269a059b4d7f902742880… Patch: https://github.com/kamailio/kamailio/commit/dfafbf6dc1269a059b4d7f902742880… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index 411653a92a..6216f40e19 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -37,14 +37,14 @@ Daniel-Constantin Mierla 2.16. hf_value_exists(hf, hvalue) 2.17. hf_iterator_start(iname) 2.18. hf_iterator_end(iname) - 2.19. textopsx.f.hf_iterator_next(iname) - 2.20. textopsx.f.hf_iterator_prev(iname) + 2.19. hf_iterator_next(iname) + 2.20. hf_iterator_prev(iname) 2.21. hf_iterator_rm(iname) 2.22. hf_iterator_append(iname, htext) 2.23. hf_iterator_insert(iname, htext) 2.24. bl_iterator_start(iname) 2.25. bl_iterator_end(iname) - 2.26. textopsx.f.bl_iterator_next(iname) + 2.26. bl_iterator_next(iname) 2.27. bl_iterator_rm(iname) 2.28. bl_iterator_append(iname, text) 2.29. bl_iterator_insert(iname, text) @@ -113,14 +113,14 @@ Chapter 1. Admin Guide 2.16. hf_value_exists(hf, hvalue) 2.17. hf_iterator_start(iname) 2.18. hf_iterator_end(iname) - 2.19. textopsx.f.hf_iterator_next(iname) - 2.20. textopsx.f.hf_iterator_prev(iname) + 2.19. hf_iterator_next(iname) + 2.20. hf_iterator_prev(iname) 2.21. hf_iterator_rm(iname) 2.22. hf_iterator_append(iname, htext) 2.23. hf_iterator_insert(iname, htext) 2.24. bl_iterator_start(iname) 2.25. bl_iterator_end(iname) - 2.26. textopsx.f.bl_iterator_next(iname) + 2.26. bl_iterator_next(iname) 2.27. bl_iterator_rm(iname) 2.28. bl_iterator_append(iname, text) 2.29. bl_iterator_insert(iname, text) @@ -161,14 +161,14 @@ Chapter 1. Admin Guide 2.16. hf_value_exists(hf, hvalue) 2.17. hf_iterator_start(iname) 2.18. hf_iterator_end(iname) - 2.19. textopsx.f.hf_iterator_next(iname) - 2.20. textopsx.f.hf_iterator_prev(iname) + 2.19. hf_iterator_next(iname) + 2.20. hf_iterator_prev(iname) 2.21. hf_iterator_rm(iname) 2.22. hf_iterator_append(iname, htext) 2.23. hf_iterator_insert(iname, htext) 2.24. bl_iterator_start(iname) 2.25. bl_iterator_end(iname) - 2.26. textopsx.f.bl_iterator_next(iname) + 2.26. bl_iterator_next(iname) 2.27. bl_iterator_rm(iname) 2.28. bl_iterator_append(iname, text) 2.29. bl_iterator_insert(iname, text) @@ -509,10 +509,10 @@ hf_iterator_start("i1"); hf_iterator_end("i1"); ... -2.19. textopsx.f.hf_iterator_next(iname) +2.19. hf_iterator_next(iname) Move the iterator to the next header. It must be called also after - bl_iterator_start() to get the first header. + hf_iterator_start() to get the first header. The return code is false when there is no other header in the list. @@ -532,7 +532,7 @@ hf_iterator_end("i1"); hf_iterator_end("i1"); ... -2.20. textopsx.f.hf_iterator_prev(iname) +2.20. hf_iterator_prev(iname) Move the iterator to the previous header. It must be called also after hf_iterator_start() and hf_iterator_next(). @@ -641,7 +641,7 @@ bl_iterator_start("b1"); bl_iterator_end("b1"); ... -2.26. textopsx.f.bl_iterator_next(iname) +2.26. bl_iterator_next(iname) Move the iterator to the next line in the body. It must be called also after bl_iterator_start() to get the first header.

1 0

git:master:01434fa8: textopsx: docs - fixed title for sections
by Daniel-Constantin Mierla 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: 01434fa89bac3174ff68c08cf776dc73abb2eb2d URL: https://github.com/kamailio/kamailio/commit/01434fa89bac3174ff68c08cf776dc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T19:23:08+02:00 textopsx: docs - fixed title for sections --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/01434fa89bac3174ff68c08cf776dc7… Patch: https://github.com/kamailio/kamailio/commit/01434fa89bac3174ff68c08cf776dc7… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index 3de3a6c8e6..7500cbaa85 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -559,11 +559,11 @@ hf_iterator_end("i1"); </section> <section id="textopsx.f.hf_iterator_next"> <title> - <function moreinfo="none">textopsx.f.hf_iterator_next(iname)</function> + <function moreinfo="none">hf_iterator_next(iname)</function> </title> <para> Move the iterator to the next header. It must - be called also after bl_iterator_start() to get the first + be called also after hf_iterator_start() to get the first header. </para> <para> @@ -594,7 +594,7 @@ hf_iterator_end("i1"); </section> <section id="textopsx.f.hf_iterator_prev"> <title> - <function moreinfo="none">textopsx.f.hf_iterator_prev(iname)</function> + <function moreinfo="none">hf_iterator_prev(iname)</function> </title> <para> Move the iterator to the previous header. It must @@ -757,7 +757,7 @@ bl_iterator_end("b1"); </section> <section id="textopsx.f.bl_iterator_next"> <title> - <function moreinfo="none">textopsx.f.bl_iterator_next(iname)</function> + <function moreinfo="none">bl_iterator_next(iname)</function> </title> <para> Move the iterator to the next line in the body. It must

1 0

SIPtrace: Blocking processes
by Olle E. Johansson 25 Oct '21

25 Oct '21

Hi! I just stumbled into a hard-to-find problem with Kamailio. The symtom was that Kamailio simply did not read a lot of incoming messages, so they did not get any response. We saw traffic coming in on the interface with tcpdump, but not in the kamailio logs. Restarting Kamailio solved the problem for a while, then it started again. I noticed there was something related to the DB, so for testing I disabled all db-based functions, but missed siptrace that connected and operated in the background by the config settings, nothing in the routing script. I finally traced the problem to the siptrace module. The db table had grown way too big (due to attacks) and adding new records to it took way too much time. During that time, with SIPtrace waiting for confirmation, the process locked and packets where dropped. Kamailio still handled calls, but a lot of calls was dropped. I will solve this shortly by setting up a parallell smaller Kamailio that logs to database instead of running siptrace with DB in a production server. But in order for others not to find themselves in this very hard to find situation, is there something that can be done to the siptrace code so it doesn’t execute in the same process that listens for incoming SIP messages? It would be a huge improvement to just block a background process so that siptrace doesn’t work, instead of blocking a listen process and drop traffic. I don’t think I can write that code. Sorry. Otherwise it would have been a high priority, because these problems in production drove me almost insane. Restarting - all works fine. After a few hours the first packets are lost. Calls getting through for some customers all of the time. Sorry for a long post, but I want this in the archives to help others. Regards, /O

2 1

[kamailio/kamailio] CDP / IMS Diameter Server Module- event_route[diameter:response] fails to receive/forward response (Issue #2900)
by w415384914 25 Oct '21

25 Oct '21

I config ims_diameter_server as below: ``` #!ifdef WITH_DIAMETER_SERVER # IMS_DIAMETER_SERVER event_route[diameter:request]{ xlog("L_INFO","ims Got diameter message"); # diameter_request("hss.ims.mnc001.mcc001.3gppnetwork.org", $diameter_application, $diameter_command, $diameter_request); diameter_request_async("hss.ims.mnc001.mcc001.3gppnetwork.org", $diameter_application, $diameter_command, $diameter_request); xlog("L_INFO","ims Forwarded Diameter Request"); } event_route[diameter:response] { xlog("L_INFO","ims Reply to Diameter request is $diameter_response\n"); } #!endif ``` And got a response from hss: ![image](https://user-images.githubusercontent.com/10116705/138629415-dd7f6266-7801-4ed3-8922-a0b9cba4089a.png) but got <null> response in log: > 90(124) INFO: <script>: ims Got diameter message90(124) DEBUG: ims_diameter_server [avp_helper.c:59]: avp2json(): AVP((nil) < 0x7f44c2ad16f0 >0x7f44c2ad0c08);code=263,flags=40; > 89(123) INFO: <script>: ims Reply to Diameter request is <null> $diameter_response is <null>, why, how to fix it? -- 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/2900

2 2

git:master:6348de19: core: unsigned literal for 1 used in left shifting for script callbacks
by Daniel-Constantin Mierla 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: 6348de19626f691036fd94134be6f64fff4418ed URL: https://github.com/kamailio/kamailio/commit/6348de19626f691036fd94134be6f64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T15:11:29+02:00 core: unsigned literal for 1 used in left shifting for script callbacks - GH #2897 --- Modified: src/core/script_cb.c Modified: src/core/script_cb.h --- Diff: https://github.com/kamailio/kamailio/commit/6348de19626f691036fd94134be6f64… Patch: https://github.com/kamailio/kamailio/commit/6348de19626f691036fd94134be6f64… --- diff --git a/src/core/script_cb.c b/src/core/script_cb.c index 2f83608e66..266037674a 100644 --- a/src/core/script_cb.c +++ b/src/core/script_cb.c @@ -78,11 +78,11 @@ int register_script_cb( cb_function f, unsigned int flags, void *param ) int i; /* type checkings */ - if ( (flags&((1<<SCRIPT_CB_NUM)-1))==0 ) { + if ( (flags&((1u<<SCRIPT_CB_NUM)-1))==0 ) { LM_BUG("callback flag not specified\n"); return -1; } - if ( (flags&(~(PRE_SCRIPT_CB|POST_SCRIPT_CB))) >= 1<<SCRIPT_CB_NUM ) { + if ( (flags&(~(PRE_SCRIPT_CB|POST_SCRIPT_CB))) >= 1u<<SCRIPT_CB_NUM ) { LM_BUG("unsupported callback flags: %u\n", flags); return -1; @@ -102,7 +102,7 @@ int register_script_cb( cb_function f, unsigned int flags, void *param ) * (as many times as many flags are set) */ for (i=0; i<SCRIPT_CB_NUM; i++) { - if ((flags&(1<<i)) == 0) + if ((flags&(1u<<i)) == 0) continue; if (add_callback(&cb_array[i], f, param) < 0) goto add_error; @@ -155,7 +155,7 @@ int exec_pre_script_cb( struct sip_msg *msg, enum script_cb_type type) return 0; } - flags = PRE_SCRIPT_CB | (1<<(type-1)); + flags = PRE_SCRIPT_CB | (1u<<(type-1)); for (cb=pre_script_cb[type-1]; cb ; cb=cb->next ) { /* stop on error */ if (cb->cbf(msg, flags, cb->param)==0) @@ -177,7 +177,7 @@ int exec_post_script_cb( struct sip_msg *msg, enum script_cb_type type) return 1; } - flags = POST_SCRIPT_CB | (1<<(type-1)); + flags = POST_SCRIPT_CB | (1u<<(type-1)); for (cb=post_script_cb[type-1]; cb ; cb=cb->next){ cb->cbf(msg, flags, cb->param); } diff --git a/src/core/script_cb.h b/src/core/script_cb.h index ece69b8e41..650bf053fa 100644 --- a/src/core/script_cb.h +++ b/src/core/script_cb.h @@ -33,8 +33,8 @@ typedef int (cb_function)(struct sip_msg *msg, unsigned int flags, void *param); -#define PRE_SCRIPT_CB (1<<30) -#define POST_SCRIPT_CB (1<<31) +#define PRE_SCRIPT_CB (1u<<30) +#define POST_SCRIPT_CB (1u<<31) /* Pre- and post-script callback flags. Use these flags to register * for the callbacks, and to check the type of the callback from the

1 0

git:5.5:158f794d: uac: fixing REGISTER to use custom socket after 401/407
by Daniel-Constantin Mierla 25 Oct '21

25 Oct '21

Module: kamailio Branch: 5.5 Commit: 158f794d07890f0f237683ece880dd123be7dbbf URL: https://github.com/kamailio/kamailio/commit/158f794d07890f0f237683ece880dd1… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T14:49:36+02:00 uac: fixing REGISTER to use custom socket after 401/407 - After receiving 401/407 uac does not use configured custom socket, second register send from first available address. (cherry picked from commit ea4d7fee43269ed50a55c444a0efdcc0dd64a95c) --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/158f794d07890f0f237683ece880dd1… Patch: https://github.com/kamailio/kamailio/commit/158f794d07890f0f237683ece880dd1… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index c36ee8ac822..f96f1ca0614 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1011,6 +1011,20 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) uac_r.cb = uac_reg_tm_callback; /* Callback parameter */ uac_r.cbp = (void*)uuid; + + if(ri->socket.s != NULL && ri->socket.len > 0) { + /* custom socket */ + LM_DBG("using custom socket %.*s to send request\n", + ri->socket.len, ri->socket.s); + uac_r.ssock = &ri->socket; + } else { + /* default socket */ + if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { + LM_DBG("using configured default_socket to send request\n"); + uac_r.ssock = &uac_default_socket; + } + } + ret = uac_tmb.t_request_within(&uac_r); if(ret<0) {

1 0

git:master:cc0cbad3: ctl: removed unused function safe_write()
by Daniel-Constantin Mierla 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: cc0cbad3660423f679fed62c42fcffb4a402081f URL: https://github.com/kamailio/kamailio/commit/cc0cbad3660423f679fed62c42fcffb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T14:45:28+02:00 ctl: removed unused function safe_write() --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/cc0cbad3660423f679fed62c42fcffb… Patch: https://github.com/kamailio/kamailio/commit/cc0cbad3660423f679fed62c42fcffb… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index b40b079a1d..50507dd03b 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -947,29 +947,6 @@ static void rpc_fault(rpc_ctx_t* ctx, int code, char* fmt, ...) } -static inline int safe_write(FILE* f, char* fmt, ...) -{ - va_list ap; - - if (!*fmt) return 0; - va_start(ap, fmt); - - retry: - /* First line containing code and reason phrase */ - if (vfprintf(f, fmt, ap) <= 0) { - ERR("fifo write error: %s\n", strerror(errno)); - if ((errno == EINTR) || (errno == EAGAIN) || (errno == EWOULDBLOCK)) { - goto retry; - } - va_end(ap); - return -1; - } - va_end(ap); - return 0; -} - - - inline static int build_iovec(rpc_ctx_t* ctx, struct iovec* v, int v_size) { struct text_chunk* p;

1 0

git:master:c9b885ff: avpops: removed unused function get_source_uri()
by Daniel-Constantin Mierla 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: c9b885ff791bd71fcbf40824369fc9369dcc6e48 URL: https://github.com/kamailio/kamailio/commit/c9b885ff791bd71fcbf40824369fc93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T14:43:17+02:00 avpops: removed unused function get_source_uri() --- Modified: src/modules/avpops/avpops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/c9b885ff791bd71fcbf40824369fc93… Patch: https://github.com/kamailio/kamailio/commit/c9b885ff791bd71fcbf40824369fc93… --- diff --git a/src/modules/avpops/avpops_impl.c b/src/modules/avpops/avpops_impl.c index c760becb43..8a6e4c2b2d 100644 --- a/src/modules/avpops/avpops_impl.c +++ b/src/modules/avpops/avpops_impl.c @@ -214,38 +214,6 @@ static int dbrow2avp(struct db_row *row, struct db_param *dbp, int_str attr, return add_avp( (unsigned short)db_flags, avp_attr, avp_val); } - -inline static str* get_source_uri(struct sip_msg* msg,int source) -{ - /* which uri will be used? */ - if (source&AVPOPS_USE_FROM) - { /* from */ - if (parse_from_header( msg )<0 ) - { - LM_ERR("failed to parse from\n"); - goto error; - } - return &(get_from(msg)->uri); - } else if (source&AVPOPS_USE_TO) - { /* to */ - if (parse_headers( msg, HDR_TO_F, 0)<0) - { - LM_ERR("failed to parse to\n"); - goto error; - } - return &(get_to(msg)->uri); - } else if (source&AVPOPS_USE_RURI) { /* RURI */ - if(msg->new_uri.s!=NULL && msg->new_uri.len>0) - return &(msg->new_uri); - return &(msg->first_line.u.request.uri); - } else { - LM_ERR("unknown source <%d>\n", source); - goto error; - } -error: - return 0; -} - static inline void int_str2db_val( int_str is_val, str *val, int is_s) { if (is_s)

1 0

[kamailio/kamailio] i want write smpp server module (Issue #2899)
by tarikogut 25 Oct '21

25 Oct '21

hello i want write smpp module do you have any documentation ?* -- 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/2899

2 2

[kamailio/kamailio] uac: fixing REGISTER to use custom socket after 401/407 (PR #2902)
by Dennis 25 Oct '21

25 Oct '21

- After receiving 401/407 uac does not use configured custom socket, second register send from first available address.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description uac module does not use configured custom socket when send second REGISTER after receiving 401/407, so packet send via first suitable socket in config with wrong source address, some carriers drops this packets because they have configured ACLs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2902 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2902/commits/ea4d7fee43269ed50a55…">uac: fixing REGISTER to use custom socket after 401/407</a> -- File Changes -- M src/modules/uac/uac_reg.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2902.patch https://github.com/kamailio/kamailio/pull/2902.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/2902

2 2

git:master:306489e8: Merge pull request #2902 from Den4t/master
by GitHub 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: 306489e82ae37ab3788808745a465ef438fb929f URL: https://github.com/kamailio/kamailio/commit/306489e82ae37ab3788808745a465ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-25T14:31:24+02:00 Merge pull request #2902 from Den4t/master uac: fixing REGISTER to use custom socket after 401/407 --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/306489e82ae37ab3788808745a465ef… Patch: https://github.com/kamailio/kamailio/commit/306489e82ae37ab3788808745a465ef… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 1ea1b62135..85fe266c92 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1011,6 +1011,20 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) uac_r.cb = uac_reg_tm_callback; /* Callback parameter */ uac_r.cbp = (void*)uuid; + + if(ri->socket.s != NULL && ri->socket.len > 0) { + /* custom socket */ + LM_DBG("using custom socket %.*s to send request\n", + ri->socket.len, ri->socket.s); + uac_r.ssock = &ri->socket; + } else { + /* default socket */ + if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { + LM_DBG("using configured default_socket to send request\n"); + uac_r.ssock = &uac_default_socket; + } + } + ret = uac_tmb.t_request_within(&uac_r); if(ret<0) {

1 0

git:master:ea4d7fee: uac: fixing REGISTER to use custom socket after 401/407
by Dennis Yurasov 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: ea4d7fee43269ed50a55c444a0efdcc0dd64a95c URL: https://github.com/kamailio/kamailio/commit/ea4d7fee43269ed50a55c444a0efdcc… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2021-10-25T13:34:14+03:00 uac: fixing REGISTER to use custom socket after 401/407 - After receiving 401/407 uac does not use configured custom socket, second register send from first available address. --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/ea4d7fee43269ed50a55c444a0efdcc… Patch: https://github.com/kamailio/kamailio/commit/ea4d7fee43269ed50a55c444a0efdcc… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 1ea1b62135..85fe266c92 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1011,6 +1011,20 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) uac_r.cb = uac_reg_tm_callback; /* Callback parameter */ uac_r.cbp = (void*)uuid; + + if(ri->socket.s != NULL && ri->socket.len > 0) { + /* custom socket */ + LM_DBG("using custom socket %.*s to send request\n", + ri->socket.len, ri->socket.s); + uac_r.ssock = &ri->socket; + } else { + /* default socket */ + if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { + LM_DBG("using configured default_socket to send request\n"); + uac_r.ssock = &uac_default_socket; + } + } + ret = uac_tmb.t_request_within(&uac_r); if(ret<0) {

1 0

[kamailio/kamailio] presence: fix build (PR #2901)
by Stefan Mititelu 25 Oct '21

25 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fix build for 5.3 branch, presence module. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2901 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2901/commits/420173265bbcd484deeb…">presence: fix build</a> -- File Changes -- M src/modules/presence/presence_dmq.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2901.patch https://github.com/kamailio/kamailio/pull/2901.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/2901

3 3

git:5.3:42017326: presence: fix build
by Stefan Mititelu 25 Oct '21

25 Oct '21

Module: kamailio Branch: 5.3 Commit: 420173265bbcd484deeb289f2d7009c3a6bb3294 URL: https://github.com/kamailio/kamailio/commit/420173265bbcd484deeb289f2d7009c… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2021-10-25T10:00:21+03:00 presence: fix build --- Modified: src/modules/presence/presence_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/420173265bbcd484deeb289f2d7009c… Patch: https://github.com/kamailio/kamailio/commit/420173265bbcd484deeb289f2d7009c… --- diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 8dd7c99fe8..a9ed2f2f4e 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -102,7 +102,7 @@ static int pres_dmq_init_proc() } } - if(publ_cache_mode==PS_PCACHE_RECORD && pres_subs_dbmode==NO_DB) { + if(publ_cache_enabled && subs_dbmode==NO_DB) { goto finish; }

1 0

git:5.3:eee27448: Merge pull request #2901 from smititelu/5.3
by GitHub 25 Oct '21

25 Oct '21

Module: kamailio Branch: 5.3 Commit: eee27448e603d554b1486376909947995c94d207 URL: https://github.com/kamailio/kamailio/commit/eee27448e603d554b14863769099479… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-25T09:11:46+02:00 Merge pull request #2901 from smititelu/5.3 presence: fix build --- Modified: src/modules/presence/presence_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/eee27448e603d554b14863769099479… Patch: https://github.com/kamailio/kamailio/commit/eee27448e603d554b14863769099479… --- diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 8dd7c99fe8..a9ed2f2f4e 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -102,7 +102,7 @@ static int pres_dmq_init_proc() } } - if(publ_cache_mode==PS_PCACHE_RECORD && pres_subs_dbmode==NO_DB) { + if(publ_cache_enabled && subs_dbmode==NO_DB) { goto finish; }

1 0

git:5.4:c09e6453: core: tcp - add alias for cinfo dst IP
by Federico Cabiddu 24 Oct '21

24 Oct '21

Module: kamailio Branch: 5.4 Commit: c09e6453db91cc71b1d853b05601a53869718550 URL: https://github.com/kamailio/kamailio/commit/c09e6453db91cc71b1d853b05601a53… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2021-10-24T11:12:17+02:00 core: tcp - add alias for cinfo dst IP (cherry picked from commit 110200ce8e5c4cf7500e57e27a23f76e18044ad5) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/c09e6453db91cc71b1d853b05601a53… Patch: https://github.com/kamailio/kamailio/commit/c09e6453db91cc71b1d853b05601a53… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 84fec376a3..f657b05571 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1478,7 +1478,12 @@ inline static struct tcp_connection* tcpconn_add(struct tcp_connection *c) * the second alias is for (peer_ip, peer_port, local_addr, 0) -- for * finding any conenction to peer_ip, peer_port from local_addr * the third alias is for (peer_ip, peer_port, local_addr, local_port) - * -- for finding if a fully specified connection exists */ + * -- for finding if a fully specified connection exists + * the fourth alias is for (peer_ip, peer_port, cinfo_addr, 0) -- for + * finding any connection to peer_ip, peer_port from address stored into cinfo (e.g. when proxy protocol is used) + * the fifth alias is for (peer_ip, peer_port, cinfo_addr, cinfo_port) + * -- for finding if a fully specified connection exists using address + * and port stored into cinfo*/ _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &zero_ip, 0, new_conn_alias_flags); if (likely(c->rcv.dst_ip.af && ! ip_addr_any(&c->rcv.dst_ip))){ @@ -1487,6 +1492,14 @@ inline static struct tcp_connection* tcpconn_add(struct tcp_connection *c) _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &c->rcv.dst_ip, c->rcv.dst_port, new_conn_alias_flags); } + if (unlikely(c->cinfo.dst_ip.af && ! ip_addr_any(&c->cinfo.dst_ip) && + ! ip_addr_cmp(&c->rcv.dst_ip, &c->cinfo.dst_ip))){ + _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &c->cinfo.dst_ip, 0, + new_conn_alias_flags); + _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &c->cinfo.dst_ip, c->cinfo.dst_port, + new_conn_alias_flags); + } + /* ignore add_alias errors, there are some valid cases when one * of the add_alias would fail (e.g. first add_alias for 2 connections * with the same destination but different src. ip*/ @@ -1604,7 +1617,8 @@ struct tcp_connection* _tcpconn_find(int id, struct ip_addr* ip, int port, ((l_port==0) || (l_port==a->parent->rcv.dst_port)) && (ip_addr_cmp(ip, &a->parent->rcv.src_ip)) && (is_local_ip_any || - ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip)) + ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip) || + ip_addr_cmp(l_ip, &a->parent->cinfo.dst_ip)) ) { LM_DBG("found connection by peer address (id: %d)\n", a->parent->id);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev