- sr-dev - kamailio.org

Kamailio v5.6.0 Released - new major version is out
by Daniel-Constantin Mierla 23 May '22

23 May '22

Kamailio v5.6.0 is out – it comes with 7 new modules and a considerable set of improvements touching again more than 90 existing modules. You can read detailed release notes at: * https://www.kamailio.org/w/kamailio-v5-6-0-release-notes/ Many thanks to all developers and community members that made possible this release. v5.6.0 brings more flexibility and optimizations across many components, plenty of new variables and transformations, load balancer enhancements, generic iterators for SIP headers and body lines, alternative http client, NATS PubSub connector, improvements to STIR/SHAKEN, IMS/VoLTE, rtpengine and tls as well as more functions exported to KEMI interface ... just to list only a few here. Enjoy Kamailio v5.5.0! Thank you for flying Kamailio! Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online: June 20-23, 2022 * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:5.6:61e86a1f: ChangeLog: content updated for v5.6.0
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 61e86a1f502388ffd4dce6e52811ba640337c813 URL: https://github.com/kamailio/kamailio/commit/61e86a1f502388ffd4dce6e52811ba6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T12:04:09+02:00 ChangeLog: content updated for v5.6.0 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/61e86a1f502388ffd4dce6e52811ba6… Patch: https://github.com/kamailio/kamailio/commit/61e86a1f502388ffd4dce6e52811ba6… --- diff --git a/ChangeLog b/ChangeLog index 62a187ce15..523193a5dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,37 @@ ===================== Changes Since Version 5.5.0 =========================== +commit 9df3ebedc62631ecb5faf1bc93008c30d1ffecb7 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Mon May 23 10:57:55 2022 +0200 + + pkg: version set to 5.6.0 for rpms and alpine specs + +commit dd2978576fca0985fe05cf6b26a9330d1b8cba1c +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Mon May 23 10:09:18 2022 +0200 + + Makefile.defs: version set to 5.6.0 + +commit 9b044b41778b3d3d55027751fc6c2b55027cc3c4 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Mon May 23 09:44:43 2022 +0200 + + ChangeLog: initial content for v5.6.x series + +commit c38529cad713964534ef1ad94c31ce88c3e16c81 +Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> +Date: Mon May 23 09:29:20 2022 +0200 + + pkg/kamailio/deb: version set 5.6.0 + +commit 018f6145e441dede75ea6f128b472397574f7763 +Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> +Date: Mon May 16 15:08:38 2022 +0200 + + pkg/kamailio/deb: version set 5.6.0~rc1 + + commit 88786b402cbeb4a7d2261ed198c0927cec79e362 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon May 23 08:18:04 2022 +0200

1 0

git:5.6:9df3ebed: pkg: version set to 5.6.0 for rpms and alpine specs
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 9df3ebedc62631ecb5faf1bc93008c30d1ffecb7 URL: https://github.com/kamailio/kamailio/commit/9df3ebedc62631ecb5faf1bc93008c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T10:57:55+02:00 pkg: version set to 5.6.0 for rpms and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9df3ebedc62631ecb5faf1bc93008c3… Patch: https://github.com/kamailio/kamailio/commit/9df3ebedc62631ecb5faf1bc93008c3… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 6bf221630da..ff4836a3d73 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.1.0 +pkgver=5.6.0 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 5b87a501bcd..10ada842b53 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.0 +%define ver 5.6.0 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.6:dd297857: Makefile.defs: version set to 5.6.0
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: dd2978576fca0985fe05cf6b26a9330d1b8cba1c URL: https://github.com/kamailio/kamailio/commit/dd2978576fca0985fe05cf6b26a9330… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T10:09:18+02:00 Makefile.defs: version set to 5.6.0 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/dd2978576fca0985fe05cf6b26a9330… Patch: https://github.com/kamailio/kamailio/commit/dd2978576fca0985fe05cf6b26a9330… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 171fba98f6..d8887dc0ca 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:5.6:9b044b41: ChangeLog: initial content for v5.6.x series
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 9b044b41778b3d3d55027751fc6c2b55027cc3c4 URL: https://github.com/kamailio/kamailio/commit/9b044b41778b3d3d55027751fc6c2b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T09:45:14+02:00 ChangeLog: initial content for v5.6.x series --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/9b044b41778b3d3d55027751fc6c2b5… Patch: https://github.com/kamailio/kamailio/commit/9b044b41778b3d3d55027751fc6c2b5…

1 0

git:5.6:c38529ca: pkg/kamailio/deb: version set 5.6.0
by Victor Seva 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: c38529cad713964534ef1ad94c31ce88c3e16c81 URL: https://github.com/kamailio/kamailio/commit/c38529cad713964534ef1ad94c31ce8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-23T09:29:20+02:00 pkg/kamailio/deb: version set 5.6.0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/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/c38529cad713964534ef1ad94c31ce8… Patch: https://github.com/kamailio/kamailio/commit/c38529cad713964534ef1ad94c31ce8…

1 0

git:5.6:018f6145: pkg/kamailio/deb: version set 5.6.0~rc1
by Victor Seva 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 018f6145e441dede75ea6f128b472397574f7763 URL: https://github.com/kamailio/kamailio/commit/018f6145e441dede75ea6f128b47239… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-23T09:03:50+02:00 pkg/kamailio/deb: version set 5.6.0~rc1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/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/018f6145e441dede75ea6f128b47239… Patch: https://github.com/kamailio/kamailio/commit/018f6145e441dede75ea6f128b47239…

1 0

Releasing Kamailio v5.6.0
by Daniel-Constantin Mierla 23 May '22

23 May '22

Hello, with some effort directed lately to convert the wiki content to markdown files and host them on github, it's time to now to nail down the path to release nest major release for Kamailio, respectively v5.6.0. What's new in this major release as well as upgrade guidelines have to be built, but I hope to be done in time to release Kamailio v5.6.0 either on Monday, June 23, 2022 or on Wednesday, June 25, 2022. Should anyone consider a different release planning, let's discuss it. If anyone wants to help with them, the content has to be added to the github wiki repository: * https://github.com/kamailio/kamailio-wiki If not there, new files have to be created and linked from the main page. The wiki is built with mkdocs into html and made available for browsing at: * https://kamailio.org/wikidocs/ Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online: June 20-23, 2022 * https://www.asipto.com/sw/kamailio-advanced-training-online/

2 3

git:5.6:88786b40: INSTALL, README: updated version and links
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 88786b402cbeb4a7d2261ed198c0927cec79e362 URL: https://github.com/kamailio/kamailio/commit/88786b402cbeb4a7d2261ed198c0927… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T08:19:00+02:00 INSTALL, README: updated version and links (cherry picked from commit 8718fb447b0d5d53a0eeb5b21ed6f8d1766cb21b) --- Modified: INSTALL Modified: README Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/88786b402cbeb4a7d2261ed198c0927… Patch: https://github.com/kamailio/kamailio/commit/88786b402cbeb4a7d2261ed198c0927… --- diff --git a/INSTALL b/INSTALL index 7982d1d380..4f7f87a408 100644 --- a/INSTALL +++ b/INSTALL @@ -3,7 +3,7 @@ Kamailio SIP Server Installation Notes - http://www.kamailio.org + https://www.kamailio.org ================================================== @@ -16,7 +16,7 @@ You can find a similar tutorial and many more on project's web site: - https://www.kamailio.org/w/documentation/ - - https://www.kamailio.org/wiki/ + - https://www.kamailio.org/wikidocs/ Table of Contents diff --git a/README b/README index 957361df15..6d22d5d941 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ -Kamailio v5.5 +Kamailio v5.6 ============= https://www.kamailio.org @@ -67,7 +67,7 @@ III. Getting started The documentation wiki is an important source of tutorials for installing and understanding how Kamailio works: - * https://www.kamailio.org/wiki/ + * https://www.kamailio.org/wikidocs/ The INSTALL document provides more details and guidelines that will help with the installation. @@ -93,7 +93,7 @@ both developer teams. During the development of the release 4.0, autumn-winter of 2012, the merger of the products was completed and a unified product was released. -See http://www.kamailio.org/ for the story of SER, OpenSER and Kamailio. +See https://www.kamailio.org/ for the story of SER, OpenSER and Kamailio. V. Obtaining Help ================= @@ -126,7 +126,7 @@ For code contributions, follow the suggestions provided at: The recommended way to contribute code is via pull requests to Kamailio project on Github: - * httpss://github.com/kamailio + * https://github.com/kamailio VII. More Information ===================== diff --git a/README.md b/README.md index c20510bdfd..f32245dda2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Project Website: - * http://www.kamailio.org + * https://www.kamailio.org [20 Years Of Kamailio Development: Sep 3, 2001 - Sep 3, 2021](https://www.kamailio.org/w/2021/09/kamailio-20-years-of-development/) @@ -57,7 +57,7 @@ The online documentation for modules in the latest stable branch: The wiki collects a consistent number of tutorials, the indexes for variables, functions and parameters: - * https://www.kamailio.org/wiki/ + * https://www.kamailio.org/wikidocs/ Please read the README file in the source code, one per module. @@ -65,14 +65,14 @@ Please read the README file in the source code, one per module. Step by step tutorials to install Kamailio from source code are available at: - * https://www.kamailio.org/wiki/start#installation + * https://www.kamailio.org/wikidocs/#installation Please read the INSTALL file from the source code for more information. Repositories for Linux packages: - * deb: https://www.kamailio.org/wiki/packages/debs - * rpm: https://www.kamailio.org/wiki/packages/rpms + * deb: https://www.kamailio.org/wikidocs/packages/debs + * rpm: https://www.kamailio.org/wikidocs/packages/rpms ## Issues And Bug Reports

1 0

git:5.6:9b8f927f: tm: fix kemi t_relay_to_proto() variants for tls
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 9b8f927f613f1666af19347b928a099a208a8d71 URL: https://github.com/kamailio/kamailio/commit/9b8f927f613f1666af19347b928a099… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T08:07:03+02:00 tm: fix kemi t_relay_to_proto() variants for tls (cherry picked from commit 1f7e894f5b293f97dc99e1b7e5d06159f91a96f7) --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/9b8f927f613f1666af19347b928a099… Patch: https://github.com/kamailio/kamailio/commit/9b8f927f613f1666af19347b928a099… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 69defa1f26..b6fcc96681 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2930,7 +2930,7 @@ static int ki_t_relay_to_proto(sip_msg_t *msg, str *sproto) proto = PROTO_UDP; } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { proto = PROTO_TCP; - } else if (strncasecmp(sproto->s, "TLS", 3)) { + } else if (strncasecmp(sproto->s, "TLS", 3) == 0) { proto = PROTO_TLS; } else { LM_ERR("bad protocol specified <%s>\n", sproto->s); @@ -2955,7 +2955,7 @@ static int ki_t_relay_to_proto_addr(sip_msg_t *msg, str *sproto, str *host, int proto = PROTO_UDP; } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { proto = PROTO_TCP; - } else if (strncasecmp(sproto->s, "TLS", 3)) { + } else if (strncasecmp(sproto->s, "TLS", 3) == 0) { proto = PROTO_TLS; } else { LM_ERR("bad protocol specified <%s>\n", sproto->s);

1 0

git:5.6:76acfb71: core: mod fixup helpers for params sequence str, str, int
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 76acfb717fac8fa8a960c0e830998d9db9909ccf URL: https://github.com/kamailio/kamailio/commit/76acfb717fac8fa8a960c0e830998d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T08:07:55+02:00 core: mod fixup helpers for params sequence str, str, int (cherry picked from commit 5e4576a54e7783b1ee8fde6af7919232a5e207c4) --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/76acfb717fac8fa8a960c0e830998d9… Patch: https://github.com/kamailio/kamailio/commit/76acfb717fac8fa8a960c0e830998d9… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 325e3d117b..925048d940 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -801,6 +801,38 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen) return -1; } +/** + * + */ +int fixup_ssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_spve_null(param, 1); + case 3: + return fixup_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_ssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_free_spve_null(param, 1); + case 3: + return fixup_free_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index ca63a5a804..8c2c766c1e 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -163,6 +163,9 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen); int fixup_igp_regexp(void** param, int param_no); int fixup_free_igp_regexp(void** param, int param_no); +int fixup_ssi(void** param, int param_no); +int fixup_free_ssi(void** param, int param_no); + int fixup_sssi(void** param, int param_no); int fixup_free_sssi(void** param, int param_no);

1 0

git:master:8718fb44: INSTALL, README: updated version and links
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: master Commit: 8718fb447b0d5d53a0eeb5b21ed6f8d1766cb21b URL: https://github.com/kamailio/kamailio/commit/8718fb447b0d5d53a0eeb5b21ed6f8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T08:18:04+02:00 INSTALL, README: updated version and links --- Modified: INSTALL Modified: README Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/8718fb447b0d5d53a0eeb5b21ed6f8d… Patch: https://github.com/kamailio/kamailio/commit/8718fb447b0d5d53a0eeb5b21ed6f8d… --- diff --git a/INSTALL b/INSTALL index 7982d1d380..4f7f87a408 100644 --- a/INSTALL +++ b/INSTALL @@ -3,7 +3,7 @@ Kamailio SIP Server Installation Notes - http://www.kamailio.org + https://www.kamailio.org ================================================== @@ -16,7 +16,7 @@ You can find a similar tutorial and many more on project's web site: - https://www.kamailio.org/w/documentation/ - - https://www.kamailio.org/wiki/ + - https://www.kamailio.org/wikidocs/ Table of Contents diff --git a/README b/README index 957361df15..6d22d5d941 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ -Kamailio v5.5 +Kamailio v5.6 ============= https://www.kamailio.org @@ -67,7 +67,7 @@ III. Getting started The documentation wiki is an important source of tutorials for installing and understanding how Kamailio works: - * https://www.kamailio.org/wiki/ + * https://www.kamailio.org/wikidocs/ The INSTALL document provides more details and guidelines that will help with the installation. @@ -93,7 +93,7 @@ both developer teams. During the development of the release 4.0, autumn-winter of 2012, the merger of the products was completed and a unified product was released. -See http://www.kamailio.org/ for the story of SER, OpenSER and Kamailio. +See https://www.kamailio.org/ for the story of SER, OpenSER and Kamailio. V. Obtaining Help ================= @@ -126,7 +126,7 @@ For code contributions, follow the suggestions provided at: The recommended way to contribute code is via pull requests to Kamailio project on Github: - * httpss://github.com/kamailio + * https://github.com/kamailio VII. More Information ===================== diff --git a/README.md b/README.md index c20510bdfd..f32245dda2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Project Website: - * http://www.kamailio.org + * https://www.kamailio.org [20 Years Of Kamailio Development: Sep 3, 2001 - Sep 3, 2021](https://www.kamailio.org/w/2021/09/kamailio-20-years-of-development/) @@ -57,7 +57,7 @@ The online documentation for modules in the latest stable branch: The wiki collects a consistent number of tutorials, the indexes for variables, functions and parameters: - * https://www.kamailio.org/wiki/ + * https://www.kamailio.org/wikidocs/ Please read the README file in the source code, one per module. @@ -65,14 +65,14 @@ Please read the README file in the source code, one per module. Step by step tutorials to install Kamailio from source code are available at: - * https://www.kamailio.org/wiki/start#installation + * https://www.kamailio.org/wikidocs/#installation Please read the INSTALL file from the source code for more information. Repositories for Linux packages: - * deb: https://www.kamailio.org/wiki/packages/debs - * rpm: https://www.kamailio.org/wiki/packages/rpms + * deb: https://www.kamailio.org/wikidocs/packages/debs + * rpm: https://www.kamailio.org/wikidocs/packages/rpms ## Issues And Bug Reports

1 0

[kamailio/kamailio] [kamailio 5.6.0~rc1] Possible regression for {s.int} (Issue #3116)
by George Diamantopoulos 22 May '22

22 May '22

### Description I noticed at least one regression while testing out kamailio 5.6.0: the same configuration yields a different result after upgrading from 5.5.4. More specifically, this xlog line/statement: ``` xlog("L_CRIT", "vn is $vn(cli_164_src_noccgr), to int is $(vn(cli_164_src_noccgr){s.int})\n"); ``` Prints the following in syslog for `$vn(cli_164_src_noccgr) = "2152157200"`: * On 5.5.4: `vn is 2152157200, to int is 2152157200` * On 5.6.0~rc1: `vn is 2152157200, to int is` I've only tested this with a couple of values and it doesn't always happen, for example for `$vn(cli_164_src_noccgr) = "2103260000"` the issue doesn't manifest. Only thing I could think of is 2103260000 can be represented (unsigned) by 31 bits, whereas you need 32 bits for 2152157200? I skimmed over pv_trans.c and there weren't any obvious commits that could take the blame, at least not to me. Perhaps this is a compiler/glibc thing? ### Troubleshooting #### Reproduction Try the transformation above with various values for the pseudovariable being transformed, I guess.  ### Additional Information ``` version: kamailio 5.6.0-rc1 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 ``` * **Operating System**: ``` Linux sbcprov0-stage-lhe0-cn1 5.10.0-10-amd64 #1 SMP Debian 5.10.84-1 (2021-12-08) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3116 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3116(a)github.com>

3 7

git:master:bed6bba7: dialog: fix ki_dlg_get_var() introduced previously
by Daniel-Constantin Mierla 21 May '22

21 May '22

Module: kamailio Branch: master Commit: bed6bba77a16ec1a840544d674d03d692869c68e URL: https://github.com/kamailio/kamailio/commit/bed6bba77a16ec1a840544d674d03d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-21T08:23:37+02:00 dialog: fix ki_dlg_get_var() introduced previously --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/bed6bba77a16ec1a840544d674d03d6… Patch: https://github.com/kamailio/kamailio/commit/bed6bba77a16ec1a840544d674d03d6… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 5347c0fa1d..6668712dc3 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1549,14 +1549,14 @@ static sr_kemi_xval_t *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, memset(&_sr_kemi_dialog_xval, 0, sizeof(sr_kemi_xval_t)); - val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); + val = ki_dlg_get_var_helper(msg, sc, sf, st, key); if(!val) { sr_kemi_xval_null(&_sr_kemi_dialog_xval, SR_KEMI_XVAL_NULL_NONE); return &_sr_kemi_dialog_xval; } _sr_kemi_dialog_xval.vtype = SR_KEMIP_STR; - _sr_kemi_dialog_xval.v.s = *pval; + _sr_kemi_dialog_xval.v.s = *val; return &_sr_kemi_dialog_xval;

1 0

[kamailio/kamailio] core: const correctness (PR #3120)
by liviu-rolo 20 May '22

20 May '22

benign const qualifiers in inline functions   #### 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/3120 -- Commit Summary -- * core: const correctness -- File Changes -- M src/core/ip_addr.h (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3120.patch https://github.com/kamailio/kamailio/pull/3120.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3120 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3120(a)github.com>

4 8

Re: [sr-dev] [kamailio/kamailio] Run failed: build - master (130ce1b)
by Henning Westerholt 20 May '22

20 May '22

Hello, this seems to be caused from 7c347e244cf761d0: dialog.c: In function ‘ki_dlg_get_var’: dialog.c:1552:51: error: ‘k’ undeclared (first use in this function) 1552 | val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); | ^ dialog.c:1552:51: note: each undeclared identifier is reported only once for each function it appears in dialog.c:1552:35: warning: passing argument 2 of ‘ki_dlg_get_var_helper’ from incompatible pointer type [-Wincompatible-pointer-types] 1552 | val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); | ^~~ [..] make[2]: *** [../../Makefile.rules:100: dialog.o] Error 1 Cheers, Henning From: Henning Westerholt <notifications(a)github.com> Sent: Friday, May 20, 2022 6:42 PM To: Kamailio Devel List <sr-dev(a)lists.sip-router.org> Cc: Ci activity <ci_activity(a)noreply.github.com> Subject: [kamailio/kamailio] Run failed: build - master (130ce1b) [GitHub] [kamailio/kamailio] build workflow run [https://github.githubassets.com/images/email/icons/actions.png] build: Some jobs were not successful View workflow run<https://github.com/kamailio/kamailio/actions/runs/2359532599> [build (bullseye, gcc)] build / build (bullseye, gcc) Failed in 2 minutes and 29 seconds [annotations for build / build (bullseye, gcc)]11 <https://github.com/kamailio/kamailio/actions/runs/2359532599> [build (bullseye, clang)] build / build (bullseye, clang) Cancelled [annotations for build / build (bullseye, clang)]2 <https://github.com/kamailio/kamailio/actions/runs/2359532599> [build (sid, gcc)] build / build (sid, gcc) Failed in 2 minutes and 35 seconds [annotations for build / build (sid, gcc)]13 <https://github.com/kamailio/kamailio/actions/runs/2359532599> [build (sid, clang)] build / build (sid, clang) Cancelled [annotations for build / build (sid, clang)]2 <https://github.com/kamailio/kamailio/actions/runs/2359532599> — You are receiving this because this workflow ran on your branch. Manage your GitHub Actions notifications<https://github.com/settings/notifications> GitHub, Inc. ・88 Colin P Kelly Jr Street ・San Francisco, CA 94107

1 0

git:master:130ce1bf: core: const correctness
by Henning Westerholt 20 May '22

20 May '22

Module: kamailio Branch: master Commit: 130ce1bf871cfb4a89bcf0cc74d898f84eeaa981 URL: https://github.com/kamailio/kamailio/commit/130ce1bf871cfb4a89bcf0cc74d898f… Author: Liviu Andron <liviu.andron(a)bjtmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-20T18:38:54+02:00 core: const correctness benign const qualifiers in inline functions --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/130ce1bf871cfb4a89bcf0cc74d898f… Patch: https://github.com/kamailio/kamailio/commit/130ce1bf871cfb4a89bcf0cc74d898f… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 2f7770f81d..88c0e0205e 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -301,7 +301,7 @@ int is_mcast(struct ip_addr* ip); /* returns 1 if the given ip address is INADDR_ANY or IN6ADDR_ANY, * 0 otherwise */ -inline static int ip_addr_any(struct ip_addr* ip) +inline static int ip_addr_any(const struct ip_addr* ip) { int r; int l; @@ -316,7 +316,7 @@ inline static int ip_addr_any(struct ip_addr* ip) /* returns 1 if the given ip address is a loopback address * 0 otherwise */ -inline static int ip_addr_loopback(struct ip_addr* ip) +inline static int ip_addr_loopback(const struct ip_addr* ip) { if (ip->af==AF_INET) return ip->u.addr32[0]==htonl(INADDR_LOOPBACK); @@ -352,7 +352,7 @@ inline static void ip_addr_mk_any(int af, struct ip_addr* ip) /* returns 1 if ip & net.mask == net.ip ; 0 otherwise & -1 on error * [ diff. address families ]) */ -inline static int matchnet(struct ip_addr* ip, struct net* net) +inline static int matchnet(const struct ip_addr* ip, const struct net* net) { unsigned int r; @@ -371,7 +371,7 @@ inline static int matchnet(struct ip_addr* ip, struct net* net) /* inits an ip_addr pointer from a sockaddr structure*/ -static inline void sockaddr2ip_addr(struct ip_addr* ip, struct sockaddr* sa) +static inline void sockaddr2ip_addr(struct ip_addr* ip, const struct sockaddr* sa) { switch(sa->sa_family){ case AF_INET: @@ -447,7 +447,7 @@ static inline void su_setport(union sockaddr_union* su, unsigned short port) /* inits an ip_addr pointer from a sockaddr_union ip address */ -static inline void su2ip_addr(struct ip_addr* ip, union sockaddr_union* su) +static inline void su2ip_addr(struct ip_addr* ip, const union sockaddr_union* su) { switch(su->s.sa_family){ case AF_INET: @@ -595,7 +595,7 @@ struct hostent* ip_addr2he(str* name, struct ip_addr* ip); /* init a dest_info structure from a recv_info structure */ inline static void init_dst_from_rcv(struct dest_info* dst, - struct receive_info* rcv) + const struct receive_info* rcv) { dst->send_sock=rcv->bind_address; dst->to=rcv->src_su;

1 0

git:master:7c347e24: dialog: reworked kemi export for dlg_get_var()
by Daniel-Constantin Mierla 20 May '22

20 May '22

Module: kamailio Branch: master Commit: 7c347e244cf761d04d5aff906e88571cd68217f3 URL: https://github.com/kamailio/kamailio/commit/7c347e244cf761d04d5aff906e88571… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T16:07:56+02:00 dialog: reworked kemi export for dlg_get_var() - return SR_KEMIP_XVAL type --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/7c347e244cf761d04d5aff906e88571… Patch: https://github.com/kamailio/kamailio/commit/7c347e244cf761d04d5aff906e88571… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index b169dc2d26..5347c0fa1d 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1511,7 +1511,7 @@ static int fixup_dlg_bridge(void** param, int param_no) return 0; } -static str *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) +static str *ki_dlg_get_var_helper(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) { dlg_cell_t *dlg = NULL; unsigned int dir = 0; @@ -1538,6 +1538,30 @@ static str *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) return val; } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_dialog_xval = {0}; + +static sr_kemi_xval_t *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) +{ + str *val = NULL; + + memset(&_sr_kemi_dialog_xval, 0, sizeof(sr_kemi_xval_t)); + + val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); + if(!val) { + sr_kemi_xval_null(&_sr_kemi_dialog_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_dialog_xval; + } + + _sr_kemi_dialog_xval.vtype = SR_KEMIP_STR; + _sr_kemi_dialog_xval.v.s = *pval; + + return &_sr_kemi_dialog_xval; + +} + static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char *key, char *pv) { str sc = STR_NULL; @@ -1582,7 +1606,7 @@ static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char return -1; } dst_pv = (pv_spec_t *)pv; - val = ki_dlg_get_var(msg, &sc, &sf, &st, &k); + val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); if(val) { memset(&dst_val, 0, sizeof(pv_value_t)); dst_val.flags |= PV_VAL_STR; @@ -2155,11 +2179,6 @@ static int ki_dlg_var_sets(sip_msg_t *msg, str *name, str *val) return (ret==0)?1:ret; } -/** - * - */ -static sr_kemi_xval_t _sr_kemi_dialog_xval = {0}; - /** * */ @@ -2289,7 +2308,7 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("dialog"), str_init("dlg_get_var"), - SR_KEMIP_STR, ki_dlg_get_var, + SR_KEMIP_XVAL, ki_dlg_get_var, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:3efc0c10: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 20 May '22

20 May '22

Module: kamailio Branch: master Commit: 3efc0c1093ed3c9b5a11e40e4ccc65c93f4627a4 URL: https://github.com/kamailio/kamailio/commit/3efc0c1093ed3c9b5a11e40e4ccc65c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-20T13:31:17+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/3efc0c1093ed3c9b5a11e40e4ccc65c… Patch: https://github.com/kamailio/kamailio/commit/3efc0c1093ed3c9b5a11e40e4ccc65c… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 22483876ad..bf0a663710 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -96,6 +96,7 @@ Bogdan-Andre Iancu 4.9. reg_fetch_contacts(domain, uri, profile) 4.10. reg_free_contacts(profile) 4.11. reg_send_reply() + 4.12. reg_from_user(ultable, uri, mode) 5. Event Routes @@ -162,8 +163,9 @@ Bogdan-Andre Iancu 1.43. reg_fetch_contacts usage 1.44. reg_free_contacts usage 1.45. reg_send_reply usage - 1.46. event_route[usrloc:contact-expired] usage - 1.47. $ulc(name) usage + 1.46. reg_from_user usage + 1.47. event_route[usrloc:contact-expired] usage + 1.48. $ulc(name) usage Chapter 1. Admin Guide @@ -230,6 +232,7 @@ Chapter 1. Admin Guide 4.9. reg_fetch_contacts(domain, uri, profile) 4.10. reg_free_contacts(profile) 4.11. reg_send_reply() + 4.12. reg_from_user(ultable, uri, mode) 5. Event Routes @@ -991,6 +994,7 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 4.9. reg_fetch_contacts(domain, uri, profile) 4.10. reg_free_contacts(profile) 4.11. reg_send_reply() + 4.12. reg_from_user(ultable, uri, mode) 4.1. save(domain, [, flags [, uri]]) @@ -1293,6 +1297,30 @@ save("location", "0x2"); reg_send_reply(); ... +4.12. reg_from_user(ultable, uri, mode) + + The function returns true if the SIP message comes from the user + identified by 'uri' parameter by matching the associated location + records. The matching is done with the field 'received' if it is set, + otherwise with the contact address. + + Meaning of the parameters is as follows: + * ultable - user location table (e.g., 'location') + * uri - SIP URI to identify the location records to match against. + * mode - matching mode (int) - host part (IP address) is matched + always. If mode has bit 1 set (value 1), then the port is matched + as well. If mode has bit 2 set (value 2), then the protocol is + matched as well. + + This function can be used from ANY_ROUTE. + + Example 1.46. reg_from_user usage +... +if(reg_from_user("location", "sip:alice@server.com", "0")) { + # message coming from where 'alice' sent before a REGISTER request +} +... + 5. Event Routes 5.1. event_route[usrloc:contact-expired] @@ -1302,7 +1330,7 @@ reg_send_reply(); Executed when a contact in location table has expired. The variable $ulc(exp=>...) is filled with the attributes of the expired contact. - Example 1.46. event_route[usrloc:contact-expired] usage + Example 1.47. event_route[usrloc:contact-expired] usage ... event_route[usrloc:contact-expired] { xlog("expired contact for $ulc(exp=>aor)\n"); @@ -1376,7 +1404,7 @@ event_route[usrloc:contact-expired] { The pseudo-variable accepts positive index value to access a specific contact record. - Example 1.47. $ulc(name) usage + Example 1.48. $ulc(name) usage ... if(reg_fetch_contacts("location", "$fu", "caller")) {

1 0

git:master:5e4576a5: core: mod fixup helpers for params sequence str, str, int
by Daniel-Constantin Mierla 20 May '22

20 May '22

Module: kamailio Branch: master Commit: 5e4576a54e7783b1ee8fde6af7919232a5e207c4 URL: https://github.com/kamailio/kamailio/commit/5e4576a54e7783b1ee8fde6af791923… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T13:15:43+02:00 core: mod fixup helpers for params sequence str, str, int --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/5e4576a54e7783b1ee8fde6af791923… Patch: https://github.com/kamailio/kamailio/commit/5e4576a54e7783b1ee8fde6af791923… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 325e3d117b..925048d940 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -801,6 +801,38 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen) return -1; } +/** + * + */ +int fixup_ssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_spve_null(param, 1); + case 3: + return fixup_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_ssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_free_spve_null(param, 1); + case 3: + return fixup_free_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index ca63a5a804..8c2c766c1e 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -163,6 +163,9 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen); int fixup_igp_regexp(void** param, int param_no); int fixup_free_igp_regexp(void** param, int param_no); +int fixup_ssi(void** param, int param_no); +int fixup_free_ssi(void** param, int param_no); + int fixup_sssi(void** param, int param_no); int fixup_free_sssi(void** param, int param_no);

1 0

git:master:005e8afe: registrar: added function reg_from_user(ultable, uri, mode)
by Daniel-Constantin Mierla 20 May '22

20 May '22

Module: kamailio Branch: master Commit: 005e8afeb6a9297bd9c752c6daaa0d99f6b4eaad URL: https://github.com/kamailio/kamailio/commit/005e8afeb6a9297bd9c752c6daaa0d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T13:17:24+02:00 registrar: added function reg_from_user(ultable, uri, mode) - return true if the message came from the user identified uri parameter by matching agains its location records --- Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/regpv.c Modified: src/modules/registrar/regpv.h --- Diff: https://github.com/kamailio/kamailio/commit/005e8afeb6a9297bd9c752c6daaa0d9… Patch: https://github.com/kamailio/kamailio/commit/005e8afeb6a9297bd9c752c6daaa0d9…

1 0

git:master:f0bf4ceb: registrar: docs for reg_from_user() function
by Daniel-Constantin Mierla 20 May '22

20 May '22

Module: kamailio Branch: master Commit: f0bf4cebef916887cd5196dce0521d4784904ab8 URL: https://github.com/kamailio/kamailio/commit/f0bf4cebef916887cd5196dce0521d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T13:26:00+02:00 registrar: docs for reg_from_user() function --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f0bf4cebef916887cd5196dce0521d4… Patch: https://github.com/kamailio/kamailio/commit/f0bf4cebef916887cd5196dce0521d4… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index d8a3c88b57..c402ab4b20 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1813,6 +1813,52 @@ save("location", "0x2"); ... reg_send_reply(); ... +</programlisting> + </example> + </section> + <section id="registrar.f.reg_from_user"> + <title> + <function moreinfo="none">reg_from_user(ultable, uri, mode)</function> + </title> + <para> + The function returns true if the SIP message comes from the user + identified by 'uri' parameter by matching the associated location + records. The matching is done with the field 'received' if it is set, + otherwise with the contact address. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>ultable</emphasis> - user location table (e.g., 'location') + </para> + </listitem> + <listitem> + <para> + <emphasis>uri</emphasis> - SIP URI to identify the location records + to match against. + </para> + </listitem> + <listitem> + <para> + <emphasis>mode</emphasis> - matching mode (int) - host part (IP address) + is matched always. If mode has bit 1 set (value 1), then the port is + matched as well. If mode has bit 2 set (value 2), then the protocol + is matched as well. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>reg_from_user</function> usage</title> + <programlisting format="linespecific"> +... +if(reg_from_user("location", "sip:alice@server.com", "0")) { + # message coming from where 'alice' sent before a REGISTER request +} +... </programlisting> </example> </section>

1 0

git:master:fce806b5: kazoo: proper print formater %.*s instead of %*.s
by Daniel-Constantin Mierla 20 May '22

20 May '22

Module: kamailio Branch: master Commit: fce806b5715286fa15148bbb8117ff3b9b4d0897 URL: https://github.com/kamailio/kamailio/commit/fce806b5715286fa15148bbb8117ff3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T09:50:27+02:00 kazoo: proper print formater %.*s instead of %*.s --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/fce806b5715286fa15148bbb8117ff3… Patch: https://github.com/kamailio/kamailio/commit/fce806b5715286fa15148bbb8117ff3… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 15d5b259a1..c7088a3c71 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1340,7 +1340,7 @@ int kz_amqp_async_query_ex(struct sip_msg* msg, char* _exchange, char* _routing_ json_obj = json_tokener_parse(json_s.s); if (json_obj==NULL) { - LM_ERR("empty or invalid JSON payload : %*.s\n", json_s.len, json_s.s); + LM_ERR("empty or invalid JSON payload : %.*s\n", json_s.len, json_s.s); goto error; } @@ -1499,7 +1499,7 @@ int kz_amqp_query_ex(struct sip_msg* msg, char* exchange, char* routing_key, cha struct json_object *j = json_tokener_parse(json_s.s); if (j==NULL) { - LM_ERR("empty or invalid JSON payload : %*.s\n", json_s.len, json_s.s); + LM_ERR("empty or invalid JSON payload : %.*s\n", json_s.len, json_s.s); return -1; }

1 0

git:master:18972def: seas: proper print formater %.*s instead of %*.s
by Daniel-Constantin Mierla 20 May '22

20 May '22

Module: kamailio Branch: master Commit: 18972def7a21506088988c1011b8aa6f13e1b8a9 URL: https://github.com/kamailio/kamailio/commit/18972def7a21506088988c1011b8aa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T09:51:44+02:00 seas: proper print formater %.*s instead of %*.s --- Modified: src/modules/seas/encode_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/18972def7a21506088988c1011b8aa6… Patch: https://github.com/kamailio/kamailio/commit/18972def7a21506088988c1011b8aa6… --- diff --git a/src/modules/seas/encode_msg.c b/src/modules/seas/encode_msg.c index 1a99c22e26..e496397888 100644 --- a/src/modules/seas/encode_msg.c +++ b/src/modules/seas/encode_msg.c @@ -324,7 +324,7 @@ int print_encoded_msg(FILE* fd,char *code,char *prefix) fprintf(fd,"MESSAGE:\n[%.*s]\n",msglen,msg); r=(i<100)?1:0; if(r){ - fprintf(fd,"%sREQUEST CODE=%d==%.*s,URI=%.*s,VERSION=%*.s\n",prefix,i, + fprintf(fd,"%sREQUEST CODE=%d==%.*s,URI=%.*s,VERSION=%.*s\n",prefix,i, payload[METHOD_CODE_IDX+1],&msg[payload[METHOD_CODE_IDX]], payload[URI_REASON_IDX+1],&msg[payload[URI_REASON_IDX]], payload[VERSION_IDX+1],&msg[payload[VERSION_IDX]]);

1 0

[kamailio/kamailio] TOPOS + RE-INVITE problem - Contact IP not updated (Issue #3118)
by chris-issy 19 May '22

19 May '22

It seems that TOPOS is not working properly on RE-INVITE and stop masking IP and contact on some RE-INVITE. When a RE-INVITE is send with Kamailio IP as Request-URI TOPOS is not operating. Note : we are using the HTABLE trick to rewrite $ru and match the call but we would need to have TOPOS re-evaluating the dialog once done. We use a standard configuration with 2 modifications. 1) in route[DISPATCH] to set the HTABLE if(is_method("INVITE")) { $sht(ct=>$ci::$ft) = $sel(contact.uri); } 2) in route[WITHINDLG] to find the call if R-URI = myself if(has_totag() && uri==myself) { if($sht(ct=>$ci::$ft) != $null && $T_reply_code > 400) $shtex(ct=>$ci::$ft) = 10 ; if($sht(ct=>$ci::$tt) != $null) { $ru = $sht(ct=>$ci::$tt); if (is_method("BYE")) $shtex(ct=>$ci::$tt) = 10 ; route(RELAY); } } As you can see in the PCAP the RE-INVITE goes directly to calling stating with the Contact not updated and the 200 OK is also sent to called party with wrong Contact info too. [topos-issue.zip](https://github.com/kamailio/kamailio/files/8730489/topos-i… This behavior breaks the BYE procedure. Any advice ? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3118 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3118(a)github.com>

2 2

[kamailio/kamailio] Added an equal 0 on TLS test on kemi t_relay_to_proto functions. (Issue #3111)
by hallthmann 18 May '22

18 May '22

### Description  module: tm kemi proto relay functions fails on TLS: - ki_t_relay_to_proto - ki_t_relay_to_proto_addr ### Troubleshooting #### Reproduction  #### Debugging Data  ``` ``` #### Log Messages  ``` 13(19) ERROR: {1 1 REGISTER 184193281845942-18001879945554(a)192.168.1.135} tm [tm.c:2934]: ki_t_relay_to_proto(): bad protocol specified <TLS> 13(19) ERROR: {1 1 REGISTER 184193281845942-18001879945554(a)192.168.1.135} sl [sl_funcs.c:414]: sl_reply_error(): stateless error reply used: I'm terribly sorry, server error occurred (1/SL) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  It's missing an equal zero (== 0) on TLS test. Code: tm.c 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("bad protocol specified <%s>\n", sproto->s); return E_UNSPEC; } Fix: 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) == 0) { proto = PROTO_TLS; } else { LM_ERR("bad protocol specified <%s>\n", sproto->s); return E_UNSPEC; } ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.0 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES 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 ``` * **Operating System**:  ``` No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 8.11 (jessie) Release: 8.11 Codename: jessie Linux routersip 4.18.0-348.el8.0.2.x86_64 #1 SMP Sun Nov 14 00:51:12 UTC 2021 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3111 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3111(a)github.com>

2 3

git:5.6:ce68e763: siprepo: set name for timer function
by Daniel-Constantin Mierla 18 May '22

18 May '22

Module: kamailio Branch: 5.6 Commit: ce68e763a5115d0f98bddac8c329ee6626581543 URL: https://github.com/kamailio/kamailio/commit/ce68e763a5115d0f98bddac8c329ee6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-18T09:20:30+02:00 siprepo: set name for timer function (cherry picked from commit 81265e41b52cfda9a284233c93683522a98f0a64) --- Modified: src/modules/siprepo/siprepo_data.c --- Diff: https://github.com/kamailio/kamailio/commit/ce68e763a5115d0f98bddac8c329ee6… Patch: https://github.com/kamailio/kamailio/commit/ce68e763a5115d0f98bddac8c329ee6… --- diff --git a/src/modules/siprepo/siprepo_data.c b/src/modules/siprepo/siprepo_data.c index f4e4d71a94..1b498f5daa 100644 --- a/src/modules/siprepo/siprepo_data.c +++ b/src/modules/siprepo/siprepo_data.c @@ -505,7 +505,7 @@ int siprepo_msg_async_pull(str *callid, str *msgid, str *gname, str *rname, /** * */ -void siprepo_timer_exec(unsigned int ticks, int worker, void *param) +void siprepo_msg_timer(unsigned int ticks, int worker, void *param) { time_t tnow; int i;

1 0

git:master:81265e41: siprepo: set name for timer function
by Daniel-Constantin Mierla 18 May '22

18 May '22

Module: kamailio Branch: master Commit: 81265e41b52cfda9a284233c93683522a98f0a64 URL: https://github.com/kamailio/kamailio/commit/81265e41b52cfda9a284233c9368352… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-18T09:19:11+02:00 siprepo: set name for timer function --- Modified: src/modules/siprepo/siprepo_data.c --- Diff: https://github.com/kamailio/kamailio/commit/81265e41b52cfda9a284233c9368352… Patch: https://github.com/kamailio/kamailio/commit/81265e41b52cfda9a284233c9368352… --- diff --git a/src/modules/siprepo/siprepo_data.c b/src/modules/siprepo/siprepo_data.c index f4e4d71a94..1b498f5daa 100644 --- a/src/modules/siprepo/siprepo_data.c +++ b/src/modules/siprepo/siprepo_data.c @@ -505,7 +505,7 @@ int siprepo_msg_async_pull(str *callid, str *msgid, str *gname, str *rname, /** * */ -void siprepo_timer_exec(unsigned int ticks, int worker, void *param) +void siprepo_msg_timer(unsigned int ticks, int worker, void *param) { time_t tnow; int i;

1 0

Re: [sr-dev] [SR-Users] Path MTU issues over UDP/IPv6
by Henning Westerholt 17 May '22

17 May '22

(sr-dev on CC) Hello, I am not aware of a special handling of MTU discovery regarding IPv6 UDP traffic in Kamailio core. But of course, we have a lot of code. You find the implementation of the MTU handling in the src/core/udp_server.c file. Its just setting the appropriate socket option right now. Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com -----Original Message----- From: sr-users <sr-users-bounces(a)lists.kamailio.org> On Behalf Of Rick van Rein Sent: Thursday, May 12, 2022 1:31 PM To: sr-users(a)lists.kamailio.org Subject: [SR-Users] Path MTU issues over UDP/IPv6 Hello, IPv6 routers never fragment packets. Rather, they drop a packet that is too large for a (local) MTU and send back ICMPv6 "Packet Too Big". This seems to cause loss of larger SIP messages when an ISP tunnels their IPv6 at the expense of the MTU. The pmtu_discovery flag sets Don't Fragment in IPv4 traffic; in IPv6 this is an implied property. Does Kamailio learn a lower MTU from any "Packet Too Big" for IPv6 even if pmtu_discovery is not set? Future resends can then be fragemented appropriately. The udp_mtu setting diverts to another protocol, but that would be a setting as low as the worst peer, impacting all. It would be a weird struggle with a telco serving many. PMTU would be better to rely on, but how does it work in Kamailio? Details on https://www.rfc-editor.org/rfc/rfc3542#section-11.3 https://stackoverflow.com/questions/38817837/how-does-mtu-retransmission-wo… Thanks, -Rick __________________________________________________________ Kamailio - Users Mailing List - Non Commercial Discussions * sr-users(a)lists.kamailio.org Important: keep the mailing list in the recipients, do not reply only to the sender! Edit mailing list options or unsubscribe: * https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users

1 0

[kamailio/kamailio] pv: log uninit () (PR #3114)
by Stefan Mititelu 17 May '22

17 May '22

#### 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  We've come into the rare issue when a kamailio process used the old $var() value for the current request message and messed some things up. LOG_WARN when $var() is used uninitialized in config. I can also just LOG_NOTICE this. Can this be brought to 5.6? Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3114 -- Commit Summary -- * pv: log uninit () -- File Changes -- M src/modules/pv/pv_core.c (9) M src/modules/pv/pv_svar.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3114.patch https://github.com/kamailio/kamailio/pull/3114.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3114 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3114(a)github.com>

4 15

git:master:9051033a: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 17 May '22

17 May '22

Module: kamailio Branch: master Commit: 9051033ac04fc94a0f19f8fbec6ec507fa6ab8d1 URL: https://github.com/kamailio/kamailio/commit/9051033ac04fc94a0f19f8fbec6ec50… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-17T12:46:29+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/9051033ac04fc94a0f19f8fbec6ec50… Patch: https://github.com/kamailio/kamailio/commit/9051033ac04fc94a0f19f8fbec6ec50…

1 0

[kamailio/kamailio] Kamailio segfault in append_branch if q is missing (Issue #3113)
by Mathias Schneuwly 17 May '22

17 May '22

### Description  We are using kamailio with a python_handler. If a call is parallel forked, kamailio segfaults in append_branch (get_str_fparam) because the q parameter is not set. Since the q parameter is optional, we didn't set it. If I set something for q (eg "1"), the forking seems to work fine. I tested the issue with Kamailio 5.2.[238] and 5.5.4. The behavior is equal in all versions. We are using yocto dunfell as OS with compiler option "O2". Interestingly, if I disable the optimization, the forking works even without q parameter. ### Troubleshooting #### Reproduction  The problem is reproducible. As soon as a call is forked to at least two callees, kamailio crashes. #### Debugging Data  ``` (gdb) list 1612 /** Get the function parameter value as string. 1613 * @return 0 - Success 1614 * -1 - Cannot get value 1615 */ 1616 int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) 1617 { 1618 int_str val; 1619 int ret; 1620 avp_t* avp; 1621 pv_value_t pv_val; (gdb) print(param) $1 = (fparam_t *) 0x478a90343ce2286 (gdb) print param->type Cannot access memory at address 0x478a90343ce228e (gdb) bt full #0 0x00005608e9016c0a in get_str_fparam (dst=dst@entry=0x7fffcf4c9a60, msg=msg@entry=0x7fb95740d408, param=param@entry=0x478a90343ce2286) at core/sr_module.c:1617 val = {n = 1451801216, s = { s = 0x7fb95688ba80 "\307\356\370\377\243\356\370\377\226\356\370\377\v\356\370\377\354\356\370\377\027%\371\377\t%\371\377\373$\371\377\355$\371\377d&\371\377j%\371\377\341\355\370\377\341\355\370\377\202\356\370\377\367\355\370\377", len = 1371188816}, re = 0x7fb95688ba80} ret = <optimized out> avp = <optimized out> pv_val = {rs = { s = 0x7fb95688ba80 "\307\356\370\377\243\356\370\377\226\356\370\377\v\356\370\377\354\356\370\377\027%\371\377\t%\371\377\373$\371\377\355$\371\377d&\371\377j%\371\377\341\355\370\377\341\355\370\377\202\356\370\377\367\355\370\377", len = 1371188816}, ri = 1371188816, flags = 32697} __func__ = "get_str_fparam" #1 0x00007fb95708ffca in w_corex_append_branch (msg=0x7fb95740d408, pu=<optimized out>, pq=0x478a90343ce2286) at corex_lib.c:94 uri = {s = 0x7fb951202dc4 "sips:100105@ttel.node-1.ersaimfs.ch", len = 35} qv = {s = 0x0, len = 0} __func__ = "w_corex_append_branch" #2 0x00007fb957088299 in w_append_branch (msg=<optimized out>, su=<optimized out>, sq=<optimized out>) at corex_mod.c:257 No locals. #3 0x00005608e8f5dca6 in do_action (h=h@entry=0x7fffcf4ca060, a=a@entry=0x7fb957322490, msg=0x7fb95740d408) at core/action.c:1079 ret = <optimized out> v = <optimized out> dst = {send_sock = 0x7fb9573224f0, to = {s = {sa_family = 1, sa_data = "\000\000\000\000\000\000\200\376.W\271\177\000"}, sin = {sin_family = 1, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\200\376.W\271\177\000"}, sin6 = {sin6_family = 1, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "\200\376.W\271\177\000\000@\237\003\353\bV\000", __u6_addr16 = {65152, 22318, 32697, 0, 40768, 60163, 22024, 0}, __u6_addr32 = {1462697600, 32697, 3942883136, 22024}}}, sin6_scope_id = 1375836400}, sas = {ss_family = 1, __ss_padding = "\000\000\000\000\000\000\200\376.W\271\177\000\000@\237\003\353\bV\000\000\360\230\001R\271\177\000\000\030i\001\351\bV\000\000P\322\036R\271\177\000\000P\322\036R\271\177\000\000\360$2W\271\177\000\000\345\331\v\351\bV\000\000M\315\020R\271\177\000\000\271\350\225V\271\177\000\000\t\000\000\000\000\000\000\000\200\376.W\271\177\000\000\003\000\000\000\000\000\000\000\002\000\000\000\000\000\000", __ss_align = 140433907209136}}, id = 1377751632, send_flags = {f = 32697, blst_imask = 0}, proto = -16 '\360', proto_pad0 = 90 'Z', proto_pad1 = 20783} tmp = <optimized out> new_uri = <optimized out> end = <optimized out> crt = <optimized out> cmd = <optimized out> len = <optimized out> user = <optimized out> uri = {user = {s = 0x5608eb72eb58 "\220%'Q\271\177", len = 1451402473}, passwd = {s = 0x7fb951abefd0 "p\350\253Q\271\177", len = -817062640}, host = {s = 0x7fb956969d3a ":LM_DBG", len = 0}, port = { s = 0x7fffcf4c9d08 "\021\234\nW\271\177", len = -817062664}, params = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 1451355409}, sip_params = {s = 0x5608eb039f40 "", len = 1494317568}, headers = {s = 0x7fb952248aa0 "\001", len = -817062640}, port_no = 40336, proto = 53068, type = 32767, flags = (unknown: 1494317568), transport = {s = 0x0, len = 1451402473}, ttl = {s = 0x7fffcf4c9d90 "p\230%R\271\177", len = -817062512}, user_param = {s = 0x7fb95696a0ea "s:call_function", len = 0}, maddr = {s = 0x7fffcf4c9d88 "", len = -817062536}, method = { s = 0x7fffcf4c9d08 "\021\234\nW\271\177", len = 1376090576}, lr = {s = 0x0, len = 1494317568}, r2 = {s = 0x7fffcf4c9d10 "", len = -817062512}, gr = {s = 0x7fffcf4c9e10 "#", len = 1460313105}, transport_val = {s = 0x800000 <error: Cannot access memory at address 0x800000>, len = 6509480}, ttl_val = {s = 0x140b88 <error: Cannot access memory at address 0x140b88>, len = 1879128}, user_param_val = {s = 0x1caed0 <error: Cannot access memory at address 0x1caed0>, len = 8}, maddr_val = {s = 0x9 <error: Cannot access memory at address 0x9>, len = 1494317568}, method_val = { s = 0x0, len = -384625558}, lr_val = {s = 0x0, len = 1}, r2_val = {s = 0x7fff00000001 <error: Cannot access memory at address 0x7fff00000001>, len = 139}, gr_val = {s = 0x7fb951be3750 "\001", len = 0}} next_hop = {user = {s = 0x7fb952259870 "\003", len = 1362141712}, passwd = {s = 0x7fb9520579d0 "", len = 2}, host = {s = 0x7fffcf4c9e39 "Tc", len = 1460313105}, port = { s = 0x800000 <error: Cannot access memory at address 0x800000>, len = 6509616}, params = {s = 0x140b68 <error: Cannot access memory at address 0x140b68>, len = 1878992}, sip_params = { s = 0x1caed0 <error: Cannot access memory at address 0x1caed0>, len = 8}, headers = {s = 0x9 <error: Cannot access memory at address 0x9>, len = 1494317568}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = (URI_SIP_USER_PHONE | unknown: 3910341736), transport = {s = 0x23 <error: Cannot access memory at address 0x23>, len = 1}, ttl = { s = 0x1 <error: Cannot access memory at address 0x1>, len = 159}, user_param = {s = 0x800000 <error: Cannot access memory at address 0x800000>, len = 6509616}, maddr = { s = 0x140b68 <error: Cannot access memory at address 0x140b68>, len = 1878992}, method = {s = 0x1caed0 <error: Cannot access memory at address 0x1caed0>, len = 1460313105}, lr = { s = 0x800000 <error: Cannot access memory at address 0x800000>, len = 6509776}, r2 = {s = 0x140b30 <error: Cannot access memory at address 0x140b30>, len = 1878832}, gr = { s = 0x1caed0 <error: Cannot access memory at address 0x1caed0>, len = 1494317568}, transport_val = {s = 0x9 <error: Cannot access memory at address 0x9>, len = 32}, ttl_val = { s = 0x7fb9573224f0 "\340%2W\271\177", len = 1462904048}, user_param_val = {s = 0x7fb9572efe80 "\263^\tW\271\177", len = -352084160}, maddr_val = {s = 0x7fb9520198f0 "\t", len = -385793122}, method_val = {s = 0x7fb9573225a8 "8", len = 1494317568}, lr_val = {s = 0x7fb951202dc4 "sips:100105@ttel.node-1.ersaimfs.ch", len = 35}, r2_val = { s = 0x1a <error: Cannot access memory at address 0x1a>, len = 2}, gr_val = {s = 0x7fb9572efe80 "\263^\tW\271\177", len = 1494317568}} u = <optimized out> port = <optimized out> dst_host = <optimized out> i = <optimized out> flags = 22024 avp = <optimized out> st = {flags = 1378195568, id = 32697, name = {n = 1362141712, s = {s = 0x7fb95130a210 "", len = 1376090576}, re = 0x7fb95130a210}, avp = 0x2} sct = <optimized out> --Type <RET> for more, q to quit, c to continue without paging-- sjt = <optimized out> rve = <optimized out> mct = <optimized out> rv = 0x7fb951272590 rv1 = <optimized out> c1 = {cache_type = RV_CACHE_PVAR, val_type = RV_NONE, c = {avp_val = {n = 0, s = {s = 0x0, len = -383795196}, re = 0x0}, pval = {rs = {s = 0x0, len = -383795196}, ri = 1361063364, flags = 32697}}, i2s = "\200\376.W\271\177\000\000\000z\021Y\372\017\223\221\360\230\001R\271\177"} s = {s = 0x7fb952238720 "\n", len = 0} srevp = {0x7fb9520198f0, 0x91930ffa59117a00} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = { number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __func__ = "do_action" #4 0x00007fb956960a1f in msg_call_function (self=0x7fb9521ed250, args=<optimized out>) at python_msgobj.c:269 i = <optimized out> rval = <optimized out> fname = 0x7fb952122214 "append_branch" arg1 = 0x7fb951202dc4 "sips:100105@ttel.node-1.ersaimfs.ch" arg2 = 0x478a90343ce2286 <error: Cannot access memory at address 0x478a90343ce2286> fexport = 0x7fb9572efe80 act = 0x7fb957322490 ra_ctx = {rec_lev = 0, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {0, 140433996622556, 94596309864320, 140433997811136, 140433922573152, 140432545677312, 140433921520564, 140433921513712}, __mask_was_saved = 1377229072, __saved_mask = {__val = {2, 140433997743136, 140433996765928, 140433921518400, 140433921518400, 140433921519984, 140433996477510, 140433921513712, 10489745524986575360, 140433921519984, 140433998468960, 140433921513712, 140433996646484, 94596309864736, 10489745524986575360, 94596309864728}}}}} __func__ = "msg_call_function" #5 0x00007fb95681df1c in PyEval_EvalFrameEx () from /usr/lib/libpython2.7.so.1.0 No symbol table info available. #6 0x00007fb95681f05f in PyEval_EvalCodeEx () from /usr/lib/libpython2.7.so.1.0 No symbol table info available. #7 0x00007fb9567a797b in ?? () from /usr/lib/libpython2.7.so.1.0 No symbol table info available. #8 0x00007fb95677f073 in PyObject_Call () from /usr/lib/libpython2.7.so.1.0 No symbol table info available. #9 0x00007fb956790852 in ?? () from /usr/lib/libpython2.7.so.1.0 No symbol table info available. #10 0x00007fb95677f073 in PyObject_Call () from /usr/lib/libpython2.7.so.1.0 No symbol table info available. #11 0x00007fb956817908 in PyEval_CallObjectWithKeywords () from /usr/lib/libpython2.7.so.1.0 No symbol table info available. #12 0x00007fb95695cd43 in apy_exec (_msg=_msg@entry=0x7fb95740d408, fname=0x7fb9573407d0 "group_lookup", fparam=0x7fb9572ae430 "1234", emode=emode@entry=1) at python_exec.c:145 pFunc = 0x7fb95161f550 pArgs = 0x7fb951b8a460 pValue = <optimized out> pResult = <optimized out> pmsg = 0x7fb9521ed250 rval = -1 bmsg = 0x0 mpid = <optimized out> locked = 1 gstate = PyGILState_LOCKED gstate_init = 1 __func__ = "apy_exec" #13 0x00007fb95695e3f1 in python_exec2 (_msg=0x7fb95740d408, method_name=<optimized out>, mystr=0x7fb957340958 "\350\b4W\271\177") at python_exec.c:202 method = {s = 0x7fb9573407d0 "group_lookup", len = 12} param = {s = 0x7fb9572ae430 "1234", len = 4} __func__ = "python_exec2" #14 0x00005608e8f5dca6 in do_action (h=h@entry=0x7fffcf4cbe10, a=a@entry=0x7fb9573457b0, msg=msg@entry=0x7fb95740d408) at core/action.c:1079 --Type <RET> for more, q to quit, c to continue without paging-- ret = <optimized out> v = <optimized out> dst = {send_sock = 0x7fb95740d408, to = {s = {sa_family = 48656, sa_data = "L\317\377\177\000\000\320\257L\317\377\177\000"}, sin = {sin_family = 48656, sin_port = 53068, sin_addr = {s_addr = 32767}, sin_zero = "\320\257L\317\377\177\000"}, sin6 = {sin6_family = 48656, sin6_port = 53068, sin6_flowinfo = 32767, sin6_addr = {__in6_u = { __u6_addr8 = "\320\257L\317\377\177\000\000\063\206#\351\bV\000", __u6_addr16 = {45008, 53068, 32767, 0, 34355, 59683, 22024, 0}, __u6_addr32 = {3477909456, 32767, 3911419443, 22024}}}, sin6_scope_id = 1314372251}, sas = {ss_family = 48656, __ss_padding = "L\317\377\177\000\000\320\257L\317\377\177\000\000\063\206#\351\bV\000\000\233\272WN\277\263|\315\233\272I\271\315\374\222\236\000\000\000\000\271\177\000\000\000z\021Y\372\017\223\221p\351\001R\271\177\000\000\060!5W\271\177\000\000\b\324@W\271\177\000\000\b\324@W\271\177\000\000\020\276L\317\377\177\000\000T\256L\317\377\177\000\000\063\206#\351\bV\000\000\a\361\363\350\bV\000", __ss_align = 32767}}, id = 1375842960, send_flags = {f = 32697, blst_imask = 0}, proto = 112 'p', proto_pad0 = -23 '\351', proto_pad1 = 20993} tmp = <optimized out> new_uri = <optimized out> end = <optimized out> crt = <optimized out> cmd = <optimized out> len = <optimized out> user = <optimized out> uri = {user = {s = 0x0, len = -352084160}, passwd = { s = 0x5608eb7f8e80 "77616cfd2e52a8b7b3a76ed9925fc2b46d9d90dcf8c61a357cc8ca71f2bdaae89edf4a3866d9fb4fa72836a6372d479e9159d77e296be22c9f77316b6b9ea82bbcc4a5390665f1b4c96e79cb029865e58\",\"_rev\":\"1-a7e301322dfc4a87e92331a8cdc"..., len = 1361025360}, host = {s = 0x0, len = 1376876464}, port = {s = 0x5608eb039f40 "", len = 1450939766}, params = {s = 0x5608eb4f6e80 "", len = -347115408}, sip_params = { s = 0x5608eb4f70a0 "8O\006\353\bV", len = -347115904}, headers = {s = 0x5608eb4f7098 "", len = 1450860348}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = (unknown: 3947851768), transport = { s = 0x0, len = 1377179552}, ttl = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 1451355409}, user_param = {s = 0x5608eb039f40 "", len = -347115528}, maddr = { s = 0x5608eb064f38 "\312\001", len = 3}, method = {s = 0x0, len = 1494317568}, lr = {s = 0x0, len = 1463866376}, r2 = {s = 0x7fffcf4cac50 "", len = 1463041960}, gr = {s = 0x5608e92086c7 "corefunc", len = -382461728}, transport_val = {s = 0x5608e9238633 "", len = -386544358}, ttl_val = {s = 0x7fffcf4cac50 "", len = 1463041960}, user_param_val = {s = 0x7fb95740d408 "\003", len = 1450867067}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = {s = 0x0, len = 1369901328}, r2_val = {s = 0x100000000 <error: Cannot access memory at address 0x100000000>, len = -817058640}, gr_val = {s = 0x7fb957c10520 <_nl_C_LC_CTYPE> "v\373\275W\271\177", len = 1494317568}} next_hop = {user = {s = 0x7fb957c10520 <_nl_C_LC_CTYPE> "v\373\275W\271\177", len = 1452408776}, passwd = {s = 0x7fb9512be6d0 "\001", len = 1450866928}, host = {s = 0x7fb951a70910 "\001", len = 1494317568}, port = {s = 0x7fb952019950 "\004", len = -817054192}, params = {s = 0x0, len = 1463866376}, sip_params = {s = 0x7fffcf4cbe10 "\003", len = -817058220}, headers = { s = 0x5608e9238633 "", len = -386485865}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = (URI_USER_NORMALIZE | URI_SIP_USER_PHONE | unknown: 4294967292), transport = {s = 0x0, len = 0}, ttl = { s = 0x0, len = 0}, user_param = {s = 0x7fffcf4cae54 "", len = -383547853}, maddr = {s = 0xcd7cb3bf4bd7ba9b <error: Cannot access memory at address 0xcd7cb3bf4bd7ba9b>, len = -1186350437}, method = { s = 0x7fb900000000 <error: Cannot access memory at address 0x7fb900000000>, len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0x7fb95740d408 "\003", len = 1}, gr = {s = 0x0, len = 0}, transport_val = { s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, user_param_val = {s = 0x0, len = 1494317568}, maddr_val = {s = 0x7fb95740d408 "\003", len = 1462860840}, method_val = {s = 0x7fb95740d408 "\003", len = 1494317568}, lr_val = {s = 0x7fb957317c40 "", len = 1463099704}, r2_val = {s = 0x7fffcf4cae54 "", len = 1494317568}, gr_val = {s = 0x7fffcf4cbe10 "\003", len = -817054192}} u = <optimized out> port = <optimized out> dst_host = <optimized out> i = <optimized out> flags = 22024 avp = <optimized out> st = {flags = 1472267552, id = 32697, name = {n = 1452408776, s = {s = 0x7fb95691ffc8 <_PyThreadState_Current> "@\237\003\353\bV", len = 1361831632}, re = 0x7fb95691ffc8 <_PyThreadState_Current>}, avp = 0x7fb9567a78f0} sct = <optimized out> sjt = <optimized out> rve = <optimized out> mct = <optimized out> rv = 0x7fb95688ba80 rv1 = <optimized out> c1 = {cache_type = 3477913104, val_type = 32767, c = {avp_val = {n = -817057840, s = {s = 0x7fffcf4cafd0 "\001", len = -383547853}, re = 0x7fffcf4cafd0}, pval = {rs = {s = 0x7fffcf4cafd0 "\001", len = -383547853}, ri = -386485865, flags = 22024}}, i2s = "\000\000\000\000\000\000\000\000\001\000\000\000\271\177\000\000\020\276L\317\377\177"} s = {s = 0x7fb9511e7910 "\002", len = 1360951568} srevp = {0x0, 0x7fb95740d408} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = { number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __func__ = "do_action" #15 0x00005608e8f5cd1a in run_actions (h=h@entry=0x7fffcf4cbe10, a=0x7fb957345578, msg=msg@entry=0x7fb95740d408) at core/action.c:1584 t = 0x7fb9573457b0 ret = <optimized out> --Type <RET> for more, q to quit, c to continue without paging-- tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = 0, tz_dsttime = 0} tdiff = <optimized out> __func__ = "run_actions" #16 0x00005608e8f5f560 in do_action (h=h@entry=0x7fffcf4cbe10, a=a@entry=0x7fb95734c3a0, msg=msg@entry=0x7fb95740d408) at core/action.c:1074 ret = <optimized out> v = <optimized out> dst = {send_sock = 0x7fb95740d408, to = {s = {sa_family = 48656, sa_data = "L\317\377\177\000\000 \267L\317\377\177\000"}, sin = {sin_family = 48656, sin_port = 53068, sin_addr = {s_addr = 32767}, sin_zero = " \267L\317\377\177\000"}, sin6 = {sin6_family = 48656, sin6_port = 53068, sin6_flowinfo = 32767, sin6_addr = {__in6_u = {__u6_addr8 = " \267L\317\377\177\000\000\063\206#\351\bV\000", __u6_addr16 = {46880, 53068, 32767, 0, 34355, 59683, 22024, 0}, __u6_addr32 = {3477911328, 32767, 3911419443, 22024}}}, sin6_scope_id = 2033695387}, sas = {ss_family = 48656, __ss_padding = "L\317\377\177\000\000 \267L\317\377\177\000\000\063\206#\351\bV\000\000\233\272\067y\277\263|\315\233\272I\271\315\374\222\236\000\000\000\000\bV\000\000\234\000\000\000\000\000\000\000\b\324@W\271\177\000\000x\332\061W\271\177\000\000\b\324@W\271\177\000\000\000\000\000\000\000\000\000\000\020\276L\317\377\177\000\000\300\265L\317\377\177\000\000\300\264L\317\377\177\000\000\000z\021Y\372\017\223\221", __ss_align = 30064771075}}, id = 9, send_flags = {f = 17, blst_imask = 0}, proto = 4 '\004', proto_pad0 = 0 '\000', proto_pad1 = 0} tmp = <optimized out> new_uri = <optimized out> end = <optimized out> crt = <optimized out> cmd = <optimized out> len = <optimized out> user = <optimized out> uri = {user = {s = 0x0, len = 1451028260}, passwd = {s = 0x0, len = 1375450128}, host = { s = 0x7fb9567bdfd0 <PyCFunction_Call> "AUATUSH\211\373H\203\354\bH\213G\020L\213o\030L\213`\b\213@\020\203\340\217\203\370\bw4H\211\327H\211\365H\215\025\377A\v", len = -817057520}, port = { s = 0x5608eb0374a8 "", len = 0}, params = {s = 0x5608eb0374a7 "3", len = 1}, sip_params = {s = 0x7fb957bdf490 "%hu%n:%hu%n:%hu%n", len = -352095065}, headers = {s = 0x5608eb0374a7 "3", len = 0}, port_no = 45328, proto = 53068, type = 32767, flags = (URI_USER_NORMALIZE | URI_SIP_USER_PHONE | unknown: 1470841432), transport = {s = 0x7fffcf4cb120 "\250t\003\353\bV", len = 16}, ttl = { s = 0x7fffcf4cb2d0 "\340\071\301W\271\177", len = -817057280}, user_param = {s = 0x7ffffbad8001 <error: Cannot access memory at address 0x7ffffbad8001>, len = -352095064}, maddr = { s = 0x5608eb0374a8 "", len = -352095065}, method = {s = 0x5608eb0374a7 "3", len = 1494317568}, lr = {s = 0x5608eb0374a7 "3", len = 1463866376}, r2 = {s = 0x7fffcf4cb3a0 "", len = 1462899544}, gr = { s = 0x5608e92086c7 "corefunc", len = -382461728}, transport_val = {s = 0x5608e9238633 "", len = -386544358}, ttl_val = {s = 0x7fffcf4cb3a0 "", len = 1462899544}, user_param_val = { s = 0x7fb95740d408 "\003", len = 8180}, maddr_val = {s = 0x7fffcf4cb440 "\003", len = 1472269024}, method_val = {s = 0x7fffcf4cb3bf "2\b\324@W\271\177", len = -352104480}, lr_val = { s = 0x900000000 <error: Cannot access memory at address 0x900000000>, len = 1}, r2_val = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 1494317568}, gr_val = { s = 0x7fb9ffffffff <error: Cannot access memory at address 0x7fb9ffffffff>, len = 1472287680}} next_hop = {user = {s = 0x0, len = 1472287680}, passwd = {s = 0x330000000000 <error: Cannot access memory at address 0x330000000000>, len = 1494317568}, host = {s = 0x7fffcf4cb2e2 "", len = -817057048}, port = {s = 0x7fffcf4cb2e4 "", len = -817057048}, params = {s = 0x7fb957c16cc0 <tz_rules+64> "", len = -817057048}, sip_params = {s = 0x7fffcf4cb4c8 "0", len = 1460313105}, headers = {s = 0x800000 <error: Cannot access memory at address 0x800000>, len = 15}, port_no = 2060, proto = 60285, type = 22024, flags = (unknown: 3950839820), transport = {s = 0x0, len = 0}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x7fb957c127c0 <_nl_C_locobj> " \005\301W\271\177", len = 1471268632}, maddr = { s = 0x3132373230303228 <error: Cannot access memory at address 0x3132373230303228>, len = 8187}, method = {s = 0x7fffcf4cb440 "\003", len = 177}, lr = {s = 0x5608eb7d07f0 "", len = 176}, r2 = { s = 0x7fb957c139e0 <main_arena> "", len = -344119296}, gr = {s = 0x0, len = 1471040194}, transport_val = {s = 0x62834997 <error: Cannot access memory at address 0x62834997>, len = 24}, ttl_val = { s = 0x7fffcf4cb3d0 " \267L\317\377\177", len = 1472281056}, user_param_val = {s = 0x5608eb7d0800 "", len = 157}, maddr_val = {s = 0x7fffcf4cb4c8 "0", len = -344127504}, method_val = { s = 0x2010 <error: Cannot access memory at address 0x2010>, len = 1471044278}, lr_val = {s = 0x7fb957c139e0 <main_arena> "", len = -817056856}, r2_val = { s = 0x12 <error: Cannot access memory at address 0x12>, len = 1494317568}, gr_val = {s = 0x5608eb35cf20 "\220\002\066\353\bV", len = -817054192}} u = <optimized out> port = <optimized out> dst_host = <optimized out> i = <optimized out> flags = 32697 avp = <optimized out> st = {flags = 0, id = 0, name = {n = 1472287680, s = {s = 0x7fb957c153c0 <_IO_str_jumps> "", len = 0}, re = 0x7fb957c153c0 <_IO_str_jumps>}, avp = 0x91930ffa59117a00} sct = <optimized out> sjt = <optimized out> rve = <optimized out> mct = <optimized out> rv = 0x7fb951fbb410 rv1 = <optimized out> c1 = {cache_type = 3477913104, val_type = 32767, c = {avp_val = {n = -817055968, s = {s = 0x7fffcf4cb720 "\001", len = -383547853}, re = 0x7fffcf4cb720}, pval = {rs = {s = 0x7fffcf4cb720 "\001", len = -383547853}, ri = -386485865, flags = 22024}}, i2s = "\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\020\276L\317\377\177"} s = {s = 0x7fb9567bdfd0 <PyCFunction_Call> "AUATUSH\211\373H\203\354\bH\213G\020L\213o\030L\213`\b\213@\020\203\340\217\203\370\bw4H\211\327H\211\365H\215\025\377A\v", len = 1376090576} srevp = {0x0, 0x7fb95740d408} evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = { --Type <RET> for more, q to quit, c to continue without paging-- number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __func__ = "do_action" #17 0x00005608e8f5cd1a in run_actions (h=h@entry=0x7fffcf4cbe10, a=0x7fb95734c3a0, msg=msg@entry=0x7fb95740d408) at core/action.c:1584 t = 0x7fb95734c3a0 ret = <optimized out> tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = 1462850328, tz_dsttime = 32697} tdiff = <optimized out> __func__ = "run_actions" #18 0x00005608e8f5e1c5 in do_action (h=h@entry=0x7fffcf4cbe10, a=a@entry=0x7fb957323c38, msg=msg@entry=0x7fb95740d408) at core/action.c:703 ret = <optimized out> v = <optimized out> dst = {send_sock = 0x10, to = {s = {sa_family = 31232, sa_data = "\021Y\372\017\223\221Y\001\000\000\000\000\000"}, sin = {sin_family = 31232, sin_port = 22801, sin_addr = {s_addr = 2442334202}, sin_zero = "Y\001\000\000\000\000\000"}, sin6 = {sin6_family = 31232, sin6_port = 22801, sin6_flowinfo = 2442334202, sin6_addr = {__in6_u = { __u6_addr8 = "Y\001\000\000\000\000\000\000l\006\023\351\bV\000", __u6_addr16 = {345, 0, 0, 0, 1644, 59667, 22024, 0}, __u6_addr32 = {345, 0, 3910338156, 22024}}}, sin6_scope_id = 16}, sas = { ss_family = 31232, __ss_padding = "\021Y\372\017\223\221Y\001\000\000\000\000\000\000l\006\023\351\bV\000\000\020\000\000\000\000\000\000\000\004\300\037\351\bV\000\000\320z7W\271\177\000\000\250\000\000\000\000\000\000\000(z7W\271\177\000\000\001\000\000\000\bV\000\000\001\000\000\000\000\000\000\000\276", '\000' <repeats 11 times>, "\267\002", '\000' <repeats 19 times>, "z\021Y\372\017\223\221", __ss_align = 0}}, id = 6, send_flags = {f = 0, blst_imask = 0}, proto = 0 '\000', proto_pad0 = 0 '\000', proto_pad1 = 0} tmp = <optimized out> new_uri = <optimized out> end = <optimized out> crt = <optimized out> cmd = <optimized out> len = <optimized out> user = <optimized out> uri = {user = {s = 0x0, len = 1463255000}, passwd = {s = 0x7fb957375bc8 "", len = 0}, host = {s = 0x0, len = 0}, port = {s = 0x7fb957375c70 "\021", len = 0}, params = {s = 0x7fb957375dc0 "\v", len = 0}, sip_params = {s = 0x0, len = 0}, headers = {s = 0x0, len = 1463244928}, port_no = 0, proto = 0, type = ERROR_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 = 1463245264}, r2 = {s = 0x0, len = 1463245096}, gr = {s = 0x0, len = 0}, transport_val = { s = 0x5608eb7aa741 " 695\r\nTH: dih\r\n\r\nv=0\r\no=100101 8000 8000 IN IP4 10.0.1.129\r\ns=SIP Call\r\nc=IN IP4 10.0.1.129\r\nt=0 0\r\nm=audio 50040 RTP/SAVP 0 8 9 101\r\na=sendrecv\r\na=rtcp:50041 IN IP4 10.0.1.129\r\na=rtpmap:0 PCMU/8000\r"..., len = -344283327}, 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}} next_hop = {user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, host = {s = 0x0, len = 0}, port = {s = 0x0, len = 0}, params = {s = 0x0, len = 0}, sip_params = {s = 0x0, len = 0}, headers = { s = 0x5608eb7aa330 "INVITE sips:1234@10.0.1.1:5061 SIP/2.0\r\nVia: SIP/2.0/TLS 10.0.1.129:5060;TH=div;branch=z9hG4bK350560282;rport;alias\r\nFrom: \"Node1 Number1\" <sips:100101@10.0.1.1:5061>;tag=1456723635\r\nTo: <sips:1234@10"..., len = 1738}, port_no = 0, proto = 0, type = ERROR_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 = 1494317568}, maddr_val = {s = 0x0, len = -384366071}, method_val = {s = 0x0, len = 84}, lr_val = {s = 0x2 <error: Cannot access memory at address 0x2>, len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 1460313105}} u = <optimized out> port = <optimized out> dst_host = <optimized out> i = <optimized out> flags = 0 avp = <optimized out> st = {flags = 0, id = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, avp = 0x0} sct = <optimized out> sjt = <optimized out> rve = <optimized out> mct = <optimized out> rv = 0x1 rv1 = <optimized out> c1 = {cache_type = 1307040, val_type = RV_NONE, c = {avp_val = {n = 1460313105, s = {s = 0x7fb9570a9c11 <pkg_proc_update_stats+65> "Hc\003H\213T$\bH\215\004@H\301\340\004H\003\005", len = 8388608}, re = 0x7fb9570a9c11 <pkg_proc_update_stats+65>}, pval = {rs = {s = 0x7fb9570a9c11 <pkg_proc_update_stats+65> "Hc\003H\213T$\bH\215\004@H\301\340\004H\003\005", len = 8388608}, ri = 6519368, flags = 0}}, i2s = "\320\370\023\000\000\000\000\000\270\205\034\000\000\000\000\000\020\245\034\000\000"} s = {s = 0x7fb9573d3670 "\001", len = 0} srevp = {0x800000, 0x6388c8} --Type <RET> for more, q to quit, c to continue without paging-- evp = {data = 0x0, obuf = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = { number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __func__ = "do_action" #19 0x00005608e8f5cd1a in run_actions (h=h@entry=0x7fffcf4cbe10, a=a@entry=0x7fb957310788, msg=msg@entry=0x7fb95740d408) at core/action.c:1584 t = 0x7fb957323c38 ret = <optimized out> tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = 0, tz_dsttime = 0} tdiff = <optimized out> __func__ = "run_actions" #20 0x00005608e8f6b235 in run_top_route (a=0x7fb957310788, msg=msg@entry=0x7fb95740d408, c=c@entry=0x0) at core/action.c:1669 ctx = {rec_lev = 3, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {0, -3639836764189246821, 0, 140434008508296, 140434009543688, 0, -3639836764059223397, -7020270908610069861}, __mask_was_saved = 0, __saved_mask = {__val = {140434005384309, 0, 94596268823528, 0, 0, 0, 0, 0, 10489745524986575360, 140434008930744, 10489745524986575360, 94596272765568, 140433931052912, 140434009543688, 10489745524986575360, 0}}}}} p = 0x7fffcf4cbe10 ret = <optimized out> sfbk = 0 #21 0x00005608e904e89c in receive_msg (buf=<optimized out>, len=<optimized out>, rcv_info=<optimized out>) at core/receive.c:501 msg = 0x7fb95740d408 ctx = {rec_lev = 0, run_flags = 0, last_retcode = 1472281056, jmp_env = {{__jmpbuf = {65536, 4097, 65552, -80, 4095, 140434016714912, 1, 140434017958464}, __mask_was_saved = 0, __saved_mask = {__val = { 7, 94596301910030, 65536, 140432545677433, 94596301934600, 65584, 1024, 4604204945409, 2, 16, 10489745524986575360, 519691042940, 140433931053816, 140433931052888, 140736671302564, 140736671302564}}}}} bctx = 0x0 ret = <optimized out> tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} diff = 0 inb = { s = 0x5608eb7aa330 "INVITE sips:1234@10.0.1.1:5061 SIP/2.0\r\nVia: SIP/2.0/TLS 10.0.1.129:5060;TH=div;branch=z9hG4bK350560282;rport;alias\r\nFrom: \"Node1 Number1\" <sips:100101@10.0.1.1:5061>;tag=1456723635\r\nTo: <sips:1234@10"..., len = 1754} netinfo = {data = {s = 0x0, len = 0}, rcv = 0x0, dst = 0x0} keng = 0x0 evp = {data = 0x7fffcf4cbf70, obuf = {s = 0x0, len = 0}, rcv = 0x7fb952932770, dst = 0x0, req = 0x0, rpl = 0x0, rplcode = 0, mode = 0} cidlockidx = 0 cidlockset = 0 errsipmsg = 0 exectime = 0 __func__ = "receive_msg" #22 0x00005608e90ecf62 in receive_tcp_msg ( tcpbuf=0x7fb952932af8 "INVITE sips:1234@10.0.1.1:5061 SIP/2.0\r\nVia: SIP/2.0/TLS 10.0.1.129:5060;branch=z9hG4bK350560282;rport;alias\r\nFrom: \"Node1 Number1\" <sips:100101@10.0.1.1:5061>;tag=1456723635\r\nTo: <sips:1234@10.0.1.1:"..., len=1738, rcv_info=0x7fb952932770, con=con@entry=0x7fb952932758) at core/tcp_read.c:1424 buf = 0x5608eb7aa330 "INVITE sips:1234@10.0.1.1:5061 SIP/2.0\r\nVia: SIP/2.0/TLS 10.0.1.129:5060;TH=div;branch=z9hG4bK350560282;rport;alias\r\nFrom: \"Node1 Number1\" <sips:100101@10.0.1.1:5061>;tag=1456723635\r\nTo: <sips:1234@10"... bsize = 65535 blen = <optimized out> __func__ = "receive_tcp_msg" #23 0x00005608e90ed3db in tcp_read_req (con=0x7fb952932758, bytes_read=bytes_read@entry=0x7fffcf4cc39c, read_flags=read_flags@entry=0x7fffcf4cc3a4) at core/tcp_read.c:1607 bytes = <optimized out> total_bytes = 1738 resp = 1 size = <optimized out> req = 0x7fb952932880 dst = {send_sock = 0x7fffcf4cc2d0, to = {s = {sa_family = 32855, sa_data = "\017\351\bV\000\000\340\302L\317\377\177\000"}, sin = {sin_family = 32855, sin_port = 59663, sin_addr = {s_addr = 22024}, sin_zero = "\340\302L\317\377\177\000"}, sin6 = {sin6_family = 32855, sin6_port = 59663, sin6_flowinfo = 22024, sin6_addr = {__in6_u = { __u6_addr8 = "\340\302L\317\377\177\000\000\030\000\000\000\000\000\000", __u6_addr16 = {49888, 53068, 32767, 0, 24, 0, 0, 0}, __u6_addr32 = {3477914336, 32767, 24, 0}}}, sin6_scope_id = 0}, --Type <RET> for more, q to quit, c to continue without paging-- sas = {ss_family = 32855, __ss_padding = "\017\351\bV\000\000\340\302L\317\377\177\000\000\030", '\000' <repeats 15 times>, "\220$l\353\bV\000\000\000\000\000\000\002\000\000\000\002", '\000' <repeats 11 times>, "\001 \000\000\320VAW\271\177\000\000\000\000\000\000\000\000\000\000\021\234\nW\271\177\000\000\000\000\200\000\000\000\000\000h\225c\000\000\000\000\000\250\303L\317\377\177\000\000\b\000\000\000\000\000\000", __ss_align = 20}}, id = 1, send_flags = {f = 1, blst_imask = 0}, proto = 17 '\021', proto_pad0 = 0 '\000', proto_pad1 = 0} c = 0 '\000' ret = <optimized out> __func__ = "tcp_read_req" #24 0x00005608e90f26ab in handle_io (fm=<optimized out>, events=<optimized out>, idx=-1) at core/tcp_read.c:1857 ret = 327 n = 1541 read_flags = RD_CONN_SHORT_READ con = 0x7fb952932758 s = 17 resp = <optimized out> t = <optimized out> ee = 0x0 __func__ = "handle_io" #25 0x00005608e90f6fee in io_wait_loop_epoll (repeat=repeat@entry=0, t=2, h=0x5608e940a120 <io_w>) at core/io_wait.h:1069 n = 1 r = 0 fm = 0x7fb9574156d0 revents = 1 __func__ = "io_wait_loop_epoll" #26 0x00005608e90fa6ef in tcp_receive_loop (unix_sock=<optimized out>) at core/tcp_read.c:1978 __func__ = "tcp_receive_loop" #27 0x00005608e8fdbe9a in tcp_init_children (woneinit=0x7fffcf4cc88c) at core/tcp_main.c:5153 r = <optimized out> i = <optimized out> reader_fd_1 = 52 pid = <optimized out> si_desc = "tcp receiver (generic)\000\000\001", '\000' <repeats 15 times>, "\034\061\001\351\bV\000\000(\023@W\271\177\000\000\001", '\000' <repeats 15 times>, "\354Y\v\351\bV\000\000\000\000&R\271\177\000\000\004\000\000\000\000\000\000\000$\300\037\351\bV\000\000\250\000 \351\bV\000\000\004\300\037\351\bV\000\000\rI\023\351\bV\000" si = <optimized out> __func__ = "tcp_init_children" #28 0x00005608e8f28203 in main_loop () at main.c:1857 i = <optimized out> pid = <optimized out> si = <optimized out> si_desc = "udp receiver child=7 sock=10.0.1.1:5060\000\000\000\000\000\bV\000\000\277\350`V\271\177\000\000\022\000\000\000\377\177\000\000\000\000\000\000\000\000\000\000\361\064\001\351\bV\000\000\200\313\245W\271\177\000\000\000z\021Y\372\017\223\221\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000HdA\351\bV\000\000@dA\351\bV\000" nrprocs = <optimized out> woneinit = 1 __func__ = "main_loop" #29 0x00005608e8f1ea04 in main (argc=<optimized out>, argv=<optimized out>) at main.c:3053 cfg_stream = <optimized out> c = <optimized out> r = <optimized out> tmp = 0x7fffcf4cee2c "" tmp_len = 1473862992 port = 32697 proto = 0 ahost = 0x0 aport = 0 options = 0x5608e91fea78 ":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 = 2003480732 rfd = <optimized out> debug_save = <optimized out> debug_flag = <optimized out> dont_fork_cnt = <optimized out> --Type <RET> for more, q to quit, c to continue without paging-- n_lst = <optimized out> p = <optimized out> st = {st_dev = 24, st_ino = 23868433, st_nlink = 2, st_mode = 16832, st_uid = 999, st_gid = 999, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1652771183, tv_nsec = 782356937}, st_mtim = {tv_sec = 1652771193, tv_nsec = 677508981}, st_ctim = {tv_sec = 1652771193, tv_nsec = 677508981}, __glibc_reserved = {0, 0, 0}} tbuf = "\000\000\000\000\000\000\000\000PQ\333W\271\177\000\000\370\377\377\377\377\377\377\377\b\025\332W\271\177\000\000`\315L\317\377\177\000\000E\345\330W\271\177", '\000' <repeats 26 times>, "\001\000\000\000\000\000\000\000\000W\333W\271\177\000\000\200\313\245W\271\177\000\000 \314L\317\377\177\000\000\001\314L\317\377\177\000\000\260I\333W\271\177", '\000' <repeats 42 times>, "\030\202V\317\377\177", '\000' <repeats 14 times>, " ", '\000' <repeats 27 times>... option_index = 0 long_options = {{name = 0x5608e91fd259 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x5608e92007a9 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x5608e92317c2 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x5608e91fd25e "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x5608e91fd264 "substdef", has_arg = 1, flag = 0x0, val = 1026}, { name = 0x5608e91fd26d "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x5608e91fd277 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x5608e91fd281 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x5608e91fd28c "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x5608e91fd295 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, { name = 0x5608e92008b9 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x5608e91fd2a0 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x5608e91fd2aa "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals val = {n = 1451801216, s = { s = 0x7fb95688ba80 "\307\356\370\377\243\356\370\377\226\356\370\377\v\356\370\377\354\356\370\377\027%\371\377\t%\371\377\373$\371\377\355$\371\377d&\371\377j%\371\377\341\355\370\377\341\355\370\377\202\356\370\377\367\355\370\377", len = 1371188816}, re = 0x7fb95688ba80} ret = <optimized out> avp = <optimized out> pv_val = {rs = { s = 0x7fb95688ba80 "\307\356\370\377\243\356\370\377\226\356\370\377\v\356\370\377\354\356\370\377\027%\371\377\t%\371\377\373$\371\377\355$\371\377d&\371\377j%\371\377\341\355\370\377\341\355\370\377\202\356\370\377\367\355\370\377", len = 1371188816}, ri = 1371188816, flags = 32697} __func__ = "get_str_fparam" ``` #### Log Messages  ``` May 17 09:07:06 ttel /usr/sbin/kamailio[2002728]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 48 May 17 09:07:06 ttel /usr/sbin/kamailio[2002683]: ALERT: <core> [main.c:788]: handle_sigs(): child process 2002721 exited by a signal 11 May 17 09:07:06 ttel /usr/sbin/kamailio[2002683]: ALERT: <core> [main.c:791]: handle_sigs(): core was generated May 17 09:07:06 ttel /usr/sbin/kamailio[2002683]: INFO: <core> [main.c:813]: handle_sigs(): terminating due to SIGCHLD ``` ### Possible Solutions  If I set a value for the optional parameter q, the forking works as expected `msg.call_function('append_branch', ruri, "1")`. Without the q parameter, it segfaults. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.5.4 (x86_64/linux) 54c9df 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 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: 54c9df compiled on 10:01:05 Feb 17 2022 with x86_64-poky-linux-gcc 9.3.0 ``` * **Operating System**:  ``` Linux ttel 5.4.172-yocto-standard #1 SMP PREEMPT Mon Jan 17 19:47:33 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3113 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3113(a)github.com>

2 2

[kamailio/kamailio] dialog: dlg_get_var() and dlg_set_var() (PR #3109)
by Victor Seva 17 May '22

17 May '22

#### 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 - [s] Tested changes locally #### Description Add functions to get and set a dlg_var from outside that dialog using call-ID, from-tag and to-tag to select the desired one You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3109 -- Commit Summary -- * dialog: dlg_get_var(ci, ft, tt, key, dst_var) * dialog: dlg_set_var(callid, ft, tt, key, value) -- File Changes -- M src/modules/dialog/dialog.c (213) M src/modules/dialog/doc/dialog_admin.xml (96) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3109.patch https://github.com/kamailio/kamailio/pull/3109.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3109 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3109(a)github.com>

2 2

git:master:79e1052c: dialog: dlg_get_var(ci, ft, tt, key, dst_var)
by Daniel-Constantin Mierla 17 May '22

17 May '22

Module: kamailio Branch: master Commit: 79e1052ccb764c3a1af52dc902fb3f606be5fd4b URL: https://github.com/kamailio/kamailio/commit/79e1052ccb764c3a1af52dc902fb3f6… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-17T12:34:59+02:00 dialog: dlg_get_var(ci, ft, tt, key, dst_var) --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/79e1052ccb764c3a1af52dc902fb3f6… Patch: https://github.com/kamailio/kamailio/commit/79e1052ccb764c3a1af52dc902fb3f6…

1 0

git:master:6d7d1281: dialog: dlg_set_var(callid, ft, tt, key, value)
by Daniel-Constantin Mierla 17 May '22

17 May '22

Module: kamailio Branch: master Commit: 6d7d1281b250e9eb73a686b323e06a2b5b81013c URL: https://github.com/kamailio/kamailio/commit/6d7d1281b250e9eb73a686b323e06a2… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-17T12:34:59+02:00 dialog: dlg_set_var(callid, ft, tt, key, value) --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6d7d1281b250e9eb73a686b323e06a2… Patch: https://github.com/kamailio/kamailio/commit/6d7d1281b250e9eb73a686b323e06a2…

1 0

[kamailio/kamailio] module tm: kemi proto relay functions fails on TLS (PR #3110)
by hallthmann 17 May '22

17 May '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  module: tm kemi proto relay functions fails on TLS Functions: ki_t_relay_to_proto and ki_t_relay_to_proto_addr. It's a simple fix, Just added a missing equal zero (== 0) on strncasecmp to TLS test to validate. } else if (strncasecmp(sproto->s, "TLS", 3) == 0) { You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3110 -- Commit Summary -- * Makefile.defs: version set to 5.7.0-dev0 * pkg/kamailio/deb: version set 5.7.0~dev0 [skip ci] * db_berkeley: reset lkey to avoid double free * ipops: warning when too many dns containers are created * ipops: add dns container in dns_update_pv() if not created before * doc: Fix typos * pkg: Fix typos * core: Fix typos * lib: Fix typos * acc: Fix typos * auth: Fix typos * ctl: Fix typos * ldap: Fix typos * pike: Fix typos * sanity: Fix typos * tls: Fix typos * uid_auth_db: Fix typos * utils: Fix typos * modules: readme files regenerated - acc ... [skip ci] * userblocklist: fix restart errors * userblocklist: fix function comment, related to gh #3102 * app_jsdt: duktape interpreter upgraded to v2.7.0 * app_squirrel: updated squirrel interpreter to latest git version (3.2+) * usrloc: connect to db for main process in PROC_POSTCHILDINIT child init * dialog: open db connection in POSTCHILDINIT callback for DB_MODE_SHUTDOWN * mtree: remove single-used small function * geoip2: log errors for cases where the container could not evaluated and add docs * modules: readme files regenerated - geoip2 ... [skip ci] * core: xavp - helper function to shift xavps to left with rotation * pv: config function to shift xavps to left with rotation * pv: docs for xavp_lshift() function * modules: readme files regenerated - pv ... [skip ci] * pv: added $shvinc(name) - return incremented value of $shv(inc) * pv: use fixup get int value to evaluate the index parameter * pv: kemi function to get $shvinc(name) value * registrar: kemi functions to get $ulc(...) attributes * pv: declare pv wrapper function with two parameters * core: str - helerp macros to set str variable with char* value * registrar: added lookup_xavp("ultable", "uri", "rxname", "cxname") * registrar: docs for lookup_xavp(...) * registrar: proper attribute name for contact record xavp * modules: readme files regenerated - registrar ... [skip ci] * registrar: docs - removed extra closing tag * modules: readme files regenerated - registrar ... [skip ci] * core: socket info - function to get socket by listen or advertise * pv: xavp_push_dst(xname) function * pv: docs for xavp_push_dst() * pv: allow xavp_push_dst() in request/branch/failure_rotue * modules: readme files regenerated - pv ... [skip ci] * siptrace: fix hardcoded PROTO_UDP in duplicate_uri module parameter * core: add an option to trigger also an RST on tcp connection close * dialog: docs -remark wabout to-tag parameter for dlg_get() * modules: readme files regenerated - dialog ... [skip ci] * core: tcp main - check setsockopt() result for SO_LINGER * kazoo: docs - removed unnecessary xinclude entity * xlog: docs - updated section ids -- File Changes -- M doc/misc/NEWS (2) M doc/tutorials/locking.txt (4) M pkg/kamailio/deb/bionic/changelog (35) M pkg/kamailio/deb/bionic/rules (2) M pkg/kamailio/deb/bookworm/changelog (35) M pkg/kamailio/deb/bookworm/rules (2) M pkg/kamailio/deb/bullseye/changelog (35) M pkg/kamailio/deb/bullseye/rules (2) M pkg/kamailio/deb/buster/changelog (35) M pkg/kamailio/deb/buster/rules (2) M pkg/kamailio/deb/debian/changelog (35) M pkg/kamailio/deb/debian/rules (2) M pkg/kamailio/deb/focal/changelog (35) M pkg/kamailio/deb/focal/rules (2) M pkg/kamailio/deb/jessie/changelog (35) M pkg/kamailio/deb/jessie/rules (2) M pkg/kamailio/deb/precise/changelog (35) M pkg/kamailio/deb/precise/rules (2) M pkg/kamailio/deb/sid/changelog (35) M pkg/kamailio/deb/sid/rules (2) M pkg/kamailio/deb/stretch/changelog (35) M pkg/kamailio/deb/stretch/rules (2) M pkg/kamailio/deb/trusty/changelog (35) M pkg/kamailio/deb/trusty/rules (2) M pkg/kamailio/deb/wheezy/changelog (35) M pkg/kamailio/deb/wheezy/rules (2) M pkg/kamailio/deb/xenial/changelog (35) M pkg/kamailio/deb/xenial/rules (2) M src/Makefile.defs (4) M src/core/atomic/atomic_mips2.h (2) M src/core/cfg.lex (2) M src/core/cfg.y (9) M src/core/dns_cache.c (4) M src/core/forward.c (2) M src/core/resolve.c (4) M src/core/socket_info.c (13) M src/core/socket_info.h (1) M src/core/str.h (16) M src/core/tcp_main.c (23) M src/core/tcp_options.c (3) M src/core/tcp_options.h (1) M src/core/xavp.c (99) M src/core/xavp.h (1) M src/lib/cds/dstring.h (2) M src/lib/srdb1/schema/uid_credentials.xml (2) M src/lib/srdb2/db_cmd.c (4) M src/lib/srdb2/schema/credentials.xml (2) M src/modules/acc/README (2) M src/modules/acc/doc/acc_admin.xml (2) M src/modules/app_jsdt/duk_config.h (6) M src/modules/app_jsdt/duktape.c (21926) M src/modules/app_jsdt/duktape.h (22) M src/modules/app_sqlang/squirrel/include/squirrel.h (10) M src/modules/app_sqlang/squirrel/sqstdlib/sqstdblob.cpp (14) M src/modules/app_sqlang/squirrel/sqstdlib/sqstdio.cpp (4) M src/modules/app_sqlang/squirrel/sqstdlib/sqstdstream.cpp (2) M src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp (42) M src/modules/app_sqlang/squirrel/squirrel/sqapi.cpp (30) M src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp (42) M src/modules/app_sqlang/squirrel/squirrel/sqclass.cpp (3) M src/modules/app_sqlang/squirrel/squirrel/sqclass.h (1) M src/modules/app_sqlang/squirrel/squirrel/sqcompiler.cpp (60) M src/modules/app_sqlang/squirrel/squirrel/sqstring.h (11) M src/modules/app_sqlang/squirrel/squirrel/sqtable.h (2) M src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp (19) M src/modules/app_sqlang/squirrel/squirrel/sqvm.h (2) M src/modules/auth/challenge.c (2) M src/modules/auth/nonce.c (12) M src/modules/ctl/binrpc.h (4) M src/modules/db_berkeley/db_berkeley.c (4) M src/modules/dialog/README (3) M src/modules/dialog/dialog.c (10) M src/modules/dialog/doc/dialog_admin.xml (3) M src/modules/geoip2/README (2) M src/modules/geoip2/doc/geoip2_admin.xml (2) M src/modules/geoip2/geoip2_pv.c (4) M src/modules/ipops/ipops_pv.c (9) M src/modules/kazoo/doc/kazoo_admin.xml (3) M src/modules/ldap/README (2) M src/modules/ldap/doc/ldap_admin.xml (2) M src/modules/mtree/mtree_mod.c (21) M src/modules/pike/ip_tree.c (2) M src/modules/pv/README (169) M src/modules/pv/doc/pv_admin.xml (75) M src/modules/pv/pv.c (141) M src/modules/pv/pv_shv.c (62) M src/modules/pv/pv_shv.h (2) M src/modules/registrar/README (113) M src/modules/registrar/doc/registrar_admin.xml (77) M src/modules/registrar/registrar.c (47) M src/modules/registrar/regpv.c (239) M src/modules/registrar/regpv.h (7) M src/modules/sanity/sanity.c (2) M src/modules/sanity/sanity.h (2) M src/modules/siptrace/siptrace_send.c (2) M src/modules/tls/tls_server.c (2) M src/modules/uid_auth_db/authorize.c (2) M src/modules/userblocklist/db_userblocklist.c (3) M src/modules/usrloc/usrloc_mod.c (14) M src/modules/xlog/doc/xlog_admin.xml (4) M utils/kamctl/kamdbctl.pgsql (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3110.patch https://github.com/kamailio/kamailio/pull/3110.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3110 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3110(a)github.com>

2 3

git:master:1f7e894f: tm: fix kemi t_relay_to_proto() variants for tls
by Daniel-Constantin Mierla 17 May '22

17 May '22

Module: kamailio Branch: master Commit: 1f7e894f5b293f97dc99e1b7e5d06159f91a96f7 URL: https://github.com/kamailio/kamailio/commit/1f7e894f5b293f97dc99e1b7e5d0615… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-17T12:30:24+02:00 tm: fix kemi t_relay_to_proto() variants for tls --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/1f7e894f5b293f97dc99e1b7e5d0615… Patch: https://github.com/kamailio/kamailio/commit/1f7e894f5b293f97dc99e1b7e5d0615… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 69defa1f26..b6fcc96681 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2930,7 +2930,7 @@ static int ki_t_relay_to_proto(sip_msg_t *msg, str *sproto) proto = PROTO_UDP; } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { proto = PROTO_TCP; - } else if (strncasecmp(sproto->s, "TLS", 3)) { + } else if (strncasecmp(sproto->s, "TLS", 3) == 0) { proto = PROTO_TLS; } else { LM_ERR("bad protocol specified <%s>\n", sproto->s); @@ -2955,7 +2955,7 @@ static int ki_t_relay_to_proto_addr(sip_msg_t *msg, str *sproto, str *host, int proto = PROTO_UDP; } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { proto = PROTO_TCP; - } else if (strncasecmp(sproto->s, "TLS", 3)) { + } else if (strncasecmp(sproto->s, "TLS", 3) == 0) { proto = PROTO_TLS; } else { LM_ERR("bad protocol specified <%s>\n", sproto->s);

1 0

git:5.6:26d5639f: xlog: docs - updated section ids
by Daniel-Constantin Mierla 16 May '22

16 May '22

Module: kamailio Branch: 5.6 Commit: 26d5639f8a81bd797cb409c3170aee2bc0428d8e URL: https://github.com/kamailio/kamailio/commit/26d5639f8a81bd797cb409c3170aee2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T19:12:00+02:00 xlog: docs - updated section ids (cherry picked from commit c6ecf1d18a41167e54dbcfca566ebf7eb8fa5b74) --- Modified: src/modules/xlog/doc/xlog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/26d5639f8a81bd797cb409c3170aee2… Patch: https://github.com/kamailio/kamailio/commit/26d5639f8a81bd797cb409c3170aee2… --- diff --git a/src/modules/xlog/doc/xlog_admin.xml b/src/modules/xlog/doc/xlog_admin.xml index 3fcda4c105..ba43403308 100644 --- a/src/modules/xlog/doc/xlog_admin.xml +++ b/src/modules/xlog/doc/xlog_admin.xml @@ -149,7 +149,7 @@ modparam("xlog", "long_format", 1) </programlisting> </example> </section> - <section id="xlog.p.varname"> + <section id="xlog.p.prefix"> <title><varname>prefix</varname> (str)</title> <para> Prefix to be output before the log message. @@ -168,7 +168,7 @@ modparam("xlog", "prefix", "-xlog: ") </programlisting> </example> </section> - <section id="xlog.p.varname"> + <section id="xlog.p.prefix_mode"> <title><varname>prefix_mode</varname> (str)</title> <para> control behaviour of <varname>prefix</varname> value.

1 0

git:5.6:213e3a85: kazoo: docs - removed unnecessary xinclude entity
by Daniel-Constantin Mierla 16 May '22

16 May '22

Module: kamailio Branch: 5.6 Commit: 213e3a850987f53913c9545dcde259d897780fd1 URL: https://github.com/kamailio/kamailio/commit/213e3a850987f53913c9545dcde259d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T19:11:52+02:00 kazoo: docs - removed unnecessary xinclude entity (cherry picked from commit 8caf4ece54623fb3b85cc5c98315d9e53ae56fbf) --- Modified: src/modules/kazoo/doc/kazoo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/213e3a850987f53913c9545dcde259d… Patch: https://github.com/kamailio/kamailio/commit/213e3a850987f53913c9545dcde259d… --- diff --git a/src/modules/kazoo/doc/kazoo_admin.xml b/src/modules/kazoo/doc/kazoo_admin.xml index 4565c078a0..2d47ce83c1 100644 --- a/src/modules/kazoo/doc/kazoo_admin.xml +++ b/src/modules/kazoo/doc/kazoo_admin.xml @@ -6,9 +6,6 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]>

1 0

git:master:8caf4ece: kazoo: docs - removed unnecessary xinclude entity
by Daniel-Constantin Mierla 16 May '22

16 May '22

Module: kamailio Branch: master Commit: 8caf4ece54623fb3b85cc5c98315d9e53ae56fbf URL: https://github.com/kamailio/kamailio/commit/8caf4ece54623fb3b85cc5c98315d9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T18:51:25+02:00 kazoo: docs - removed unnecessary xinclude entity --- Modified: src/modules/kazoo/doc/kazoo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8caf4ece54623fb3b85cc5c98315d9e… Patch: https://github.com/kamailio/kamailio/commit/8caf4ece54623fb3b85cc5c98315d9e… --- diff --git a/src/modules/kazoo/doc/kazoo_admin.xml b/src/modules/kazoo/doc/kazoo_admin.xml index 4565c078a0..2d47ce83c1 100644 --- a/src/modules/kazoo/doc/kazoo_admin.xml +++ b/src/modules/kazoo/doc/kazoo_admin.xml @@ -6,9 +6,6 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]>

1 0

git:master:c6ecf1d1: xlog: docs - updated section ids
by Daniel-Constantin Mierla 16 May '22

16 May '22

Module: kamailio Branch: master Commit: c6ecf1d18a41167e54dbcfca566ebf7eb8fa5b74 URL: https://github.com/kamailio/kamailio/commit/c6ecf1d18a41167e54dbcfca566ebf7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T18:51:51+02:00 xlog: docs - updated section ids --- Modified: src/modules/xlog/doc/xlog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c6ecf1d18a41167e54dbcfca566ebf7… Patch: https://github.com/kamailio/kamailio/commit/c6ecf1d18a41167e54dbcfca566ebf7… --- diff --git a/src/modules/xlog/doc/xlog_admin.xml b/src/modules/xlog/doc/xlog_admin.xml index 3fcda4c105..ba43403308 100644 --- a/src/modules/xlog/doc/xlog_admin.xml +++ b/src/modules/xlog/doc/xlog_admin.xml @@ -149,7 +149,7 @@ modparam("xlog", "long_format", 1) </programlisting> </example> </section> - <section id="xlog.p.varname"> + <section id="xlog.p.prefix"> <title><varname>prefix</varname> (str)</title> <para> Prefix to be output before the log message. @@ -168,7 +168,7 @@ modparam("xlog", "prefix", "-xlog: ") </programlisting> </example> </section> - <section id="xlog.p.varname"> + <section id="xlog.p.prefix_mode"> <title><varname>prefix_mode</varname> (str)</title> <para> control behaviour of <varname>prefix</varname> value.

1 0

git:master:d32f8f52: core: tcp main - check setsockopt() result for SO_LINGER
by Daniel-Constantin Mierla 16 May '22

16 May '22

Module: kamailio Branch: master Commit: d32f8f52198d04a90f53a221a1797faa1a0f39af URL: https://github.com/kamailio/kamailio/commit/d32f8f52198d04a90f53a221a1797fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T13:48:28+02:00 core: tcp main - check setsockopt() result for SO_LINGER --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/d32f8f52198d04a90f53a221a1797fa… Patch: https://github.com/kamailio/kamailio/commit/d32f8f52198d04a90f53a221a1797fa… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index b046d9a848..9edbe79a36 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3199,8 +3199,7 @@ int tcp_init(struct socket_info* sock_info) inline static void tcpconn_close_main_fd(struct tcp_connection* tcpconn) { int fd; - - + fd=tcpconn->s; #ifdef USE_TLS if (tcpconn->type==PROTO_TLS || tcpconn->type==PROTO_WSS) @@ -3214,7 +3213,10 @@ inline static void tcpconn_close_main_fd(struct tcp_connection* tcpconn) .l_onoff = 1, /* non-zero value enables linger option in kernel */ .l_linger = 0, /* timeout interval in seconds */ }; - setsockopt(fd, SOL_SOCKET, SO_LINGER, &sl, sizeof(sl)); + if(setsockopt(fd, SOL_SOCKET, SO_LINGER, &sl, sizeof(sl))<0) { + LM_WARN("setsockopt SO_LINGER %d - %s\n", errno, + strerror(errno)); + } } if (unlikely(tcp_safe_close(fd)<0)) LM_ERR("(%p): %s close(%d) failed (flags 0x%x): %s (%d)\n", tcpconn,

1 0

git: new commits in branch 5.6
by Daniel-Constantin Mierla 16 May '22

16 May '22

- URL: https://github.com/kamailio/kamailio/commit/2f27c6f6765c5356cbfff2e2a81da62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:01:44+02:00 ipops: warning when too many dns containers are created (cherry picked from commit 0f9a833fcc7cbc306a5d47413f6449ccc5a37f59) - URL: https://github.com/kamailio/kamailio/commit/b9418cfae910264696b9b6c6c002e9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:01:54+02:00 ipops: add dns container in dns_update_pv() if not created before - dns context creation relied on using the dns variable in some way, the main purpose of dns_update_pv() being to fill the variable, but one may want to use it for testing only (cherry picked from commit 543cd8f897bc43d5fe1eb4c562d8351b32778209) - URL: https://github.com/kamailio/kamailio/commit/6cb54c218ae8d088720061abe1f8481… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:02:12+02:00 doc: Fix typos (cherry picked from commit 5497d15766d25625b4704a3bd3e884ef2f1149da) - URL: https://github.com/kamailio/kamailio/commit/6051768c472f5a30467866f38966d0b… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:02:21+02:00 pkg: Fix typos (cherry picked from commit e8bdf2b99de1ecfe8f276e2d9bed54e01588210b) - URL: https://github.com/kamailio/kamailio/commit/d7fcb3178bba4e2084662ddc3a2c43b… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:02:30+02:00 core: Fix typos (cherry picked from commit 5dd8f0a6ff30fd3aa917a98b006106bef61506e5) - URL: https://github.com/kamailio/kamailio/commit/b9f29aff97c4a5a3a78560b915a9325… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:02:38+02:00 lib: Fix typos (cherry picked from commit 4b2b8925c2c8f195f135ff262f7b45601b111b0d) - URL: https://github.com/kamailio/kamailio/commit/a3d4672795583e5fd955a7c6f549da0… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:02:47+02:00 acc: Fix typos (cherry picked from commit 5e71d0100ff93e345d31b7210e93be92cde88111) - URL: https://github.com/kamailio/kamailio/commit/141183abadd2e0cc6484ef213cbb122… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:02:55+02:00 auth: Fix typos (cherry picked from commit ba3f7d5157819d55a67a054de1b7d0f8fc521140) - URL: https://github.com/kamailio/kamailio/commit/ef7d6def2802014f03a2e1b45c5af4e… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:03:05+02:00 ctl: Fix typos (cherry picked from commit 4caf7e70c09a5b61f5c28b89fa1ea5c951e4cbc0) - URL: https://github.com/kamailio/kamailio/commit/3349a521487c0b39f3338948ee9a13c… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:03:25+02:00 ldap: Fix typos (cherry picked from commit f6da37aa7dec1cdc5a737ed354a68ae15cfc7a43) - URL: https://github.com/kamailio/kamailio/commit/ceb88c9a302ad87f951d786eb411907… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:03:35+02:00 pike: Fix typos (cherry picked from commit b94f8da598ef99d06a0db8f9bb2f9ca29a198740) - URL: https://github.com/kamailio/kamailio/commit/668a2f8e80b0e8eadfb37eeb5625070… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:04:30+02:00 sanity: Fix typos (cherry picked from commit c5ff6d9638b1033d2536ed46a7d254c016d8b103) - URL: https://github.com/kamailio/kamailio/commit/73df223b4e78a422f3c3c32ed97266b… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:04:47+02:00 tls: Fix typos (cherry picked from commit ff9b030be39f82d0e952301ddd0b61a0de5a8041) - URL: https://github.com/kamailio/kamailio/commit/af6533f0797601dd710ce254adba17c… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:07:17+02:00 uid_auth_db: Fix typos (cherry picked from commit f72c574372abf4c0286799137896a247ed6269b6) - URL: https://github.com/kamailio/kamailio/commit/d9c87c114b32cfa8af676685557183a… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2022-05-16T10:17:45+02:00 userblocklist: fix restart errors (cherry picked from commit 778374aba27d81058869dba18b5dd0833893056a) - URL: https://github.com/kamailio/kamailio/commit/616026b4888c4e8b3e42cdb104642e7… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-16T10:18:04+02:00 userblocklist: fix function comment, related to gh #3102 (cherry picked from commit a21c929a389c6e5f85e9166d01adb0d474c6ebaf) - URL: https://github.com/kamailio/kamailio/commit/b90b950712b841a1ce477cd6dd1f8db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:18:50+02:00 app_jsdt: duktape interpreter upgraded to v2.7.0 (cherry picked from commit 3bd6eb0d7322b9f4654656b3f0b5080cd44c6e5b) - URL: https://github.com/kamailio/kamailio/commit/150a66f51ade6484d570a877ff96928… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:19:04+02:00 app_squirrel: updated squirrel interpreter to latest git version (3.2+) (cherry picked from commit c5da175fd79ecd17752bb2fd8af2b5a65739e58e) - URL: https://github.com/kamailio/kamailio/commit/f1c7d72f00a2c65c65241d97e2901af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:19:36+02:00 usrloc: connect to db for main process in PROC_POSTCHILDINIT child init (cherry picked from commit 4780d46976a7a392f23af0d89f05855d473bcb30) - URL: https://github.com/kamailio/kamailio/commit/a1c0788f33485bbc80db8993c9fcdfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:26:25+02:00 dialog: open db connection in POSTCHILDINIT callback for DB_MODE_SHUTDOWN (cherry picked from commit 1ff86ffceede46c7a67fec92c8319c34c916a545) - URL: https://github.com/kamailio/kamailio/commit/d40aa29915b4621b783384a9b3a69d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:26:37+02:00 mtree: remove single-used small function (cherry picked from commit 2e38d1a5a1178ca437d5256d7619fee251b06d6f) - URL: https://github.com/kamailio/kamailio/commit/0c7abf1010afe72da8d4c117937e6fd… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-16T10:26:49+02:00 geoip2: log errors for cases where the container could not evaluated and add docs - log errors for cases where the container could not evaluated due to missing initialization of the pvc container because no actual access is done in the cfg - add documentation describing that at least one access to the container is necessary for the match function to work correctly (cherry picked from commit 0c16d6824fda729bf481e300992fb6bad057c89d) - URL: https://github.com/kamailio/kamailio/commit/43a8f66903ce11f9017a6c7e2bdfe22… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2022-05-16T10:27:56+02:00 siptrace: fix hardcoded PROTO_UDP in duplicate_uri module parameter - possibility to switch to other then UDP transport protocol in diplicate_uri (cherry picked from commit 2d24221e3b409a13f3724267860d8f8411ae063e) - URL: https://github.com/kamailio/kamailio/commit/bf65c0e229e2bcf2967d3e5fb0a43da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:28:16+02:00 dialog: docs -remark wabout to-tag parameter for dlg_get() (cherry picked from commit b498a0ad470a83f1e21c45a585926509827dda50) - URL: https://github.com/kamailio/kamailio/commit/f8365576dd8291c924870f43b765196… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:29:03+02:00 Makefile.defs: version set to 5.6.0-rc1

1 0

git:master:2538ddd3: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 16 May '22

16 May '22

Module: kamailio Branch: master Commit: 2538ddd36245c86424ef4911c7bc8bf65f99eefb URL: https://github.com/kamailio/kamailio/commit/2538ddd36245c86424ef4911c7bc8bf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-16T09:16:18+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/2538ddd36245c86424ef4911c7bc8bf… Patch: https://github.com/kamailio/kamailio/commit/2538ddd36245c86424ef4911c7bc8bf… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 73e16a5977..bae07dc79d 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1705,7 +1705,8 @@ dlg_bridge("sip:user@kamailio.org", "sip:annoucement@kamailio.org", Meaning of the parameters is as follows: * callid - SIP call-id. * ftag - SIP From tag. - * ttag - SIP To tag. + * ttag - SIP To tag (it can be empty string to match a dialog during + call setup (eg., match for CANCEL)). This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE.

1 0

git:master:b498a0ad: dialog: docs -remark wabout to-tag parameter for dlg_get()
by Daniel-Constantin Mierla 16 May '22

16 May '22

Module: kamailio Branch: master Commit: b498a0ad470a83f1e21c45a585926509827dda50 URL: https://github.com/kamailio/kamailio/commit/b498a0ad470a83f1e21c45a58592650… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T09:09:42+02:00 dialog: docs -remark wabout to-tag parameter for dlg_get() --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b498a0ad470a83f1e21c45a58592650… Patch: https://github.com/kamailio/kamailio/commit/b498a0ad470a83f1e21c45a58592650… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index f8cbfb2e9c..5b8d99b180 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2081,7 +2081,8 @@ dlg_bridge("sip:user@kamailio.org", "sip:annoucement@kamailio.org", </para> </listitem> <listitem> - <para><emphasis>ttag</emphasis> - SIP To tag. + <para><emphasis>ttag</emphasis> - SIP To tag (it can be empty string + to match a dialog during call setup (eg., match for CANCEL)). </para> </listitem> </itemizedlist>

1 0

[kamailio/kamailio] core: add an option to trigger also an RST on tcp connection close (PR #3101)
by Rick Barenthin 16 May '22

16 May '22

#### 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  We have seen that in deployments where there are strict port requirements on both side, there are tcp connections in TIME_WAIT state causing no fresh TCP connections possible until the TIME_WAIT is gone. In a lot of these case the clients are sending from them self a RST after they send a FIN,ACK from there side but some aren't doing this. The basic idea of this PR is to give an extra option for the tcp configuration from the cfg to trigger always an RST on connection close from Kamailio side. This currently done by enabling SO_LINGER with a value of 0 just before close. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3101 -- Commit Summary -- * core: add an option to trigger also an RST on tcp connection close -- File Changes -- M src/core/cfg.lex (2) M src/core/cfg.y (9) M src/core/tcp_main.c (7) M src/core/tcp_options.c (3) M src/core/tcp_options.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3101.patch https://github.com/kamailio/kamailio/pull/3101.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3101 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3101(a)github.com>

2 1

git:master:e46c90c5: core: add an option to trigger also an RST on tcp connection close
by Daniel-Constantin Mierla 16 May '22

16 May '22

Module: kamailio Branch: master Commit: e46c90c5ca98a9fba08382686c25c707efd57bf3 URL: https://github.com/kamailio/kamailio/commit/e46c90c5ca98a9fba08382686c25c70… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T08:01:02+02:00 core: add an option to trigger also an RST on tcp connection close - This gives an option to also send RST in case kamailio closes the connection. There are cases where a FIN,ACK back forth leaves the connection in the host in TIME_WAIT state, but the ports on both sides are fixed. This leads to no request can send until the TIME_WAIT state is gone. --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/tcp_main.c Modified: src/core/tcp_options.c Modified: src/core/tcp_options.h --- Diff: https://github.com/kamailio/kamailio/commit/e46c90c5ca98a9fba08382686c25c70… Patch: https://github.com/kamailio/kamailio/commit/e46c90c5ca98a9fba08382686c25c70… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index e5e269ebc0..fc259b2147 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -421,6 +421,7 @@ TCP_OPT_CRLF_PING "tcp_crlf_ping" TCP_OPT_ACCEPT_NO_CL "tcp_accept_no_cl" TCP_OPT_ACCEPT_HEP3 "tcp_accept_hep3" TCP_OPT_ACCEPT_HAPROXY "tcp_accept_haproxy" +TCP_OPT_CLOSE_RST "tcp_close_rst" TCP_CLONE_RCVBUF "tcp_clone_rcvbuf" TCP_REUSE_PORT "tcp_reuse_port" TCP_WAIT_DATA "tcp_wait_data" @@ -917,6 +918,7 @@ IMPORTFILE "import_file" return TCP_OPT_ACCEPT_HEP3; } <INITIAL>{TCP_OPT_ACCEPT_HAPROXY} { count(); yylval.strval=yytext; return TCP_OPT_ACCEPT_HAPROXY; } +<INITIAL>{TCP_OPT_CLOSE_RST} { count(); yylval.strval=yytext; return TCP_OPT_CLOSE_RST; } <INITIAL>{TCP_CLONE_RCVBUF} { count(); yylval.strval=yytext; return TCP_CLONE_RCVBUF; } <INITIAL>{TCP_REUSE_PORT} { count(); yylval.strval=yytext; return TCP_REUSE_PORT; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 7db37bbc09..5b5c51258d 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -450,6 +450,7 @@ extern char *default_routename; %token TCP_OPT_ACCEPT_NO_CL %token TCP_OPT_ACCEPT_HEP3 %token TCP_OPT_ACCEPT_HAPROXY +%token TCP_OPT_CLOSE_RST %token TCP_CLONE_RCVBUF %token TCP_REUSE_PORT %token TCP_WAIT_DATA @@ -1301,6 +1302,14 @@ assign_stm: #endif } | TCP_OPT_ACCEPT_HAPROXY EQUAL error { yyerror("boolean value expected"); } + | TCP_OPT_CLOSE_RST EQUAL NUMBER { + #ifdef USE_TCP + tcp_default_cfg.close_rst=$3; + #else + warn("tcp support not compiled in"); + #endif + } + | TCP_OPT_CLOSE_RST EQUAL error { yyerror("boolean value expected"); } | TCP_CLONE_RCVBUF EQUAL NUMBER { #ifdef USE_TCP diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index c60ce7f2b2..b046d9a848 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3209,6 +3209,13 @@ inline static void tcpconn_close_main_fd(struct tcp_connection* tcpconn) #ifdef TCP_FD_CACHE if (likely(cfg_get(tcp, tcp_cfg, fd_cache))) shutdown(fd, SHUT_RDWR); #endif /* TCP_FD_CACHE */ + if(unlikely(cfg_get(tcp, tcp_cfg, close_rst))) { + struct linger sl = { + .l_onoff = 1, /* non-zero value enables linger option in kernel */ + .l_linger = 0, /* timeout interval in seconds */ + }; + setsockopt(fd, SOL_SOCKET, SO_LINGER, &sl, sizeof(sl)); + } if (unlikely(tcp_safe_close(fd)<0)) LM_ERR("(%p): %s close(%d) failed (flags 0x%x): %s (%d)\n", tcpconn, su2a(&tcpconn->rcv.src_su, sizeof(tcpconn->rcv.src_su)), diff --git a/src/core/tcp_options.c b/src/core/tcp_options.c index 54f23a0cdb..211bcfb1e9 100644 --- a/src/core/tcp_options.c +++ b/src/core/tcp_options.c @@ -110,6 +110,8 @@ static cfg_def_t tcp_cfg_def[] = { "reuse TCP ports "}, { "wait_data_ms", CFG_VAR_INT | CFG_ATOMIC, 0, 7200000, 0, 0, "wait for data on new tcp connetions (milliseconds)"}, + { "close_rst", CFG_VAR_INT | CFG_READONLY, 0, 1, 0, 0, + "trigger an RST on connection close"}, /* internal and/or "fixed" versions of some vars (not supposed to be writeable, read will provide only debugging value*/ { "rd_buf_size", CFG_VAR_INT | CFG_ATOMIC, 512, 16777216, 0, 0, @@ -167,6 +169,7 @@ void init_tcp_options() tcp_default_cfg.wq_blk_size=DEFAULT_TCP_WBUF_SIZE; tcp_default_cfg.reuse_port=0; tcp_default_cfg.wait_data_ms=5000; + tcp_default_cfg.close_rst=0; } diff --git a/src/core/tcp_options.h b/src/core/tcp_options.h index 284956647b..dd4d8ac20c 100644 --- a/src/core/tcp_options.h +++ b/src/core/tcp_options.h @@ -139,6 +139,7 @@ struct cfg_group_tcp{ int accept_no_cl; /* on/off - accept messages without content-length */ int reuse_port; /* enable SO_REUSEPORT */ int wait_data_ms; /* wait for data in milliseconds */ + int close_rst; /* on /off trigger an RST on connection close */ /* internal, "fixed" vars */ unsigned int rd_buf_size; /* read buffer size (should be > max. datagram)*/

1 0

[kamailio/kamailio] siptrace: fix hardcoded PROTO_UDP in duplicate_uri module parameter (PR #3108)
by Dennis 16 May '22

16 May '22

Possibility to switch to other then UDP transport protocol in diplicate_uri   #### 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) - [ ] 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 Sometimes it's preferable to do the duplication over TCP or another transport, this little fix removes the hard-coded UDP from the diplicate_uri module parameter. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3108 -- Commit Summary -- * siptrace: fix hardcoded PROTO_UDP in duplicate_uri module parameter -- File Changes -- M src/modules/siptrace/siptrace_send.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3108.patch https://github.com/kamailio/kamailio/pull/3108.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3108 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3108(a)github.com>

2 1

git:master:2d24221e: siptrace: fix hardcoded PROTO_UDP in duplicate_uri module parameter
by Daniel-Constantin Mierla 16 May '22

16 May '22

Module: kamailio Branch: master Commit: 2d24221e3b409a13f3724267860d8f8411ae063e URL: https://github.com/kamailio/kamailio/commit/2d24221e3b409a13f3724267860d8f8… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T08:00:07+02:00 siptrace: fix hardcoded PROTO_UDP in duplicate_uri module parameter - possibility to switch to other then UDP transport protocol in diplicate_uri --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/2d24221e3b409a13f3724267860d8f8… Patch: https://github.com/kamailio/kamailio/commit/2d24221e3b409a13f3724267860d8f8… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index ed05cb0b51..a2b5390838 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -305,7 +305,7 @@ int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) if(!dst2) { /* create a temporary proxy from dst param */ - dst.proto = PROTO_UDP; + dst.proto = trace_dup_uri->proto; p = mk_proxy(&trace_dup_uri->host, (trace_dup_uri->port_no) ? trace_dup_uri->port_no : SIP_PORT, dst.proto); if(p == 0) {

1 0

git:master:a1ea2c0d: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 13 May '22

13 May '22

Module: kamailio Branch: master Commit: a1ea2c0d49f56154af5ba1028d7340ea3ed1ae42 URL: https://github.com/kamailio/kamailio/commit/a1ea2c0d49f56154af5ba1028d7340e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-13T16:16:25+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/a1ea2c0d49f56154af5ba1028d7340e… Patch: https://github.com/kamailio/kamailio/commit/a1ea2c0d49f56154af5ba1028d7340e…

1 0

git:master:1144c2e9: pv: allow xavp_push_dst() in request/branch/failure_rotue
by Daniel-Constantin Mierla 13 May '22

13 May '22

Module: kamailio Branch: master Commit: 1144c2e9bfa99e817acff378967d689d356c216b URL: https://github.com/kamailio/kamailio/commit/1144c2e9bfa99e817acff378967d689… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-13T16:07:04+02:00 pv: allow xavp_push_dst() in request/branch/failure_rotue --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/1144c2e9bfa99e817acff378967d689… Patch: https://github.com/kamailio/kamailio/commit/1144c2e9bfa99e817acff378967d689… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 717c8ad530..49d80286a9 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -695,7 +695,7 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"xavp_push_dst", (cmd_function)w_xavp_push_dst, 1, fixup_spve_null, fixup_free_spve_null, - ANY_ROUTE}, + REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, {"sbranch_set_ruri", (cmd_function)w_sbranch_set_ruri, 0, 0, 0, ANY_ROUTE }, {"sbranch_append", (cmd_function)w_sbranch_append, 0, 0, 0,

1 0

git:master:8cb05b21: pv: xavp_push_dst(xname) function
by Daniel-Constantin Mierla 13 May '22

13 May '22

Module: kamailio Branch: master Commit: 8cb05b21a6683a569563c72eeba92f3054b4d31e URL: https://github.com/kamailio/kamailio/commit/8cb05b21a6683a569563c72eeba92f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-13T15:52:26+02:00 pv: xavp_push_dst(xname) function - push a destination from XAVP attributes --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/8cb05b21a6683a569563c72eeba92f3… Patch: https://github.com/kamailio/kamailio/commit/8cb05b21a6683a569563c72eeba92f3… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 907f45b2c4..717c8ad530 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -29,6 +29,7 @@ #include "../../core/mod_fix.h" #include "../../core/xavp.h" #include "../../core/kemi.h" +#include "../../core/dset.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" #include "../../core/strutils.h" @@ -611,6 +612,7 @@ static int w_xavi_rm(sip_msg_t *msg, char *prname, char *p2); static int w_xavi_child_rm(sip_msg_t *msg, char *prname, char *pcname); static int w_xavp_lshift(sip_msg_t *msg, char *pxname, char *pidx); +static int w_xavp_push_dst(sip_msg_t *msg, char *pxname, char *p2); int pv_xavp_copy_fixup(void** param, int param_no); int pv_evalx_fixup(void** param, int param_no); @@ -691,6 +693,9 @@ static cmd_export_t cmds[]={ {"xavp_lshift", (cmd_function)w_xavp_lshift, 2, fixup_spve_igp, fixup_free_spve_igp, ANY_ROUTE}, + {"xavp_push_dst", (cmd_function)w_xavp_push_dst, + 1, fixup_spve_null, fixup_free_spve_null, + ANY_ROUTE}, {"sbranch_set_ruri", (cmd_function)w_sbranch_set_ruri, 0, 0, 0, ANY_ROUTE }, {"sbranch_append", (cmd_function)w_sbranch_append, 0, 0, 0, @@ -943,6 +948,84 @@ static int w_xavp_lshift(sip_msg_t *msg, char *pxname, char *pidx) return ki_xavp_lshift(msg, &xname, idx); } +/** + * + */ +static int ki_xavp_push_dst(sip_msg_t *msg, str *xname) +{ + sr_xavp_t *rxavp = NULL; + sr_xavp_t *lxavp = NULL; + str fxname = STR_NULL; + socket_info_t *si; + + rxavp = xavp_get(xname, NULL); + if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { + LM_DBG("no xavp with destination attributes\n"); + return -1; + } + + /* retrieve attributes from sub list */ + rxavp = rxavp->val.v.xavp; + + STR_STATIC_SET(fxname, "uri") + lxavp = xavp_get(&fxname, rxavp); + if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_STR) { + LM_DBG("xavp uri field in next destination record (%p)\n", lxavp); + if(rewrite_uri(msg, &lxavp->val.v.s) < 0) { + LM_ERR("error while setting r-uri with: %.*s\n", + lxavp->val.v.s.len, lxavp->val.v.s.s); + return -1; + } + } + + STR_STATIC_SET(fxname, "dsturi") + lxavp = xavp_get(&fxname, rxavp); + if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_STR) { + LM_DBG("xavp dsturi field in next destination record (%p)\n", lxavp); + if(set_dst_uri(msg, &lxavp->val.v.s) < 0) { + LM_ERR("error while setting dst uri with: %.*s\n", + lxavp->val.v.s.len, lxavp->val.v.s.s); + return -1; + } + /* dst_uri changes, so it makes sense to re-use the current uri for + * forking */ + ruri_mark_new(); /* re-use uri for serial forking */ + } + + STR_STATIC_SET(fxname, "socket") + lxavp = xavp_get(&fxname, rxavp); + if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_STR) { + si = ksr_get_socket_by_address(&lxavp->val.v.s); + if(si != NULL) { + set_force_socket(msg, si); + } + } else { + STR_STATIC_SET(fxname, "sockptr") + lxavp = xavp_get(&fxname, rxavp); + if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_VPTR) { + LM_DBG("socket enforced in next destination record\n"); + set_force_socket(msg, lxavp->val.v.vptr); + } + } + + return 1; +} + +/** + * + */ +static int w_xavp_push_dst(sip_msg_t *msg, char *pxname, char *p2) +{ + str xname = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)pxname, &xname)<0) { + LM_ERR("failed to get the xavp name\n"); + return -1; + } + + return ki_xavp_push_dst(msg, &xname); +} + static int ki_xavu_print(sip_msg_t* msg) { xavu_print_list(NULL); @@ -3222,6 +3305,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_push_dst"), + SR_KEMIP_INT, ki_xavp_push_dst, + { 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

git:master:33c3f355: pv: docs for xavp_push_dst()
by Daniel-Constantin Mierla 13 May '22

13 May '22

Module: kamailio Branch: master Commit: 33c3f35544489ca367290dbf95d4c5ab11e5adc4 URL: https://github.com/kamailio/kamailio/commit/33c3f35544489ca367290dbf95d4c5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-13T16:03:40+02:00 pv: docs for xavp_push_dst() --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/33c3f35544489ca367290dbf95d4c5a… Patch: https://github.com/kamailio/kamailio/commit/33c3f35544489ca367290dbf95d4c5a… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index bc36df564b..409ecaa4da 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -765,6 +765,48 @@ $xavp(n) = 20; $xavp(n) = 30; xavp_lshift("n", "1"); # results in: $xavp(n) having the list of values 20 30 10 +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_push_dst"> + <title> + <function moreinfo="none">xavp_push_dst(xname)</function> + </title> + <para> + Set destination fields from XAVP attributes. + </para> + <para> + The first parameter has to be the name of XAVP in the root list. + </para> + <para> + The parameters can be with variables. + </para> + <para> + The attributes that can be stored in the XAVP fields: + </para> + <itemizedlist> + <listitem> + <para>uri: SIP URI address to set R-URI</para> + </listitem> + <listitem> + <para>dsturi: SIP URI address to set DST-URI</para> + </listitem> + <listitem> + <para>socket: listen address to set outgoing socket</para> + </listitem> + </itemizedlist> + <para> + Function can be used from REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE. + </para> + <example> + <title><function>xavp_push_dst</function> usage</title> + <programlisting format="linespecific"> +... +$xavp(dst=>uri) = "sip:alice@server.com"; +$xavp(dst[0]=>dsturi) = "sip:proxy.com"; +$xavp(dst[0]=>socket) = "udp:1.2.3.4:5060"; +xavp_push_dst("dst"); ... </programlisting> </example>

1 0

git:master:ae40acf6: core: socket info - function to get socket by listen or advertise
by Daniel-Constantin Mierla 13 May '22

13 May '22

Module: kamailio Branch: master Commit: ae40acf61a5c666db5ff9c55f2ff9b0770418a52 URL: https://github.com/kamailio/kamailio/commit/ae40acf61a5c666db5ff9c55f2ff9b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-13T15:51:51+02:00 core: socket info - function to get socket by listen or advertise --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/ae40acf61a5c666db5ff9c55f2ff9b0… Patch: https://github.com/kamailio/kamailio/commit/ae40acf61a5c666db5ff9c55f2ff9b0… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index c9dd89118d..c263f9fcb9 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -946,6 +946,19 @@ socket_info_t* ksr_get_socket_by_index(int idx) return NULL; } +socket_info_t* ksr_get_socket_by_address(str *sockstr) +{ + socket_info_t *si = NULL; + + si = ksr_get_socket_by_listen(sockstr); + + if(si!=NULL) { + return si; + } + + return ksr_get_socket_by_advertise(sockstr); +} + /* checks if the proto:port is one of the ports we listen on * and returns the corresponding socket_info structure. * if proto==0 (PROTO_NONE) the protocol is ignored diff --git a/src/core/socket_info.h b/src/core/socket_info.h index cbc630b9b8..134f2d47d8 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -107,6 +107,7 @@ socket_info_t* ksr_get_socket_by_name(str *sockname); socket_info_t* ksr_get_socket_by_listen(str *sockstr); socket_info_t* ksr_get_socket_by_advertise(str *sockstr); socket_info_t* ksr_get_socket_by_index(int idx); +socket_info_t* ksr_get_socket_by_address(str *sockstr); struct socket_info** get_sock_info_list(unsigned short proto);

1 0

[kamailio/kamailio] Failing Audio stream on Kamailio+webrtc with integration to asterisk server. (Issue #3105)
by kelvinpressone 13 May '22

13 May '22

Summary: We have a kamailio server as our sip proxy server, sip firewall with websocket and RTP engine configured on it (the Kamailio Server). But we experience one way audio, no audio, hang up after 30s, when we try making calls between internal extensions (eg extension 100 to call extension 105) and external calls (eg extension 100 to call mobile number 09056925668) as well. The call flow is as: Webrtc client<------->Kamailio1+rtpengine<-----Asterisk+rtpengine---->Kamailio2<-------->Telco Provider The asterisk communication between all three boxes is via local IP (All ports open between them). The Kamailio 1 box where we have our sip registration cache, has rtp ports and wss port open on the internet. Asterisk 18.9.0 Kamailio 5.5.3 + RTPengine 10.4.0.0 Debian 11 bullseye Kindly see attached below a diagram depicting the voip network flow and also attached are logs files for the webrtc client and server side. ![MrOpee](https://user-images.githubusercontent.com/105465203/168183786-c10a822b-402b-4666-be10-b2bc5ad98e85.png) [ServersideWebrtc-external2.txt](https://github.com/kamailio/kamailio/files/… [Clientside(webrtc2external)__III.txt](https://github.com/kamailio/kamailio/… Thank you. @rfuchs @doublec @ibc @fredposner @linuxmaniac @miconda -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3105 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3105(a)github.com>

2 3

git:master:490eb07a: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 12 May '22

12 May '22

Module: kamailio Branch: master Commit: 490eb07a75567c91f20beaa4833f1df10a9cab1f URL: https://github.com/kamailio/kamailio/commit/490eb07a75567c91f20beaa4833f1df… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-12T19:31:15+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/490eb07a75567c91f20beaa4833f1df… Patch: https://github.com/kamailio/kamailio/commit/490eb07a75567c91f20beaa4833f1df…

1 0

git:master:38365c43: registrar: docs - removed extra closing tag
by Daniel-Constantin Mierla 12 May '22

12 May '22

Module: kamailio Branch: master Commit: 38365c43c2b627587d9aff470f371a0ec76bbba2 URL: https://github.com/kamailio/kamailio/commit/38365c43c2b627587d9aff470f371a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T19:23:06+02:00 registrar: docs - removed extra closing tag --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/38365c43c2b627587d9aff470f371a0… Patch: https://github.com/kamailio/kamailio/commit/38365c43c2b627587d9aff470f371a0… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 15fcc0d1fc..d8a3c88b57 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1465,8 +1465,8 @@ lookup_branches("location"); <emphasis>ultable</emphasis> - name of the usrloc table that is used for the lookup. </para> - <listitem> </listitem> + <listitem> <para> <emphasis>uri</emphasis> - the URI to be searched in location table. </para> @@ -1508,7 +1508,6 @@ lookup_branches("location"); </para> </listitem> </itemizedlist> - </itemizedlist> </listitem> </itemizedlist> <para>

1 0

git:master:4d94b9e0: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 12 May '22

12 May '22

Module: kamailio Branch: master Commit: 4d94b9e0fa7dfeb425f15c2e92e906425c96d810 URL: https://github.com/kamailio/kamailio/commit/4d94b9e0fa7dfeb425f15c2e92e9064… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-12T19:01:19+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/4d94b9e0fa7dfeb425f15c2e92e9064… Patch: https://github.com/kamailio/kamailio/commit/4d94b9e0fa7dfeb425f15c2e92e9064…

1 0

git:master:45d7500a: registrar: proper attribute name for contact record xavp
by Daniel-Constantin Mierla 12 May '22

12 May '22

Module: kamailio Branch: master Commit: 45d7500ace163660047e241df9a7b178638e3329 URL: https://github.com/kamailio/kamailio/commit/45d7500ace163660047e241df9a7b17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T18:49:06+02:00 registrar: proper attribute name for contact record xavp --- Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/45d7500ace163660047e241df9a7b17… Patch: https://github.com/kamailio/kamailio/commit/45d7500ace163660047e241df9a7b17… --- diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index dca26fa30e..5cf0eb6d0f 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -937,7 +937,7 @@ int ki_lookup_xavp(sip_msg_t* msg, str *utname, str* uri, memset(&nxval, 0, sizeof(sr_xval_t)); nxval.type = SR_XTYPE_STR; nxval.v.s = ptr->received; - STR_STATIC_SET(fxname, "socket"); + STR_STATIC_SET(fxname, "dsturi"); if(xavp_add_value(&fxname, &nxval, &cxavp)==NULL) { LM_ERR("failed to add xavp %.*s field\n", fxname.len, fxname.s); goto error;

1 0

git:master:4d478b74: registrar: docs for lookup_xavp(...)
by Daniel-Constantin Mierla 12 May '22

12 May '22

Module: kamailio Branch: master Commit: 4d478b741e8a21365d1e7c0342476f2e77cca34c URL: https://github.com/kamailio/kamailio/commit/4d478b741e8a21365d1e7c0342476f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T18:41:32+02:00 registrar: docs for lookup_xavp(...) --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4d478b741e8a21365d1e7c0342476f2… Patch: https://github.com/kamailio/kamailio/commit/4d478b741e8a21365d1e7c0342476f2… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 50ba66f38f..15fcc0d1fc 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1450,6 +1450,84 @@ lookup_branches("location"); </example> </section> + <section id="registrar.f.lookup_xavp"> + <title> + <function moreinfo="none">lookup_xavp(ultable, uri, rxname, cxname)</function> + </title> + <para> + Similar to lookup(...), but store the location record attributes + in XAVPs. Note that not all contact record fields are stored + </para> + <para>Meaning of the parameters:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>ultable</emphasis> - name of the usrloc table that is used + for the lookup. + </para> + <listitem> + </listitem> + <para> + <emphasis>uri</emphasis> - the URI to be searched in location table. + </para> + </listitem> + <listitem> + <para> + <emphasis>rxname</emphasis> - name of the XAVP to store record + attributes. These are: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>aor</emphasis> - the address of record. + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + <emphasis>cxname</emphasis> - name of the XAVP to store content + attributes, name mapping is done from the perspective of using + them to send out SIP requests. These are: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>uri</emphasis> - the contact address. + </para> + </listitem> + <listitem> + <para> + <emphasis>socket</emphasis> - the socket of the contact record. + </para> + </listitem> + <listitem> + <para> + <emphasis>dsturi</emphasis> - the destination uri of the contact + record (the received field in location contact). + </para> + </listitem> + </itemizedlist> + </itemizedlist> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>lookup_xavp</function> usage</title> + <programlisting format="linespecific"> +... +lookup_xavp("location", "$fu", "rul", "cul"); +xinfo("aor: $xavp(rul=>aor)\n"); +xinfo("number of contacts: $xavp(rul>count)\n"); +xinfo("first contact record - uri: $xavp(cul>uri)\n"); +xinfo("first contact record - socket: $xavp(cul>socket)\n"); +... +</programlisting> + </example> + </section> + <section id="registrar.f.registered"> <title> <function moreinfo="none">registered(domain [, uri [, match_option [, match_action]]])</function>

1 0

git:master:9100baa7: core: str - helerp macros to set str variable with char* value
by Daniel-Constantin Mierla 12 May '22

12 May '22

Module: kamailio Branch: master Commit: 9100baa7e3762b49a339933b2790a9d9cb1128c5 URL: https://github.com/kamailio/kamailio/commit/9100baa7e3762b49a339933b2790a9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T13:51:52+02:00 core: str - helerp macros to set str variable with char* value --- Modified: src/core/str.h --- Diff: https://github.com/kamailio/kamailio/commit/9100baa7e3762b49a339933b2790a9d… Patch: https://github.com/kamailio/kamailio/commit/9100baa7e3762b49a339933b2790a9d… --- diff --git a/src/core/str.h b/src/core/str.h index 063a9e9398..615b35499e 100644 --- a/src/core/str.h +++ b/src/core/str.h @@ -142,6 +142,22 @@ typedef struct _str str; } \ } while(0) +/** + * set str x variable with static value char* v + */ +#define STR_STATIC_SET(x, v) do { \ + (x).s = v; \ + (x).len = sizeof(v) - 1; \ +} while (0); + +/** + * set str x variable with char* v + */ +#define STR_SET(x, v) do { \ + (x).s = v; \ + (x).len = strlen(v); \ +} while (0); + /** * str with value: not null and not empty */

1 0

git:master:19496226: registrar: added lookup_xavp("ultable", "uri", "rxname", "cxname")
by Daniel-Constantin Mierla 12 May '22

12 May '22

Module: kamailio Branch: master Commit: 194962260c4e880a199797fa0d9faf8e766c8d76 URL: https://github.com/kamailio/kamailio/commit/194962260c4e880a199797fa0d9faf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T18:18:14+02:00 registrar: added lookup_xavp("ultable", "uri", "rxname", "cxname") - lookup of uri and store record and contact attributes in xavps --- Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/regpv.c Modified: src/modules/registrar/regpv.h --- Diff: https://github.com/kamailio/kamailio/commit/194962260c4e880a199797fa0d9faf8… Patch: https://github.com/kamailio/kamailio/commit/194962260c4e880a199797fa0d9faf8…

1 0

git:master:67f6a289: pv: declare pv wrapper function with two parameters
by Daniel-Constantin Mierla 12 May '22

12 May '22

Module: kamailio Branch: master Commit: 67f6a2890a38d81dae934e01a2ca536a45625c42 URL: https://github.com/kamailio/kamailio/commit/67f6a2890a38d81dae934e01a2ca536… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T13:20:50+02:00 pv: declare pv wrapper function with two parameters --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/67f6a2890a38d81dae934e01a2ca536… Patch: https://github.com/kamailio/kamailio/commit/67f6a2890a38d81dae934e01a2ca536… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 237ed8c7f5..907f45b2c4 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -601,7 +601,7 @@ static int w_sbranch_set_ruri(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_append(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_reset(sip_msg_t *msg, char p1, char *p2); static int w_var_to_xavp(sip_msg_t *msg, char *p1, char *p2); -static int w_xavp_to_var(sip_msg_t *msg, char *p1); +static int w_xavp_to_var(sip_msg_t *msg, char *p1, char *p2); static int w_xavi_child_seti(sip_msg_t *msg, char *prname, char *pcname, char *pval); @@ -888,7 +888,7 @@ static int ki_var_to_xavp(sip_msg_t *msg, str *varname, str *xname) /** * xavp to script variable */ -static int w_xavp_to_var(sip_msg_t *msg, char *s1) +static int w_xavp_to_var(sip_msg_t *msg, char *s1, char *p2) { str xname = STR_NULL;

1 0

siptrace error
by Luis Azedo 12 May '22

12 May '22

Hi, has anyone seen this error before ? running from master thanks 116(469) ERROR: <core> [main.c:1231]: parse_phostport(): bad protocol in wss: 192.168.1.197:61609 116(469) ERROR: siptrace [siptrace.c:2545]: pv_get_siptrace(): invalid src_addr: wss: 192.168.1.197:61609 116(469) ERROR: <core> [main.c:1231]: parse_phostport(): bad protocol in wss: 10.10.4.159:5065 116(469) ERROR: siptrace [siptrace.c:2554]: pv_get_siptrace(): invalid dst_addr: wss: 10.10.4.159:5065 snippet of config modparam("siptrace", "trace_mode", 1) modparam("siptrace", "trace_init_mode", 1) event_route[siptrace:msg] { if ($sel(cfg_get.kazoo.trace_ignored_methods) != $null) { if($rm =~ $sel(cfg_get.kazoo.trace_ignored_methods)) { xlog("L_DEBUG", "dropping trace for method $rm\n"); drop(); } } if ($sel(cfg_get.kazoo.trace_ignored_ports) != $null) { if($Rp =~ $sel(cfg_get.kazoo.trace_ignored_ports)) { xlog("L_INFO", "dropping trace for port $Rp\n"); drop(); } } #!ifdef KZ_TRACE_IGNORE_INTERNAL if ($siptrace(src_hostip) =~ "127\\.0\\.0\\.1") drop(); if ($siptrace(dst_hostip) =~ "127\\.0\\.0\\.1") drop(); #!endif }

3 2

git:master:69f33615: registrar: kemi functions to get $ulc(...) attributes
by Daniel-Constantin Mierla 12 May '22

12 May '22

Module: kamailio Branch: master Commit: 69f33615874cf3505a6ce9ea9e74be2797bbe433 URL: https://github.com/kamailio/kamailio/commit/69f33615874cf3505a6ce9ea9e74be2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T11:21:46+02:00 registrar: kemi functions to get $ulc(...) attributes --- Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/regpv.c Modified: src/modules/registrar/regpv.h --- Diff: https://github.com/kamailio/kamailio/commit/69f33615874cf3505a6ce9ea9e74be2… Patch: https://github.com/kamailio/kamailio/commit/69f33615874cf3505a6ce9ea9e74be2…

1 0

git:master:9f9fd6ff: pv: kemi function to get $shvinc(name) value
by Daniel-Constantin Mierla 11 May '22

11 May '22

Module: kamailio Branch: master Commit: 9f9fd6ff153fe72aa4bb07f81aa4fbcf67cd9491 URL: https://github.com/kamailio/kamailio/commit/9f9fd6ff153fe72aa4bb07f81aa4fbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-11T16:42:19+02:00 pv: kemi function to get $shvinc(name) value --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_shv.c Modified: src/modules/pv/pv_shv.h --- Diff: https://github.com/kamailio/kamailio/commit/9f9fd6ff153fe72aa4bb07f81aa4fbc… Patch: https://github.com/kamailio/kamailio/commit/9f9fd6ff153fe72aa4bb07f81aa4fbc… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index db832d7419..237ed8c7f5 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -2872,6 +2872,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("shvinc_get"), + SR_KEMIP_XVAL, ki_shvinc_get, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("pv_var_to_xavp"), SR_KEMIP_INT, ki_var_to_xavp, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, diff --git a/src/modules/pv/pv_shv.c b/src/modules/pv/pv_shv.c index 392c4d823d..f3469ccf55 100644 --- a/src/modules/pv/pv_shv.c +++ b/src/modules/pv/pv_shv.c @@ -796,4 +796,34 @@ sr_kemi_xval_t* ki_shv_get(sip_msg_t *msg, str *vname) } } +/** + * + */ +sr_kemi_xval_t* ki_shvinc_get(sip_msg_t *msg, str *vname) +{ + sh_var_t *shv = NULL; + + memset(&_sr_kemi_shv_xval, 0, sizeof(sr_kemi_xval_t)); + + shv = get_shvar_by_name(vname); + if(shv==NULL) { + LM_WARN("$shv(%.*s) is not defined - return value 0\n", + vname->len, vname->s); + _sr_kemi_shv_xval.vtype = SR_KEMIP_INT; + _sr_kemi_shv_xval.v.n = 0; + return &_sr_kemi_shv_xval; + } + + lock_shvar(shv); + if(shv->v.flags&VAR_VAL_STR) { + _sr_kemi_shv_xval.v.n = 0; + } else { + shv->v.value.n++; + _sr_kemi_shv_xval.v.n = shv->v.value.n; + } + unlock_shvar(shv); + _sr_kemi_shv_xval.vtype = SR_KEMIP_INT; + return &_sr_kemi_shv_xval; +} + /* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/src/modules/pv/pv_shv.h b/src/modules/pv/pv_shv.h index 65a4d1afc9..50311f5787 100644 --- a/src/modules/pv/pv_shv.h +++ b/src/modules/pv/pv_shv.h @@ -71,6 +71,7 @@ void rpc_shv_set(rpc_t* rpc, void* c); int ki_shv_seti(sip_msg_t *msg, str *vname, int ival); int ki_shv_sets(sip_msg_t *msg, str *vname, str *sval); sr_kemi_xval_t* ki_shv_get(sip_msg_t *msg, str *vname); +sr_kemi_xval_t* ki_shvinc_get(sip_msg_t *msg, str *vname); #endif

1 0

git:master:6770afc5: pv: use fixup get int value to evaluate the index parameter
by Daniel-Constantin Mierla 11 May '22

11 May '22

Module: kamailio Branch: master Commit: 6770afc5329c18371fb5149eaf5ef2a95f286eff URL: https://github.com/kamailio/kamailio/commit/6770afc5329c18371fb5149eaf5ef2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-11T16:16:47+02:00 pv: use fixup get int value to evaluate the index parameter --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/6770afc5329c18371fb5149eaf5ef2a… Patch: https://github.com/kamailio/kamailio/commit/6770afc5329c18371fb5149eaf5ef2a… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 2113115a15..db832d7419 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -935,7 +935,7 @@ static int w_xavp_lshift(sip_msg_t *msg, char *pxname, char *pidx) LM_ERR("failed to get the xavp name\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)pidx, &idx)<0) { + if(fixup_get_ivalue(msg, (gparam_t*)pidx, &idx)<0) { LM_ERR("failed to get the xavp index\n"); return -1; }

1 0

git:master:eebdabe4: pv: added $shvinc(name) - return incremented value of $shv(inc)
by Daniel-Constantin Mierla 11 May '22

11 May '22

Module: kamailio Branch: master Commit: eebdabe4850d99ff937171d4b723122726c0aa43 URL: https://github.com/kamailio/kamailio/commit/eebdabe4850d99ff937171d4b723122… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-11T16:11:42+02:00 pv: added $shvinc(name) - return incremented value of $shv(inc) - leverage internal mutex to avoid config locks --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_shv.c Modified: src/modules/pv/pv_shv.h --- Diff: https://github.com/kamailio/kamailio/commit/eebdabe4850d99ff937171d4b723122… Patch: https://github.com/kamailio/kamailio/commit/eebdabe4850d99ff937171d4b723122… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 685c0ef9f0..2113115a15 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -526,6 +526,8 @@ static pv_export_t mod_pvs[] = { { {"shv", (sizeof("shv")-1)}, PVT_OTHER, pv_get_shvar, pv_set_shvar, pv_parse_shvar_name, 0, 0, 0}, + { {"shvinc", (sizeof("shvinc")-1)}, PVT_OTHER, pv_get_shvinc, + 0, pv_parse_shvar_name, 0, 0, 0}, { {"time", (sizeof("time")-1)}, PVT_CONTEXT, pv_get_local_time, 0, pv_parse_time_name, 0, 0, 0}, { {"timef", (sizeof("timef")-1)}, PVT_CONTEXT, pv_get_local_strftime, diff --git a/src/modules/pv/pv_shv.c b/src/modules/pv/pv_shv.c index fb4de51114..392c4d823d 100644 --- a/src/modules/pv/pv_shv.c +++ b/src/modules/pv/pv_shv.c @@ -387,6 +387,38 @@ int pv_get_shvar(struct sip_msg *msg, pv_param_t *param, return 0; } +int pv_get_shvinc(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + int len = 0; + char *sval = NULL; + sh_var_t *shv=NULL; + + if(msg==NULL || res==NULL) + return -1; + + if(param==NULL || param->pvn.u.dname==0) + return pv_get_null(msg, param, res); + + shv= (sh_var_t*)param->pvn.u.dname; + + lock_shvar(shv); + if(shv->v.flags&VAR_VAL_STR) + { + res->ri = 0; + } else { + shv->v.value.n++; + res->ri = shv->v.value.n; + } + unlock_shvar(shv); + + sval = sint2str(res->ri, &len); + res->rs.s = sval; + res->rs.len = len; + res->flags = PV_VAL_STR|PV_VAL_INT|PV_TYPE_INT; + return 0; +} + int pv_set_shvar(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) { diff --git a/src/modules/pv/pv_shv.h b/src/modules/pv/pv_shv.h index b7873a037e..65a4d1afc9 100644 --- a/src/modules/pv/pv_shv.h +++ b/src/modules/pv/pv_shv.h @@ -57,6 +57,7 @@ int pv_parse_shvar_name(pv_spec_p sp, str *in); int pv_get_shvar(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_set_shvar(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val); +int pv_get_shvinc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int shvar_init_locks(void); void shvar_destroy_locks(void);

1 0

git:master:85d1881b: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 10 May '22

10 May '22

Module: kamailio Branch: master Commit: 85d1881b665fd4e380538996b1eb6280af46d31a URL: https://github.com/kamailio/kamailio/commit/85d1881b665fd4e380538996b1eb628… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-10T19:46:22+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/85d1881b665fd4e380538996b1eb628… Patch: https://github.com/kamailio/kamailio/commit/85d1881b665fd4e380538996b1eb628…

1 0

git:master:4b377f07: core: xavp - helper function to shift xavps to left with rotation
by Daniel-Constantin Mierla 10 May '22

10 May '22

Module: kamailio Branch: master Commit: 4b377f07128a5322e7647bd9d492b50e81c5f278 URL: https://github.com/kamailio/kamailio/commit/4b377f07128a5322e7647bd9d492b50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-10T19:35:02+02:00 core: xavp - helper function to shift xavps to left with rotation --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/4b377f07128a5322e7647bd9d492b50… Patch: https://github.com/kamailio/kamailio/commit/4b377f07128a5322e7647bd9d492b50… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 036a5ffbe1..be92510520 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -519,6 +519,105 @@ int xavp_count(str *name, sr_xavp_t **start) return n; } +/** + * Left shift xavps + */ +int xavp_lshift(str *name, sr_xavp_t **head, int idx) +{ + sr_xavp_t *avp; + sr_xavp_t *lhead = NULL; + sr_xavp_t *lhead_last = NULL; + sr_xavp_t *ltail = NULL; + sr_xavp_t *ltail_last = NULL; + sr_xavp_t *crt=0; + sr_xavp_t *prv=0; + unsigned int id; + int n=0; + int xcnt; + + if(name==NULL || name->s==NULL || name->len<=0) { + return 0; + } + + if(idx==0) { + return 1; + } + xcnt = xavp_count(name, head); + if(xcnt <= 0) { + return -2; + } + while(idx < 0) { + idx = xcnt + idx; + } + if(idx==0) { + return 1; + } + idx = idx % xcnt; + if(idx==0) { + return 1; + } + + id = get_hash1_raw(name->s, name->len); + if(head!=NULL) + avp = *head; + else + avp = *_xavp_list_crt; + while(avp) + { + crt = avp; + avp=avp->next; + if(crt->id==id && crt->name.len==name->len + && strncmp(crt->name.s, name->s, name->len)==0) + { + if(prv!=NULL) + prv->next=crt->next; + else if(head!=NULL) + *head = crt->next; + else + *_xavp_list_crt = crt->next; + crt->next = NULL; + if(n < idx) { + if(ltail==NULL) { + ltail = crt; + } + if(ltail_last!=NULL) { + ltail_last->next = crt; + } + ltail_last = crt; + } else { + if(lhead==NULL) { + lhead = crt; + } + if(lhead_last!=NULL) { + lhead_last->next = crt; + } + lhead_last = crt; + } + n++; + } else { + prv = crt; + } + } + + if(lhead_last) { + lhead_last->next = ltail; + } + + if(head!=NULL) { + if(ltail_last) { + ltail_last->next = *head; + } + *head = lhead; + } else { + if(ltail_last) { + ltail_last->next = *_xavp_list_crt; + } + *_xavp_list_crt = lhead; + } + + return 0; +} + void xavp_destroy_list_unsafe(sr_xavp_t **head) { sr_xavp_t *avp, *foo; diff --git a/src/core/xavp.h b/src/core/xavp.h index 446b48eba3..880ea980dc 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -98,6 +98,7 @@ struct str_list *xavp_get_list_key_names(sr_xavp_t *xavp); int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list); sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list); +int xavp_lshift(str *name, sr_xavp_t **head, int idx); void xavp_print_list(sr_xavp_t **head);

1 0

git:master:72c361fd: pv: config function to shift xavps to left with rotation
by Daniel-Constantin Mierla 10 May '22

10 May '22

Module: kamailio Branch: master Commit: 72c361fd80ba0f3d017591e4bb3fb883f7dec490 URL: https://github.com/kamailio/kamailio/commit/72c361fd80ba0f3d017591e4bb3fb88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-10T19:35:52+02:00 pv: config function to shift xavps to left with rotation --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/72c361fd80ba0f3d017591e4bb3fb88… Patch: https://github.com/kamailio/kamailio/commit/72c361fd80ba0f3d017591e4bb3fb88… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index cdd34ce5b9..685c0ef9f0 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -608,6 +608,8 @@ static int w_xavi_child_sets(sip_msg_t *msg, char *prname, char *pcname, static int w_xavi_rm(sip_msg_t *msg, char *prname, char *p2); static int w_xavi_child_rm(sip_msg_t *msg, char *prname, char *pcname); +static int w_xavp_lshift(sip_msg_t *msg, char *pxname, char *pidx); + int pv_xavp_copy_fixup(void** param, int param_no); int pv_evalx_fixup(void** param, int param_no); int w_pv_evalx(struct sip_msg *msg, char *dst, str *fmt); @@ -684,6 +686,9 @@ static cmd_export_t cmds[]={ {"xavi_child_rm", (cmd_function)w_xavi_child_rm, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, + {"xavp_lshift", (cmd_function)w_xavp_lshift, + 2, fixup_spve_igp, fixup_free_spve_igp, + ANY_ROUTE}, {"sbranch_set_ruri", (cmd_function)w_sbranch_set_ruri, 0, 0, 0, ANY_ROUTE }, {"sbranch_append", (cmd_function)w_sbranch_append, 0, 0, 0, @@ -904,6 +909,38 @@ static int ki_xavp_print(sip_msg_t* msg) return 1; } +/** + * + */ +static int ki_xavp_lshift(sip_msg_t *msg, str *xname, int idx) +{ + int ret; + + ret = xavp_lshift(xname, NULL, idx); + + return (ret==0)?1:ret; +} + +/** + * + */ +static int w_xavp_lshift(sip_msg_t *msg, char *pxname, char *pidx) +{ + str xname = STR_NULL; + int idx = 0; + + if(fixup_get_svalue(msg, (gparam_t*)pxname, &xname)<0) { + LM_ERR("failed to get the xavp name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)pidx, &idx)<0) { + LM_ERR("failed to get the xavp index\n"); + return -1; + } + + return ki_xavp_lshift(msg, &xname, idx); +} + static int ki_xavu_print(sip_msg_t* msg) { xavu_print_list(NULL); @@ -3173,6 +3210,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_lshift"), + SR_KEMIP_INT, ki_xavp_lshift, + { SR_KEMIP_STR, SR_KEMIP_INT, 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

git:master:42678706: pv: docs for xavp_lshift() function
by Daniel-Constantin Mierla 10 May '22

10 May '22

Module: kamailio Branch: master Commit: 426787068bab1dbeb07ca7b973ac90a91a980628 URL: https://github.com/kamailio/kamailio/commit/426787068bab1dbeb07ca7b973ac90a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-10T19:42:48+02:00 pv: docs for xavp_lshift() function --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/426787068bab1dbeb07ca7b973ac90a… Patch: https://github.com/kamailio/kamailio/commit/426787068bab1dbeb07ca7b973ac90a… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index dca9392822..bc36df564b 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -732,6 +732,39 @@ xavp_child_rm("x", "y"); ... xavi_child_rm("WhatEver", "FoO"); # same result as: $xavi(whatever=>foo) = $null; +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_lshift"> + <title> + <function moreinfo="none">xavp_lshift(xname, idx)</function> + </title> + <para> + Left shift with rotation of the xavps with name xname so that + the one at the index idx becomes the first and the ones before + it are at the end of the list. + </para> + <para> + The first parameter has to be the name of XAVP in the root list. + The second parameter is the index of the XAVP that becomes the + first one. + </para> + <para> + The parameters can be with variables. + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_lshift</function> usage</title> + <programlisting format="linespecific"> +... +$xavp(n) = 10; +$xavp(n) = 20; +$xavp(n) = 30; +xavp_lshift("n", "1"); +# results in: $xavp(n) having the list of values 20 30 10 ... </programlisting> </example>

1 0

git:master:7e88c988: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 7e88c988a4843ee35172809c6955eac870229ff1 URL: https://github.com/kamailio/kamailio/commit/7e88c988a4843ee35172809c6955eac… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-09T18:46:15+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/7e88c988a4843ee35172809c6955eac… Patch: https://github.com/kamailio/kamailio/commit/7e88c988a4843ee35172809c6955eac… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 80691c5516..3f09eb637a 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -135,6 +135,8 @@ modparam("geoip2", "path", "/usr/local/share/GeoIP/GeoLite2-City.mmdb") Match ipaddr against the GeoIP database and set the pvc container. The function has to be called before accessing a key via: $gip2(pvc=>key). + At least one function needs to be present that access the pvc + container, otherwise this function will not work. Example 1.2. geoip2_match usage ...

1 0

git:master:0c16d682: geoip2: log errors for cases where the container could not evaluated and add docs
by Henning Westerholt 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 0c16d6824fda729bf481e300992fb6bad057c89d URL: https://github.com/kamailio/kamailio/commit/0c16d6824fda729bf481e300992fb6b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-09T16:43:22Z geoip2: log errors for cases where the container could not evaluated and add docs - log errors for cases where the container could not evaluated due to missing initialization of the pvc container because no actual access is done in the cfg - add documentation describing that at least one access to the container is necessary for the match function to work correctly --- Modified: src/modules/geoip2/doc/geoip2_admin.xml Modified: src/modules/geoip2/geoip2_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/0c16d6824fda729bf481e300992fb6b… Patch: https://github.com/kamailio/kamailio/commit/0c16d6824fda729bf481e300992fb6b… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index 8c5a96caa8..a82b1a9a29 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -112,6 +112,8 @@ modparam("geoip2", "path", "/usr/local/share/GeoIP/GeoLite2-City.mmdb") <para> Match ipaddr against the GeoIP database and set the pvc container. The function has to be called before accessing a key via: $gip2(pvc=>key). + At least one function needs to be present that access the pvc container, + otherwise this function will not work. </para> <example> <title><function>geoip2_match</function> usage</title> diff --git a/src/modules/geoip2/geoip2_pv.c b/src/modules/geoip2/geoip2_pv.c index 0995ae2d25..ff427f259f 100644 --- a/src/modules/geoip2/geoip2_pv.c +++ b/src/modules/geoip2/geoip2_pv.c @@ -565,14 +565,14 @@ int geoip2_update_pv(str *tomatch, str *name) if(tomatch->len>255) { - LM_DBG("target too long (max 255): %s\n", tomatch->s); + LM_ERR("target too long (max 255): %s\n", tomatch->s); return -3; } gr = sr_geoip2_get_record(name); if(gr==NULL) { - LM_DBG("container not found: %s\n", tomatch->s); + LM_ERR("container not found: %s\n", tomatch->s); return - 4; }

1 0

Info: converting dokuwiki content to markdown files
by Daniel-Constantin Mierla 09 May '22

09 May '22

Hello, it was discussed a couple of times during the past Kamailio development meetings and several days ago the works started to convert the Kamailio Wiki content to markdown format and host the files on Kamailio github.com organisation. The Dokuwiki engine has served us very well during more than a decade and a half, but open editing had to be disabled many years ago due to bad actors pushing inappropriate content. The contributors had to make a dedicated account on our portal only for Wiki editing. More recently we had add another layer of protection requiring to grant manually edit permissions to newly created wiki accounts because bots started to work around CAPTCHA and other security extensions, posting again inappropriate content. All these added to operational overhead, but also made it difficult for new people to contribute, specially for small editing to fix typos or add usage examples. Thanks to Kenneth Stowe, who undertook the first big effort of converting the Dowkuwiki files to markdown format, we are now in the position of moving further with the plans of using github for hosting the content of the wiki and enable easier contributions via pull requests. The history of changes done via Dokuwiki show up now as git commits. The github repository for the wiki content is available at: * https://github.com/kamailio/kamailio-wiki It is still work in progress, therefore we ask for the help of community to speed up the conversion, among the tasks that need to be done: * convert relative links between wiki pages – the conversion tools used relative paths without file extensions, like: [Install Kamailio v4.4.x From GIT](/install/4.4.x/git) They have to be converted to relative path with .md extension in order to be able to browse directly :n the github.com portal — practically the leading / has to be removed and .md added at the end, like: [Install Kamailio v4.4.x From GIT](install/4.4.x/git.md) * some section heading markers were not detected/converted, onee may notice many equal signs (=) around a section name, it has to be replaced with the appropriate markdown format based on hash signs (#). For example: ======= Install And Maintain Kamailio v4.4.x From GIT ======= Should be converted to: # Install And Maintain Kamailio v4.4.x From GIT * some Dokuwiki paragraphs used special formatting based on plugins, for example the notes, warnings, … had special colors. The common markdown format does not specify a syntax to color the text, the propose solution is to use emoji at the start of the paragraph to signal its special purpose. For example, the Dokuwiki content: <color blue>//IMPORTANT: Content for older releases than 3.2.0 is available at the **Old Wiki Site**://</color> Has to be transformed to: :fire:*IMPORTANT: Content for older releases than 3.2.0 is available at the **Old Wiki Site**:* You are welcome to propose a better syntax for this kind of transformation. * review config examples and evaluate what improvements can be done (e.g., in terms of formatting and syntax highlighting) Any of these changes do not require any C programming knowledge, nor much Kamailio config knowledge. Can be your first contribution to the project and it will be very appreciated. It can also help you learn more about Kamailio, because you may discover documentation that you were not aware of. A very important decision is how to present the wiki markdown content on kamailio.org website. Besides being able to see it on github repository, we want to process the markdown pages somehow and make them available in html format on kamailio.org website for easier navigation and better indexing (e.g., with tables of content for large pages). If you are aware of a suitable cli or web app that can convert markdown to html and generate table of content, let us know. Any questions and suggestions should be addressed to sr-users(a)lists.kamailio.org mailing list. Looking forward to your contributions on this community effort! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:master:2e38d1a5: mtree: remove single-used small function
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 2e38d1a5a1178ca437d5256d7619fee251b06d6f URL: https://github.com/kamailio/kamailio/commit/2e38d1a5a1178ca437d5256d7619fee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T11:19:16+02:00 mtree: remove single-used small function --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2e38d1a5a1178ca437d5256d7619fee… Patch: https://github.com/kamailio/kamailio/commit/2e38d1a5a1178ca437d5256d7619fee… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 8c703f3531..66f72bbd02 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -318,18 +318,6 @@ static int mod_init(void) return -1; } -static int mt_child_init(void) -{ - db_con = mt_dbf.init(&db_url); - if(db_con==NULL) - { - LM_ERR("failed to connect to database\n"); - return -1; - } - - return 0; -} - /* each child get a new connection to the database */ static int child_init(int rank) @@ -338,9 +326,12 @@ static int child_init(int rank) if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) return 0; - if ( mt_child_init()!=0 ) + db_con = mt_dbf.init(&db_url); + if(db_con==NULL) + { + LM_ERR("failed to connect to database\n"); return -1; - + } LM_DBG("#%d: database connection opened successfully\n", rank); return 0; @@ -942,7 +933,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) } rpc->rpl_printf(c, "Ok. Mtrees reloaded."); return; - } + } if(!mt_defined_trees()) { rpc->fault(c, 500, "No Mtrees defined.");

1 0

git:master:1ff86ffc: dialog: open db connection in POSTCHILDINIT callback for DB_MODE_SHUTDOWN
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 1ff86ffceede46c7a67fec92c8319c34c916a545 URL: https://github.com/kamailio/kamailio/commit/1ff86ffceede46c7a67fec92c8319c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T09:16:49+02:00 dialog: open db connection in POSTCHILDINIT callback for DB_MODE_SHUTDOWN --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/1ff86ffceede46c7a67fec92c8319c3… Patch: https://github.com/kamailio/kamailio/commit/1ff86ffceede46c7a67fec92c8319c3… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 08f0a85882..4d30b2748f 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -738,6 +738,10 @@ static int mod_init(void) return -1; } + if(dlg_db_mode==DB_MODE_SHUTDOWN) { + ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT); + } + return 0; } @@ -777,9 +781,9 @@ static int child_init(int rank) } } - if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) && - (rank>0 || rank==PROC_TIMER || rank==PROC_RPC)) || - (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) ) { + if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) + && (rank>0 || rank==PROC_TIMER || rank==PROC_RPC)) + || (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_POSTCHILDINIT)) ) { if ( dlg_connect_db(&db_url) ) { LM_ERR("failed to connect to database (rank=%d)\n",rank); return -1;

1 0

git:master:4780d469: usrloc: connect to db for main process in PROC_POSTCHILDINIT child init
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 4780d46976a7a392f23af0d89f05855d473bcb30 URL: https://github.com/kamailio/kamailio/commit/4780d46976a7a392f23af0d89f05855… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T09:05:18+02:00 usrloc: connect to db for main process in PROC_POSTCHILDINIT child init --- Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4780d46976a7a392f23af0d89f05855… Patch: https://github.com/kamailio/kamailio/commit/4780d46976a7a392f23af0d89f05855… --- diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index d60162ed3e..797c252b85 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -358,6 +358,16 @@ static int mod_init(void) } /* Shall we use database ? */ + switch (ul_db_mode) { + case DB_ONLY: + case WRITE_THROUGH: + case WRITE_BACK: + /* + * register the need to be called post-fork of all children + * with the special rank PROC_POSTCHILDINIT + */ + ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT); + } if (ul_db_mode != NO_DB) { /* Yes */ if (db_bind_mod(&ul_db_url, &ul_dbf) < 0) { /* Find database module */ LM_ERR("failed to bind database module\n"); @@ -452,14 +462,14 @@ static int child_init(int _rank) case WRITE_THROUGH: /* connect to db only from SIP workers, TIMER and MAIN processes, * and RPC processes */ - if (_rank<=0 && _rank!=PROC_TIMER && _rank!=PROC_MAIN + if (_rank<=0 && _rank!=PROC_TIMER && _rank!=PROC_POSTCHILDINIT && _rank!=PROC_RPC) return 0; break; case WRITE_BACK: /* connect to db only from TIMER (for flush), from MAIN (for * final flush() and from child 1 for preload */ - if (_rank!=PROC_TIMER && _rank!=PROC_MAIN && _rank!=PROC_SIPINIT) + if (_rank!=PROC_TIMER && _rank!=PROC_POSTCHILDINIT && _rank!=PROC_SIPINIT) return 0; break; case DB_READONLY:

1 0

git:master:c5da175f: app_squirrel: updated squirrel interpreter to latest git version (3.2+)
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: c5da175fd79ecd17752bb2fd8af2b5a65739e58e URL: https://github.com/kamailio/kamailio/commit/c5da175fd79ecd17752bb2fd8af2b5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T08:36:19+02:00 app_squirrel: updated squirrel interpreter to latest git version (3.2+) --- Modified: src/modules/app_sqlang/squirrel/include/squirrel.h Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdblob.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdio.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstream.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqapi.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqclass.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqclass.h Modified: src/modules/app_sqlang/squirrel/squirrel/sqcompiler.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqstring.h Modified: src/modules/app_sqlang/squirrel/squirrel/sqtable.h Modified: src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqvm.h --- Diff: https://github.com/kamailio/kamailio/commit/c5da175fd79ecd17752bb2fd8af2b5a… Patch: https://github.com/kamailio/kamailio/commit/c5da175fd79ecd17752bb2fd8af2b5a…

1 0

git:master:3bd6eb0d: app_jsdt: duktape interpreter upgraded to v2.7.0
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 3bd6eb0d7322b9f4654656b3f0b5080cd44c6e5b URL: https://github.com/kamailio/kamailio/commit/3bd6eb0d7322b9f4654656b3f0b5080… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T08:36:18+02:00 app_jsdt: duktape interpreter upgraded to v2.7.0 --- Modified: src/modules/app_jsdt/duk_config.h Modified: src/modules/app_jsdt/duktape.c Modified: src/modules/app_jsdt/duktape.h --- Diff: https://github.com/kamailio/kamailio/commit/3bd6eb0d7322b9f4654656b3f0b5080… Patch: https://github.com/kamailio/kamailio/commit/3bd6eb0d7322b9f4654656b3f0b5080…

1 0

git:master:a21c929a: userblocklist: fix function comment, related to gh #3102
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: a21c929a389c6e5f85e9166d01adb0d474c6ebaf URL: https://github.com/kamailio/kamailio/commit/a21c929a389c6e5f85e9166d01adb0d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T15:33:56Z userblocklist: fix function comment, related to gh #3102 --- Modified: src/modules/userblocklist/db_userblocklist.c --- Diff: https://github.com/kamailio/kamailio/commit/a21c929a389c6e5f85e9166d01adb0d… Patch: https://github.com/kamailio/kamailio/commit/a21c929a389c6e5f85e9166d01adb0d… --- diff --git a/src/modules/userblocklist/db_userblocklist.c b/src/modules/userblocklist/db_userblocklist.c index e857178f25..0377761ab3 100644 --- a/src/modules/userblocklist/db_userblocklist.c +++ b/src/modules/userblocklist/db_userblocklist.c @@ -61,7 +61,7 @@ void userblocklist_db_close(void) { /*! - * Initialises the DB API, check the table version and closes the connection. + * Initialises the DB API and check the table version. * This should be called from the mod_init function. * * \return 0 means ok, -1 means an error occurred.

1 0

[kamailio/kamailio] userblocklist: fix restart errors (PR #3102)
by Stefan Mititelu 08 May '22

08 May '22

#### 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  Spotted this ERRORs on kamailio restart: ``` ERROR: <core> [db.c:481]: db_use_table(): invalid connection parameter ERROR: userblocklist [db.c:123]: db_reload_source(): cannot use db table 'globalblocklist' ERROR: userblocklist [userblocklist.c:425]: load_source(): cannot load source from 'globalblocklist ``` Debugging it further, seen that the above ERRORs appear on ```check_allowlist()``` function fixup. This was happening because db connection is closed in mod_init and re-done in child_init. But the fixups happen before child_init and they need db connection. Decided to not close the db connection after mod_init because they are later, first closed and then re-opened, in each child. Figured out this fix after checked where each function of db_userblocklist.c is used. ERRORs no longer appear on restart. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3102 -- Commit Summary -- * userblocklist: fix restart errors -- File Changes -- M src/modules/userblocklist/db_userblocklist.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3102.patch https://github.com/kamailio/kamailio/pull/3102.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3102 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3102(a)github.com>

2 2

git:master:778374ab: userblocklist: fix restart errors
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 778374aba27d81058869dba18b5dd0833893056a URL: https://github.com/kamailio/kamailio/commit/778374aba27d81058869dba18b5dd08… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:32:12+02:00 userblocklist: fix restart errors --- Modified: src/modules/userblocklist/db_userblocklist.c --- Diff: https://github.com/kamailio/kamailio/commit/778374aba27d81058869dba18b5dd08… Patch: https://github.com/kamailio/kamailio/commit/778374aba27d81058869dba18b5dd08… --- diff --git a/src/modules/userblocklist/db_userblocklist.c b/src/modules/userblocklist/db_userblocklist.c index 47469f5adc..e857178f25 100644 --- a/src/modules/userblocklist/db_userblocklist.c +++ b/src/modules/userblocklist/db_userblocklist.c @@ -91,7 +91,6 @@ int userblocklist_db_init(void) { userblocklist_db_close(); return -1; } - userblocklist_db_close(); return 0; }

1 0

git:master:97efd6a6: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 97efd6a64380025f3b4ef45372180f7e61448c1c URL: https://github.com/kamailio/kamailio/commit/97efd6a64380025f3b4ef45372180f7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-08T17:31:17+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/ldap/README --- Diff: https://github.com/kamailio/kamailio/commit/97efd6a64380025f3b4ef45372180f7… Patch: https://github.com/kamailio/kamailio/commit/97efd6a64380025f3b4ef45372180f7… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 7c31188ac7..878623d24f 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -1129,7 +1129,7 @@ modparam("acc", "cdr_start_on_confirmed", 1) 6.34. cdr_facility (integer) Log facility to which CDR messages are issued to syslog. This allows to - easily seperate CDR-specific logging from the other log messages. + easily separate CDR-specific logging from the other log messages. Default value is LOG_DAEMON. diff --git a/src/modules/ldap/README b/src/modules/ldap/README index c7555ca3c6..921f45822f 100644 --- a/src/modules/ldap/README +++ b/src/modules/ldap/README @@ -533,7 +533,7 @@ ldap_result("telephoneNumber/$avp(s:tel_number)"); AVP. It can be either str for string, or int for integer. If avp_type is specified as int then ldap_result tries to convert the LDAP attribute values to integer. In this case, the values are only stored - as AVP if the conversion to integer is succesfull. + as AVP if the conversion to integer is successful. Function Parameters:

1 0

[kamailio/kamailio] Fix typos (PR #3103)
by Bastian Triller 08 May '22

08 May '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fix typos. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3103 -- Commit Summary -- * doc: Fix typos * pkg: Fix typos * core: Fix typos * lib: Fix typos * acc: Fix typos * auth: Fix typos * ctl: Fix typos * ldap: Fix typos * pike: Fix typos * sanity: Fix typos * tls: Fix typos * uid_auth_db: Fix typos * utils: Fix typos -- File Changes -- M doc/misc/NEWS (2) M doc/tutorials/locking.txt (4) M pkg/kamailio/deb/bionic/rules (2) M pkg/kamailio/deb/bookworm/rules (2) M pkg/kamailio/deb/bullseye/rules (2) M pkg/kamailio/deb/buster/rules (2) M pkg/kamailio/deb/debian/rules (2) M pkg/kamailio/deb/focal/rules (2) M pkg/kamailio/deb/jessie/rules (2) M pkg/kamailio/deb/precise/rules (2) M pkg/kamailio/deb/sid/rules (2) M pkg/kamailio/deb/stretch/rules (2) M pkg/kamailio/deb/trusty/rules (2) M pkg/kamailio/deb/wheezy/rules (2) M pkg/kamailio/deb/xenial/rules (2) M src/core/atomic/atomic_mips2.h (2) M src/core/dns_cache.c (4) M src/core/forward.c (2) M src/core/resolve.c (4) M src/core/tcp_main.c (10) M src/lib/cds/dstring.h (2) M src/lib/srdb1/schema/uid_credentials.xml (2) M src/lib/srdb2/db_cmd.c (4) M src/lib/srdb2/schema/credentials.xml (2) M src/modules/acc/doc/acc_admin.xml (2) M src/modules/auth/challenge.c (2) M src/modules/auth/nonce.c (12) M src/modules/ctl/binrpc.h (4) M src/modules/ldap/doc/ldap_admin.xml (2) M src/modules/pike/ip_tree.c (2) M src/modules/sanity/sanity.c (2) M src/modules/sanity/sanity.h (2) M src/modules/tls/tls_server.c (2) M src/modules/uid_auth_db/authorize.c (2) M utils/kamctl/kamdbctl.pgsql (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3103.patch https://github.com/kamailio/kamailio/pull/3103.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3103 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3103(a)github.com>

2 2

git:master:c282b581: utils: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: c282b5812c9e9badb4c99fe8ce3bd5cce927044f URL: https://github.com/kamailio/kamailio/commit/c282b5812c9e9badb4c99fe8ce3bd5c… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 utils: Fix typos --- Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/c282b5812c9e9badb4c99fe8ce3bd5c… Patch: https://github.com/kamailio/kamailio/commit/c282b5812c9e9badb4c99fe8ce3bd5c… --- diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index fa1fe1ada8..1eb5d88d2b 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -20,7 +20,7 @@ # 2006-10-19 Added address table (bogdan) # 2006-10-27 subscriber table cleanup; some columns are created only if # serweb is installed (bogdan) -# 2007-01-26 added seperate installation routine for presence related tables +# 2007-01-26 added separate installation routine for presence related tables # and fix permissions for the SERIAL sequences. # 2007-05-21 Move SQL database definitions out of this script (henning) # 2007-05-31 Move common definitions to kamdbctl.base file (henningw)

1 0

git:master:c5ff6d96: sanity: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: c5ff6d9638b1033d2536ed46a7d254c016d8b103 URL: https://github.com/kamailio/kamailio/commit/c5ff6d9638b1033d2536ed46a7d254c… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 sanity: Fix typos --- Modified: src/modules/sanity/sanity.c Modified: src/modules/sanity/sanity.h --- Diff: https://github.com/kamailio/kamailio/commit/c5ff6d9638b1033d2536ed46a7d254c… Patch: https://github.com/kamailio/kamailio/commit/c5ff6d9638b1033d2536ed46a7d254c… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index 4264c2c190..f49d6e50c1 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -578,7 +578,7 @@ int check_cseq_value(sip_msg_t* msg) { return SANITY_CHECK_PASSED; } -/* compare the Content-Length value with the accutal body length */ +/* compare the Content-Length value with the actual body length */ int check_cl(sip_msg_t* msg) { char *body; diff --git a/src/modules/sanity/sanity.h b/src/modules/sanity/sanity.h index 339548edf4..0808cc99a5 100644 --- a/src/modules/sanity/sanity.h +++ b/src/modules/sanity/sanity.h @@ -48,7 +48,7 @@ int check_via_protocol(struct sip_msg* _msg); /* check if the SIP version in the Via header is 2.0 */ int check_via_sip_version(struct sip_msg* _msg); -/* compare the Content-Length value with the accutal body length */ +/* compare the Content-Length value with the actual body length */ int check_cl(struct sip_msg* _msg); /* compare the method in the CSeq header with the request line value */

1 0

git:master:ff9b030b: tls: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: ff9b030be39f82d0e952301ddd0b61a0de5a8041 URL: https://github.com/kamailio/kamailio/commit/ff9b030be39f82d0e952301ddd0b61a… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 tls: Fix typos --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/ff9b030be39f82d0e952301ddd0b61a… Patch: https://github.com/kamailio/kamailio/commit/ff9b030be39f82d0e952301ddd0b61a… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 7004096adf..00686a07dd 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -737,7 +737,7 @@ void tls_h_tcpconn_close_f(struct tcp_connection *c, int fd) tls_mbuf_init(&rd, 0, 0); /* no read */ tls_mbuf_init(&wr, wr_buf, sizeof(wr_buf)); if (tls_set_mbufs(c, &rd, &wr)==0) { - tls_shutdown(c); /* shudown only on succesfull set fd */ + tls_shutdown(c); /* shutdown only on successful set fd */ /* write as much as possible and update wr. * Since this is a close, we don't want to queue the write * (if it can't write immediately, just fail silently)

1 0

git:master:f72c5743: uid_auth_db: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: f72c574372abf4c0286799137896a247ed6269b6 URL: https://github.com/kamailio/kamailio/commit/f72c574372abf4c0286799137896a24… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 uid_auth_db: Fix typos --- Modified: src/modules/uid_auth_db/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/f72c574372abf4c0286799137896a24… Patch: https://github.com/kamailio/kamailio/commit/f72c574372abf4c0286799137896a24… --- diff --git a/src/modules/uid_auth_db/authorize.c b/src/modules/uid_auth_db/authorize.c index 0dd155adda..a71fd45793 100644 --- a/src/modules/uid_auth_db/authorize.c +++ b/src/modules/uid_auth_db/authorize.c @@ -216,7 +216,7 @@ static int generate_avps(db_res_t* result, db_rec_t *row) /* this is a dirty work around to check the credentials of all users, * if the database query returned more then one result * - * Fills res (which must be db_free'd afterwards if the call was succesfull) + * Fills res (which must be db_free'd afterwards if the call was successful) * returns 0 on success, 1 on no match (?) * and -1 on error (memory, db a.s.o). * WARNING: if -1 is returned res _must_ _not_ be freed (it's empty)

1 0

git:master:f6da37aa: ldap: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: f6da37aa7dec1cdc5a737ed354a68ae15cfc7a43 URL: https://github.com/kamailio/kamailio/commit/f6da37aa7dec1cdc5a737ed354a68ae… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 ldap: Fix typos --- Modified: src/modules/ldap/doc/ldap_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f6da37aa7dec1cdc5a737ed354a68ae… Patch: https://github.com/kamailio/kamailio/commit/f6da37aa7dec1cdc5a737ed354a68ae… --- diff --git a/src/modules/ldap/doc/ldap_admin.xml b/src/modules/ldap/doc/ldap_admin.xml index 0e3f146ef7..5778e2ebf5 100644 --- a/src/modules/ldap/doc/ldap_admin.xml +++ b/src/modules/ldap/doc/ldap_admin.xml @@ -616,7 +616,7 @@ ldap_result("telephoneNumber/$avp(s:tel_number)"); <varname>int</varname> for integer. If <varname>avp_type</varname> is specified as <varname>int</varname> then <varname>ldap_result</varname> tries to convert the LDAP attribute values to integer. In this case, the values are only stored as AVP if the - conversion to integer is succesfull. + conversion to integer is successful. </para> <variablelist>

1 0

git:master:b94f8da5: pike: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: b94f8da598ef99d06a0db8f9bb2f9ca29a198740 URL: https://github.com/kamailio/kamailio/commit/b94f8da598ef99d06a0db8f9bb2f9ca… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 pike: Fix typos --- Modified: src/modules/pike/ip_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/b94f8da598ef99d06a0db8f9bb2f9ca… Patch: https://github.com/kamailio/kamailio/commit/b94f8da598ef99d06a0db8f9bb2f9ca… --- diff --git a/src/modules/pike/ip_tree.c b/src/modules/pike/ip_tree.c index 1fe9227a5f..12e03055b0 100644 --- a/src/modules/pike/ip_tree.c +++ b/src/modules/pike/ip_tree.c @@ -92,7 +92,7 @@ static gen_lock_set_t* init_lock_set(int *size) lset = 0; continue; } - /* alloc and init succesfull */ + /* alloc and init successful */ break; }

1 0

git:master:4caf7e70: ctl: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 4caf7e70c09a5b61f5c28b89fa1ea5c951e4cbc0 URL: https://github.com/kamailio/kamailio/commit/4caf7e70c09a5b61f5c28b89fa1ea5c… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 ctl: Fix typos --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/4caf7e70c09a5b61f5c28b89fa1ea5c… Patch: https://github.com/kamailio/kamailio/commit/4caf7e70c09a5b61f5c28b89fa1ea5c… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index bb34cd3be5..da4524878c 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -694,7 +694,7 @@ inline static int binrpc_bytes_needed(struct binrpc_parse_ctx *ctx) * known problems: no support for arrays inside STRUCT * param smode: allow simple vals inside struct (needed for * not-strict-formatted rpc responses) - * returns position after the record and *err==0 if succesfull + * returns position after the record and *err==0 if successful * original position and *err<0 if not */ inline static unsigned char* binrpc_read_record(struct binrpc_parse_ctx* ctx, unsigned char* buf, @@ -829,7 +829,7 @@ inline static unsigned char* binrpc_read_record(struct binrpc_parse_ctx* ctx, } break; case BINRPC_T_DOUBLE: /* FIXME: hack: represented as fixed point - inside an long long */ + inside a long long */ if (ctx->in_struct && smode==0) goto error_record; p=binrpc_read_llong(&ll, len, p, end, err); v->u.fval=((double)ll)/1000;

1 0

git:master:5e71d010: acc: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 5e71d0100ff93e345d31b7210e93be92cde88111 URL: https://github.com/kamailio/kamailio/commit/5e71d0100ff93e345d31b7210e93be9… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 acc: Fix typos --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5e71d0100ff93e345d31b7210e93be9… Patch: https://github.com/kamailio/kamailio/commit/5e71d0100ff93e345d31b7210e93be9… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 036163da14..04fe28a8da 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1123,7 +1123,7 @@ modparam("acc", "cdr_start_on_confirmed", 1) <title><varname>cdr_facility</varname> (integer)</title> <para> Log facility to which CDR messages are issued to syslog. - This allows to easily seperate CDR-specific logging from + This allows to easily separate CDR-specific logging from the other log messages. </para> <para>

1 0

git:master:ba3f7d51: auth: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: ba3f7d5157819d55a67a054de1b7d0f8fc521140 URL: https://github.com/kamailio/kamailio/commit/ba3f7d5157819d55a67a054de1b7d0f… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 auth: Fix typos --- Modified: src/modules/auth/challenge.c Modified: src/modules/auth/nonce.c --- Diff: https://github.com/kamailio/kamailio/commit/ba3f7d5157819d55a67a054de1b7d0f… Patch: https://github.com/kamailio/kamailio/commit/ba3f7d5157819d55a67a054de1b7d0f… --- diff --git a/src/modules/auth/challenge.c b/src/modules/auth/challenge.c index 93142391b4..c5a769ed21 100644 --- a/src/modules/auth/challenge.c +++ b/src/modules/auth/challenge.c @@ -81,7 +81,7 @@ void strip_realm(str* _realm) * @param nonce_len A value/result parameter. Initially it contains the * nonce buffer length. If the length is too small, it * will be set to the needed length and the function will - * return error immediately. After a succesfull call it will + * return error immediately. After a successful call it will * contain the size of nonce written into the buffer, * without the terminating 0. * @param cfg This is the value of one of the three module parameters that diff --git a/src/modules/auth/nonce.c b/src/modules/auth/nonce.c index 4ec4d0a3af..b07515084a 100644 --- a/src/modules/auth/nonce.c +++ b/src/modules/auth/nonce.c @@ -158,12 +158,12 @@ inline static int calc_bin_nonce_md5(union bin_nonce* b_nonce, int cfg, * This function creates the nonce string as it will be sent to the * user agent in digest challenge. The format of the nonce string * depends on the value of three module parameters, auth_checks_register, - * auth_checks_no_dlg, and auth_checks_in_dlg. These module parameters - * control the amount of information from the SIP requst that will be + * auth_checks_no_dlg and auth_checks_in_dlg. These module parameters + * control the amount of information from the SIP request that will be * stored in the nonce string for verification purposes. * * If all three parameters contain zero then the nonce string consists - * of time in seconds since 1.1. 1970 and a secret phrase: + * of time in seconds since 1.1.1970 and a secret phrase: * <expire_time> <valid_since> MD5(<expire_time>, <valid_since>, secret) * If any of the parameters is not zero (some optional checks are enabled * then the nonce string will also contain MD5 hash of selected parts @@ -175,7 +175,7 @@ inline static int calc_bin_nonce_md5(union bin_nonce* b_nonce, int cfg, * @param nonce_len A value/result parameter. Initially it contains the * nonce buffer length. If the length is too small, it * will be set to the needed length and the function will - * return error immediately. After a succesfull call it will + * return error immediately. After a successful call it will * contain the size of nonce written into the buffer, * without the terminating 0. * @param cfg This is the value of one of the three module parameters that @@ -187,7 +187,7 @@ inline static int calc_bin_nonce_md5(union bin_nonce* b_nonce, int cfg, * @param n_id Nounce count and/or one-time nonce index value * (32 bit counter) * @param pf First 2 bits are flags, the rest is the index pool number - * used if nonce counts or one-time nonces are enabled. + * used if nonce counts or one-time nonces are enabled. * The possible flags values are: NF_VALID_NC_ID which means * the nonce-count support is enabled and NF_VALID_OT_ID * which means the one-time nonces support is enabled. @@ -200,7 +200,7 @@ inline static int calc_bin_nonce_md5(union bin_nonce* b_nonce, int cfg, * MD5(<msg_parts(auth_extra_checks)>, secret2). * @param msg The message for which the nonce is computed. If * auth_extra_checks is set, the MD5 of some fields of the - * message will be included in the generated nonce. + * message will be included in the generated nonce. * @return 0 on success and -1 on error */ int calc_nonce(char* nonce, int *nonce_len, int cfg, int since, int expires,

1 0

git:master:e8bdf2b9: pkg: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: e8bdf2b99de1ecfe8f276e2d9bed54e01588210b URL: https://github.com/kamailio/kamailio/commit/e8bdf2b99de1ecfe8f276e2d9bed54e… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 pkg: Fix typos --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/e8bdf2b99de1ecfe8f276e2d9bed54e… Patch: https://github.com/kamailio/kamailio/commit/e8bdf2b99de1ecfe8f276e2d9bed54e…

1 0

git:master:5dd8f0a6: core: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 5dd8f0a6ff30fd3aa917a98b006106bef61506e5 URL: https://github.com/kamailio/kamailio/commit/5dd8f0a6ff30fd3aa917a98b006106b… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 core: Fix typos --- Modified: src/core/atomic/atomic_mips2.h Modified: src/core/dns_cache.c Modified: src/core/forward.c Modified: src/core/resolve.c Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/5dd8f0a6ff30fd3aa917a98b006106b… Patch: https://github.com/kamailio/kamailio/commit/5dd8f0a6ff30fd3aa917a98b006106b…

1 0

git:master:4b2b8925: lib: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 4b2b8925c2c8f195f135ff262f7b45601b111b0d URL: https://github.com/kamailio/kamailio/commit/4b2b8925c2c8f195f135ff262f7b456… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 lib: Fix typos --- Modified: src/lib/cds/dstring.h Modified: src/lib/srdb1/schema/uid_credentials.xml Modified: src/lib/srdb2/db_cmd.c Modified: src/lib/srdb2/schema/credentials.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b2b8925c2c8f195f135ff262f7b456… Patch: https://github.com/kamailio/kamailio/commit/4b2b8925c2c8f195f135ff262f7b456… --- diff --git a/src/lib/cds/dstring.h b/src/lib/cds/dstring.h index 039ed2b099..5dc2de5c91 100644 --- a/src/lib/cds/dstring.h +++ b/src/lib/cds/dstring.h @@ -77,7 +77,7 @@ typedef struct _dstring_t { /** predefined buffer size */ int buff_size; - /** a operation on this string was unsuccesfull -> + /** a operation on this string was unsuccessful -> * all other operations will produce error */ int error; } dstring_t; diff --git a/src/lib/srdb1/schema/uid_credentials.xml b/src/lib/srdb1/schema/uid_credentials.xml index 8391e28e1c..d0089693e0 100644 --- a/src/lib/srdb1/schema/uid_credentials.xml +++ b/src/lib/srdb1/schema/uid_credentials.xml @@ -16,7 +16,7 @@ users identified by uid. Credentials can be used in digest authentication in SIP and/or authentication in SERWeb. In most situations credentials for digest authentication and SERWeb authentication are same. There are cases, - however, where seperate credentials for SERWeb and separate credentials + however, where separate credentials for SERWeb and separate credentials for digest authentication may be needed. One such example are setups where subscribers get HW user agents with locked configuration and thay do not know the password and are not allowed to change it. If they should be able diff --git a/src/lib/srdb2/db_cmd.c b/src/lib/srdb2/db_cmd.c index 0adeca646a..691b5f2999 100644 --- a/src/lib/srdb2/db_cmd.c +++ b/src/lib/srdb2/db_cmd.c @@ -73,8 +73,8 @@ db_cmd_t* db_cmd(enum db_cmd_type type, db_ctx_t* ctx, char* table, } /* FIXME: This should be redesigned so that we do not need to connect - * connections in context before comands are created, this takes splitting - * the command initializatio sequence in two steps, one would be creating + * connections in context before commands are created, this takes splitting + * the command initialization sequence in two steps, one would be creating * all the data structures and the second would be checking corresponding * fields and tables on the server. */ diff --git a/src/lib/srdb2/schema/credentials.xml b/src/lib/srdb2/schema/credentials.xml index 8bc7809fbf..a6c3ccadfb 100644 --- a/src/lib/srdb2/schema/credentials.xml +++ b/src/lib/srdb2/schema/credentials.xml @@ -15,7 +15,7 @@ users identified by uid. Credentials can be used in digest authentication in SIP and/or authentication in SERWeb. In most situations credentials for digest authentication and SERWeb authentication are same. There are cases, - however, where seperate credentials for SERWeb and separate credentials + however, where separate credentials for SERWeb and separate credentials for digest authentication may be needed. One such example are setups where subscribers get HW user agents with locked configuration and thay do not know the password and are not allowed to change it. If they should be able

1 0

git:master:5497d157: doc: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 5497d15766d25625b4704a3bd3e884ef2f1149da URL: https://github.com/kamailio/kamailio/commit/5497d15766d25625b4704a3bd3e884e… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 doc: Fix typos --- Modified: doc/misc/NEWS Modified: doc/tutorials/locking.txt --- Diff: https://github.com/kamailio/kamailio/commit/5497d15766d25625b4704a3bd3e884e… Patch: https://github.com/kamailio/kamailio/commit/5497d15766d25625b4704a3bd3e884e… --- diff --git a/doc/misc/NEWS b/doc/misc/NEWS index 9b62dd39c1..09b63a72b4 100644 --- a/doc/misc/NEWS +++ b/doc/misc/NEWS @@ -338,7 +338,7 @@ modules: the retransmissions which would otherwise be challenged). The major advantage is greatly enhanced security (extremely small probability of - a succesfull replay attack) combine with support + a successful replay attack) combine with support for cached credentials (if the UAs do support qop and auth) - nc_array_size - size of the array used for storing diff --git a/doc/tutorials/locking.txt b/doc/tutorials/locking.txt index 7507a5d002..3ff12f6c85 100644 --- a/doc/tutorials/locking.txt +++ b/doc/tutorials/locking.txt @@ -109,7 +109,7 @@ Locking & unlocking: void lock_get(gen_lock_t* lock); - lock (mutex down) void lock_release(gen_lock_t* lock); - unlock (mutex up) int lock_try(gen_lock_t* lock); - tries to lock and returns 0 - if succesfull, -1 if not (this is + if successful, -1 if not (this is a non-blocking lock_get()) @@ -164,7 +164,7 @@ Locking & unlocking: void lock_set_get(lock_set_t* s, int i); void lock_set_release(lock_set_t* s, int i); int lock_set_try(lock_set_t* s, int i); - tries to lock the i-th lock - from the set. If succesfull + from the set. If successful returns 0, if not -1. Example:

1 0

git:master:543cd8f8: ipops: add dns container in dns_update_pv() if not created before
by Daniel-Constantin Mierla 06 May '22

06 May '22

Module: kamailio Branch: master Commit: 543cd8f897bc43d5fe1eb4c562d8351b32778209 URL: https://github.com/kamailio/kamailio/commit/543cd8f897bc43d5fe1eb4c562d8351… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-06T13:50:13+02:00 ipops: add dns container in dns_update_pv() if not created before - dns context creation relied on using the dns variable in some way, the main purpose of dns_update_pv() being to fill the variable, but one may want to use it for testing only --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/543cd8f897bc43d5fe1eb4c562d8351… Patch: https://github.com/kamailio/kamailio/commit/543cd8f897bc43d5fe1eb4c562d8351… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 1afc806541..9ee6f5879a 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -373,7 +373,7 @@ int dns_update_pv(str *hostname, str *name) return -2; } - dr = sr_dns_get_item(name); + dr = sr_dns_add_item(name); if(dr==NULL) { LM_DBG("container not found: %s\n", name->s);

1 0

git:master:0f9a833f: ipops: warning when too many dns containers are created
by Daniel-Constantin Mierla 06 May '22

06 May '22

Module: kamailio Branch: master Commit: 0f9a833fcc7cbc306a5d47413f6449ccc5a37f59 URL: https://github.com/kamailio/kamailio/commit/0f9a833fcc7cbc306a5d47413f6449c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-06T12:46:28+02:00 ipops: warning when too many dns containers are created --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/0f9a833fcc7cbc306a5d47413f6449c… Patch: https://github.com/kamailio/kamailio/commit/0f9a833fcc7cbc306a5d47413f6449c… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 6e9d86b5a6..1afc806541 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -95,6 +95,7 @@ sr_dns_item_t *sr_dns_add_item(str *name) { sr_dns_item_t *it = NULL; unsigned int hashid = 0; + int n = 0; hashid = get_hash1_raw(name->s, name->len); @@ -105,7 +106,13 @@ sr_dns_item_t *sr_dns_add_item(str *name) && strncmp(it->name.s, name->s, name->len)==0) return it; it = it->next; + n++; } + if(n > 20) { + LM_WARN("too many dns containers - adding nunmber %d - can fill memory\n", + n); + } + /* add new */ it = (sr_dns_item_t*)pkg_malloc(sizeof(sr_dns_item_t)); if(it==NULL)

1 0

Re: [sr-dev] sr-dev Digest, Vol 162, Issue 61
by Luis Azedo 06 May '22

06 May '22

Hello, seeing some weirdness in kamailio logs while testing kamailio under docker/kubernetes and logging to stderr, not sure if its related to kamailio or the infrastructure itself. running in 8 core host, it looks like the write to stderr has some race condition if that's even possible. the breaks happen with different processes and i wonder if the LOG_FX and DPRINT_NON_CRIT macros are responsible for that. it looks like 2 different processes could evaluate to true and try to write to stderr at same time. two examples real output 116(354) INFO: 2022-04-28T18:08:14.476102048Z 3ebe6ff3-1799-4798-baa3-a109df32711d registrar-role.cfg:745 (route_to_external_aor) 117(355) INFO: 2022-04-28T18:08:14.473375226Z 5f2567bf-25bb-4cb1-a306-dc28711d9fcb default.cfg:305 (log_request) to sip:1117@1.sip-stress.com 117(355) INFO: 2022-04-28T18:08:14.476592352Z 5f2567bf-25bb-4cb1-a306-dc28711d9fcb default.cfg:324 (classify_source) end - routing to contact sip:1104@10.23.0.2:9181 originated from internal sources should be 116(354) INFO: 2022-04-28T18:08:14.476102048Z 3ebe6ff3-1799-4798-baa3-a109df32711d registrar-role.cfg:745 (route_to_external_aor) end - routing to contact sip:1104@10.23.0.2:9181 117(355) INFO: 2022-04-28T18:08:14.473375226Z 5f2567bf-25bb-4cb1-a306-dc28711d9fcb default.cfg:305 (log_request) to sip:1117@1.sip-stress.com 117(355) INFO: 2022-04-28T18:08:14.476592352Z 5f2567bf-25bb-4cb1-a306-dc28711d9fcb default.cfg:324 (classify_source) originated from internal sources second example real output 71(309) INFO: 2022-04-28T18:08:14.514892167Z cid-10440-3(a)10.21.0.1 default.cfg:304 (log_request) 116(354) INFO: 2022-04-28T18:08:14.521506921Z cid-10440-26(a)10.21.0.1 default.cfg:751 (internal_reply) 200 OK from sip:1002@1.sip-stress.com should be 71(309) INFO: 2022-04-28T18:08:14.514892167Z cid-10440-3(a)10.21.0.1 default.cfg:304 (log_request) from sip:1002@1.sip-stress.com 116(354) INFO: 2022-04-28T18:08:14.521506921Z cid-10440-26(a)10.21.0.1 default.cfg:751 (internal_reply) 200 OK Any hints/thoughts ? should we try to have a better way to handle this inb dprint.c/dprint.h ? Thanks

1 1

[kamailio/kamailio] LCR function from_gw (Issue #3077)
by Antoineb2s 06 May '22

06 May '22

Hi, Kamailio 5.5.4 from deb packages I tried to use the lcr function from_gw(lcr_id[, ip_addr, proto]) I've declared several gws with different lcr_id Unfortunately from_gw doesn't work with lcr_ids > 1 For example : if (from_gw(2,$si,1)) { .... } ... ki_from_gw(): invalid lcr_id parameter value 2 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3077 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3077(a)github.com>

3 2

[kamailio/kamailio] htable Module Crash in Kamailio 5.5 (Issue #3082)
by surabhigarg 06 May '22

06 May '22

**Issue Description:** Kamailio is running with htable module having following parameter configuration: `modparam("htable", "htable", "flags=>size=6;dbtable=htable;autoexpire=0;dbmode=1") ` So, If there is an error in kamailio cfg then crash is observed in htable module. Here, I believe when kamailio goes to sync in memory htable content to the DB it crashes. **Troubleshooting** with dbmode=0 crash is not observed. **Steps to Reproduce** 1. Add entries in htable(DB) of mariadb. 2. Intentionally add some error in kamailio.cfg (i.e. remove colon at the end of any line) 3. start kamailio 4. kamailio wont come up as there is an error in kamailio.cfg 5. And while kamailio is shutting down there is a crash in htable 6. Now, check entries in htable(DB)of mariadb which gets empty **Kamailio Cfg** ``` modparam("htable", "htable", "flags=>size=6;dbtable=htable;autoexpire=0;dbmode=1") modparam("htable", "db_url", DBURL) # HTable Init event_route[htable:mod-init] { $sht(flags=>disable_sip_message_processing) = 0; xlog("L_INFO", "Init: disable_sip_message_processing $sht(flags=>disable_sip_message_processing)\n"); } ``` **Debugging Data:** ``` $ gdb /usr/local/kamailio-5.5/sbin/kamailio /tmp/core.kamailio.103011.N1VL-PA-SIP01.1649823318 GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-120.el7 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /usr/local/kamailio-5.5/sbin/kamailio...done. warning: exec file is newer than core file. [New LWP 103011] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/local/kamailio-5.5/sbin/kamailio -D -P /run/kamailio/kamailio.pid -f /usr/'. Program terminated with signal 11, Segmentation fault. #0 0x00007f5b54995755 in atomic_get (v=0x14) at ../../core/mem/../atomic/atomic_common.h:66 66 return atomic_get_int(&(v->val)); Missing separate debuginfos, use: debuginfo-install glibc-2.17-324.el7_9.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-50.el7.x86_64 libcom_err-1.42.9-19.el7.x86_64 libgcc-4.8.5-44.el7.x86_64 libselinux-2.5-15.el7.x86_64 libstdc++-4.8.5-44.el7.x86_64 mariadb-libs-5.5.68-1.el7.x86_64 openssl-libs-1.0.2k-21.el7_9.x86_64 pcre-8.32-17.el7.x86_64 zlib-1.2.7-19.el7_9.x86_64 (gdb) bt full #0 0x00007f5b54995755 in atomic_get (v=0x14) at ../../core/mem/../atomic/atomic_common.h:66 No locals. #1 0x00007f5b54996d51 in ht_slot_lock (ht=0x7f5b504de738, idx=0) at ht_api.c:153 mypid = 103011 #2 0x00007f5b5498e3fb in ht_db_save_table (ht=0x7f5b504de738, dbtable=0x7f5b504de750) at ht_db.c:577 db_cols = {0x7f5b54bd83f0 <ht_db_name_column>, 0x7f5b54bd8400 <ht_db_ktype_column>, 0x7f5b54bd8410 <ht_db_vtype_column>, 0x7f5b54bd8420 <ht_db_value_column>, 0x7f5b54bd8430 <ht_db_expires_column>} db_vals = {{type = 8527368, nul = 0, free = 6, val = {int_val = -874111776, ll_val = 140723729341664, double_val = 6.9526760222378001e-310, time_val = 140723729341664, string_val = 0x7ffccbe61ce0 "\300\035\346\313\374\177", str_val = {s = 0x7ffccbe61ce0 "\300\035\346\313\374\177", len = 1532402903}, blob_val = { s = 0x7ffccbe61ce0 "\300\035\346\313\374\177", len = 1532402903}, bitmap_val = 3420855520, uint_val = 3420855520, ull_val = 140723729341664}}, { type = 1532380141, nul = 32603, free = 6, val = {int_val = 0, ll_val = 0, double_val = 0, time_val = 0, string_val = 0x0, str_val = {s = 0x0, len = 0}, blob_val = { s = 0x0, len = 0}, bitmap_val = 0, uint_val = 0, ull_val = 0}}, {type = DB1_INT, nul = 0, free = 1535278736, val = {int_val = -874111552, ll_val = 140723729341888, double_val = 6.9526760222488671e-310, time_val = 140723729341888, string_val = 0x7ffccbe61dc0 "\260\036\346\313\374\177", str_val = { s = 0x7ffccbe61dc0 "\260\036\346\313\374\177", len = 1419312224}, blob_val = {s = 0x7ffccbe61dc0 "\260\036\346\313\374\177", len = 1419312224}, bitmap_val = 3420855744, uint_val = 3420855744, ull_val = 140723729341888}}, {type = 1532429419, nul = 32603, free = 48, val = {int_val = -874111488, ll_val = 140723729341952, double_val = 6.9526760222520291e-310, time_val = 140723729341952, string_val = 0x7ffccbe61e00 "\260\036\346\313\374\177", str_val = { s = 0x7ffccbe61e00 "\260\036\346\313\374\177", len = -874111728}, blob_val = {s = 0x7ffccbe61e00 "\260\036\346\313\374\177", len = -874111728}, bitmap_val = 3420855808, uint_val = 3420855808, ull_val = 140723729341952}}, {type = 1544071712, nul = 32603, free = 8527368, val = {int_val = 8527368, ll_val = 8527368, double_val = 4.2130795782459789e-317, time_val = 8527368, string_val = 0x821e08 "DEBUG", str_val = {s = 0x821e08 "DEBUG", len = 0}, blob_val = { s = 0x821e08 "DEBUG", len = 0}, bitmap_val = 8527368, uint_val = 8527368, ull_val = 8527368}}} it = 0x0 tmp = {s = 0x7f5b549cdfcb "lid parameters\n", len = 1544071712} i = 0 now = 1649823318 ncols = 3 __FUNCTION__ = "ht_db_save_table" #3 0x00007f5b549a3c7d in ht_db_sync_tables () at ht_api.c:1078 ht = 0x7f5b504de738 __FUNCTION__ = "ht_db_sync_tables" #4 0x00007f5b549ac4cc in destroy () at htable.c:321 No locals. #5 0x0000000000590523 in destroy_modules () at core/sr_module.c:839 t = 0x7f5b5b83bd08 foo = 0x7f5b5b83b520 __FUNCTION__ = "destroy_modules" #6 0x000000000041d7da in cleanup (show_status=0) at main.c:575 memlog = 0 __FUNCTION__ = "cleanup" #7 0x000000000041f0b5 in shutdown_children (sig=15, show_status=0) at main.c:718 __FUNCTION__ = "shutdown_children" #8 0x0000000000436825 in main (argc=12, argv=0x7ffccbe62688) at main.c:3068 cfg_stream = 0xba2050 c = -1 r = 0 ---Type <return> to continue, or q <return> to quit--- tmp = 0x7ffccbe6466c "" tmp_len = 1408 port = 896 proto = 32603 ahost = 0x0 aport = 0 options = 0x7df0f8 ":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 = 513568880 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffccbe62540 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> 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}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7e150f "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7dc584 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7e1514 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x7e151a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7e1520 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7e1529 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7e1533 "server-id", has_arg = 1, flag = 0x0, val = 1028}, { name = 0x7e153d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7e1548 "modparam", has_arg = 1, flag = 0x0, val = 1030}, { name = 0x7e1551 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7e155c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7e1562 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x7e156c "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) ``` **Additional Information** - Kamailio Version: ``` [root@N1VL-PA-SIP01 kamailio]# /usr/local/kamailio-5.5/sbin/kamailio -V version: kamailio 5.5.2 (x86_64/linux) e5f5a8 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 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: e5f5a8 compiled on 19:07:54 Apr 12 2022 with gcc 4.8.5 ``` - Operating System: ``` $ cat /etc/os-release NAME="Red Hat Enterprise Linux Server" VERSION="7.9 (Maipo)" ID="rhel" ID_LIKE="fedora" VARIANT="Server" VARIANT_ID="server" VERSION_ID="7.9" PRETTY_NAME="Red Hat Enterprise Linux Server 7.9 (Maipo)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:redhat:enterprise_linux:7.9:GA:server" HOME_URL="https://www.redhat.com/" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 7" REDHAT_BUGZILLA_PRODUCT_VERSION=7.9 REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux" REDHAT_SUPPORT_PRODUCT_VERSION="7.9" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3082 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3082(a)github.com>

3 5

git:master:33228bba: db_berkeley: reset lkey to avoid double free
by Daniel-Constantin Mierla 05 May '22

05 May '22

Module: kamailio Branch: master Commit: 33228bba33a6ea2e2d9a7acd9a240929223b9d39 URL: https://github.com/kamailio/kamailio/commit/33228bba33a6ea2e2d9a7acd9a24092… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T19:52:11+02:00 db_berkeley: reset lkey to avoid double free --- Modified: src/modules/db_berkeley/db_berkeley.c --- Diff: https://github.com/kamailio/kamailio/commit/33228bba33a6ea2e2d9a7acd9a24092… Patch: https://github.com/kamailio/kamailio/commit/33228bba33a6ea2e2d9a7acd9a24092… --- diff --git a/src/modules/db_berkeley/db_berkeley.c b/src/modules/db_berkeley/db_berkeley.c index 80c9aefac0..a8fe812c50 100644 --- a/src/modules/db_berkeley/db_berkeley.c +++ b/src/modules/db_berkeley/db_berkeley.c @@ -1055,8 +1055,10 @@ int bdb_update(db1_con_t *_con, db_key_t *_k, db_op_t *_op, db_val_t *_v, goto cleanup; } - if(lkey) + if(lkey) { pkg_free(lkey); + lkey = NULL; + } key.data = kbuf; key.ulen = MAX_ROW_SIZE;

1 0

git:5.6:532cef75: pkg/kamailio/deb: version set 5.6.0~rc0 [skip ci]
by Victor Seva 05 May '22

05 May '22

Module: kamailio Branch: 5.6 Commit: 532cef75a2fda7725e869776fe8faa83ded33dd3 URL: https://github.com/kamailio/kamailio/commit/532cef75a2fda7725e869776fe8faa8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-05T12:53:05+02:00 pkg/kamailio/deb: version set 5.6.0~rc0 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/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/532cef75a2fda7725e869776fe8faa8… Patch: https://github.com/kamailio/kamailio/commit/532cef75a2fda7725e869776fe8faa8…

1 0

git:master:e310166a: pkg/kamailio/deb: version set 5.7.0~dev0 [skip ci]
by Victor Seva 05 May '22

05 May '22

Module: kamailio Branch: master Commit: e310166a5c0c7d419e036315c1d105278db51e58 URL: https://github.com/kamailio/kamailio/commit/e310166a5c0c7d419e036315c1d1052… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-05T12:50:41+02:00 pkg/kamailio/deb: version set 5.7.0~dev0 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/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/e310166a5c0c7d419e036315c1d1052… Patch: https://github.com/kamailio/kamailio/commit/e310166a5c0c7d419e036315c1d1052…

1 0

Development is open for future release of v5.7.x series
by Daniel-Constantin Mierla 05 May '22

05 May '22

Hello, the branch 5.6 was created, therefore the master branch is open for adding new features, to be part of future release series v5.7.x (or whatever version is decided for next series). Any bug fix committed to master that applies to 5.6.x or older stable branches should be backported as usual with "git cherry-pick -x ..." to appropriate branches like 5.6 or 5.5. Expect that v5.6.0 will be released in a few weeks from now. Based on the workflow used during the past years, the next future release v5.7.0 should be out after another 6-10 months of development, plus 1-2 months of testing, so sometime by end of 2022 or in the first part of 2023. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

Branch 5.6 has been created
by Daniel-Constantin Mierla 05 May '22

05 May '22

Hello, the branch 5.6 has been created, to be used for releasing v5.6.x series. To check out this branch, the following commands can be used: git clone https://github.com/kamailio/kamailio kamailio-5.6 cd kamailio-5.6 git checkout -b 5.6 origin/5.6 Pushing commits in this branch: git push origin 5.6:5.6 Note that 5.6 is an official stable branch, so only bug fixes, missing kemi exports (discuss on sr-dev if not sure) or improvements to documentation or helper tools can be pushed to this branch. As usual, if there is a bug fixed, commit and push first to master branch and then cherry pick to 5.5 branch: git cherry-pick -x COMMITID In few weeks, the first release from branch 5.6 will be out, respectively Kamailio v5.6.0. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:master:39431b8f: Makefile.defs: version set to 5.7.0-dev0
by Daniel-Constantin Mierla 05 May '22

05 May '22

Module: kamailio Branch: master Commit: 39431b8fd94f49e2ae5ee61109bf8e329a1c7c60 URL: https://github.com/kamailio/kamailio/commit/39431b8fd94f49e2ae5ee61109bf8e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T12:11:31+02:00 Makefile.defs: version set to 5.7.0-dev0 - master branch is open for new features to be part of future release series 5.7.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/39431b8fd94f49e2ae5ee61109bf8e3… Patch: https://github.com/kamailio/kamailio/commit/39431b8fd94f49e2ae5ee61109bf8e3… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index c119502d4a..c155889688 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 -PATCHLEVEL = 6 +PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -pre2 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:6bd109d0: Makefile.defs: version set to 5.6.0-pre2
by Daniel-Constantin Mierla 05 May '22

05 May '22

Module: kamailio Branch: master Commit: 6bd109d0230369514f611869fd3e321634bf6e4a URL: https://github.com/kamailio/kamailio/commit/6bd109d0230369514f611869fd3e321… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T11:40:17+02:00 Makefile.defs: version set to 5.6.0-pre2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/6bd109d0230369514f611869fd3e321… Patch: https://github.com/kamailio/kamailio/commit/6bd109d0230369514f611869fd3e321… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 41c7b31652..c119502d4a 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -pre2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:f1194f44: pv: check parameters and fix log message for invalid values for {s.fmtline...}
by Daniel-Constantin Mierla 05 May '22

05 May '22

Module: kamailio Branch: master Commit: f1194f44532f179c016269f93c44b755d2594c1d URL: https://github.com/kamailio/kamailio/commit/f1194f44532f179c016269f93c44b75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T11:38:41+02:00 pv: check parameters and fix log message for invalid values for {s.fmtline...} --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/f1194f44532f179c016269f93c44b75… Patch: https://github.com/kamailio/kamailio/commit/f1194f44532f179c016269f93c44b75… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 5f45fa8e66..a2b546d02a 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1476,14 +1476,14 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(pv_get_spec_value(msg, (pv_spec_p)tp->next->v.data, &v)!=0 || (!(v.flags&PV_VAL_INT))) { - LM_ERR("fmt cannot get p2 (cfg line: %d)\n", + LM_ERR("fmtline cannot get p2 (cfg line: %d)\n", get_cfg_crt_line()); return -1; } m = v.ri; } - if(n<0 || m<0) { - LM_ERR("substr negative offset (cfg line: %d)\n", + if(n<=0 || m<0) { + LM_ERR("fmtline with invalid parameters (cfg line: %d)\n", get_cfg_crt_line()); return -1; }

1 0

Development for v5.6.x is frozen
by Daniel-Constantin Mierla 05 May '22

05 May '22

Hello, the formal notification that the development for the next major version 5.6.0 is now frozen. The focus has to be on testing the master branch. Also, the master branch should not get commits with new features till the branch 5.6 is created, expected to happen in 2-4 weeks, a matter of how testing goes on. Meanwhile, the commits with new features in the C code can be pushed to personal branches, new pull requests can still be done, but they will be merged after branching 5.6. Can still be done commits with documentation improvements, enhancements to related tools (e.g., kamctl, kamcmd), merging exiting pull requests at this moment, exporting missing KEMI functions and completing the functionality of the new modules added for 5.6. Once the branch 5.6 is created, new features can be pushed again to master branch as usual. From that moment, the v5.6.0 should be out very soon, time used for further testing but also preparing the release of packages. If someone is not sure if a commit brings a new feature, just make a pull request and it can be discussed there on github portal or via sr-dev mailing list. A summary of what is new in upcoming 5.6 is going to be built at: * https://www.kamailio.org/wiki/features/new-in-5.6.x Upgrade guidelines will be collected at: * https://www.kamailio.org/wiki/install/upgrade/5.5.x-to-5.6.0 Everyone is more than welcome to contribute to the above wiki pages, especially to the upgrade guidelines, to help everyone else during the migration process from v5.5.x to 5.6.x. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 2

git:5.5:9d039b60: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 May '22

05 May '22

Module: kamailio Branch: 5.5 Commit: 9d039b6023dc7c0bfb48509fc47f830eaeede90f URL: https://github.com/kamailio/kamailio/commit/9d039b6023dc7c0bfb48509fc47f830… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-05T09:31:59+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/auth/README Modified: src/modules/cfgutils/README --- Diff: https://github.com/kamailio/kamailio/commit/9d039b6023dc7c0bfb48509fc47f830… Patch: https://github.com/kamailio/kamailio/commit/9d039b6023dc7c0bfb48509fc47f830… --- diff --git a/src/modules/auth/README b/src/modules/auth/README index c0badc4115..25c448901d 100644 --- a/src/modules/auth/README +++ b/src/modules/auth/README @@ -143,7 +143,8 @@ Chapter 1. Admin Guide 2. Dependencies - The module does not depend on any other module. + The following modules must be loaded before this module: + * sl - stateless reply. 3. Parameters diff --git a/src/modules/cfgutils/README b/src/modules/cfgutils/README index 3d46af3ba3..890952c7c5 100644 --- a/src/modules/cfgutils/README +++ b/src/modules/cfgutils/README @@ -757,11 +757,11 @@ $ kamcmd cfgutils.get_gflags Example 1.34. RANDOM pseudo-variable usage ... if (rand_event()) { - $avp(i:10) = ($RANDOM / 16777216); # 2^24 - if ($avp(i:10) < 10) { - $avp(i:10) = 10; + $var(value) = ($RANDOM / 16777216); # 2^24 + if ($var(value) < 10) { + $var(value) = 10; } - append_to_reply("Retry-After: $avp(i:10)\n"); + append_to_reply("Retry-After: $var(value)\n"); sl_send_reply("503", "Try later"); exit; };

1 0

git: new commits in branch 5.5
by Daniel-Constantin Mierla 05 May '22

05 May '22

- URL: https://github.com/kamailio/kamailio/commit/8614efb544374945a45b755586d9a05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:44:10+02:00 blst: docs - small formatting updates (cherry picked from commit 415f20804e423b503d5e0d1743e28c9f509f9c21) - URL: https://github.com/kamailio/kamailio/commit/ddcc1a24fc6b4323de09ee30c4dc64d… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Date: 2022-05-05T08:45:22+02:00 cdp: increase the amount of avps allocated when reading AVP_Vendor_Specific_Application_Id (cherry picked from commit 62f7be2281f5dd91a5668c4b84e52a7d7169e21f) - URL: https://github.com/kamailio/kamailio/commit/fad03e0af24629b5dfdd835d251b350… Author: frederic <frederic.gaisnon(a)mmtt.fr> Date: 2022-05-05T08:47:31+02:00 topos: handle BYE sent by callee during non connected call with provitional response sent by callee (INVITE,180 and BYE from callee instead CANCEL) (cherry picked from commit e1974977a3e604996b752566d187b77da5072999) - URL: https://github.com/kamailio/kamailio/commit/d4a69b1b4878c808631fca078a5980c… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2022-05-05T08:47:59+02:00 smsops: Fix ucs2-to-utf8 for Accent chars (cherry picked from commit f9f16a6c700a7378fc30f6f9c0a767438fc638b9) - URL: https://github.com/kamailio/kamailio/commit/c30312a4f7e4bdacd777c5df2adfe85… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2022-05-05T08:48:19+02:00 siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring - Added X-Siptrace headers in core callback mode for SIP URI traffic duplication, headers also available in event route for filtering purporses. (cherry picked from commit 57b1d5375927b987b162fcf0e2c99a39b717bd65) - URL: https://github.com/kamailio/kamailio/commit/fc454a5c2a9c83732ed11df7f42cb98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:49:38+02:00 core: parse sdp - detect multipart invalid format (cherry picked from commit 7076904d0f0980d6bfa0814e3b1a8c61ee0acecc) - URL: https://github.com/kamailio/kamailio/commit/afefd474c9571f7c0282823819335d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:49:49+02:00 core: parse sdp - removed redundant check (cherry picked from commit 355c02106c95400c44833a89aeea68c61ba2f200) - URL: https://github.com/kamailio/kamailio/commit/46eaf304de272134579519740f589dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:50:01+02:00 sanity: use dedicated functions for parsing From/To URIs - updates to parsing Contact headers (cherry picked from commit 5c99d7f87ed94cd52c6ab74d46f511447b3db2b9) - URL: https://github.com/kamailio/kamailio/commit/0947dde559a60afc52fb46c9dbcd123… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:50:21+02:00 core: parser - helper functions to parse all record-/route headers (cherry picked from commit 22b8ecc24442dce775600dfb186a83bc947fd4ca) - URL: https://github.com/kamailio/kamailio/commit/d74d044f54d49cd4c80f9ae75fbd025… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:50:44+02:00 dispatcher: fix ds_reload() return logic - GH #3054 (cherry picked from commit 30079910bbb33b430621f188beae40c71592bcba) - URL: https://github.com/kamailio/kamailio/commit/4213ed97695dac97505422a8a9925c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:02+02:00 core: parse uri - detect empty user when @ is found (cherry picked from commit 0c101ffe713603e812759da6d396e0451cf13ba1) - URL: https://github.com/kamailio/kamailio/commit/140abc77f33861952c750e7013767b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:15+02:00 sipcapture: init buffers content (cherry picked from commit 9292b9f5daacfa5340b5fe1a5f02469a7e597d9b) - URL: https://github.com/kamailio/kamailio/commit/81b93c0858cf7ccc357b3d623336d79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:27+02:00 dmq: init peer structures (cherry picked from commit 0204232ba1f229edb9c7e0080e98e9d3b2500672) - URL: https://github.com/kamailio/kamailio/commit/44295fa538e0d0b88208264a516d15a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:42+02:00 sipcapture: more init buffers content (cherry picked from commit 0b684a5d9a2f5d17e64cb8cb5f4b53b06f180f06) - URL: https://github.com/kamailio/kamailio/commit/c16044f47def23c4d43fbc9b38ffc56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:58+02:00 pua_reginfo: init uri buffer (cherry picked from commit 692d15ce9bcc329fff55060dcdc8e5161f12c30e) - URL: https://github.com/kamailio/kamailio/commit/b16a4e5038c30a4fdd662ce1f080df9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:52:12+02:00 core: parse uri - sanity check for user part (cherry picked from commit eda4b3c51ce12d4fe052b7e9ad40be1ef6e56444) - URL: https://github.com/kamailio/kamailio/commit/f6995deb6c7a03542ca381b30279f76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:52:38+02:00 core: parse - fix typo in comment of previous commit (cherry picked from commit 8b20e6045dbebdb784a4e8f66d81fc79c0a17304) - URL: https://github.com/kamailio/kamailio/commit/5c65d50469dbffb3ce021ff2db2af61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:53:00+02:00 core: parser digest - warn if the header type is not set properly (cherry picked from commit 67e0fa5e53ef5d4dd9802e3027b2bc7ff6dcb671) - URL: https://github.com/kamailio/kamailio/commit/5b387fc146db587b01b961e1d07afe8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:53:18+02:00 core: parser - catch special header types for get_hdr() (cherry picked from commit f9a38d6b621a2c3966a3c85dce6fdd2e6bb8d431) - URL: https://github.com/kamailio/kamailio/commit/cd3f1f8fe6ef1836ac2c8a43731dcf6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:53:42+02:00 seas: check for header type value for flags comparison (cherry picked from commit e513d1cc549fea43eebc5fc504bb01270adbc10e) - URL: https://github.com/kamailio/kamailio/commit/841baf0fc851b1cd180da3c5e5bac54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:53:55+02:00 db_text: reworked the checks for database and table names (cherry picked from commit d4af1304778c10213cb1f98e23938c6c4b912723) - URL: https://github.com/kamailio/kamailio/commit/071fba8cc700d99b62aba59bc768681… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:55:32+02:00 db_redis: init allocated structure (cherry picked from commit b8c4d8b8d0f06267f2bc1a760307345fd06745ce) - URL: https://github.com/kamailio/kamailio/commit/9083eb3befc2a50df12b57ff3e1098a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:55:43+02:00 core: 0-terminate string for very long local network interface names (cherry picked from commit 476d763d8ee504b71c13063ca002ecfe158da94e) - URL: https://github.com/kamailio/kamailio/commit/ddc343f3a89faeacd85ae1374594e28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:55:53+02:00 db_berkeley: covert blob values (cherry picked from commit dad443172628c3736b057fa24343c265ed3827b2) - URL: https://github.com/kamailio/kamailio/commit/22fd93ec58abbbe4a850343b85082f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:56:02+02:00 core: parse uri - extra check when user part is missing before @ (cherry picked from commit b32a9caf4797370a4704b5f94d2d704b6e52fdef) - URL: https://github.com/kamailio/kamailio/commit/08eeb04d40a3a66a139fd60df153724… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-05-05T08:57:03+02:00 utils: fixed sinitiser error [root@localhost]# kamcmd cfg.seti param_group param_name value ================================================================= ==2409977==ERROR: LeakSanitizer: detected memory leaks Direct leak of 38 byte(s) in 1 object(s) allocated from: #0 0xffff98c250af in malloc (/lib64/libasan.so.5+0xd50af) #1 0x41549f in parse_listen_id /root/kamailio/utils/kamcmd/parse_listen_id.c:133 #2 0x4144fb in main /root/kamailio/utils/kamcmd/kamcmd.c:2075 #3 0xffff97dc0de3 in __libc_start_main (/lib64/libc.so.6+0x20de3) #4 0x40260b (/usr/local/sbin/kamcmd+0x40260b) (cherry picked from commit d28ca884548b0f24a618ed9cbdc8e1b9538f2574) - URL: https://github.com/kamailio/kamailio/commit/d4b2b095e6da139d886ac71d3aae1e7… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2022-05-05T08:57:28+02:00 siptrace: fix pkg memory leak when module configured with core callbacks - Correctly freeng pkg memory in core callbacks when body modifications take place with X-Siptrace headers, also fix potential pkg_free with not dynamicaly allocated objects. (cherry picked from commit fc50ce1dbd31bbd28a11d672ed9bdbe9bd4ae5d0) - URL: https://github.com/kamailio/kamailio/commit/963842bc6afec81ef3d8ba8c7d0e9b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:59:49+02:00 core: zero-ending ipv4 string in ip_addr2sbufz() like done for ipv6 (cherry picked from commit 2eac6a0c2f2dd7c8831ef65fa9d92b88a79d23af) - URL: https://github.com/kamailio/kamailio/commit/beb501f3ac2dd6095b0184c60f9fe41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:00:40+02:00 permissions: return ret variable set inside double_fixup() (cherry picked from commit e272eea0229678b4446a3907b7360c61c273caa7) - URL: https://github.com/kamailio/kamailio/commit/25b54ae9a62d6877f74356fedf0325b… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-05T09:02:16+02:00 auth: Fix missing dependency in docs (cherry picked from commit dd15436e8697f70df6ef9d188da36f70e7116a74) - URL: https://github.com/kamailio/kamailio/commit/4be7e2573750c4bccef4e74eafd41bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:03:01+02:00 htable: reset entries field if hash table initialization fails (cherry picked from commit d542cb89afb1a34cba35cbcf0f40315581fbb767) - URL: https://github.com/kamailio/kamailio/commit/02b0340f8dcfc172d5f4c493bf97a60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:03:09+02:00 htable: track when records were successfully loaded from database - write back only in such case (cherry picked from commit b1fa63b1547fc5af6cc1e97db42ea76db1bf927b) - URL: https://github.com/kamailio/kamailio/commit/b8ad92740a35df43aba201e116641df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:03:22+02:00 htable: check if entries are initialized before sync'ing to db (cherry picked from commit 9a8974a80b8ce5ffc9166e81f43f8581777cd48f) - URL: https://github.com/kamailio/kamailio/commit/ccf116505f1784b635dc1e9e1f5e4e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:04:55+02:00 xmlops: coherent formatting (cherry picked from commit 098955e23289b82db40d5cef76ee03bf09e8a0da) - URL: https://github.com/kamailio/kamailio/commit/d6d73e3bb7d3fa1a07d816a136316f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:05:04+02:00 topos: use direction for loading invite record for other early dialog requests - GH #3090 (cherry picked from commit ceb688b3d364bb7b8d9f52b7238d560cb4e30b3d) - URL: https://github.com/kamailio/kamailio/commit/170126fb80bf93595a5d3e3b2f56c65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:05:25+02:00 topos: restore attributes based on direction for early dialog requests - GH #3090 (cherry picked from commit c309122864eaa2bfa58253290bed49084ccc9302) - URL: https://github.com/kamailio/kamailio/commit/58a02618cec102455e35ad3dfbddf93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:06:53+02:00 core: mem/tlsf - handle return codes during memory pool init (cherry picked from commit ef62bfb27514dc7ec3b603bee661cfac18c4fe93) - URL: https://github.com/kamailio/kamailio/commit/fef9c3406c2f070bf25013997912124… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:07:04+02:00 rls: free resources in case of errors (cherry picked from commit 72443722d7fda4289390ef8bc20ad91990b895a7) - URL: https://github.com/kamailio/kamailio/commit/3b8f91d241ccf965c08bdb6ad560cf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:08:02+02:00 topos: catch INFO requests during early dialog phase (cherry picked from commit 67da7301f1eb74b6fff9e6e73b43f08dbc9c53bf) - URL: https://github.com/kamailio/kamailio/commit/0cc8bbad9fab44c387535b09fc51944… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:08:15+02:00 rls: safety check for dialog structur (cherry picked from commit b5aae4f5afd07db114c3ff7712b484f743663b26) - URL: https://github.com/kamailio/kamailio/commit/397b5c1c7f5c4e8743dbfcf851dede1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:08:28+02:00 xcap_client: init structure (cherry picked from commit cfb50124e67b68552520e418a20ad2dfec96117b) - URL: https://github.com/kamailio/kamailio/commit/c7d8f24f2237c03e493ddfe0fbb806b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:09:02+02:00 lrkproxy: init value for compiler warning (cherry picked from commit 9fd0cae960b0795a5e511c37f768f0962b7a15c1) - URL: https://github.com/kamailio/kamailio/commit/05e2b31ff419176cbc8be4f848c940f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:09:14+02:00 sms: use unsigned int for bit shifting for compiler warnings (cherry picked from commit cacae7fc5db5418a67d543995273280d57f027c6) - URL: https://github.com/kamailio/kamailio/commit/1d39dc57cda8fbb169a3848c5e4dba3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:09:37+02:00 presence_xml: free uri for http xcap auth (cherry picked from commit eba6c7d78088cde411f5cd1b7730ba458e62a69e) - URL: https://github.com/kamailio/kamailio/commit/a830c48802edeb0284dbfb7e554b39d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:10:22+02:00 core: main - check the debug cli param value (cherry picked from commit dfc407c4009acbd6e05ecfaf4e727b0636ab92a4) - URL: https://github.com/kamailio/kamailio/commit/a03721b4e0b9251b11dd2dcabbdce3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:10:41+02:00 core: modparam - safety check for str s pointer - deal with the case of argument with 'nonnull' attribute passed null (cherry picked from commit 69c004eec161c14d957f9e4011aeff4163af858d) - URL: https://github.com/kamailio/kamailio/commit/eac307296fafeb96047a4359f3d36de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:10:52+02:00 snmpstats: use same type as the pointer for sizeof (cherry picked from commit 3de5a781a3d0333352ab72c6b790f472f393df2b) - URL: https://github.com/kamailio/kamailio/commit/db3fb40e3b8e1b12ad6a0faf7274abf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:11:03+02:00 cdp: use same data type for size computing as pointer type (cherry picked from commit 47169b6774759131e9e535f2b9d358772b777b9c) - URL: https://github.com/kamailio/kamailio/commit/bb63c1212ba8ce1d2ea6d07c007c7d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:11:51+02:00 snmpstats: fix allocator sizeof operand mismatch (cherry picked from commit 0c99fed48403e2cc4f24441901b81b7c51411511) - URL: https://github.com/kamailio/kamailio/commit/3bccd877acbc03b136186fd45bc98ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:12:03+02:00 msilo: skip invalid stored records (cherry picked from commit e5efcbdd7be9897cf169b28a7a52c45bff24cac3) - URL: https://github.com/kamailio/kamailio/commit/2b3e09d781a157629c5f9bdb809f7c4… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-05T09:12:16+02:00 cfgutils: improve example for $RANDOM (cherry picked from commit 79b2e4b00ebf7a7cdf0ed3b9c4ab7f0176d78686) - URL: https://github.com/kamailio/kamailio/commit/a05a2f01bcc85ee1f5d9db707d289e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:13:19+02:00 lcr: init variable for fixing warning report (cherry picked from commit 7f359ca152e87ec72c6dd39fe09885bae630e36f) - URL: https://github.com/kamailio/kamailio/commit/17d9e99b6f3826cbad59e01dbbc1ac0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:13:30+02:00 tm: function to clean local parsed headers and body for uas request - some modules use t->uas.request for getting attributes of the transaction request when processing the response, which may result in pointers to private memory being stored in the shared memory, causing crashes when other processes try to use the pointers (cherry picked from commit 159224b254d9a67104c60fedab46a1b78cf19a83) - URL: https://github.com/kamailio/kamailio/commit/12ca7d43a262ef7a654933db65cde78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:13:42+02:00 tm: relocated defines not useful in the header file (cherry picked from commit 27b6c641b5d941503f974fea05af506972ac2ab5) - URL: https://github.com/kamailio/kamailio/commit/d5d2105b82503f747ed82803c0dab5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:13:52+02:00 presence: rename local variable that conflicts with tm define (cherry picked from commit 8e69474ab7fd23ebd03bd193387f7e9fe8e1346d) - URL: https://github.com/kamailio/kamailio/commit/259448fe45346eeb201d441a6cde471… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:14:06+02:00 cdp: close socket in case of error (cherry picked from commit 993c036bb185f6053a3a2f0486be30398918a87c) - URL: https://github.com/kamailio/kamailio/commit/34d83298f0dfa79e228bdb5998b3c2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:14:17+02:00 sanity: fix sanity_reply function name for config exports (cherry picked from commit eeefe7dcc2af90e7def8f1698e8f79d0dd020043) - URL: https://github.com/kamailio/kamailio/commit/cbb86fe6451c4ed323a394ce6691f08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:14:34+02:00 Revert "sanity: fix sanity_reply function name for config exports" This reverts commit eeefe7dcc2af90e7def8f1698e8f79d0dd020043. (cherry picked from commit d9e0e3716cd85a4fae4587e7bf8dc6967cf19ebe) - URL: https://github.com/kamailio/kamailio/commit/89c917534b76d936993ce1b590df6fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:14:46+02:00 sanity: fix sanity_reply() function name for config exports (cherry picked from commit 7c52c05b09abdf2cf754cc02f3a1ea0855cdedd0)

1 0

git:master:d9e0e371: Revert "sanity: fix sanity_reply function name for config exports"
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: d9e0e3716cd85a4fae4587e7bf8dc6967cf19ebe URL: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T16:33:08+02:00 Revert "sanity: fix sanity_reply function name for config exports" This reverts commit eeefe7dcc2af90e7def8f1698e8f79d0dd020043. --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db_con.h Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc69… Patch: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc69… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index 5dc0cabfb7..54b66d330b 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2001-2003 FhG Fokus * Copyright (C) 2007-2008 1&1 Internet AG - * + * * This file is part of Kamailio, a free SIP server. * * Kamailio is free software; you can redistribute it and/or modify @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -294,7 +294,7 @@ db1_con_t* db_do_init2(const str* url, void* (*new_connection)(), db_pooling_t p LM_ERR("The configured db_url is too long\n"); return 0; } - + /* this is the root memory for this database connection. */ res = (db1_con_t*)pkg_malloc(con_size); if (!res) { diff --git a/src/lib/srdb1/db_con.h b/src/lib/srdb1/db_con.h index fab02c0e62..3a026f1f93 100644 --- a/src/lib/srdb1/db_con.h +++ b/src/lib/srdb1/db_con.h @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -36,7 +36,6 @@ * are used as a connection handle from modules uses the db API. */ typedef struct { - long cpid; /*!< connection process id */ const str* table; /*!< Default table that should be used */ const char *tquote; /*!< Char to quote special tokens (table/column names) */ unsigned long tail; /*!< Variable length tail, database module specific */ diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 832a0c2308..3f813bb021 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -60,7 +60,7 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|ONREPLY_ROUTE}, {"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0, + {"sanity_check", (cmd_function)w_sanity_reply, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0 }, {0, 0, 0, 0, 0, 0}

1 0

git:master:7c52c05b: sanity: fix sanity_reply() function name for config exports
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 7c52c05b09abdf2cf754cc02f3a1ea0855cdedd0 URL: https://github.com/kamailio/kamailio/commit/7c52c05b09abdf2cf754cc02f3a1ea0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T16:33:47+02:00 sanity: fix sanity_reply() function name for config exports --- Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7c52c05b09abdf2cf754cc02f3a1ea0… Patch: https://github.com/kamailio/kamailio/commit/7c52c05b09abdf2cf754cc02f3a1ea0… --- diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 3f813bb021..832a0c2308 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -60,7 +60,7 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|ONREPLY_ROUTE}, {"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_check", (cmd_function)w_sanity_reply, 0, 0, 0, + {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0 }, {0, 0, 0, 0, 0, 0}

1 0

git:master:eeefe7dc: sanity: fix sanity_reply function name for config exports
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: eeefe7dcc2af90e7def8f1698e8f79d0dd020043 URL: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T16:25:03+02:00 sanity: fix sanity_reply function name for config exports --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db_con.h Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d… Patch: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index 54b66d330b..5dc0cabfb7 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2001-2003 FhG Fokus * Copyright (C) 2007-2008 1&1 Internet AG - * + * * This file is part of Kamailio, a free SIP server. * * Kamailio is free software; you can redistribute it and/or modify @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -294,7 +294,7 @@ db1_con_t* db_do_init2(const str* url, void* (*new_connection)(), db_pooling_t p LM_ERR("The configured db_url is too long\n"); return 0; } - + /* this is the root memory for this database connection. */ res = (db1_con_t*)pkg_malloc(con_size); if (!res) { diff --git a/src/lib/srdb1/db_con.h b/src/lib/srdb1/db_con.h index 3a026f1f93..fab02c0e62 100644 --- a/src/lib/srdb1/db_con.h +++ b/src/lib/srdb1/db_con.h @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -36,6 +36,7 @@ * are used as a connection handle from modules uses the db API. */ typedef struct { + long cpid; /*!< connection process id */ const str* table; /*!< Default table that should be used */ const char *tquote; /*!< Char to quote special tokens (table/column names) */ unsigned long tail; /*!< Variable length tail, database module specific */ diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 3f813bb021..832a0c2308 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -60,7 +60,7 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|ONREPLY_ROUTE}, {"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_check", (cmd_function)w_sanity_reply, 0, 0, 0, + {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0 }, {0, 0, 0, 0, 0, 0}

1 0

git:master:993c036b: cdp: close socket in case of error
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 993c036bb185f6053a3a2f0486be30398918a87c URL: https://github.com/kamailio/kamailio/commit/993c036bb185f6053a3a2f0486be303… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T14:55:01+02:00 cdp: close socket in case of error --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/993c036bb185f6053a3a2f0486be303… Patch: https://github.com/kamailio/kamailio/commit/993c036bb185f6053a3a2f0486be303… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 0bff4131d3..692cc363ae 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -844,7 +844,7 @@ int receive_loop(peer *original_peer) */ int peer_connect(peer *p) { - int sock; + int sock = -1; int tmp = 0; unsigned int option = 1; @@ -922,17 +922,20 @@ int peer_connect(peer *p) if (valopt) { LM_ERR("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(valopt)); close(sock); + sock = -1; continue; } }else{ LM_ERR("peer_connect(): Timeout or error opening connection to to %s port %s >%s\n",host,serv,strerror(errno)); close(sock); + sock = -1; continue; } } }else{ LM_ERR("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(errno)); close(sock); + sock = -1; continue; } @@ -956,7 +959,6 @@ int peer_connect(peer *p) if (!send_fd(p->fd_exchange_pipe,sock,p)){ LM_ERR("peer_connect(): [%.*s] Error sending fd to respective receiver\n",p->fqdn.len,p->fqdn.s); - close(sock); goto error; } @@ -967,6 +969,7 @@ int peer_connect(peer *p) error: if (res) freeaddrinfo(res); if (sainfo) freeaddrinfo(sainfo); + if (sock!=-1) close(sock); return -1; }

1 0

git:master:b1eb0928: ims_ipsec_pcscf: safety check for pcontact search result
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: b1eb0928f8e68a697eccda3e75504eb2263cb95b URL: https://github.com/kamailio/kamailio/commit/b1eb0928f8e68a697eccda3e75504eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T10:02:18+02:00 ims_ipsec_pcscf: safety check for pcontact search result --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/b1eb0928f8e68a697eccda3e75504eb… Patch: https://github.com/kamailio/kamailio/commit/b1eb0928f8e68a697eccda3e75504eb… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 5013087c02..0651d4226f 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -667,7 +667,7 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0 || pcontact==NULL) { LM_ERR("Contact doesn't exist\n"); goto cleanup; } @@ -810,7 +810,8 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact, _cflags & IPSEC_REVERSE_SEARCH) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, _cflags & IPSEC_REVERSE_SEARCH) != 0 + || pcontact==NULL) { LM_ERR("Contact doesn't exist\n"); goto cleanup; } @@ -967,7 +968,7 @@ int ipsec_destroy(struct sip_msg* m, udomain_t* d) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0 || pcontact==NULL) { LM_ERR("Contact doesn't exist\n"); goto cleanup; }

1 0

git:master:5cac8b4e: ims_ipsec_pcscf: clean local parsed tm uas request headers
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 5cac8b4e99399ae3db4fb281fc084f73d8e8307f URL: https://github.com/kamailio/kamailio/commit/5cac8b4e99399ae3db4fb281fc084f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T09:57:53+02:00 ims_ipsec_pcscf: clean local parsed tm uas request headers --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/5cac8b4e99399ae3db4fb281fc084f7… Patch: https://github.com/kamailio/kamailio/commit/5cac8b4e99399ae3db4fb281fc084f7… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index f8672a592a..5013087c02 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -140,7 +140,7 @@ static str get_www_auth_param(const char* param_name, str www_auth) return val; } -static int fill_contact(struct pcontact_info* ci, struct sip_msg* m) +static int fill_contact(struct pcontact_info* ci, struct sip_msg* m, tm_cell_t *t) { contact_body_t* cb = NULL; struct via_body* vb = NULL; @@ -244,7 +244,6 @@ static int fill_contact(struct pcontact_info* ci, struct sip_msg* m) } } else if(m->first_line.type == SIP_REPLY) { - struct cell *t = tmb.t_gett(); if (!t || t == (void*) -1) { LM_ERR("Reply without transaction\n"); return -1; @@ -651,9 +650,13 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) pcontact_t* pcontact = NULL; struct pcontact_info ci; int ret = IPSEC_CMD_FAIL; // FAIL by default + tm_cell_t *t = NULL; + if(m->first_line.type == SIP_REPLY) { + t = tmb.t_gett(); + } // Find the contact - if(fill_contact(&ci, m) != 0) { + if(fill_contact(&ci, m, t) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -681,7 +684,7 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) } // Get request from reply - struct cell *t = tmb.t_gett(); + if (!t) t = tmb.t_gett(); if (!t || t == (void*) -1) { LM_ERR("Reply without transaction\n"); goto cleanup; @@ -765,6 +768,9 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) // Do not free str* sec_header! It will be freed in data_lump.c -> free_lump() ul.unlock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); pkg_free(ci.received_host.s); + if(t) { + tmb.t_uas_request_clean_parsed(t); + } return ret; } @@ -778,11 +784,12 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) unsigned short dst_port = 0; unsigned short src_port = 0; ip_addr_t via_host; - struct sip_msg* req = NULL; + struct cell *t = NULL; + if(m->first_line.type == SIP_REPLY) { // Get request from reply - struct cell *t = tmb.t_gett(); + t = tmb.t_gett(); if (!t) { LM_ERR("Error getting transaction\n"); return ret; @@ -796,7 +803,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) // // Find the contact // - if(fill_contact(&ci, m) != 0) { + if(fill_contact(&ci, m, t) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -864,7 +871,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) // for Request sends from P-CSCF client port src_port = s->port_pc; - + // for Request sends to UE server port dst_port = s->port_us; } @@ -934,6 +941,9 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) cleanup: ul.unlock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); pkg_free(ci.received_host.s); + if(t) { + tmb.t_uas_request_clean_parsed(t); + } return ret; } @@ -943,11 +953,14 @@ int ipsec_destroy(struct sip_msg* m, udomain_t* d) struct pcontact_info ci; pcontact_t* pcontact = NULL; int ret = IPSEC_CMD_FAIL; // FAIL by default + tm_cell_t *t = NULL; + + if(m->first_line.type == SIP_REPLY) { + t = tmb.t_gett(); + } - // // Find the contact - // - if(fill_contact(&ci, m) != 0) { + if(fill_contact(&ci, m, t) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -978,6 +991,9 @@ int ipsec_destroy(struct sip_msg* m, udomain_t* d) cleanup: ul.unlock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); pkg_free(ci.received_host.s); + if(t) { + tmb.t_uas_request_clean_parsed(t); + } return ret; }

1 0

git:master:8e69474a: presence: rename local variable that conflicts with tm define
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 8e69474ab7fd23ebd03bd193387f7e9fe8e1346d URL: https://github.com/kamailio/kamailio/commit/8e69474ab7fd23ebd03bd193387f7e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T09:05:03+02:00 presence: rename local variable that conflicts with tm define --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/8e69474ab7fd23ebd03bd193387f7e9… Patch: https://github.com/kamailio/kamailio/commit/8e69474ab7fd23ebd03bd193387f7e9… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index b53528ce80..64c13a5f09 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -1303,7 +1303,7 @@ int extract_sdialog_info_ex(subs_t *subs, struct sip_msg *msg, uint32_t miexp, str rec_route = {0, 0}; int rt = 0; contact_body_t *b; - struct to_body *pto, TO = {0}, *pfrom = NULL; + struct to_body *pto, tob = {0}, *pfrom = NULL; uint32_t lexpire; str rtag_value; struct sip_uri uri; @@ -1352,12 +1352,12 @@ int extract_sdialog_info_ex(subs_t *subs, struct sip_msg *msg, uint32_t miexp, LM_DBG("'To' header ALREADY PARSED: <%.*s>\n", pto->uri.len, pto->uri.s); } else { - parse_to(msg->to->body.s, msg->to->body.s + msg->to->body.len + 1, &TO); - if(TO.uri.len <= 0) { + parse_to(msg->to->body.s, msg->to->body.s + msg->to->body.len + 1, &tob); + if(tob.uri.len <= 0) { LM_DBG("'To' header NOT parsed\n"); goto error; } - pto = &TO; + pto = &tob; } if(pto->parsed_uri.user.s && pto->parsed_uri.host.s @@ -1509,11 +1509,11 @@ int extract_sdialog_info_ex(subs_t *subs, struct sip_msg *msg, uint32_t miexp, } getbflagsval(0, &subs->flags); - free_to_params(&TO); + free_to_params(&tob); return 0; error: - free_to_params(&TO); + free_to_params(&tob); return -1; }

1 0

git:master:159224b2: tm: function to clean local parsed headers and body for uas request
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 159224b254d9a67104c60fedab46a1b78cf19a83 URL: https://github.com/kamailio/kamailio/commit/159224b254d9a67104c60fedab46a1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T08:56:14+02:00 tm: function to clean local parsed headers and body for uas request - some modules use t->uas.request for getting attributes of the transaction request when processing the response, which may result in pointers to private memory being stored in the shared memory, causing crashes when other processes try to use the pointers --- Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/159224b254d9a67104c60fedab46a1b… Patch: https://github.com/kamailio/kamailio/commit/159224b254d9a67104c60fedab46a1b… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 27aaef9b5f..ad9c8ae903 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1776,3 +1776,37 @@ char *build_uac_cancel(str *headers,str *body,struct cell *cancelledT, return NULL; } +/** + * + */ +void t_uas_request_clean_parsed(tm_cell_t *t) +{ + struct hdr_field *hdr; + void *mstart; + void *mend; + + if (!t || !t->uas.request) { + return; + } + + mstart = t->uas.request; + mend = t->uas.end_request; + + /* free header's parsed structures that were added by failure handlers */ + for (hdr=t->uas.request->headers; hdr; hdr=hdr->next ) { + if (hdr->parsed && hdr_allocs_parse(hdr) + && (hdr->parsed<mstart || hdr->parsed>=mend)) { + /* header parsed filed doesn't point inside fake memory + * chunck -> it was added by failure funcs.-> free it as pkg */ + LM_DBG("removing hdr->parsed %d\n", hdr->type); + clean_hdr_field(hdr); + hdr->parsed = 0; + } + } + /* free parsed body added by failure handlers */ + if (t->uas.request->body) { + if(t->uas.request->body->free) + t->uas.request->body->free(&t->uas.request->body); + t->uas.request->body = 0; + } +} diff --git a/src/modules/tm/t_msgbuilder.h b/src/modules/tm/t_msgbuilder.h index 46969e0d69..e22bb0e1de 100644 --- a/src/modules/tm/t_msgbuilder.h +++ b/src/modules/tm/t_msgbuilder.h @@ -28,7 +28,6 @@ #include "h_table.h" #include "t_reply.h" - #define CSEQ "CSeq: " #define CSEQ_LEN (sizeof(CSEQ)-1) #define TO "To: " @@ -45,7 +44,6 @@ #define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF #define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1) - char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, char *method, int method_len, str *to , struct cancel_reason* reason @@ -92,4 +90,7 @@ int t_calc_branch(struct cell *t, char* print_callid_mini(char* target, str callid); char* print_cseq_mini(char* target, str* cseq, str* method); +typedef void (*t_uas_request_clean_parsed_f)(tm_cell_t *t); +void t_uas_request_clean_parsed(tm_cell_t *t); + #endif diff --git a/src/modules/tm/tm_load.c b/src/modules/tm/tm_load.c index 65515a3a28..8635b90eae 100644 --- a/src/modules/tm/tm_load.c +++ b/src/modules/tm/tm_load.c @@ -139,6 +139,7 @@ int load_tm( struct tm_binds *tmb) tmb->t_next_contacts = t_next_contacts; tmb->set_fr = t_set_fr; tmb->t_release_transaction = t_release_transaction; + tmb->t_uas_request_clean_parsed = t_uas_request_clean_parsed; return 1; } diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index 8190ee977c..4695a8f7e1 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -38,6 +38,7 @@ #include "t_append_branches.h" #include "t_stats.h" #include "t_serial.h" +#include "t_msgbuilder.h" /* export not usable from scripts */ #define NO_SCRIPT -1 @@ -122,6 +123,7 @@ struct tm_binds { cmd_function t_next_contacts; tset_fr_f set_fr; trelease_t t_release_transaction; + t_uas_request_clean_parsed_f t_uas_request_clean_parsed; }; typedef struct tm_binds tm_api_t;

1 0

git:master:27b6c641: tm: relocated defines not useful in the header file
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 27b6c641b5d941503f974fea05af506972ac2ab5 URL: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T09:00:55+02:00 tm: relocated defines not useful in the header file --- Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h --- Diff: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506… Patch: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index ad9c8ae903..08e50a8ea9 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -46,6 +46,22 @@ #endif +#define CSEQ "CSeq: " +#define CSEQ_LEN (sizeof(CSEQ)-1) +#define TO "To: " +#define TO_LEN (sizeof(TO)-1) +#define CALLID "Call-ID: " +#define CALLID_LEN (sizeof(CALLID)-1) +#define FROM "From: " +#define FROM_LEN (sizeof(FROM)-1) +#define FROMTAG ";tag=" +#define FROMTAG_LEN (sizeof(FROMTAG)-1) +#define TOTAG ";tag=" +#define TOTAG_LEN (sizeof(TOTAG)-1) +#define MAXFWD_VALUE "70" +#define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF +#define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1) + /* convenience macros */ #define memapp(_d,_s,_len) \ do{\ diff --git a/src/modules/tm/t_msgbuilder.h b/src/modules/tm/t_msgbuilder.h index e22bb0e1de..a97c1f9451 100644 --- a/src/modules/tm/t_msgbuilder.h +++ b/src/modules/tm/t_msgbuilder.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -28,22 +28,6 @@ #include "h_table.h" #include "t_reply.h" -#define CSEQ "CSeq: " -#define CSEQ_LEN (sizeof(CSEQ)-1) -#define TO "To: " -#define TO_LEN (sizeof(TO)-1) -#define CALLID "Call-ID: " -#define CALLID_LEN (sizeof(CALLID)-1) -#define FROM "From: " -#define FROM_LEN (sizeof(FROM)-1) -#define FROMTAG ";tag=" -#define FROMTAG_LEN (sizeof(FROMTAG)-1) -#define TOTAG ";tag=" -#define TOTAG_LEN (sizeof(TOTAG)-1) -#define MAXFWD_VALUE "70" -#define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF -#define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1) - char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, char *method, int method_len, str *to , struct cancel_reason* reason @@ -55,7 +39,7 @@ char *build_local_reparse(struct cell *Trans, unsigned int branch, ); char *build_uac_request( str msg_type, str dst, str from, - str fromtag, int cseq, str callid, str headers, + str fromtag, int cseq, str callid, str headers, str body, int branch, struct cell *t, unsigned int *len); @@ -71,7 +55,7 @@ char *build_uac_cancel(str *headers,str *body,struct cell *cancelledT, * request should be send. The function is used by tm when it generates * local ACK to 200 OK (on behalf of applications using uac */ -char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, +char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, unsigned int branch, str *hdrs, str *body, unsigned int *len, struct dest_info* dst); @@ -79,8 +63,8 @@ char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, /* * Create a request */ -char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch, - struct cell *t, int* len, struct dest_info* dst); +char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch, + struct cell *t, int* len, struct dest_info* dst); int t_calc_branch(struct cell *t,

1 0

db_redis shared tcp connection issue
by Andrew Pogrebennyk 04 May '22

04 May '22

Dear community, I've been looking at some weirdness in db_redis behavior when it returns the responses to the queries made by tcp processes in mixed order. Tested this on various kamailio 5.3 and 5.4 (sipwise spce) and they are showing interesting pattern. After restart of kamailio I ran lsof to enumerate all the sockets open in kamailio children. There is a connection to db port 6379 which is held by multiple processes at the same time. > for i in $(ps auxww | grep kamailio.proxy | grep -v grep | awk '{print > $2}'); do echo "print file descriptors of $i" && sudo lsof -p $i | grep > 6379; done > redis_conn.txt ...i see that lsof lists tcp client socket to redis server with same source TCP port and same inode number in several processes: 14199, "TIMER NH", 14200, "ctl handler", 14205, "Dialog Clean Timer", 14206, "JSONRPCS FIFO", 14210, "JSONRPCS DATAGRAM", 14213, "tcp receiver (generic) child=0", 14214, "tcp receiver (generic) child=1", 14215, "tcp receiver (generic) child=2", 14220, "tcp receiver (generic) child=3", 14224, "tcp receiver (generic) child=4", 14225, "tcp main process" The UDP processes are safe (and some timer ones too), because in that lsof they have unique TCP client port. That's giving me a lot of headache because UA registrations received by any of the TCP workers (or IPSec ones for that matter) are randomly failing, because if two processes made same query to DB in parallel it is appearing on the wire with same TCP source port and replies can be mixed up. This can be some bug in usage of hiredis, impacting all users of db_redis module. Is there any relation to the way kamailio is working its TCP workers, where maybe tcp workers are forked from the main attendant processes after having opened the DB connection? P.S. Why I have the above hypothesis: when I log redis queries with redis-cli monitor at startup of kamailio, I see only that srem_key_lua is executed against redis in runtime only once from that source port, but then this connection is shared across multiple processes. Regards, Andrew

3 8

git:master:7f359ca1: lcr: init variable for fixing warning report
by Daniel-Constantin Mierla 03 May '22

03 May '22

Module: kamailio Branch: master Commit: 7f359ca152e87ec72c6dd39fe09885bae630e36f URL: https://github.com/kamailio/kamailio/commit/7f359ca152e87ec72c6dd39fe09885b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-03T20:59:49+02:00 lcr: init variable for fixing warning report --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7f359ca152e87ec72c6dd39fe09885b… Patch: https://github.com/kamailio/kamailio/commit/7f359ca152e87ec72c6dd39fe09885b… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 9647dde044..6f5eafdb22 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -1939,7 +1939,7 @@ static inline int decode_avp_value(char *value, unsigned int *gw_index, struct ip_addr *addr, str *hostname, str *port, str *params, str *transport, unsigned int *flags, unsigned int *rule_id) { - unsigned int u; + unsigned int u = 0; str s; char *sep; struct ip_addr *ip;

1 0

git:master:a0285e6d: modules: readme files regenerated - cfgutils ... [skip ci]
by Kamailio Dev 03 May '22

03 May '22

Module: kamailio Branch: master Commit: a0285e6d6f1aec539e89df60cf5aeb78c6a0409b URL: https://github.com/kamailio/kamailio/commit/a0285e6d6f1aec539e89df60cf5aeb7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-03T20:01:15+02:00 modules: readme files regenerated - cfgutils ... [skip ci] --- Modified: src/modules/cfgutils/README --- Diff: https://github.com/kamailio/kamailio/commit/a0285e6d6f1aec539e89df60cf5aeb7… Patch: https://github.com/kamailio/kamailio/commit/a0285e6d6f1aec539e89df60cf5aeb7… --- diff --git a/src/modules/cfgutils/README b/src/modules/cfgutils/README index 3d46af3ba3..890952c7c5 100644 --- a/src/modules/cfgutils/README +++ b/src/modules/cfgutils/README @@ -757,11 +757,11 @@ $ kamcmd cfgutils.get_gflags Example 1.34. RANDOM pseudo-variable usage ... if (rand_event()) { - $avp(i:10) = ($RANDOM / 16777216); # 2^24 - if ($avp(i:10) < 10) { - $avp(i:10) = 10; + $var(value) = ($RANDOM / 16777216); # 2^24 + if ($var(value) < 10) { + $var(value) = 10; } - append_to_reply("Retry-After: $avp(i:10)\n"); + append_to_reply("Retry-After: $var(value)\n"); sl_send_reply("503", "Try later"); exit; };

1 0

git:master:79b2e4b0: cfgutils: improve example for $RANDOM
by Henning Westerholt 03 May '22

03 May '22

Module: kamailio Branch: master Commit: 79b2e4b00ebf7a7cdf0ed3b9c4ab7f0176d78686 URL: https://github.com/kamailio/kamailio/commit/79b2e4b00ebf7a7cdf0ed3b9c4ab7f0… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-03T17:45:49Z cfgutils: improve example for $RANDOM --- Modified: src/modules/cfgutils/doc/cfgutils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/79b2e4b00ebf7a7cdf0ed3b9c4ab7f0… Patch: https://github.com/kamailio/kamailio/commit/79b2e4b00ebf7a7cdf0ed3b9c4ab7f0… --- diff --git a/src/modules/cfgutils/doc/cfgutils_admin.xml b/src/modules/cfgutils/doc/cfgutils_admin.xml index 5f411a272a..7df0a2a87e 100644 --- a/src/modules/cfgutils/doc/cfgutils_admin.xml +++ b/src/modules/cfgutils/doc/cfgutils_admin.xml @@ -839,11 +839,11 @@ $ &kamcmd; cfgutils.get_gflags <programlisting format="linespecific"> ... if (rand_event()) { - $avp(i:10) = ($RANDOM / 16777216); # 2^24 - if ($avp(i:10) < 10) { - $avp(i:10) = 10; + $var(value) = ($RANDOM / 16777216); # 2^24 + if ($var(value) < 10) { + $var(value) = 10; } - append_to_reply("Retry-After: $avp(i:10)\n"); + append_to_reply("Retry-After: $var(value)\n"); sl_send_reply("503", "Try later"); exit; };

1 0

git:master:e5efcbdd: msilo: skip invalid stored records
by Daniel-Constantin Mierla 03 May '22

03 May '22

Module: kamailio Branch: master Commit: e5efcbdd7be9897cf169b28a7a52c45bff24cac3 URL: https://github.com/kamailio/kamailio/commit/e5efcbdd7be9897cf169b28a7a52c45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-03T19:19:52+02:00 msilo: skip invalid stored records --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/e5efcbdd7be9897cf169b28a7a52c45… Patch: https://github.com/kamailio/kamailio/commit/e5efcbdd7be9897cf169b28a7a52c45… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index 0bf53ecc5a..f7218bfa61 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -1406,6 +1406,10 @@ void m_send_ontimer(unsigned int ticks, void *param) SET_STR_VAL(str_vals[0], db_res, i, 1); /* user */ SET_STR_VAL(str_vals[1], db_res, i, 2); /* host */ SET_STR_VAL(str_vals[2], db_res, i, 3); /* body */ + if(str_vals[0].s==NULL || str_vals[1].s==NULL || str_vals[2].s==NULL) { + LM_DBG("message[%d] mid=%d has no user, host or body\n", i, mid); + continue; + } SET_STR_VAL(str_vals[3], db_res, i, 4); /* ctype */ extra_hdrs_str.len = 0;

1 0

git:master:0c99fed4: snmpstats: fix allocator sizeof operand mismatch
by Daniel-Constantin Mierla 03 May '22

03 May '22

Module: kamailio Branch: master Commit: 0c99fed48403e2cc4f24441901b81b7c51411511 URL: https://github.com/kamailio/kamailio/commit/0c99fed48403e2cc4f24441901b81b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-03T19:07:41+02:00 snmpstats: fix allocator sizeof operand mismatch --- Modified: src/modules/snmpstats/snmpSIPRegUserLookupTable.c Modified: src/modules/snmpstats/snmpSIPRegUserTable.c --- Diff: https://github.com/kamailio/kamailio/commit/0c99fed48403e2cc4f24441901b81b7… Patch: https://github.com/kamailio/kamailio/commit/0c99fed48403e2cc4f24441901b81b7… --- diff --git a/src/modules/snmpstats/snmpSIPRegUserLookupTable.c b/src/modules/snmpstats/snmpSIPRegUserLookupTable.c index 9ded597b83..f00dde9ac7 100644 --- a/src/modules/snmpstats/snmpSIPRegUserLookupTable.c +++ b/src/modules/snmpstats/snmpSIPRegUserLookupTable.c @@ -520,7 +520,7 @@ void kamailioSIPRegUserLookupTable_set_action(netsnmp_request_group *rg) case COLUMN_KAMAILIOSIPREGUSERLOOKUPURI: row_ctx->kamailioSIPRegUserLookupURI = - pkg_malloc(sizeof(char) * (var->val_len + 1)); + pkg_malloc(sizeof(unsigned char) * (var->val_len + 1)); memcpy(row_ctx->kamailioSIPRegUserLookupURI, var->val.string, var->val_len); @@ -776,4 +776,4 @@ kamailioSIPRegUserLookupTable_get_by_idx(netsnmp_index *hdr) { return (const kamailioSIPRegUserLookupTable_context *)CONTAINER_FIND( cb.container, hdr); -} \ No newline at end of file +} diff --git a/src/modules/snmpstats/snmpSIPRegUserTable.c b/src/modules/snmpstats/snmpSIPRegUserTable.c index 4ad5bf3307..6d4270a188 100644 --- a/src/modules/snmpstats/snmpSIPRegUserTable.c +++ b/src/modules/snmpstats/snmpSIPRegUserTable.c @@ -248,7 +248,7 @@ int createRegUserRow(char *stringToRegister) theRow->kamailioSIPUserIndex = index; theRow->kamailioSIPUserUri = - (unsigned char *)pkg_malloc(stringLength * sizeof(char)); + (unsigned char *)pkg_malloc(stringLength * sizeof(unsigned char)); if(theRow->kamailioSIPUserUri == NULL) { pkg_free(OIDIndex); free(theRow); @@ -378,4 +378,4 @@ const kamailioSIPRegUserTable_context *kamailioSIPRegUserTable_get_by_idx( { return (const kamailioSIPRegUserTable_context *)CONTAINER_FIND( cb.container, hdr); -} \ No newline at end of file +}

1 0

[kamailio/kamailio] core: add an option to trigger also an RST on tcp connection close (PR #3100)
by Rick Barenthin 03 May '22

03 May '22

- This gives an option to also send RST in case kamailio closes the connection. There are cases where a FIN,ACK back forth leaves the connection in the host in TIME_WAIT state, but the ports on both sides are fixed. This leads to no request can send until the TIME_WAIT state is gone.   #### 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  We have seen that in deployments where there are strict port requirements on both side, there are tcp connections in TIME_WAIT state causing no fresh TCP connections possible until the TIME_WAIT is gone. In a lot of these case the clients are sending from them self a RST after they send a FIN,ACK from there side but some aren't doing this. The basic idea of this PR is to give an extra option for the tcp configuration from the cfg to trigger always an RST on connection close from Kamailio side. This currently done by enabling SO_LINGER with a value of 0 just before close. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3100 -- Commit Summary -- * core: add an option to trigger also an RST on tcp connection close -- File Changes -- M src/core/cfg.lex (2) M src/core/cfg.y (9) M src/core/tcp_main.c (7) M src/core/tcp_options.c (3) M src/core/tcp_options.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3100.patch https://github.com/kamailio/kamailio/pull/3100.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3100 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3100(a)github.com>

2 3

git:master:c0b5e627: core: clang format for sip msg clone code
by Daniel-Constantin Mierla 03 May '22

03 May '22

Module: kamailio Branch: master Commit: c0b5e62782e0c8d5eb10eeb9d8e0952b1cb720d6 URL: https://github.com/kamailio/kamailio/commit/c0b5e62782e0c8d5eb10eeb9d8e0952… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-03T12:09:07+02:00 core: clang format for sip msg clone code --- Modified: src/core/sip_msg_clone.c Modified: src/core/sip_msg_clone.h --- Diff: https://github.com/kamailio/kamailio/commit/c0b5e62782e0c8d5eb10eeb9d8e0952… Patch: https://github.com/kamailio/kamailio/commit/c0b5e62782e0c8d5eb10eeb9d8e0952…

1 0

[kamailio/kamailio] pv_headers: fix possible mem. overflow issue and wrong size string (PR #3095)
by Tomohare 03 May '22

03 May '22

#### 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  - remove a variable creation Put two variable accessible to the entire function, renaming one to have some clarity. Remove the useless variable. - Change from using snprintf to memset (no more \0 at last position) This fix possible a memory overflow while using `snprintf`. This also add a \0 at the end of the structure, so a more direct approach with `memset` was used. - change the destination of an allocated space being smaller than the source Elements were being put into a smaller string, this commit makes the destination bigger then the source. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3095 -- Commit Summary -- * pv_headers: fix possible mem. overflow issue and wrong size string -- File Changes -- M src/modules/pv_headers/pvh_func.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3095.patch https://github.com/kamailio/kamailio/pull/3095.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3095 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3095(a)github.com>

4 6

git:master:82f14f54: pv_headers: fix possible mem. overflow issue and wrong size string
by Victor Seva 03 May '22

03 May '22

Module: kamailio Branch: master Commit: 82f14f54a45a2d0ddd4c870d6fb4adae7e1a65f1 URL: https://github.com/kamailio/kamailio/commit/82f14f54a45a2d0ddd4c870d6fb4ada… Author: Fabricio Santolin da Silva <fabricio.santolin-da-silva(a)al-enterprise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-03T10:04:17+02:00 pv_headers: fix possible mem. overflow issue and wrong size string - remove a variable creation - change from using snprintf to memset (no more \0 at last position) - change the destination of a allocated space being smaller than the source --- Modified: src/modules/pv_headers/pvh_func.c --- Diff: https://github.com/kamailio/kamailio/commit/82f14f54a45a2d0ddd4c870d6fb4ada… Patch: https://github.com/kamailio/kamailio/commit/82f14f54a45a2d0ddd4c870d6fb4ada… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index c2a3f98e41..dde1b8301b 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -383,13 +383,13 @@ int pvh_header_param_exists(struct sip_msg *msg, str *hname, str *hvalue) int pvh_remove_header_param(struct sip_msg *msg, int idx, str *hname, str *elements, str *toRemove) { + int notTarget, writtenChars; int offset = 0; int ret = -1; char *next_token; char *token; char *result = (char*)pkg_malloc(elements->len - toRemove->len); - char *t = (char*)pkg_malloc(elements->len); - int maxSize = elements->len; + char *t = (char*)pkg_malloc(elements->len+1); if (result == NULL || t == NULL) { @@ -397,37 +397,35 @@ int pvh_remove_header_param(struct sip_msg *msg, int idx, str *hname, str *eleme goto clean; } - snprintf(result, elements->len - toRemove->len, "%*s", elements->len - toRemove->len, ""); snprintf(t, elements->len+1, "%s", elements->s); token = strtok_r(t, ", ", &next_token); while(token) { - int notTarget = strncmp(token, toRemove->s, toRemove->len); + notTarget = strncmp(token, toRemove->s, toRemove->len); if (notTarget) { - int n = snprintf(result + offset, maxSize - offset, "%s", token); - if (n < 0 || n >= maxSize - offset) + writtenChars = snprintf(result + offset, elements->len - offset, "%s", token); + if (writtenChars < 0 || writtenChars >= elements->len - offset) { break; } - offset += n; + offset += writtenChars; } token = strtok_r(NULL, ", ", &next_token); - if (token && notTarget && maxSize - offset - toRemove->len > 2) + if (token && notTarget && elements->len - offset - toRemove->len > 2) { - int n = snprintf(result + offset, maxSize - offset, ", "); - if (n < 0 || n >= maxSize - offset) + writtenChars = snprintf(result + offset, elements->len - offset, ", "); + if (writtenChars < 0 || writtenChars >= elements->len - offset) { break; } - offset += n; + offset += writtenChars; } } if (elements->len-toRemove->len > 0) { - snprintf(elements->s, elements->len, "%*s", elements->len-toRemove->len, ""); snprintf(elements->s, (strlen(result)%elements->len)+1, "%s", result); elements->len = strlen(result); ret = 1;

1 0

git:master:64d14117: modules: readme files regenerated - userblocklist ... [skip ci]
by Kamailio Dev 02 May '22

02 May '22

Module: kamailio Branch: master Commit: 64d141170430fad2e9dbe09fc5bec0b96cedf040 URL: https://github.com/kamailio/kamailio/commit/64d141170430fad2e9dbe09fc5bec0b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-02T17:01:19+02:00 modules: readme files regenerated - userblocklist ... [skip ci] --- Modified: src/modules/userblocklist/README --- Diff: https://github.com/kamailio/kamailio/commit/64d141170430fad2e9dbe09fc5bec0b… Patch: https://github.com/kamailio/kamailio/commit/64d141170430fad2e9dbe09fc5bec0b…

1 0

[kamailio/kamailio] userblocklist: add RPC functions (PR #3097)
by Stefan Mititelu 02 May '22

02 May '22

#### 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  Ported mi functions to RPC. Note that in order to send long number strings (e.g. username) from kamcmd one must prefix it with "s:" You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3097 -- Commit Summary -- * userblocklist: add RPC functions -- File Changes -- M src/modules/userblocklist/userblocklist.c (348) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3097.patch https://github.com/kamailio/kamailio/pull/3097.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3097 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3097(a)github.com>

3 6

git:master:4192d734: userblocklist: add RPC functions
by Henning Westerholt 02 May '22

02 May '22

Module: kamailio Branch: master Commit: 4192d734640acedbc6509170166876a20675f2a7 URL: https://github.com/kamailio/kamailio/commit/4192d734640acedbc6509170166876a… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-02T16:54:00+02:00 userblocklist: add RPC functions --- Modified: src/modules/userblocklist/doc/userblocklist_admin.xml Modified: src/modules/userblocklist/userblocklist.c --- Diff: https://github.com/kamailio/kamailio/commit/4192d734640acedbc6509170166876a… Patch: https://github.com/kamailio/kamailio/commit/4192d734640acedbc6509170166876a…

1 0

[kamailio/kamailio] pua_dialoginfo: Determine dialog event types in mod_init (PR #3079)
by Bastian Triller 02 May '22

02 May '22

Determine dialog event types for dialog callback on module initialization, since these will not change.   #### 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/3079 -- Commit Summary -- * pua_dialoginfo: Determine dialog event types in mod_init -- File Changes -- M src/modules/pua_dialoginfo/pua_dialoginfo.c (29) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3079.patch https://github.com/kamailio/kamailio/pull/3079.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3079 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3079(a)github.com>

2 6

git:master:fa3cf27a: pua_dialoginfo: Determine dialog event types in mod_init
by Henning Westerholt 02 May '22

02 May '22

Module: kamailio Branch: master Commit: fa3cf27abf1f76ef90941f47ef81adef4ffae68e URL: https://github.com/kamailio/kamailio/commit/fa3cf27abf1f76ef90941f47ef81ade… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-02T16:42:35+02:00 pua_dialoginfo: Determine dialog event types in mod_init Determine dialog event types for dialog callback on module initialization, since these will not change. --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/fa3cf27abf1f76ef90941f47ef81ade… Patch: https://github.com/kamailio/kamailio/commit/fa3cf27abf1f76ef90941f47ef81ade… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 7b27e666c5..2dae4d449b 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -101,6 +101,7 @@ int disable_callee_publish_flag = DEF_DISABLE_CALLEE_PUBLISH_FLAG; char * pubruri_caller_avp = DEF_PUBRURI_CALLER_AVP; char * pubruri_callee_avp = DEF_PUBRURI_CALLEE_AVP; int publish_dialog_req_within = DEF_PUBLISH_DIALOG_REQ_WITHIN; +int dialog_event_types = DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_TERMINATED | DLGCB_EXPIRED | DLGCB_EARLY; int puadinfo_attribute_display = 0; @@ -622,25 +623,12 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable } /* register dialog callbacks which triggers sending PUBLISH */ - if (publish_dialog_req_within) { - if (dlg_api.register_dlgcb(dlg, - DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_TERMINATED - | DLGCB_EXPIRED | DLGCB_REQ_WITHIN | DLGCB_EARLY, - __dialog_sendpublish, dlginfo, free_dlginfo_cell) != 0) { - LM_ERR("cannot register callback for interesting dialog types\n"); - free_dlginfo_cell(dlginfo); - return NULL; - } - } else { - if (dlg_api.register_dlgcb(dlg, - DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_TERMINATED - | DLGCB_EXPIRED | DLGCB_EARLY, - __dialog_sendpublish, dlginfo, free_dlginfo_cell) != 0) { - LM_ERR("cannot register callback for interesting dialog types\n"); - free_dlginfo_cell(dlginfo); - return NULL; - } - } + if (dlg_api.register_dlgcb(dlg, dialog_event_types, + __dialog_sendpublish, dlginfo, free_dlginfo_cell) != 0) { + LM_ERR("cannot register callback for interesting dialog types\n"); + free_dlginfo_cell(dlginfo); + return NULL; + } #ifdef PUA_DIALOGINFO_DEBUG /* dialog callback testing (registered last to be executed first) */ @@ -856,6 +844,9 @@ static int mod_init(void) LM_DBG("configured to use headers for uri values\n"); } + if(publish_dialog_req_within) + dialog_event_types |= DLGCB_REQ_WITHIN; + return 0; }

1 0

[kamailio/kamailio] core/crypto: fix several mismatched bound warnings (PR #3098)
by Ovidiu Sas 02 May '22

02 May '22

#### 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 Fix for the following compiler warnings: ``` core/crypto/sha256.c:548:32: warning: argument 1 of type ‘sha2_byte[]’ {aka ‘unsigned char[]’} with mismatched bound [-Warray-parameter=] 548 | void sr_SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { | ~~~~~~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:86:22: note: previously declared as ‘uint8_t[32]’ {aka ‘unsigned char[32]’} 86 | void sr_SHA256_Final(uint8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:611:47: warning: argument 2 of type ‘char[]’ with mismatched bound [-Warray-parameter=] 611 | char *sr_SHA256_End(SHA256_CTX* context, char buffer[]) { | ~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:87:34: note: previously declared as ‘char[65]’ 87 | char* sr_SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:911:32: warning: argument 1 of type ‘sha2_byte[]’ {aka ‘unsigned char[]’} with mismatched bound [-Warray-parameter=] 911 | void sr_SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { | ~~~~~~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:98:22: note: previously declared as ‘uint8_t[64]’ {aka ‘unsigned char[64]’} 98 | void sr_SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:940:47: warning: argument 2 of type ‘char[]’ with mismatched bound [-Warray-parameter=] 940 | char *sr_SHA512_End(SHA512_CTX* context, char buffer[]) { | ~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:99:34: note: previously declared as ‘char[129]’ 99 | char* sr_SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:986:32: warning: argument 1 of type ‘sha2_byte[]’ {aka ‘unsigned char[]’} with mismatched bound [-Warray-parameter=] 986 | void sr_SHA384_Final(sha2_byte digest[], SHA384_CTX* context) { | ~~~~~~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:92:22: note: previously declared as ‘uint8_t[48]’ {aka ‘unsigned char[48]’} 92 | void sr_SHA384_Final(uint8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/crypto/sha256.c:1015:47: warning: argument 2 of type ‘char[]’ with mismatched bound [-Warray-parameter=] 1015 | char *sr_SHA384_End(SHA384_CTX* context, char buffer[]) { | ~~~~~^~~~~~~~ In file included from core/crypto/sha256.c:36: core/crypto/sha256.h:93:34: note: previously declared as ‘char[97]’ 93 | char* sr_SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3098 -- Commit Summary -- * core/crypto: fix several mismatched bound warnings -- File Changes -- M src/core/crypto/sha256.c (16) M src/core/crypto/sha256.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3098.patch https://github.com/kamailio/kamailio/pull/3098.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3098 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3098(a)github.com>

2 2

git:master:b4daf059: core/crypto: fix several mismatched bound warnings
by Henning Westerholt 02 May '22

02 May '22

Module: kamailio Branch: master Commit: b4daf05991f5fd5faae0defcf8802b650d6a4d24 URL: https://github.com/kamailio/kamailio/commit/b4daf05991f5fd5faae0defcf8802b6… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-02T16:42:21+02:00 core/crypto: fix several mismatched bound warnings --- Modified: src/core/crypto/sha256.c Modified: src/core/crypto/sha256.h --- Diff: https://github.com/kamailio/kamailio/commit/b4daf05991f5fd5faae0defcf8802b6… Patch: https://github.com/kamailio/kamailio/commit/b4daf05991f5fd5faae0defcf8802b6…

1 0

git:master:3de5a781: snmpstats: use same type as the pointer for sizeof
by Daniel-Constantin Mierla 02 May '22

02 May '22

Module: kamailio Branch: master Commit: 3de5a781a3d0333352ab72c6b790f472f393df2b URL: https://github.com/kamailio/kamailio/commit/3de5a781a3d0333352ab72c6b790f47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-30T17:21:42+02:00 snmpstats: use same type as the pointer for sizeof --- Modified: src/modules/snmpstats/snmpSIPContactTable.c --- Diff: https://github.com/kamailio/kamailio/commit/3de5a781a3d0333352ab72c6b790f47… Patch: https://github.com/kamailio/kamailio/commit/3de5a781a3d0333352ab72c6b790f47… --- diff --git a/src/modules/snmpstats/snmpSIPContactTable.c b/src/modules/snmpstats/snmpSIPContactTable.c index d23f8557ac..e953bae6a3 100644 --- a/src/modules/snmpstats/snmpSIPContactTable.c +++ b/src/modules/snmpstats/snmpSIPContactTable.c @@ -203,7 +203,7 @@ int createContactRow(int userIndex, int contactIndex, char *contactName, /* Fill in the rest of the rows columns */ theRow->kamailioSIPContactURI = - (unsigned char *)pkg_malloc((stringLength + 1) * sizeof(char)); + (unsigned char *)pkg_malloc((stringLength + 1) * sizeof(unsigned char)); if(theRow->kamailioSIPContactURI == NULL) { pkg_free(OIDIndex); free(theRow);

1 0

git:master:47169b67: cdp: use same data type for size computing as pointer type
by Daniel-Constantin Mierla 02 May '22

02 May '22

Module: kamailio Branch: master Commit: 47169b6774759131e9e535f2b9d358772b777b9c URL: https://github.com/kamailio/kamailio/commit/47169b6774759131e9e535f2b9d3587… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-01T16:28:41+02:00 cdp: use same data type for size computing as pointer type --- Modified: src/modules/cdp/acceptor.c --- Diff: https://github.com/kamailio/kamailio/commit/47169b6774759131e9e535f2b9d3587… Patch: https://github.com/kamailio/kamailio/commit/47169b6774759131e9e535f2b9d3587… --- diff --git a/src/modules/cdp/acceptor.c b/src/modules/cdp/acceptor.c index 003f531fe2..4821ddd38e 100644 --- a/src/modules/cdp/acceptor.c +++ b/src/modules/cdp/acceptor.c @@ -79,12 +79,12 @@ void acceptor_process(dp_config *cfg) unsigned int sock; LM_INFO("Acceptor process starting up...\n"); - listening_socks = pkg_malloc((cfg->acceptors_cnt+1)*sizeof(int)); + listening_socks = pkg_malloc((cfg->acceptors_cnt+1)*sizeof(unsigned int)); if (!listening_socks){ - LOG_NO_MEM("pkg",(cfg->acceptors_cnt+1)*sizeof(int)); + LOG_NO_MEM("pkg",(cfg->acceptors_cnt+1)*sizeof(unsigned int)); goto done; } - memset(listening_socks,0,(cfg->acceptors_cnt+1)*sizeof(int)); + memset(listening_socks,0,(cfg->acceptors_cnt+1)*sizeof(unsigned int)); k=0; for(i=0;i<cfg->acceptors_cnt;i++) if (create_socket(cfg->acceptors[i].port,cfg->acceptors[i].bind,&sock)){

1 0

git:master:69c004ee: core: modparam - safety check for str s pointer
by Daniel-Constantin Mierla 29 Apr '22

29 Apr '22

Module: kamailio Branch: master Commit: 69c004eec161c14d957f9e4011aeff4163af858d URL: https://github.com/kamailio/kamailio/commit/69c004eec161c14d957f9e4011aeff4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-29T14:04:12+02:00 core: modparam - safety check for str s pointer - deal with the case of argument with 'nonnull' attribute passed null --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/69c004eec161c14d957f9e4011aeff4… Patch: https://github.com/kamailio/kamailio/commit/69c004eec161c14d957f9e4011aeff4… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index 361536691d..0ccecf7c90 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -147,6 +147,12 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val) break; case PARAM_STR: + if( ((str*)val2)->s==NULL) { + LM_ERR("null value\n"); + regfree(&preg); + pkg_free(reg); + return -1; + } ((str*)ptr)->s = pkg_malloc(((str*)val2)->len+1); if (!((str*)ptr)->s) { PKG_MEM_ERROR;

1 0

git:master:dfc407c4: core: main - check the debug cli param value
by Daniel-Constantin Mierla 29 Apr '22

29 Apr '22

Module: kamailio Branch: master Commit: dfc407c4009acbd6e05ecfaf4e727b0636ab92a4 URL: https://github.com/kamailio/kamailio/commit/dfc407c4009acbd6e05ecfaf4e727b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-29T09:44:46+02:00 core: main - check the debug cli param value --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/dfc407c4009acbd6e05ecfaf4e727b0… Patch: https://github.com/kamailio/kamailio/commit/dfc407c4009acbd6e05ecfaf4e727b0… --- diff --git a/src/main.c b/src/main.c index 2a268a689b..cb0c92e357 100644 --- a/src/main.c +++ b/src/main.c @@ -2100,6 +2100,10 @@ int main(int argc, char** argv) ksr_slog_init(optarg); break; case KARGOPTVAL+8: + if (optarg == NULL) { + fprintf(stderr, "bad debug level value\n"); + goto error; + } debug_flag = 1; default_core_cfg.debug=(int)strtol(optarg, &tmp, 10); if ((tmp==0) || (*tmp)){

1 0

Kamailio functionality clarification - call forwarding no replay (call is ringing but not answered)
by VESELOVSKY Pavel 29 Apr '22

29 Apr '22

Hallo all, I would need help with Kamailio. I hope, you can give me some hints. I would like use Kamailio for CFNRy feature call forward no replay, i.e. * call is forked to multiple destination * 180 is received, call is ringing, but not answered, no 200 OK is received from some destination * after predefined time (CFNRy timer), only this specific branch has to be rerouted to another destination Expected behaviour is described in this flow: [cid:image001.png@01D85B0C.FCF06DE0] My current behavior: * Kamailio TM module is involved for parallel forking (https://www.kamailio.org/docs/modules/stable/modules/tm.html#:~:text=1.-,Ov…) * all branches are CANCEL-ed, it is not possible send CANCEL just to one specific branch [cid:image002.png@01D85B0C.FCF06DE0] My questions: * is it possible to CANCEL just specific branch? * is it possible start timer just for specific branch? * do you think is it possible somehow implement this feature with Kamailio? Thanks a lot in advance for any comment. Pavel.

2 1

git:master:89495b85: db_redis: free db vals on error
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: 89495b8595d37f4d24e10e5ed1177614b2979d82 URL: https://github.com/kamailio/kamailio/commit/89495b8595d37f4d24e10e5ed117761… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T14:09:13+02:00 db_redis: free db vals on error --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/89495b8595d37f4d24e10e5ed117761… Patch: https://github.com/kamailio/kamailio/commit/89495b8595d37f4d24e10e5ed117761… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 68536816a8..254e0f6b3e 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -2164,6 +2164,8 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con if (db_redis_build_type_keys(con, CON_TABLE(_h), db_keys, db_vals, all_type_keys_count, &type_keys, &set_keys, &type_keys_count) != 0) { LM_ERR("failed to build type keys\n"); + pkg_free(db_vals); + db_vals = NULL; goto error; } pkg_free(db_keys); @@ -2306,7 +2308,7 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con if (scard != 0) continue; - + if (db_redis_key_add_string(&query_v, "SREM", 4) != 0) { LM_ERR("Failed to add srem command to post-delete query\n"); goto error;

1 0

git:master:eba6c7d7: presence_xml: free uri for http xcap auth
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: eba6c7d78088cde411f5cd1b7730ba458e62a69e URL: https://github.com/kamailio/kamailio/commit/eba6c7d78088cde411f5cd1b7730ba4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T14:03:55+02:00 presence_xml: free uri for http xcap auth --- Modified: src/modules/presence_xml/xcap_auth.c --- Diff: https://github.com/kamailio/kamailio/commit/eba6c7d78088cde411f5cd1b7730ba4… Patch: https://github.com/kamailio/kamailio/commit/eba6c7d78088cde411f5cd1b7730ba4… --- diff --git a/src/modules/presence_xml/xcap_auth.c b/src/modules/presence_xml/xcap_auth.c index 0cf0669ca1..c40f0a899e 100644 --- a/src/modules/presence_xml/xcap_auth.c +++ b/src/modules/presence_xml/xcap_auth.c @@ -521,7 +521,7 @@ int get_rules_doc( int http_get_rules_doc(str user, str domain, str *rules_doc) { - str uri; + str uri = STR_NULL; xcap_doc_sel_t doc_sel; char *doc = NULL; xcap_serv_t *xs; @@ -559,6 +559,8 @@ int http_get_rules_doc(str user, str domain, str *rules_doc) rules_doc->s = doc; rules_doc->len = doc ? strlen(doc) : 0; + pkg_free(uri.s); + return 0; error:

1 0

git:master:33921b79: cfgt: free dest.s before return on error
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: 33921b79a4f5849f85a588332fe8debfb4d27c0e URL: https://github.com/kamailio/kamailio/commit/33921b79a4f5849f85a588332fe8deb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T13:42:21+02:00 cfgt: free dest.s before return on error --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/33921b79a4f5849f85a588332fe8deb… Patch: https://github.com/kamailio/kamailio/commit/33921b79a4f5849f85a588332fe8deb… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index b8345b4565..489fdfe445 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -394,6 +394,7 @@ void cfgt_save_node(cfgt_node_p node) LM_DBG("dir [%s] already exists\n", dest.s); } else if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { LM_ERR("failed to make directory: %s\n", strerror(errno)); + pkg_free(dest.s); return; } dest.s[dir] = '/';

1 0

git:master:cacae7fc: sms: use unsigned int for bit shifting for compiler warnings
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: cacae7fc5db5418a67d543995273280d57f027c6 URL: https://github.com/kamailio/kamailio/commit/cacae7fc5db5418a67d543995273280… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T13:31:41+02:00 sms: use unsigned int for bit shifting for compiler warnings --- Modified: src/modules/sms/libsms_getsms.c --- Diff: https://github.com/kamailio/kamailio/commit/cacae7fc5db5418a67d543995273280… Patch: https://github.com/kamailio/kamailio/commit/cacae7fc5db5418a67d543995273280… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index e8c7590456..a98cfd80d8 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -55,7 +55,7 @@ mailto:s.frings@mail.isis.de /* converts an octet to a 8-Bit value */ static inline int octet2bin(char* octet) { - int result=0; + unsigned int result=0; if (octet[0]>57) result=octet[0]-55; @@ -66,7 +66,7 @@ static inline int octet2bin(char* octet) result+=octet[1]-55; else result+=octet[1]-48; - return result; + return (int)result; }

1 0

git:master:9fd0cae9: lrkproxy: init value for compiler warning
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: 9fd0cae960b0795a5e511c37f768f0962b7a15c1 URL: https://github.com/kamailio/kamailio/commit/9fd0cae960b0795a5e511c37f768f09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T13:10:23+02:00 lrkproxy: init value for compiler warning --- Modified: src/modules/lrkproxy/lrkproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/9fd0cae960b0795a5e511c37f768f09… Patch: https://github.com/kamailio/kamailio/commit/9fd0cae960b0795a5e511c37f768f09… --- diff --git a/src/modules/lrkproxy/lrkproxy.c b/src/modules/lrkproxy/lrkproxy.c index e30f4e976b..157048c350 100644 --- a/src/modules/lrkproxy/lrkproxy.c +++ b/src/modules/lrkproxy/lrkproxy.c @@ -1284,7 +1284,7 @@ static int change_media_sdp(sip_msg_t *msg, struct lrkproxy_hash_entry *e, const e->snat_ipv4.len = strlen(e->snat_ipv4.s); str current_port; - unsigned int snat_port; + unsigned int snat_port = 0; str2int(&e->dst_port, &snat_port);

1 0

git:master:cfb50124: xcap_client: init structure
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: cfb50124e67b68552520e418a20ad2dfec96117b URL: https://github.com/kamailio/kamailio/commit/cfb50124e67b68552520e418a20ad2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T13:04:37+02:00 xcap_client: init structure --- Modified: src/modules/xcap_client/xcap_client.c --- Diff: https://github.com/kamailio/kamailio/commit/cfb50124e67b68552520e418a20ad2d… Patch: https://github.com/kamailio/kamailio/commit/cfb50124e67b68552520e418a20ad2d… --- diff --git a/src/modules/xcap_client/xcap_client.c b/src/modules/xcap_client/xcap_client.c index 607628dbb4..efd434c2ab 100644 --- a/src/modules/xcap_client/xcap_client.c +++ b/src/modules/xcap_client/xcap_client.c @@ -309,6 +309,7 @@ int parse_doc_url(str doc_url, char** serv_addr, xcap_doc_sel_t* doc_sel) { char* sl, *str_type; + memset(doc_sel, 0, sizeof(xcap_doc_sel_t)); sl= strchr(doc_url.s, '/'); if(sl==NULL) { return -1;

1 0

git:master:b5aae4f5: rls: safety check for dialog structur
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: b5aae4f5afd07db114c3ff7712b484f743663b26 URL: https://github.com/kamailio/kamailio/commit/b5aae4f5afd07db114c3ff7712b484f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T12:15:12+02:00 rls: safety check for dialog structur --- Modified: src/modules/rls/resource_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/b5aae4f5afd07db114c3ff7712b484f… Patch: https://github.com/kamailio/kamailio/commit/b5aae4f5afd07db114c3ff7712b484f… --- diff --git a/src/modules/rls/resource_notify.c b/src/modules/rls/resource_notify.c index d3ad4fd1fc..0343a5c665 100644 --- a/src/modules/rls/resource_notify.c +++ b/src/modules/rls/resource_notify.c @@ -420,8 +420,9 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, if(rlmi_doc) { - LM_DBG("timer_send_notify at end len_est = %d resource_added = %d\n", len_est, resource_added); - if (resource_added == 1) + LM_DBG("timer notify at end len_est = %d resource_added = %d dlg = %p\n", + len_est, resource_added, dialog); + if (resource_added == 1 && dialog != NULL) { send_notify(&rlmi_doc, buf, buf_len, bstr, dialog, hash_code); }

1 0

git:master:f6620aa5: pkg/kamailio/deb: set version 5.6.0~pre1
by Victor Seva 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: f6620aa5fe7ef65ddd7fa232829ea9cfb3f0f774 URL: https://github.com/kamailio/kamailio/commit/f6620aa5fe7ef65ddd7fa232829ea9c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-28T09:46:31+02:00 pkg/kamailio/deb: set version 5.6.0~pre1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/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/f6620aa5fe7ef65ddd7fa232829ea9c… Patch: https://github.com/kamailio/kamailio/commit/f6620aa5fe7ef65ddd7fa232829ea9c…

1 0

git:master:67da7301: topos: catch INFO requests during early dialog phase
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: 67da7301f1eb74b6fff9e6e73b43f08dbc9c53bf URL: https://github.com/kamailio/kamailio/commit/67da7301f1eb74b6fff9e6e73b43f08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T09:36:09+02:00 topos: catch INFO requests during early dialog phase --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/67da7301f1eb74b6fff9e6e73b43f08… Patch: https://github.com/kamailio/kamailio/commit/67da7301f1eb74b6fff9e6e73b43f08… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index cd781328e5..83d5f5fddf 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -837,7 +837,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) goto error; } metid = get_cseq(msg)->method_id; - if((metid & (METHOD_BYE|METHOD_PRACK|METHOD_UPDATE)) + if((metid & (METHOD_BYE|METHOD_INFO|METHOD_PRACK|METHOD_UPDATE)) && stsd.b_contact.len <= 0) { /* no B-side contact, look for INVITE transaction record */ if(metid & (METHOD_BYE|METHOD_UPDATE)) {

1 0

git:master:dc2ef8ed: async: proper pv function name
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: dc2ef8edaacb6947019cbde0a4c3ca238bee56c2 URL: https://github.com/kamailio/kamailio/commit/dc2ef8edaacb6947019cbde0a4c3ca2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T09:20:08+02:00 async: proper pv function name --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/dc2ef8edaacb6947019cbde0a4c3ca2… Patch: https://github.com/kamailio/kamailio/commit/dc2ef8edaacb6947019cbde0a4c3ca2… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index b51887e351..02c3b8d488 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -649,7 +649,7 @@ int pv_get_async(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) /** * */ -int pv_parse_geoip_name(pv_spec_t *sp, str *in) +int pv_parse_async_name(pv_spec_t *sp, str *in) { if(sp==NULL || in==NULL || in->len<=0) return -1;

1 0

git:master:bd71add6: Makefile.defs: version set to 5.6.0-pre1
by Daniel-Constantin Mierla 28 Apr '22

28 Apr '22

Module: kamailio Branch: master Commit: bd71add6616e283f9f60a28785170c41c439f905 URL: https://github.com/kamailio/kamailio/commit/bd71add6616e283f9f60a28785170c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-28T09:02:07+02:00 Makefile.defs: version set to 5.6.0-pre1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/bd71add6616e283f9f60a28785170c4… Patch: https://github.com/kamailio/kamailio/commit/bd71add6616e283f9f60a28785170c4… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 90aa777782..41c7b31652 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

dlg_isflagset not working on CANCEL request
by David Escartín 27 Apr '22

27 Apr '22

hello all Using kamailio 5.4 version, we have seen that dlg_isflagset is not detecting a dialog flag set in the request route for the initial INVITE, when a CANCEL request arrives. We have applied this change to set the dialog context unique ide for this request. Since it's done on dlg_onreply, dlg_onroute and dlg_ontimeout functions. This way, dlg_get_by_iuid(&dctx->iuid) in the function ki_dlg_isflagset is not NULL and dialog flags are detected. Is this change correct? Or can it generate any kind of issues? diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 3f8adefb79..f1df4a76c5 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1255,6 +1255,9 @@ dlg_cell_t *dlg_lookup_msg_dialog(sip_msg_t *msg, unsigned int *dir) msg->callid->body.len, msg->callid->body.s); return NULL; } + if(msg->first_line.u.request.method_value == METHOD_CANCEL) { + dlg_set_ctx_iuid(dlg); + } if(dir) *dir = vdir; return dlg; } thanks a lot and regards David -- <http://www.sonoc.io/> David Escartín NOC engineer *www.sonoc.io* <http://www.sonoc.io/> [image: LinkedIn] <https://www.linkedin.com/company/sonoc> [image: Twitter] <https://twitter.com/sonoc_> [image: Facebook] <https://www.facebook.com/SONOCio/> This e-mail is for the exclusive use of its recipients and may contain business secrets or other confidential or privileged information. Any unauthorised use, copying, publication or distribution of this e-mail is strictly prohibited. If you are not the intended recipient, please inform us immediately by replying to this e-mail and delete it, including any attachments or copies on your system. In accordance with the GDPR (EU) 2016/679 and the LOPDGDD 3/2018, we inform you that this e-mail address and/or any other personal data you have provided us with will be treated by SONOC with absolute confidentiality and with the only purpose of providing you with the requested services, due to your condition as a client, supplier or because you have requested information from us at any time. These data will only be kept for as long as required to comply with legal obligations. You can exercise your rights at any time by sending an e-mail to: *dataprotection(a)sonoc.io* <dataprotection(a)sonoc.io>*.* <dataprotection(a)sonoc.io>

2 1

git:master:cfca8106: cfgt: improve detection of dynamic format
by Victor Seva 27 Apr '22

27 Apr '22

Module: kamailio Branch: master Commit: cfca81063c36ff2f1fe5578f89ccf9c0701e818a URL: https://github.com/kamailio/kamailio/commit/cfca81063c36ff2f1fe5578f89ccf9c… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-27T15:59:43+02:00 cfgt: improve detection of dynamic format * skip tm vars $T_* --- Modified: src/modules/cfgt/cfgt_json.c --- Diff: https://github.com/kamailio/kamailio/commit/cfca81063c36ff2f1fe5578f89ccf9c… Patch: https://github.com/kamailio/kamailio/commit/cfca81063c36ff2f1fe5578f89ccf9c… --- diff --git a/src/modules/cfgt/cfgt_json.c b/src/modules/cfgt/cfgt_json.c index b3dea63de4..d3aca8d305 100644 --- a/src/modules/cfgt/cfgt_json.c +++ b/src/modules/cfgt/cfgt_json.c @@ -43,6 +43,10 @@ int _cfgt_get_array_avp_vals(struct sip_msg *msg, pv_param_t *param, LM_ERR("invalid name\n"); return -1; } + if(name_type == 0 && avp_name.n == 0) { + LM_DBG("skip name_type:%d avp_name:%d\n", name_type, avp_name.n); + return 0; + } *jobj = srjson_CreateArray(jdoc); if(*jobj == NULL) { LM_ERR("cannot create json object\n"); @@ -286,8 +290,8 @@ int cfgt_get_json(struct sip_msg *msg, unsigned int mask, srjson_doc_t *jdoc, el = el->next; continue; } - if(srjson_GetArraySize(jdoc, jobj) == 0 - && !(mask & CFGT_DP_NULL)) { + if(jobj == NULL || (srjson_GetArraySize(jdoc, jobj) == 0 + && !(mask & CFGT_DP_NULL))) { el = el->next; continue; } @@ -314,6 +318,16 @@ int cfgt_get_json(struct sip_msg *msg, unsigned int mask, srjson_doc_t *jdoc, } snprintf(iname, 128, "$xavp(%.*s)", item_name.len, item_name.s); } else { + if(el->pvname.len > 3 && strncmp("$T_", el->pvname.s, 3) == 0) { + LM_DBG("skip tm var[%.*s]\n", el->pvname.len, el->pvname.s); + el = el->next; + continue; + } + if(strchr(el->pvname.s + 1, 36) != NULL) { + LM_DBG("skip dynamic format [%.*s]\n", el->pvname.len, el->pvname.s); + el = el->next; + continue; + } if(pv_get_spec_value(msg, &el->spec, &value) != 0) { LM_WARN("can't get value[%.*s]\n", el->pvname.len, el->pvname.s);

1 0

git:master:a49a0177: cfgt: fix memory leaks
by Victor Seva 27 Apr '22

27 Apr '22

Module: kamailio Branch: master Commit: a49a017764bf7a6cdb3ff4ecd885b0a51c87dc15 URL: https://github.com/kamailio/kamailio/commit/a49a017764bf7a6cdb3ff4ecd885b0a… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-27T15:59:44+02:00 cfgt: fix memory leaks - free parsed message - free srjson object left behind + remove unused headers + remove unused function + parse only HDR_CALLID_F --- Modified: src/modules/cfgt/cfgt_int.c Modified: src/modules/cfgt/cfgt_json.c --- Diff: https://github.com/kamailio/kamailio/commit/a49a017764bf7a6cdb3ff4ecd885b0a… Patch: https://github.com/kamailio/kamailio/commit/a49a017764bf7a6cdb3ff4ecd885b0a…

1 0

git:master:563ea056: siprepo: removed sip msg parameter when not used
by Daniel-Constantin Mierla 27 Apr '22

27 Apr '22

Module: kamailio Branch: master Commit: 563ea05637da475bdaed789d9530e3221e2e7296 URL: https://github.com/kamailio/kamailio/commit/563ea05637da475bdaed789d9530e32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-27T15:22:39+02:00 siprepo: removed sip msg parameter when not used - filled async pull --- Modified: src/modules/siprepo/siprepo_data.c Modified: src/modules/siprepo/siprepo_data.h Modified: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/563ea05637da475bdaed789d9530e32… Patch: https://github.com/kamailio/kamailio/commit/563ea05637da475bdaed789d9530e32…

1 0

git:master:1465a9b6: Revert "dialog: Terminate dialogs in Early stage and add functionality to send messages within a dialog"
by Carsten Bock 27 Apr '22

27 Apr '22

Module: kamailio Branch: master Commit: 1465a9b6e9fda36617b7b198ae051f0957803550 URL: https://github.com/kamailio/kamailio/commit/1465a9b6e9fda36617b7b198ae051f0… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2022-04-27T14:43:55+02:00 Revert "dialog: Terminate dialogs in Early stage and add functionality to send messages within a dialog" This reverts commit 26ef622ff3621c8a82c1c3560a32e8d735e30c4e. --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_hash.h Modified: src/modules/dialog/dlg_req_within.c Modified: src/modules/dialog/dlg_req_within.h Modified: src/modules/dialog/doc/dialog.xml Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1465a9b6e9fda36617b7b198ae051f0… Patch: https://github.com/kamailio/kamailio/commit/1465a9b6e9fda36617b7b198ae051f0…

1 0

git:master:d3ec6057: Revert "modules: readme files regenerated - dialog ... [skip ci]"
by Carsten Bock 27 Apr '22

27 Apr '22

Module: kamailio Branch: master Commit: d3ec6057d8ab2875476f7b87d2b64265fd3c31f2 URL: https://github.com/kamailio/kamailio/commit/d3ec6057d8ab2875476f7b87d2b6426… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2022-04-27T14:43:01+02:00 Revert "modules: readme files regenerated - dialog ... [skip ci]" This reverts commit 4704f53593d3e810c159a2825df61b47143ce1f7. --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/d3ec6057d8ab2875476f7b87d2b6426… Patch: https://github.com/kamailio/kamailio/commit/d3ec6057d8ab2875476f7b87d2b6426…

1 0

git:master:4704f535: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 27 Apr '22

27 Apr '22

Module: kamailio Branch: master Commit: 4704f53593d3e810c159a2825df61b47143ce1f7 URL: https://github.com/kamailio/kamailio/commit/4704f53593d3e810c159a2825df61b4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-27T11:46:20+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/4704f53593d3e810c159a2825df61b4… Patch: https://github.com/kamailio/kamailio/commit/4704f53593d3e810c159a2825df61b4…

1 0

git:master:cd201b8a: siprepo: removed extra empty comment header lines
by Daniel-Constantin Mierla 26 Apr '22

26 Apr '22

Module: kamailio Branch: master Commit: cd201b8a8e6c059fdac599c8498873395f8e89e6 URL: https://github.com/kamailio/kamailio/commit/cd201b8a8e6c059fdac599c84988733… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-26T14:16:28+02:00 siprepo: removed extra empty comment header lines --- Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cd201b8a8e6c059fdac599c84988733… Patch: https://github.com/kamailio/kamailio/commit/cd201b8a8e6c059fdac599c84988733… --- diff --git a/src/modules/sworker/sworker_mod.c b/src/modules/sworker/sworker_mod.c index aedc3cc735..6a151caa44 100644 --- a/src/modules/sworker/sworker_mod.c +++ b/src/modules/sworker/sworker_mod.c @@ -119,9 +119,6 @@ static void mod_destroy(void) { } -/** - * - */ /** * */

1 0

git:master:d3ba4209: core: async task - fix typo in log message
by Daniel-Constantin Mierla 26 Apr '22

26 Apr '22

Module: kamailio Branch: master Commit: d3ba42097af410b5395f03edd1f8a95c61f7b041 URL: https://github.com/kamailio/kamailio/commit/d3ba42097af410b5395f03edd1f8a95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-26T14:21:28+02:00 core: async task - fix typo in log message --- Modified: src/core/async_task.c --- Diff: https://github.com/kamailio/kamailio/commit/d3ba42097af410b5395f03edd1f8a95… Patch: https://github.com/kamailio/kamailio/commit/d3ba42097af410b5395f03edd1f8a95… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index a96eb90286..bacb9ce994 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -440,7 +440,7 @@ int async_task_group_push(str *gname, async_task_t *task) gname->len, gname->s); return -1; } - LM_DBG("task [%p] sent to groupt [%.*s]\n", task, gname->len, gname->s); + LM_DBG("task [%p] sent to group [%.*s]\n", task, gname->len, gname->s); return 0; }

1 0

git:5.4:604dc459: pkg/kamailio/deb: fix lintian warnings [skip ci]
by Victor Seva 26 Apr '22

26 Apr '22

Module: kamailio Branch: 5.4 Commit: 604dc459f5413b8ecc35f2b5b50585f73da6ae8b URL: https://github.com/kamailio/kamailio/commit/604dc459f5413b8ecc35f2b5b50585f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-26T12:17:47+02:00 pkg/kamailio/deb: fix lintian warnings [skip ci] (cherry picked from commit dfbeb92a956009fc57070ac988cb0177f9c8192f) (cherry picked from commit c8af56f46822504e0cd1cfa79f12c6f20e335ccb) --- Added: pkg/kamailio/deb/bionic/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/debian/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/focal/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/jessie/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/sid/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/stretch/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-systemd-modules.lintian-overrides Modified: pkg/kamailio/deb/bionic/copyright Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/copyright Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/copyright Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/copyright Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/604dc459f5413b8ecc35f2b5b50585f… Patch: https://github.com/kamailio/kamailio/commit/604dc459f5413b8ecc35f2b5b50585f…

1 0

git:5.4:8ec4d583: pkg/kamailio/deb: remove python*-dev dependency for module package [skip ci]
by Victor Seva 26 Apr '22

26 Apr '22

Module: kamailio Branch: 5.4 Commit: 8ec4d583bd0836dd1e0dd94dd3896f1d4351de8d URL: https://github.com/kamailio/kamailio/commit/8ec4d583bd0836dd1e0dd94dd3896f1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-26T10:38:41+02:00 pkg/kamailio/deb: remove python*-dev dependency for module package [skip ci] (cherry picked from commit 39a0a5d6f43ab265f1003f7bbb6e981bcd2e3b72) --- 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/8ec4d583bd0836dd1e0dd94dd3896f1… Patch: https://github.com/kamailio/kamailio/commit/8ec4d583bd0836dd1e0dd94dd3896f1…

1 0

git:5.4:10be3004: pkg: fix debian lintian error after kamailio scripts changed to python3 [skip ci]
by Victor Seva 26 Apr '22

26 Apr '22

Module: kamailio Branch: 5.4 Commit: 10be300458db9c6e9e1800c080bd7665ba5d7f62 URL: https://github.com/kamailio/kamailio/commit/10be300458db9c6e9e1800c080bd766… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-26T10:38:31+02:00 pkg: fix debian lintian error after kamailio scripts changed to python3 [skip ci] (cherry picked from commit b7b33ad13942a7f0ef48ed9487541cd418f137f6) --- 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/10be300458db9c6e9e1800c080bd766… Patch: https://github.com/kamailio/kamailio/commit/10be300458db9c6e9e1800c080bd766… --- diff --git a/pkg/kamailio/deb/bionic/control b/pkg/kamailio/deb/bionic/control index 107d662084..cb1f6dabbf 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 107d662084..cb1f6dabbf 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 b0233c812b..73bdf702cc 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 107d662084..cb1f6dabbf 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 ef10eef8b4..2c3993b5e8 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 89da6133a9..5d5dabc02b 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -61,7 +61,6 @@ Pre-Depends: Depends: adduser, lsb-base, - python, python3, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index 107d662084..cb1f6dabbf 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 26c5daca3f..50087da12d 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 3d35498cf1..f6ac6fd860 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 89da6133a9..5d5dabc02b 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -61,7 +61,6 @@ Pre-Depends: Depends: adduser, lsb-base, - python, python3, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control index b4ecf0870d..2850a659ee 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

git:5.5:c8af56f4: pkg/kamailio/deb: fix lintian warnings [skip ci]
by Victor Seva 26 Apr '22

26 Apr '22

Module: kamailio Branch: 5.5 Commit: c8af56f46822504e0cd1cfa79f12c6f20e335ccb URL: https://github.com/kamailio/kamailio/commit/c8af56f46822504e0cd1cfa79f12c6f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-26T10:21:39+02:00 pkg/kamailio/deb: fix lintian warnings [skip ci] (cherry picked from commit dfbeb92a956009fc57070ac988cb0177f9c8192f) --- Added: pkg/kamailio/deb/bionic/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bionic/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/debian/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/debian/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/focal/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/focal/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/jessie/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/jessie/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/sid/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/sid/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/stretch/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/stretch/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-systemd-modules.lintian-overrides Modified: pkg/kamailio/deb/bionic/copyright Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/copyright Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/copyright Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/copyright Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/copyright Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/c8af56f46822504e0cd1cfa79f12c6f… Patch: https://github.com/kamailio/kamailio/commit/c8af56f46822504e0cd1cfa79f12c6f…

1 0

[kamailio/kamailio] Building APKs fail due to rename of malloc_test module (Issue #3091)
by Ben Kaufman 25 Apr '22

25 Apr '22

In 5.6, the module `malloc_test` was renamed to `misctest`, but the refernce in `pkg/kamailio/alpine/APKBUILD` was not changed to reflect this, so following the APK build instructions `/pkg/kamailio/README.md` fail. I admittedly know very little about the APK package building process, but this looks very straight forward. I'll submit a PR once I've finished testing it out. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3091 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3091(a)github.com>

2 1

[kamailio/kamailio] pkg alpine renamed malloc_test to misctest (PR #3093)
by Ben Kaufman 25 Apr '22

25 Apr '22

FIX #3091 Building APKs fail due to rename of malloc_test module  #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue FIX #3091 #### Description Refactored reference to `malloc_test` in `pkg/kamailio/alpine/APKBUILDER` to `misctest` due to module rename. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3093 -- Commit Summary -- * pkg alpine renamed malloc_test to misctest -- File Changes -- M pkg/kamailio/alpine/APKBUILD (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3093.patch https://github.com/kamailio/kamailio/pull/3093.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3093 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3093(a)github.com>

2 2

git:master:96c402b9: pkg alpine renamed malloc_test to misctest
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: 96c402b94ada3556218d9924d89d53bf5663b203 URL: https://github.com/kamailio/kamailio/commit/96c402b94ada3556218d9924d89d53b… Author: Kaufman <bkaufman(a)nexvortex.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T18:16:14+02:00 pkg alpine renamed malloc_test to misctest - Fix #3091 Building APKs fail due to rename of malloc_test module --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/96c402b94ada3556218d9924d89d53b… Patch: https://github.com/kamailio/kamailio/commit/96c402b94ada3556218d9924d89d53b… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f23ad03308..6bf221630d 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -77,7 +77,7 @@ _mod_list_dbuid="db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \ uid_uri_db" # - modules for devel purposes -_mod_list_devel="malloc_test print print_lib" +_mod_list_devel="misctest print print_lib" # - modules depending on pcre3 library _mod_list_pcre="dialplan lcr regex"

1 0

git:master:5e274713: siprepo: unlink item from hash table based on rmode
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: 5e27471312c110ce19cfa0bfa5a29abcd03daec6 URL: https://github.com/kamailio/kamailio/commit/5e27471312c110ce19cfa0bfa5a29ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T15:08:15+02:00 siprepo: unlink item from hash table based on rmode --- Modified: src/modules/siprepo/siprepo_data.c Modified: src/modules/siprepo/siprepo_data.h --- Diff: https://github.com/kamailio/kamailio/commit/5e27471312c110ce19cfa0bfa5a29ab… Patch: https://github.com/kamailio/kamailio/commit/5e27471312c110ce19cfa0bfa5a29ab… --- diff --git a/src/modules/siprepo/siprepo_data.c b/src/modules/siprepo/siprepo_data.c index 0c9873e3c2..603d3744c1 100644 --- a/src/modules/siprepo/siprepo_data.c +++ b/src/modules/siprepo/siprepo_data.c @@ -108,6 +108,25 @@ siprepo_msg_t *siprepo_msg_find(sip_msg_t *msg, str *callid, str *msgid, int lmo return 0; } +/** + * + */ +void siprepo_msg_unlink(siprepo_msg_t *it, unsigned int slotid) +{ + if(it->prev==NULL) { + _siprepo_table[slotid].plist = it->next; + if(_siprepo_table[slotid].plist) { + _siprepo_table[slotid].plist->prev = NULL; + } + } else { + it->prev->next = it->next; + } + if(it->next!=NULL) { + it->next->prev = it->prev; + } + return; +} + /** * */ @@ -334,9 +353,15 @@ int siprepo_msg_pull(sip_msg_t *msg, str *callid, str *msgid, str *rname, lmsg.set_global_address = default_global_address; lmsg.set_global_port = default_global_port; + if(rmode & SIPREPO_RMODE_RM) { + siprepo_msg_unlink(it, slotid); + shm_free(it); + } + + lock_release(&_siprepo_table[slotid].lock); + if(parse_msg(lmsg.buf, lmsg.len, &lmsg) != 0) { LM_ERR("failed to parse msg id [%.*s]\n", msgid->len, msgid->s); - lock_release(&_siprepo_table[slotid].lock); return 1; } if(unlikely(parse_headers(&lmsg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F, 0) @@ -394,17 +419,7 @@ void siprepo_timer_exec(unsigned int ticks, int worker, void *param) lock_get(&_siprepo_table[i].lock); for(it=_siprepo_table[i].plist; it!=NULL; it=it->next) { if(it->itime+_siprepo_expire < tnow) { - if(it->prev==NULL) { - _siprepo_table[i].plist = it->next; - if(_siprepo_table[i].plist) { - _siprepo_table[i].plist->prev = NULL; - } - } else { - it->prev->next = it->next; - } - if(it->next!=NULL) { - it->next->prev = it->prev; - } + siprepo_msg_unlink(it, slotid); if(elist) { it->next = elist; elist = it; diff --git a/src/modules/siprepo/siprepo_data.h b/src/modules/siprepo/siprepo_data.h index 2750189ae0..683348c8b0 100644 --- a/src/modules/siprepo/siprepo_data.h +++ b/src/modules/siprepo/siprepo_data.h @@ -27,6 +27,8 @@ #include "../../core/parser/msg_parser.h" +#define SIPREPO_RMODE_RM 1 + typedef struct siprepo_msg { unsigned int hid; int mtype;

1 0

git:master:72443722: rls: free resources in case of errors
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: 72443722d7fda4289390ef8bc20ad91990b895a7 URL: https://github.com/kamailio/kamailio/commit/72443722d7fda4289390ef8bc20ad91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T12:04:06+02:00 rls: free resources in case of errors --- Modified: src/modules/rls/resource_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/72443722d7fda4289390ef8bc20ad91… Patch: https://github.com/kamailio/kamailio/commit/72443722d7fda4289390ef8bc20ad91… --- diff --git a/src/modules/rls/resource_notify.c b/src/modules/rls/resource_notify.c index 0f31e7c877..d3ad4fd1fc 100644 --- a/src/modules/rls/resource_notify.c +++ b/src/modules/rls/resource_notify.c @@ -146,6 +146,9 @@ int send_notify(xmlDocPtr * rlmi_doc, char * buf, int buf_len, int result = 0; str rlmi_cont= {0, 0}, multi_cont; + if(rlmi_doc==NULL || *rlmi_doc==NULL) { + return -1; + } xmlDocDumpFormatMemory(*rlmi_doc,(xmlChar**)(void*)&rlmi_cont.s, &rlmi_cont.len, 0); @@ -183,7 +186,6 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, subs_t* dialog= NULL; int len_est = 0; int resource_added = 0; /* Flag to indicate that we have added at least one resource */ - int ok = 0; /* generate the boundary string */ boundary_string= generate_string(BOUNDARY_STRING_LEN); @@ -431,7 +433,6 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, } done: - ok = 1; if (dbmode == RLS_DB_ONLY && rls_dbf.end_transaction) { if (rls_dbf.end_transaction(rls_db) < 0) @@ -456,11 +457,10 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, LM_ERR("in abort_transaction\n"); } - if(ok==0) { - if(rlmi_doc!=NULL) { - xmlFreeDoc(rlmi_doc); - } + if(rlmi_doc!=NULL) { + xmlFreeDoc(rlmi_doc); } + return; }

1 0

git:master:3553ee0b: janssonrpcc: free resources in case of errors
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: 3553ee0b4e2e973a742c5c73f43d848496959723 URL: https://github.com/kamailio/kamailio/commit/3553ee0b4e2e973a742c5c73f43d848… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T11:39:10+02:00 janssonrpcc: free resources in case of errors --- Modified: src/modules/janssonrpcc/janssonrpc_io.c Modified: src/modules/janssonrpcc/janssonrpc_request.c Modified: src/modules/janssonrpcc/janssonrpc_server.c Modified: src/modules/janssonrpcc/janssonrpc_srv.c --- Diff: https://github.com/kamailio/kamailio/commit/3553ee0b4e2e973a742c5c73f43d848… Patch: https://github.com/kamailio/kamailio/commit/3553ee0b4e2e973a742c5c73f43d848… --- diff --git a/src/modules/janssonrpcc/janssonrpc_io.c b/src/modules/janssonrpcc/janssonrpc_io.c index 5e9d01d004..830c2b9611 100644 --- a/src/modules/janssonrpcc/janssonrpc_io.c +++ b/src/modules/janssonrpcc/janssonrpc_io.c @@ -442,6 +442,7 @@ int jsonrpc_send(str conn, jsonrpc_request_t* req, bool notify_only) if (sent) { if (notify_only == true) { // free the request if using janssonrpc_notification function free_req_cmd(req->cmd); + req->cmd = NULL; free_request(req); } else { struct timeval tv; diff --git a/src/modules/janssonrpcc/janssonrpc_request.c b/src/modules/janssonrpcc/janssonrpc_request.c index ecd43c1476..758c56b61d 100644 --- a/src/modules/janssonrpcc/janssonrpc_request.c +++ b/src/modules/janssonrpcc/janssonrpc_request.c @@ -217,7 +217,7 @@ void retry_cb(int fd, short event, void* arg) DEBUG("retrying request: id=%d\n", req->id); - if(jsonrpc_send(req->cmd->conn, req, 0)<0) { + if(jsonrpc_send(req->cmd->conn, req, false)<0) { goto error; } diff --git a/src/modules/janssonrpcc/janssonrpc_server.c b/src/modules/janssonrpcc/janssonrpc_server.c index 6c4b999b50..16365fe214 100644 --- a/src/modules/janssonrpcc/janssonrpc_server.c +++ b/src/modules/janssonrpcc/janssonrpc_server.c @@ -278,7 +278,7 @@ int jsonrpc_server_from_srv(str conn, str srv, DBG("server %s\n", srv_record->name); server = create_server(); - CHECK_MALLOC(server); + CHECK_MALLOC_GOTO(server, error); shm_str_dup(&server->conn, &conn); CHECK_MALLOC_GOTO(server->conn.s, error); diff --git a/src/modules/janssonrpcc/janssonrpc_srv.c b/src/modules/janssonrpcc/janssonrpc_srv.c index 3ce7e28676..e29767ffa7 100644 --- a/src/modules/janssonrpcc/janssonrpc_srv.c +++ b/src/modules/janssonrpcc/janssonrpc_srv.c @@ -89,6 +89,7 @@ int refresh_srv(jsonrpc_srv_t* srv_obj) continue; srv_record = (struct srv_rdata*)l->rdata; if (srv_record == NULL) { + free_rdata_list(head); ERR("BUG: null rdata\n"); return -1; } @@ -109,16 +110,16 @@ int refresh_srv(jsonrpc_srv_t* srv_obj) jsonrpc_server_group_t* cgroup = NULL; for(cgroup=conn_group; cgroup!=NULL; cgroup=cgroup->next) { new_server = create_server(); - CHECK_MALLOC(new_server); + CHECK_MALLOC_GOTO(new_server, errdup); shm_str_dup(&new_server->conn, &cgroup->conn); - CHECK_MALLOC(new_server->conn.s); + CHECK_MALLOC_GOTO(new_server->conn.s, errdup); shm_str_dup(&new_server->addr, &name); - CHECK_MALLOC(new_server->addr.s); + CHECK_MALLOC_GOTO(new_server->addr.s, errdup); shm_str_dup(&new_server->srv, &srv); - CHECK_MALLOC(new_server->srv.s); + CHECK_MALLOC_GOTO(new_server->srv.s, errdup); new_server->port = srv_record->port; new_server->priority = srv_record->priority; @@ -129,6 +130,7 @@ int refresh_srv(jsonrpc_srv_t* srv_obj) addto_server_list(new_server, &new_servers); } } + free_rdata_list(head); if(iter <= 0) goto end; @@ -204,6 +206,12 @@ int refresh_srv(jsonrpc_srv_t* srv_obj) free_server_list(rm_servers); return retval; + +errdup: + free_rdata_list(head); + free_server_list(new_servers); + free_server(new_server); + return -1; } void free_srv(jsonrpc_srv_t* srv)

1 0

git:master:ef62bfb2: core: mem/tlsf - handle return codes during memory pool init
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: ef62bfb27514dc7ec3b603bee661cfac18c4fe93 URL: https://github.com/kamailio/kamailio/commit/ef62bfb27514dc7ec3b603bee661cfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T09:46:18+02:00 core: mem/tlsf - handle return codes during memory pool init --- Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/ef62bfb27514dc7ec3b603bee661cfa… Patch: https://github.com/kamailio/kamailio/commit/ef62bfb27514dc7ec3b603bee661cfa… --- diff --git a/src/core/mem/tlsf_malloc.c b/src/core/mem/tlsf_malloc.c index 19b71a8be3..805ada03cc 100644 --- a/src/core/mem/tlsf_malloc.c +++ b/src/core/mem/tlsf_malloc.c @@ -936,7 +936,13 @@ tlsf_t tlsf_create(void* mem) tlsf_t tlsf_create_with_pool(void* mem, size_t bytes) { tlsf_t tlsf = tlsf_create(mem); - tlsf_add_pool(tlsf, (char*)mem + tlsf_size(), bytes - tlsf_size()); + if(tlsf) { + pool_t p; + p = tlsf_add_pool(tlsf, (char*)mem + tlsf_size(), bytes - tlsf_size()); + if(!p) { + return NULL; + } + } return tlsf; } @@ -1387,6 +1393,12 @@ int tlsf_malloc_init_pkg_manager(void) _tlsf_pkg_pool = malloc(pkg_mem_size); if (_tlsf_pkg_pool) { _tlsf_pkg_block = tlsf_create_with_pool(_tlsf_pkg_pool, pkg_mem_size); + if(_tlsf_pkg_block==NULL) { + LM_CRIT("could not create tlsf pkg memory pool\n"); + fprintf(stderr, "could not create tlsf pkg memory pool: %ld bytes\n", + pkg_mem_size); + return -1; + } } else { LOG(L_CRIT, "could not initialize tlsf pkg memory pool\n"); fprintf(stderr, "Too much tlsf pkg memory demanded: %ld bytes\n", @@ -1639,6 +1651,12 @@ int tlsf_malloc_init_shm_manager(void) _tlsf_shm_pool = shm_core_get_pool(); if (_tlsf_shm_pool) { _tlsf_shm_block = tlsf_create_with_pool(_tlsf_shm_pool, shm_mem_size); + if(!_tlsf_shm_block) { + LM_CRIT("could not create tlsf shm memory pool\n"); + fprintf(stderr, "could not create tlsf shm memory pool: %ld bytes\n", + shm_mem_size); + return -1; + } } else { LOG(L_CRIT, "could not initialize tlsf shm memory pool\n"); fprintf(stderr, "Too much tlsf shm memory demanded: %ld bytes\n",

1 0

git:master:5504c68c: kamdbctl: version set to 5.6.0
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: 5504c68c88d6f8fcc85db4d18b818203a748329d URL: https://github.com/kamailio/kamailio/commit/5504c68c88d6f8fcc85db4d18b81820… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T09:46:18+02:00 kamdbctl: version set to 5.6.0 --- Modified: utils/kamctl/kamdbctl --- Diff: https://github.com/kamailio/kamailio/commit/5504c68c88d6f8fcc85db4d18b81820… Patch: https://github.com/kamailio/kamailio/commit/5504c68c88d6f8fcc85db4d18b81820… --- diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index 89ddc81477..60c20f224d 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='5.4.0' +VERSION='5.6.0' PATH=$PATH:/usr/local/sbin/

1 0

git:5.4:de2f80e1: pkg/kamailio/deb: add breaks/replaces to kamailio-cnxcc-modules
by Victor Seva 23 Apr '22

23 Apr '22

Module: kamailio Branch: 5.4 Commit: de2f80e103faac3dad820fabbe772a4d7085c3d8 URL: https://github.com/kamailio/kamailio/commit/de2f80e103faac3dad820fabbe772a4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-23T11:08:11+02:00 pkg/kamailio/deb: add breaks/replaces to kamailio-cnxcc-modules (cherry picked from commit ec22a2127750b5422d5ab01a23c4ea7404bad3cf) (cherry picked from commit 9333fe21023bb0a902b2fbf58c9ee556946d0a30) --- 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/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/de2f80e103faac3dad820fabbe772a4… Patch: https://github.com/kamailio/kamailio/commit/de2f80e103faac3dad820fabbe772a4…

1 0

git:5.4:0c3ef261: pkg/kamailio/deb: update copyright with new paths
by Victor Seva 23 Apr '22

23 Apr '22

Module: kamailio Branch: 5.4 Commit: 0c3ef2619024673edc52a4d39b74dbea491cdea3 URL: https://github.com/kamailio/kamailio/commit/0c3ef2619024673edc52a4d39b74dbe… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-23T11:08:02+02:00 pkg/kamailio/deb: update copyright with new paths * remove duplicate-globbing-patterns (cherry picked from commit 0030a756375217f4e1b5de55f96c6b2ba89a87d4) (cherry picked from commit 0d4a53e415a531a4270b18e141a5f922682ed507) --- Modified: pkg/kamailio/deb/bionic/copyright Modified: pkg/kamailio/deb/buster/copyright Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/focal/copyright Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/xenial/copyright --- Diff: https://github.com/kamailio/kamailio/commit/0c3ef2619024673edc52a4d39b74dbe… Patch: https://github.com/kamailio/kamailio/commit/0c3ef2619024673edc52a4d39b74dbe…

1 0

git:5.5:0d4a53e4: pkg/kamailio/deb: update copyright with new paths
by Victor Seva 23 Apr '22

23 Apr '22

Module: kamailio Branch: 5.5 Commit: 0d4a53e415a531a4270b18e141a5f922682ed507 URL: https://github.com/kamailio/kamailio/commit/0d4a53e415a531a4270b18e141a5f92… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-23T11:06:23+02:00 pkg/kamailio/deb: update copyright with new paths * remove duplicate-globbing-patterns (cherry picked from commit 0030a756375217f4e1b5de55f96c6b2ba89a87d4) --- Modified: pkg/kamailio/deb/bionic/copyright Modified: pkg/kamailio/deb/bullseye/copyright Modified: pkg/kamailio/deb/buster/copyright Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/focal/copyright Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/xenial/copyright --- Diff: https://github.com/kamailio/kamailio/commit/0d4a53e415a531a4270b18e141a5f92… Patch: https://github.com/kamailio/kamailio/commit/0d4a53e415a531a4270b18e141a5f92…

1 0

git:5.5:9333fe21: pkg/kamailio/deb: add breaks/replaces to kamailio-cnxcc-modules
by Victor Seva 23 Apr '22

23 Apr '22

Module: kamailio Branch: 5.5 Commit: 9333fe21023bb0a902b2fbf58c9ee556946d0a30 URL: https://github.com/kamailio/kamailio/commit/9333fe21023bb0a902b2fbf58c9ee55… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-23T11:06:44+02:00 pkg/kamailio/deb: add breaks/replaces to kamailio-cnxcc-modules (cherry picked from commit ec22a2127750b5422d5ab01a23c4ea7404bad3cf) --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bullseye/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/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/9333fe21023bb0a902b2fbf58c9ee55… Patch: https://github.com/kamailio/kamailio/commit/9333fe21023bb0a902b2fbf58c9ee55…

1 0

git:master:ec22a212: pkg/kamailio/deb: add breaks/replaces to kamailio-cnxcc-modules
by Victor Seva 23 Apr '22

23 Apr '22

Module: kamailio Branch: master Commit: ec22a2127750b5422d5ab01a23c4ea7404bad3cf URL: https://github.com/kamailio/kamailio/commit/ec22a2127750b5422d5ab01a23c4ea7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-23T10:28:46+02:00 pkg/kamailio/deb: add breaks/replaces to kamailio-cnxcc-modules --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bullseye/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/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/ec22a2127750b5422d5ab01a23c4ea7… Patch: https://github.com/kamailio/kamailio/commit/ec22a2127750b5422d5ab01a23c4ea7…

1 0

git:master:e59fcc4d: Revert "pkg/kamailio/deb: remove radius old Breaks/Replaces"
by Victor Seva 23 Apr '22

23 Apr '22

Module: kamailio Branch: master Commit: e59fcc4d828e12e1fc506775477772c8fa5c2ef5 URL: https://github.com/kamailio/kamailio/commit/e59fcc4d828e12e1fc506775477772c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-23T10:27:06+02:00 Revert "pkg/kamailio/deb: remove radius old Breaks/Replaces" This reverts commit 61ea9c85140766ff6fd3201d3117803114436bd4. --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bullseye/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/e59fcc4d828e12e1fc506775477772c… Patch: https://github.com/kamailio/kamailio/commit/e59fcc4d828e12e1fc506775477772c…

1 0

git:master:0030a756: pkg/kamailio/deb: update copyright with new paths
by Victor Seva 23 Apr '22

23 Apr '22

Module: kamailio Branch: master Commit: 0030a756375217f4e1b5de55f96c6b2ba89a87d4 URL: https://github.com/kamailio/kamailio/commit/0030a756375217f4e1b5de55f96c6b2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-23T09:17:53+02:00 pkg/kamailio/deb: update copyright with new paths * remove duplicate-globbing-patterns --- Modified: pkg/kamailio/deb/bionic/copyright Modified: pkg/kamailio/deb/bookworm/copyright Modified: pkg/kamailio/deb/bullseye/copyright Modified: pkg/kamailio/deb/buster/copyright Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/focal/copyright Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/xenial/copyright --- Diff: https://github.com/kamailio/kamailio/commit/0030a756375217f4e1b5de55f96c6b2… Patch: https://github.com/kamailio/kamailio/commit/0030a756375217f4e1b5de55f96c6b2…

1 0

git:master:61ea9c85: pkg/kamailio/deb: remove radius old Breaks/Replaces
by Victor Seva 23 Apr '22

23 Apr '22

Module: kamailio Branch: master Commit: 61ea9c85140766ff6fd3201d3117803114436bd4 URL: https://github.com/kamailio/kamailio/commit/61ea9c85140766ff6fd3201d3117803… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-23T09:25:09+02:00 pkg/kamailio/deb: remove radius old Breaks/Replaces --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bullseye/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/61ea9c85140766ff6fd3201d3117803… Patch: https://github.com/kamailio/kamailio/commit/61ea9c85140766ff6fd3201d3117803…

1 0

git:master:3da9060a: janssonrpcc: do not set TCP_KEEPIDLE if not available in the OS
by Daniel-Constantin Mierla 22 Apr '22

22 Apr '22

Module: kamailio Branch: master Commit: 3da9060a4479b5d1275088213b560f9e3b250394 URL: https://github.com/kamailio/kamailio/commit/3da9060a4479b5d1275088213b560f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-22T13:17:01+02:00 janssonrpcc: do not set TCP_KEEPIDLE if not available in the OS --- Modified: src/modules/janssonrpcc/janssonrpc_connect.c --- Diff: https://github.com/kamailio/kamailio/commit/3da9060a4479b5d1275088213b560f9… Patch: https://github.com/kamailio/kamailio/commit/3da9060a4479b5d1275088213b560f9… --- diff --git a/src/modules/janssonrpcc/janssonrpc_connect.c b/src/modules/janssonrpcc/janssonrpc_connect.c index b6f4d69912..6f5048efd4 100644 --- a/src/modules/janssonrpcc/janssonrpc_connect.c +++ b/src/modules/janssonrpcc/janssonrpc_connect.c @@ -316,8 +316,12 @@ int set_keepalive(int fd, int keepalive, int cnt, int idle, int intvl) { res = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &idle, sizeof(idle)); assert(res == 0); +#ifdef HAVE_TCP_KEEPIDLE res = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(idle)); assert(res == 0); +#else + LM_INFO("TCP_KEEPIDLE option not available - ignoring\n"); +#endif res = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &intvl, sizeof(intvl)); assert(res == 0);

1 0

git:master:dbf9b284: ims_diameter_server: 0-terminate value converted to json
by Daniel-Constantin Mierla 22 Apr '22

22 Apr '22

Module: kamailio Branch: master Commit: dbf9b28402d9506c5761476febc31fbf45eb08fa URL: https://github.com/kamailio/kamailio/commit/dbf9b28402d9506c5761476febc31fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-22T12:29:35+02:00 ims_diameter_server: 0-terminate value converted to json --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/dbf9b28402d9506c5761476febc31fb… Patch: https://github.com/kamailio/kamailio/commit/dbf9b28402d9506c5761476febc31fb… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index 04e2d6d967..73c0e047ea 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -164,9 +164,10 @@ int AAAmsg2json(AAAMessage * request, str * dest) { } dest->len = strlen(out); - dest->s = pkg_malloc(dest->len); + dest->s = pkg_malloc(dest->len + 1); if (dest->s) { memcpy(dest->s, out, dest->len); + dest->s[dest->len] = '\0'; free(out); } else { LM_WARN("Failed to allocate %d bytes for the JSON\n", dest->len);

1 0

git:master:b8b6c915: janssonrpcc: close fd in case of error
by Daniel-Constantin Mierla 22 Apr '22

22 Apr '22

Module: kamailio Branch: master Commit: b8b6c915a0f8d3f820e6c51a272ccd8d8c8f9ac7 URL: https://github.com/kamailio/kamailio/commit/b8b6c915a0f8d3f820e6c51a272ccd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-22T13:05:54+02:00 janssonrpcc: close fd in case of error --- Modified: src/modules/janssonrpcc/janssonrpc_connect.c --- Diff: https://github.com/kamailio/kamailio/commit/b8b6c915a0f8d3f820e6c51a272ccd8… Patch: https://github.com/kamailio/kamailio/commit/b8b6c915a0f8d3f820e6c51a272ccd8… --- diff --git a/src/modules/janssonrpcc/janssonrpc_connect.c b/src/modules/janssonrpcc/janssonrpc_connect.c index 0ba40f1643..b6f4d69912 100644 --- a/src/modules/janssonrpcc/janssonrpc_connect.c +++ b/src/modules/janssonrpcc/janssonrpc_connect.c @@ -338,7 +338,7 @@ void bev_connect(jsonrpc_server_t* server) } else { INFO("setting up socket"); fd = socket(AF_INET, SOCK_STREAM, 0); - if (fd <= 0) { + if (fd < 0) { server->keep_alive_socket_fd = -1; ERR("could not setup socket"); } else { @@ -346,6 +346,9 @@ void bev_connect(jsonrpc_server_t* server) } } if (!fd_is_valid(fd)) { // make sure socket is valid + if (fd >= 0) { + close(fd); + } fd = -1; server->keep_alive_socket_fd = -1; }

1 0

git:master:55255570: tcpops: remove explicit compile warning about unavailable TCP_KEEPIDLE
by Daniel-Constantin Mierla 22 Apr '22

22 Apr '22

Module: kamailio Branch: master Commit: 55255570cf74f8c86d7757a3fb08ac3aad7cfa55 URL: https://github.com/kamailio/kamailio/commit/55255570cf74f8c86d7757a3fb08ac3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-22T13:15:57+02:00 tcpops: remove explicit compile warning about unavailable TCP_KEEPIDLE --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/55255570cf74f8c86d7757a3fb08ac3… Patch: https://github.com/kamailio/kamailio/commit/55255570cf74f8c86d7757a3fb08ac3… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index cb1728390c..fa886c5460 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -168,7 +168,6 @@ int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int close LM_ERR("failed to set keepalive idle interval: %s\n", strerror(errno)); } #else - #warning "TCP_KEEPIDLE option not supported by this platform" LM_DBG("TCP_KEEPIDLE option not available - ignoring\n"); #endif

1 0

git:master:1e97d6e6: evrexec: free resources in case of failure
by Daniel-Constantin Mierla 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: 1e97d6e63c89c7a27be7152ac38192d056fef7c8 URL: https://github.com/kamailio/kamailio/commit/1e97d6e63c89c7a27be7152ac38192d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T20:00:11+02:00 evrexec: free resources in case of failure --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1e97d6e63c89c7a27be7152ac38192d… Patch: https://github.com/kamailio/kamailio/commit/1e97d6e63c89c7a27be7152ac38192d… --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index 253197d100..3087e65369 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -259,11 +259,14 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) if(it->sockfd==-1) { LM_ERR("failed to create socket - address: %.*s (%d/%s)\n", it->sockaddr.len, it->sockaddr.s, errno, strerror(errno)); + freeaddrinfo(res); return; } if(bind(it->sockfd, res->ai_addr, res->ai_addrlen)==-1) { LM_ERR("failed to bind socket - address: %.*s (%d/%s)\n", it->sockaddr.len, it->sockaddr.s, errno, strerror(errno)); + close(it->sockfd); + freeaddrinfo(res); return; } freeaddrinfo(res);

1 0

git:master:e2df1d91: pua_reginfo: clang format code files
by Daniel-Constantin Mierla 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: e2df1d91de0e0351a7976720d1e9a101af746cf7 URL: https://github.com/kamailio/kamailio/commit/e2df1d91de0e0351a7976720d1e9a10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T16:07:17+02:00 pua_reginfo: clang format code files --- Modified: src/modules/pua_reginfo/notify.c Modified: src/modules/pua_reginfo/notify.h Modified: src/modules/pua_reginfo/pua_reginfo.c Modified: src/modules/pua_reginfo/pua_reginfo.h Modified: src/modules/pua_reginfo/subscribe.c Modified: src/modules/pua_reginfo/subscribe.h Modified: src/modules/pua_reginfo/usrloc_cb.c Modified: src/modules/pua_reginfo/usrloc_cb.h --- Diff: https://github.com/kamailio/kamailio/commit/e2df1d91de0e0351a7976720d1e9a10… Patch: https://github.com/kamailio/kamailio/commit/e2df1d91de0e0351a7976720d1e9a10…

1 0

[kamailio/kamailio] ims_registrar_scscf: replace unregistered state with deregistered (PR #3076)
by Kristiyan Peychev 21 Apr '22

21 Apr '22

#### 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  This is the actual application of PR #3051; registration termination requests work properly now. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3076 -- Commit Summary -- * ims_registrar_scscf: replace unregistered state with deregistered where relevant for CxDx Registration Termination Requests -- File Changes -- M src/modules/ims_registrar_scscf/cxdx_callbacks.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3076.patch https://github.com/kamailio/kamailio/pull/3076.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3076 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3076(a)github.com>

3 2

git:master:27a98c58: ims_registrar_scscf: replace unregistered state with deregistered where relevant for CxDx Registration Termination Requests
by Daniel-Constantin Mierla 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: 27a98c580f41a279417a8493461ff0567b3ce12a URL: https://github.com/kamailio/kamailio/commit/27a98c580f41a279417a8493461ff05… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T15:30:05+02:00 ims_registrar_scscf: replace unregistered state with deregistered where relevant for CxDx Registration Termination Requests --- Modified: src/modules/ims_registrar_scscf/cxdx_callbacks.c --- Diff: https://github.com/kamailio/kamailio/commit/27a98c580f41a279417a8493461ff05… Patch: https://github.com/kamailio/kamailio/commit/27a98c580f41a279417a8493461ff05… --- diff --git a/src/modules/ims_registrar_scscf/cxdx_callbacks.c b/src/modules/ims_registrar_scscf/cxdx_callbacks.c index ca601bd991..00fc280b4d 100644 --- a/src/modules/ims_registrar_scscf/cxdx_callbacks.c +++ b/src/modules/ims_registrar_scscf/cxdx_callbacks.c @@ -90,10 +90,9 @@ AAAMessage* cxdx_process_rtr(AAAMessage *rtr) { while (impucontact) { LM_DBG("Deleting contact with AOR [%.*s]\n", impucontact->contact->aor.len, impucontact->contact->aor.s); ul.lock_contact_slot_i(impucontact->contact->sl); - impucontact->contact->state = CONTACT_DELETE_PENDING; if (r->shead) { //send NOTIFY to all subscribers of this IMPU. - notify_subscribers(r, impucontact->contact, 0, 0, IMS_REGISTRAR_CONTACT_UNREGISTERED); + notify_subscribers(r, impucontact->contact, 0, 0, IMS_REGISTRAR_CONTACT_DEREGISTERED); } impucontact->contact->state = CONTACT_DELETED; ul.unlock_contact_slot_i(impucontact->contact->sl); @@ -119,10 +118,9 @@ AAAMessage* cxdx_process_rtr(AAAMessage *rtr) { while (impucontact) { LM_DBG("Deleting contact with AOR [%.*s]\n", impucontact->contact->aor.len, impucontact->contact->aor.s); ul.lock_contact_slot_i(impucontact->contact->sl); - impucontact->contact->state = CONTACT_DELETE_PENDING; if (r->shead) { //send NOTIFY to all subscribers of this IMPU. - notify_subscribers(r, impucontact->contact, 0, 0, IMS_REGISTRAR_CONTACT_UNREGISTERED); + notify_subscribers(r, impucontact->contact, 0, 0, IMS_REGISTRAR_CONTACT_DEREGISTERED); } impucontact->contact->state = CONTACT_DELETED; ul.unlock_contact_slot_i(impucontact->contact->sl);

1 0

[kamailio/kamailio] add function t_continue_skip_timer to enable skipping of timer checks (PR #3080)
by Kristiyan Peychev 21 Apr '22

21 Apr '22

#### 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  This is done because IMS third party registration requests would be skipped because t_continue would get called on the transaction _way_ before the timer timeout. All this resulted in the correct route not being called. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3080 -- Commit Summary -- * tm: add function t_continue_skip_timer to enable skipping of timer checks * ims_registrar_scscf: use t_continue_skip_timer instead of t_continue when processing CxDx SAR -- File Changes -- M src/modules/ims_registrar_scscf/cxdx_sar.c (2) M src/modules/tm/t_lookup.c (2) M src/modules/tm/t_suspend.c (15) M src/modules/tm/t_suspend.h (2) M src/modules/tm/tm_load.c (1) M src/modules/tm/tm_load.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3080.patch https://github.com/kamailio/kamailio/pull/3080.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3080 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3080(a)github.com>

2 2

git:master:2067f110: tm: add function t_continue_skip_timer to enable skipping of timer checks
by Daniel-Constantin Mierla 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: 2067f110336244826b183a649cb987fac94ffe1c URL: https://github.com/kamailio/kamailio/commit/2067f110336244826b183a649cb987f… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T15:29:37+02:00 tm: add function t_continue_skip_timer to enable skipping of timer checks This is done because third party registration requests would be skipped because t_continue would get called on the transaction _way_ before the timer timeout. All this resulted in the correct route not being called. --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_suspend.c Modified: src/modules/tm/t_suspend.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/2067f110336244826b183a649cb987f… Patch: https://github.com/kamailio/kamailio/commit/2067f110336244826b183a649cb987f… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index b90672b3e4..f041116bb8 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1587,7 +1587,7 @@ int t_get_canceled_ident(struct sip_msg* msg, unsigned int* hash_index, * 0). * @param hash_index - searched transaction hash_index (part of the ident). * @param label - searched transaction label (part of the ident). - * @param filter - if 1, skip transaction put on-wait (terminated state). + * @param filter - if 1, filter out transactions put on-wait (terminated state). * @return -1 on error/not found, 1 on success (found) * Side-effects: sets T and T_branch (T_branch always to T_BR_UNDEFINED). */ diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index bae9747282..f0255d6647 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -163,8 +163,8 @@ int t_suspend(struct sip_msg *msg, * 0 - success * <0 - failure */ -int t_continue_helper(unsigned int hash_index, unsigned int label, - struct action *rtact, str *cbname, str *cbparam) +static int t_continue_helper(unsigned int hash_index, unsigned int label, + struct action *rtact, str *cbname, str *cbparam, int skip_timer) { tm_cell_t *t; tm_cell_t *backup_T = T_UNDEFINED; @@ -192,7 +192,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, backup_T = get_t(); backup_T_branch = get_t_branch(); - if (t_lookup_ident_filter(&t, hash_index, label, 1) < 0) { + if (t_lookup_ident_filter(&t, hash_index, label, skip_timer) < 0) { set_t(backup_T, backup_T_branch); LM_WARN("active transaction not found\n"); return -1; @@ -592,13 +592,18 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, int t_continue(unsigned int hash_index, unsigned int label, struct action *route) { - return t_continue_helper(hash_index, label, route, NULL, NULL); + return t_continue_helper(hash_index, label, route, NULL, NULL, 1); +} +int t_continue_skip_timer(unsigned int hash_index, unsigned int label, + struct action *route) +{ + return t_continue_helper(hash_index, label, route, NULL, NULL, 0); } int t_continue_cb(unsigned int hash_index, unsigned int label, str *cbname, str *cbparam) { - return t_continue_helper(hash_index, label, NULL, cbname, cbparam); + return t_continue_helper(hash_index, label, NULL, cbname, cbparam, 0); } /* Revoke the suspension of the SIP request, i.e. diff --git a/src/modules/tm/t_suspend.h b/src/modules/tm/t_suspend.h index fcbe182ad1..07c4e7bc37 100644 --- a/src/modules/tm/t_suspend.h +++ b/src/modules/tm/t_suspend.h @@ -29,6 +29,8 @@ typedef int (*t_suspend_f)(struct sip_msg *msg, int t_continue(unsigned int hash_index, unsigned int label, struct action *route); +int t_continue_skip_timer(unsigned int hash_index, unsigned int label, + struct action *route); typedef int (*t_continue_f)(unsigned int hash_index, unsigned int label, struct action *route); diff --git a/src/modules/tm/tm_load.c b/src/modules/tm/tm_load.c index 911be5d917..65515a3a28 100644 --- a/src/modules/tm/tm_load.c +++ b/src/modules/tm/tm_load.c @@ -115,6 +115,7 @@ int load_tm( struct tm_binds *tmb) tmb->t_get_canceled_ident = t_get_canceled_ident; tmb->t_suspend = t_suspend; tmb->t_continue = t_continue; + tmb->t_continue_skip_timer = t_continue_skip_timer; tmb->t_continue_cb = t_continue_cb; tmb->t_cancel_suspend = t_cancel_suspend; tmb->t_get_reply_totag = t_get_reply_totag; diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index a0f3afde00..8190ee977c 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -95,6 +95,7 @@ struct tm_binds { t_get_canceled_ident_f t_get_canceled_ident; t_suspend_f t_suspend; t_continue_f t_continue; + t_continue_f t_continue_skip_timer; t_continue_cb_f t_continue_cb; t_cancel_suspend_f t_cancel_suspend; tget_reply_totag_f t_get_reply_totag;

1 0

git:master:89421e18: ims_registrar_scscf: use t_continue_skip_timer instead of t_continue when processing CxDx SAR
by Daniel-Constantin Mierla 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: 89421e184a8b47557dcfc6c348d60dde347a9417 URL: https://github.com/kamailio/kamailio/commit/89421e184a8b47557dcfc6c348d60dd… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T15:29:37+02:00 ims_registrar_scscf: use t_continue_skip_timer instead of t_continue when processing CxDx SAR --- Modified: src/modules/ims_registrar_scscf/cxdx_sar.c --- Diff: https://github.com/kamailio/kamailio/commit/89421e184a8b47557dcfc6c348d60dd… Patch: https://github.com/kamailio/kamailio/commit/89421e184a8b47557dcfc6c348d60dd… --- diff --git a/src/modules/ims_registrar_scscf/cxdx_sar.c b/src/modules/ims_registrar_scscf/cxdx_sar.c index 951b9d26f5..e0097921e2 100644 --- a/src/modules/ims_registrar_scscf/cxdx_sar.c +++ b/src/modules/ims_registrar_scscf/cxdx_sar.c @@ -286,7 +286,7 @@ void async_cdp_callback(int is_timeout, void *param, AAAMessage *saa, long elaps //free path vector pkg memory // reset_path_vector(req); - tmb.t_continue(data->tindex, data->tlabel, data->act); + tmb.t_continue_skip_timer(data->tindex, data->tlabel, data->act); free_saved_transaction_data(data); return;

1 0

git:master:858ecd29: modules: readme files regenerated - sanity ... [skip ci]
by Kamailio Dev 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: 858ecd297c9c53e3f6d0575868d409c4dd3460cf URL: https://github.com/kamailio/kamailio/commit/858ecd297c9c53e3f6d0575868d409c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-21T14:46:14+02:00 modules: readme files regenerated - sanity ... [skip ci] --- Modified: src/modules/sanity/README --- Diff: https://github.com/kamailio/kamailio/commit/858ecd297c9c53e3f6d0575868d409c… Patch: https://github.com/kamailio/kamailio/commit/858ecd297c9c53e3f6d0575868d409c… --- diff --git a/src/modules/sanity/README b/src/modules/sanity/README index 4493c7f3cd..ac3e2ca927 100644 --- a/src/modules/sanity/README +++ b/src/modules/sanity/README @@ -77,18 +77,18 @@ Chapter 1. Admin Guide * ruri scheme - (2) - checks if the URI scheme of the request URI is supported (sip[s]|tel[s]) by Kamailio * required headers - (4) -checks if the minimum set of required - headers to, from, cseq, callid and via is present in the request. + headers To, From, CSeq, Call-ID and Via is present in the request. * via sip version - (8) - disabled. * via protocol - (16) - disabled. - * Cseq method - (32) - checks if the method from the Cseq header is + * Cseq method - (32) - checks if the method from the CSeq header is equal to the request method. - * Cseq value - (64) - checks if the number in the Cseq header is a + * Cseq value - (64) - checks if the number in the CSeq header is a valid unsigned integer. * content length - (128) - checks if the size of the body matches - with the value from the content length header. - * expires value - (256) - checks if the value of the expires header + with the value from the Content-Length header. + * expires value - (256) - checks if the value of the Expires header is a valid unsigned integer. - * proxy require - (512) - checks if all items of the proxy require + * proxy require - (512) - checks if all items of the Proxy-Require header are present in the list of the extensions from the module parameter proxy_require. * parse uri's - (1024) - checks if the specified URIs are present and @@ -100,9 +100,9 @@ Chapter 1. Admin Guide scheme differs from "digest", * duplicated To/From tags (4096) - checks for the presence of duplicated tags in To/From headers. - * authorization header (8192) - checks if the Authorization is valid - if the scheme is "digest" (see "digest credentials" above), always - returns success for other schemes. + * Authorization header (8192) - checks if the Authorization header is + valid if the scheme is "digest" (see "digest credentials" above), + always returns success for other schemes. * first via header (16384) - checks if the first Via header is available, can be parsed and has an address value. @@ -153,9 +153,10 @@ modparam("sanity", "uri_checks", 3) 3.3. proxy_require (string) This parameter sets the list of supported SIP extensions for this - Kamailio. The value is expected as a comma separated list of - extensions. This list is separated into single tokens. Each token from - a proxy require header will be compared with the tokens from this list. + Kamailio. The value is expected as a comma separated list (leading and + trailing whitespaces are stripped from each token) of extensions. This + list is separated into single tokens. Each token from a proxy require + header will be compared with the tokens from this list. Example 1.3. Set proxy_require parameter ...

1 0

[kamailio/kamailio] sanity: Use str_list implementation from core (PR #3088)
by Bastian Triller 21 Apr '22

21 Apr '22

* Remove redundant str_list implementation. * Improve docs   #### 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  * use str_list implementation from core * typo fixes, doc improvements You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3088 -- Commit Summary -- * sanity: Use str_list implementation from core -- File Changes -- M src/modules/sanity/doc/sanity_admin.xml (17) M src/modules/sanity/sanity.c (60) M src/modules/sanity/sanity.h (4) M src/modules/sanity/sanity_mod.c (8) M src/modules/sanity/sanity_mod.h (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3088.patch https://github.com/kamailio/kamailio/pull/3088.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3088 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3088(a)github.com>

2 2

git:master:acafe707: sanity: Use str_list implementation from core
by Daniel-Constantin Mierla 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: acafe70708a13ac7f549cb113d99af53ee0ac088 URL: https://github.com/kamailio/kamailio/commit/acafe70708a13ac7f549cb113d99af5… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T14:32:05+02:00 sanity: Use str_list implementation from core * Remove redundant str_list implementation. * Improve docs --- Modified: src/modules/sanity/doc/sanity_admin.xml Modified: src/modules/sanity/sanity.c Modified: src/modules/sanity/sanity.h Modified: src/modules/sanity/sanity_mod.c Modified: src/modules/sanity/sanity_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/acafe70708a13ac7f549cb113d99af5… Patch: https://github.com/kamailio/kamailio/commit/acafe70708a13ac7f549cb113d99af5…

1 0

git:master:c3091228: topos: restore attributes based on direction for early dialog requests
by Daniel-Constantin Mierla 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: c309122864eaa2bfa58253290bed49084ccc9302 URL: https://github.com/kamailio/kamailio/commit/c309122864eaa2bfa58253290bed490… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T14:28:26+02:00 topos: restore attributes based on direction for early dialog requests - GH #3090 --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/c309122864eaa2bfa58253290bed490… Patch: https://github.com/kamailio/kamailio/commit/c309122864eaa2bfa58253290bed490… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index c16a0adacb..cd781328e5 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -863,10 +863,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) mtsd.direction = direction; } - tps_storage_lock_release(&lkey); - if(use_branch) { + if(use_branch && direction == TPS_DIR_DOWNSTREAM) { nuri = stsd.b_contact; } else { if(direction == TPS_DIR_UPSTREAM) { @@ -884,7 +883,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) } } - if(use_branch) { + if(use_branch && direction == TPS_DIR_DOWNSTREAM) { if(tps_reappend_route(msg, &stsd, &stsd.s_rr, 1) < 0) { LM_ERR("failed to reappend s-route\n"); return -1;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev