- sr-dev - kamailio.org

Kamailio not under GPL2
by tom Gross 22 Dec '20

22 Dec '20

Hallo I hope I am writing to the right mailing address. We are interested in Kamailio source code but We would like to purchase Kamailio (for a fee) that is not under the GPL2 category . Do you offer that? Thank you Tom <https://docs.google.com/uc?export=download&id=1zTACqAqtPFWXnR_r-T8kaF4TaJpg AJ7l&revid=0Bx0wng2lOd16cCtVL1kyWWZmdHpGdktTbXFpNHJmQTRzWm9JPQ> Tom Gross Director of Operations and Corporate +972-52-3922304 <http://www.flolive.net/> www.flolive.net The information contained in this e-mail message is intended for the use of individual or entity named above and may include information that is confidential and proprietary. Please keep the content of this email in strict confidence. If you are not the intended recipient, please immediately notify us by return e-mail, delete this e-mail and destroy any copies. -- *The information contained in this e-mail message is intended for the use of individual or entity named above and may include information that is confidential and proprietary. Please keep the content of this email in strict confidence. If you are not the intended recipient, please immediately notify us by return e-mail, delete this e-mail and destroy any copies.*

2 1

Kamailio v5.3.8 released
by Henning Westerholt 21 Dec '20

21 Dec '20

Hello, Kamailio SIP Server v5.3.8 stable has been released. This is a maintenance release of the previous stable branch (5.3), that includes fixes since the release of v5.3.7. There are no change to database schema or configuration language structure that you have to do on previous installations of v5.3.x. Deployments running previous v5.3.x versions are recommended to be upgraded to v5.3.8. For more details about version 5.3.8 (including links and guidelines to download the tar file or from GIT repository), visit: https://www.kamailio.org/w/2020/12/kamailio-v5-3-8-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

git:5.3:05d4d530: Makefile.defs: set version to 5.3.8
by Henning Westerholt 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.3 Commit: 05d4d530d56ddad05103b222d734e0429ca3457b URL: https://github.com/kamailio/kamailio/commit/05d4d530d56ddad05103b222d734e04… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T17:02:17Z Makefile.defs: set version to 5.3.8 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/05d4d530d56ddad05103b222d734e04… Patch: https://github.com/kamailio/kamailio/commit/05d4d530d56ddad05103b222d734e04… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index d0d1e46338..83e48e6f0d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 3 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = # memory manager switcher

1 0

git:5.3:cd35b944: pkg: set version to 5.3.8 for packaging files
by Henning Westerholt 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.3 Commit: cd35b9440e3bf1f4509cc3d481846addf9236774 URL: https://github.com/kamailio/kamailio/commit/cd35b9440e3bf1f4509cc3d481846ad… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T17:02:17Z pkg: set version to 5.3.8 for packaging files --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cd35b9440e3bf1f4509cc3d481846ad… Patch: https://github.com/kamailio/kamailio/commit/cd35b9440e3bf1f4509cc3d481846ad…

1 0

git:5.3:a5815595: Changelog: update content for 5.3.8 release
by Henning Westerholt 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.3 Commit: a5815595511d298a9948027fb0d9410a2fd65e66 URL: https://github.com/kamailio/kamailio/commit/a5815595511d298a9948027fb0d9410… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T17:06:38Z Changelog: update content for 5.3.8 release --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/a5815595511d298a9948027fb0d9410… Patch: https://github.com/kamailio/kamailio/commit/a5815595511d298a9948027fb0d9410…

1 0

git:5.3:c6718920: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.3 Commit: c67189205cad464cb8480c9883cfaa6531062fac URL: https://github.com/kamailio/kamailio/commit/c67189205cad464cb8480c9883cfaa6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-21T16:46:54+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/http_client/README Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/c67189205cad464cb8480c9883cfaa6… Patch: https://github.com/kamailio/kamailio/commit/c67189205cad464cb8480c9883cfaa6… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 465f6055af..0be13f07c5 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -90,7 +90,7 @@ Hugh Waite 2. Developer Guide - 1. + 1. Introduction 2. Available Functions 2.1. int http_connect(msg, connection, url, result, @@ -855,7 +855,7 @@ Chapter 2. Developer Guide Table of Contents - 1. + 1. Introduction 2. Available Functions 2.1. int http_connect(msg, connection, url, result, content_type, @@ -865,6 +865,8 @@ Chapter 2. Developer Guide 2.3. int http_query(msg, url, dest, post) 2.4. http_get_content_type(str connection) +1. Introduction + This module provides a set of API functions that other modules can use in order to integrate with HTTP services. diff --git a/src/modules/lost/README b/src/modules/lost/README index 357c41d388..ae24ac2676 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -156,7 +156,7 @@ $var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$va r(pidf)"); ... -$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)"", "$var(err)"); +$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)", "$var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$va r(pidf)\n"); ...

1 0

git: new commits in branch 5.3
by Henning Westerholt 21 Dec '20

21 Dec '20

- URL: https://github.com/kamailio/kamailio/commit/8cc9193404e7dac358e96fe8b9dd744… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:00:51Z exec: debug message when command returns non-zero (cherry picked from commit e9eee1ead964992a2d81014709755bbfd1e995c9) - URL: https://github.com/kamailio/kamailio/commit/f0732ee99ee486a71790b2ce4419ba1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:04:25Z dialog: skip doing cseq update processing for non-sip requests (cherry picked from commit 960b60ede8543f38b61ad2769e81e11d5a777df8) - URL: https://github.com/kamailio/kamailio/commit/580afabee9f76f1e37b09b1f7b7086c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:06:25Z core: init origproto to fix compiler warning - GH #2543 (cherry picked from commit ef3233d14080936486d09edbe9598d7d92bd2f33) - URL: https://github.com/kamailio/kamailio/commit/6e7858b0b1837bfa17fb374f01b3ad2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:06:54Z http_async_client: include poll.h instead sys/poll.h - according to POSIX specs - GH #2543 (cherry picked from commit 8f30c75cff7787a39f7c934e00e933b1beb43c20) - URL: https://github.com/kamailio/kamailio/commit/0b09dd1f5453f66684053f5b3ea3d2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:07:04Z sctp: memcpy field data to avoid unaligned access warning - GH #2543 (cherry picked from commit 4bb099b046939b85e1827b804167a51ef4bc00c4) - URL: https://github.com/kamailio/kamailio/commit/164c4f1523d8400b84a4359b1e15d56… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-12-21T15:07:16Z core: added missing field in sip_msg_update_buffer - added a missing field in sip_msg_update_buffer() when restoring message fiedls: msg->pid. (cherry picked from commit 57be5c1f33344275c15777a7927d9c48df4a69ba) - URL: https://github.com/kamailio/kamailio/commit/63022e0d95500e5da0d1a7cc4d14ced… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:08:40Z jsonrpcs: exported dispatch() function to kemi (cherry picked from commit 08a9ed3d136c861f990e4f63c2c0544e08d9078d) - URL: https://github.com/kamailio/kamailio/commit/fc91871294ff7d23fadb642550122e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:09:04Z drouting: give portparameter set to 0 to sip_resolvehost() - enable doing SRV query, GH #2553 (cherry picked from commit 18f59c10582845da5eea280990daf19c804978fb) - URL: https://github.com/kamailio/kamailio/commit/833e3d0f9bbc2e4e00c662f4927ace9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:09:12Z dispatcher: test no-dns flag to skip ip matching for hostnames - no dns done at startup if the flag is set in the destination record (cherry picked from commit 1c58b8e0ed221404a15c1426f40df167654e3860) - URL: https://github.com/kamailio/kamailio/commit/a9a35d0ba6e6f55a7788bf8cee945b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:09:36Z tm: print ruri mode in debug message from t load contacts (cherry picked from commit 3214ecd8ee82d1b69cde57d96dddefe1301c190c) - URL: https://github.com/kamailio/kamailio/commit/41761ed5d158ab59ef51aca11a849ce… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-12-21T15:10:48Z smsops: fix len calc for a concatenated sms - fixed the calculation for concatenated SMSs based on TS 23.040, Sec. 9.2.3.16 (cherry picked from commit d90f29b3b03386add989aebe3865bdc78dff8fbe) - URL: https://github.com/kamailio/kamailio/commit/7cecd70c29bd5e0b8fa918ad99b016a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:11:00Z tm: proper fill of From/To URI/tag values using parsed structure in t_uac_send() (cherry picked from commit aa6e9963b2725c1b6b7e5ff995a77c222d95fa3c) - URL: https://github.com/kamailio/kamailio/commit/1f5bd88fd60f98e36fd0b59b54398a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:11:08Z misc/examples: note that sr is exported by app_lua_sr - hint for lua syntax check (cherry picked from commit 889431746d24c73eeff73705fab36a0e154116a9) - URL: https://github.com/kamailio/kamailio/commit/a76f06eb010765216450bd78bcc1040… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:11:16Z kemix: exported function get_rcvadvip() and get_rcvadvport() - return advertised address and port of the receiving socket (cherry picked from commit 070a9c042a1caf19162d3d97b26f8d7548747cbb) - URL: https://github.com/kamailio/kamailio/commit/6f6dda289c5c26a3098cae0d8df37e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:11:25Z kemix: exported functions to get socket string and name (cherry picked from commit b59204eb1df8c85bcdde65f2a840f55986f01223) - URL: https://github.com/kamailio/kamailio/commit/b4f83c8001569c99582eb3f92433083… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T15:13:46Z tls: log version, gh #2561 (cherry picked from commit c9f0adddde8321bfaf368691fea74079e40bd789) - URL: https://github.com/kamailio/kamailio/commit/f7e7c3501a79415ff12ae77b5428a88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:15:45Z dispatcher: removed unnecessary return (cherry picked from commit 721d533317c735d7ddbd16ad94684b483468c010) - URL: https://github.com/kamailio/kamailio/commit/91d4c181c5472c9e1d1727c74e7e637… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:16:16Z core: check if the tcp clone rcv buffer is set when applying changes (cherry picked from commit aa13720e5d78dde5ae5235c13399848cb8f5a0cc) - URL: https://github.com/kamailio/kamailio/commit/f21627f0e24c5717ca29198a1c8f457… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-12-21T15:17:22Z ndb_redis: set message level to debug on reconnect * logging error makes no sense here since there's going to be a reconnection afterwards (cherry picked from commit 98805c723fbe01556e56d5b00ffc686b92014847) - URL: https://github.com/kamailio/kamailio/commit/5c685f3d3d091dfd56fea5cb2ae7668… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-21T15:18:02Z lost: removed extra `"` symbol in example (cherry picked from commit 124499c12db185d85805e5c71d5cc4222e608b68) - URL: https://github.com/kamailio/kamailio/commit/7465d23be7b0e9f27dc4f95c99fba7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:20:13Z auth_diameter: init variable and check before freeing (cherry picked from commit 04dc5d6c66c85d0d411aa23b27bc6be00258eff6) - URL: https://github.com/kamailio/kamailio/commit/6a4e6784dd787f3c33af8907771c023… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:24:55Z tm: check end of header name in lw parser - proper identification of header type, prior could mistakenly set the type by matching the prefix of long header name - GH #2572 (cherry picked from commit c0f5382bfbd2022896a9b206967977f827517700) - URL: https://github.com/kamailio/kamailio/commit/7d2fc9e4e480fb811983212136938ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:26:36Z core: tcp - debug messages merged, print bytes read and flags (cherry picked from commit efb9c5f83b37c316b848ae7b6dc829e2f8ca6275) - URL: https://github.com/kamailio/kamailio/commit/ef4bb80111a3eb8e7741a814ae3b113… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:26:40Z core: tcp - log connection state and flags on debug message (cherry picked from commit 41040a0420ee48f51901bf32e29526c8948ecea0) - URL: https://github.com/kamailio/kamailio/commit/4bc84f40b0fe7e9a654a1d24ee190fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:27:07Z dispatcher: check weight value to be in expected range (cherry picked from commit e00f610203fee957a22afc5f8103c1482a925138) - URL: https://github.com/kamailio/kamailio/commit/65b9c2d085f8d0b2f73fc948f185f59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:29:17Z dispatcher: info log message when adding extra weight or rweight percentages (cherry picked from commit ba27633ca22bcfc18fd4bb7d62c2f5bb32e56962) - URL: https://github.com/kamailio/kamailio/commit/b0c05e51d2fdfba36cd1e023a9d44e7… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T15:29:49Z Revert "kemix: exported functions to get socket string and name" This reverts commit 6f6dda289c5c26a3098cae0d8df37e6bc51e1ac1. - URL: https://github.com/kamailio/kamailio/commit/dcc0b84d12d2a8591e91019cd626047… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:31:08Z http_client: do not set empty headers and body (cherry picked from commit ce58411c462231d6ea1fc3b4acbf50520c2962ce) - URL: https://github.com/kamailio/kamailio/commit/03505654c7ecd4b0e026a561d36ca2c… Author: tsearle <tsearle(a)gmail.com> Date: 2020-12-21T15:31:26Z modules/siptrace: fix regression preventing variables to be used (#2588) * modules/siptrace: fix regression preventing variables to be used Commit fa7eb2a switched the 2 parameter version of sip_trace from using the builtin fixup_spve_spve to the custom fixup method to using the custom fixup_siptrace. As it is a custom fixup method, the corresponding free method can not be auto-detected causing the config parser to require the parameters to be a constant. This patch adds a free method, allowing variables to be once again passed as the 2nd parameter of this method (as well as fixing a memory leak for the 3rd parameter). * change free for parameter 3 Co-authored-by: Torrey Searle <tsearle(a)voxbone.com> (cherry picked from commit 7c98d547996637a7bf1c7025c93142f574fe3ac9) - URL: https://github.com/kamailio/kamailio/commit/8283f280977a5edc8973028a05d70d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:34:12Z dialog: handle CANCEL requests for CSeq updates (cherry picked from commit fd35a1a4eee2c50a3b7bf4ee6b1f6f20f4fa7d62) - URL: https://github.com/kamailio/kamailio/commit/70aaf931cf24738b6909721405657f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:35:17Z http_client: docs - section title to get proper entry in toc - bits of whitespacing fixing (cherry picked from commit fadc0fc499fb57a763aa71a76b24cff152bbd927)

1 0

git:5.4:573dd7e6: tls: log version, gh #2561
by Henning Westerholt 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.4 Commit: 573dd7e63ac3d2629367f72c967ec7fbd4edfcf1 URL: https://github.com/kamailio/kamailio/commit/573dd7e63ac3d2629367f72c967ec7f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T15:14:31Z tls: log version, gh #2561 (cherry picked from commit c9f0adddde8321bfaf368691fea74079e40bd789) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/573dd7e63ac3d2629367f72c967ec7f… Patch: https://github.com/kamailio/kamailio/commit/573dd7e63ac3d2629367f72c967ec7f… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 0b9fd39fc8..fed9749624 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -385,6 +385,7 @@ static int mod_init(void) if (tls_check_sockets(*tls_domains_cfg) < 0) goto error; + LM_INFO("use OpenSSL version: %08x\n", (uint32_t)(OPENSSL_VERSION_NUMBER)); #ifndef OPENSSL_NO_ECDH LM_INFO("With ECDH-Support!\n"); #endif

1 0

git:master:8e54f027: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 8e54f027e8193b70e840033b9c3c5a94ebf5486b URL: https://github.com/kamailio/kamailio/commit/8e54f027e8193b70e840033b9c3c5a9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-21T14:46:11+01:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/8e54f027e8193b70e840033b9c3c5a9… Patch: https://github.com/kamailio/kamailio/commit/8e54f027e8193b70e840033b9c3c5a9… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 3298f6f41d..8100557bd5 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -722,13 +722,15 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") Defines the name of XAVP class to store runtime module config values. The values are stored as inner XAVPs, like $xavp(class=>attribute). Valid inner XAVP names: + * expires - the number of maximum contacts to be stored for the + current registration AoR. It overwrites the 'max_contacts' module + parameter value. + * q - the expires value, to overwrite the value from SIP headers. * max_contacts - the number of maximum contacts to be stored for the current registration AoR. It overwrites the 'max_contacts' module parameter value. * socket - the string representing the socket on which the register request was received, as alternative to using the sock_hdr. - * q - q value of contact (integer 0-1000). It overrides q value given - in contact header and default_q parameter. For example. if this parameter is set to 'reg', then the number of maximum contacts can be set in $xavp(reg=>max_contacts). @@ -742,6 +744,7 @@ modparam("registrar", "xavp_cfg", "reg") request_route { ... $xavp(reg=>max_contacts) = 4; + $xavp(reg[0]=>expires) = 600; save("location"); ... }

1 0

git:master:132c9d03: registrar: allow taking expires value from xavp_cfg expires field
by Daniel-Constantin Mierla 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 132c9d03a458c1c8371dfe5bfe07d996e4407cb2 URL: https://github.com/kamailio/kamailio/commit/132c9d03a458c1c8371dfe5bfe07d99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T14:31:08+01:00 registrar: allow taking expires value from xavp_cfg expires field --- Modified: src/modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/132c9d03a458c1c8371dfe5bfe07d99… Patch: https://github.com/kamailio/kamailio/commit/132c9d03a458c1c8371dfe5bfe07d99… --- diff --git a/src/modules/registrar/sip_msg.c b/src/modules/registrar/sip_msg.c index 2b43dd7611..905e3d6b9d 100644 --- a/src/modules/registrar/sip_msg.c +++ b/src/modules/registrar/sip_msg.c @@ -246,27 +246,36 @@ contact_t* get_next_contact(contact_t* _c) void calc_contact_expires(struct sip_msg* _m, param_t* _ep, int* _e, int novariation) { int range = 0; + sr_xavp_t *vavp = NULL; + str xename = str_init("expires"); - if (!_ep || !_ep->body.len) { - *_e = get_expires_hf(_m); + if (reg_xavp_cfg.s != NULL) { + vavp = xavp_get_child_with_ival(&reg_xavp_cfg, &xename); + } - if ( *_e < 0 ) { - *_e = cfg_get(registrar, registrar_cfg, default_expires); - range = cfg_get(registrar, registrar_cfg, default_expires_range); - } else { - range = cfg_get(registrar, registrar_cfg, expires_range); - } + if (vavp != NULL && vavp->val.v.i >= 0) { + *_e = vavp->val.v.i; } else { - if (str2int(&_ep->body, (unsigned int*)_e) < 0) { - *_e = cfg_get(registrar, registrar_cfg, default_expires); - range = cfg_get(registrar, registrar_cfg, default_expires_range); + if (!_ep || !_ep->body.len) { + *_e = get_expires_hf(_m); + + if ( *_e < 0 ) { + *_e = cfg_get(registrar, registrar_cfg, default_expires); + range = cfg_get(registrar, registrar_cfg, default_expires_range); + } else { + range = cfg_get(registrar, registrar_cfg, expires_range); + } } else { - range = cfg_get(registrar, registrar_cfg, expires_range); + if (str2int(&_ep->body, (unsigned int*)_e) < 0) { + *_e = cfg_get(registrar, registrar_cfg, default_expires); + range = cfg_get(registrar, registrar_cfg, default_expires_range); + } else { + range = cfg_get(registrar, registrar_cfg, expires_range); + } } } - if ( *_e != 0 ) - { + if ( *_e != 0 ) { if (*_e < cfg_get(registrar, registrar_cfg, min_expires)) { if(reg_min_expires_mode) { rerrno = R_LOW_EXP;

1 0

git:master:4b7c02c9: registrar: docs for expires field of xavp_cfg
by Daniel-Constantin Mierla 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 4b7c02c93053076d3089499a0290203157b63c0d URL: https://github.com/kamailio/kamailio/commit/4b7c02c93053076d3089499a0290203… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T14:34:16+01:00 registrar: docs for expires field of xavp_cfg --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b7c02c93053076d3089499a0290203… Patch: https://github.com/kamailio/kamailio/commit/4b7c02c93053076d3089499a0290203… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 94ce4b3a0b..f4bb213b14 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -745,24 +745,29 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") <itemizedlist> <listitem> <para> - <emphasis>max_contacts</emphasis> - the number of maximum + <emphasis>expires</emphasis> - the number of maximum contacts to be stored for the current registration AoR. It overwrites the 'max_contacts' module parameter value. </para> </listitem> <listitem> <para> - <emphasis>socket</emphasis> - the string representing the - socket on which the register request was received, as alternative - to using the sock_hdr. + <emphasis>q</emphasis> - the expires value, to overwrite the + value from SIP headers. + </para> + </listitem> + <listitem> + <para> + <emphasis>max_contacts</emphasis> - the number of maximum + contacts to be stored for the current registration AoR. It + overwrites the 'max_contacts' module parameter value. </para> </listitem> <listitem> <para> - <emphasis>q</emphasis> - q value of contact - (integer 0-1000). It - overrides q value given in contact header and - default_q parameter. + <emphasis>socket</emphasis> - the string representing the + socket on which the register request was received, as alternative + to using the sock_hdr. </para> </listitem> </itemizedlist> @@ -784,6 +789,7 @@ modparam("registrar", "xavp_cfg", "reg") request_route { ... $xavp(reg=>max_contacts) = 4; + $xavp(reg[0]=>expires) = 600; save("location"); ... }

1 0

Releasing Kamailio 5.3.8
by Henning Westerholt 21 Dec '20

21 Dec '20

Hello, I am planning to release next week (likely on Monday 21st December) the next minor version out of branch 5.3, version 5.3.8. Backports of fixed issues from git master will be integrated as usual. If you are aware of new issues which were not yet reported, let us know (by creating an issue on the tracker). Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 1

git:master:58468c3a: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 58468c3ac6cbfcf426e2f7a89d2becbec09aac32 URL: https://github.com/kamailio/kamailio/commit/58468c3ac6cbfcf426e2f7a89d2becb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-21T10:31:37+01:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/58468c3ac6cbfcf426e2f7a89d2becb… Patch: https://github.com/kamailio/kamailio/commit/58468c3ac6cbfcf426e2f7a89d2becb… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 6724cc5716..0028f9e623 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -72,6 +72,7 @@ Hugh Waite 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) + 4.5. http_client_get(url, body, hdrs, respv) 5. Pseudovariables @@ -128,6 +129,7 @@ Hugh Waite 1.23. http_connect_raw() usage 1.24. http_get_redirect() usage 1.25. http_client_query() usage + 1.26. http_client_get() usage Chapter 1. Admin Guide @@ -169,6 +171,7 @@ Chapter 1. Admin Guide 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) + 4.5. http_client_get(url, body, hdrs, respv) 5. Pseudovariables @@ -670,6 +673,7 @@ modparam("http_client", "netinterface", "eth0") 4.2. http_connect_raw(connection, url, content_type, data, result) 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) + 4.5. http_client_get(url, body, hdrs, respv) 4.1. http_connect(connection, url, [content_type, data,] result) @@ -818,6 +822,28 @@ http_client_query("http://api.com/index.php", "src=$si", "Content-Type: text/plain", "$var(result)"); ... +4.5. http_client_get(url, body, hdrs, respv) + + Perform a HTTP GET request to "url", storing the response body in the + "respv" variable. The "body" and "hdrs" can be empty strings to skip + setting them. The first three parameters can contain variables that are + evaluated at runtime. The "respv" has to be the name of a writable + variable. + + Note: usually HTTP GET requests should have no body, according to specs + the body in HTTP GET does not affect the response, but is not + explicitely forbidden. + + Example 1.26. http_client_get() usage +... +http_client_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu +{s.escape.param})", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} +... + 5. Pseudovariables 5.1. $curlerror(error)

1 0

git:master:729340ff: http_client: docs for http_client_get()
by Daniel-Constantin Mierla 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 729340ff8c80ac836f1889c505cf361abc4fe0ae URL: https://github.com/kamailio/kamailio/commit/729340ff8c80ac836f1889c505cf361… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T10:29:28+01:00 http_client: docs for http_client_get() --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/729340ff8c80ac836f1889c505cf361… Patch: https://github.com/kamailio/kamailio/commit/729340ff8c80ac836f1889c505cf361… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 6f1c897690..2c8295f07f 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -897,6 +897,35 @@ http_client_query("http://api.com/index.php", # POST-Request http_client_query("http://api.com/index.php", "src=$si", "Content-Type: text/plain", "$var(result)"); +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_get"> + <title> + <function moreinfo="none">http_client_get(url, body, hdrs, respv)</function> + </title> + <para> + Perform a HTTP GET request to "url", storing the response body + in the "respv" variable. The "body" and "hdrs" can be empty strings + to skip setting them. The first three parameters can contain + variables that are evaluated at runtime. The "respv" has to be + the name of a writable variable. + </para> + <para> + Note: usually HTTP GET requests should have no body, according to + specs the body in HTTP GET does not affect the response, but is + not explicitely forbidden. + </para> + <example> + <title><function>http_client_get()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} ... </programlisting> </example>

1 0

git:master:b6a10887: http_client: new function http_client_get()
by Daniel-Constantin Mierla 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: b6a1088767c4d9d483113ad06ac4700dcf46820f URL: https://github.com/kamailio/kamailio/commit/b6a1088767c4d9d483113ad06ac4700… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T10:15:53+01:00 http_client: new function http_client_get() - do explicit GET request with headers (and body) - exported KSR.http_client.get_hdrs() --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/b6a1088767c4d9d483113ad06ac4700… Patch: https://github.com/kamailio/kamailio/commit/b6a1088767c4d9d483113ad06ac4700…

1 0

git:master:b04111b5: core: kemi - KSR.is_method_in() uses E/e to match PRACK
by Daniel-Constantin Mierla 19 Dec '20

19 Dec '20

Module: kamailio Branch: master Commit: b04111b583b454b12ea0c6a265a14858c195b213 URL: https://github.com/kamailio/kamailio/commit/b04111b583b454b12ea0c6a265a1485… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-19T15:34:05+01:00 core: kemi - KSR.is_method_in() uses E/e to match PRACK --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b04111b583b454b12ea0c6a265a1485… Patch: https://github.com/kamailio/kamailio/commit/b04111b583b454b12ea0c6a265a1485… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 4060ad9d4d..ba0b435dce 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -852,6 +852,12 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + case 'E': + case 'e': + if(imethod==METHOD_PRACK) { + return SR_KEMI_TRUE; + } + break; case 'P': case 'p': if(imethod==METHOD_PUBLISH) {

1 0

git:master:8693fabb: tls: kemi function KSR.tls.cget(aname)
by Daniel-Constantin Mierla 18 Dec '20

18 Dec '20

Module: kamailio Branch: master Commit: 8693fabb57af9428af5d3110da7dce12fe5cd634 URL: https://github.com/kamailio/kamailio/commit/8693fabb57af9428af5d3110da7dce1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-18T09:19:08+01:00 tls: kemi function KSR.tls.cget(aname) - get connection/certificates attributes by providing a corresponding tls pv name --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_select.c Modified: src/modules/tls/tls_select.h --- Diff: https://github.com/kamailio/kamailio/commit/8693fabb57af9428af5d3110da7dce1… Patch: https://github.com/kamailio/kamailio/commit/8693fabb57af9428af5d3110da7dce1…

1 0

git:master:797db215: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 18 Dec '20

18 Dec '20

Module: kamailio Branch: master Commit: 797db215d4a71723012b4a6e2ce54ccf55dbcedd URL: https://github.com/kamailio/kamailio/commit/797db215d4a71723012b4a6e2ce54cc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-18T08:31:24+01:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/797db215d4a71723012b4a6e2ce54cc… Patch: https://github.com/kamailio/kamailio/commit/797db215d4a71723012b4a6e2ce54cc… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 623d873204..6724cc5716 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -91,7 +91,7 @@ Hugh Waite 2. Developer Guide - 1. + 1. Introduction 2. Available Functions 2.1. int http_connect(msg, connection, url, result, @@ -872,7 +872,7 @@ Chapter 2. Developer Guide Table of Contents - 1. + 1. Introduction 2. Available Functions 2.1. int http_connect(msg, connection, url, result, content_type, @@ -882,6 +882,8 @@ Chapter 2. Developer Guide 2.3. int http_query(msg, url, dest, post) 2.4. http_get_content_type(str connection) +1. Introduction + This module provides a set of API functions that other modules can use in order to integrate with HTTP services.

1 0

git:master:fadc0fc4: http_client: docs - section title to get proper entry in toc
by Daniel-Constantin Mierla 18 Dec '20

18 Dec '20

Module: kamailio Branch: master Commit: fadc0fc499fb57a763aa71a76b24cff152bbd927 URL: https://github.com/kamailio/kamailio/commit/fadc0fc499fb57a763aa71a76b24cff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-18T08:18:51+01:00 http_client: docs - section title to get proper entry in toc - bits of whitespacing fixing --- Modified: src/modules/http_client/doc/http_client.xml Modified: src/modules/http_client/doc/http_client_admin.xml Modified: src/modules/http_client/doc/http_client_devel.xml --- Diff: https://github.com/kamailio/kamailio/commit/fadc0fc499fb57a763aa71a76b24cff… Patch: https://github.com/kamailio/kamailio/commit/fadc0fc499fb57a763aa71a76b24cff…

1 0

git:5.4:88d1eb7a: dialog: handle CANCEL requests for CSeq updates
by Daniel-Constantin Mierla 17 Dec '20

17 Dec '20

Module: kamailio Branch: 5.4 Commit: 88d1eb7a79acd6afecb3d6760889433f69646b5b URL: https://github.com/kamailio/kamailio/commit/88d1eb7a79acd6afecb3d6760889433… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-17T14:55:13+01:00 dialog: handle CANCEL requests for CSeq updates (cherry picked from commit fd35a1a4eee2c50a3b7bf4ee6b1f6f20f4fa7d62) --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/88d1eb7a79acd6afecb3d6760889433… Patch: https://github.com/kamailio/kamailio/commit/88d1eb7a79acd6afecb3d6760889433… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 17c63bbb1c..70b2b43c2b 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -387,8 +387,9 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) } if(get_to(&msg)->tag_value.len<=0) { - /* intial request - handle only INVITEs */ - if(msg.first_line.u.request.method_value!=METHOD_INVITE) { + /* intial request - handle only INVITEs, ACKs and CANCELs */ + if(!(msg.first_line.u.request.method_value + & (METHOD_INVITE|METHOD_ACK|METHOD_CANCEL))) { goto done; } }

1 0

git:master:fd35a1a4: dialog: handle CANCEL requests for CSeq updates
by Daniel-Constantin Mierla 17 Dec '20

17 Dec '20

Module: kamailio Branch: master Commit: fd35a1a4eee2c50a3b7bf4ee6b1f6f20f4fa7d62 URL: https://github.com/kamailio/kamailio/commit/fd35a1a4eee2c50a3b7bf4ee6b1f6f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-17T14:54:04+01:00 dialog: handle CANCEL requests for CSeq updates --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/fd35a1a4eee2c50a3b7bf4ee6b1f6f2… Patch: https://github.com/kamailio/kamailio/commit/fd35a1a4eee2c50a3b7bf4ee6b1f6f2… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 17c63bbb1c..70b2b43c2b 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -387,8 +387,9 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) } if(get_to(&msg)->tag_value.len<=0) { - /* intial request - handle only INVITEs */ - if(msg.first_line.u.request.method_value!=METHOD_INVITE) { + /* intial request - handle only INVITEs, ACKs and CANCELs */ + if(!(msg.first_line.u.request.method_value + & (METHOD_INVITE|METHOD_ACK|METHOD_CANCEL))) { goto done; } }

1 0

[kamailio/kamailio] lost: removed not used namespace (#2584)
by sergey-safarov 17 Dec '20

17 Dec '20

#### 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 Caller LIS server may use namepace prefix `gml` or any other. When created LOST request, then `location-info` payload created from `pidf-lo` and `p2` prefix namespace not used. I suggest make some code cleanup and remove not used strings. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2584 -- Commit Summary -- * lost: removed not used namespace -- File Changes -- M src/modules/lost/utilities.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2584.patch https://github.com/kamailio/kamailio/pull/2584.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/2584

3 5

git:master:6c1c957b: Merge pull request #2584 from sergey-safarov/master
by GitHub 17 Dec '20

17 Dec '20

Module: kamailio Branch: master Commit: 6c1c957b18a395e2dad79a8b3a3c0de347aa4f2d URL: https://github.com/kamailio/kamailio/commit/6c1c957b18a395e2dad79a8b3a3c0de… Author: Wolfgang Kampichler <49035738+wkampich(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2020-12-17T09:25:19+01:00 Merge pull request #2584 from sergey-safarov/master lost: removed not used namespace --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/6c1c957b18a395e2dad79a8b3a3c0de… Patch: https://github.com/kamailio/kamailio/commit/6c1c957b18a395e2dad79a8b3a3c0de… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index ab717fce18..4e3450b21b 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -955,12 +955,15 @@ char *lost_find_service_request(p_loc_t loc, int *lgth) /* set properties */ xmlNewProp(ptrFindService, BAD_CAST "xmlns", BAD_CAST "urn:ietf:params:xml:ns:lost1"); - xmlNewProp(ptrFindService, BAD_CAST "xmlns:p2", - BAD_CAST "http://www.opengis.net/gml"); xmlNewProp(ptrFindService, BAD_CAST "serviceBoundary", (loc->boundary == 1) ? BAD_CAST "value" : BAD_CAST "reference"); xmlNewProp(ptrFindService, BAD_CAST "recursive", (loc->recursive == 1) ? BAD_CAST "true" : BAD_CAST "false"); + if(loc->xpath == NULL) { + xmlNewProp(ptrFindService, BAD_CAST "xmlns:p2", + BAD_CAST "http://www.opengis.net/gml"); + } + /* location - element */ ptrLocation = xmlNewChild(ptrFindService, NULL, BAD_CAST "location", NULL); xmlNewProp(ptrLocation, BAD_CAST "id", BAD_CAST loc->identity);

1 0

git:master:205cad46: lost: removed not used namespace
by Sergey Safarov 17 Dec '20

17 Dec '20

Module: kamailio Branch: master Commit: 205cad460ba5c519e4c6411a3b0c2d33cacba534 URL: https://github.com/kamailio/kamailio/commit/205cad460ba5c519e4c6411a3b0c2d3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-14T14:14:52+03:00 lost: removed not used namespace fix #2584 --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/205cad460ba5c519e4c6411a3b0c2d3… Patch: https://github.com/kamailio/kamailio/commit/205cad460ba5c519e4c6411a3b0c2d3… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index ab717fce18..4e3450b21b 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -955,12 +955,15 @@ char *lost_find_service_request(p_loc_t loc, int *lgth) /* set properties */ xmlNewProp(ptrFindService, BAD_CAST "xmlns", BAD_CAST "urn:ietf:params:xml:ns:lost1"); - xmlNewProp(ptrFindService, BAD_CAST "xmlns:p2", - BAD_CAST "http://www.opengis.net/gml"); xmlNewProp(ptrFindService, BAD_CAST "serviceBoundary", (loc->boundary == 1) ? BAD_CAST "value" : BAD_CAST "reference"); xmlNewProp(ptrFindService, BAD_CAST "recursive", (loc->recursive == 1) ? BAD_CAST "true" : BAD_CAST "false"); + if(loc->xpath == NULL) { + xmlNewProp(ptrFindService, BAD_CAST "xmlns:p2", + BAD_CAST "http://www.opengis.net/gml"); + } + /* location - element */ ptrLocation = xmlNewChild(ptrFindService, NULL, BAD_CAST "location", NULL); xmlNewProp(ptrLocation, BAD_CAST "id", BAD_CAST loc->identity);

1 0

[kamailio/kamailio] keepalive: fix initialization when using destination mod param (#2579)
by Nacho G. 17 Dec '20

17 Dec '20

- Fixed the way the module is initialized, causing problems when using destination mod parameter because when invoking this parameter some utilities are not initialized (timers).   #### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2476 (replace XXXX with an open issue number) #### Description  Fixed the way the module is initialized, causing problems when using destination mod parameter because when invoking this parameter some utilities are not yet initialized (timers). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2579 -- Commit Summary -- * keepalive: fix initialization when using destination mod param -- File Changes -- M src/modules/keepalive/keepalive.h (8) M src/modules/keepalive/keepalive_mod.c (68) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2579.patch https://github.com/kamailio/kamailio/pull/2579.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/2579

3 9

git:master:70cb87bd: Merge pull request #2579 from NGSegovia/keepalive_fix_crash_on_destination_mod_param
by GitHub 17 Dec '20

17 Dec '20

Module: kamailio Branch: master Commit: 70cb87bd98f054f6e493992ae844bcfea0ea98fa URL: https://github.com/kamailio/kamailio/commit/70cb87bd98f054f6e493992ae844bcf… Author: Nacho G <nacho.gs(a)zaleos.net> Committer: GitHub <noreply(a)github.com> Date: 2020-12-17T08:58:22+01:00 Merge pull request #2579 from NGSegovia/keepalive_fix_crash_on_destination_mod_param keepalive: fix initialization when using destination mod param --- Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/70cb87bd98f054f6e493992ae844bcf… Patch: https://github.com/kamailio/kamailio/commit/70cb87bd98f054f6e493992ae844bcf…

1 0

git:master:871ae263: keepalive: fix initialization when using destination mod param
by Nacho Garcia Segovia 17 Dec '20

17 Dec '20

Module: kamailio Branch: master Commit: 871ae263f0547c4a1d7c394d8fded054e0d55818 URL: https://github.com/kamailio/kamailio/commit/871ae263f0547c4a1d7c394d8fded05… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-12-16T19:21:59+01:00 keepalive: fix initialization when using destination mod param - Fixed the way the module is initialized, causing problems when using destination mod parameter because when invoking this parameter some utilities are not initialized (timers). --- Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/871ae263f0547c4a1d7c394d8fded05… Patch: https://github.com/kamailio/kamailio/commit/871ae263f0547c4a1d7c394d8fded05…

1 0

[kamailio/kamailio] modules/siptrace: fix regression preventing variables to be used (#2588)
by tsearle 17 Dec '20

17 Dec '20

Commit fa7eb2a switched the 2 parameter version of sip_trace from using the builtin fixup_spve_spve to the custom fixup method to using the custom fixup_siptrace. As it is a custom fixup method, the corresponding free method can not be auto-detected causing the config parser to require the parameters to be a constant. This patch adds a free method, allowing variables to be once again passed as the 2nd parameter of this method (as well as fixing a memory leak for the 3rd parameter).   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2588 -- Commit Summary -- * modules/siptrace: fix regression preventing variables to be used -- File Changes -- M src/modules/siptrace/siptrace.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2588.patch https://github.com/kamailio/kamailio/pull/2588.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/2588

2 5

git:master:4a2c1ea8: rtpengine: fix param mos_min_roundtrip_B_pv
by Julien Chavanton 16 Dec '20

16 Dec '20

Module: kamailio Branch: master Commit: 4a2c1ea81dcb58a5b31ad3d090d5694366b8fde0 URL: https://github.com/kamailio/kamailio/commit/4a2c1ea81dcb58a5b31ad3d090d5694… Author: Julien Chavanton <jchavanton(a)subspace.com> Committer: Julien Chavanton <jchavanton(a)subspace.com> Date: 2020-12-16T13:08:59-08:00 rtpengine: fix param mos_min_roundtrip_B_pv --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/4a2c1ea81dcb58a5b31ad3d090d5694… Patch: https://github.com/kamailio/kamailio/commit/4a2c1ea81dcb58a5b31ad3d090d5694… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index f69ca4b255..fb736b2f10 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -508,7 +508,7 @@ static param_export_t params[] = { {"mos_min_packetloss_B_pv", PARAM_STR, &side_B_mos_stats.min.packetloss_param }, {"mos_min_jitter_B_pv", PARAM_STR, &side_B_mos_stats.min.jitter_param }, {"mos_min_roundtrip_B_pv", PARAM_STR, &side_B_mos_stats.min.roundtrip_param }, - {"mos_min_roundtrip_B_pv", PARAM_STR, &side_B_mos_stats.min.roundtrip_param }, + {"mos_min_roundtrip_leg_B_pv", PARAM_STR, &side_B_mos_stats.min.roundtrip_leg_param }, {"mos_max_B_pv", PARAM_STR, &side_B_mos_stats.max.mos_param }, {"mos_max_at_B_pv", PARAM_STR, &side_B_mos_stats.max.at_param }, {"mos_max_packetloss_B_pv", PARAM_STR, &side_B_mos_stats.max.packetloss_param },

1 0

git:master:7c98d547: modules/siptrace: fix regression preventing variables to be used (#2588)
by GitHub 16 Dec '20

16 Dec '20

Module: kamailio Branch: master Commit: 7c98d547996637a7bf1c7025c93142f574fe3ac9 URL: https://github.com/kamailio/kamailio/commit/7c98d547996637a7bf1c7025c93142f… Author: tsearle <tsearle(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-12-16T21:47:11+01:00 modules/siptrace: fix regression preventing variables to be used (#2588) * modules/siptrace: fix regression preventing variables to be used Commit fa7eb2a switched the 2 parameter version of sip_trace from using the builtin fixup_spve_spve to the custom fixup method to using the custom fixup_siptrace. As it is a custom fixup method, the corresponding free method can not be auto-detected causing the config parser to require the parameters to be a constant. This patch adds a free method, allowing variables to be once again passed as the 2nd parameter of this method (as well as fixing a memory leak for the 3rd parameter). * change free for parameter 3 Co-authored-by: Torrey Searle <tsearle(a)voxbone.com> --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/7c98d547996637a7bf1c7025c93142f… Patch: https://github.com/kamailio/kamailio/commit/7c98d547996637a7bf1c7025c93142f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 2e8e690ac0..e9c44ec548 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -91,6 +91,7 @@ static int w_sip_trace1(struct sip_msg *, char *dest, char *p2); static int w_sip_trace2(struct sip_msg *, char *dest, char *correlation_id); static int w_sip_trace3(struct sip_msg *, char *dest, char *correlation_id, char *trace_type); static int fixup_siptrace(void **param, int param_no); +static int fixup_free_siptrace(void **param, int param_no); static int w_sip_trace_mode(sip_msg_t *msg, char *pmode, char *p2); static int siptrace_parse_uri(str* duri, dest_info_t* dst); @@ -203,9 +204,9 @@ static cmd_export_t cmds[] = { ANY_ROUTE}, {"sip_trace", (cmd_function)w_sip_trace1, 1, fixup_siptrace, 0, ANY_ROUTE}, - {"sip_trace", (cmd_function)w_sip_trace2, 2, fixup_siptrace, 0, + {"sip_trace", (cmd_function)w_sip_trace2, 2, fixup_siptrace, fixup_free_siptrace, ANY_ROUTE}, - {"sip_trace", (cmd_function)w_sip_trace3, 3, fixup_siptrace, 0, + {"sip_trace", (cmd_function)w_sip_trace3, 3, fixup_siptrace, fixup_free_siptrace, ANY_ROUTE}, {"hlog", (cmd_function)w_hlog1, 1, fixup_spve_null, 0, ANY_ROUTE}, @@ -785,6 +786,21 @@ static int fixup_siptrace(void **param, int param_no) return 0; } +static int fixup_free_siptrace(void **param, int param_no) +{ + if (param_no == 1 || param_no == 2) { + /* correlation id */ + return fixup_free_spve_all(param, param_no); + } if (param_no == 3) { + /* tracing type; string only */ + if (*param) { + pkg_free(*param); + } + } + + return 0; +} + /** *

1 0

[kamailio/kamailio] textops: added functions to manipulate the body in the exported api (#2586)
by Daniel Martínez Ruiz 16 Dec '20

16 Dec '20

Functions added: - set_body - set_body_multipart - append_body_part   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2586 -- Commit Summary -- * textops: added functions to manipulate the body in the exported api -- File Changes -- M src/modules/textops/api.c (18) M src/modules/textops/api.h (6) M src/modules/textops/textops.c (19) M src/modules/textops/textops.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2586.patch https://github.com/kamailio/kamailio/pull/2586.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/2586

2 2

git:master:67f74139: Merge pull request #2586 from danielmartinezruiz/textops_add_body_functions_to_api
by GitHub 16 Dec '20

16 Dec '20

Module: kamailio Branch: master Commit: 67f741395d5a8dbd4a0a8e50aaffefbc0a72e414 URL: https://github.com/kamailio/kamailio/commit/67f741395d5a8dbd4a0a8e50aaffefb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-12-16T21:30:49+01:00 Merge pull request #2586 from danielmartinezruiz/textops_add_body_functions_to_api textops: added functions to manipulate the body in the exported api --- Modified: src/modules/textops/api.c Modified: src/modules/textops/api.h Modified: src/modules/textops/textops.c Modified: src/modules/textops/textops.h --- Diff: https://github.com/kamailio/kamailio/commit/67f741395d5a8dbd4a0a8e50aaffefb… Patch: https://github.com/kamailio/kamailio/commit/67f741395d5a8dbd4a0a8e50aaffefb…

1 0

git:master:ed8c3605: textops: added functions to manipulate the body in the exported api
by Daniel MartÃnez Ruiz 16 Dec '20

16 Dec '20

Module: kamailio Branch: master Commit: ed8c360544b86061b7a517dc256e85089079fe02 URL: https://github.com/kamailio/kamailio/commit/ed8c360544b86061b7a517dc256e850… Author: Daniel MartÃnez Ruiz <d.martinez(a)zaleos.net> Committer: Daniel MartÃnez Ruiz <d.martinez(a)zaleos.net> Date: 2020-12-16T11:02:52+01:00 textops: added functions to manipulate the body in the exported api Functions added: - set_body - set_body_multipart - append_body_part --- Modified: src/modules/textops/api.c Modified: src/modules/textops/api.h Modified: src/modules/textops/textops.c Modified: src/modules/textops/textops.h --- Diff: https://github.com/kamailio/kamailio/commit/ed8c360544b86061b7a517dc256e850… Patch: https://github.com/kamailio/kamailio/commit/ed8c360544b86061b7a517dc256e850…

1 0

[kamailio/kamailio] evapi: export async_multicast() to kemi (#2582)
by Balajee SV 16 Dec '20

16 Dec '20

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [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  Evapi: added KEMI function for evapi_async_multicast You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2582 -- Commit Summary -- * evapi: export async_multicast() to kemi -- File Changes -- M src/modules/evapi/evapi_mod.c (58) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2582.patch https://github.com/kamailio/kamailio/pull/2582.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/2582

2 2

git:master:ccaba976: evapi: export async_multicast() to kemi
by balajeesv 16 Dec '20

16 Dec '20

Module: kamailio Branch: master Commit: ccaba976cd1c599ba64067df0896fdd4888af00f URL: https://github.com/kamailio/kamailio/commit/ccaba976cd1c599ba64067df0896fdd… Author: balajeesv <balajee.sv(a)gmail.com> Committer: balajeesv <balajee.sv(a)gmail.com> Date: 2020-12-11T21:31:27+05:30 evapi: export async_multicast() to kemi --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ccaba976cd1c599ba64067df0896fdd… Patch: https://github.com/kamailio/kamailio/commit/ccaba976cd1c599ba64067df0896fdd… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index bcc582f6e3..a9c4d9ad37 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -756,6 +756,59 @@ static int ki_evapi_async_unicast(sip_msg_t *msg, str *sdata, str *stag) return 1; } +static int ki_evapi_async_multicast(sip_msg_t *msg, str *sdata, str *stag) +{ + unsigned int tindex; + unsigned int tlabel; + tm_cell_t *t = 0; + + if(tmb.t_suspend==NULL) { + LM_ERR("evapi async relay is disabled - tm module not loaded\n"); + return -1; + } + + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + if(tmb.t_newtran(msg)<0) + { + LM_ERR("cannot create the transaction\n"); + return -1; + } + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + LM_ERR("cannot lookup the transaction\n"); + return -1; + } + } + if(tmb.t_suspend(msg, &tindex, &tlabel)<0) + { + LM_ERR("failed to suspend request processing\n"); + return -1; + } + + LM_DBG("transaction suspended [%u:%u]\n", tindex, tlabel); + + + if(sdata->s==NULL || sdata->len == 0) { + LM_ERR("invalid data parameter\n"); + return -1; + } + + if(stag->s==NULL || stag->len == 0) { + LM_ERR("invalid tag parameter\n"); + return -1; + } + + if(evapi_relay_multicast(sdata, stag)<0) { + LM_ERR("failed to relay event: [[%.*s]] to [%.*s] \n", + sdata->len, sdata->s, stag->len, stag->s); + return -2; + } + return 1; +} + /** * */ @@ -824,6 +877,11 @@ static sr_kemi_t sr_kemi_evapi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("evapi"), str_init("async_multicast"), + SR_KEMIP_INT, ki_evapi_async_multicast, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; /* clang-format on */

1 0

git:master:d5c8ac5d: Merge pull request #2582 from balajeesv/kemi_evapi_multicast
by GitHub 16 Dec '20

16 Dec '20

Module: kamailio Branch: master Commit: d5c8ac5daabbe354a267f24ee1e3fe704bccb048 URL: https://github.com/kamailio/kamailio/commit/d5c8ac5daabbe354a267f24ee1e3fe7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-12-16T21:29:52+01:00 Merge pull request #2582 from balajeesv/kemi_evapi_multicast evapi: export async_multicast() to kemi --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d5c8ac5daabbe354a267f24ee1e3fe7… Patch: https://github.com/kamailio/kamailio/commit/d5c8ac5daabbe354a267f24ee1e3fe7… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index bcc582f6e3..a9c4d9ad37 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -756,6 +756,59 @@ static int ki_evapi_async_unicast(sip_msg_t *msg, str *sdata, str *stag) return 1; } +static int ki_evapi_async_multicast(sip_msg_t *msg, str *sdata, str *stag) +{ + unsigned int tindex; + unsigned int tlabel; + tm_cell_t *t = 0; + + if(tmb.t_suspend==NULL) { + LM_ERR("evapi async relay is disabled - tm module not loaded\n"); + return -1; + } + + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + if(tmb.t_newtran(msg)<0) + { + LM_ERR("cannot create the transaction\n"); + return -1; + } + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + LM_ERR("cannot lookup the transaction\n"); + return -1; + } + } + if(tmb.t_suspend(msg, &tindex, &tlabel)<0) + { + LM_ERR("failed to suspend request processing\n"); + return -1; + } + + LM_DBG("transaction suspended [%u:%u]\n", tindex, tlabel); + + + if(sdata->s==NULL || sdata->len == 0) { + LM_ERR("invalid data parameter\n"); + return -1; + } + + if(stag->s==NULL || stag->len == 0) { + LM_ERR("invalid tag parameter\n"); + return -1; + } + + if(evapi_relay_multicast(sdata, stag)<0) { + LM_ERR("failed to relay event: [[%.*s]] to [%.*s] \n", + sdata->len, sdata->s, stag->len, stag->s); + return -2; + } + return 1; +} + /** * */ @@ -824,6 +877,11 @@ static sr_kemi_t sr_kemi_evapi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("evapi"), str_init("async_multicast"), + SR_KEMIP_INT, ki_evapi_async_multicast, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; /* clang-format on */

1 0

git:5.4:d9df74d4: http_client: do not set empty headers and body
by Daniel-Constantin Mierla 16 Dec '20

16 Dec '20

Module: kamailio Branch: 5.4 Commit: d9df74d43d736dd330f4f9aa364a9f0560717e1a URL: https://github.com/kamailio/kamailio/commit/d9df74d43d736dd330f4f9aa364a9f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-16T21:03:23+01:00 http_client: do not set empty headers and body (cherry picked from commit ce58411c462231d6ea1fc3b4acbf50520c2962ce) --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/d9df74d43d736dd330f4f9aa364a9f0… Patch: https://github.com/kamailio/kamailio/commit/d9df74d43d736dd330f4f9aa364a9f0… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 177e50eb14..e34dae58fd 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -894,8 +894,9 @@ static int ki_http_query_helper(sip_msg_t *_m, str *url, str *post, str *hdrs, LM_ERR("invalid url parameter\n"); return -1; } - ret = http_client_query(_m, url->s, &result, (post && post->s)?post->s:NULL, - (hdrs && hdrs->s)?hdrs->s:NULL); + ret = http_client_query(_m, url->s, &result, + (post && post->s && post->len>0)?post->s:NULL, + (hdrs && hdrs->s && hdrs->len>0)?hdrs->s:NULL); val.rs = result; val.flags = PV_VAL_STR;

1 0

git:master:ce58411c: http_client: do not set empty headers and body
by Daniel-Constantin Mierla 16 Dec '20

16 Dec '20

Module: kamailio Branch: master Commit: ce58411c462231d6ea1fc3b4acbf50520c2962ce URL: https://github.com/kamailio/kamailio/commit/ce58411c462231d6ea1fc3b4acbf505… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-16T20:54:57+01:00 http_client: do not set empty headers and body --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/ce58411c462231d6ea1fc3b4acbf505… Patch: https://github.com/kamailio/kamailio/commit/ce58411c462231d6ea1fc3b4acbf505… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 177e50eb14..e34dae58fd 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -894,8 +894,9 @@ static int ki_http_query_helper(sip_msg_t *_m, str *url, str *post, str *hdrs, LM_ERR("invalid url parameter\n"); return -1; } - ret = http_client_query(_m, url->s, &result, (post && post->s)?post->s:NULL, - (hdrs && hdrs->s)?hdrs->s:NULL); + ret = http_client_query(_m, url->s, &result, + (post && post->s && post->len>0)?post->s:NULL, + (hdrs && hdrs->s && hdrs->len>0)?hdrs->s:NULL); val.rs = result; val.flags = PV_VAL_STR;

1 0

INFO: RTC Devroom Fosdem 2021 - Online Event
by Daniel-Constantin Mierla 16 Dec '20

16 Dec '20

Hello, (cross-posting to kamailio public groups, a few may get this message duplicated). Fosdem 2021 is going to be online, meaning that it opens the possibility for everyone to do a presentation on the RTC Devroom, no longer being required to travel to Brussels. Therefore I am sending here the link to CFP in case someone would be interested to present about Kamailio or something else RTC-related: * https://github.com/FreeRTC/fosdem/blob/master/2021/cfp.md New speakers are always welcome! Only have in mind that the event is targeting developers and source code development, therefore your proposals have to be made from this perspective. Note also that submission deadline is 20th of December, very short time frame from now. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:master:d620aab9: xhttp: clang format code
by Daniel-Constantin Mierla 16 Dec '20

16 Dec '20

Module: kamailio Branch: master Commit: d620aab9d2bc16e7785d5be0ddecd016329055de URL: https://github.com/kamailio/kamailio/commit/d620aab9d2bc16e7785d5be0ddecd01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-16T08:29:41+01:00 xhttp: clang format code --- Modified: src/modules/xhttp/api.h Modified: src/modules/xhttp/xhttp_mod.c Modified: src/modules/xhttp/xhttp_trans.c Modified: src/modules/xhttp/xhttp_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/d620aab9d2bc16e7785d5be0ddecd01… Patch: https://github.com/kamailio/kamailio/commit/d620aab9d2bc16e7785d5be0ddecd01…

1 0

[kamailio/kamailio] Passing Listening Socket details through Environment Variables (#2585)
by sido420 15 Dec '20

15 Dec '20

I am not 100% sure if its a bug or feature request. And, I have already asked this question in mailing list. ### Description I was trying to pass environment variables to Kamailio that are definitely there in the container. Also, I am trying to use the environment variables to specify ports for Kamailio to listen on. I have already tried passing variables through -A option but to no avail. ### Expected behavior Please note that these values are known at start time so should work. #### Actual observed behavior Errors #### Debugging Data I have tried: ``` #!define TLS_TO_LISTEN tls:TLS_IP:$env(TLS_PORT) ``` I have also tried using in EVAPI `bind_addr` modparam but that throws errors: ``` #!define EVAPI_LISTEN "0.0.0.0:EVAPI_PORT" .. modparam("evapi", "bind_addr", EVAPI_LISTEN ) // IP and port to listen on for incoming TCP connections. ``` Error: ``` ERROR: evapi [evapi_mod.c:156]: mod_init(): invalid port: 0 ``` ### Additional Information ``` version: kamailio 5.4.2 (x86_64/linux) f8885c ``` * **Operating System**: Docker Container: ``` Linux fe1933ee6208 4.15.0-124-generic #127-Ubuntu SMP Fri Nov 6 10:54:43 UTC 2020 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/2585

2 2

git:master:4add1751: kemix: exported functions to get define values
by Daniel-Constantin Mierla 15 Dec '20

15 Dec '20

Module: kamailio Branch: master Commit: 4add1751ed673f062f2c79a2bc4c8f31955b6d1d URL: https://github.com/kamailio/kamailio/commit/4add1751ed673f062f2c79a2bc4c8f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-15T09:28:26+01:00 kemix: exported functions to get define values --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4add1751ed673f062f2c79a2bc4c8f3… Patch: https://github.com/kamailio/kamailio/commit/4add1751ed673f062f2c79a2bc4c8f3… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 37854bfa86..269dbd3dee 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -28,6 +28,7 @@ #include "../../core/sr_module.h" #include "../../core/dprint.h" #include "../../core/kemi.h" +#include "../../core/ppcfg.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" @@ -1054,6 +1055,45 @@ static sr_kemi_xval_t* ki_kx_gete_cturi(sip_msg_t *msg) return ki_kx_get_cturi_mode(msg, SR_KEMI_XVAL_NULL_EMPTY); } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_def(sip_msg_t *msg, str *dname) +{ + str *val; + + val = pp_define_get(dname->len, dname->s); + + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if (val==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s.s = val->s; + _sr_kemi_kx_xval.v.s.len = val->len; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static int ki_kx_get_defn(sip_msg_t *msg, str *dname) +{ + str *val; + int n = 0; + + val = pp_define_get(dname->len, dname->s); + + if (val != NULL) { + str2sint(val, &n); + } + + return n; +} + + /** * */ @@ -1354,6 +1394,16 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_def"), + SR_KEMIP_XVAL, ki_kx_get_def, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_defn"), + SR_KEMIP_INT, ki_kx_get_defn, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } }

1 0

Kamailio v5.4.3 Released
by Daniel-Constantin Mierla 14 Dec '20

14 Dec '20

Hello, Kamailio SIP Server v5.4.3 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.2. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.3. For more details about version 5.4.3 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2020/12/kamailio-v5-4-3-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.4:e19ae306: ChangeLog: content updated for v5.4.3
by Daniel-Constantin Mierla 14 Dec '20

14 Dec '20

Module: kamailio Branch: 5.4 Commit: e19ae3062ce67a7e163c7d9ea7b71ed73e8689f2 URL: https://github.com/kamailio/kamailio/commit/e19ae3062ce67a7e163c7d9ea7b71ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-14T11:39:47+01:00 ChangeLog: content updated for v5.4.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/e19ae3062ce67a7e163c7d9ea7b71ed… Patch: https://github.com/kamailio/kamailio/commit/e19ae3062ce67a7e163c7d9ea7b71ed…

1 0

git:5.4:32a19315: pkg/kamailio/deb: version set 5.4.3
by Victor Seva 14 Dec '20

14 Dec '20

Module: kamailio Branch: 5.4 Commit: 32a19315eb946f939ca9cd8c50aae98b78adcfa1 URL: https://github.com/kamailio/kamailio/commit/32a19315eb946f939ca9cd8c50aae98… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-12-14T09:44:34+01:00 pkg/kamailio/deb: version set 5.4.3 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/32a19315eb946f939ca9cd8c50aae98… Patch: https://github.com/kamailio/kamailio/commit/32a19315eb946f939ca9cd8c50aae98…

1 0

git:5.4:fc592bd1: Makefile.defs: version set to 5.4.3
by Daniel-Constantin Mierla 14 Dec '20

14 Dec '20

Module: kamailio Branch: 5.4 Commit: fc592bd1c4f0f0d400c8c50fbc7583157d7f4956 URL: https://github.com/kamailio/kamailio/commit/fc592bd1c4f0f0d400c8c50fbc75831… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-14T09:25:07+01:00 Makefile.defs: version set to 5.4.3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/fc592bd1c4f0f0d400c8c50fbc75831… Patch: https://github.com/kamailio/kamailio/commit/fc592bd1c4f0f0d400c8c50fbc75831… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 34df5d7295..1f5e5518b6 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = # memory manager switcher

1 0

git:5.4:b1b2067d: pkg: version set to 5.4.3 for rpms and apline
by Daniel-Constantin Mierla 14 Dec '20

14 Dec '20

Module: kamailio Branch: 5.4 Commit: b1b2067d360be72d536b7372c5bafd918bb57593 URL: https://github.com/kamailio/kamailio/commit/b1b2067d360be72d536b7372c5bafd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-14T08:56:22+01:00 pkg: version set to 5.4.3 for rpms and apline --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b1b2067d360be72d536b7372c5bafd9… Patch: https://github.com/kamailio/kamailio/commit/b1b2067d360be72d536b7372c5bafd9… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 41af6c2024..c443804535 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.2 +pkgver=5.4.3 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 6b22aefa59..950dd4b0e4 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.2 +%define ver 5.4.3 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing Kamailio v5.4.3
by Daniel-Constantin Mierla 14 Dec '20

14 Dec '20

Hello, I am considering to release Kamailio v5.4.3 sometime next week, likely on Monday, December 14, 2020. This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

1 1

git:master:5272c8a2: tm: free proxy structure in latest kemi export
by Daniel-Constantin Mierla 14 Dec '20

14 Dec '20

Module: kamailio Branch: master Commit: 5272c8a2ec910e5d9e37067e94089a42a5198fd9 URL: https://github.com/kamailio/kamailio/commit/5272c8a2ec910e5d9e37067e94089a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-14T07:34:07+01:00 tm: free proxy structure in latest kemi export --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/5272c8a2ec910e5d9e37067e94089a4… Patch: https://github.com/kamailio/kamailio/commit/5272c8a2ec910e5d9e37067e94089a4… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index fcc312aeb6..4113743f3f 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2927,7 +2927,8 @@ static int ki_t_relay_to_proto_addr(sip_msg_t *msg, str *sproto, str *host, int { int proto = PROTO_NONE; - struct proxy_l *proxy; + proxy_l_t *proxy = NULL; + int ret = -1; if (sproto != NULL && sproto->s != NULL && sproto->len == 3) { if (strncasecmp(sproto->s, "UDP", 3) == 0) { @@ -2947,7 +2948,10 @@ static int ki_t_relay_to_proto_addr(sip_msg_t *msg, str *sproto, str *host, int host->s, port ); return E_BAD_ADDRESS; } - return _w_t_relay_to(msg, proxy, proto); + ret = _w_t_relay_to(msg, proxy, proto); + free_proxy(proxy); + pkg_free(proxy); + return ret; } /**

1 0

[kamailio/kamailio] Kamailio-5.4.: Crashs from keepalive module (#2476)
by zhangyang 14 Dec '20

14 Dec '20

### Description I just update kamailio 5.2.1 to 5.4.1. then there are some crashs from keepalive module. ### Troubleshooting ![image](https://user-images.githubusercontent.com/16113837/93066033-08c29880-f6ac-11ea-8660-12348f8881ab.png) #### Reproduction #### Debugging Data ``` Thread 1 (Thread 0x2b4d0df90d00 (LWP 30239)): #0 0x00000000004ef1a7 in atomic_cmpxchg_int (var=0x0, old=0, new_v=1) at core/mem/../atomic/atomic_x86.h:224 #1 0x00000000004ef21a in futex_get (lock=0x0) at core/mem/../futexlock.h:99 #2 0x00000000004f339a in timer_add_safe (tl=0x2b4d13af7928, delta=8) at core/timer.c:543 #3 0x00002b4d133b32c3 in ka_add_dest (uri=0x7ffe571d1440, owner=0x7ffe571d1430, flags=0, ping_interval=3, statechanged_clb=0x0, response_clb=0x0, user_attr=0x0) at keepalive_api.c:120 #4 0x00002b4d133b95ff in ka_mod_add_destination (type=2147483649, val=0x2b4d0ed29300) at keepalive_mod.c:244 #5 0x00000000006615b8 in set_mod_param_regex (regex=0x2b4d0ed29130 "keepalive", name=0x2b4d0ed29218 "destination", type=1, val=0x2b4d0ed29300) at core/modparam.c:125 #6 0x00000000007becec in yyparse () at core/cfg.y:1842 #7 0x000000000042f216 in main (argc=5, argv=0x7ffe571d2578) at main.c:2320 #3 0x00002b4d133b32c3 in ka_add_dest (uri=0x7ffe571d1440, owner=0x7ffe571d1430, flags=0, ping_interval=3, statechanged_clb=0x0, response_clb=0x0, user_attr=0x0) at keepalive_api.c:120 120 if(timer_add(dest->timer, MS_TO_TICKS(KA_FIRST_TRY_DELAY)) < 0){ $2 = {next = 0x0, prev = 0x0, expire = 0, initial_timeout = 0, data = 0x2b4d13af7738, f = 0x2b4d133b4fbf <ka_check_timer>, flags = 0, slow_idx = 0} _uri = {user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, host = {s = 0x2b4d13af783c "172.18.67.47", len = 12}, port = {s = 0x0, len = 0}, params = {s = 0x0, len = 0}, sip_params = {s = 0x0, len = 0}, headers = {s = 0x0, len = 0}, port_no = 0, proto = 0, type = SIP_URI_T, flags = (unknown: 0), transport = {s = 0x0, len = 0}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = 0}, method = {s = 0x0, len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0x0, len = 0}, gr = {s = 0x0, len = 0}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, user_param_val = { s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 0}} dest = 0x2b4d13af7738 hollow = 0x0 __FUNCTION__ = "ka_add_dest" #2 0x00000000004f339a in timer_add_safe (tl=0x2b4d13af7928, delta=8) at core/timer.c:543 543 LOCK_TIMER_LIST(); ret = 0 __FUNCTION__ = "timer_add_safe" ``` #### Log Messages ``` Sep 14 15:49:34 localhost kamailio: INFO: pv [pv_shv.c:60]: shvar_init_locks(): locks array size 16 Sep 14 15:49:34 localhost kernel: kamailio[30186]: segfault at 0 ip 00000000004ef1a7 sp 00007ffdd2db9170 error 6 in kamailio[400000+4ae000] ``` #### SIP Traffic ``` (paste your sip traffic here) ``` ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**: ``` Linux version 3.10.0-327.el7.x86_64 (builder(a)kbuilder.dev.centos.org) (gcc version 4.8.3 20140911 (Red Hat 4.8.3-9) (GCC) ) #1 SMP Thu Nov 19 22:10:57 UTC 2015 ``` -- 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/2476

4 9

git:5.4:0dffe40c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 11 Dec '20

11 Dec '20

Module: kamailio Branch: 5.4 Commit: 0dffe40c25f59ba796edab7653633fe6c0773dc8 URL: https://github.com/kamailio/kamailio/commit/0dffe40c25f59ba796edab7653633fe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-11T21:01:26+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/0dffe40c25f59ba796edab7653633fe… Patch: https://github.com/kamailio/kamailio/commit/0dffe40c25f59ba796edab7653633fe…

1 0

git: new commits in branch 5.4
by Daniel-Constantin Mierla 11 Dec '20

11 Dec '20

- URL: https://github.com/kamailio/kamailio/commit/4851f0318bf049ccef93390f6ac0fdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:39:20+01:00 tm: proper fill of From/To URI/tag values using parsed structure in t_uac_send() (cherry picked from commit aa6e9963b2725c1b6b7e5ff995a77c222d95fa3c) - URL: https://github.com/kamailio/kamailio/commit/66f5cc9d021eca4a9acfbca935e991c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:40:25+01:00 misc/examples: note that sr is exported by app_lua_sr - hint for lua syntax check (cherry picked from commit 889431746d24c73eeff73705fab36a0e154116a9) - URL: https://github.com/kamailio/kamailio/commit/c5793f508aa115146e10c2f32691a29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:41:11+01:00 misc/examples/kemi: filter on user agent matching friendly, scanner and sipvicious (cherry picked from commit e15c90d31fd0444f41cb862408f77399123c0191) - URL: https://github.com/kamailio/kamailio/commit/fba5f6172932c7925dce1ee49fbfeb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:41:24+01:00 etc/kamailio.cfg: split to filter on both friendly and scanner - some scanning scripts use a different format for the user agent (cherry picked from commit 454c4653409a69ef115de5ee748524d36e147246) - URL: https://github.com/kamailio/kamailio/commit/0744976d1ab80caf09f80b7594d2c76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:41:59+01:00 misc/examples/kemi: fixed function name to get From-URI (cherry picked from commit 6035c30aea72d06bf08883677d45f4eb0019f189) - URL: https://github.com/kamailio/kamailio/commit/d610f27185eafe275e98c567f1c1781… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-12-11T20:42:32+01:00 smsops: fix len calc for a concatenated sms - fixed the calculation for concatenated SMSs based on TS 23.040, Sec. 9.2.3.16 (cherry picked from commit d90f29b3b03386add989aebe3865bdc78dff8fbe) - URL: https://github.com/kamailio/kamailio/commit/5c6ddfea8845cd2d76bd15ec5511d15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:43:29+01:00 dispatcher: removed unnecessary return (cherry picked from commit 721d533317c735d7ddbd16ad94684b483468c010) - URL: https://github.com/kamailio/kamailio/commit/7c7fc27eb10372fda305a65c2dacea6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:44:23+01:00 core: check if the tcp clone rcv buffer is set when applying changes (cherry picked from commit aa13720e5d78dde5ae5235c13399848cb8f5a0cc) - URL: https://github.com/kamailio/kamailio/commit/4b5f58be3101c4efe745f37e286bf84… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-11T20:45:23+01:00 lost: fixed typo (cherry picked from commit 87f363f7fa0bf8f1897a3d6de13a09d6ec3812b9) - URL: https://github.com/kamailio/kamailio/commit/e7f616df3f68bd7c53150ad20a8ec5a… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-11T20:45:37+01:00 lost: removed extra `"` symbol in example (cherry picked from commit 124499c12db185d85805e5c71d5cc4222e608b68) - URL: https://github.com/kamailio/kamailio/commit/7ef04a11c4b92a49dcf94dade5bb0a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:46:39+01:00 auth_diameter: init variable and check before freeing (cherry picked from commit 04dc5d6c66c85d0d411aa23b27bc6be00258eff6) - URL: https://github.com/kamailio/kamailio/commit/f72f1effb079f66714f4399b12eaba0… Author: Patrick Wakano <patrick.wakano(a)ipscape.com> Date: 2020-12-11T20:46:56+01:00 dialog: access dialog table entry by reference for dmq_send_all_dlgs - avoid race conditions to get and release the lock when entry structure is copied in local variable - GH #2570, GH #2547 (cherry picked from commit 4183b860e8af6d65074ab98a996c187211aebc7f) - URL: https://github.com/kamailio/kamailio/commit/cb6d5b577aa9eb3d60cb71a60133dd4… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-11T20:47:18+01:00 lost: trimed spaces before reolving locationURI value fixes GH2569 (#2569). Allow parse exmaples from RFC7840 (cherry picked from commit f9d424ac426dc0547c7233902dfa44ad1287e077) - URL: https://github.com/kamailio/kamailio/commit/bded4ca0918a4a48e7d1001bc924b31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:47:37+01:00 pv: use static buffer for ctime_r() output and check its return - fixed $TF output, regression introduced when switching to thread safe time function (cherry picked from commit 02fc919e4f177cc3ab9c5d53eb9ea2019c572bd9) - URL: https://github.com/kamailio/kamailio/commit/bec3650b51342a9b093ca92134c3b22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:48:18+01:00 core: tcp - debug messages merged, print bytes read and flags (cherry picked from commit efb9c5f83b37c316b848ae7b6dc829e2f8ca6275) - URL: https://github.com/kamailio/kamailio/commit/834bca2dab19fd1a63386e28955428c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:48:37+01:00 core: tcp - log connection state and flags on debug message (cherry picked from commit 41040a0420ee48f51901bf32e29526c8948ecea0) - URL: https://github.com/kamailio/kamailio/commit/24666d2223c8e718ed9abe949a74d43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T20:48:51+01:00 dispacher: docs - more details about weight and rweight attributes - cross reference sections that have info about weight and rweight attributes (cherry picked from commit db55715003cd9af5ef3d32b51b5246643eea10d1)

1 0

git:master:7811f2df: pv: new var $defn(name)
by Daniel-Constantin Mierla 11 Dec '20

11 Dec '20

Module: kamailio Branch: master Commit: 7811f2dfa8b2465bb9c5b962038b03c50c1d399c URL: https://github.com/kamailio/kamailio/commit/7811f2dfa8b2465bb9c5b962038b03c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-11T14:21:53+01:00 pv: new var $defn(name) - return the value of a define converted to numbaer (signed int) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/7811f2dfa8b2465bb9c5b962038b03c… Patch: https://github.com/kamailio/kamailio/commit/7811f2dfa8b2465bb9c5b962038b03c… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index bd80bafed7..67f42c227d 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -196,8 +196,10 @@ static pv_export_t mod_pvs[] = { {{"dd", (sizeof("dd")-1)}, /* */ PVT_OTHER, pv_get_dsturi_attr, 0, 0, 0, pv_init_iname, 1}, - {{"def", (sizeof("env")-1)}, PVT_OTHER, pv_get_def, 0, + {{"def", (sizeof("def")-1)}, PVT_OTHER, pv_get_def, 0, pv_parse_def_name, 0, 0, 0}, + {{"defn", (sizeof("defn")-1)}, PVT_OTHER, pv_get_defn, 0, + pv_parse_defn_name, 0, 0, 0}, {{"di", (sizeof("di")-1)}, /* */ PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 1}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index e569a393e8..681e6beab1 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3797,3 +3797,29 @@ int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } +int pv_parse_defn_name(pv_spec_p sp, str *in) +{ + if (in == NULL || in->s == NULL || sp == NULL) { + LM_ERR("INVALID DEF NAME\n"); + return -1; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_NAME_STR; + sp->pvp.pvn.u.isname.name.s = *in; + return 0; + +} + +int pv_get_defn(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + int n = 0; + str *val = pp_define_get(param->pvn.u.isname.name.s.len, + param->pvn.u.isname.name.s.s); + + if (val) { + str2sint(val, &n); + return pv_get_intstrval(msg, param, res, n, val); + } else { + return pv_get_sintval(msg, param, res, n); + } +} diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 29ec9f25a4..afcaa1f84a 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -397,5 +397,8 @@ int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, int pv_parse_def_name(pv_spec_p sp, str *in); int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_defn_name(pv_spec_p sp, str *in); +int pv_get_defn(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); + #endif

1 0

git:master:ba27633c: dispatcher: info log message when adding extra weight or rweight percentages
by Daniel-Constantin Mierla 10 Dec '20

10 Dec '20

Module: kamailio Branch: master Commit: ba27633ca22bcfc18fd4bb7d62c2f5bb32e56962 URL: https://github.com/kamailio/kamailio/commit/ba27633ca22bcfc18fd4bb7d62c2f5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-10T17:07:30+01:00 dispatcher: info log message when adding extra weight or rweight percentages --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/ba27633ca22bcfc18fd4bb7d62c2f5b… Patch: https://github.com/kamailio/kamailio/commit/ba27633ca22bcfc18fd4bb7d62c2f5b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index c1f4dbfd8f..c0a6d22fc0 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -653,6 +653,10 @@ int dp_init_relative_weights(ds_set_t *dset) /* if the array was not completely filled (i.e., the sum of rweights is * less than 100 due to truncated), then use last address to fill the rest */ last_insert = t > 0 ? dset->rwlist[t - 1] : (unsigned int)(dset->nr - 1); + if(t < 100) { + LM_INFO("extra rweight %d for last active destination in group %d\n", + (100-t), dset->id); + } for(j = t; j < 100; j++) dset->rwlist[j] = last_insert; @@ -706,6 +710,10 @@ int dp_init_weights(ds_set_t *dset) } /* if the array was not completely filled (i.e., the sum of weights is * less than 100), then use last address to fill the rest */ + if(t < 100) { + LM_INFO("extra weight %d for last destination in group %d\n", + (100-t), dset->id); + } for(; t < 100; t++) dset->wlist[t] = (unsigned int)(dset->nr - 1); randomize:

1 0

git:master:547f0678: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 10 Dec '20

10 Dec '20

Module: kamailio Branch: master Commit: 547f06785187a0af5e10ff71c3ed91a1ee300528 URL: https://github.com/kamailio/kamailio/commit/547f06785187a0af5e10ff71c3ed91a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-10T16:46:14+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/547f06785187a0af5e10ff71c3ed91a… Patch: https://github.com/kamailio/kamailio/commit/547f06785187a0af5e10ff71c3ed91a… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 27d35e78cc..5b029903f4 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1719,18 +1719,20 @@ kamctl rpc dispatcher.hash 4 bob server.com for new calls until an exiting call via that gateway is terminated. If set to 0, then no active call limit is used.> * 'weight' - used for weight based load distribution. It must be set - to a positive integer value beteen 0 and 100. The value represents - the percent of calls to be sent to that gateways. The sum must not - exceed 100, otherwise the destinations whose weight added to the - sum go over 100 are ignored. If the sum is less than 100, then the - last destination is used to fill the missing percentage. See also - the description of the corresponding algorithm parameter for - ds_select_dst(). + to a positive integer value beteen 1 and 100 (inclusive the + limits), otherwise the destination address is ignored (its weight + set to 0). The value represents the percent of calls to be sent to + that gateways. The sum must not exceed 100, otherwise the + destinations whose weight added to the sum go over 100 are ignored. + If the sum is less than 100, then the last destination is used to + fill the missing percentage. See also the description of the + corresponding algorithm parameter for ds_select_dst(). * 'rweight' - used for relative weight based load distribution. It must be set to a positive integer value between 1 and 100 - (otherwise host will be excluded from relative weight distribution - type). See also the description of the corresponding algorithm - parameter for ds_select_dst(). + (inclusive the limits) otherwise host will be excluded from + relative weight distribution type - its rweight is set to 0. See + also the description of the corresponding algorithm parameter for + ds_select_dst(). * 'socket' - used to set the sending socket for the gateway. It is used for sending the SIP traffic as well as OPTIONS keepalives. * 'sockname' - used to set by name the sending socket for the

1 0

git:master:e00f6102: dispatcher: check weight value to be in expected range
by Daniel-Constantin Mierla 10 Dec '20

10 Dec '20

Module: kamailio Branch: master Commit: e00f610203fee957a22afc5f8103c1482a925138 URL: https://github.com/kamailio/kamailio/commit/e00f610203fee957a22afc5f8103c14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-10T16:41:18+01:00 dispatcher: check weight value to be in expected range --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/e00f610203fee957a22afc5f8103c14… Patch: https://github.com/kamailio/kamailio/commit/e00f610203fee957a22afc5f8103c14… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index e52ffdeae8..c1f4dbfd8f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -284,7 +284,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) param_hooks_t phooks; param_t *pit = NULL; str param; - int tmp_rweight = 0; + int tmp_ival = 0; str sattrs; if(vattrs == NULL || vattrs->len <= 0) { @@ -319,7 +319,15 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) str2sint(&pit->body, &dest->attrs.congestion_control); } else if(pit->name.len == 6 && strncasecmp(pit->name.s, "weight", 6) == 0) { - str2sint(&pit->body, &dest->attrs.weight); + tmp_ival = 0; + str2sint(&pit->body, &tmp_ival); + if(tmp_ival >= 1 && tmp_ival <= 100) { + dest->attrs.weight = tmp_ival; + } else { + dest->attrs.weight = 0; + LM_ERR("weight %d not in 1-100 range - ignoring destination", + tmp_ival); + } } else if(pit->name.len == 7 && strncasecmp(pit->name.s, "latency", 7) == 0) { int initial_latency = 0; @@ -336,12 +344,13 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) dest->attrs.sockname = pit->body; } else if(pit->name.len == 7 && strncasecmp(pit->name.s, "rweight", 7) == 0) { - tmp_rweight = 0; - str2sint(&pit->body, &tmp_rweight); - if(tmp_rweight >= 1 && tmp_rweight <= 100) { - dest->attrs.rweight = tmp_rweight; + tmp_ival = 0; + str2sint(&pit->body, &tmp_ival); + if(tmp_ival >= 1 && tmp_ival <= 100) { + dest->attrs.rweight = tmp_ival; } else { - LM_ERR("rweight %d not in 1-100 range; skipped", tmp_rweight); + dest->attrs.rweight = 0; + LM_WARN("rweight %d not in 1-100 range - ignoring", tmp_ival); } } else if(pit->name.len == 9 && strncasecmp(pit->name.s, "ping_from", 9) == 0) {

1 0

git:master:15a535c7: dispacher: docs - note that the range for weights include the limits
by Daniel-Constantin Mierla 10 Dec '20

10 Dec '20

Module: kamailio Branch: master Commit: 15a535c7eae5a4954d51667c8ec8d7900a7d26fe URL: https://github.com/kamailio/kamailio/commit/15a535c7eae5a4954d51667c8ec8d79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-10T16:41:18+01:00 dispacher: docs - note that the range for weights include the limits --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/15a535c7eae5a4954d51667c8ec8d79… Patch: https://github.com/kamailio/kamailio/commit/15a535c7eae5a4954d51667c8ec8d79… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 53eea613ce..45f93a3121 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2147,20 +2147,21 @@ kamctl rpc dispatcher.hash 4 bob server.com </listitem> <listitem> <para>'weight' - used for weight based load distribution. It must be set - to a positive integer value beteen 0 and 100. The value represents - the percent of calls to be sent to that gateways. The sum must not - exceed 100, otherwise the destinations whose weight added to the - sum go over 100 are ignored. If the sum is less than 100, then the - last destination is used to fill the missing percentage. See also - the description of the corresponding algorithm parameter for + to a positive integer value beteen 1 and 100 (inclusive the limits), + otherwise the destination address is ignored (its weight set to 0). + The value represents the percent of calls to be sent to that gateways. + The sum must not exceed 100, otherwise the destinations whose weight + added to the sum go over 100 are ignored. If the sum is less than 100, + then the last destination is used to fill the missing percentage. See + also the description of the corresponding algorithm parameter for ds_select_dst().</para> </listitem> <listitem> <para>'rweight' - used for relative weight based load distribution. It - must be set to a positive integer value between 1 and 100 (otherwise - host will be excluded from relative weight distribution - type). See also the description of the corresponding algorithm - parameter for ds_select_dst().</para> + must be set to a positive integer value between 1 and 100 (inclusive + the limits) otherwise host will be excluded from relative weight + distribution type - its rweight is set to 0. See also the description + of the corresponding algorithm parameter for ds_select_dst().</para> </listitem> <listitem> <para>'socket' - used to set the sending socket for the gateway. It is

1 0

git:master:7fa61a98: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 10 Dec '20

10 Dec '20

Module: kamailio Branch: master Commit: 7fa61a98a52723ee6f990e9cc3aee252f23d433a URL: https://github.com/kamailio/kamailio/commit/7fa61a98a52723ee6f990e9cc3aee25… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-10T16:31:24+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/7fa61a98a52723ee6f990e9cc3aee25… Patch: https://github.com/kamailio/kamailio/commit/7fa61a98a52723ee6f990e9cc3aee25… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 7db3838dec..27d35e78cc 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1063,8 +1063,8 @@ modparam("dispatcher", "reload_delta", 1) (serial forking ordered by priority). + “9” - use weight based load distribution. You have to set the attribute 'weight' for each address (gateway) in destination - set. For more see the description of the 'weight' attribute in - the 'Special Attributes' section. + set. See also the description of the 'weight' attribute in the + 'Special Attributes' section. + “10” - use call load distribution. You have to set the attribute 'duid' (as an unique string id) per each address in destination set. Also, you must set the parameter @@ -1086,10 +1086,14 @@ modparam("dispatcher", "reload_delta", 1) active host rweights in destination group). The major difference from the weight distribution is the probability recalculation according to rweight value in case - of host enabling/disabling - For example, 100 calls in 3-hosts group with rweight params - 1/2/1 will be distributed as 25/50/25. After third host - failing distribution will be changed to 33/67/0. + of destinations being active or inactive. + For example, 100 calls in 3-destinations group with rweight + params 1/2/1 will be distributed as 25/50/25. If the third + destination becomes inactive, the distribution is changed to + 33/67/0. If the computation of percentage per destination is + not an exact integer number, the value is trucated and the + last destination is used to fill the remaining percentage till + 100. Using this algorithm, you can also enable congestion control by setting the attribute 'cc=1', when 'cc' is enabled the 'weight' attribute will also be used to control congestion @@ -1102,6 +1106,8 @@ modparam("dispatcher", "reload_delta", 1) above their congestion threshold(weight), the load distribution is instead done using the ratio of estimated congestion ms. + See also the description of the 'rweight' attribute in the + 'Special Attributes' section. + “12” - dispatch to all destination in setid at once (parallel forking). Note that the XAVPs are no longer set with the values of the destination records, no re-routing making sense @@ -1714,11 +1720,17 @@ kamctl rpc dispatcher.hash 4 bob server.com If set to 0, then no active call limit is used.> * 'weight' - used for weight based load distribution. It must be set to a positive integer value beteen 0 and 100. The value represents - the percent of calls to be sent to that gateways.> + the percent of calls to be sent to that gateways. The sum must not + exceed 100, otherwise the destinations whose weight added to the + sum go over 100 are ignored. If the sum is less than 100, then the + last destination is used to fill the missing percentage. See also + the description of the corresponding algorithm parameter for + ds_select_dst(). * 'rweight' - used for relative weight based load distribution. It must be set to a positive integer value between 1 and 100 (otherwise host will be excluded from relative weight distribution - type). + type). See also the description of the corresponding algorithm + parameter for ds_select_dst(). * 'socket' - used to set the sending socket for the gateway. It is used for sending the SIP traffic as well as OPTIONS keepalives. * 'sockname' - used to set by name the sending socket for the

1 0

git:master:db557150: dispacher: docs - more details about weight and rweight attributes
by Daniel-Constantin Mierla 10 Dec '20

10 Dec '20

Module: kamailio Branch: master Commit: db55715003cd9af5ef3d32b51b5246643eea10d1 URL: https://github.com/kamailio/kamailio/commit/db55715003cd9af5ef3d32b51b52466… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-10T16:25:49+01:00 dispacher: docs - more details about weight and rweight attributes - cross reference sections that have info about weight and rweight attributes --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/db55715003cd9af5ef3d32b51b52466… Patch: https://github.com/kamailio/kamailio/commit/db55715003cd9af5ef3d32b51b52466… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 953c6b0b57..53eea613ce 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1193,7 +1193,7 @@ modparam("dispatcher", "reload_delta", 1) <para> <quote>9</quote> - use weight based load distribution. You have to set the attribute 'weight' for each address (gateway) in - destination set. For more see the description of the 'weight' + destination set. See also the description of the 'weight' attribute in the 'Special Attributes' section. </para> </listitem> @@ -1232,12 +1232,15 @@ modparam("dispatcher", "reload_delta", 1) <para> The major difference from the weight distribution is the probability recalculation according to rweight value in case of - host enabling/disabling + destinations being active or inactive. </para> <para> - For example, 100 calls in 3-hosts group with rweight params 1/2/1 - will be distributed as 25/50/25. After third host failing - distribution will be changed to 33/67/0. + For example, 100 calls in 3-destinations group with rweight params 1/2/1 + will be distributed as 25/50/25. If the third destination becomes + inactive, the distribution is changed to 33/67/0. If the computation + of percentage per destination is not an exact integer number, the value + is trucated and the last destination is used to fill the remaining + percentage till 100. </para> <para> Using this algorithm, you can also enable congestion control by setting the @@ -1252,6 +1255,10 @@ modparam("dispatcher", "reload_delta", 1) If all the gateways in a set are above their congestion threshold(weight), the load distribution is instead done using the ratio of estimated congestion ms. </para> + <para> + See also the description of the 'rweight' attribute in the + 'Special Attributes' section. + </para> </listitem> <listitem> <para> @@ -2141,13 +2148,19 @@ kamctl rpc dispatcher.hash 4 bob server.com <listitem> <para>'weight' - used for weight based load distribution. It must be set to a positive integer value beteen 0 and 100. The value represents - the percent of calls to be sent to that gateways.></para> + the percent of calls to be sent to that gateways. The sum must not + exceed 100, otherwise the destinations whose weight added to the + sum go over 100 are ignored. If the sum is less than 100, then the + last destination is used to fill the missing percentage. See also + the description of the corresponding algorithm parameter for + ds_select_dst().</para> </listitem> <listitem> <para>'rweight' - used for relative weight based load distribution. It must be set to a positive integer value between 1 and 100 (otherwise host will be excluded from relative weight distribution - type).</para> + type). See also the description of the corresponding algorithm + parameter for ds_select_dst().</para> </listitem> <listitem> <para>'socket' - used to set the sending socket for the gateway. It is

1 0

[kamailio/kamailio] Microsoft Teams and Survivable Branch Appliance (SBA) (#2580)
by MarkMasiak 10 Dec '20

10 Dec '20

Support for Teams Survivable Branch Appliance Direct Routing Occasionally, a customer site using Direct Routing to connect to Microsoft Phone System may experience an internet outage. Assume that the customer site--called a branch--temporarily cannot connect to the Microsoft cloud through Direct Routing. However, the intranet inside the branch is still fully functional and users can connect to the Session Border Controller (SBC) that is providing PSTN connectivity. https://docs.microsoft.com/en-us/microsoftteams/direct-routing-survivable-b… -- -- 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/2580

2 2

[kamailio/kamailio] Deadlocks after ungracefully terminated TLS connections (#2395)
by Laszlo 09 Dec '20

09 Dec '20

This bug report concerns a Kamailio instance that's functioning as an edge proxy, accepting requests from clients over TLS and forwarding them to internal components over UDP. I've observed occasional "deadlocks" that all take place after there were connectivity issues between Kamailio and one or more of the clients (logging messages such as "tcp_send failed", "handle_tcpconn_ev(): connect x failed", "tcp_read_data(): error reading: Connection reset by peer"). Environment: * Ubuntu 16.04 * Kamailio 5.2.7 (5.2.7+ubuntu16.04) Relevant config: ``` # for TLS clients socket_workers=10 listen=tls:wan.ip:TLS_PORT # to be able to forward incoming TCP requests to UDP destinations socket_workers=10 listen=udp:wan.ip:TLS_PORT # for RPC commands socket_workers=2 listen=tcp:127.0.0.1:HTTP_PORT ``` ## Reproduction After a lot of trial and error, I've found a way to somewhat reproducibly trigger the problem using sipp. It involves setting up a large amount of simultaneous calls dialing into the edge proxy using TLS, to a destination UA that will answer the call and keep it open for a few seconds, then using `ctrl-c` to suddenly quit sipp which will ungracefully terminate the TCP/TLS connections. It takes me a couple of iterations to trigger the problem, e.g repeat until Kamailio starts failing: * start sipp * terminate sipp with ctrl-c * (quickly) restart sipp * terminate sipp * etc The amount of simultaneous calls has to be sufficiently large. In my environment I'm unable to reproduce the problem at all with 10-20 calls, while 50 calls always triggers the problem after a couple of iterations. Example sipp commandline: `sipp -nd -sf caller.xml -d 2000 -r 50 -l 500 -m 5000 -max_socket 1000 -t ln -tls_cert cert.crt -tls_key key.key kamailio.edge.proxy:5061` ## Failure mode 1 In one of the failure modes, it appears that all available TCP/TLS workers are permanently bricked; sipp's calls will simply timeout and not trigger any dialplan handling. Interestingly, even though I have dedicated workers for TLS (SIP client) and TCP (RPC commands), and my reproduction scenario doesn't connect to the HTTP_PORT at all, this failure scenario bricks the TCP (RPC) listeners as well; any curl requests to it will simply timeout as well. Kamailio will hang for a while on (systemd) restart. ## Failure mode 2 In another failure mode, it looks like the TCP workers are unaffected but the UDP perform forwarding to UDP destinations are broken. Sipp's calls will enter Kamailio, but forwarding (`relay()`) to the next hop will timeout even though the destination is functioning just fine. Since this failure mode doesn't break RPC I was able to enable debug logging: ``` 2020-07-07T17:26:58.770411+02:00 kamailio[24056]: INFO: From Customer 2020-07-07T17:26:58.770697+02:00 kamailio[24056]: DEBUG: pv [pv_trans.c:590]: tr_eval_string(): i=0 j=2 2020-07-07T17:26:58.770971+02:00 kamailio[24056]: DEBUG: dispatcher [dispatch.c:2055]: ds_manage_routes(): set [4] 2020-07-07T17:26:58.771248+02:00 kamailio[24056]: DEBUG: dispatcher [dispatch.c:2161]: ds_manage_routes(): using alg [0] hash [250849449] 2020-07-07T17:26:58.771535+02:00 kamailio[24056]: DEBUG: dispatcher [dispatch.c:2205]: ds_manage_routes(): selected [0-4-0/1] <sip:wan.ip:8065> 2020-07-07T17:26:58.771817+02:00 kamailio[24056]: DEBUG: dispatcher [dispatch.c:2226]: ds_manage_routes(): using first entry [4/1] 2020-07-07T17:26:58.772090+02:00 kamailio[24056]: DEBUG: dispatcher [dispatch.c:2269]: ds_manage_routes(): using entry [4/0] 2020-07-07T17:26:58.772362+02:00 kamailio[24056]: DEBUG: dispatcher [dispatch.c:2016]: ds_select_dst_limit(): selected target destinations: 2 2020-07-07T17:26:58.773001+02:00 kamailio[24056]: DEBUG: pv [pv_core.c:2611]: pv_set_force_sock(): trying to set send-socket to [udp:wan.ip:5061] 2020-07-07T17:26:58.773353+02:00 kamailio[24056]: DEBUG: <core> [core/socket_info.c:559]: grep_sock_info(): checking if host==us: 13==13 && [wan.ip] == [wan.ip] 2020-07-07T17:26:58.773829+02:00 kamailio[24056]: DEBUG: <core> [core/socket_info.c:566]: grep_sock_info(): checking if port 5061 (advertise 0) matches port 5061 2020-07-07T17:26:58.774122+02:00 kamailio[24056]: NOTICE: Relaying (cid: 1-9151(a)sipp.ip). 2020-07-07T17:26:58.774417+02:00 kamailio[24056]: DEBUG: siputils [checks.c:120]: has_totag(): no totag 2020-07-07T17:26:58.774708+02:00 kamailio[24056]: DEBUG: tm [t_lookup.c:1344]: t_newtran(): msg (0x7f69d1cc4980) id=1265/24056 global id=1265/24056 T start=(nil) 2020-07-07T17:26:58.774989+02:00 kamailio[24056]: DEBUG: tm [t_lookup.c:499]: t_lookup_request(): start searching: hash=43232, isACK=0 2020-07-07T17:26:58.775315+02:00 kamailio[24056]: DEBUG: tm [t_lookup.c:457]: matching_3261(): RFC3261 transaction matching failed - via branch [z9hG4bK-9151-1-1] 2020-07-07T17:26:58.775612+02:00 kamailio[24056]: DEBUG: tm [t_lookup.c:682]: t_lookup_request(): no transaction found 2020-07-07T17:26:58.775908+02:00 kamailio[24056]: DEBUG: <core> [core/md5utils.c:67]: MD5StringArray(): MD5 calculated: 0a5d4a8d13f9606523da9c4d193b2261 2020-07-07T17:26:58.776270+02:00 kamailio[24056]: DEBUG: <core> [core/dns_cache.c:3197]: dns_srv_sip_resolve(): (wan.ip, 0, 0), ip, ret=0 2020-07-07T17:26:58.776701+02:00 kamailio[24056]: DEBUG: <core> [core/msg_translator.c:1765]: check_boundaries(): no multi-part body 2020-07-07T17:26:58.777012+02:00 kamailio[24056]: DEBUG: <core> [core/msg_translator.c:2935]: create_via_hf(): id added: <;i=a701>, rcv proto=3 2020-07-07T17:26:58.777596+02:00 kamailio[24056]: DEBUG: tm [t_funcs.c:375]: t_relay_to(): new transaction forwarded 2020-07-07T17:26:58.777948+02:00 kamailio[24056]: DEBUG: <core> [core/receive.c:354]: receive_msg(): request-route executed in: 1927 usec 2020-07-07T17:26:58.778243+02:00 kamailio[24056]: DEBUG: <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list (nil) 2020-07-07T17:26:58.779265+02:00 kamailio[24056]: message repeated 5 times: [ DEBUG: <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list (nil)] 2020-07-07T17:26:58.779431+02:00 kamailio[24056]: DEBUG: <core> [core/xavp.c:507]: xavp_destroy_list(): destroying xavp list (nil) 2020-07-07T17:26:58.779753+02:00 kamailio[24056]: DEBUG: <core> [core/receive.c:458]: receive_msg(): cleaning up 2020-07-07T17:27:00.705303+02:00 kamailio[24053]: DEBUG: tm [t_reply.c:1266]: t_should_relay_response(): ->>>>>>>>> T_code=0, new_code=408 2020-07-07T17:27:00.705917+02:00 kamailio[24053]: DEBUG: tm [t_lookup.c:1041]: t_check_msg(): msg (0x7f69b1017e80) id=1264/24056 global id=1264/24056 T start=0x7f69b10167c0 2020-07-07T17:27:00.706187+02:00 kamailio[24053]: DEBUG: tm [t_lookup.c:1116]: t_check_msg(): T (0x7f69b10167c0) already found for msg (0x7f69b1017e80)! 2020-07-07T17:27:00.706533+02:00 kamailio[24053]: DEBUG: tmx [t_var.c:539]: pv_get_tm_reply_code(): reply code is <408> 2020-07-07T17:27:00.706879+02:00 kamailio[24053]: DEBUG: tm [t_lookup.c:1041]: t_check_msg(): msg (0x7f69b1017e80) id=1264/24056 global id=1264/24056 T start=0x7f69b10167c0 2020-07-07T17:27:00.707198+02:00 kamailio[24053]: DEBUG: tm [t_lookup.c:1116]: t_check_msg(): T (0x7f69b10167c0) already found for msg (0x7f69b1017e80)! 2020-07-07T17:27:00.707522+02:00 kamailio[24053]: DEBUG: tmx [t_var.c:594]: pv_get_tm_reply_reason(): reply reason is [Request Timeout] { "DSC": "tcp receiver (tls:wan.ip:5061) child=0", "IDX": 14, "PID": 24056 }, { "DSC": "slow timer", "IDX": 11, "PID": 24053 }, ``` Kamailio will restart (systemd) normally and everything will function normally again afterwards. -- 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/2395

3 19

[kamailio/kamailio] htable + dmq: sht_rm_name does not replicate (#2573)
by marcinkowalczyk 09 Dec '20

09 Dec '20

### Description I'm using htable DMQ replication to relicate call details over kamailio nodes. I've noticed that htable items are not removed when sht_rm_name is called inside script ### Troubleshooting #### Reproduction put in script: ``` $sht(cidParam=>$ci::callee_socket) = $sas; sht_rm_name("cidParam", "sw", "$ci"); ``` make a call and see what gets replicated `ngrep -W byline -d any '"htname":"cidParam"' | grep action ` When htable item is removed from htable using CLI removal it's replicated `{"action":3,"htname":"cidParam","cname":"x","mode":0}. ` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.1 (x86_64/linux) 09fd6a flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES 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: 09fd6a compiled on 11:07:49 Sep 1 2020 with gcc 4.8.5 ``` * **Operating System**: CentOS7 ``` Linux 3.10.0-1127.18.2.el7.x86_64 #1 SMP Sun Jul 26 15:27:06 UTC 2020 x86_64 x86_64 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/2573

2 7

git:master:41040a04: core: tcp - log connection state and flags on debug message
by Daniel-Constantin Mierla 08 Dec '20

08 Dec '20

Module: kamailio Branch: master Commit: 41040a0420ee48f51901bf32e29526c8948ecea0 URL: https://github.com/kamailio/kamailio/commit/41040a0420ee48f51901bf32e29526c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-08T13:07:44+01:00 core: tcp - log connection state and flags on debug message --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/41040a0420ee48f51901bf32e29526c… Patch: https://github.com/kamailio/kamailio/commit/41040a0420ee48f51901bf32e29526c… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 13a21f6ddd..50853cc5b6 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -296,9 +296,11 @@ int tcp_read_data(int fd, struct tcp_connection *c, } }else if (unlikely((bytes_read==0) || (*flags & RD_CONN_FORCE_EOF))){ - LM_DBG("EOF on %p, FD %d, bytes %d, flags %x ([%s]:%u -> [%s]:%u)", - c, fd, bytes_read, *flags, ip_addr2a(&c->rcv.src_ip), - c->rcv.src_port, ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); + LM_DBG("EOF on connection %p (state: %u, flags: %x) - FD %d," + " bytes %d, rd-flags %x ([%s]:%u -> [%s]:%u)", + c, c->state, c->flags, fd, bytes_read, *flags, + ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, + ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); c->state=S_CONN_EOF; *flags|=RD_CONN_EOF; tcp_emit_closed_event(c, TCP_CLOSED_EOF);

1 0

git:master:efb9c5f8: core: tcp - debug messages merged, print bytes read and flags
by Daniel-Constantin Mierla 08 Dec '20

08 Dec '20

Module: kamailio Branch: master Commit: efb9c5f83b37c316b848ae7b6dc829e2f8ca6275 URL: https://github.com/kamailio/kamailio/commit/efb9c5f83b37c316b848ae7b6dc829e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-08T12:50:56+01:00 core: tcp - debug messages merged, print bytes read and flags --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/efb9c5f83b37c316b848ae7b6dc829e… Patch: https://github.com/kamailio/kamailio/commit/efb9c5f83b37c316b848ae7b6dc829e… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 3ae21a71d9..13a21f6ddd 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -296,12 +296,12 @@ int tcp_read_data(int fd, struct tcp_connection *c, } }else if (unlikely((bytes_read==0) || (*flags & RD_CONN_FORCE_EOF))){ + LM_DBG("EOF on %p, FD %d, bytes %d, flags %x ([%s]:%u -> [%s]:%u)", + c, fd, bytes_read, *flags, ip_addr2a(&c->rcv.src_ip), + c->rcv.src_port, ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); c->state=S_CONN_EOF; *flags|=RD_CONN_EOF; tcp_emit_closed_event(c, TCP_CLOSED_EOF); - LM_DBG("EOF on %p, FD %d ([%s]:%u ->", c, fd, - ip_addr2a(&c->rcv.src_ip), c->rcv.src_port); - LM_DBG("-> [%s]:%u)\n", ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); }else{ if (unlikely(c->state==S_CONN_CONNECT || c->state==S_CONN_ACCEPT)){ TCP_STATS_ESTABLISHED(c->state);

1 0

git:master:d80ae5e8: htable: set the value for dmq replicate of rm with sw operation
by Daniel-Constantin Mierla 08 Dec '20

08 Dec '20

Module: kamailio Branch: master Commit: d80ae5e88edec8471ade209f9984bef488cbb06f URL: https://github.com/kamailio/kamailio/commit/d80ae5e88edec8471ade209f9984bef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-08T11:32:16+01:00 htable: set the value for dmq replicate of rm with sw operation --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/d80ae5e88edec8471ade209f9984bef… Patch: https://github.com/kamailio/kamailio/commit/d80ae5e88edec8471ade209f9984bef… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index d449839c2f..d05cf5227d 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -493,6 +493,7 @@ static int ht_rm_items(sip_msg_t* msg, str* hname, str* op, str *val, } return 1; } else if(strncmp(op->s, "sw", 2)==0) { + isval.s = *val; if (ht_dmq_replicate_action(HT_DMQ_RM_CELL_SW, &ht->name, NULL, AVP_VAL_STR, &isval, mkey)!=0) { LM_ERR("dmq relication failed (op %d)\n", mkey);

1 0

git:master:1a532a57: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 07 Dec '20

07 Dec '20

Module: kamailio Branch: master Commit: 1a532a57f568da3e9c2f2d953b0d5d8336baab44 URL: https://github.com/kamailio/kamailio/commit/1a532a57f568da3e9c2f2d953b0d5d8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-07T14:31:13+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/1a532a57f568da3e9c2f2d953b0d5d8… Patch: https://github.com/kamailio/kamailio/commit/1a532a57f568da3e9c2f2d953b0d5d8…

1 0

[kamailio/kamailio] rtpengine: query rtt per call leg (#2576)
by Julien Chavanton 07 Dec '20

07 Dec '20

#### Type Of Change - [x] New feature (non-breaking change which adds new functionality) #### Checklist: - [x] Tested changes locally #### Description This modification is to provide access to the new exposed metrics. RTPengine is now keeping track of RTT per call leg https://github.com/sipwise/rtpengine/pull/1116 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2576 -- Commit Summary -- * rtpengine: query rtt per call leg -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (185) M src/modules/rtpengine/rtpengine.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2576.patch https://github.com/kamailio/kamailio/pull/2576.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/2576

3 2

git:master:26a7b41f: rtpengine: query rtt per call leg (#2576)
by GitHub 07 Dec '20

07 Dec '20

Module: kamailio Branch: master Commit: 26a7b41f7a78f4cc4a7abbb82c1c38cf0927e40a URL: https://github.com/kamailio/kamailio/commit/26a7b41f7a78f4cc4a7abbb82c1c38c… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-12-07T08:26:19-05:00 rtpengine: query rtt per call leg (#2576) Co-authored-by: Julien Chavanton <jchavanton(a)subspace.com> --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/26a7b41f7a78f4cc4a7abbb82c1c38c… Patch: https://github.com/kamailio/kamailio/commit/26a7b41f7a78f4cc4a7abbb82c1c38c…

1 0

[kamailio/kamailio] dlgs v5.4.* dlgs_count wrong number (#2568)
by 狐狐 07 Dec '20

07 Dec '20

### Description Recently I upgraded kamailio to 5.4.2 using the dlgs module. No matter how many calls I make, the dlgs_count() and dlgs_tags_count() always return 1. After viewing the source code, I found the following bugs ### Troubleshooting #### Reproduction dlgs_init($fu,$tu,"data"); dlgs_update(); dlgs_count("any","eq","1"); and then make several calls, the dlgs_count always return 1. #### Debugging Data #### Log Messages ![image](https://user-images.githubusercontent.com/26111722/100606180-033c2c80-3344-11eb-9653-ebeefbeb70a7.png) nn ![image](https://user-images.githubusercontent.com/26111722/100606206-0c2cfe00-3344-11eb-98ba-1773046ec951.png) #### SIP Traffic ### Possible Solutions I find the `ki_dlgs_count` functions always return 1; ![image](https://user-images.githubusercontent.com/26111722/100605735-55308280-3343-11eb-9908-aa8f55e60f63.png) I modified the retrun value = 10086, then the `dlgs_count` always return 10086 ! ! I modified the return value = dlgs_count(msg, vfield, vop, vdata); then I found the dlgs_count always return 0; obviously there is still something wrong. then I run the dlgs_ht_dbg() in the dlgs_count (dlgs_records.c) and get some useful dbg log as above. as the picture shows，the slots[i].astats.c_init is always 0 or -1. I think maybe c_init is not initialized to 1 when dlgs_init . and I add the c_init's initial logic in the dlgs_add_items() then everything is fine ! ### Additional Information ``` Linux localhost.localdomain 3.10.0-1127.el7.x86_64 #1 SMP Tue Mar 31 23:36:51 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux kamailio version: kamailio 5.4.2 (x86_64/linux compiled on 20:13:39 Nov 9 2020 with gcc 4.8.5 ``` -- 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/2568

2 7

git:5.4:f8885c99: tm: check end of header name in lw parser
by Daniel-Constantin Mierla 07 Dec '20

07 Dec '20

Module: kamailio Branch: 5.4 Commit: f8885c990642d4f2bebe47ea7d1f6ce8673c29f6 URL: https://github.com/kamailio/kamailio/commit/f8885c990642d4f2bebe47ea7d1f6ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-07T14:07:33+01:00 tm: check end of header name in lw parser - proper identification of header type, prior could mistakenly set the type by matching the prefix of long header name - GH #2572 (cherry picked from commit c0f5382bfbd2022896a9b206967977f827517700) --- Modified: src/modules/tm/lw_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/f8885c990642d4f2bebe47ea7d1f6ce… Patch: https://github.com/kamailio/kamailio/commit/f8885c990642d4f2bebe47ea7d1f6ce…

1 0

[kamailio/kamailio] CANCEL msg results in "500 cancel error" because of "duplicate From header" error (#2572)
by Justin LaVelle 07 Dec '20

07 Dec '20

### CANCEL msg results in "500 cancel error" because of "duplicate From header" error  Cancelling a call before it's answered sometimes results in a "500 cancel error" response and the far end not getting a cancel msg. The from header seems to be wrongly detected as being duplicated. This issue does not exist in version 5.2.8 or 5.1.10, does exist in 5.3.7 and 5.4.2. >From header from CANCEL that generates the error ``` f:"user 1002"<sip:+1002@bf96cc.domain.com>;tag=8FUg427jU6pva ``` >From header from CANCEL that works fine ``` f:"Reseda Ca"<sip:+18185144209@bf96cc.domain.com>;tag=cm0KBFB1Fag7r ``` #### Log Messages  ``` Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:610]: parse_msg(): SIP Request: Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:612]: parse_msg(): method: <CANCEL> Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:614]: parse_msg(): uri: <sip:john.webrtc@bf96cc.domain.com> Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:616]: parse_msg(): version: <SIP/2.0> Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 235, <rport> = <n/a>; state=6 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKSg9eBr2tSDU5c>; state=16 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:498]: parse_headers(): Via found, flags=2 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:500]: parse_headers(): this is the first via Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=10 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <t> [41]; uri=[sip:john.webrtc@bf96cc.domain.com] Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:174]: get_hdr_field(): to body (41)[<sip:john.webrtc@bf96cc.domain.com>#015#012], to tag (0)[] Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <28924918> <CANCEL> Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/receive.c:319]: receive_msg(): --- received sip message - request - call-id: [39d19e18-afa6-1239-1dba-ea02c604123e] - cseq: [28924918 CANCEL] Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:185]: get_hdr_field(): content_length=0 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:89]: get_hdr_field(): found end of header Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/receive.c:379]: receive_msg(): preparing to run routing scripts... Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} pv [pv_core.c:1073]: pv_get_useragent(): no User-Agent header Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} maxfwd [mf_funcs.c:74]: is_maxfwd_present(): value = 68 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:727]: t_lookupOriginalT(): searching on hash entry 19365 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:439]: matching_3261(): RFC3261 transaction matched, tid=Sg9eBr2tSDU5c Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:823]: t_lookupOriginalT(): canceled transaction found (0x7f742bb6d000)! Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:826]: t_lookupOriginalT(): found - lookup completed Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [tm.c:1220]: ki_t_lookup_cancel_flags(): lookup_original: t_lookupOriginalT returned: 0x7f742bb6d000 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:1328]: t_newtran(): msg (0x7f74318090e8) id=97/2451 global id=96/2451 T start=0xffffffffffffffff Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:497]: t_lookup_request(): start searching: hash=19365, isACK=0 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:455]: matching_3261(): RFC3261 transaction matching failed - via branch [z9hG4bKSg9eBr2tSDU5c] Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:675]: t_lookup_request(): no transaction found Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=N53jU220NtrFH Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/crypto/md5utils.c:67]: MD5StringArray(): MD5 calculated: 3c5f13a67a8cbfe1028669836f4291d4 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:727]: t_lookupOriginalT(): searching on hash entry 19365 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:430]: matching_3261(): matched skip method - s:0x2 t:0x2 m:0x2 - continue searching Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:439]: matching_3261(): RFC3261 transaction matched, tid=Sg9eBr2tSDU5c Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:823]: t_lookupOriginalT(): canceled transaction found (0x7f742bb6d000)! Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:826]: t_lookupOriginalT(): found - lookup completed Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_msgbuilder.c:412]: build_local_reparse(): duplicate From header Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: ERROR: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_msgbuilder.c:531]: build_local_reparse(): cannot build CANCEL request Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: ERROR: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_cancel.c:297]: cancel_branch(): attempt to build a CANCEL failed Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: ERROR: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_fwd.c:1434]: e2e_cancel(): cancel error Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_reply.c:1761]: cleanup_uac_timers(): RETR/FR timers reset Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_reply.c:633]: _reply_light(): reply sent out - buf=0x7f74317ec440: SIP/2.0 500 cancel e... shmem=0x7f742bb77260: SIP/2.0 500 cancel e Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_reply.c:644]: _reply_light(): finished Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_funcs.c:376]: t_relay_to(): new transaction forwarded Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/receive.c:437]: receive_msg(): request-route executed in: 1125 usec Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list (nil) Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: message repeated 5 times: [ DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list (nil)] Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/xavp.c:539]: xavp_destroy_list(): destroying xavp list (nil) Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: message repeated 2 times: [ DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/xavp.c:539]: xavp_destroy_list(): destroying xavp list (nil)] Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/receive.c:528]: receive_msg(): cleaning up ``` #### SIP Traffic  ``` CANCEL sip:john.webrtc@bf96cc.domain.com SIP/2.0 v:SIP/2.0/UDP a.b.c.d:5081;rport;branch=z9hG4bKgZ5FU4aUKXjXm Route:<sip:kam3.rtp.lax.domain.net:5060> Max-Forwards:68 f:"user 1002"<sip:+1002@bf96cc.domain.com>;tag=8FUg427jU6pva t:<sip:john.webrtc@bf96cc.domain.com> i:98fa8010-afa4-1239-1dba-ea02c604123e CSeq:28924569 CANCEL Reason:SIP;cause=487;text="ORIGINATOR_CANCEL" l:0 ``` ### Possible Solutions  I found that Kamailio versions 5.2.10 and 5.2.8 do not have this issue, so for now have downgraded to 5.2.8. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES 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 5.4.0 ``` * **Operating System**: Ubuntu 16.04.7 LTS  ``` Linux kam3-lax 4.4.0-194-generic #226-Ubuntu SMP Wed Oct 21 10:19:36 UTC 2020 x86_64 x86_64 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/2572

2 6

[kamailio/kamailio] kamailio.cfg calling t_check_trans() without using the result? (#2578)
by space88man 07 Dec '20

07 Dec '20

### Description Why does the sample script call `t_check_trans()` without using the result? ``` if (!is_method("ACK")) { if(t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); } ``` ### Troubleshooting N/A #### Reproduction N/A view the kamailio.cfg script at https://github.com/kamailio/kamailio/blob/master/etc/kamailio.cfg #### Debugging Data N/A ### Possible Solutions ### Additional Information master branch * **Operating System**: 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/2578

2 2

[kamailio/kamailio] rtpengine_manage sends 180 Responses to rtpengine when onreply_route is enabled (#2577)
by aalba6675 05 Dec '20

05 Dec '20

### Description Different behaviour of rtpengine_manage depending on where it is called 1. Response 180 **is not** sent to rtpengine :12221 using only reply_route 1. Response 180 **is sent** to rtpengine :12221 using `onreply_route[MANAGE_REPLY]` Scenario 1 - reply_route only - call rtpenginge_manage() in reply_route for responses - works for 200 OK - for 180 Ringing, the command does not appear on the wire to rtpengine :12221 Scenario 2 - reply_route is empty, use `onreply_route[MANAGE_REPLY]` - call rtpenginge_manage() in `onreply_route[MANAGE_REPLY]` - works for 200 OK - for 180 Ringing, the command appears on the wire to rtpengine :12221, and SDP is injected ### Troubleshooting #### Reproduction 1. Confirmed that setup is working without `onreply_route[MANAGE_REPLY]` 2. Caller does not see any SDP inside 180 response; this means that rtpengine_manage decided not to end anything to rtpengine :12221 3. Move call to `rtpengine_manage()` inside `onreply_route[MANAGE_REPLAY]` 4. Now observe that SDP appears inside 180 response, indicating that rtpengine_manage decided that it should send the "offer" command to rtpengine :12221 #### Debugging Data -- 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/2577

1 2

git:5.4:b9846143: cfgt: log info when node is created and saved
by Victor Seva 04 Dec '20

04 Dec '20

Module: kamailio Branch: 5.4 Commit: b9846143c171d731e94d7f0d450b40f66f2ac2c6 URL: https://github.com/kamailio/kamailio/commit/b9846143c171d731e94d7f0d450b40f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-12-04T10:32:21+01:00 cfgt: log info when node is created and saved (cherry picked from commit a2eff905626c6428539d3d848e7968f5dd0f2108) --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/b9846143c171d731e94d7f0d450b40f… Patch: https://github.com/kamailio/kamailio/commit/b9846143c171d731e94d7f0d450b40f… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index c47a1cecc0..7b0c991285 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -429,6 +429,8 @@ void cfgt_save_node(cfgt_node_p node) } fclose(fp); node->jdoc.free_fn(dest.s); + LM_INFO("*** node uuid:[%.*s] id:[%d] saved ***\n", + STR_FMT(&node->uuid), node->msgid); } else { LM_ERR("Can't open file [%s] to write\n", dest.s); pkg_free(dest.s); @@ -767,7 +769,7 @@ int cfgt_msgin(sr_event_param_t *evp) int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar) { str unknown = {"unknown", 7}; - int get_hdr_result = 0; + int get_hdr_result = 0, res; if(_cfgt_node) { if(_cfgt_node->msgid == 0) { @@ -786,7 +788,10 @@ int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar) } pkg_str_dup(&_cfgt_node->uuid, &unknown); } - return _cfgt_get_uuid_id(_cfgt_node); + res = _cfgt_get_uuid_id(_cfgt_node); + LM_INFO("*** node uuid:[%.*s] id:[%d] created ***\n", + STR_FMT(&_cfgt_node->uuid), _cfgt_node->msgid); + return res; } else { LM_DBG("_cfgt_node->uuid:[%.*s]\n", _cfgt_node->uuid.len, _cfgt_node->uuid.s);

1 0

git:master:a2eff905: cfgt: log info when node is created and saved
by Victor Seva 04 Dec '20

04 Dec '20

Module: kamailio Branch: master Commit: a2eff905626c6428539d3d848e7968f5dd0f2108 URL: https://github.com/kamailio/kamailio/commit/a2eff905626c6428539d3d848e7968f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-12-04T10:23:04+01:00 cfgt: log info when node is created and saved --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/a2eff905626c6428539d3d848e7968f… Patch: https://github.com/kamailio/kamailio/commit/a2eff905626c6428539d3d848e7968f… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index c47a1cecc0..7b0c991285 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -429,6 +429,8 @@ void cfgt_save_node(cfgt_node_p node) } fclose(fp); node->jdoc.free_fn(dest.s); + LM_INFO("*** node uuid:[%.*s] id:[%d] saved ***\n", + STR_FMT(&node->uuid), node->msgid); } else { LM_ERR("Can't open file [%s] to write\n", dest.s); pkg_free(dest.s); @@ -767,7 +769,7 @@ int cfgt_msgin(sr_event_param_t *evp) int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar) { str unknown = {"unknown", 7}; - int get_hdr_result = 0; + int get_hdr_result = 0, res; if(_cfgt_node) { if(_cfgt_node->msgid == 0) { @@ -786,7 +788,10 @@ int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar) } pkg_str_dup(&_cfgt_node->uuid, &unknown); } - return _cfgt_get_uuid_id(_cfgt_node); + res = _cfgt_get_uuid_id(_cfgt_node); + LM_INFO("*** node uuid:[%.*s] id:[%d] created ***\n", + STR_FMT(&_cfgt_node->uuid), _cfgt_node->msgid); + return res; } else { LM_DBG("_cfgt_node->uuid:[%.*s]\n", _cfgt_node->uuid.len, _cfgt_node->uuid.s);

1 0

git:master:02fc919e: pv: use static buffer for ctime_r() output and check its return
by Daniel-Constantin Mierla 03 Dec '20

03 Dec '20

Module: kamailio Branch: master Commit: 02fc919e4f177cc3ab9c5d53eb9ea2019c572bd9 URL: https://github.com/kamailio/kamailio/commit/02fc919e4f177cc3ab9c5d53eb9ea20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-03T14:07:34+01:00 pv: use static buffer for ctime_r() output and check its return - fixed $TF output, regression introduced when switching to thread safe time function --- Modified: src/modules/pv/pv_time.c --- Diff: https://github.com/kamailio/kamailio/commit/02fc919e4f177cc3ab9c5d53eb9ea20… Patch: https://github.com/kamailio/kamailio/commit/02fc919e4f177cc3ab9c5d53eb9ea20… --- diff --git a/src/modules/pv/pv_time.c b/src/modules/pv/pv_time.c index 87b62b71e9..4a9cc14dd1 100644 --- a/src/modules/pv/pv_time.c +++ b/src/modules/pv/pv_time.c @@ -246,12 +246,16 @@ int pv_get_timenowf(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str s; - char t_buf[26] = {0}; + static char t_buf[26] = {0}; time_t t; t = time(NULL); s.s = ctime_r(&t, t_buf); + if(s.s == NULL) { + return pv_get_null(msg, param, res); + } + s.s = t_buf; s.len = strlen(s.s)-1; return pv_get_strintval(msg, param, res, &s, (int)t); } @@ -271,7 +275,7 @@ int pv_get_timef(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str s; - char t_buf[26] = {0}; + static char t_buf[26] = {0}; if(msg==NULL) return -1; @@ -279,6 +283,10 @@ int pv_get_timef(struct sip_msg *msg, pv_param_t *param, msg_set_time(msg); s.s = ctime_r(&msg->tval.tv_sec, t_buf); + if(s.s == NULL) { + return pv_get_null(msg, param, res); + } + s.s = t_buf; s.len = strlen(s.s)-1; return pv_get_strintval(msg, param, res, &s, (int)msg->tval.tv_sec); }

1 0

git:master:53664ba2: htable: replicate the operation rm with sw
by Daniel-Constantin Mierla 03 Dec '20

03 Dec '20

Module: kamailio Branch: master Commit: 53664ba26af389855444c1c2c6a78d53b276c0a0 URL: https://github.com/kamailio/kamailio/commit/53664ba26af389855444c1c2c6a78d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-03T13:50:58+01:00 htable: replicate the operation rm with sw - GH #2573 --- Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/53664ba26af389855444c1c2c6a78d5… Patch: https://github.com/kamailio/kamailio/commit/53664ba26af389855444c1c2c6a78d5… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index ccb67e30d8..42e1847d30 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -350,7 +350,9 @@ int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq return 0; } -int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, int type, int_str* val, int mode) { +int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, + int type, int_str* val, int mode) +{ srjson_doc_t jdoc; @@ -370,7 +372,8 @@ int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, int srjson_AddStrToObject(&jdoc, jdoc.root, "cname", cname->s, cname->len); } - if (action==HT_DMQ_SET_CELL || action==HT_DMQ_SET_CELL_EXPIRE || action==HT_DMQ_RM_CELL_RE) { + if (action==HT_DMQ_SET_CELL || action==HT_DMQ_SET_CELL_EXPIRE + || action==HT_DMQ_RM_CELL_RE || action==HT_DMQ_RM_CELL_SW) { srjson_AddNumberToObject(&jdoc, jdoc.root, "type", type); if (type&AVP_VAL_STR) { srjson_AddStrToObject(&jdoc, jdoc.root, "strval", val->s.s, val->s.len); @@ -407,7 +410,8 @@ int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, int return -1; } -int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, int type, int_str* val, int mode) { +int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, + int type, int_str* val, int mode) { ht_t* ht; ht = ht_get_table(htname); @@ -416,7 +420,8 @@ int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, int ty return -1; } - LM_DBG("replaying action %d on %.*s=>%.*s...\n", action, htname->len, htname->s, cname->len, cname->s); + LM_DBG("replaying action %d on %.*s=>%.*s...\n", action, + htname->len, htname->s, cname->len, cname->s); if (action==HT_DMQ_SET_CELL) { return ht_set_cell(ht, cname, type, val, mode); @@ -426,6 +431,8 @@ int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, int ty return ht_del_cell(ht, cname); } else if (action==HT_DMQ_RM_CELL_RE) { return ht_rm_cell_re(&val->s, ht, mode); + } else if (action==HT_DMQ_RM_CELL_SW) { + return ht_rm_cell_op(&val->s, ht, mode, HT_RM_OP_SW); } else { LM_ERR("unrecognized action\n"); return -1; diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index 55f2af783d..22c4876191 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -33,11 +33,12 @@ extern dmq_resp_cback_t ht_dmq_resp_callback; typedef enum { HT_DMQ_NONE, + HT_DMQ_SYNC, HT_DMQ_SET_CELL, HT_DMQ_SET_CELL_EXPIRE, HT_DMQ_DEL_CELL, HT_DMQ_RM_CELL_RE, - HT_DMQ_SYNC + HT_DMQ_RM_CELL_SW } ht_dmq_action_t; int ht_dmq_initialize(); diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 55717ecd94..d449839c2f 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -493,6 +493,10 @@ static int ht_rm_items(sip_msg_t* msg, str* hname, str* op, str *val, } return 1; } else if(strncmp(op->s, "sw", 2)==0) { + if (ht_dmq_replicate_action(HT_DMQ_RM_CELL_SW, &ht->name, NULL, + AVP_VAL_STR, &isval, mkey)!=0) { + LM_ERR("dmq relication failed (op %d)\n", mkey); + } if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_SW)<0) { return -1; }

1 0

git:master:c0f5382b: tm: check end of header name in lw parser
by Daniel-Constantin Mierla 03 Dec '20

03 Dec '20

Module: kamailio Branch: master Commit: c0f5382bfbd2022896a9b206967977f827517700 URL: https://github.com/kamailio/kamailio/commit/c0f5382bfbd2022896a9b206967977f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-03T13:15:52+01:00 tm: check end of header name in lw parser - proper identification of header type, prior could mistakenly set the type by matching the prefix of long header name - GH #2572 --- Modified: src/modules/tm/lw_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/c0f5382bfbd2022896a9b206967977f… Patch: https://github.com/kamailio/kamailio/commit/c0f5382bfbd2022896a9b206967977f…

1 0

[kamailio/kamailio] lost: do not parse locationURI with indention spaces (#2569)
by sergey-safarov 03 Dec '20

03 Dec '20

### Description Examples of [RFC7840](https://tools.ietf.org/html/rfc7840#section-7) contains this response: ```xml <locationResponse xmlns="urn:ietf:params:xml:ns:geopriv:held"> <locationUriSet expires="2006-01-01T13:00:00.0Z"> <locationURI> https://ls.example.com:9768/357yc6s64ceyoiuy5ax3o </locationURI> <locationURI> sip:9769+357yc6s64ceyoiuy5ax3o@ls.example.com </locationURI> </locationUriSet> <routingInformation xmlns="urn:ietf:params:xml:ns:geopriv:held:ri"> <service serviceUri="urn:service:sos"> <dest>sip:112@example.com</dest> <dest>sips:112@example.com</dest> <dest>xmpp:112@example.com</dest> </service> </routingInformation> </locationResponse> ``` When the `lost` module receives such a response, then generate this message ``` http_client [functions.c:299]: curL_query_url(): Malformed URL used in http client (url: https://ls.example.com:9768/357yc6s64ceyoiuy5ax3o ) lost [functions.c:325]: lost_held_function(): dereferencing location failed: 3 ``` This error is fixed when if I strip spaces in a string of `locationURI` element. ### Troubleshooting #### Reproduction Send xml eample from RFC as responce for `lost_held_query` function call. ### Possible Solutions Strip leading and trailing spaces of `locationURI` element. Maybe the required changes here https://github.com/kamailio/kamailio/blob/master/src/modules/lost/functions… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@ip-100-86-47-115 ~]# kamailio -v version: kamailio 5.5.0-dev3 (x86_64/linux) 0f572c flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 0f572c compiled on 04:01:25 Nov 29 2020 with gcc 8.3.1 ``` * **Operating System**: ``` [root@ip-100-86-47-115 ~]# cat /etc/os-release NAME="CentOS Linux" VERSION="8 (Core)" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8 (Core)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://www.centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" REDHAT_SUPPORT_PRODUCT="centos" REDHAT_SUPPORT_PRODUCT_VERSION="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/2569

3 6

[kamailio/kamailio] dialog/dmq access dialog table by reference (#2570)
by pwakano 02 Dec '20

02 Dec '20

- Access to the d_table entries should be done by reference so there is no risk of race conditions to get and release the lock   #### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2547 #### Description  It was seen the access to the d_table was not being made by reference on the function dmq_send_all_dlgs. It was then leading to race conditions where the same entry could have its lock changed elsewhere and then a dead lock would occur. By checking the code in other places where the d_table is used, everywhere it is accessed by reference, this function was the only one not following this logic. Changes were done to have "entry" as a reference to d_table and not a copy. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2570 -- Commit Summary -- * dialog/dmq access dialog table by reference -- File Changes -- M src/modules/dialog/dlg_dmq.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2570.patch https://github.com/kamailio/kamailio/pull/2570.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/2570

3 4

[kamailio/kamailio] lost: trimed spaces before reolving locationURI value (#2571)
by sergey-safarov 02 Dec '20

02 Dec '20

#### 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2569 #### Description fixes GH2569. Allow parse examples from RFC7840 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2571 -- Commit Summary -- * lost: trimed spaces before reolving locationURI value -- File Changes -- M src/modules/lost/functions.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2571.patch https://github.com/kamailio/kamailio/pull/2571.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/2571

3 4

git:master:f9d424ac: lost: trimed spaces before reolving locationURI value
by Henning Westerholt 02 Dec '20

02 Dec '20

Module: kamailio Branch: master Commit: f9d424ac426dc0547c7233902dfa44ad1287e077 URL: https://github.com/kamailio/kamailio/commit/f9d424ac426dc0547c7233902dfa44a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-02T21:13:37+01:00 lost: trimed spaces before reolving locationURI value fixes GH2569 (#2569). Allow parse exmaples from RFC7840 --- Modified: src/modules/lost/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/f9d424ac426dc0547c7233902dfa44a… Patch: https://github.com/kamailio/kamailio/commit/f9d424ac426dc0547c7233902dfa44a… --- diff --git a/src/modules/lost/functions.c b/src/modules/lost/functions.c index c94c7883f0..481d737071 100644 --- a/src/modules/lost/functions.c +++ b/src/modules/lost/functions.c @@ -298,6 +298,8 @@ int lost_held_function(struct sip_msg *_m, char *_con, char *_pidf, char *_url, if(geo.len == 0) { LM_WARN("%s element not found\n", HELD_TYPE_URI); geo.s = NULL; + } else { + geo.s = lost_trim_content(geo.s, &geo.len); } } if(xmlStrcmp(cur_node->name,

1 0

[kamailio/kamailio] core: main - Protect async-signal-unsafe code in sig_usr() with SIG_DEBUG (#2127)
by Guillem Jover 02 Dec '20

02 Dec '20

#### Pre-Submission Checklist - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description The sig_usr() signal handler contains debug code to print memory usage and statistics that is not async-signal-safe, which can cause crashes or misbehavior. This code which only affects explicit SIGUSR1 signals on children processes, and is not guarded with the SIG_DEBUG macro. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2127 -- Commit Summary -- * core: main - Protect async-signal-unsafe code in sig_usr() with SIG_DEBUG -- File Changes -- M src/main.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2127.patch https://github.com/kamailio/kamailio/pull/2127.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/2127

4 9

git:master:31f0612c: core: main - log message on more signal values, wrap around SIG_DEBUG
by Daniel-Constantin Mierla 02 Dec '20

02 Dec '20

Module: kamailio Branch: master Commit: 31f0612c2d1f843e3cdc43aefebf3b942300149b URL: https://github.com/kamailio/kamailio/commit/31f0612c2d1f843e3cdc43aefebf3b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-02T14:25:46+01:00 core: main - log message on more signal values, wrap around SIG_DEBUG - includes part of GH #2127 --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/31f0612c2d1f843e3cdc43aefebf3b9… Patch: https://github.com/kamailio/kamailio/commit/31f0612c2d1f843e3cdc43aefebf3b9… --- diff --git a/src/main.c b/src/main.c index 373236c5d0..db81d3a0c3 100644 --- a/src/main.c +++ b/src/main.c @@ -833,9 +833,10 @@ void handle_sigs(void) */ void sig_usr(int signo) { - +#ifdef SIG_DEBUG #ifdef PKG_MALLOC int memlog; +#endif #endif if (is_main){ @@ -859,7 +860,7 @@ void sig_usr(int signo) #ifdef SIG_DEBUG /* signal unsafe stuff follows */ LM_INFO("signal %d received\n", signo); /* print memory stats for non-main too */ - #ifdef PKG_MALLOC +#ifdef PKG_MALLOC /* make sure we have current cfg values, but update only the safe part (values not requiring callbacks), to account for processes that might not have registered @@ -877,11 +878,13 @@ void sig_usr(int signo) pkg_sums(); } } - #endif +#endif #endif _exit(0); break; case SIGUSR1: +#ifdef SIG_DEBUG /* signal unsafe stuff follows */ + LM_INFO("signal %d received\n", signo); #ifdef PKG_MALLOC cfg_update_no_cbs(); memlog=cfg_get(core, core_cfg, memlog); @@ -895,11 +898,15 @@ void sig_usr(int signo) pkg_sums(); } } +#endif #endif break; /* ignored*/ case SIGUSR2: case SIGHUP: +#ifdef SIG_DEBUG /* signal unsafe stuff follows */ + LM_INFO("signal %d received - ignoring\n", signo); +#endif break; case SIGCHLD: #ifndef STOP_JIRIS_CHANGES

1 0

git:master:86532d14: core: main - removed old unchanged compile ifndef condition
by Daniel-Constantin Mierla 02 Dec '20

02 Dec '20

Module: kamailio Branch: master Commit: 86532d14f005409be7ae67e3013703b216775aed URL: https://github.com/kamailio/kamailio/commit/86532d14f005409be7ae67e3013703b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-02T16:20:57+01:00 core: main - removed old unchanged compile ifndef condition --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/86532d14f005409be7ae67e3013703b… Patch: https://github.com/kamailio/kamailio/commit/86532d14f005409be7ae67e3013703b… --- diff --git a/src/main.c b/src/main.c index db81d3a0c3..fa18b3221e 100644 --- a/src/main.c +++ b/src/main.c @@ -797,14 +797,12 @@ void handle_sigs(void) break; } -#ifndef STOP_JIRIS_CHANGES if (dont_fork) { LM_INFO("dont_fork turned on, living on\n"); break; } LM_INFO("terminating due to SIGCHLD\n"); -#endif - LM_DBG("terminating due to SIGCHLD\n"); + /* exit */ shutdown_children(SIGTERM, 1); if (WIFSIGNALED(chld_status)) { @@ -909,13 +907,9 @@ void sig_usr(int signo) #endif break; case SIGCHLD: -#ifndef STOP_JIRIS_CHANGES #ifdef SIG_DEBUG /* signal unsafe stuff follows */ LM_DBG("SIGCHLD received: " "we do not worry about grand-children\n"); -#endif -#else - _exit(0); /* terminate if one child died */ #endif break; }

1 0

[kamailio/kamailio] keep-alive refactoring: use case front-end proxy with backend registrar (#2565)
by sergey-safarov 02 Dec '20

02 Dec '20

### Description In my use case exists 1. pool of front-end proxies (all share some IPv4 address via AWS network load-balancer); 2. pool of backend registrars. I must: 1. send keepalive messages to endpoints when used INVITE, REGISTRAR, SUBSCRIBE methods via all possible transports (UDP/TSP/TLS/WS/WSS/SCTP) (like nat_keepalive function of nat_traversal module). Internally store record for this SIP URI with flag `ka_dynamic` and `Record-Route` headers from `180, 183, 200` responses as `Route`; 2. send keepalive messages on predefined SIP URI (like ka_add_destination of keepalive module). Internally store record for this SIP URI with flag `ka_static` and manually defined `Route` value; 3. when keepalive for cases above is failed, then added record into arrays: a. ka_invite_failed; b. ka_registrar_failed; c. ka_supscribe_failed; d. ka_invite_succcess; e. ka_registrar_success; f. ka_supscribe_success; 4. need to trigger `even route` function with initialized `xavp` params of a. of SIP URI endpoints; b. relevant array ID; c. dynamic or static flag of SIP URI record; d. `Record-Route` of SIP URI record; 5.If we have arrays for multiple arrays, then the `event router` function called multiple times. 6. the time period for `event route` calls must be configurable via module settings; 7. when executed `event route` I want to have abbility a. send a new registration message to the registrar node using saved `Route` header when OPTION is successful for the statically defined SIP URI; a. send registration expiration message to the registrar node from received `200` response; b. send the clear subscription message to the node from received `200` response; #### Actual observed behavior In current implementation `OPTIONS` keepalive messages send from different modules 1. usrloc; 2. keepalive; 3. nat_traversal; 4. nathelper All the above have limitations like: 1. no TCP/TLS/WS/WSS transport support (nat_traversal, nathelper); 2. no ability to define call `event-route` on failed (success) OPTIONS message (think all modules do not have such feature); 3. no ability to check response code before enabling keepalive (nat_traversal); 4. no ability to notify backend REGISTRAR/SUBSCRIPTION server (think all modules do not have such feature) about failed keepalive messages; #### What is expected >From my of view required: 1. some refactor of keepalive feature; 2. merge code from different modules into one and make other modules dependent; 3. implement the ability to notify backend REGISTRAR/SUBSCRIPTION servers of failed keepalive messages; 4. implement the ability to emulate registration when OPTION message success to SIP URI. Required on SBC to emulate customer PBX registration. -- 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/2565

2 5

[kamailio/kamailio] DMQ workers stops processing msgs and consume all shmmem (#2547)
by pwakano 02 Dec '20

02 Dec '20

### Description Kamailio is configured to use the DMQ replication for dialog. When running a load test Kamailio DMQ workers eventually becomes unresponsive and stops processing DMQ messages. As a side effect the shm memory is fully consumed then SIP processing stops happening properly and everything else stops working due to that. ### Troubleshooting Investigation showed that the DMQ workers are locked in the dmq_send_all_dlgs. Debugging and studying the function it was identified that it is prone to data inconsistency because it uses a copy of the (d_table->entries)[index] and not a pointer to it. This gives a small window where a change in the d_table for that entry can occur and changing the lock information before the copy can actually get the lock making the process to get stuck in the lock get. There is a need for some expert to validate this conclusion. #### Reproduction Run a simple load test making calls at a rate of ~5 cps and keep around ~2000 calls connected all the time. A higher cps seems to make it easier to reproduce the problem. Adding network degradation to the environment makes the problem happens, but when running a tool such as SIPp for the load test, the retransmission can be forced by simply killing the SIPp instance receiving calls which will then force Kamailio to retransmit. #### Debugging Data ``` 7236 # DMQ WORKER #0 0x00007fa7bd760bf9 in syscall () from /lib64/libc.so.6 #1 0x00007fa793395484 in futex_get (lock=0x7ffd072acaa4) at ../../core/futexlock.h:121 #2 0x00007fa7933a123b in dmq_send_all_dlgs (dmq_node=0x0) at dlg_dmq.c:657 (gdb) p entry $1 = {first = 0x7fa79f8540d0, last = 0x7fa79f8540d0, next_id = 86622, lock = {val = 2}, locker_pid = {val = 7211}, rec_lock_level = 0} (gdb) p &entry->lock $2 = (gen_lock_t *) 0x7ffd072acaa4 (gdb) p index $3 = 187 (gdb) p (d_table->entries)[index] $1 = {first = 0x0, last = 0x0, next_id = 86652, lock = {val = 0}, locker_pid = {val = 0}, rec_lock_level = 0} (gdb) p entry $2 = {first = 0x7fa79f8540d0, last = 0x7fa79f8540d0, next_id = 86622, lock = {val = 2}, locker_pid = {val = 7211}, rec_lock_level = 0} #3 0x00007fa79339cfa3 in dlg_dmq_handle_msg (msg=0x7fa79fca15c8, resp=0x7ffd072aceb0, node=0x7fa79ee93cb8) at dlg_dmq.c:391 #4 0x00007fa793f3bb98 in worker_loop (id=0) at worker.c:113 #5 0x00007fa793f39314 in child_init (rank=0) at dmq.c:296 #6 0x00000000005990e8 in init_mod_child (m=0x7fa7bc735d98, rank=0) at core/sr_module.c:780 #7 0x0000000000598d5d in init_mod_child (m=0x7fa7bc736b00, rank=0) at core/sr_module.c:776 #8 0x0000000000598d5d in init_mod_child (m=0x7fa7bc737038, rank=0) at core/sr_module.c:776 #9 0x0000000000598d5d in init_mod_child (m=0x7fa7bc738eb8, rank=0) at core/sr_module.c:776 #10 0x0000000000598d5d in init_mod_child (m=0x7fa7bc73a0e0, rank=0) at core/sr_module.c:776 #11 0x0000000000598d5d in init_mod_child (m=0x7fa7bc73ab70, rank=0) at core/sr_module.c:776 #12 0x0000000000598d5d in init_mod_child (m=0x7fa7bc73d8e0, rank=0) at core/sr_module.c:776 #13 0x0000000000598d5d in init_mod_child (m=0x7fa7bc73e720, rank=0) at core/sr_module.c:776 #14 0x0000000000598d5d in init_mod_child (m=0x7fa7bc73f1b8, rank=0) at core/sr_module.c:776 #15 0x0000000000598d5d in init_mod_child (m=0x7fa7bc73fd08, rank=0) at core/sr_module.c:776 #16 0x0000000000598d5d in init_mod_child (m=0x7fa7bc740128, rank=0) at core/sr_module.c:776 #17 0x0000000000598d5d in init_mod_child (m=0x7fa7bc7409d0, rank=0) at core/sr_module.c:776 #18 0x0000000000598d5d in init_mod_child (m=0x7fa7bc7414d8, rank=0) at core/sr_module.c:776 #19 0x0000000000598d5d in init_mod_child (m=0x7fa7bc742cd8, rank=0) at core/sr_module.c:776 #20 0x0000000000598d5d in init_mod_child (m=0x7fa7bc742fc8, rank=0) at core/sr_module.c:776 #21 0x0000000000598d5d in init_mod_child (m=0x7fa7bc744ed0, rank=0) at core/sr_module.c:776 #22 0x0000000000598d5d in init_mod_child (m=0x7fa7bc745920, rank=0) at core/sr_module.c:776 #23 0x0000000000598d5d in init_mod_child (m=0x7fa7bc748d60, rank=0) at core/sr_module.c:776 #24 0x0000000000598d5d in init_mod_child (m=0x7fa7bc7498f8, rank=0) at core/sr_module.c:776 #25 0x0000000000599887 in init_child (rank=0) at core/sr_module.c:825 #26 0x000000000042ab2d in main_loop () at main.c:1763 #27 0x0000000000433a96 in main (argc=12, argv=0x7ffd072aeb48) at main.c:2856 7237 # DMQ WORKER #0 0x00007fa7bd760bf9 in syscall () from /lib64/libc.so.6 #1 0x00007fa793395484 in futex_get (lock=0x7ffd072acaa4) at ../../core/futexlock.h:121 #2 0x00007fa7933a123b in dmq_send_all_dlgs (dmq_node=0x0) at dlg_dmq.c:657 (gdb) p entry $1 = {first = 0x7fa79f38bdb8, last = 0x7fa79f38bdb8, next_id = 15672, lock = {val = 2}, locker_pid = {val = 7221}, rec_lock_level = 1} (gdb) p &entry->lock $2 = (gen_lock_t *) 0x7ffd072acaa4 (gdb) p index $1 = 402 (gdb) p (d_table->entries)[index] $1 = {first = 0x0, last = 0x0, next_id = 15702, lock = {val = 0}, locker_pid = {val = 0}, rec_lock_level = 0} (gdb) p entry $4 = {first = 0x7fa79f38bdb8, last = 0x7fa79f38bdb8, next_id = 15672, lock = {val = 2}, locker_pid = {val = 7221}, rec_lock_level = 1} (gdb) p &(d_table->entries)[index]->lock $5 = (gen_lock_t *) 0x7fa79ec44e2c (gdb) p &entry->lock $6 = (gen_lock_t *) 0x7ffd072acaa4 #3 0x00007fa79339cfa3 in dlg_dmq_handle_msg (msg=0x7fa79f9e4d90, resp=0x7ffd072aceb0, node=0x7fa79ee93cb8) at dlg_dmq.c:391 #4 0x00007fa793f3bb98 in worker_loop (id=1) at worker.c:113 #5 0x00007fa793f39314 in child_init (rank=0) at dmq.c:296 #6 0x00000000005990e8 in init_mod_child (m=0x7fa7bc735d98, rank=0) at core/sr_module.c:780 #7 0x0000000000598d5d in init_mod_child (m=0x7fa7bc736b00, rank=0) at core/sr_module.c:776 #8 0x0000000000598d5d in init_mod_child (m=0x7fa7bc737038, rank=0) at core/sr_module.c:776 #9 0x0000000000598d5d in init_mod_child (m=0x7fa7bc738eb8, rank=0) at core/sr_module.c:776 #10 0x0000000000598d5d in init_mod_child (m=0x7fa7bc73a0e0, rank=0) at core/sr_module.c:776 #11 0x0000000000598d5d in init_mod_child (m=0x7fa7bc73ab70, rank=0) at core/sr_module.c:776 #12 0x0000000000598d5d in init_mod_child (m=0x7fa7bc73d8e0, rank=0) at core/sr_module.c:776 #13 0x0000000000598d5d in init_mod_child (m=0x7fa7bc73e720, rank=0) at core/sr_module.c:776 #14 0x0000000000598d5d in init_mod_child (m=0x7fa7bc73f1b8, rank=0) at core/sr_module.c:776 #15 0x0000000000598d5d in init_mod_child (m=0x7fa7bc73fd08, rank=0) at core/sr_module.c:776 #16 0x0000000000598d5d in init_mod_child (m=0x7fa7bc740128, rank=0) at core/sr_module.c:776 #17 0x0000000000598d5d in init_mod_child (m=0x7fa7bc7409d0, rank=0) at core/sr_module.c:776 #18 0x0000000000598d5d in init_mod_child (m=0x7fa7bc7414d8, rank=0) at core/sr_module.c:776 #19 0x0000000000598d5d in init_mod_child (m=0x7fa7bc742cd8, rank=0) at core/sr_module.c:776 #20 0x0000000000598d5d in init_mod_child (m=0x7fa7bc742fc8, rank=0) at core/sr_module.c:776 #21 0x0000000000598d5d in init_mod_child (m=0x7fa7bc744ed0, rank=0) at core/sr_module.c:776 #22 0x0000000000598d5d in init_mod_child (m=0x7fa7bc745920, rank=0) at core/sr_module.c:776 #23 0x0000000000598d5d in init_mod_child (m=0x7fa7bc748d60, rank=0) at core/sr_module.c:776 #24 0x0000000000598d5d in init_mod_child (m=0x7fa7bc7498f8, rank=0) at core/sr_module.c:776 #25 0x0000000000599887 in init_child (rank=0) at core/sr_module.c:825 #26 0x000000000042ab2d in main_loop () at main.c:1763 #27 0x0000000000433a96 in main (argc=12, argv=0x7ffd072aeb48) at main.c:2856 7211 (gdb) bt #0 0x00007fa7bd7677d3 in __recvfrom_nocancel () from /lib64/libc.so.6 #1 0x00000000004d6a45 in udp_rcv_loop () at core/udp_server.c:457 #2 0x0000000000429d47 in main_loop () at main.c:1683 #3 0x0000000000433a96 in main (argc=12, argv=0x7ffd072aeb48) at main.c:2856 7221 #0 0x00007fa7bd7677d3 in __recvfrom_nocancel () from /lib64/libc.so.6 #1 0x00000000004d6a45 in udp_rcv_loop () at core/udp_server.c:457 #2 0x0000000000429d47 in main_loop () at main.c:1683 #3 0x0000000000433a96 in main (argc=12, argv=0x7ffd072aeb48) at main.c:2856 ``` ### Possible Solutions Suggested patch (was not compiled and tested yet): ``` diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index a5628f4..b681759 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -646,22 +646,22 @@ int dmq_send_all_dlgs(dmq_node_t* dmq_node) { int index; - dlg_entry_t entry; + dlg_entry_t *entry; dlg_cell_t *dlg; LM_DBG("sending all dialogs \n"); for(index = 0; index< d_table->size; index++){ /* lock the whole entry */ - entry = (d_table->entries)[index]; - dlg_lock( d_table, &entry); + entry = &(d_table->entries)[index]; + dlg_lock( d_table, entry); - for(dlg = entry.first; dlg != NULL; dlg = dlg->next){ + for(dlg = entry->first; dlg != NULL; dlg = dlg->next){ dlg->dflags |= DLG_FLAG_CHANGED_PROF; dlg_dmq_replicate_action(DLG_DMQ_UPDATE, dlg, 0, dmq_node); } - dlg_unlock( d_table, &entry); + dlg_unlock( d_table, entry); } return 0; ``` ### Additional Information kamailio 5.4.2 (x86_64/linux) 5bd72f * **Operating System**: ``` Centos 7 3.10.0-1127.19.1.el7.x86_64 #1 SMP Tue Aug 25 17:23:54 UTC 2020 x86_64 x86_64 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/2547

2 4

git:master:4183b860: dialog: access dialog table entry by reference for dmq_send_all_dlgs
by Daniel-Constantin Mierla 02 Dec '20

02 Dec '20

Module: kamailio Branch: master Commit: 4183b860e8af6d65074ab98a996c187211aebc7f URL: https://github.com/kamailio/kamailio/commit/4183b860e8af6d65074ab98a996c187… Author: Patrick Wakano <patrick.wakano(a)ipscape.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-02T13:58:18+01:00 dialog: access dialog table entry by reference for dmq_send_all_dlgs - avoid race conditions to get and release the lock when entry structure is copied in local variable - GH #2570, GH #2547 --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/4183b860e8af6d65074ab98a996c187… Patch: https://github.com/kamailio/kamailio/commit/4183b860e8af6d65074ab98a996c187… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 9f70354d50..38dc105fb8 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -646,22 +646,22 @@ int dlg_dmq_replicate_action(dlg_dmq_action_t action, dlg_cell_t* dlg, int dmq_send_all_dlgs(dmq_node_t* dmq_node) { int index; - dlg_entry_t entry; + dlg_entry_t *entry; dlg_cell_t *dlg; LM_DBG("sending all dialogs \n"); for(index = 0; index< d_table->size; index++){ /* lock the whole entry */ - entry = (d_table->entries)[index]; - dlg_lock( d_table, &entry); + entry = &d_table->entries[index]; + dlg_lock( d_table, entry); - for(dlg = entry.first; dlg != NULL; dlg = dlg->next){ + for(dlg = entry->first; dlg != NULL; dlg = dlg->next){ dlg->dflags |= DLG_FLAG_CHANGED_PROF; dlg_dmq_replicate_action(DLG_DMQ_UPDATE, dlg, 0, dmq_node); } - dlg_unlock( d_table, &entry); + dlg_unlock( d_table, entry); } return 0;

1 0

git:master:6137358a: tm: cast port parameter for kemi export function
by Daniel-Constantin Mierla 02 Dec '20

02 Dec '20

Module: kamailio Branch: master Commit: 6137358a9f699efd88c53d9b0b1081b338996888 URL: https://github.com/kamailio/kamailio/commit/6137358a9f699efd88c53d9b0b1081b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-02T14:00:32+01:00 tm: cast port parameter for kemi export function --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/6137358a9f699efd88c53d9b0b1081b… Patch: https://github.com/kamailio/kamailio/commit/6137358a9f699efd88c53d9b0b1081b… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 06e315fe14..fcc312aeb6 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2923,7 +2923,7 @@ static int ki_t_relay_to_proto(sip_msg_t *msg, str *sproto) /** * */ -static int ki_t_relay_to_proto_addr(sip_msg_t *msg, str *sproto, str *host, unsigned int port) +static int ki_t_relay_to_proto_addr(sip_msg_t *msg, str *sproto, str *host, int port) { int proto = PROTO_NONE; @@ -2941,9 +2941,9 @@ static int ki_t_relay_to_proto_addr(sip_msg_t *msg, str *sproto, str *host, unsi return E_UNSPEC; } } - proxy = mk_proxy(host, port, 0); + proxy = mk_proxy(host, (unsigned short)port, 0); if (proxy == 0) { - LM_ERR("bad host, port provided <%s,%d>\n", + LM_ERR("bad host:port provided <%s:%d>\n", host->s, port ); return E_BAD_ADDRESS; }

1 0

[kamailio/kamailio] Expand the list of required default 3rd party libraries for Kamailio (#969)
by Olle E. Johansson 02 Dec '20

02 Dec '20

(from devmeeting #Fosdem) - adding new dependencies as core dependencies - Curl - libssl - uuid - libunistring - libxml2 Any other candidates? They have to be libraries that are commonly installed on most Linux/Unix system. This would mean that a lot of more modules will be built by default, like TLS, HTTP_CLIENT, WEBSOCKET. We may also look over the names of the packages/groups for the build system and linux distros -- 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/969

2 3

[kamailio/kamailio] Dynamic Routing Module: SRV resolution does not work in NAPTR is turned off. (#2553)
by zvoneos 02 Dec '20

02 Dec '20

### Description >From what I experience dynamic routing (drouting) module is not supporting SRV resolution if NAPTR is turned off (dns_try_naptr=no). Is this intentional to not have SRV if NAPTR is turned off? Or some special format of entry is expected for SRV records in gateways table? I've tried with just **domain** and **_sip._udp.domain** but it it the same. #### Reproduction 1. Use Dynamic routing module 2. set dns_try_naptr=no 3. insert gateway with SRV domain name in dynamic routing gateways table. 4. execute kamcmd drouting.reload 5. in the log of the kamailio is the error: ERROR: drouting [routing.c:337]: add_dst(): cannot resolve <domainexample> ### Possible Solutions Upon reload of drouting tables, dynamic routing tries to add destinations and resolve them: https://github.com/kamailio/kamailio/blob/08a9ed3d136c861f990e4f63c2c0544e0… But, since port that is sent is NULL, SRV is being skipped later on. It seems that SRV would be executed if port would be 0 instead of NULL. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.9 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, HAVE_RESOLV_RES 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 4.9.2 ``` -- 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/2553

2 4

git:master:04dc5d6c: auth_diameter: init variable and check before freeing
by Daniel-Constantin Mierla 02 Dec '20

02 Dec '20

Module: kamailio Branch: master Commit: 04dc5d6c66c85d0d411aa23b27bc6be00258eff6 URL: https://github.com/kamailio/kamailio/commit/04dc5d6c66c85d0d411aa23b27bc6be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-02T09:45:48+01:00 auth_diameter: init variable and check before freeing --- Modified: src/modules/auth_diameter/message.c --- Diff: https://github.com/kamailio/kamailio/commit/04dc5d6c66c85d0d411aa23b27bc6be… Patch: https://github.com/kamailio/kamailio/commit/04dc5d6c66c85d0d411aa23b27bc6be… --- diff --git a/src/modules/auth_diameter/message.c b/src/modules/auth_diameter/message.c index ad81816a42..2dcb80de16 100644 --- a/src/modules/auth_diameter/message.c +++ b/src/modules/auth_diameter/message.c @@ -185,7 +185,7 @@ AAAMessage* AAATranslateMessage( unsigned char* source, unsigned int sourceLen, int attach_buf) { unsigned char *ptr; - AAAMessage *msg; + AAAMessage *msg = NULL; unsigned char version; unsigned int msg_len; AAA_AVP *avp; @@ -310,7 +310,9 @@ AAAMessage* AAATranslateMessage( unsigned char* source, unsigned int sourceLen, return msg; error: LM_ERR(" message conversion dropped!!\n"); - AAAFreeMessage(&msg); + if (msg) { + AAAFreeMessage(&msg); + } return 0; }

1 0

git:5.2:1d6bce1c: pkg/kamailio/obs: updated tmpfiles
by Sergey Safarov 01 Dec '20

01 Dec '20

Module: kamailio Branch: 5.2 Commit: 1d6bce1cd1a067f84432121f722ff48878c2e0fe URL: https://github.com/kamailio/kamailio/commit/1d6bce1cd1a067f84432121f722ff48… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-01T18:08:10+03:00 pkg/kamailio/obs: updated tmpfiles fixed removing of kamailio_ctl and other files (cherry picked from commit 468ec8f26ff8496bdf62a7bfbbb1b1e2e3452c0f) --- Modified: pkg/kamailio/obs/kamailio.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/1d6bce1cd1a067f84432121f722ff48… Patch: https://github.com/kamailio/kamailio/commit/1d6bce1cd1a067f84432121f722ff48… --- diff --git a/pkg/kamailio/obs/kamailio.tmpfiles b/pkg/kamailio/obs/kamailio.tmpfiles index dd2c42484c..78cf6289ea 100644 --- a/pkg/kamailio/obs/kamailio.tmpfiles +++ b/pkg/kamailio/obs/kamailio.tmpfiles @@ -1 +1,6 @@ -D /run/kamailio 0700 kamailio kamailio - +x /run/kamailio/kamailio_ctl +x /run/kamailio/kamailio.pid +x /run/kamailio/kamailio_rpc.fifo +x /run/kamailio/kamailio_rpc.sock +d /run/kamailio 0700 kamailio kamailio 7d +

1 0

git:5.3:b37aa273: pkg/kamailio/obs: updated tmpfiles
by Sergey Safarov 01 Dec '20

01 Dec '20

Module: kamailio Branch: 5.3 Commit: b37aa273da9c35561378acacf7922904265713cc URL: https://github.com/kamailio/kamailio/commit/b37aa273da9c35561378acacf792290… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-01T18:07:05+03:00 pkg/kamailio/obs: updated tmpfiles fixed removing of kamailio_ctl and other files (cherry picked from commit 468ec8f26ff8496bdf62a7bfbbb1b1e2e3452c0f) --- Modified: pkg/kamailio/obs/kamailio.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/b37aa273da9c35561378acacf792290… Patch: https://github.com/kamailio/kamailio/commit/b37aa273da9c35561378acacf792290… --- diff --git a/pkg/kamailio/obs/kamailio.tmpfiles b/pkg/kamailio/obs/kamailio.tmpfiles index dd2c42484c..78cf6289ea 100644 --- a/pkg/kamailio/obs/kamailio.tmpfiles +++ b/pkg/kamailio/obs/kamailio.tmpfiles @@ -1 +1,6 @@ -D /run/kamailio 0700 kamailio kamailio - +x /run/kamailio/kamailio_ctl +x /run/kamailio/kamailio.pid +x /run/kamailio/kamailio_rpc.fifo +x /run/kamailio/kamailio_rpc.sock +d /run/kamailio 0700 kamailio kamailio 7d +

1 0

git:5.4:4fdc21a8: pkg/kamailio/obs: updated tmpfiles
by Sergey Safarov 01 Dec '20

01 Dec '20

Module: kamailio Branch: 5.4 Commit: 4fdc21a826533f1b889ee6e8302fe112859bf0fd URL: https://github.com/kamailio/kamailio/commit/4fdc21a826533f1b889ee6e8302fe11… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-01T18:03:10+03:00 pkg/kamailio/obs: updated tmpfiles fixed removing of kamailio_ctl and other files --- Modified: pkg/kamailio/obs/kamailio.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/4fdc21a826533f1b889ee6e8302fe11… Patch: https://github.com/kamailio/kamailio/commit/4fdc21a826533f1b889ee6e8302fe11… --- diff --git a/pkg/kamailio/obs/kamailio.tmpfiles b/pkg/kamailio/obs/kamailio.tmpfiles index dd2c42484c..78cf6289ea 100644 --- a/pkg/kamailio/obs/kamailio.tmpfiles +++ b/pkg/kamailio/obs/kamailio.tmpfiles @@ -1 +1,6 @@ -D /run/kamailio 0700 kamailio kamailio - +x /run/kamailio/kamailio_ctl +x /run/kamailio/kamailio.pid +x /run/kamailio/kamailio_rpc.fifo +x /run/kamailio/kamailio_rpc.sock +d /run/kamailio 0700 kamailio kamailio 7d +

1 0

git:master:468ec8f2: pkg/kamailio/obs: updated tmpfiles
by Sergey Safarov 01 Dec '20

01 Dec '20

Module: kamailio Branch: master Commit: 468ec8f26ff8496bdf62a7bfbbb1b1e2e3452c0f URL: https://github.com/kamailio/kamailio/commit/468ec8f26ff8496bdf62a7bfbbb1b1e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-01T18:02:03+03:00 pkg/kamailio/obs: updated tmpfiles fixed removing of kamailio_ctl and other files --- Modified: pkg/kamailio/obs/kamailio.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/468ec8f26ff8496bdf62a7bfbbb1b1e… Patch: https://github.com/kamailio/kamailio/commit/468ec8f26ff8496bdf62a7bfbbb1b1e… --- diff --git a/pkg/kamailio/obs/kamailio.tmpfiles b/pkg/kamailio/obs/kamailio.tmpfiles index dd2c42484c..78cf6289ea 100644 --- a/pkg/kamailio/obs/kamailio.tmpfiles +++ b/pkg/kamailio/obs/kamailio.tmpfiles @@ -1 +1,6 @@ -D /run/kamailio 0700 kamailio kamailio - +x /run/kamailio/kamailio_ctl +x /run/kamailio/kamailio.pid +x /run/kamailio/kamailio_rpc.fifo +x /run/kamailio/kamailio_rpc.sock +d /run/kamailio 0700 kamailio kamailio 7d +

1 0

kamailio SIP and RTP proxy
by Patrick Leybag 01 Dec '20

01 Dec '20

Hi, Can someone help me? I self host a kamailio using my raspberry pi as a load balancer for my two asterisk servers and get a did number. when I call to my DID number it points to my kamailio and kamailio will distribute to asterisk server but the call has no audio. I tried port forwarding ports 5060 for SIP and 10000-20000 for RTP but it still does not work. Any help is much appreciated. Thank you in advance

2 1

About VoNR
by LiuJian3 (刘俭) 01 Dec '20

01 Dec '20

Hi Thanks for your perfect project. I am a developer who want to enable a VoNR environment to evaluate our gNB product. I want to use 5GS and kamailio for this. But I don’t know whether kamailio support VoNR. Would you tell me？ Thanks a lot. Best regards. Jimmy 本电子邮件（包括任何的附件）为本公司保密文件。本文件仅仅可为以上指定的收件人或公司使用，如果阁下非电子邮件所指定之收件人，那么阁下对该邮件部分或全部的泄漏、阅览、复印、变更、散布或对邮件内容的使用都是被严格禁止的。如果阁下接收了该错误传送的电子邮件，敬请阁下通过回复该邮件的方式立即通知寄件人，同时删除你所接收到的文本。 This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure or distribution of the material in this e-mail is strictly forbidden.

2 1

git:5.4:49d83385: dlgs: fixed return value for dlgs_tags_count()
by Daniel-Constantin Mierla 01 Dec '20

01 Dec '20

Module: kamailio Branch: 5.4 Commit: 49d833852bdcdc7c37ebd8d8d4e8cfb5ef149613 URL: https://github.com/kamailio/kamailio/commit/49d833852bdcdc7c37ebd8d8d4e8cfb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-01T09:44:57+01:00 dlgs: fixed return value for dlgs_tags_count() (cherry picked from commit 057383f0b780b8317831f72c7c9f64786cc5a25e) --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/49d833852bdcdc7c37ebd8d8d4e8cfb… Patch: https://github.com/kamailio/kamailio/commit/49d833852bdcdc7c37ebd8d8d4e8cfb… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index c7f60fcab8..503dd8c197 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -341,8 +341,11 @@ static int w_dlgs_tags_rm(sip_msg_t *msg, char *ptags, char *p2) */ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) { - if(dlgs_tags_count(msg, vtags)<0) { - return -1; + int ret; + + ret = dlgs_tags_count(msg, vtags); + if(ret<=0) { + return (ret-1); } return 1; }

1 0

git:5.4:3c8d3df4: dlgs: fix counting dialogs function
by Daniel-Constantin Mierla 01 Dec '20

01 Dec '20

Module: kamailio Branch: 5.4 Commit: 3c8d3df471c92068144f84f2f02b9e79c8c723d2 URL: https://github.com/kamailio/kamailio/commit/3c8d3df471c92068144f84f2f02b9e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-01T09:44:43+01:00 dlgs: fix counting dialogs function - count the dialog in initial state - GH #2568 (cherry picked from commit 6376e24960878ca510ab6f1ce0594a351debc409) --- Modified: src/modules/dlgs/dlgs_mod.c Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/3c8d3df471c92068144f84f2f02b9e7… Patch: https://github.com/kamailio/kamailio/commit/3c8d3df471c92068144f84f2f02b9e7… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index e26e0d9899..c7f60fcab8 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -250,13 +250,16 @@ static int w_dlgs_update(sip_msg_t *msg, char *p1, char *p2) */ static int ki_dlgs_count(sip_msg_t *msg, str *vfield, str *vop, str *vdata) { + int ret; + LM_DBG("counting by: [%.*s] [%.*s] [%.*s]\n", vfield->len, vfield->s, vop->len, vop->s, vdata->len, vdata->s); - if(dlgs_count(msg, vfield, vop, vdata) < 0) { - return -1; + ret = dlgs_count(msg, vfield, vop, vdata); + if(ret <= 0) { + return (ret-1); } - return 1; + return ret; } /** diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index 6b4a6b70e8..1f6af22ba3 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -340,6 +340,7 @@ int dlgs_add_item(sip_msg_t *msg, str *src, str *dst, str *data) prev->next = nitem; } dsht->slots[idx].esize++; + dlgs_update_stats(&dsht->slots[idx].astats, nitem->state, 1); lock_release(&dsht->slots[idx].lock); return 0; }

1 0

git:master:057383f0: dlgs: fixed return value for dlgs_tags_count()
by Daniel-Constantin Mierla 01 Dec '20

01 Dec '20

Module: kamailio Branch: master Commit: 057383f0b780b8317831f72c7c9f64786cc5a25e URL: https://github.com/kamailio/kamailio/commit/057383f0b780b8317831f72c7c9f647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-01T09:40:56+01:00 dlgs: fixed return value for dlgs_tags_count() --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/057383f0b780b8317831f72c7c9f647… Patch: https://github.com/kamailio/kamailio/commit/057383f0b780b8317831f72c7c9f647… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index c7f60fcab8..503dd8c197 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -341,8 +341,11 @@ static int w_dlgs_tags_rm(sip_msg_t *msg, char *ptags, char *p2) */ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) { - if(dlgs_tags_count(msg, vtags)<0) { - return -1; + int ret; + + ret = dlgs_tags_count(msg, vtags); + if(ret<=0) { + return (ret-1); } return 1; }

1 0

git:master:a12029cd: tm: some more cleanups regarding logging (remove double log level or function)
by Henning Westerholt 01 Dec '20

01 Dec '20

Module: kamailio Branch: master Commit: a12029cd2b4a9153851496fb2999b89875b5b495 URL: https://github.com/kamailio/kamailio/commit/a12029cd2b4a9153851496fb2999b89… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-01T08:28:51Z tm: some more cleanups regarding logging (remove double log level or function) --- Modified: src/modules/tm/lock.c Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/a12029cd2b4a9153851496fb2999b89… Patch: https://github.com/kamailio/kamailio/commit/a12029cd2b4a9153851496fb2999b89… --- diff --git a/src/modules/tm/lock.c b/src/modules/tm/lock.c index c06bd4c16a..ed7de0c971 100644 --- a/src/modules/tm/lock.c +++ b/src/modules/tm/lock.c @@ -80,8 +80,7 @@ int lock_initialize() lock_set_dealloc(reply_semaphore); } if(i == 0) { - LOG(L_CRIT, "lock_initialize: could not allocate semaphore" - " sets\n"); + LOG(L_CRIT, "could not allocate semaphore sets\n"); goto error; } diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index dadfaa6b08..4ccdee7574 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1067,8 +1067,7 @@ int t_check_msg( struct sip_msg* p_msg , int *param_branch ) if (cfg_get(tm, tm_cfg, tm_aggregate_auth) && (p_msg->REPLY_STATUS==401 || p_msg->REPLY_STATUS==407)){ if (parse_headers(p_msg, HDR_EOH_F,0)==-1){ - LM_WARN("WARNING: the reply cannot be " - "completely parsed\n"); + LM_WARN("the reply cannot be completely parsed\n"); /* try to continue, via1 & cseq are checked below */ } }else if ( parse_headers(p_msg, HDR_VIA1_F|HDR_CSEQ_F|HDR_CALLID_F, diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index cda84b6f5d..47f94c1697 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -484,7 +484,7 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, /* final (end-of-headers) CRLF */ append_str(d, CRLF, CRLF_LEN); *len = d - cancel_buf; - /* LOG(L_DBG, "DBG: build_local: %.*s\n", *len, cancel_buf); */ + /* LOG(L_DBG, "%.*s\n", *len, cancel_buf); */ return cancel_buf; default: diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 481a4a00f8..51b669f776 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1666,8 +1666,7 @@ int t_retransmit_reply( struct cell *t ) * the chances for this increase a lot. */ if (!t->uas.response.dst.send_sock) { - LOG(L_WARN, "WARNING: t_retransmit_reply: " - "no resolved dst to retransmit\n"); + LOG(L_WARN, "no resolved dst to retransmit\n"); return -1; } @@ -1677,14 +1676,13 @@ int t_retransmit_reply( struct cell *t ) LOCK_REPLIES( t ); if (!t->uas.response.buffer) { - DBG("DBG: t_retransmit_reply: nothing to retransmit\n"); + DBG("nothing to retransmit\n"); goto error; } len=t->uas.response.buffer_len; if ( len==0 || len>BUF_SIZE ) { - DBG("DBG: t_retransmit_reply: " - "zero length or too big to retransmit: %d\n", len); + DBG("zero length or too big to retransmit: %d\n", len); goto error; } memcpy( b, t->uas.response.buffer, len );

1 0

[kamailio/kamailio] core on simple config file (#2562)
by sergey-safarov 30 Nov '20

30 Nov '20

### Description For test purpose, i created a config file with this content ``` listen=udp:eth0:11000 ``` When I start Kamailio using the command I got core ``` [centos@ip-100-86-32-7 ~]$ kamailio -f kamailio.cfg Segmentation fault (core dumped) [centos@ip-100-86-32-7 ~]$ ``` #### Debugging Data ``` (gdb) bt full #0 0x0000000000000000 in ?? () No symbol table info available. #1 0x00000000005979fb in ksr_shutdown_phase_init () at core/sr_module.c:118 __func__ = "ksr_shutdown_phase_init" #2 0x0000000000431181 in main (argc=3, argv=0x7fffffffe388) at main.c:2545 cfg_stream = 0xba02b0 c = -1 r = -7712 tmp = 0x9c0000009c0 <error: Cannot access memory at address 0x9c0000009c0> tmp_len = 32767 port = -134224128 proto = 0 ahost = 0x0 aport = 0 options = 0x7e3488 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 3173775974 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffff7ffe700 p = 0x7ffff70f9205 <handle_intel.constprop+197> "H\205\300uf\213t$\004M\215\216\244" st = {st_dev = 0, st_ino = 0, st_nlink = 0, st_mode = 0, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 0, st_blksize = 0, st_blocks = 0, st_atim = { tv_sec = 0, tv_nsec = 0}, st_mtim = {tv_sec = 0, tv_nsec = 0}, st_ctim = {tv_sec = 0, tv_nsec = 0}, __glibc_reserved = {0, 0, 0}} tbuf = "|\343\006\367\377\177\000\000ء\377\367\377\177\000\000\000\000\000\000 ", '\000' <repeats 19 times>, " O\335\367\377\177\000\000`\340\377\377\377\177\000\000\a\000\000\000\000\000\000\000\330D\335\367\377\177\000\000\a\000\000\000\t\000\000\000\220\331\377\367\377\177\000\000\314\000\336\367\377\177\000\000\000\000\000\000\000\000\000\000\370\016\336\367\377\177\000\000\260\337\377\377\377\177\000\000\240\343\006\367\377\177\000\000\300\263\376\367\377\177\000\000\000\000\000\000\000\000\000\000\060\340\377\377\377\177", '\000' <repeats 26 times>, "HG\335\367\377\177\000\000\270\344\377\367\377\177\000\000\060\340\377\377\377\177\000\000\000"... option_index = 0 long_options = {{name = 0x7e55f6 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7e0bc1 "version", has_arg = 0, flag = 0x0, val = 118}, { name = 0x7e55fb "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x7e5601 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7e5607 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7e5610 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7e561a "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7e5624 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7e562f "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7e5638 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7e5643 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals No symbol table info available. (gdb) list 1890 +((!sctp_disable)?sctp_listeners:0) 1891 #endif 1892 ; 1893 } 1894 1895 int main(int argc, char** argv) 1896 { 1897 1898 FILE* cfg_stream; 1899 int c,r; (gdb) ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [centos@ip-100-86-32-7 ~]$ kamailio -v version: kamailio 5.5.0-dev3 (x86_64/linux) e9624b flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: e9624b compiled on 04:01:18 Nov 10 2020 with gcc 8.3.1 ``` * **Operating System**: ``` [centos@ip-100-86-32-7 ~]$ cat /etc/os-release NAME="CentOS Linux" VERSION="8 (Core)" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8 (Core)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://www.centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" REDHAT_SUPPORT_PRODUCT="centos" REDHAT_SUPPORT_PRODUCT_VERSION="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/2562

2 4

git:master:d4316319: tm: removed function name from log messages
by Daniel-Constantin Mierla 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: d4316319225ba98e940b3631d00531eed6e31f9a URL: https://github.com/kamailio/kamailio/commit/d4316319225ba98e940b3631d00531e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-30T15:11:27+01:00 tm: removed function name from log messages - it is already in the prefix --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/d4316319225ba98e940b3631d00531e… Patch: https://github.com/kamailio/kamailio/commit/d4316319225ba98e940b3631d00531e… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 1beeee1053..06e315fe14 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2913,7 +2913,7 @@ static int ki_t_relay_to_proto(sip_msg_t *msg, str *sproto) } else if (strncasecmp(sproto->s, "TLS", 3)) { proto = PROTO_TLS; } else { - LM_ERR("t_relay_to_proto failed, bad protocol specified <%s>\n", sproto->s); + LM_ERR("bad protocol specified <%s>\n", sproto->s); return E_UNSPEC; } } @@ -2937,7 +2937,7 @@ static int ki_t_relay_to_proto_addr(sip_msg_t *msg, str *sproto, str *host, unsi } else if (strncasecmp(sproto->s, "TLS", 3)) { proto = PROTO_TLS; } else { - LM_ERR("t_relay_to_proto2 failed, bad protocol specified <%s>\n", sproto->s); + LM_ERR("bad protocol specified <%s>\n", sproto->s); return E_UNSPEC; } }

1 0

Re: [sr-dev] [kamailio/kamailio] tm: renamed kemi ki_t_relay_to_proto2() to ki_t_relay_to_proto_addr() (bd504b2)
by aalba6675 30 Nov '20

30 Nov '20

Thanks @miconda ! There is one more string (in error message) that probably should be changed as well. ``` LM_ERR("t_relay_to_proto2 failed, bad protocol specified <%s>\n", sproto->s); ``` -- 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/commit/bd504b2352d322e94072ff7915cc4ee…

1 0

Re: [sr-dev] [kamailio/kamailio] Audio issue - STUN 401 Unauthorized with RTPEngine (#2567)
by Daniel-Constantin Mierla 30 Nov '20

30 Nov '20

Closed #2567. -- 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/2567#event-4051878245

1 0

Re: [sr-dev] [kamailio/kamailio] Audio issue - STUN 401 Unauthorized with RTPEngine (#2567)
by Daniel-Constantin Mierla 30 Nov '20

30 Nov '20

This is obviously about how to use kamailio and building its config file kamailio.cfg, not a report related to a bug in the c code of kamailio. Use sr-users(a)lists.kamailio.org for such needs, that is the place for community support. The tracker here is only for bug reports or requests for new features related to the C code of Kamailio application and its related tools. -- 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/2567#issuecomment-735778825

1 0

git:master:bd504b23: tm: renamed kemi ki_t_relay_to_proto2() to ki_t_relay_to_proto_addr()
by Daniel-Constantin Mierla 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: bd504b2352d322e94072ff7915cc4ee48260cccc URL: https://github.com/kamailio/kamailio/commit/bd504b2352d322e94072ff7915cc4ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-30T14:08:49+01:00 tm: renamed kemi ki_t_relay_to_proto2() to ki_t_relay_to_proto_addr() --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/bd504b2352d322e94072ff7915cc4ee… Patch: https://github.com/kamailio/kamailio/commit/bd504b2352d322e94072ff7915cc4ee… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index e46c3fb057..1beeee1053 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2923,7 +2923,7 @@ static int ki_t_relay_to_proto(sip_msg_t *msg, str *sproto) /** * */ -static int ki_t_relay_to_proto2(sip_msg_t *msg, str *sproto, str *host, unsigned int port) +static int ki_t_relay_to_proto_addr(sip_msg_t *msg, str *sproto, str *host, unsigned int port) { int proto = PROTO_NONE; @@ -3284,8 +3284,8 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("tm"), str_init("t_relay_to_proto2"), - SR_KEMIP_INT, ki_t_relay_to_proto2, + { str_init("tm"), str_init("t_relay_to_proto_addr"), + SR_KEMIP_INT, ki_t_relay_to_proto_addr, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:6376e249: dlgs: fix counting dialogs function
by Daniel-Constantin Mierla 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 6376e24960878ca510ab6f1ce0594a351debc409 URL: https://github.com/kamailio/kamailio/commit/6376e24960878ca510ab6f1ce0594a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-30T14:08:49+01:00 dlgs: fix counting dialogs function - count the dialog in initial state - GH #2568 --- Modified: src/modules/dlgs/dlgs_mod.c Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/6376e24960878ca510ab6f1ce0594a3… Patch: https://github.com/kamailio/kamailio/commit/6376e24960878ca510ab6f1ce0594a3… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index e26e0d9899..c7f60fcab8 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -250,13 +250,16 @@ static int w_dlgs_update(sip_msg_t *msg, char *p1, char *p2) */ static int ki_dlgs_count(sip_msg_t *msg, str *vfield, str *vop, str *vdata) { + int ret; + LM_DBG("counting by: [%.*s] [%.*s] [%.*s]\n", vfield->len, vfield->s, vop->len, vop->s, vdata->len, vdata->s); - if(dlgs_count(msg, vfield, vop, vdata) < 0) { - return -1; + ret = dlgs_count(msg, vfield, vop, vdata); + if(ret <= 0) { + return (ret-1); } - return 1; + return ret; } /** diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index 6b4a6b70e8..1f6af22ba3 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -340,6 +340,7 @@ int dlgs_add_item(sip_msg_t *msg, str *src, str *dst, str *data) prev->next = nitem; } dsht->slots[idx].esize++; + dlgs_update_stats(&dsht->slots[idx].astats, nitem->state, 1); lock_release(&dsht->slots[idx].lock); return 0; }

1 0

git:master:26b16dff: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 26b16dff41822feb37dd574b7324e817a25e1aff URL: https://github.com/kamailio/kamailio/commit/26b16dff41822feb37dd574b7324e81… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-30T09:16:16+01:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/26b16dff41822feb37dd574b7324e81… Patch: https://github.com/kamailio/kamailio/commit/26b16dff41822feb37dd574b7324e81… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index 1cbd906d27..81a4fa4833 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -179,7 +179,7 @@ Chapter 1. Admin Guide Example 1.3. Set location_type parameter ... - modparam("http_client", "location_type, "civic geodetic locationURI") + modparam("lost", "location_type, "civic geodetic locationURI") ... 4. Functions @@ -221,7 +221,7 @@ $var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$va r(pidf)"); ... -$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)"", "$var(err)"); +$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)", "$var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$va r(pidf)\n"); ...

1 0

[kamailio/kamailio] lost: fixed typo (#2566)
by sergey-safarov 30 Nov '20

30 Nov '20

#### 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Fixed type in lost module example. Param `location_type`. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2566 -- Commit Summary -- * lost: fixed typo -- File Changes -- M src/modules/lost/doc/lost_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2566.patch https://github.com/kamailio/kamailio/pull/2566.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/2566

2 3

git:master:87f363f7: lost: fixed typo
by Sergey Safarov 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 87f363f7fa0bf8f1897a3d6de13a09d6ec3812b9 URL: https://github.com/kamailio/kamailio/commit/87f363f7fa0bf8f1897a3d6de13a09d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-11-29T22:44:33+03:00 lost: fixed typo --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/87f363f7fa0bf8f1897a3d6de13a09d… Patch: https://github.com/kamailio/kamailio/commit/87f363f7fa0bf8f1897a3d6de13a09d… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index c8be8f668b..308b836db6 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -168,7 +168,7 @@ <title>Set <varname>location_type</varname> parameter</title> <programlisting format="linespecific"> ... - modparam("http_client", "location_type, "civic geodetic locationURI") + modparam("lost", "location_type, "civic geodetic locationURI") ... </programlisting> </example>

1 0

git:master:124499c1: lost: removed extra `"` symbol in example
by Sergey Safarov 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 124499c12db185d85805e5c71d5cc4222e608b68 URL: https://github.com/kamailio/kamailio/commit/124499c12db185d85805e5c71d5cc42… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-11-29T22:54:24+03:00 lost: removed extra `"` symbol in example --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/124499c12db185d85805e5c71d5cc42… Patch: https://github.com/kamailio/kamailio/commit/124499c12db185d85805e5c71d5cc42… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index 308b836db6..c5d4f5ad69 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -228,7 +228,7 @@ $var(id) = "sip:alice@atlanta"; $var(res) = lost_held_query("heldsrv", "$var(id)" , "$var(pidf)", "$var(url)", "$var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$var(pidf)"); ... -$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)"", "$var(err)"); +$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)", "$var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$var(pidf)\n"); ... </programlisting>

1 0

git:master:60cf4502: Merge pull request #2566 from sergey-safarov/master
by GitHub 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 60cf4502bbc55b4b8d246c3967dd8cae87e95c45 URL: https://github.com/kamailio/kamailio/commit/60cf4502bbc55b4b8d246c3967dd8ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-30T09:14:18+01:00 Merge pull request #2566 from sergey-safarov/master lost: fixed typo --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/60cf4502bbc55b4b8d246c3967dd8ca… Patch: https://github.com/kamailio/kamailio/commit/60cf4502bbc55b4b8d246c3967dd8ca… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index c8be8f668b..c5d4f5ad69 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -168,7 +168,7 @@ <title>Set <varname>location_type</varname> parameter</title> <programlisting format="linespecific"> ... - modparam("http_client", "location_type, "civic geodetic locationURI") + modparam("lost", "location_type, "civic geodetic locationURI") ... </programlisting> </example> @@ -228,7 +228,7 @@ $var(id) = "sip:alice@atlanta"; $var(res) = lost_held_query("heldsrv", "$var(id)" , "$var(pidf)", "$var(url)", "$var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$var(pidf)"); ... -$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)"", "$var(err)"); +$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)", "$var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$var(pidf)\n"); ... </programlisting>

1 0

[kamailio/kamailio] tm: KEMI expose t_relay_to_xxx protocol functions (#2563)
by aalba6675 30 Nov '20

30 Nov '20

#### 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 tm module: In KEMI let's expose t_relay_to_tcp t_relay_to_udp t_relay_to_tls to force the transport. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2563 -- Commit Summary -- * tm: KEMI expose t_relay_to_xxx protocol functions -- File Changes -- M src/modules/tm/tm.c (28) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2563.patch https://github.com/kamailio/kamailio/pull/2563.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/2563

2 5

git:master:93b2c03e: tm: KEMI expose t_relay_to_<proto>(host, port) functions
by Anthony Alba 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 93b2c03eca373831d895f392b790b28973c8e30e URL: https://github.com/kamailio/kamailio/commit/93b2c03eca373831d895f392b790b28… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2020-11-27T11:05:55+08:00 tm: KEMI expose t_relay_to_<proto>(host, port) functions --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/93b2c03eca373831d895f392b790b28… Patch: https://github.com/kamailio/kamailio/commit/93b2c03eca373831d895f392b790b28… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index d6bb017287..e46c3fb057 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2920,6 +2920,36 @@ static int ki_t_relay_to_proto(sip_msg_t *msg, str *sproto) return _w_t_relay_to(msg, (struct proxy_l *)0, proto); } +/** + * + */ +static int ki_t_relay_to_proto2(sip_msg_t *msg, str *sproto, str *host, unsigned int port) +{ + + int proto = PROTO_NONE; + struct proxy_l *proxy; + + if (sproto != NULL && sproto->s != NULL && sproto->len == 3) { + if (strncasecmp(sproto->s, "UDP", 3) == 0) { + proto = PROTO_UDP; + } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { + proto = PROTO_TCP; + } else if (strncasecmp(sproto->s, "TLS", 3)) { + proto = PROTO_TLS; + } else { + LM_ERR("t_relay_to_proto2 failed, bad protocol specified <%s>\n", sproto->s); + return E_UNSPEC; + } + } + proxy = mk_proxy(host, port, 0); + if (proxy == 0) { + LM_ERR("bad host, port provided <%s,%d>\n", + host->s, port ); + return E_BAD_ADDRESS; + } + return _w_t_relay_to(msg, proxy, proto); +} + /** * */ @@ -3254,6 +3284,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_relay_to_proto2"), + SR_KEMIP_INT, ki_t_relay_to_proto2, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tm"), str_init("t_get_status_code"), SR_KEMIP_INT, ki_t_get_status_code, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:6c18df16: Merge pull request #2563 from aalba6675/kemi-tm-proto
by GitHub 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 6c18df166379dd635bb99375ae1269b1ef8d96b2 URL: https://github.com/kamailio/kamailio/commit/6c18df166379dd635bb99375ae1269b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-30T09:02:33+01:00 Merge pull request #2563 from aalba6675/kemi-tm-proto tm: KEMI expose t_relay_to_xxx protocol functions --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/6c18df166379dd635bb99375ae1269b… Patch: https://github.com/kamailio/kamailio/commit/6c18df166379dd635bb99375ae1269b… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 99c932b417..e46c3fb057 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2897,6 +2897,59 @@ static int ki_t_relay(sip_msg_t *msg) return _w_t_relay_to(msg, (struct proxy_l *)0, PROTO_NONE); } +/** + * + */ +static int ki_t_relay_to_proto(sip_msg_t *msg, str *sproto) +{ + + int proto = PROTO_NONE; + + if (sproto != NULL && sproto->s != NULL && sproto->len == 3) { + if (strncasecmp(sproto->s, "UDP", 3) == 0) { + proto = PROTO_UDP; + } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { + proto = PROTO_TCP; + } else if (strncasecmp(sproto->s, "TLS", 3)) { + proto = PROTO_TLS; + } else { + LM_ERR("t_relay_to_proto failed, bad protocol specified <%s>\n", sproto->s); + return E_UNSPEC; + } + } + return _w_t_relay_to(msg, (struct proxy_l *)0, proto); +} + +/** + * + */ +static int ki_t_relay_to_proto2(sip_msg_t *msg, str *sproto, str *host, unsigned int port) +{ + + int proto = PROTO_NONE; + struct proxy_l *proxy; + + if (sproto != NULL && sproto->s != NULL && sproto->len == 3) { + if (strncasecmp(sproto->s, "UDP", 3) == 0) { + proto = PROTO_UDP; + } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { + proto = PROTO_TCP; + } else if (strncasecmp(sproto->s, "TLS", 3)) { + proto = PROTO_TLS; + } else { + LM_ERR("t_relay_to_proto2 failed, bad protocol specified <%s>\n", sproto->s); + return E_UNSPEC; + } + } + proxy = mk_proxy(host, port, 0); + if (proxy == 0) { + LM_ERR("bad host, port provided <%s,%d>\n", + host->s, port ); + return E_BAD_ADDRESS; + } + return _w_t_relay_to(msg, proxy, proto); +} + /** * */ @@ -3226,6 +3279,16 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_relay_to_proto"), + SR_KEMIP_INT, ki_t_relay_to_proto, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tm"), str_init("t_relay_to_proto2"), + SR_KEMIP_INT, ki_t_relay_to_proto2, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tm"), str_init("t_get_status_code"), SR_KEMIP_INT, ki_t_get_status_code, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:6520ee44: tm: KEMI expose t_relay_to_xxx protocol functions
by Anthony Alba 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 6520ee4422b24ca26f6d095d30cd2a0b0ea80aa2 URL: https://github.com/kamailio/kamailio/commit/6520ee4422b24ca26f6d095d30cd2a0… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2020-11-26T22:52:25+08:00 tm: KEMI expose t_relay_to_xxx protocol functions In KEMI let's expose t_relay_to_tcp t_relay_to_udp t_relay_to_tls to force the transport. --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/6520ee4422b24ca26f6d095d30cd2a0… Patch: https://github.com/kamailio/kamailio/commit/6520ee4422b24ca26f6d095d30cd2a0… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 99c932b417..d6bb017287 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2897,6 +2897,29 @@ static int ki_t_relay(sip_msg_t *msg) return _w_t_relay_to(msg, (struct proxy_l *)0, PROTO_NONE); } +/** + * + */ +static int ki_t_relay_to_proto(sip_msg_t *msg, str *sproto) +{ + + int proto = PROTO_NONE; + + if (sproto != NULL && sproto->s != NULL && sproto->len == 3) { + if (strncasecmp(sproto->s, "UDP", 3) == 0) { + proto = PROTO_UDP; + } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { + proto = PROTO_TCP; + } else if (strncasecmp(sproto->s, "TLS", 3)) { + proto = PROTO_TLS; + } else { + LM_ERR("t_relay_to_proto failed, bad protocol specified <%s>\n", sproto->s); + return E_UNSPEC; + } + } + return _w_t_relay_to(msg, (struct proxy_l *)0, proto); +} + /** * */ @@ -3226,6 +3249,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_relay_to_proto"), + SR_KEMIP_INT, ki_t_relay_to_proto, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tm"), str_init("t_get_status_code"), SR_KEMIP_INT, ki_t_get_status_code, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] nat_traversal: TCP transport support (#2564)
by sergey-safarov 28 Nov '20

28 Nov '20

### Description Typical client device located behind NAT. If the customer use TLS or TCP transport then `nat_keepalive` cannot be used. Details at [nat_traversal.c#L1389-L1391](https://github.com/kamailio/kamailio/blob/mast… In this case, the TCP session may be expired on the NAT device, and future calls to the user phone not possible. ### Expected behavior Send keep-alive messages for clients connected via TLS and TCP transport after `nat_keepalive` function call. #### Actual observed behavior Keep-alive messages do not send if phone connected via using TLS or TCP transport. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@localhost kamailio]# kamailio -v version: kamailio 5.5.0-dev3 (x86_64/linux) e9624b flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: e9624b compiled on 04:01:18 Nov 10 2020 with gcc 8.3.1 ``` * **Operating System**: ``` [root@localhost kamailio]# cat /etc/os-release NAME="CentOS Linux" VERSION="8 (Core)" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8 (Core)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://www.centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" REDHAT_SUPPORT_PRODUCT="centos" REDHAT_SUPPORT_PRODUCT_VERSION="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/2564

4 9

git:master:0f572ca9: pkg/kamailio/obs: packaged sworker module
by Sergey Safarov 28 Nov '20

28 Nov '20

Module: kamailio Branch: master Commit: 0f572ca97215e0a86b8f6d54d04bb3756c779889 URL: https://github.com/kamailio/kamailio/commit/0f572ca97215e0a86b8f6d54d04bb37… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-11-28T18:41:16+03:00 pkg/kamailio/obs: packaged sworker module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0f572ca97215e0a86b8f6d54d04bb37… Patch: https://github.com/kamailio/kamailio/commit/0f572ca97215e0a86b8f6d54d04bb37… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 396eeb8cc7..999422a746 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1491,6 +1491,7 @@ fi %doc %{_docdir}/kamailio/modules/README.sst %doc %{_docdir}/kamailio/modules/README.statistics %doc %{_docdir}/kamailio/modules/README.stun +%doc %{_docdir}/kamailio/modules/README.sworker %doc %{_docdir}/kamailio/modules/README.textops %doc %{_docdir}/kamailio/modules/README.textopsx %doc %{_docdir}/kamailio/modules/README.timer @@ -1648,6 +1649,7 @@ fi %{_libdir}/kamailio/modules/sst.so %{_libdir}/kamailio/modules/statistics.so %{_libdir}/kamailio/modules/stun.so +%{_libdir}/kamailio/modules/sworker.so %{_libdir}/kamailio/modules/textops.so %{_libdir}/kamailio/modules/textopsx.so %{_libdir}/kamailio/modules/timer.so

1 0

handling of locally generated 478 errors
by Henning Westerholt 27 Nov '20

27 Nov '20

Hello, I want to ask for your opinion on the best approach regarding the handling of locally generated 478 errors. To give an example, like the ones generated from TM during t_relay() on an unresolvable destination. Nov 25 17:40:13 kamailio[19345]: ERROR: {28607414 INVITE bba500ac-a9df-1239-6693-00505682c04d} tm [ut.h:286]: uri2dst2(): failed to resolve "invalid.skalatan.de" :unresolvable A or AAAA request (-7) Nov 25 17:40:13 kamailio[19345]: ERROR: {28607414 INVITE bba500ac-a9df-1239-6693-00505682c04d} tm [t_fwd.c:1738]: t_forward_nonack(): failure to add branches Nov 25 17:40:13 kamailio[19345]: CRITICAL: {28607414 INVITE bba500ac-a9df-1239-6693-00505682c04d} rtpengine [../../core/parser/../ip_addr.h:658]: ip_addr2sbuf(): unknown address family 0 These errors will not show up in onreply or failure_route. A long time ago this was discussed on the list [1], as some functionality were phased out out that support these scenarios. Kamailio will try to generate a 478 with TM, this will obviously fail as well, and then generate a 478 with SL. Question 1) Is this intentional that the internally generated 478 is not showing up in the failure_route, like for for 408? This has been tested several times, but it is a complicated configuration. Question 2) Are there any other (better) ideas how to handle that besides using a "event_route[sl:local-response]" to catch this, e.g. to tear down otherwise stale rtpengine sessions etc..? As a side note, event_route[tm:local-response] seems not to work as well because of the tm failure. Thanks, Henning [1] https://lists.kamailio.org/pipermail/sr-users/2011-June/069020.html -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

2 4

git:5.3:3a9ed0aa: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 27 Nov '20

27 Nov '20

Module: kamailio Branch: 5.3 Commit: 3a9ed0aab93d8fd04c33a35eec10481c1b699611 URL: https://github.com/kamailio/kamailio/commit/3a9ed0aab93d8fd04c33a35eec10481… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-27T19:16:44+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/3a9ed0aab93d8fd04c33a35eec10481… Patch: https://github.com/kamailio/kamailio/commit/3a9ed0aab93d8fd04c33a35eec10481… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index edaab1a5bb..f991ddd094 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1796,21 +1796,17 @@ modparam("rtpengine", "control_cmd_tos", 144) 4.72. hash_algo (integer) Hashing algorithm to be used in node selection algorithm. Now there are - 2 possibilities: legacy algorithm - 0(very basic hash over callid), - SHA1 - 1(apply sha1 over the callid and calculate hash) or CRC32 - - 2(calculate crc32 sum over the callid). + 2 possibilities: legacy alogrithm - 0(very basic hash over callid) or + SHA1 - 1(apply sha1 over the callid and calculate hash). Default value is 0, legacy algorithm. - The values not falling into the range “0-2” are ignored. + The values not falling into the range “0-1” . Example 1.73. Set control_cmd_tos parameter ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) - -### use CRC32 instead of legacy algorithm -modparam("rtpengine", "hash_algo", 2) ... 5. Functions

1 0

git:5.4:d0da7896: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 27 Nov '20

27 Nov '20

Module: kamailio Branch: 5.4 Commit: d0da78960e61aca42e75ba346b76616b59a16e86 URL: https://github.com/kamailio/kamailio/commit/d0da78960e61aca42e75ba346b76616… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-27T19:16:29+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/d0da78960e61aca42e75ba346b76616… Patch: https://github.com/kamailio/kamailio/commit/d0da78960e61aca42e75ba346b76616… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 0483ddd273..00e3746ffe 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1804,21 +1804,17 @@ modparam("rtpengine", "control_cmd_tos", 144) 4.72. hash_algo (integer) Hashing algorithm to be used in node selection algorithm. Now there are - 2 possibilities: legacy algorithm - 0(very basic hash over callid), - SHA1 - 1(apply sha1 over the callid and calculate hash) or CRC32 - - 2(calculate crc32 sum over the callid). + 2 possibilities: legacy algorithm - 0(very basic hash over callid) or + SHA1 - 1(apply sha1 over the callid and calculate hash). Default value is 0, legacy algorithm. - The values not falling into the range “0-2” are ignored. + The values not falling into the range “0-1” are ignored. Example 1.73. Set control_cmd_tos parameter ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) - -### use CRC32 instead of legacy algorithm -modparam("rtpengine", "hash_algo", 2) ... 5. Functions

1 0

git:5.4:89b66e50: Revert "rtpengine: add CRC32 hash algo (#2558)"
by Henning Westerholt 27 Nov '20

27 Nov '20

Module: kamailio Branch: 5.4 Commit: 89b66e50b93465c120e818dabd4c94f9443bd686 URL: https://github.com/kamailio/kamailio/commit/89b66e50b93465c120e818dabd4c94f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-11-27T18:05:35Z Revert "rtpengine: add CRC32 hash algo (#2558)" This reverts commit bc1cf60f970c572ecaddf1ea154834d0e41d292e. --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/89b66e50b93465c120e818dabd4c94f… Patch: https://github.com/kamailio/kamailio/commit/89b66e50b93465c120e818dabd4c94f… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 60d8673a5f..362fa58910 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2022,14 +2022,13 @@ modparam("rtpengine", "control_cmd_tos", 144) <title><varname>hash_algo</varname> (integer)</title> <para> Hashing algorithm to be used in node selection algorithm. Now there are 2 possibilities: legacy - algorithm - 0(very basic hash over callid), SHA1 - 1(apply sha1 over the callid and calculate hash) or - CRC32 - 2(calculate crc32 sum over the callid). + algorithm - 0(very basic hash over callid) or SHA1 - 1(apply sha1 over the callid and calculate hash). </para> <para> Default value is 0, legacy algorithm. </para> <para> - The values not falling into the range <quote>0-2</quote> are ignored. + The values not falling into the range <quote>0-1</quote> are ignored. </para> <example> <title>Set <varname>control_cmd_tos</varname> parameter</title> @@ -2037,9 +2036,6 @@ modparam("rtpengine", "control_cmd_tos", 144) ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) - -### use CRC32 instead of legacy algorithm -modparam("rtpengine", "hash_algo", 2) ... </programlisting> </example> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 0a7c3b3b88..95726fa4a1 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2974,9 +2974,6 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } break; - case RTP_HASH_CRC32_CALLID: - crc32_uint(&callid, &sum); - goto retry; default: LM_ERR("unknown hashing algo %d\n", hash_algo); return NULL; @@ -2994,7 +2991,6 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } retry: - LM_DBG("sum is = %u\n", sum); weight_sum = 0; lock_get(active_rtpp_set->rset_lock); diff --git a/src/modules/rtpengine/rtpengine.h b/src/modules/rtpengine/rtpengine.h index 81f6cb388c..03999bf22f 100644 --- a/src/modules/rtpengine/rtpengine.h +++ b/src/modules/rtpengine/rtpengine.h @@ -103,6 +103,6 @@ extern str rtpp_url_col; extern str rtpp_weight_col; extern str rtpp_disabled_col; -enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID, RTP_HASH_CRC32_CALLID }; +enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID}; #endif

1 0

git:5.3:93ad3b9e: Revert "rtpengine: add CRC32 hash algo (#2558)"
by Henning Westerholt 27 Nov '20

27 Nov '20

Module: kamailio Branch: 5.3 Commit: 93ad3b9ed017f00984ef241a90186b4dfdab2728 URL: https://github.com/kamailio/kamailio/commit/93ad3b9ed017f00984ef241a90186b4… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-11-27T18:01:50Z Revert "rtpengine: add CRC32 hash algo (#2558)" This reverts commit 0bff74a16bb991ffe8c6690133414c5c9126bd1f. --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/93ad3b9ed017f00984ef241a90186b4… Patch: https://github.com/kamailio/kamailio/commit/93ad3b9ed017f00984ef241a90186b4… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 6c4c932b99..cafd6b6ef4 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2012,14 +2012,13 @@ modparam("rtpengine", "control_cmd_tos", 144) <title><varname>hash_algo</varname> (integer)</title> <para> Hashing algorithm to be used in node selection algorithm. Now there are 2 possibilities: legacy - algorithm - 0(very basic hash over callid), SHA1 - 1(apply sha1 over the callid and calculate hash) or - CRC32 - 2(calculate crc32 sum over the callid). + alogrithm - 0(very basic hash over callid) or SHA1 - 1(apply sha1 over the callid and calculate hash). </para> <para> Default value is 0, legacy algorithm. </para> <para> - The values not falling into the range <quote>0-2</quote> are ignored. + The values not falling into the range <quote>0-1</quote> . </para> <example> <title>Set <varname>control_cmd_tos</varname> parameter</title> @@ -2027,9 +2026,6 @@ modparam("rtpengine", "control_cmd_tos", 144) ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) - -### use CRC32 instead of legacy algorithm -modparam("rtpengine", "hash_algo", 2) ... </programlisting> </example> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 3044fe4b07..8b72e5b675 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2943,9 +2943,6 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } break; - case RTP_HASH_CRC32_CALLID: - crc32_uint(&callid, &sum); - goto retry; default: LM_ERR("unknown hashing algo %d\n", hash_algo); return NULL; @@ -2963,7 +2960,6 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } retry: - LM_DBG("sum is = %u\n", sum); weight_sum = 0; lock_get(active_rtpp_set->rset_lock); diff --git a/src/modules/rtpengine/rtpengine.h b/src/modules/rtpengine/rtpengine.h index bea421ee9d..8a29210db2 100644 --- a/src/modules/rtpengine/rtpengine.h +++ b/src/modules/rtpengine/rtpengine.h @@ -102,6 +102,6 @@ extern str rtpp_url_col; extern str rtpp_weight_col; extern str rtpp_disabled_col; -enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID, RTP_HASH_CRC32_CALLID }; +enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID}; #endif

1 0

[kamailio/kamailio] rtpengine: add CRC32 hash algo (#2558)
by Stefan Mititelu 27 Nov '20

27 Nov '20

#### 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 CRC32 selection algo. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2558 -- Commit Summary -- * rtpengine: add CRC32 hash algo -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (5) M src/modules/rtpengine/rtpengine.c (4) M src/modules/rtpengine/rtpengine.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2558.patch https://github.com/kamailio/kamailio/pull/2558.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/2558

4 9

git:master:06860832: core: skip running event_route[core:pre-routing] for internal routed messages
by Daniel-Constantin Mierla 27 Nov '20

27 Nov '20

Module: kamailio Branch: master Commit: 0686083209841be9f5d26ea61c3f4b660d74a9b8 URL: https://github.com/kamailio/kamailio/commit/0686083209841be9f5d26ea61c3f4b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-27T13:27:48+01:00 core: skip running event_route[core:pre-routing] for internal routed messages --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/0686083209841be9f5d26ea61c3f4b6… Patch: https://github.com/kamailio/kamailio/commit/0686083209841be9f5d26ea61c3f4b6… --- diff --git a/src/core/receive.c b/src/core/receive.c index b438182f26..f3b31fefbc 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -235,6 +235,11 @@ int ksr_evrt_pre_routing(sip_msg_t *msg) str evname = str_init("core:pre-routing"); recv_flags_t brflags; + if(msg->rcv.rflags & RECV_F_INTERNAL) { + DBG("skip internal routed message\n"); + return 0; + } + if(kemi_pre_routing_callback.len>0) { keng = sr_kemi_eng_get(); if(keng == NULL) {

1 0

git:master:98805c72: ndb_redis: set message level to debug on reconnect
by Victor Seva 27 Nov '20

27 Nov '20

Module: kamailio Branch: master Commit: 98805c723fbe01556e56d5b00ffc686b92014847 URL: https://github.com/kamailio/kamailio/commit/98805c723fbe01556e56d5b00ffc686… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-11-27T12:22:52+01:00 ndb_redis: set message level to debug on reconnect * logging error makes no sense here since there's going to be a reconnection afterwards --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/98805c723fbe01556e56d5b00ffc686… Patch: https://github.com/kamailio/kamailio/commit/98805c723fbe01556e56d5b00ffc686… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 15a86f7b10..42880310f2 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -1011,7 +1011,7 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) /* null reply, reconnect and try again */ if(rsrv->ctxRedis->err) { - LM_ERR("Redis error: %s\n", rsrv->ctxRedis->errstr); + LM_DBG("Redis error: %s\n", rsrv->ctxRedis->errstr); } if(redisc_reconnect_server(rsrv)==0) { @@ -1054,7 +1054,7 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) /* null reply, reconnect and try again */ if(rsrv->ctxRedis->err) { - LM_ERR("Redis error: %s\n", rsrv->ctxRedis->errstr); + LM_DBG("Redis error: %s\n", rsrv->ctxRedis->errstr); } if(redisc_reconnect_server(rsrv)==0) { @@ -1152,7 +1152,7 @@ redisReply* redisc_exec_argv(redisc_server_t *rsrv, int argc, const char **argv, /* null reply, reconnect and try again */ if(rsrv->ctxRedis->err) { - LM_ERR("Redis error: %s\n", rsrv->ctxRedis->errstr); + LM_DBG("Redis error: %s\n", rsrv->ctxRedis->errstr); } if(res)

1 0

git:master:b7d42f24: core: test if shm is initialized on early shutdown
by Daniel-Constantin Mierla 27 Nov '20

27 Nov '20

Module: kamailio Branch: master Commit: b7d42f248bef70a06d8ae23f4a7652fd3f0e4e61 URL: https://github.com/kamailio/kamailio/commit/b7d42f248bef70a06d8ae23f4a7652f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-27T07:49:27+01:00 core: test if shm is initialized on early shutdown --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/b7d42f248bef70a06d8ae23f4a7652f… Patch: https://github.com/kamailio/kamailio/commit/b7d42f248bef70a06d8ae23f4a7652f… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 56ba8bca59..ba6406ba46 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -43,6 +43,7 @@ #include "sr_compat.h" #include "ppcfg.h" #include "async_task.h" +#include "shm_init.h" #include <sys/stat.h> #include <regex.h> @@ -114,7 +115,7 @@ static int *_ksr_shutdown_phase = NULL; int ksr_shutdown_phase_init(void) { - if(_ksr_shutdown_phase == NULL) { + if((_ksr_shutdown_phase == NULL) && (shm_initialized())) { _ksr_shutdown_phase = (int*)shm_malloc(sizeof(int)); } return 0;

1 0

git:master:85b2f1a1: core: new global parameter async_workers_group
by Daniel-Constantin Mierla 26 Nov '20

26 Nov '20

Module: kamailio Branch: master Commit: 85b2f1a18ad12a74bc80a4946d41510795e47e04 URL: https://github.com/kamailio/kamailio/commit/85b2f1a18ad12a74bc80a4946d41510… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T16:04:39+01:00 core: new global parameter async_workers_group - define groups of async worker processes - async_workers_group="name=abc;workers=N;nonblock=[0|1];usleep=M" - groups of worker processes can be used now with sworker module --- Modified: src/core/async_task.c Modified: src/core/async_task.h Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/85b2f1a18ad12a74bc80a4946d41510… Patch: https://github.com/kamailio/kamailio/commit/85b2f1a18ad12a74bc80a4946d41510…

1 0

git:master:aa13720e: core: check if the tcp clone rcv buffer is set when applying changes
by Daniel-Constantin Mierla 26 Nov '20

26 Nov '20

Module: kamailio Branch: master Commit: aa13720e5d78dde5ae5235c13399848cb8f5a0cc URL: https://github.com/kamailio/kamailio/commit/aa13720e5d78dde5ae5235c13399848… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T13:55:17+01:00 core: check if the tcp clone rcv buffer is set when applying changes --- Modified: src/core/msg_translator.c Modified: src/core/tcp_options.h Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/aa13720e5d78dde5ae5235c13399848… Patch: https://github.com/kamailio/kamailio/commit/aa13720e5d78dde5ae5235c13399848… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 07e70b715f..f895df9683 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3252,7 +3252,12 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) LM_ERR("invalid buffer parameter\n"); return -1; } - +#ifdef USE_TCP + if(tcp_get_clone_rcvbuf()==0) { + LM_ERR("tcp clone received buffer not enabled\n"); + return -1; + } +#endif if(obuf->len >= BUF_SIZE) { LM_ERR("new buffer is too large (%d)\n", obuf->len); return -1; diff --git a/src/core/tcp_options.h b/src/core/tcp_options.h index f9729544df..61d5828c27 100644 --- a/src/core/tcp_options.h +++ b/src/core/tcp_options.h @@ -157,6 +157,7 @@ void tcp_options_get(struct cfg_group_tcp* t); #ifdef USE_TCP int tcp_set_clone_rcvbuf(int v); +int tcp_get_clone_rcvbuf(void); #endif /* USE_TCP */ #endif /* tcp_options_h */ diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 8944d246c1..3ae21a71d9 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -109,6 +109,11 @@ int tcp_set_clone_rcvbuf(int v) return r; } +int tcp_get_clone_rcvbuf(void) +{ + return tcp_clone_rcvbuf; +} + #ifdef READ_HTTP11 int tcp_http11_continue(struct tcp_connection *c) {

1 0

git:master:3fde5ddc: modules: readme files regenerated - sworker ... [skip ci]
by Kamailio Dev 26 Nov '20

26 Nov '20

Module: kamailio Branch: master Commit: 3fde5ddcd8ae583b8d3fa6be43589bba2e07b984 URL: https://github.com/kamailio/kamailio/commit/3fde5ddcd8ae583b8d3fa6be43589bb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-26T13:46:28+01:00 modules: readme files regenerated - sworker ... [skip ci] --- Modified: src/modules/sworker/README --- Diff: https://github.com/kamailio/kamailio/commit/3fde5ddcd8ae583b8d3fa6be43589bb… Patch: https://github.com/kamailio/kamailio/commit/3fde5ddcd8ae583b8d3fa6be43589bb… --- diff --git a/src/modules/sworker/README b/src/modules/sworker/README index e01307b175..241b077ab6 100644 --- a/src/modules/sworker/README +++ b/src/modules/sworker/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2020 asipto.com + Copyright Â© 2020 asipto.com __________________________________________________________________ Table of Contents @@ -51,10 +51,19 @@ Chapter 1. Admin Guide 1. Overview This module can delegate processing of SIP requests to a group of - workers in the configuration file. The async workers have to defined - with the global parameter. + workers in the configuration file by using + event_route[core:pre-routing]. The async workers have to defined with + the global parameter. The worker process that received the message + internally does the usual execution of the config script, running + request_route or reply_route. - It does not create the transaction and nor suspend it. + Note: the behaviour is different than the async module, because it does + not create the transaction (obviously also not performing suspend). + + Note: it does not propagate anything set in the event_route, therefore + any set flag, or avp, etc. are lost. The SIP message is processed by + the delegated worker as it was fresh received from the network + (including parsing). 2. Dependencies @@ -77,7 +86,7 @@ Chapter 1. Admin Guide 3.1. sworker_active() 3.2. swork_task(gname) -3.1. sworker_active() +3.1. sworker_active() Return 1 (true) if the processing happens in an asyn process, or -1 (false) if the processing is happening in a SIP receiving process. @@ -94,24 +103,28 @@ request_route { } ... -3.2. swork_task(gname) +3.2. swork_task(gname) - Delegate the processing of SIP message to a group of async workers. + Delegate the processing of SIP message to a group of async workers. The + function is restricted to be used inside event_route[core:pre-routing]. The parameter gname provides the name of the group workers, it can contain pseudo-variables. - The function returns 0 (exit) in case the task is delegated. + The function returns 1 (true) in case the task is delegated. After + that, 'drop' must be used so processing of the message does not + continue to request_route or reply_route in the same process, it is + going to be done by the delegated group of workers. It returns -1 + (false) in case there was a proble delegating the processing. This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE. Example 1.2. sworker_task() usage ... -request_route { - if(!sworker_active()) { +event_route[core:pre-routing] { + if(sworker_task("default")) { xinfo("===== delegate processing [$Tf] [$si:$sp]\n"); - sworker_task("default"); - exit; + drop; } xinfo("===== processing continues [$Tf] [$si:$sp]\n"); ...

1 0

git:master:09d9a349: sworker: restrict use of sworker_task() in pre-processing phase
by Daniel-Constantin Mierla 26 Nov '20

26 Nov '20

Module: kamailio Branch: master Commit: 09d9a34923fa2ca3441f8b67a740383466a92481 URL: https://github.com/kamailio/kamailio/commit/09d9a34923fa2ca3441f8b67a740383… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T13:25:50+01:00 sworker: restrict use of sworker_task() in pre-processing phase - allow execution only in event_route[core:pre-routing] --- Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/09d9a34923fa2ca3441f8b67a740383… Patch: https://github.com/kamailio/kamailio/commit/09d9a34923fa2ca3441f8b67a740383… --- diff --git a/src/modules/sworker/sworker_mod.c b/src/modules/sworker/sworker_mod.c index bf3782e5cb..33ee3361bd 100644 --- a/src/modules/sworker/sworker_mod.c +++ b/src/modules/sworker/sworker_mod.c @@ -167,12 +167,15 @@ int ki_sworker_task(sip_msg_t *msg, str *gname) return -1; } + if(!(msg->rcv.rflags & RECV_F_PREROUTING)) { + LM_WARN("not used in pre-routing phase\n"); + return -1; + } if(sworker_send_task(msg, gname) < 0) { return -1; } - /* force exit in config */ - return 0; + return 1; } /**

1 0

git:master:10292cf1: sworker: docs update to reflect use with event_route[core:pre-routing]
by Daniel-Constantin Mierla 26 Nov '20

26 Nov '20

Module: kamailio Branch: master Commit: 10292cf151bd4d0ab9d2926d6acc9e2642b6f6da URL: https://github.com/kamailio/kamailio/commit/10292cf151bd4d0ab9d2926d6acc9e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T13:44:27+01:00 sworker: docs update to reflect use with event_route[core:pre-routing] --- Modified: src/modules/sworker/doc/sworker_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/10292cf151bd4d0ab9d2926d6acc9e2… Patch: https://github.com/kamailio/kamailio/commit/10292cf151bd4d0ab9d2926d6acc9e2… --- diff --git a/src/modules/sworker/doc/sworker_admin.xml b/src/modules/sworker/doc/sworker_admin.xml index e1675a45bf..9656ff1071 100644 --- a/src/modules/sworker/doc/sworker_admin.xml +++ b/src/modules/sworker/doc/sworker_admin.xml @@ -17,11 +17,20 @@ <title>Overview</title> <para> This module can delegate processing of SIP requests to a group of - workers in the configuration file. The async workers have to defined - with the global parameter. + workers in the configuration file by using event_route[core:pre-routing]. + The async workers have to defined with the global parameter. The worker + process that received the message internally does the usual execution + of the config script, running request_route or reply_route. </para> <para> - It does not create the transaction and nor suspend it. + Note: the behaviour is different than the async module, because it does + not create the transaction (obviously also not performing suspend). + </para> + <para> + Note: it does not propagate anything set in the event_route, therefore + any set flag, or avp, etc. are lost. The SIP message is processed by the + delegated worker as it was fresh received from the network (including + parsing). </para> </section> @@ -88,14 +97,19 @@ request_route { <function moreinfo="none">swork_task(gname)</function> </title> <para> - Delegate the processing of SIP message to a group of async workers. + Delegate the processing of SIP message to a group of async workers. The + function is restricted to be used inside event_route[core:pre-routing]. </para> <para> The parameter gname provides the name of the group workers, it can contain pseudo-variables. </para> <para> - The function returns 0 (exit) in case the task is delegated. + The function returns 1 (true) in case the task is delegated. After that, + 'drop' must be used so processing of the message does not continue to + request_route or reply_route in the same process, it is going to be done + by the delegated group of workers. It returns -1 (false) in case there + was a proble delegating the processing. </para> <para> This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE. @@ -104,11 +118,10 @@ request_route { <title><function>sworker_task()</function> usage</title> <programlisting format="linespecific"> ... -request_route { - if(!sworker_active()) { +event_route[core:pre-routing] { + if(sworker_task("default")) { xinfo("===== delegate processing [$Tf] [$si:$sp]\n"); - sworker_task("default"); - exit; + drop; } xinfo("===== processing continues [$Tf] [$si:$sp]\n"); ...

1 0

git:master:0792f6e5: core: added flags field for received info structure
by Daniel-Constantin Mierla 26 Nov '20

26 Nov '20

Module: kamailio Branch: master Commit: 0792f6e5f9b8e43981f8dfa87a860f578d16da1e URL: https://github.com/kamailio/kamailio/commit/0792f6e5f9b8e43981f8dfa87a860f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T09:50:00+01:00 core: added flags field for received info structure --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/0792f6e5f9b8e43981f8dfa87a860f5… Patch: https://github.com/kamailio/kamailio/commit/0792f6e5f9b8e43981f8dfa87a860f5… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 7373e7bc24..8e26ee0c47 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -145,6 +145,10 @@ typedef struct snd_flags { unsigned short blst_imask; /* blocklist ignore mask */ } snd_flags_t; +/* recv flags */ +typedef enum recv_flags { + RECV_F_INTERNAL = (1 << 0), /* */ +} recv_flags_t; typedef struct receive_info { struct ip_addr src_ip; @@ -156,6 +160,7 @@ typedef struct receive_info { union sockaddr_union src_su; /* useful for replies*/ struct socket_info* bind_address; /* sock_info structure on which * the msg was received */ + recv_flags_t rflags; /* flags */ char proto; #ifdef USE_COMP char proto_pad0; /* padding field */

1 0

git:master:ecea36c6: sworker: set the internal received flag
by Daniel-Constantin Mierla 26 Nov '20

26 Nov '20

Module: kamailio Branch: master Commit: ecea36c6281c60888b2273a046b8937858cd2f7b URL: https://github.com/kamailio/kamailio/commit/ecea36c6281c60888b2273a046b8937… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T09:50:00+01:00 sworker: set the internal received flag --- Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ecea36c6281c60888b2273a046b8937… Patch: https://github.com/kamailio/kamailio/commit/ecea36c6281c60888b2273a046b8937… --- diff --git a/src/modules/sworker/sworker_mod.c b/src/modules/sworker/sworker_mod.c index 06762cdbe5..bf3782e5cb 100644 --- a/src/modules/sworker/sworker_mod.c +++ b/src/modules/sworker/sworker_mod.c @@ -122,6 +122,7 @@ void sworker_exec_task(void *param) memcpy(buf, stp->buf, stp->len); len = stp->len; memcpy(&rcvi, &stp->rcv, sizeof(receive_info_t)); + rcvi.rflags |= RECV_F_INTERNAL; _sworker_active = 1; receive_msg(buf, len, &rcvi);

1 0

git:master:f86ced04: core: new event_route[core:pre-routing]
by Daniel-Constantin Mierla 26 Nov '20

26 Nov '20

Module: kamailio Branch: master Commit: f86ced0419787a3c5196edb055f30b39684e37c5 URL: https://github.com/kamailio/kamailio/commit/f86ced0419787a3c5196edb055f30b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T13:23:05+01:00 core: new event_route[core:pre-routing] - executed before running config script for SIP messages, if received from the network, it is not executed if the message was dispatched internally - can be used to delegate processing to special workers via sworker module - if drop is used, then processing stops for that message, otherwise it goes forther to request_route or reply_route --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/ip_addr.h Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/f86ced0419787a3c5196edb055f30b3… Patch: https://github.com/kamailio/kamailio/commit/f86ced0419787a3c5196edb055f30b3…

1 0

git:5.3:19ac8252: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 26 Nov '20

26 Nov '20

Module: kamailio Branch: 5.3 Commit: 19ac8252b08521e79cd7c6608ac38bdf3bad767a URL: https://github.com/kamailio/kamailio/commit/19ac8252b08521e79cd7c6608ac38bd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-26T08:16:58+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/19ac8252b08521e79cd7c6608ac38bd… Patch: https://github.com/kamailio/kamailio/commit/19ac8252b08521e79cd7c6608ac38bd… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index f991ddd094..edaab1a5bb 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1796,17 +1796,21 @@ modparam("rtpengine", "control_cmd_tos", 144) 4.72. hash_algo (integer) Hashing algorithm to be used in node selection algorithm. Now there are - 2 possibilities: legacy alogrithm - 0(very basic hash over callid) or - SHA1 - 1(apply sha1 over the callid and calculate hash). + 2 possibilities: legacy algorithm - 0(very basic hash over callid), + SHA1 - 1(apply sha1 over the callid and calculate hash) or CRC32 - + 2(calculate crc32 sum over the callid). Default value is 0, legacy algorithm. - The values not falling into the range “0-1” . + The values not falling into the range “0-2” are ignored. Example 1.73. Set control_cmd_tos parameter ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) + +### use CRC32 instead of legacy algorithm +modparam("rtpengine", "hash_algo", 2) ... 5. Functions

1 0

git:5.4:18edda18: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 26 Nov '20

26 Nov '20

Module: kamailio Branch: 5.4 Commit: 18edda18229ee6e75370a078a5deb8f980274e52 URL: https://github.com/kamailio/kamailio/commit/18edda18229ee6e75370a078a5deb8f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-26T08:16:39+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/18edda18229ee6e75370a078a5deb8f… Patch: https://github.com/kamailio/kamailio/commit/18edda18229ee6e75370a078a5deb8f… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 00e3746ffe..0483ddd273 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1804,17 +1804,21 @@ modparam("rtpengine", "control_cmd_tos", 144) 4.72. hash_algo (integer) Hashing algorithm to be used in node selection algorithm. Now there are - 2 possibilities: legacy algorithm - 0(very basic hash over callid) or - SHA1 - 1(apply sha1 over the callid and calculate hash). + 2 possibilities: legacy algorithm - 0(very basic hash over callid), + SHA1 - 1(apply sha1 over the callid and calculate hash) or CRC32 - + 2(calculate crc32 sum over the callid). Default value is 0, legacy algorithm. - The values not falling into the range “0-1” are ignored. + The values not falling into the range “0-2” are ignored. Example 1.73. Set control_cmd_tos parameter ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) + +### use CRC32 instead of legacy algorithm +modparam("rtpengine", "hash_algo", 2) ... 5. Functions

1 0

git:5.4:bc1cf60f: rtpengine: add CRC32 hash algo (#2558)
by Stefan Mititelu 26 Nov '20

26 Nov '20

Module: kamailio Branch: 5.4 Commit: bc1cf60f970c572ecaddf1ea154834d0e41d292e URL: https://github.com/kamailio/kamailio/commit/bc1cf60f970c572ecaddf1ea154834d… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2020-11-26T09:13:40+02:00 rtpengine: add CRC32 hash algo (#2558) (cherry picked from commit 10349080490faabffaf1ab7cc5d591678b8c94dd) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/bc1cf60f970c572ecaddf1ea154834d… Patch: https://github.com/kamailio/kamailio/commit/bc1cf60f970c572ecaddf1ea154834d… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 362fa58910..60d8673a5f 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2022,13 +2022,14 @@ modparam("rtpengine", "control_cmd_tos", 144) <title><varname>hash_algo</varname> (integer)</title> <para> Hashing algorithm to be used in node selection algorithm. Now there are 2 possibilities: legacy - algorithm - 0(very basic hash over callid) or SHA1 - 1(apply sha1 over the callid and calculate hash). + algorithm - 0(very basic hash over callid), SHA1 - 1(apply sha1 over the callid and calculate hash) or + CRC32 - 2(calculate crc32 sum over the callid). </para> <para> Default value is 0, legacy algorithm. </para> <para> - The values not falling into the range <quote>0-1</quote> are ignored. + The values not falling into the range <quote>0-2</quote> are ignored. </para> <example> <title>Set <varname>control_cmd_tos</varname> parameter</title> @@ -2036,6 +2037,9 @@ modparam("rtpengine", "control_cmd_tos", 144) ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) + +### use CRC32 instead of legacy algorithm +modparam("rtpengine", "hash_algo", 2) ... </programlisting> </example> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 95726fa4a1..0a7c3b3b88 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2974,6 +2974,9 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } break; + case RTP_HASH_CRC32_CALLID: + crc32_uint(&callid, &sum); + goto retry; default: LM_ERR("unknown hashing algo %d\n", hash_algo); return NULL; @@ -2991,6 +2994,7 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } retry: + LM_DBG("sum is = %u\n", sum); weight_sum = 0; lock_get(active_rtpp_set->rset_lock); diff --git a/src/modules/rtpengine/rtpengine.h b/src/modules/rtpengine/rtpengine.h index 03999bf22f..81f6cb388c 100644 --- a/src/modules/rtpengine/rtpengine.h +++ b/src/modules/rtpengine/rtpengine.h @@ -103,6 +103,6 @@ extern str rtpp_url_col; extern str rtpp_weight_col; extern str rtpp_disabled_col; -enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID}; +enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID, RTP_HASH_CRC32_CALLID }; #endif

1 0

git:5.3:0bff74a1: rtpengine: add CRC32 hash algo (#2558)
by Stefan Mititelu 26 Nov '20

26 Nov '20

Module: kamailio Branch: 5.3 Commit: 0bff74a16bb991ffe8c6690133414c5c9126bd1f URL: https://github.com/kamailio/kamailio/commit/0bff74a16bb991ffe8c6690133414c5… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2020-11-26T09:09:58+02:00 rtpengine: add CRC32 hash algo (#2558) (cherry picked from commit 10349080490faabffaf1ab7cc5d591678b8c94dd) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/0bff74a16bb991ffe8c6690133414c5… Patch: https://github.com/kamailio/kamailio/commit/0bff74a16bb991ffe8c6690133414c5… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index cafd6b6ef4..6c4c932b99 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2012,13 +2012,14 @@ modparam("rtpengine", "control_cmd_tos", 144) <title><varname>hash_algo</varname> (integer)</title> <para> Hashing algorithm to be used in node selection algorithm. Now there are 2 possibilities: legacy - alogrithm - 0(very basic hash over callid) or SHA1 - 1(apply sha1 over the callid and calculate hash). + algorithm - 0(very basic hash over callid), SHA1 - 1(apply sha1 over the callid and calculate hash) or + CRC32 - 2(calculate crc32 sum over the callid). </para> <para> Default value is 0, legacy algorithm. </para> <para> - The values not falling into the range <quote>0-1</quote> . + The values not falling into the range <quote>0-2</quote> are ignored. </para> <example> <title>Set <varname>control_cmd_tos</varname> parameter</title> @@ -2026,6 +2027,9 @@ modparam("rtpengine", "control_cmd_tos", 144) ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) + +### use CRC32 instead of legacy algorithm +modparam("rtpengine", "hash_algo", 2) ... </programlisting> </example> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 8b72e5b675..3044fe4b07 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2943,6 +2943,9 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } break; + case RTP_HASH_CRC32_CALLID: + crc32_uint(&callid, &sum); + goto retry; default: LM_ERR("unknown hashing algo %d\n", hash_algo); return NULL; @@ -2960,6 +2963,7 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } retry: + LM_DBG("sum is = %u\n", sum); weight_sum = 0; lock_get(active_rtpp_set->rset_lock); diff --git a/src/modules/rtpengine/rtpengine.h b/src/modules/rtpengine/rtpengine.h index 8a29210db2..bea421ee9d 100644 --- a/src/modules/rtpengine/rtpengine.h +++ b/src/modules/rtpengine/rtpengine.h @@ -102,6 +102,6 @@ extern str rtpp_url_col; extern str rtpp_weight_col; extern str rtpp_disabled_col; -enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID}; +enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID, RTP_HASH_CRC32_CALLID }; #endif

1 0

git:master:f3f1a643: pkg/kamailio/alpine: renamed userblacklist to userblocklist
by Sergey Safarov 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: f3f1a643b7084365d1b18d971cf4ef024f717e7b URL: https://github.com/kamailio/kamailio/commit/f3f1a643b7084365d1b18d971cf4ef0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-11-25T21:45:36+03:00 pkg/kamailio/alpine: renamed userblacklist to userblocklist --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/f3f1a643b7084365d1b18d971cf4ef0… Patch: https://github.com/kamailio/kamailio/commit/f3f1a643b7084365d1b18d971cf4ef0… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 6a7cb2534f..f23ad03308 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -70,7 +70,7 @@ _mod_list_db="acc alias_db auth_db avpops cfg_db db_berkeley db_flatstore \ db_cluster dialog dispatcher domain drouting group \ htable imc matrix mohqueue msilo mtree p_usrloc pdt permissions \ pipelimit prefix_route registrar sipcapture siptrace speeddial \ - sqlops uac uri_db userblacklist usrloc" + sqlops uac uri_db userblocklist usrloc" # - common modules depending on database, using UID db schema _mod_list_dbuid="db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \

1 0

git:master:309c00f0: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: 309c00f0bbc0320ef376495b1dd88c2c13cc61a2 URL: https://github.com/kamailio/kamailio/commit/309c00f0bbc0320ef376495b1dd88c2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-25T18:31:19+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/309c00f0bbc0320ef376495b1dd88c2… Patch: https://github.com/kamailio/kamailio/commit/309c00f0bbc0320ef376495b1dd88c2… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index b72a92de2a..b74f6f15b7 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1804,17 +1804,21 @@ modparam("rtpengine", "control_cmd_tos", 144) 4.72. hash_algo (integer) Hashing algorithm to be used in node selection algorithm. Now there are - 2 possibilities: legacy algorithm - 0(very basic hash over callid) or - SHA1 - 1(apply sha1 over the callid and calculate hash). + 2 possibilities: legacy algorithm - 0(very basic hash over callid), + SHA1 - 1(apply sha1 over the callid and calculate hash) or CRC32 - + 2(calculate crc32 sum over the callid). Default value is 0, legacy algorithm. - The values not falling into the range “0-1” are ignored. + The values not falling into the range “0-2” are ignored. Example 1.73. Set control_cmd_tos parameter ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) + +### use CRC32 instead of legacy algorithm +modparam("rtpengine", "hash_algo", 2) ... 5. Functions

1 0

git:master:7eda3756: pkg/kamailio/obs: renamed userblacklist to userblocklist
by Sergey Safarov 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: 7eda375669a03ad991d812acfaf15a936b1cabaf URL: https://github.com/kamailio/kamailio/commit/7eda375669a03ad991d812acfaf15a9… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-11-25T20:27:51+03:00 pkg/kamailio/obs: renamed userblacklist to userblocklist --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/7eda375669a03ad991d812acfaf15a9… Patch: https://github.com/kamailio/kamailio/commit/7eda375669a03ad991d812acfaf15a9… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 887f4411ce..396eeb8cc7 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1506,7 +1506,7 @@ fi %doc %{_docdir}/kamailio/modules/README.uid_gflags %doc %{_docdir}/kamailio/modules/README.uid_uri_db %doc %{_docdir}/kamailio/modules/README.uri_db -%doc %{_docdir}/kamailio/modules/README.userblacklist +%doc %{_docdir}/kamailio/modules/README.userblocklist %doc %{_docdir}/kamailio/modules/README.usrloc %doc %{_docdir}/kamailio/modules/README.xhttp %doc %{_docdir}/kamailio/modules/README.xhttp_prom @@ -1663,7 +1663,7 @@ fi %{_libdir}/kamailio/modules/uid_gflags.so %{_libdir}/kamailio/modules/uid_uri_db.so %{_libdir}/kamailio/modules/uri_db.so -%{_libdir}/kamailio/modules/userblacklist.so +%{_libdir}/kamailio/modules/userblocklist.so %{_libdir}/kamailio/modules/usrloc.so %{_libdir}/kamailio/modules/xhttp.so %{_libdir}/kamailio/modules/xhttp_prom.so

1 0

git:master:10349080: rtpengine: add CRC32 hash algo (#2558)
by GitHub 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: 10349080490faabffaf1ab7cc5d591678b8c94dd URL: https://github.com/kamailio/kamailio/commit/10349080490faabffaf1ab7cc5d5916… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: GitHub <noreply(a)github.com> Date: 2020-11-25T12:20:52-05:00 rtpengine: add CRC32 hash algo (#2558) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/10349080490faabffaf1ab7cc5d5916… Patch: https://github.com/kamailio/kamailio/commit/10349080490faabffaf1ab7cc5d5916… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index db7e7334b9..9647b5a3cc 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2022,13 +2022,14 @@ modparam("rtpengine", "control_cmd_tos", 144) <title><varname>hash_algo</varname> (integer)</title> <para> Hashing algorithm to be used in node selection algorithm. Now there are 2 possibilities: legacy - algorithm - 0(very basic hash over callid) or SHA1 - 1(apply sha1 over the callid and calculate hash). + algorithm - 0(very basic hash over callid), SHA1 - 1(apply sha1 over the callid and calculate hash) or + CRC32 - 2(calculate crc32 sum over the callid). </para> <para> Default value is 0, legacy algorithm. </para> <para> - The values not falling into the range <quote>0-1</quote> are ignored. + The values not falling into the range <quote>0-2</quote> are ignored. </para> <example> <title>Set <varname>control_cmd_tos</varname> parameter</title> @@ -2036,6 +2037,9 @@ modparam("rtpengine", "control_cmd_tos", 144) ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) + +### use CRC32 instead of legacy algorithm +modparam("rtpengine", "hash_algo", 2) ... </programlisting> </example> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7b2573b246..cb7165acd1 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2969,6 +2969,9 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } break; + case RTP_HASH_CRC32_CALLID: + crc32_uint(&callid, &sum); + goto retry; default: LM_ERR("unknown hashing algo %d\n", hash_algo); return NULL; @@ -2986,6 +2989,7 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } retry: + LM_DBG("sum is = %u\n", sum); weight_sum = 0; lock_get(active_rtpp_set->rset_lock); diff --git a/src/modules/rtpengine/rtpengine.h b/src/modules/rtpengine/rtpengine.h index 03999bf22f..81f6cb388c 100644 --- a/src/modules/rtpengine/rtpengine.h +++ b/src/modules/rtpengine/rtpengine.h @@ -103,6 +103,6 @@ extern str rtpp_url_col; extern str rtpp_weight_col; extern str rtpp_disabled_col; -enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID}; +enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID, RTP_HASH_CRC32_CALLID }; #endif

1 0

git:master:721d5333: dispatcher: removed unnecessary return
by Daniel-Constantin Mierla 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: 721d533317c735d7ddbd16ad94684b483468c010 URL: https://github.com/kamailio/kamailio/commit/721d533317c735d7ddbd16ad94684b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-25T18:10:17+01:00 dispatcher: removed unnecessary return --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/721d533317c735d7ddbd16ad94684b4… Patch: https://github.com/kamailio/kamailio/commit/721d533317c735d7ddbd16ad94684b4… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 836038442f..18ece721f3 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1063,7 +1063,6 @@ static int ki_ds_list_exists(struct sip_msg *msg, int set) static int fixup_ds_list_exist(void **param, int param_no) { return fixup_igp_null(param, param_no); - return 0; } static int ds_parse_reply_codes()

1 0

[kamailio/kamailio] tls: log version (#2561)
by Julien Chavanton 25 Nov '20

25 Nov '20

log the version of openssl used You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2561 -- Commit Summary -- * tls: log version -- File Changes -- M src/modules/tls/tls_mod.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2561.patch https://github.com/kamailio/kamailio/pull/2561.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/2561

2 2

git:master:c9f0addd: tls: log version, gh #2561
by Henning Westerholt 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: c9f0adddde8321bfaf368691fea74079e40bd789 URL: https://github.com/kamailio/kamailio/commit/c9f0adddde8321bfaf368691fea7407… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-11-25T15:29:19Z tls: log version, gh #2561 --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c9f0adddde8321bfaf368691fea7407… Patch: https://github.com/kamailio/kamailio/commit/c9f0adddde8321bfaf368691fea7407… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 0b9fd39fc8..fed9749624 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -385,6 +385,7 @@ static int mod_init(void) if (tls_check_sockets(*tls_domains_cfg) < 0) goto error; + LM_INFO("use OpenSSL version: %08x\n", (uint32_t)(OPENSSL_VERSION_NUMBER)); #ifndef OPENSSL_NO_ECDH LM_INFO("With ECDH-Support!\n"); #endif

1 0

Next online devel meeting - Wed, Nov 25, 2020, 15:00UTC
by Daniel-Constantin Mierla 25 Nov '20

25 Nov '20

Hello, in order to plan the roadmap to next major release, it is time to organize another online devel meeting, so the developers and community members can syncronize and plan what should be done till Kamailio v5.5 will be out. Because freenode.net service is requiring user registration to join IRC channels on their servers, the meeting will be done on a matrix chat room. More details are in the wiki page of the event, available at: * https://www.kamailio.org/wiki/devel/irc-meetings/2020b Feel free to add there topics that you want to be discussed. The proposed date is next Wednesday, November 25, 2020, at 15:00UTC (15:00 London/Dublin, 16:00 most of West Europe, 10:00 New York), but other dates can be proposed if they suit for more participants. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 2

git:master:bd02d616: core: created a structure for async task attributes
by Daniel-Constantin Mierla 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: bd02d616dacfd7152fefc9b050cb6203ea19cf39 URL: https://github.com/kamailio/kamailio/commit/bd02d616dacfd7152fefc9b050cb620… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-25T09:08:59+01:00 core: created a structure for async task attributes --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/bd02d616dacfd7152fefc9b050cb620… Patch: https://github.com/kamailio/kamailio/commit/bd02d616dacfd7152fefc9b050cb620…

1 0

git:master:e71f60ff: core: async - function to push task to a specific group of workers
by Daniel-Constantin Mierla 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: e71f60ffc51654512863e583d863f7247381281d URL: https://github.com/kamailio/kamailio/commit/e71f60ffc51654512863e583d863f72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-25T14:04:21+01:00 core: async - function to push task to a specific group of workers --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/e71f60ffc51654512863e583d863f72… Patch: https://github.com/kamailio/kamailio/commit/e71f60ffc51654512863e583d863f72… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index dc7fe7c57f..b6532f69e1 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -273,6 +273,38 @@ int async_task_push(async_task_t *task) return 0; } +/** + * + */ +int async_task_group_push(str *gname, async_task_t *task) +{ + int len; + async_wgroup_t *awg = NULL; + + if(_async_wgroup_list==NULL) { + LM_WARN("async task pushed, but no async group - ignoring\n"); + return 0; + } + for(awg=_async_wgroup_list; awg!=NULL; awg=awg->next) { + if(awg->name.len==gname->len + && memcmp(awg->name.s, gname->s, gname->len)==0) { + break; + } + } + if(awg==NULL) { + LM_WARN("group [%.*s] not found - ignoring\n", gname->len, gname->s); + return 0; + } + len = write(_async_wgroup_list->sockets[1], &task, sizeof(async_task_t*)); + if(len<=0) { + LM_ERR("failed to pass the task [%p] to group [%.*s]\n", task, + gname->len, gname->s); + return -1; + } + LM_DBG("task [%p] sent to groupt [%.*s]\n", task, gname->len, gname->s); + return 0; +} + /** * */ diff --git a/src/core/async_task.h b/src/core/async_task.h index 13f6c64b0c..84f1e9c954 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -50,4 +50,6 @@ int async_task_set_usleep(int n); int async_task_workers_get(void); int async_task_workers_active(void); +int async_task_group_push(str *gname, async_task_t *task); + #endif

1 0

git:master:0d90412e: sworker: new module to delegate sip message processing to a group of workers
by Daniel-Constantin Mierla 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: 0d90412e5f6ecce601e21561142d0a19ad509f62 URL: https://github.com/kamailio/kamailio/commit/0d90412e5f6ecce601e21561142d0a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-25T14:05:31+01:00 sworker: new module to delegate sip message processing to a group of workers --- Added: src/modules/sworker/Makefile Added: src/modules/sworker/README Added: src/modules/sworker/doc/Makefile Added: src/modules/sworker/doc/sworker.xml Added: src/modules/sworker/doc/sworker_admin.xml Added: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0d90412e5f6ecce601e21561142d0a1… Patch: https://github.com/kamailio/kamailio/commit/0d90412e5f6ecce601e21561142d0a1…

1 0

[kamailio/kamailio] smsops: fix len calc for a concatenated sms (#2556)
by alexyosifov 25 Nov '20

25 Nov '20

- fixed the calculation for concatenated SMSs based on TS 23.040, Sec. 9.2.3.16   #### 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 - [ ] 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/2556 -- Commit Summary -- * smsops: fix len calc for a concatenated sms -- File Changes -- M src/modules/smsops/smsops_impl.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2556.patch https://github.com/kamailio/kamailio/pull/2556.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/2556

2 4

git:master:0b8d8840: Merge pull request #2556 from alexyosifov/smsops_fix_concatenated
by GitHub 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: 0b8d884083c7240b1e58b720c57fd8e9bc6f8262 URL: https://github.com/kamailio/kamailio/commit/0b8d884083c7240b1e58b720c57fd8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-25T08:12:31+01:00 Merge pull request #2556 from alexyosifov/smsops_fix_concatenated smsops: fix len calc for a concatenated sms --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/0b8d884083c7240b1e58b720c57fd8e… Patch: https://github.com/kamailio/kamailio/commit/0b8d884083c7240b1e58b720c57fd8e… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index b284d83c62..e956656d1a 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -195,7 +195,7 @@ static int ascii_to_gsm(str sms, char * output_buffer, int buffer_size) { } } - if (i <= sms.len) + if (i < sms.len) output_buffer[output_buffer_length++] = (sms.s[i] & BITMASK_7BITS) >> (carry_on_bits - 1); return output_buffer_length; @@ -606,6 +606,15 @@ int decode_3gpp_sms(struct sip_msg *msg) { udh_read += (1 /* IE ID */ + 1 /* IE Len */ + ie->data.len /* IE data */); } + // TS 23.040, Sec. 9.2.3.16 + // Coding: 7 Bit + if (rp_data->pdu.coding == 0x00) { + int udh_bit_len = (1 + udh_len) * 8; // add 1 octet for the udh length + udh_bit_len += (7 - (udh_bit_len % 7)); + len -= (udh_bit_len / 7); + }else{ + len -= (1 + udh_len); // add 1 octet for the udh length + } } blen = 2 + len*4; @@ -618,6 +627,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { // Coding: 7 Bit if (rp_data->pdu.coding == 0x00) { // We don't care about the extra used bytes here. + rp_data->pdu.payload.sm.len = len; rp_data->pdu.payload.sm.len = gsm_to_ascii(&body.s[p], len, rp_data->pdu.payload.sm, fill_bits); } else { // Length is worst-case 2 * len (UCS2 is 2 Bytes, UTF8 is worst-case 4 Bytes)

1 0

git:master:d90f29b3: smsops: fix len calc for a concatenated sms
by Aleksandar Yosifov 25 Nov '20

25 Nov '20

Module: kamailio Branch: master Commit: d90f29b3b03386add989aebe3865bdc78dff8fbe URL: https://github.com/kamailio/kamailio/commit/d90f29b3b03386add989aebe3865bdc… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-11-19T15:39:13+02:00 smsops: fix len calc for a concatenated sms - fixed the calculation for concatenated SMSs based on TS 23.040, Sec. 9.2.3.16 --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/d90f29b3b03386add989aebe3865bdc… Patch: https://github.com/kamailio/kamailio/commit/d90f29b3b03386add989aebe3865bdc… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index b284d83c62..e956656d1a 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -195,7 +195,7 @@ static int ascii_to_gsm(str sms, char * output_buffer, int buffer_size) { } } - if (i <= sms.len) + if (i < sms.len) output_buffer[output_buffer_length++] = (sms.s[i] & BITMASK_7BITS) >> (carry_on_bits - 1); return output_buffer_length; @@ -606,6 +606,15 @@ int decode_3gpp_sms(struct sip_msg *msg) { udh_read += (1 /* IE ID */ + 1 /* IE Len */ + ie->data.len /* IE data */); } + // TS 23.040, Sec. 9.2.3.16 + // Coding: 7 Bit + if (rp_data->pdu.coding == 0x00) { + int udh_bit_len = (1 + udh_len) * 8; // add 1 octet for the udh length + udh_bit_len += (7 - (udh_bit_len % 7)); + len -= (udh_bit_len / 7); + }else{ + len -= (1 + udh_len); // add 1 octet for the udh length + } } blen = 2 + len*4; @@ -618,6 +627,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { // Coding: 7 Bit if (rp_data->pdu.coding == 0x00) { // We don't care about the extra used bytes here. + rp_data->pdu.payload.sm.len = len; rp_data->pdu.payload.sm.len = gsm_to_ascii(&body.s[p], len, rp_data->pdu.payload.sm, fill_bits); } else { // Length is worst-case 2 * len (UCS2 is 2 Bytes, UTF8 is worst-case 4 Bytes)

1 0

[kamailio/kamailio] CSeq is not being updated for ACK messges after upgrade to 5.3.7. Dialog + UAC module (#2559)
by arkadiam 24 Nov '20

24 Nov '20

### Description After updating from 5.3.6 to 5.3.7 Kamailio is no longer increments CSeq for ACK when used together with UAC module. Usage scenario: <pre> |EP1 | Kamailio | PBX | ->INVITE -> | | | <- 407 - | | | - ACK -> | | | -> INVITE SDP AUTH-> | | | <- 100 Trying - | | | | - INVITE SDP -> | | | <- 407 - | | | -> ACK -> | | | - INVITE SDP AUTH -> | | | <- 100 Trying - | | | <- 200 OK - | | <- 200 OK - | | | - ACK -> | | | | - ACK -> | ... </pre> Kamailio is configured to use dialog module and calling "dlg_manage();" UAC module is used to authenticate request on the PBX. Because of the authentication against the PBX the CSeq is being incremented independently between Kamailio & PBX. ACK that is send to the PBX after 200 OK usually is CSeq + 1 from EP1 ACK message. After update, Cseq is no longer incremented in ACK which cause re-transmission of 200 OK by the PBX and eventually in 30 sec PBX drops the call because 200 is not being acknowledged. Dialog configured as: modparam("dialog", "dlg_flag", FLD_TRACKDLG) modparam("dialog", "track_cseq_updates", 1) modparam("dialog", "dlg_match_mode", 1) modparam("dialog", "timeout_avp", "$avp(dlgtimeout)") modparam("dialog", "default_timeout", 43200) UAC configured as: modparam("uac", "reg_db_url", DBURL) modparam("uac", "reg_contact_addr", REG_CONTACT) modparam("uac", "reg_timer_interval", 10) modparam("uac", "restore_from_avp","$avp(original_uri_from)") modparam("uac", "restore_to_avp","$avp(original_uri_to)") modparam("uac", "restore_dlg", 1) modparam("uac", "auth_username_avp","$avp(auser)") modparam("uac", "auth_password_avp","$avp(apass)") modparam("uac", "auth_realm_avp","$avp(arealm)") modparam("uac", "restore_mode","manual") ### Possible Solutions After reverting this commit a973882b064c758972ce40e9ac3a83440c613be1 CSeq started to update properly. "dialog: skip non-INVITE initial request for cseq update processing" -- 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/2559

2 2

git:master:fb878ee5: kemix: added functions to get contact header uri
by Daniel-Constantin Mierla 24 Nov '20

24 Nov '20

Module: kamailio Branch: master Commit: fb878ee5b90fa79363c75338c294e78a9bc9f73a URL: https://github.com/kamailio/kamailio/commit/fb878ee5b90fa79363c75338c294e78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-24T13:25:43+01:00 kemix: added functions to get contact header uri --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fb878ee5b90fa79363c75338c294e78… Patch: https://github.com/kamailio/kamailio/commit/fb878ee5b90fa79363c75338c294e78… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index ba56a6c16f..37854bfa86 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -32,6 +32,8 @@ #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" #include "../../core/parser/digest/digest.h" +#include "../../core/parser/contact/parse_contact.h" + #include "../../core/tcp_conn.h" MODULE_VERSION @@ -997,6 +999,61 @@ static int ki_kx_get_msgtype(sip_msg_t *msg) } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_cturi_mode(sip_msg_t *msg, int xmode) +{ + contact_t *c; + + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + + if((parse_contact_headers(msg) < 0) || (msg->contact == NULL) + || (msg->contact->parsed == NULL)) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + + if (((contact_body_t*)msg->contact->parsed)->star == 1) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + + c = (((contact_body_t*)msg->contact->parsed)->contacts); + if(c==NULL || c->uri.s==NULL || c->uri.len<=0) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = c->uri; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_cturi(sip_msg_t *msg) +{ + return ki_kx_get_cturi_mode(msg, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_getw_cturi(sip_msg_t *msg) +{ + return ki_kx_get_cturi_mode(msg, SR_KEMI_XVAL_NULL_PRINT); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_gete_cturi(sip_msg_t *msg) +{ + return ki_kx_get_cturi_mode(msg, SR_KEMI_XVAL_NULL_EMPTY); +} + /** * */ @@ -1127,6 +1184,21 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_cturi"), + SR_KEMIP_XVAL, ki_kx_get_cturi, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("gete_cturi"), + SR_KEMIP_XVAL, ki_kx_gete_cturi, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("getw_cturi"), + SR_KEMIP_XVAL, ki_kx_getw_cturi, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_nhuri"), SR_KEMIP_XVAL, ki_kx_get_nhuri, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:5dab8768: core/parser/contact: helper function to parse all contact headers
by Daniel-Constantin Mierla 24 Nov '20

24 Nov '20

Module: kamailio Branch: master Commit: 5dab8768efb3bc8214c46005520c92c6d735ba39 URL: https://github.com/kamailio/kamailio/commit/5dab8768efb3bc8214c46005520c92c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-24T13:09:23+01:00 core/parser/contact: helper function to parse all contact headers --- Modified: src/core/parser/contact/parse_contact.c Modified: src/core/parser/contact/parse_contact.h --- Diff: https://github.com/kamailio/kamailio/commit/5dab8768efb3bc8214c46005520c92c… Patch: https://github.com/kamailio/kamailio/commit/5dab8768efb3bc8214c46005520c92c… --- diff --git a/src/core/parser/contact/parse_contact.c b/src/core/parser/contact/parse_contact.c index af0cd39c2c..37a075a17d 100644 --- a/src/core/parser/contact/parse_contact.c +++ b/src/core/parser/contact/parse_contact.c @@ -226,3 +226,31 @@ int contact_iterator(contact_t** c, struct sip_msg* msg, contact_t* prev) return 0; } } + +/** + * + */ +int parse_contact_headers(sip_msg_t *msg) +{ + hdr_field_t* hdr; + + if (parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse headers\n"); + return -1; + } + + if (msg->contact) { + hdr = msg->contact; + while(hdr) { + if (hdr->type == HDR_CONTACT_T) { + if (!hdr->parsed && (parse_contact(hdr) < 0)) { + LM_ERR("failed to parse Contact body\n"); + return -1; + } + } + hdr = hdr->next; + } + } + + return 0; +} diff --git a/src/core/parser/contact/parse_contact.h b/src/core/parser/contact/parse_contact.h index 36389b5e06..4d8e1cd642 100644 --- a/src/core/parser/contact/parse_contact.h +++ b/src/core/parser/contact/parse_contact.h @@ -70,5 +70,9 @@ void print_contact(FILE* _o, contact_body_t* _c); */ int contact_iterator(contact_t** c, struct sip_msg* msg, contact_t* prev); +/* + * parse all Contact headers + */ +int parse_contact_headers(sip_msg_t *msg); #endif /* PARSE_CONTACT_H */

1 0

git:master:802b8085: registrar: use core function for parsing all contact headers
by Daniel-Constantin Mierla 24 Nov '20

24 Nov '20

Module: kamailio Branch: master Commit: 802b80853baf3f9e33f84de79a4473bdf2b4e6df URL: https://github.com/kamailio/kamailio/commit/802b80853baf3f9e33f84de79a4473b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-24T13:11:57+01:00 registrar: use core function for parsing all contact headers --- Modified: src/modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/802b80853baf3f9e33f84de79a4473b… Patch: https://github.com/kamailio/kamailio/commit/802b80853baf3f9e33f84de79a4473b… --- diff --git a/src/modules/registrar/sip_msg.c b/src/modules/registrar/sip_msg.c index 802435865f..2b43dd7611 100644 --- a/src/modules/registrar/sip_msg.c +++ b/src/modules/registrar/sip_msg.c @@ -86,8 +86,6 @@ static inline int get_expires_hf(struct sip_msg* _m) */ int parse_message(struct sip_msg* _m) { - struct hdr_field* ptr; - if (parse_headers(_m, HDR_EOH_F, 0) == -1) { rerrno = R_PARSE; LM_ERR("failed to parse headers\n"); @@ -118,18 +116,10 @@ int parse_message(struct sip_msg* _m) return -5; } - if (_m->contact) { - ptr = _m->contact; - while(ptr) { - if (ptr->type == HDR_CONTACT_T) { - if (!ptr->parsed && (parse_contact(ptr) < 0)) { - rerrno = R_PARSE_CONT; - LM_ERR("failed to parse Contact body\n"); - return -6; - } - } - ptr = ptr->next; - } + if(parse_contact_headers(_m) < 0) { + rerrno = R_PARSE_CONT; + LM_ERR("failed to parse Contact body\n"); + return -6; } return 0;

1 0

ACK Relay Issue Transaction Not Found
by me.projects＠yahoo.com 24 Nov '20

24 Nov '20

Hi When ACK is received on Kamailio from PBX t_check_trans() fails. 200 OK sent PBX from Teams and ACK from PBX is provided here. What could be the issue. SIP/2.0 200 OK FROM: "Ext1"<sip:1102@PBX_IP>;tag=e08f0a03-1120-4e13-b0e2-90d1a027c05f TO: <sip:1101@KAM_IP>;tag=e667397cb47c457a860222931e320b41 CSEQ: 25772 INVITE CALL-ID: a6685754-b402-4a15-82b2-5fb2551e5b58 VIA: SIP/2.0/UDP PBX_IP:7790;received=PBX_IP;branch=z9hG4bKPj170912fc-0908-40bb-8248-9f6cb560332d;rport=7790 RECORD-ROUTE: <sip:sip-du-a-us.pstnhub.microsoft.com:5061;transport=tls;lr>,<sip:sbc.callsprout.com;transport=tls;ftag=e08f0a03-1120-4e13-b0e2-90d1a027c05f;lr>,<sip:KAM_IP:7790;transport=udp;ftag=e08f0a03-1120-4e13-b0e2-90d1a027c05f;lr> CONTACT: <sip:api-du-b-usea.pstnhub.microsoft.com:443;x-i=c825abba-7203-442c-8461-994522d14365;x-c=25f3c2ce3a635971b809dc3be872e51b/s/1/63c9eea743284db99366cabf5f7dcbf5;ias=52.114.132.46~5061~3> CONTENT-LENGTH: 353 SUPPORTED: timer CONTENT-TYPE: application/sdp ALLOW: INVITE,ACK,OPTIONS,CANCEL,BYE,NOTIFY REQUIRE: timer SESSION-EXPIRES: 1800;refresher=uac SERVER: Microsoft.PSTNHub.SIPProxy v.2020.11.16.5 i.USEA.5 X-Siptrace-Fromip: tls:KAM_IP:7790 X-Siptrace-Toip: udp:PBX_IP:7790 X-Siptrace-Time: 1606205334 607029 X-Siptrace-Method: INVITE X-Siptrace-Dir: out ACK sip:api-du-b-usea.pstnhub.microsoft.com:443;x-i=c825abba-7203-442c-8461-994522d14365;x-c=25f3c2ce3a635971b809dc3be872e51b/s/1/63c9eea743284db99366cabf5f7dcbf5;alias=.114.132.46~5061~3 SIP/2.0 Via: SIP/2.0/UDP PBX_IP:7790;rport;branch=z9hG4bKPjaa30c14c-c965-473d-bc49-9f223f9f634c From: "Ext1" <sip:1102@PBX_IP>;tag=e08f0a03-1120-4e13-b0e2-90d1a027c05f To: <sip:1101@KAM_IP>;tag=e667397cb47c457a860222931e320b41 Call-ID: a6685754-b402-4a15-82b2-5fb2551e5b58 CSeq: 25772 ACK Route: <sip:KAM_IP:7790;lr;ftag=e08f0a03-1120-4e13-b0e2-90d1a027c05f> Route: <sip:sbc.callsprout.com;transport=tls;lr;ftag=e08f0a03-1120-4e13-b0e2-90d1a027c05f> Route: <sip:sip-du-a-us.pstnhub.microsoft.com:5061;transport=tls;lr> Max-Forwards: 70 User-Agent: Asterisk Content-Length: 0 X-Siptrace-Fromip: udp:PBX_IP:7790 X-Siptrace-Toip: udp:KAM_IP:7790 X-Siptrace-Time: 1606205334 615495 X-Siptrace-Method: ACK X-Siptrace-Dir: in

1 0

git:master:32c750ed: misc/tools/kemi: lua - replaced markdown term
by Daniel-Constantin Mierla 24 Nov '20

24 Nov '20

Module: kamailio Branch: master Commit: 32c750ed833ec1d1c2d1a2a2cf189ea3b0c5e2ee URL: https://github.com/kamailio/kamailio/commit/32c750ed833ec1d1c2d1a2a2cf189ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-24T09:49:37+01:00 misc/tools/kemi: lua - replaced markdown term - no longer suitable for the new tools --- Modified: misc/tools/kemi/lua/kemiksrlib.py Modified: misc/tools/kemi/lua/kemiluacheck.py --- Diff: https://github.com/kamailio/kamailio/commit/32c750ed833ec1d1c2d1a2a2cf189ea… Patch: https://github.com/kamailio/kamailio/commit/32c750ed833ec1d1c2d1a2a2cf189ea… --- diff --git a/misc/tools/kemi/lua/kemiksrlib.py b/misc/tools/kemi/lua/kemiksrlib.py index dfa528cb79..f801a9d6a2 100644 --- a/misc/tools/kemi/lua/kemiksrlib.py +++ b/misc/tools/kemi/lua/kemiksrlib.py @@ -8,7 +8,7 @@ class ModuleObjGenerator(object): # Contains the output until it should be written to disk - markdown_string = "" + output_string = "" def execute(self, data): # Validate that we got some methods back. 155 is an arbitrary large number. @@ -57,7 +57,7 @@ def object_module_content(self, module, methods): module_prefix = module + "." for value in methods: - self.markdown_string += "local function KSR." + module_prefix + value["name"] + self.object_string += "local function KSR." + module_prefix + value["name"] # Sanitize the return values if value["return"] == "none": @@ -79,10 +79,10 @@ def object_module_content(self, module, methods): else: params_value = value["params"] - # Generate the output string for the markdown page - self.markdown_string += "(" + params_value + ")\n" - self.markdown_string += "\treturn" + return_value + ";\n" - self.markdown_string += "end\n\n" + # Generate the output string for the file + self.object_string += "(" + params_value + ")\n" + self.object_string += "\treturn" + return_value + ";\n" + self.object_string += "end\n\n" return True @@ -90,7 +90,7 @@ def object_module_content(self, module, methods): def obj_write(self): f = open(PATH_GENERATED_OBJ, "w") f.write("local KSR = {};\n\n") - f.write(self.markdown_string) + f.write(self.object_string) f.write("return KSR;\n") f.close() return True diff --git a/misc/tools/kemi/lua/kemiluacheck.py b/misc/tools/kemi/lua/kemiluacheck.py index 3da285305d..75c6e59f59 100644 --- a/misc/tools/kemi/lua/kemiluacheck.py +++ b/misc/tools/kemi/lua/kemiluacheck.py @@ -8,7 +8,7 @@ class ModuleObjGenerator(object): # Contains the output until it should be written to disk - markdown_string = "" + object_string = "" def execute(self, data): # Validate that we got some methods back. 155 is an arbitrary large number. @@ -19,7 +19,7 @@ def execute(self, data): functions_parsed = self.parse_function_list(data) self.output_obj(functions_parsed) - print ("Markdown doc created successfully at " + PATH_GENERATED_OBJ) + print ("File created successfully at " + PATH_GENERATED_OBJ) def parse_function_list(self, functions): data = {} @@ -52,22 +52,22 @@ def output_obj(self, data): def object_module_content(self, module, methods): if module != "_core": - self.markdown_string += "\t\t\t\t" + module + " = {\n\t\t\t\t\tfields= {\n" + self.object_string += "\t\t\t\t" + module + " = {\n\t\t\t\t\tfields= {\n" for value in methods: if module != "_core": - self.markdown_string += "\t\t\t\t\t\t" + value["name"] + " = {},\n" + self.object_string += "\t\t\t\t\t\t" + value["name"] + " = {},\n" else: - self.markdown_string += "\t\t\t\t" + value["name"] + " = {},\n" + self.object_string += "\t\t\t\t" + value["name"] + " = {},\n" if module != "_core": - self.markdown_string += "\t\t\t\t\t},\n\t\t\t\t},\n" + self.object_string += "\t\t\t\t\t},\n\t\t\t\t},\n" return True def obj_write(self): f = open(PATH_GENERATED_OBJ, "w") f.write("stds.KSR = {\n\tread_globals = {\n\t\tKSR = {\n\t\t\tfields = {\n") - f.write(self.markdown_string) + f.write(self.object_string) f.write("\t\t\t\tx = {\n\t\t\t\t\tfields= {\n") f.write("\t\t\t\t\t\tdrop= {},\n") f.write("\t\t\t\t\t\texit= {},\n")

1 0

git:master:96642c19: misc/tools/kemi: lua - fixed typos in readme
by GitHub 23 Nov '20

23 Nov '20

Module: kamailio Branch: master Commit: 96642c19fa0fb135d9c0bb30d35834b7938c668d URL: https://github.com/kamailio/kamailio/commit/96642c19fa0fb135d9c0bb30d35834b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-23T21:17:59+01:00 misc/tools/kemi: lua - fixed typos in readme --- Modified: misc/tools/kemi/lua/README.md --- Diff: https://github.com/kamailio/kamailio/commit/96642c19fa0fb135d9c0bb30d35834b… Patch: https://github.com/kamailio/kamailio/commit/96642c19fa0fb135d9c0bb30d35834b… --- diff --git a/misc/tools/kemi/lua/README.md b/misc/tools/kemi/lua/README.md index 41fa5e8694..8847c810f7 100644 --- a/misc/tools/kemi/lua/README.md +++ b/misc/tools/kemi/lua/README.md @@ -71,9 +71,9 @@ Other external tools useful to check the Lua scripts. ### luac ### The `luac` (the Lua compiler) can be used with parameter `-p` to check for -syntax errors (e.g., missing closing quote or parenthesis).:w +syntax errors (e.g., missing closing quote or parenthesis). -Example - when there is a missing closing quite, like: +Example - when there is a missing closing quote, like: ``` KSR.hdr.remove("Route);

1 0

git:master:3f4e5899: misc/tools/kemi: lua - full file name for kemiluacheck tool
by GitHub 23 Nov '20

23 Nov '20

Module: kamailio Branch: master Commit: 3f4e589973ff7746611242f50d14eb990b2efa3f URL: https://github.com/kamailio/kamailio/commit/3f4e589973ff7746611242f50d14eb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-23T19:44:08+01:00 misc/tools/kemi: lua - full file name for kemiluacheck tool --- Modified: misc/tools/kemi/lua/README.md --- Diff: https://github.com/kamailio/kamailio/commit/3f4e589973ff7746611242f50d14eb9… Patch: https://github.com/kamailio/kamailio/commit/3f4e589973ff7746611242f50d14eb9… --- diff --git a/misc/tools/kemi/lua/README.md b/misc/tools/kemi/lua/README.md index de2a7b814c..41fa5e8694 100644 --- a/misc/tools/kemi/lua/README.md +++ b/misc/tools/kemi/lua/README.md @@ -2,7 +2,7 @@ Tools useful for using Kamailio with KEMI Lua scripts. -## kemiksrlib ## +## kemiksrlib.py ## Generates the file `KSR.lua` with skeleton functions in the `KSR` object. The function parameters are prefixed with `p_` and the functions return: @@ -85,4 +85,4 @@ the check results in: luac -p kamailio-basic-kemi-lua.lua luac: kamailio-basic-kemi-lua.lua:100: unfinished string near '"Route);' -``` \ No newline at end of file +```

1 0

[kamailio/kamailio] Keep several last versions at Kamailio build infrustructure (#2557)
by arkadiam 23 Nov '20

23 Nov '20

### Description When a new version in released, built and made available it'll be great to preserve at least one previous build. E.g. for Ubuntu/Debian repos: deb http://deb.kamailio.org/kamailio53 bionic main deb-src http://deb.kamailio.org/kamailio53 bionic main As of today these repos have 5.3.7 builds only. It not possible to downgrade to a previous version 5.3.6 using native package management tools. ### Expected behaviour apt list -a kamailio ...have kamailio 5.3.6 option here... apt install kamailio=5.3.6+ubuntu18.04 #### Actual observed behaviour apt list -a kamailio Listing... Done kamailio/unknown,now 5.3.7+ubuntu18.04 amd64 [installed] kamailio/bionic 5.1.2-1ubuntu2 amd64 #### Other notes This will be helpful in cases when quick downgrade is required. After the last upgrade to 5.3.7 by some reason Kamailio stopped processing ACKs after the call was answered and 200 OK was sent. We had to rebuild 5.3.6 from sources and rollback to our build to restore the service. I'll try to figure out what was the issue and provide more details in a separate issue. -- 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/2557

2 2

git:master:c89d46d8: misc/tools/kemi: lua - tools useful for using Kamailio with KEMI Lua scripts
by Daniel-Constantin Mierla 23 Nov '20

23 Nov '20

Module: kamailio Branch: master Commit: c89d46d88687602131c88b4001345a0be9f01380 URL: https://github.com/kamailio/kamailio/commit/c89d46d88687602131c88b4001345a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-23T14:21:12+01:00 misc/tools/kemi: lua - tools useful for using Kamailio with KEMI Lua scripts --- Added: misc/tools/kemi/lua/README.md Added: misc/tools/kemi/lua/kemiksrlib.py Added: misc/tools/kemi/lua/kemiluacheck.py --- Diff: https://github.com/kamailio/kamailio/commit/c89d46d88687602131c88b4001345a0… Patch: https://github.com/kamailio/kamailio/commit/c89d46d88687602131c88b4001345a0…

1 0

git:master:6035c30a: misc/examples/kemi: fixed function name to get From-URI
by Daniel-Constantin Mierla 23 Nov '20

23 Nov '20

Module: kamailio Branch: master Commit: 6035c30aea72d06bf08883677d45f4eb0019f189 URL: https://github.com/kamailio/kamailio/commit/6035c30aea72d06bf08883677d45f4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-23T13:48:01+01:00 misc/examples/kemi: fixed function name to get From-URI --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/6035c30aea72d06bf08883677d45f4e… Patch: https://github.com/kamailio/kamailio/commit/6035c30aea72d06bf08883677d45f4e… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index 0ddfc82c1e..bddabbaa89 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -163,13 +163,13 @@ function ksr_route_reqinit() if KSR.htable.sht_match_name("ipban", "eq", srcip) > 0 then -- ip is already blocked KSR.dbg("request from blocked IP - " .. KSR.kx.get_method() - .. " from " .. KSR.kx.gete_furi() .. " (IP:" + .. " from " .. KSR.kx.get_furi() .. " (IP:" .. srcip .. ":" .. KSR.kx.get_srcport() .. ")\n"); KSR.x.exit(); end if KSR.pike.pike_check_req() < 0 then KSR.err("ALERT: pike blocking " .. KSR.kx.get_method() - .. " from " .. KSR.kx.gete_furi() .. " (IP:" + .. " from " .. KSR.kx.get_furi() .. " (IP:" .. srcip .. ":" .. KSR.kx.get_srcport() .. ")\n"); KSR.htable.sht_seti("ipban", srcip, 1); KSR.x.exit();

1 0

git:master:454c4653: etc/kamailio.cfg: split to filter on both friendly and scanner
by Daniel-Constantin Mierla 23 Nov '20

23 Nov '20

Module: kamailio Branch: master Commit: 454c4653409a69ef115de5ee748524d36e147246 URL: https://github.com/kamailio/kamailio/commit/454c4653409a69ef115de5ee748524d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-23T10:10:55+01:00 etc/kamailio.cfg: split to filter on both friendly and scanner - some scanning scripts use a different format for the user agent --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/454c4653409a69ef115de5ee748524d… Patch: https://github.com/kamailio/kamailio/commit/454c4653409a69ef115de5ee748524d… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 29af152df7..2cf02d995b 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") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit;

1 0

git:master:b59204eb: kemix: exported functions to get socket string and name
by Daniel-Constantin Mierla 23 Nov '20

23 Nov '20

Module: kamailio Branch: master Commit: b59204eb1df8c85bcdde65f2a840f55986f01223 URL: https://github.com/kamailio/kamailio/commit/b59204eb1df8c85bcdde65f2a840f55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-23T08:15:34+01:00 kemix: exported functions to get socket string and name --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b59204eb1df8c85bcdde65f2a840f55… Patch: https://github.com/kamailio/kamailio/commit/b59204eb1df8c85bcdde65f2a840f55… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 66cdcf1bc1..ba56a6c16f 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -486,6 +486,39 @@ static sr_kemi_xval_t* ki_kx_get_srcport(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_send_sock(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if (msg==NULL || msg->force_send_socket==0) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->force_send_socket->sock_str; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_send_sock_name(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if (msg==NULL || msg->force_send_socket==0 + || msg->force_send_socket->sockname.s==0) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->force_send_socket->sockname; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -520,6 +553,23 @@ static sr_kemi_xval_t* ki_kx_get_rcvport(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rcv_sock_name(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL || msg->rcv.bind_address==NULL + || msg->rcv.bind_address->sockname.s==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->rcv.bind_address->sockname; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -1107,11 +1157,26 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_send_sock"), + SR_KEMIP_XVAL, ki_kx_get_send_sock, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_send_sock_name"), + SR_KEMIP_XVAL, ki_kx_get_send_sock_name, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_rcvip"), SR_KEMIP_XVAL, ki_kx_get_rcvip, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_rcv_sock_name"), + SR_KEMIP_XVAL, ki_kx_get_rcv_sock_name, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_rcvport"), SR_KEMIP_XVAL, ki_kx_get_rcvport, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:e15c90d3: misc/examples/kemi: filter on user agent matching friendly, scanner and sipvicious
by Daniel-Constantin Mierla 23 Nov '20

23 Nov '20

Module: kamailio Branch: master Commit: e15c90d31fd0444f41cb862408f77399123c0191 URL: https://github.com/kamailio/kamailio/commit/e15c90d31fd0444f41cb862408f7739… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-23T10:09:33+01:00 misc/examples/kemi: filter on user agent matching friendly, scanner and sipvicious --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua Modified: misc/examples/kemi/kamailio-basic-kemi-python.py Modified: misc/examples/kemi/kamailio-basic-kemi-ruby.rb Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq --- Diff: https://github.com/kamailio/kamailio/commit/e15c90d31fd0444f41cb862408f7739… Patch: https://github.com/kamailio/kamailio/commit/e15c90d31fd0444f41cb862408f7739… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index 7cc880f290..ab3799fdc9 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -133,7 +133,8 @@ function ksr_route_reqinit() } if (KSR.corex.has_user_agent()>0) { var UA = KSR.pv.gete("$ua"); - if (UA.indexOf("friendly-scanner")>=0 || UA.indexOf("sipcli")>=0) { + if (UA.indexOf("friendly")>=0 || UA.indexOf("scanner")>=0 + || UA.indexOf("sipcli")>=0 || UA.indexOf("sipvicious")>=0) { KSR.sl.sl_send_reply(200, "OK"); KSR.x.exit(); } diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index fc31e1b93c..0ddfc82c1e 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -176,8 +176,8 @@ function ksr_route_reqinit() end end local ua = KSR.kx.gete_ua(); - if string.find(ua, "friendly-scanner") - or string.find(ua, "sipcli") then + if string.find(ua, "friendly") or string.find(ua, "scanner") + or string.find(ua, "sipcli") or string.find(ua, "sipvicious") then KSR.sl.sl_send_reply(200, "OK"); KSR.x.exit(); end diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index f73abfedc5..601daa3687 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -157,8 +157,8 @@ def ksr_route_reqinit(self, msg): if KSR.corex.has_user_agent() > 0 : ua = KSR.pv.gete("$ua") - if (ua.find("friendly-scanner")!=-1 - or ua.find("sipcli")!=-1) : + if (ua.find("friendly")!=-1 or ua.find("scanner")!=-1 + or ua.find("sipcli")!=-1 or ua.find("sipvicious")!=-1) : KSR.sl.sl_send_reply(200, "Processed") return -255 diff --git a/misc/examples/kemi/kamailio-basic-kemi-ruby.rb b/misc/examples/kemi/kamailio-basic-kemi-ruby.rb index 11f96b460c..2a3a9eca41 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-ruby.rb +++ b/misc/examples/kemi/kamailio-basic-kemi-ruby.rb @@ -41,7 +41,7 @@ def ksr_request_route() # Auth ksr_route_auth() - + # Record routing for dialog forming requests (in case they are routed) KSR::HDR.remove("Route") if KSR.is_method_in("IS") then @@ -65,7 +65,8 @@ def ksr_request_route() def ksr_route_reqinit() if KSR::COREX.has_user_agent() > 0 then ua = KSR::PV.gete("$ua"); - if ua.include? 'friendly-scanner' or ua.include? 'sipcli' then + if ua.include? 'friendly' or ua.include? 'scanner' + or ua.include? 'sipcli' or ua.include? 'sipvicious' then KSR::SL.sl_send_reply(200, "OK"); exit end diff --git a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq index 4926ec8317..38672aa817 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq +++ b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq @@ -137,7 +137,8 @@ function ksr_route_reqinit() if (KSR.corex.has_user_agent()>0) { local UA = KSR.pv.get("$ua"); // if (sipscanregex.match(UA)) { - if (UA.find("friendly-scanner")!=null || UA.find("sipcli")!=null) { + if (UA.find("friendly")!=null || UA.find("scanner")!=null + || UA.find("sipcli")!=null || UA.find("sipvicious")!=null) { KSR.sl.sl_send_reply(200, "OK"); KSR.x.exit(); }

1 0

git:master:efe36cf0: pv: new variable $Rn - return receiving socket name
by Daniel-Constantin Mierla 23 Nov '20

23 Nov '20

Module: kamailio Branch: master Commit: efe36cf0bab16addb2a42a696f58ee38477f9e7f URL: https://github.com/kamailio/kamailio/commit/efe36cf0bab16addb2a42a696f58ee3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-23T07:44:09+01:00 pv: new variable $Rn - return receiving socket name --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/efe36cf0bab16addb2a42a696f58ee3… Patch: https://github.com/kamailio/kamailio/commit/efe36cf0bab16addb2a42a696f58ee3… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 9367103bfe..bd80bafed7 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -410,6 +410,9 @@ static pv_export_t mod_pvs[] = { {{"Rut", (sizeof("Rut")-1)}, /* */ PVT_OTHER, pv_get_rcvaddr_uri_full, 0, 0, 0, 0, 0}, + {{"Rn", (sizeof("Rn")-1)}, /* */ + PVT_OTHER, pv_get_rcvsname, 0, + 0, 0, 0, 0}, {{"RAi", (sizeof("RAi")-1)}, /* */ PVT_OTHER, pv_get_rcv_advertised_ip, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index f7af431341..e569a393e8 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -858,6 +858,19 @@ int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, &msg->rcv.bind_address->port_no_str); } +int pv_get_rcvsname(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address==NULL + || msg->rcv.bind_address->sockname.s==NULL) + return pv_get_null(msg, param, res); + + return pv_get_strval(msg, param, res, &msg->rcv.bind_address->sockname); +} + int pv_get_rcvaddr_uri_helper(struct sip_msg *msg, pv_param_t *param, int tmode, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index cf87a7e0c9..29ec9f25a4 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -163,6 +163,9 @@ int pv_get_rcvaddr_uri(struct sip_msg *msg, pv_param_t *param, int pv_get_rcvaddr_uri_full(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcvsname(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:070a9c04: kemix: exported function get_rcvadvip() and get_rcvadvport()
by Daniel-Constantin Mierla 20 Nov '20

20 Nov '20

Module: kamailio Branch: master Commit: 070a9c042a1caf19162d3d97b26f8d7548747cbb URL: https://github.com/kamailio/kamailio/commit/070a9c042a1caf19162d3d97b26f8d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-20T08:12:18+01:00 kemix: exported function get_rcvadvip() and get_rcvadvport() - return advertised address and port of the receiving socket --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/070a9c042a1caf19162d3d97b26f8d7… Patch: https://github.com/kamailio/kamailio/commit/070a9c042a1caf19162d3d97b26f8d7… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 4bd6f839d1..66cdcf1bc1 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -520,6 +520,38 @@ static sr_kemi_xval_t* ki_kx_get_rcvport(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rcvadvip(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->useinfo.address_str.len > 0) { + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->rcv.bind_address->useinfo.address_str; + return &_sr_kemi_kx_xval; + } + + return ki_kx_get_rcvip(msg); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rcvadvport(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg->rcv.bind_address!=NULL + && msg->rcv.bind_address->useinfo.port_no_str.len > 0) { + _sr_kemi_kx_xval.vtype = SR_KEMIP_INT; + _sr_kemi_kx_xval.v.n = (int)msg->rcv.bind_address->useinfo.port_no; + return &_sr_kemi_kx_xval; + } + + return ki_kx_get_rcvport(msg); +} + /** * */ @@ -1085,6 +1117,16 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_rcvadvip"), + SR_KEMIP_XVAL, ki_kx_get_rcvadvip, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rcvadvport"), + SR_KEMIP_XVAL, ki_kx_get_rcvadvport, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_proto"), SR_KEMIP_XVAL, ki_kx_get_proto, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:88943174: misc/examples: note that sr is exported by app_lua_sr
by Daniel-Constantin Mierla 20 Nov '20

20 Nov '20

Module: kamailio Branch: master Commit: 889431746d24c73eeff73705fab36a0e154116a9 URL: https://github.com/kamailio/kamailio/commit/889431746d24c73eeff73705fab36a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-20T08:02:37+01:00 misc/examples: note that sr is exported by app_lua_sr - hint for lua syntax check --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/889431746d24c73eeff73705fab36a0… Patch: https://github.com/kamailio/kamailio/commit/889431746d24c73eeff73705fab36a0… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index a896529965..fc31e1b93c 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -1,7 +1,7 @@ -- Kamailio - equivalent of routing blocks in Lua -- --- KSR - the new dynamic object exporting Kamailio functions (kemi) --- sr - the old static object exporting Kamailio functions +-- KSR - the object exporting Kamailio KEMI functions (app_lua module) +-- sr - the old object exporting Kamailio functions (app_lua_sr module) -- -- Relevant remarks: @@ -11,6 +11,9 @@ -- * KSR.drop() is only marking the SIP message for drop, but doesn't stop -- the execution of the script. Use KSR.x.exit() after it or KSR.x.drop() -- +-- Hints: +-- * Lua syntax check: luac -p /path/to/script.lua +-- -- debug callback function to print details of execution trace --[[

1 0

git:master:aa6e9963: tm: proper fill of From/To URI/tag values using parsed structure in t_uac_send()
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: master Commit: aa6e9963b2725c1b6b7e5ff995a77c222d95fa3c URL: https://github.com/kamailio/kamailio/commit/aa6e9963b2725c1b6b7e5ff995a77c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T17:07:05+01:00 tm: proper fill of From/To URI/tag values using parsed structure in t_uac_send() --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/aa6e9963b2725c1b6b7e5ff995a77c2… Patch: https://github.com/kamailio/kamailio/commit/aa6e9963b2725c1b6b7e5ff995a77c2… --- diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index cc50274f0c..dfe99d1390 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -593,7 +593,7 @@ void rpc_t_uac_wait(rpc_t* rpc, void* c) static int t_uac_check_msg(struct sip_msg* msg, str* method, str* body, - int* fromtag, int *cseq_is, int* cseq, + str *fromtag, int *cseq_is, int* cseq, str* callid) { struct to_body* parsed_from; @@ -628,7 +628,13 @@ static int t_uac_check_msg(struct sip_msg* msg, } parsed_from = (struct to_body*)msg->from->parsed; - *fromtag = parsed_from->tag_value.s && parsed_from->tag_value.len; + if(parsed_from->tag_value.s && parsed_from->tag_value.len) { + fromtag->s = parsed_from->tag_value.s; + fromtag->len = parsed_from->tag_value.len; + } else { + fromtag->s = NULL; + fromtag->len = 0; + } *cseq = 0; if (msg->cseq && (parsed_cseq = get_cseq(msg))) { @@ -676,7 +682,8 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket, struct socket_info* ssock; str saddr; int sport, sproto; - int ret, fromtag, cseq_is, cseq; + int ret, cseq_is, cseq; + str fromtag; dlg_t dlg; uac_req_t uac_req; @@ -749,7 +756,9 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket, */ /* Generate fromtag if not present */ - if (!fromtag) { + if (fromtag.s && fromtag.len) { + dlg.id.loc_tag = fromtag; + } else { generate_fromtag(&dlg.id.loc_tag, &dlg.id.call_id, ruri); } @@ -758,8 +767,11 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket, else dlg.loc_seq.value = DEFAULT_CSEQ; dlg.loc_seq.is_set = 1; - dlg.loc_uri = faked_msg.from->body; - dlg.rem_uri = faked_msg.to->body; + dlg.loc_uri = get_from(&faked_msg)->uri; + dlg.rem_uri = get_to(&faked_msg)->uri; + if(get_to(&faked_msg)->tag_value.len > 0) { + dlg.id.rem_tag = get_to(&faked_msg)->tag_value; + } dlg.rem_target = *ruri; dlg.dst_uri = *nexthop; dlg.send_sock=ssock;

1 0

git:master:9c8abc6b: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 19 Nov '20

19 Nov '20

Module: kamailio Branch: master Commit: 9c8abc6bba6807231989c3dabed4aef1e7fff307 URL: https://github.com/kamailio/kamailio/commit/9c8abc6bba6807231989c3dabed4aef… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-19T17:01:16+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/9c8abc6bba6807231989c3dabed4aef… Patch: https://github.com/kamailio/kamailio/commit/9c8abc6bba6807231989c3dabed4aef…

1 0

[kamailio/kamailio] dispatcher: algorithm 13 latency optimized round-robin with failover (#2493)
by Julien Chavanton 19 Nov '20

19 Nov '20

#### Type Of Change - [x] New feature (non-breaking change which adds new functionality) #### Checklist: - [x] Tested changes locally #### Description Previously discussed in the mailing list : **“13” - latency optimized routing mode, the lowest latency gets higher priority (serial forking ordered by priority, ds_ping_latency_stats is required).** - The algorithm will load balance using round-robin prioritizing the gateways with the highest priority. - The priority will be lowered by 1 point every time the latency ms is as high as the priority. Using this simple formula : ADJUSTED_PRIORITY = PRIORITY - (ESTIMATED_LATENCY/PRIORITY) GATEWAY | PRIORITY | ESTIMATED_LATENCY | ADJUSTED_PRIORITY | LOAD DISTRIBUTION -- | -- | -- | -- | -- 1 | 30 | 21 | 30 | 33% 2 | 30 | 91 | 27 | 0% 3 | 30 | 61 | 28 | 0% 4 | 30 | 19 | 30 | 33% 5 | 30 | 32 | 29 | 0% 6 | 30 | 0 | 30 | 33% 7 | 30 | 201 | 24 | 0% You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2493 -- Commit Summary -- * dispatcher: algorithm 13 -- File Changes -- M src/modules/dispatcher/dispatch.c (43) M src/modules/dispatcher/dispatch.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2493.patch https://github.com/kamailio/kamailio/pull/2493.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/2493

4 19

git:master:90e3033c: dispatcher: algorithm 13 (#2493)
by GitHub 19 Nov '20

19 Nov '20

Module: kamailio Branch: master Commit: 90e3033c51d7403a303f44e29f60be339ec217ef URL: https://github.com/kamailio/kamailio/commit/90e3033c51d7403a303f44e29f60be3… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-19T07:51:06-08:00 dispatcher: algorithm 13 (#2493) - latency optimized round-robin with failover - optionally congestion can be use instead of latency - thanks to Salman Ali (asalman18) for the review --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/90e3033c51d7403a303f44e29f60be3… Patch: https://github.com/kamailio/kamailio/commit/90e3033c51d7403a303f44e29f60be3…

1 0

git:master:b40a2a42: core: new preprocessor directive $!defenv ID=ENVVAR
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: master Commit: b40a2a42a3f4f3a21f2d0a2f9ec3c18668a05b4d URL: https://github.com/kamailio/kamailio/commit/b40a2a42a3f4f3a21f2d0a2f9ec3c18… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T16:16:35+01:00 core: new preprocessor directive $!defenv ID=ENVVAR - define an ID to the value of an environment variable with the name ENVVAR - it can also be just $!defenv ENVVAR and the ID is set to ENVVAR name - example: #!defenv SHELL * if environment variable $SHELL is '/bin/bash', then it is like #!define SHELL /bin/bash * variant: #!defenv ENVSHELL=SHELL * then it is like #!define ENVSHELL /bin/bash - it is a simplified alternative of using #!substdef with $env(NAME) in replacement part --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/b40a2a42a3f4f3a21f2d0a2f9ec3c18… Patch: https://github.com/kamailio/kamailio/commit/b40a2a42a3f4f3a21f2d0a2f9ec3c18… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 0d18031692..e6afb549d1 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -125,7 +125,7 @@ /* start conditions */ %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P -%x PVARID INCLF IMPTF EVRTNAME CFGPRINTMODE CFGPRINTLOADMOD +%x PVARID INCLF IMPTF EVRTNAME CFGPRINTMODE CFGPRINTLOADMOD DEFENV_ID %x LINECOMMENT DEFINE_ID DEFINE_EOL DEFINE_DATA IFDEF_ID IFDEF_EOL IFDEF_SKIP /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ @@ -551,6 +551,7 @@ IFNDEF ifndef ENDIF endif TRYDEF "trydefine"|"trydef" REDEF "redefine"|"redef" +DEFENV defenv /* else is already defined */ @@ -1413,6 +1414,27 @@ IMPORTFILE "import_file" ksr_cfg_print_initial_state(); } +<INITIAL,CFGPRINTMODE>{PREP_START}{DEFENV} { count(); + ksr_cfg_print_part(yytext); + state = DEFINE_S; + BEGIN(DEFENV_ID); +} + +<DEFENV_ID>[ \t]* { /* eat the whitespace */ + count(); + ksr_cfg_print_part(yytext); + } +<DEFENV_ID>[^ \t\r\n]+ { /* get the define id of environment variable */ + count(); + ksr_cfg_print_part(yytext); + if(pp_define_env(yytext, yyleng) < 0) { + LM_CRIT("error at %s line %d\n", (finame)?finame:"cfg", line); + exit(-1); + } + state = INITIAL; + ksr_cfg_print_initial_state(); +} + <CFGPRINTMODE>{LOADMODULE} { count(); printf("%s", yytext); BEGIN(CFGPRINTLOADMOD); } @@ -2000,6 +2022,47 @@ int pp_define_set(int len, char *text) return 0; } +int pp_define_env(const char * text, int len) +{ + char *r; + str defname; + str defvalue; + + r = strchr(text, '='); + + defname.s = (char*)text; + if(r == NULL) { + defname.len = len; + r = (char*)text; + } else { + defname.len = r - text; + r++; + if(strlen(r) == 0) { + LM_ERR("invalid defenv id [%s]\n", (char*)text); + return -1; + } + } + defvalue.s = getenv(r); + + if(defvalue.s == NULL) { + LM_ERR("env variable not defined [%s]\n", (char*)text); + return -1; + } + defvalue.len = strlen(defvalue.s); + + pp_define_set_type(0); + if(pp_define(defname.len, defname.s)<0) { + LM_ERR("cannot set define name [%s]\n", (char*)text); + return -1; + } + if(pp_define_set(defvalue.len, defvalue.s)<0) { + LM_ERR("cannot set define value [%s]\n", (char*)text); + return -1; + } + + return 0; +} + str *pp_define_get(int len, const char * text) { str var = {(char *)text, len}; diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 0573b0165d..70627268b6 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -42,6 +42,7 @@ int pp_define(int len, const char *text); int pp_define_set(int len, char *text); int pp_define_set_type(int type); str *pp_define_get(int len, const char * text); +int pp_define_env(const char * text, int len); void pp_ifdef_level_update(int val); int pp_ifdef_level_check(void);

1 0

[kamailio/kamailio] Kamailio on RHEL/Centos 8 issue with SCTP associations created towards endpoint's primary and secondary IP addresses (#2429)
by Piotr Grabowski 19 Nov '20

19 Nov '20

### Description Kamailio is unable to create a SCTP association to IP address that is reachable normally when dispatcher.list is configured as following: ``` 760320003 sip:10.59.144.2:5063;transport=sctp 9 0 dstid=1 760320003 sip:10.59.144.130:5063;transport=sctp 9 0 dstid=1 ``` 10.59.144.2 and 10.59.144.130 are IPs of same endpoint treated as primary and secondary, Kamailio can't send probe (OPTIONS requests) as SCTP association can't be created. Issue doesn't exist on RHEL/Centos 6. ### Troubleshooting #### Reproduction Use previously mentioned dispatcher list with changed IP addresses to match local configuration. SCTP part of kamailio.cfg ``` # if not OS default is used #modparam("sctp", "sctp_socket_rcvbuf", 14096) #modparam("sctp", "sctp_socket_sndbuf", 14096) # Number of milliseconds before an unsent message/chunk is dropped. modparam("sctp", "sctp_send_ttl", 10000) modparam("sctp", "sctp_autoclose", 300) # How many times to attempt re-sending a message on a re-opened association, if the sctp stack did give up sending it (it's not related to sctp protocol level retransmission). Useful to improve reliability with peers that reboot/restart or fail over to another machine. modparam("sctp", "sctp_send_retries", 1) modparam("sctp", "sctp_srto_initial", 200) modparam("sctp", "sctp_srto_max", 250) modparam("sctp", "sctp_srto_min", 150) modparam("sctp", "sctp_asocmaxrxt", 4) modparam("sctp", "sctp_init_max_attempts", 3) modparam("sctp", "sctp_init_max_timeo", 1000) modparam("sctp", "sctp_hbinterval", 1000) modparam("sctp", "sctp_pathmaxrxt", 2) modparam("sctp", "sctp_sack_delay", 10) modparam("sctp", "sctp_sack_freq", 1) modparam("sctp", "sctp_max_burst", 4) ``` #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: dispatcher [dispatch.c:3234]: ds_ping_result_helper(): probing set, but not mode DS_PROBE_INACTIVE Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: dispatcher [dispatch.c:3268]: ds_ping_set(): probing set #760320003, URI sip:10.59.144.2:5063;transport=sctp Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: dispatcher [dispatch.c:3293]: ds_ping_set(): Default ping_from: sip:siplb@sdp.t-mobile.at Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: tm [uac.c:435]: t_uac_prepare(): next_hop=<sip:10.59.144.2:5063;transport=sctp> Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: <core> [core/resolve.c:1244]: srv_sip_resolvehost(): 10.59.144.2:5063 proto=4 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2281]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.130:5063: SCTP_ADDR_ADDED: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: <core> [core/resolve.c:1356]: srv_sip_resolvehost(): returning 0xa7c280 (10.59.144.2:5063 proto=4) Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: tm [uac.c:158]: dlg2hash(): hashid 27287 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2281]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.130:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2280]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.130:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: tm [uac.c:652]: send_prepared_request_impl(): uac: 0x7fbf4eb4e5b8 branch: 0 to 10.59.144.2:5063 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: tm [../../core/onsend.h:69]: run_onsend(): required parameters are not available - ignoring Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2282]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.2:5063: SCTP_ADDR_ADDED: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2278]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.2:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2282]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.2:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2285]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.2:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2283]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.130:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2279]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.130:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2279]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.2:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:14 sdp-lbref02 /usr/sbin/kamailio[2280]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.2:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:14 sdp-lbref02 /usr/sbin/kamailio[2278]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.130:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:15 sdp-lbref02 /usr/sbin/kamailio[2285]: DEBUG: sctp [sctp_server.c:2340]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_ASSOC_CHANGE: SCTP_CANT_STR_ASSOC: assoc_id 0, ostreams 0, istreams 0 Aug 6 18:19:15 sdp-lbref02 /usr/sbin/kamailio[2282]: DEBUG: sctp [sctp_server.c:2340]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_ASSOC_CHANGE: SCTP_CANT_STR_ASSOC: assoc_id 0, ostreams 0, istreams 0 Aug 6 18:19:15 sdp-lbref02 /usr/sbin/kamailio[2285]: DEBUG: sctp [sctp_server.c:2299]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_SEND_FAILED: error 0, assoc_id 0, flags 0 Aug 6 18:19:15 sdp-lbref02 /usr/sbin/kamailio[2285]: DEBUG: sctp [sctp_server.c:2098]: sctp_handle_send_failed(): sctp: RETRY-ing (1) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  Issue is gone when one of IP addresses is removed from dispatcher.list. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.3.5 (x86_64/linux) 9e70e8 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, 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: 9e70e8 compiled on 12:22:26 Jun 22 2020 with gcc 8.3.1 ``` Also tested latest 5.2 and 5.4 * **Operating System**:  ``` [root@sdp-lbref02 ~]# uname -a Linux sdp-lbref02 4.18.0-193.14.3.el8_2.x86_64 #1 SMP Mon Jul 20 15:02:29 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux [root@sdp-lbref02 ~]# cat /etc/redhat-release Red Hat Enterprise Linux release 8.2 (Ootpa) ``` -- 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/2429

4 6

[kamailio/kamailio] Branch ordering behavior changed since v5.3.4 (#2449)
by Cindy Leung 19 Nov '20

19 Nov '20

### Description I'm appending two contacts / branches upon receiving a call. This is a snippet of the config I'm using to debug: ``` xlog ("=== branch 0: $(branch(uri)[0]), $(branch(q)[0])\n"); xlog ("=== branch 1: $(branch(uri)[1]), $(branch(q)[1])\n"); revert_uri(); t_load_contacts(); while (t_next_contacts()) { xlog ("==== $ru\n"); } ``` We expect that the branches are rearranged by weight. When t_next_contacts() is called, the $ru is being rewritten with the branch having the highest q value. This behavior changed after upgrading to v5.4.0. The order of the branches is now being reversed. ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages In v5.4.0, this is what we're seeing in the logs ``` ERROR: IBG_LOG: sipp-ci1-20200819163846-1-22(a)172.18.1.21: === branch 0: sip:1001@gateway2.carrierB.com;transport=udp, 200 ERROR: IBG_LOG: sipp-ci1-20200819163846-1-22(a)172.18.1.21: === branch 1: sip:1001@gateway1.carrierB.com;transport=tcp, 300 DEBUG: IBG_LOG: sipp-ci1-20200819163846-1-22(a)172.18.1.21: tm [t_serial.c:526]: t_load_contacts(): load_contact mode not selected, using: 0 DEBUG: IBG_LOG: sipp-ci1-20200819163846-1-22(a)172.18.1.21: tm [t_serial.c:340]: ki_t_load_contacts_mode(): nr_branches is 2 DEBUG: IBG_LOG: sipp-ci1-20200819163846-1-22(a)172.18.1.21: <core> [core/xavp.c:539]: xavp_destroy_list(): destroying xavp list 0x7fcbe3103e20 DEBUG: IBG_LOG: sipp-ci1-20200819163846-1-22(a)172.18.1.21: tm [t_serial.c:890]: ki_t_next_contacts(): Appending branch uri-'sip:1001@gateway1.carrierB.com;transport=tcp' dst-'' path-'' inst-'' ruid-'' location_ua-'' DEBUG: IBG_LOG: sipp-ci1-20200819163846-1-22(a)172.18.1.21: <core> [core/xavp.c:539]: xavp_destroy_list(): destroying xavp list 0x7fcbe3103b68 ERROR: IBG_LOG: sipp-ci1-20200819163846-1-22(a)172.18.1.21: ==== sip:1001@carrierB DEBUG: IBG_LOG: sipp-ci1-20200819163846-1-22(a)172.18.1.21: <core> [core/xavp.c:539]: xavp_destroy_list(): destroying xavp list 0x7fcbe3103890 ERROR: IBG_LOG: sipp-ci1-20200819163846-1-22(a)172.18.1.21: ==== sip:1001@gateway2.carrierB.com;transport=udp DEBUG: IBG_LOG: sipp-ci1-20200819163846-1-22(a)172.18.1.21: tm [t_serial.c:627]: ki_t_next_contacts(): no contacts in contacts_avp - we are done! ``` This was the behavior in v.5.3.4 ``` ERROR: IBG_LOG: sipp-ci1-20200819172941-1-22(a)172.18.1.21: === branch 0: sip:1001@gateway2.carrierB.com;transport=udp, 200 ERROR: IBG_LOG: sipp-ci1-20200819172941-1-22(a)172.18.1.21: === branch 1: sip:1001@gateway1.carrierB.com;transport=tcp, 300 DEBUG: IBG_LOG: sipp-ci1-20200819172941-1-22(a)172.18.1.21: tm [t_serial.c:191]: ki_t_load_contacts(): nr_branches is 2 DEBUG: IBG_LOG: sipp-ci1-20200819172941-1-22(a)172.18.1.21: <core> [core/xavp.c:529]: xavp_destroy_list(): destroying xavp list 0x7f55bdf0c1d8 ERROR: IBG_LOG: sipp-ci1-20200819172941-1-22(a)172.18.1.21: ==== sip:1001@gateway1.carrierB.com;transport=tcp DEBUG: IBG_LOG: sipp-ci1-20200819172941-1-22(a)172.18.1.21: <core> [core/xavp.c:529]: xavp_destroy_list(): destroying xavp list 0x7f55bdf0bf00 ERROR: IBG_LOG: sipp-ci1-20200819172941-1-22(a)172.18.1.21: ==== sip:1001@gateway2.carrierB.com;transport=udp DEBUG: IBG_LOG: sipp-ci1-20200819172941-1-22(a)172.18.1.21: <core> [core/xavp.c:529]: xavp_destroy_list(): destroying xavp list 0x7f55bdf0bc28 ERROR: IBG_LOG: sipp-ci1-20200819172941-1-22(a)172.18.1.21: ==== sip:1001@carrierB DEBUG: IBG_LOG: sipp-ci1-20200819172941-1-22(a)172.18.1.21: tm [t_serial.c:460]: ki_t_next_contacts(): no contacts in contacts_avp - we are done! ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/2449

5 20

git:5.4:2d733ec7: tm: print ruri mode in debug message from t load contacts
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: 2d733ec7c9e26ad79d9d8503db0d342217febd30 URL: https://github.com/kamailio/kamailio/commit/2d733ec7c9e26ad79d9d8503db0d342… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:29:03+01:00 tm: print ruri mode in debug message from t load contacts (cherry picked from commit 3214ecd8ee82d1b69cde57d96dddefe1301c190c) --- Modified: src/modules/tm/t_serial.c --- Diff: https://github.com/kamailio/kamailio/commit/2d733ec7c9e26ad79d9d8503db0d342… Patch: https://github.com/kamailio/kamailio/commit/2d733ec7c9e26ad79d9d8503db0d342… --- diff --git a/src/modules/tm/t_serial.c b/src/modules/tm/t_serial.c index 13611cdb54..e7e9c8eedc 100644 --- a/src/modules/tm/t_serial.c +++ b/src/modules/tm/t_serial.c @@ -337,7 +337,7 @@ int ki_t_load_contacts_mode(struct sip_msg* msg, int mode) } /* Check if anything needs to be done */ - LM_DBG("nr_branches is %d\n", nr_branches); + LM_DBG("nr_branches is %d - new uri mode %d\n", nr_branches, ruri_is_new); if ((nr_branches == 0) || ((nr_branches == 1) && !ruri_is_new)) { LM_DBG("nothing to do - only one contact!\n");

1 0

git:5.4:d9a1a5cf: drouting: give portparameter set to 0 to sip_resolvehost()
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: d9a1a5cf667e7d093cc077fc51297825565c79d1 URL: https://github.com/kamailio/kamailio/commit/d9a1a5cf667e7d093cc077fc5129782… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:28:35+01:00 drouting: give portparameter set to 0 to sip_resolvehost() - enable doing SRV query, GH #2553 (cherry picked from commit 18f59c10582845da5eea280990daf19c804978fb) --- Modified: src/modules/drouting/routing.c --- Diff: https://github.com/kamailio/kamailio/commit/d9a1a5cf667e7d093cc077fc5129782… Patch: https://github.com/kamailio/kamailio/commit/d9a1a5cf667e7d093cc077fc5129782… --- diff --git a/src/modules/drouting/routing.c b/src/modules/drouting/routing.c index a1d32fa0ba..da4385911f 100644 --- a/src/modules/drouting/routing.c +++ b/src/modules/drouting/routing.c @@ -268,6 +268,7 @@ int add_dst(rt_data_t *r, #define GWABUF_MAX_SIZE 512 char gwabuf[GWABUF_MAX_SIZE]; str gwas; + unsigned short port; if(NULL == r || NULL == ip) { LM_ERR("invalid parametres\n"); @@ -331,7 +332,8 @@ int add_dst(rt_data_t *r, } /* note we discard the port discovered by the resolve function - we are interested only in the port that was actually configured. */ - if((he = sip_resolvehost(&uri.host, NULL, (char *)(void *)&uri.proto)) + port = 0; + if((he = sip_resolvehost(&uri.host, &port, (char *)(void *)&uri.proto)) == 0) { if(dr_force_dns) { LM_ERR("cannot resolve <%.*s>\n", uri.host.len, uri.host.s);

1 0

git:5.4:f61d7a1b: tm: use q field comparison in while for standard t contacts load
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: f61d7a1b6b45bbed29bf4bc6c8a69fd52700ca41 URL: https://github.com/kamailio/kamailio/commit/f61d7a1b6b45bbed29bf4bc6c8a69fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:28:53+01:00 tm: use q field comparison in while for standard t contacts load - fix ordering change to standar mode introduced with proportional mode - GH #2449 (cherry picked from commit 59f6ddbe902d61bc682dd12fc6330df656468b1b) --- Modified: src/modules/tm/t_serial.c --- Diff: https://github.com/kamailio/kamailio/commit/f61d7a1b6b45bbed29bf4bc6c8a69fd… Patch: https://github.com/kamailio/kamailio/commit/f61d7a1b6b45bbed29bf4bc6c8a69fd… --- diff --git a/src/modules/tm/t_serial.c b/src/modules/tm/t_serial.c index d27a648243..13611cdb54 100644 --- a/src/modules/tm/t_serial.c +++ b/src/modules/tm/t_serial.c @@ -459,11 +459,20 @@ int ki_t_load_contacts_mode(struct sip_msg* msg, int mode) prev = (struct contact *)0; curr = contacts; - while (curr && - ((curr->q_index < next->q_index) || - ((curr->q_index == next->q_index) && (next->path.len == 0)))) { - prev = curr; - curr = curr->next; + if (mode == T_LOAD_PROPORTIONAL) { + while (curr && + ((curr->q_index < next->q_index) || + ((curr->q_index == next->q_index) && (next->path.len == 0)))) { + prev = curr; + curr = curr->next; + } + } else { + while (curr && + ((curr->q < next->q) || + ((curr->q == next->q) && (next->path.len == 0)))) { + prev = curr; + curr = curr->next; + } } if (!curr) { next->next = (struct contact *)0;

1 0

git:5.4:bec6cdf1: core: added missing field in sip_msg_update_buffer
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: bec6cdf10dfbf9f32fce041987a3468b8a675a22 URL: https://github.com/kamailio/kamailio/commit/bec6cdf10dfbf9f32fce041987a3468… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:27:38+01:00 core: added missing field in sip_msg_update_buffer - added a missing field in sip_msg_update_buffer() when restoring message fiedls: msg->pid. (cherry picked from commit 57be5c1f33344275c15777a7927d9c48df4a69ba) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/bec6cdf10dfbf9f32fce041987a3468… Patch: https://github.com/kamailio/kamailio/commit/bec6cdf10dfbf9f32fce041987a3468… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index fd183d4f80..77b90a92c6 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3276,6 +3276,7 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) /* restore msg fields */ msg->buf = tmp.buf; msg->id = tmp.id; + msg->pid = tmp.pid; msg->rcv = tmp.rcv; msg->set_global_address = tmp.set_global_address; msg->set_global_port = tmp.set_global_port;

1 0

git:5.4:c9ab7671: jsonrpcs: exported dispatch() function to kemi
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: c9ab7671bffdee3c775f6eb13cbd2363b6f5ecf3 URL: https://github.com/kamailio/kamailio/commit/c9ab7671bffdee3c775f6eb13cbd236… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:28:08+01:00 jsonrpcs: exported dispatch() function to kemi (cherry picked from commit 08a9ed3d136c861f990e4f63c2c0544e08d9078d) --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c9ab7671bffdee3c775f6eb13cbd236… Patch: https://github.com/kamailio/kamailio/commit/c9ab7671bffdee3c775f6eb13cbd236… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 6f3491b038..c3b8003046 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -1227,7 +1227,7 @@ static void mod_destroy(void) /** * */ -static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) +static int ki_jsonrpcs_dispatch(sip_msg_t* msg) { rpc_export_t* rpce; jsonrpc_ctx_t* ctx; @@ -1315,6 +1315,14 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) } +/** + * + */ +static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) +{ + return ki_jsonrpcs_dispatch(msg); +} + int jsonrpc_exec_ex(str *cmd, str *rpath) { rpc_export_t* rpce; @@ -1551,6 +1559,11 @@ static sr_kemi_xval_t* ki_jsonrpcs_response(sip_msg_t *msg) */ /* clang-format off */ static sr_kemi_t sr_kemi_jsonrpcs_exports[] = { + { str_init("jsonrpcs"), str_init("dispatch"), + SR_KEMIP_INT, ki_jsonrpcs_dispatch, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("jsonrpcs"), str_init("exec"), SR_KEMIP_INT, ki_jsonrpcs_exec, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:5.4:b72ab5e5: core: init origproto to fix compiler warning
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: b72ab5e554d230b36a7c6dbc79b8e86b5d0c70e2 URL: https://github.com/kamailio/kamailio/commit/b72ab5e554d230b36a7c6dbc79b8e86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:26:19+01:00 core: init origproto to fix compiler warning - GH #2543 (cherry picked from commit ef3233d14080936486d09edbe9598d7d92bd2f33) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/b72ab5e554d230b36a7c6dbc79b8e86… Patch: https://github.com/kamailio/kamailio/commit/b72ab5e554d230b36a7c6dbc79b8e86… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index e383786de2..05dc3f98ba 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3261,6 +3261,7 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, ret=-E_DNS_NO_NAPTR; if(proto) origproto=*proto; + else origproto = PROTO_NONE; if (dns_hash==0){ /* not init => use normal, non-cached version */ LM_WARN("called before dns cache initialization\n"); h->srv=h->a=0;

1 0

git:5.4:f3a872e9: http_async_client: include poll.h instead sys/poll.h
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: f3a872e9e8f780a23f7e3426ce4152a3a26cc448 URL: https://github.com/kamailio/kamailio/commit/f3a872e9e8f780a23f7e3426ce4152a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:26:53+01:00 http_async_client: include poll.h instead sys/poll.h - according to POSIX specs - GH #2543 (cherry picked from commit 8f30c75cff7787a39f7c934e00e933b1beb43c20) --- Modified: src/modules/http_async_client/http_multi.h --- Diff: https://github.com/kamailio/kamailio/commit/f3a872e9e8f780a23f7e3426ce4152a… Patch: https://github.com/kamailio/kamailio/commit/f3a872e9e8f780a23f7e3426ce4152a… --- diff --git a/src/modules/http_async_client/http_multi.h b/src/modules/http_async_client/http_multi.h index c830daa9b1..10070eb6bd 100644 --- a/src/modules/http_async_client/http_multi.h +++ b/src/modules/http_async_client/http_multi.h @@ -37,7 +37,7 @@ #include <sys/time.h> #include <time.h> #include <unistd.h> -#include <sys/poll.h> +#include <poll.h> #include <curl/curl.h> #include <event2/event.h> #include <fcntl.h>

1 0

git:5.4:f6747a1f: sctp: memcpy field data to avoid unaligned access warning
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: f6747a1fe4af59062733090ee0081d1bf15669c3 URL: https://github.com/kamailio/kamailio/commit/f6747a1fe4af59062733090ee0081d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:27:02+01:00 sctp: memcpy field data to avoid unaligned access warning - GH #2543 (cherry picked from commit 4bb099b046939b85e1827b804167a51ef4bc00c4) --- Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/f6747a1fe4af59062733090ee0081d1… Patch: https://github.com/kamailio/kamailio/commit/f6747a1fe4af59062733090ee0081d1… --- diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c index 6690503973..fff7a0b6b3 100644 --- a/src/modules/sctp/sctp_server.c +++ b/src/modules/sctp/sctp_server.c @@ -2258,6 +2258,7 @@ static int sctp_handle_notification(struct socket_info *si, { union sctp_notification *snp; char su_buf[SU2A_MAX_STR_SIZE]; + struct sockaddr_storage sa_storage; #define SNOT DBG #define ERR_LEN_TOO_SMALL(length, val, bind_addr, from_su, text) \ @@ -2311,8 +2312,9 @@ static int sctp_handle_notification(struct socket_info *si, sctp_paddr_change_state2s(snp->sn_paddr_change.spc_state), snp->sn_paddr_change.spc_state, &snp->sn_paddr_change.spc_aaddr); - strcpy(su_buf, su2a((union sockaddr_union *)&snp->sn_paddr_change - .spc_aaddr, + memcpy(&sa_storage, &snp->sn_paddr_change.spc_aaddr, + sizeof(snp->sn_paddr_change.spc_aaddr)); + strcpy(su_buf, su2a((union sockaddr_union *)&sa_storage, sizeof(snp->sn_paddr_change.spc_aaddr))); SNOT("sctp notification from %s on %.*s:%d: SCTP_PEER_ADDR_CHANGE" ": %s: %s: assoc_id %d \n",

1 0

git:5.4:82e00ce3: exec: debug message when command returns non-zero
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: 82e00ce32c9a232be1dbd2e0a0e6e6c349e054b0 URL: https://github.com/kamailio/kamailio/commit/82e00ce32c9a232be1dbd2e0a0e6e6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:23:06+01:00 exec: debug message when command returns non-zero (cherry picked from commit e9eee1ead964992a2d81014709755bbfd1e995c9) --- Modified: src/modules/exec/exec.c --- Diff: https://github.com/kamailio/kamailio/commit/82e00ce32c9a232be1dbd2e0a0e6e6c… Patch: https://github.com/kamailio/kamailio/commit/82e00ce32c9a232be1dbd2e0a0e6e6c… --- diff --git a/src/modules/exec/exec.c b/src/modules/exec/exec.c index 0e809ed8af..763e30816e 100644 --- a/src/modules/exec/exec.c +++ b/src/modules/exec/exec.c @@ -326,11 +326,17 @@ int exec_cmd(sip_msg_t *msg, char *cmd) exit_status = pclose(pipe); if(WIFEXITED(exit_status)) { /* exited properly .... */ /* return false if script exited with non-zero status */ - if(WEXITSTATUS(exit_status) != 0) + if(WEXITSTATUS(exit_status) != 0) { + LM_DBG("cmd %s with non-zero status - exit_status=%d," + " wexitstatus: %d, errno=%d: %s\n", + cmd, exit_status, WEXITSTATUS(exit_status), + errno, strerror(errno)); ret = -1; + } } else { /* exited erroneously */ - LM_ERR("cmd %s failed. exit_status=%d, errno=%d: %s\n", cmd, - exit_status, errno, strerror(errno)); + LM_ERR("cmd %s failed. exit_status=%d, wexitstatus: %d, errno=%d: %s\n", + cmd, exit_status, WEXITSTATUS(exit_status), + errno, strerror(errno)); ret = -1; }

1 0

git:5.4:88f43b97: dialog: skip doing cseq update processing for non-sip requests
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: 88f43b97768676fd2b84c3e855ec5ae441b826cd URL: https://github.com/kamailio/kamailio/commit/88f43b97768676fd2b84c3e855ec5ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:23:45+01:00 dialog: skip doing cseq update processing for non-sip requests (cherry picked from commit 960b60ede8543f38b61ad2769e81e11d5a777df8) --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/88f43b97768676fd2b84c3e855ec5ae… Patch: https://github.com/kamailio/kamailio/commit/88f43b97768676fd2b84c3e855ec5ae… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index a85b726514..17c63bbb1c 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -381,7 +381,12 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) goto done; } - if((get_to(&msg)->tag_value.len<=0)) { + if(!IS_SIP(&msg)) { + /* nothing to do for non-sip requests */ + goto done; + } + + if(get_to(&msg)->tag_value.len<=0) { /* intial request - handle only INVITEs */ if(msg.first_line.u.request.method_value!=METHOD_INVITE) { goto done;

1 0

git:5.4:17cb589c: dialog: small formatting changes
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: 17cb589ce5ac07dbb12f1b99f17258f313adf783 URL: https://github.com/kamailio/kamailio/commit/17cb589ce5ac07dbb12f1b99f17258f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:22:55+01:00 dialog: small formatting changes (cherry picked from commit a3443211515068bb12ecbd53541785a5ebf1cb6c) --- Modified: src/modules/dialog/dlg_dmq.c Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/17cb589ce5ac07dbb12f1b99f17258f… Patch: https://github.com/kamailio/kamailio/commit/17cb589ce5ac07dbb12f1b99f17258f… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index a5628f485b..9f70354d50 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -534,11 +534,11 @@ int dlg_dmq_replicate_action(dlg_dmq_action_t action, dlg_cell_t* dlg, if (dlg->vars != NULL) { srjson_t *pj = NULL; pj = srjson_CreateObject(&jdoc); - for(var=dlg->vars ; var ; var=var->next) { + for(var=dlg->vars ; var ; var=var->next) { srjson_AddStrToObject(&jdoc, pj, var->key.s, var->value.s, var->value.len); - } - srjson_AddItemToObject(&jdoc, jdoc.root, "vars", pj); + } + srjson_AddItemToObject(&jdoc, jdoc.root, "vars", pj); } if (dlg->profile_links) { @@ -657,8 +657,8 @@ int dmq_send_all_dlgs(dmq_node_t* dmq_node) { dlg_lock( d_table, &entry); for(dlg = entry.first; dlg != NULL; dlg = dlg->next){ - dlg->dflags |= DLG_FLAG_CHANGED_PROF; - dlg_dmq_replicate_action(DLG_DMQ_UPDATE, dlg, 0, dmq_node); + dlg->dflags |= DLG_FLAG_CHANGED_PROF; + dlg_dmq_replicate_action(DLG_DMQ_UPDATE, dlg, 0, dmq_node); } dlg_unlock( d_table, &entry); @@ -672,7 +672,7 @@ int dmq_send_all_dlgs(dmq_node_t* dmq_node) { * @brief dmq response callback */ int dlg_dmq_resp_callback_f(struct sip_msg* msg, int code, - dmq_node_t* node, void* param) + dmq_node_t* node, void* param) { LM_DBG("dmq response callback triggered [%p %d %p]\n", msg, code, param); return 0; diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 7cf6b7ba7a..3f8adefb79 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -749,15 +749,15 @@ static void dlg_on_send(struct cell* t, int type, struct tmcb_params *param) LM_DBG("dialog_on_send CB\n"); iuid = (dlg_iuid_t*)(*param->param); if (iuid==NULL) - return; + return; dlg = dlg_get_by_iuid(iuid); if(dlg==NULL) - return; + return; /* sync over dmq */ if (dlg_enable_dmq) { - dlg_dmq_replicate_action(DLG_DMQ_UPDATE, dlg, 1, 0); + dlg_dmq_replicate_action(DLG_DMQ_UPDATE, dlg, 1, 0); } /* unref by 2: 1 set when adding in tm cb, 1 set by dlg_get_by_iuid() */

1 0

git:master:a93d3f93: modules: readme files regenerated - http_async_client ... [skip ci]
by Kamailio Dev 19 Nov '20

19 Nov '20

Module: kamailio Branch: master Commit: a93d3f9375a9ad044866c2aa32490238a4a270a2 URL: https://github.com/kamailio/kamailio/commit/a93d3f9375a9ad044866c2aa3249023… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-19T10:46:19+01:00 modules: readme files regenerated - http_async_client ... [skip ci] --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/a93d3f9375a9ad044866c2aa3249023… Patch: https://github.com/kamailio/kamailio/commit/a93d3f9375a9ad044866c2aa3249023… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index f2afe6325d..cfa2c37df0 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -477,6 +477,21 @@ http_async_query("https://example.com/test.php", "HTTP_REPLY"); * $http_mb and $http_ml: HTTP response buffer (including headers) and length * $http_rb and $http_bs: HTTP response body and body length + * $http_time: provides access to broken-down transfer time in + microseconds calculated by cURL + (https://curl.se/libcurl/c/curl_easy_getinfo.html). + 'name' can be: + + total - total time for the transfer + + lookup - name lookup time + + connect - time from the start until the connection to the + remote host (or proxy) was completed. + + appconnect - time from start until SSL/SSH handshake completed + + pretransfer - time from start until just before the transfer + begins + + starttransfer - time from start until just when the first byte + is received + + redirect - time taken for all redirect steps before the final + transfer. 6. Statistics

1 0

git:master:8ab72a37: http_async_client: add http_time pseudovariable
by Federico Cabiddu 19 Nov '20

19 Nov '20

Module: kamailio Branch: master Commit: 8ab72a37565bbec503d825f48774a0627014f665 URL: https://github.com/kamailio/kamailio/commit/8ab72a37565bbec503d825f48774a06… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-11-19T10:34:13+01:00 http_async_client: add http_time pseudovariable --- Modified: src/modules/http_async_client/async_http.c Modified: src/modules/http_async_client/async_http.h Modified: src/modules/http_async_client/doc/http_async_client_admin.xml Modified: src/modules/http_async_client/hm_hash.h Modified: src/modules/http_async_client/http_async_client_mod.c Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/8ab72a37565bbec503d825f48774a06… Patch: https://github.com/kamailio/kamailio/commit/8ab72a37565bbec503d825f48774a06…

1 0

git:master:b7b33ad1: pkg: fix debian lintian error after kamailio scripts changed to python3
by Henning Westerholt 19 Nov '20

19 Nov '20

Module: kamailio Branch: master Commit: b7b33ad13942a7f0ef48ed9487541cd418f137f6 URL: https://github.com/kamailio/kamailio/commit/b7b33ad13942a7f0ef48ed9487541cd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-11-19T07:07:35Z pkg: fix debian lintian error after kamailio scripts changed to python3 --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/b7b33ad13942a7f0ef48ed9487541cd… Patch: https://github.com/kamailio/kamailio/commit/b7b33ad13942a7f0ef48ed9487541cd… --- diff --git a/pkg/kamailio/deb/bionic/control b/pkg/kamailio/deb/bionic/control index dfe684cda3..457a4671ea 100644 --- a/pkg/kamailio/deb/bionic/control +++ b/pkg/kamailio/deb/bionic/control @@ -71,7 +71,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/buster/control b/pkg/kamailio/deb/buster/control index dfe684cda3..457a4671ea 100644 --- a/pkg/kamailio/deb/buster/control +++ b/pkg/kamailio/deb/buster/control @@ -71,7 +71,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 52957ddabc..62719f61c6 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -74,7 +74,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/focal/control b/pkg/kamailio/deb/focal/control index dfe684cda3..457a4671ea 100644 --- a/pkg/kamailio/deb/focal/control +++ b/pkg/kamailio/deb/focal/control @@ -71,7 +71,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index f4ea235b3b..ddfe38a40c 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -70,7 +70,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index fec8c75984..5d5dabc02b 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -61,7 +61,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index dfe684cda3..457a4671ea 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -71,7 +71,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control index 69d071586b..55c32d2230 100644 --- a/pkg/kamailio/deb/stretch/control +++ b/pkg/kamailio/deb/stretch/control @@ -73,7 +73,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index 213c83989a..954ca2b6fb 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -65,7 +65,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index fec8c75984..5d5dabc02b 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -61,7 +61,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control index 0bd5a2a845..5635f2daac 100644 --- a/pkg/kamailio/deb/xenial/control +++ b/pkg/kamailio/deb/xenial/control @@ -76,7 +76,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces:

1 0

[kamailio/kamailio] jansson: Fix another case of inverse boolean logic (#2555)
by Alex Hermann 19 Nov '20

19 Nov '20

Copy-pasto from before the other fix. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2555 -- Commit Summary -- * jansson: Fix another case of inverse boolean logic -- File Changes -- M src/modules/jansson/jansson_utils.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2555.patch https://github.com/kamailio/kamailio/pull/2555.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/2555

2 3

git:master:526873c7: jansson: Fix another case of inverse boolean logic
by Henning Westerholt 19 Nov '20

19 Nov '20

Module: kamailio Branch: master Commit: 526873c70ac3860638107a74ac50ed6028319bc8 URL: https://github.com/kamailio/kamailio/commit/526873c70ac3860638107a74ac50ed6… Author: Alex Hermann <alex(a)hexla.nl> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-11-19T07:54:01+01:00 jansson: Fix another case of inverse boolean logic Copy-pasto from before the other fix. --- Modified: src/modules/jansson/jansson_utils.c --- Diff: https://github.com/kamailio/kamailio/commit/526873c70ac3860638107a74ac50ed6… Patch: https://github.com/kamailio/kamailio/commit/526873c70ac3860638107a74ac50ed6… --- diff --git a/src/modules/jansson/jansson_utils.c b/src/modules/jansson/jansson_utils.c index 14b4b82c25..db1ab43b07 100644 --- a/src/modules/jansson/jansson_utils.c +++ b/src/modules/jansson/jansson_utils.c @@ -97,7 +97,7 @@ int jansson_to_xval(sr_xval_t *val, char** freeme, json_t* v) { val->v.s.len = strlen(value); }else if(json_is_boolean(v)) { val->type = SR_XTYPE_INT; - val->v.i = json_is_true(v) ? 0 : 1; + val->v.i = json_is_true(v) ? 1 : 0; }else if(json_is_real(v)) { char* value = NULL; if(asprintf(&value, "%.15g", json_real_value(v))<0) {

1 0

[kamailio/kamailio] topos module seems to break re-SUBSCRIBE routing to downstream destinations (#1724)
by George Diamantopoulos 18 Nov '20

18 Nov '20

### Description Kamailio seems to fail to properly route in-dialog SUBSCRIBE with the topos module enabled. In this configuration, SUBSCRIBEs are expected to be delivered to a downstream UAS, an asterisk instance in the internal network. record_route() is executed for all initial requests, including SUBSCRIBEs. Routing is performed correctly with the topos module disabled, no other modifications were needed.  ### Troubleshooting I haven't been able to work around this issue in any other way other than disabling the topos module. #### Reproduction The configuration used is a heavily modified version of the example configuration file, but the handling of SUBSCRIBEs is generally simple. The initial SUBSCRIBE is subject to some tests, the R-URI is edited and dispatched to a farm of asterisk servers based on some criteria. Record Routing is enforced, so subsequent in-dialog re-SUBSCRIBEs are expected to be routed with loose_route(), which doesn't seem to handle things properly.  #### Debugging Data I'm attaching kamailio logs with debug=4, cfg_trace  #### Log Messages See attachments  #### SIP Traffic Please see: https://www.cloudshark.org/captures/d2643aae7f2a  ### Possible Solutions Using topoh instead for topos, but unfortunately this will break communication for other reasons (messages too large/UDP fragmentation for some peers). ### Additional Information * **Kamailio Version** Tried with kamailio 5.1.6 and kamailio 5.3.0-dev0 deb.kamailio.org repositories were used to acquire binaries for both versions * **Operating System**: Debian Stretch  [resubscribe.log](https://github.com/kamailio/kamailio/files/2586440/resubsc… -- 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/1724

2 4

[kamailio/kamailio] uri_restore_rcv_alias() tried twice for local request (#2014)
by Alex Hermann 18 Nov '20

18 Nov '20

### Description While debugging an issue with locally generated in-dialog requests I stumbled upon some weirdness with the alias functionality from the nathelper module. The dialog modules tries to handle an alias parameter when sending an in-dialog request by calling ```uri_restore_rcv_alias()``` in the function ```build_dlg_t()```. A few instructions later, the same is attempted by the tm module in the function ```req_within()```. It seems to me that the attempt by the dialog module is redundant and can be removed. And while at it, IMHO it should be removed from the tm module too. This is functionality introduced by the nathelper module. Nowhere in the documentation it is mentioned there is some automatic handling of the alias parameter. If handling is needed for local requests, the script writer can call ```handle_uri_alias()``` from within local_route. If the functionality has to stay, may I suggest that the code in the nathelper module makes use of the ```uri_restore_rcv_alias()``` function instead of having its own duplicate implementation. Less maintenance, easier debugging. -- 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/2014

2 3

[kamailio/kamailio] rtpengine: stats for rtpengine command and reply from rtpengine (#1699)
by Surendra Tiwari 18 Nov '20

18 Nov '20

### Description rightnow, there is no stats about command sent to rtpengine and getting reply from rtpengine. There should be a stats that will tell that number of offer request sent: number of answer request sent: number of delete request sent: number of failed request for offer [after retry]: number of failed request for answer [after retry]: number of failed request for delete [after retry]: This will help to identify actual number of failed request.  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/1699

2 2

[kamailio/kamailio] 100% CPU usage after NTP date update (#2046)
by Benjamin Marty 18 Nov '20

18 Nov '20

#### Reproduction Install newest Kamailio 5.2. Change date e.g. 2 Years into the future. (Make sure you have no daemon running which prohibits those operations): ``` sudo date -s "2014-12-25 $(date +%H:%M:%S)" ``` ``` sudo date -s "2016-12-25 $(date +%H:%M:%S)" ``` Kamailio now uses the whole CPU to do stuff: ``` top - 08:10:35 up 14 days, 1:29, 2 users, load average: 3.77, 1.83, 1.05 Tasks: 212 total, 11 running, 201 sleeping, 0 stopped, 0 zombie %Cpu(s): 95.9 us, 1.5 sy, 2.2 ni, 0.0 id, 0.0 wa, 0.0 hi, 0.4 si, 0.0 st MiB Mem : 926.1 total, 116.3 free, 382.5 used, 427.3 buff/cache MiB Swap: 100.0 total, 40.4 free, 59.6 used. 423.4 avail Mem PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND 13264 root 20 0 89720 3944 2676 R 44.9 0.4 0:05.15 kamailio 13266 root 20 0 89720 4000 2736 R 37.3 0.4 0:04.63 kamailio 13267 root 20 0 89720 4912 3488 R 36.0 0.5 0:04.37 kamailio 13270 root 20 0 89720 4540 3240 R 36.0 0.5 0:05.85 kamailio 13269 root 20 0 89720 4000 2736 R 34.7 0.4 0:04.81 kamailio 13265 root 20 0 89720 3944 2680 R 34.4 0.4 0:04.61 kamailio 13261 root 20 0 89720 3952 2676 R 32.2 0.4 0:04.44 kamailio 13262 root 20 0 89720 3944 2676 R 31.8 0.4 0:04.72 kamailio 13256 root 20 0 89720 4752 3540 R 30.3 0.5 0:07.04 kamailio 13268 root 20 0 89720 4000 2736 R 30.3 0.4 0:04.49 kamailio 18021 root 20 0 40116 11884 5728 D 13.7 1.3 0:01.11 apt-get ``` There are multiple mailing list entries regarding this issue: https://lists.kamailio.org/pipermail/sr-users/2015-October/090465.html https://lists.kamailio.org/pipermail/sr-users/2015-November/090487.html https://lists.kamailio.org/pipermail/sr-users/2019-June/105967.html https://lists.kamailio.org/pipermail/sr-users/2019-August/106428.html I was able to get rid of the issue with uncommenting the mentioned part of the code. But I'm quite sure that's not a fix :) ![image](https://user-images.githubusercontent.com/11159719/63680341-b6d67880-c7f3-11e9-825b-529e7ec26b2e.png) -- 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/2046

2 3

[kamailio/kamailio] commit 0436af5abd8b73e breaks startup for jsonrpcs module (#2391)
by Henning Westerholt 18 Nov '20

18 Nov '20

The commit 0436af5abd8b73e breaks startup for jsonrpcs module. Logs: ``` Jul 5 10:04:41 kam01 kamailio[4951]: ERROR: jsonrpcs [jsonrpcs_sock.c:358]: jsonrpc_dgram_init_server(): failed to change the owner/group for /var/run/kamailio/kamailio_rpc.sock to 33.0;Operation not permitted[1] Jul 5 10:04:41 kam01 kamailio[4951]: CRITICAL: jsonrpcs [jsonrpcs_sock.c:423]: jsonrpc_dgram_init_socks(): initializing datagram server function returned error Jul 5 10:04:41 kam01 kamailio[4951]: ERROR: jsonrpcs [jsonrpcs_sock.c:246]: jsonrpc_dgram_mod_init(): init datagram sockets function failed Jul 5 10:04:41 kam01 kamailio[4951]: ERROR: jsonrpcs [jsonrpcs_mod.c:1150]: mod_init(): cannot initialize datagram transport Jul 5 10:04:41 kam01 kamailio[4951]: ERROR: <core> [core/sr_module.c:849]: init_mod(): Error while initializing module jsonrpcs (/usr/lib/x86_64-linux-gnu/kamailio/modules/jsonrpcs.so) ``` Relevant cfg: ``` loadmodule "jsonrpcs.so" modparam("jsonrpcs", "pretty_format", 1) modparam("jsonrpcs", "dgram_user", "www-data") modparam("jsonrpcs", "dgram_group", "root") modparam("jsonrpcs", "transport", 7) ``` Previously Kamailio was started as root, and then configured with -u $USER and -g $GROUP to drop privileges to the lower user/group. During startup Kamailio could create the socket with the correct permissions. The mentioned commit changes this to: start Kamailio directly as user Kamailio and group Kamailio, which don't have privileges create the sockets with the correct permissions. Not sure about the motivation about this change, so I don't want to simple revert it. Maybe @sergey-safarov or other developers can comment. -- 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/2391

4 25

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev