sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
244 discussions

git:master:24e410f9: topos: properly handle cases of no user in contact for mode 1
by Daniel-Constantin Mierla 10 Mar '24

10 Mar '24

Module: kamailio Branch: master Commit: 24e410f9a20d004f55bcc79cd10fb35cb26e4570 URL: https://github.com/kamailio/kamailio/commit/24e410f9a20d004f55bcc79cd10fb35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-10T08:11:09+01:00 topos: properly handle cases of no user in contact for mode 1 - contact mode 1 accepted cases with no-user in contact uri but not in r-uri, however, requests within dialog can have one's contact in r-uri and then processing failed --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/24e410f9a20d004f55bcc79cd10fb35… Patch: https://github.com/kamailio/kamailio/commit/24e410f9a20d004f55bcc79cd10fb35… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index bb153bb780a..946092c04f9 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -223,6 +223,7 @@ int tps_storage_fill_contact( int i; int contact_len; int cparam_len; + int cuser_len = 0; sr_xavp_t *vavu = NULL; if(dir == TPS_DIR_DOWNSTREAM) { @@ -317,21 +318,27 @@ int tps_storage_fill_contact( LM_ERR("failed to parse the contact uri\n"); return -1; } - memcpy(td->cp, curi.user.s, curi.user.len); - td->cp += curi.user.len; + if(curi.user.len > 0) { + memcpy(td->cp, curi.user.s, curi.user.len); + td->cp += curi.user.len; + cuser_len = curi.user.len; + } else { + LM_DBG("no contact user - skipping it\n"); + } } else { /* extract the ruri */ if(parse_sip_msg_uri(msg) < 0) { LM_ERR("failed to parse r-uri\n"); return -1; } - if(msg->parsed_uri.user.len == 0) { - LM_ERR("no r-uri user\n"); - return -1; + if(msg->parsed_uri.user.len > 0) { + memcpy(td->cp, msg->parsed_uri.user.s, + msg->parsed_uri.user.len); + td->cp += msg->parsed_uri.user.len; + cuser_len = msg->parsed_uri.user.len; + } else { + LM_DBG("no r-uri user - skipping it\n"); } - memcpy(td->cp, msg->parsed_uri.user.s, - msg->parsed_uri.user.len); - td->cp += msg->parsed_uri.user.len; } } else if(ctmode == TPS_CONTACT_MODE_XAVPUSER) { if(dir == TPS_DIR_DOWNSTREAM) { @@ -344,6 +351,7 @@ int tps_storage_fill_contact( } memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); td->cp += vavu->val.v.s.len; + cuser_len = vavu->val.v.s.len; } else { /* extract the b contact */ vavu = xavu_get_child_with_sval( @@ -354,11 +362,11 @@ int tps_storage_fill_contact( } memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); td->cp += vavu->val.v.s.len; + cuser_len = vavu->val.v.s.len; } } - if(!((ctmode == TPS_CONTACT_MODE_RURIUSER) - && (dir == TPS_DIR_DOWNSTREAM) && (curi.user.len <= 0))) { + if(cuser_len > 0) { *td->cp = '@'; td->cp++; }

1 0

git:master:b6fccea2: topos: small rearangement by removing else after return in the true block
by Daniel-Constantin Mierla 10 Mar '24

10 Mar '24

Module: kamailio Branch: master Commit: b6fccea258e56b7d3195659245713a6d44acb013 URL: https://github.com/kamailio/kamailio/commit/b6fccea258e56b7d3195659245713a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-10T07:43:51+01:00 topos: small rearangement by removing else after return in the true block - reduce level of indentation - a few wraps in curly braces for clearer view of the if block --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/b6fccea258e56b7d3195659245713a6… Patch: https://github.com/kamailio/kamailio/commit/b6fccea258e56b7d3195659245713a6… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index fc0c2835a33..bb153bb780a 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -241,8 +241,9 @@ int tps_storage_fill_contact( } contact_len = sv.len; - if(_tps_contact_host.len) + if(_tps_contact_host.len) { contact_len = sv.len - puri.host.len + _tps_contact_host.len; + } if(ctmode == TPS_CONTACT_MODE_RURIUSER || ctmode == TPS_CONTACT_MODE_XAVPUSER) { @@ -283,8 +284,9 @@ int tps_storage_fill_contact( for(i = 0; i < sv.len; i++) { *td->cp = sv.s[i]; td->cp++; - if(sv.s[i] == ':') + if(sv.s[i] == ':') { break; + } } if(ctmode == TPS_CONTACT_MODE_RURIUSER || ctmode == TPS_CONTACT_MODE_XAVPUSER) { @@ -296,27 +298,24 @@ int tps_storage_fill_contact( || msg->contact == NULL) { LM_WARN("bad sip message or missing Contact hdr\n"); return -1; - } else { - if(parse_contact(msg->contact) < 0 - || ((contact_body_t *)msg->contact->parsed) - ->contacts - == NULL - || ((contact_body_t *)msg->contact->parsed) - ->contacts->next - != NULL) { - LM_ERR("bad Contact header\n"); - return -1; - } else { - if(parse_uri(((contact_body_t *)msg->contact->parsed) - ->contacts->uri.s, - ((contact_body_t *)msg->contact->parsed) - ->contacts->uri.len, - &curi) - < 0) { - LM_ERR("failed to parse the contact uri\n"); - return -1; - } - } + } + if(parse_contact(msg->contact) < 0 + || ((contact_body_t *)msg->contact->parsed)->contacts + == NULL + || ((contact_body_t *)msg->contact->parsed) + ->contacts->next + != NULL) { + LM_ERR("bad Contact header\n"); + return -1; + } + if(parse_uri(((contact_body_t *)msg->contact->parsed) + ->contacts->uri.s, + ((contact_body_t *)msg->contact->parsed) + ->contacts->uri.len, + &curi) + < 0) { + LM_ERR("failed to parse the contact uri\n"); + return -1; } memcpy(td->cp, curi.user.s, curi.user.len); td->cp += curi.user.len;

1 0

Kamailio v5.8.0 Released - new major version is out
by Daniel-Constantin Mierla 07 Mar '24

07 Mar '24

Kamailio v5.8.0 is out – it comes with 4 new modules and a large set of improvements touching again more than 50 existing modules. You can read a bit more detailed release notes at: * https://www.kamailio.org/w/kamailio-v5-8-0-release-notes/ Many thanks to all developers and community members that made possible this release. v5.8.0 brings more flexibility and optimizations across many existing components and modules, new parameters, functions, variables and transformations. Enjoy Kamailio v5.8.0! Thank you for flying Kamailio! Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

1 0

git:master:20edb642: pkg/kamailio/obs: packaged README.file_out
by Sergey Safarov 07 Mar '24

07 Mar '24

Module: kamailio Branch: master Commit: 20edb64247a20a5d6b4b8bfb264b6e31d283b039 URL: https://github.com/kamailio/kamailio/commit/20edb64247a20a5d6b4b8bfb264b6e3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-03-07T13:32:22+02:00 pkg/kamailio/obs: packaged README.file_out --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/20edb64247a20a5d6b4b8bfb264b6e3… Patch: https://github.com/kamailio/kamailio/commit/20edb64247a20a5d6b4b8bfb264b6e3… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 13d6fb20ffd..59f7360f9e2 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1535,6 +1535,7 @@ fi %doc %{_docdir}/kamailio/modules/README.drouting %doc %{_docdir}/kamailio/modules/README.enum %doc %{_docdir}/kamailio/modules/README.exec +%doc %{_docdir}/kamailio/modules/README.file_out %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc

1 0

git:5.8:2e2217b1: ChangeLog: content set for v5.8.0
by Daniel-Constantin Mierla 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.8 Commit: 2e2217b153b5acf05a7cb37c70760194802312bb URL: https://github.com/kamailio/kamailio/commit/2e2217b153b5acf05a7cb37c7076019… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-07T12:30:56+01:00 ChangeLog: content set for v5.8.0 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/2e2217b153b5acf05a7cb37c7076019… Patch: https://github.com/kamailio/kamailio/commit/2e2217b153b5acf05a7cb37c7076019… --- diff --git a/ChangeLog b/ChangeLog index a6fe8c22523..1e38365cf3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,25 @@ ===================== Changes Since Version 5.7.0 =========================== +commit 1fa3ba8ee48b6a68f2133544da56e0d68eae8609 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Mar 7 12:29:02 2024 +0100 + + Makefile.defs: version set to 5.8.0 + + - first in the new 5.8.x series + +commit e6b67b13a75a49d9269c53443de7233888c0df00 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Mar 7 12:23:09 2024 +0100 + + pkg/kamailio: version set 5.8.0 for rpms and alpine + +commit 50a0f82eab0a1f9dc5738f022231eba349a46a3a +Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> +Date: Thu Mar 7 11:41:19 2024 +0100 + + pkg/kamailio/deb: version set 5.8.0 [skip ci] commit ed99a5e2648c39e29fbbc7842c86425147c607c6 Author: Kamailio Dev <kamailio.dev(a)kamailio.org>

1 0

git:5.8:1fa3ba8e: Makefile.defs: version set to 5.8.0
by Daniel-Constantin Mierla 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.8 Commit: 1fa3ba8ee48b6a68f2133544da56e0d68eae8609 URL: https://github.com/kamailio/kamailio/commit/1fa3ba8ee48b6a68f2133544da56e0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-07T12:29:02+01:00 Makefile.defs: version set to 5.8.0 - first in the new 5.8.x series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1fa3ba8ee48b6a68f2133544da56e0d… Patch: https://github.com/kamailio/kamailio/commit/1fa3ba8ee48b6a68f2133544da56e0d… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 62f1dd78273..f5e8b0da653 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 8 SUBLEVEL = 0 -EXTRAVERSION = -rc0 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:5.8:e6b67b13: pkg/kamailio: version set 5.8.0 for rpms and alpine
by Daniel-Constantin Mierla 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.8 Commit: e6b67b13a75a49d9269c53443de7233888c0df00 URL: https://github.com/kamailio/kamailio/commit/e6b67b13a75a49d9269c53443de7233… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-07T12:23:09+01:00 pkg/kamailio: version set 5.8.0 for rpms and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/e6b67b13a75a49d9269c53443de7233… Patch: https://github.com/kamailio/kamailio/commit/e6b67b13a75a49d9269c53443de7233… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 0696216564a..eaa70ccd5ff 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.8.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 13d6fb20ffd..74df5cb4066 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.8.0 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.8:50a0f82e: pkg/kamailio/deb: version set 5.8.0 [skip ci]
by Victor Seva 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.8 Commit: 50a0f82eab0a1f9dc5738f022231eba349a46a3a URL: https://github.com/kamailio/kamailio/commit/50a0f82eab0a1f9dc5738f022231eba… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-07T11:42:06+01:00 pkg/kamailio/deb: version set 5.8.0 [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/jammy/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/50a0f82eab0a1f9dc5738f022231eba… Patch: https://github.com/kamailio/kamailio/commit/50a0f82eab0a1f9dc5738f022231eba…

1 0

git:5.8:dc289e49: ChangeLog: added content from 5.8.0 developent
by Daniel-Constantin Mierla 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.8 Commit: dc289e492fab13e717c26495cfa2a3d0103658d3 URL: https://github.com/kamailio/kamailio/commit/dc289e492fab13e717c26495cfa2a3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-07T10:36:38+01:00 ChangeLog: added content from 5.8.0 developent --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/dc289e492fab13e717c26495cfa2a3d… Patch: https://github.com/kamailio/kamailio/commit/dc289e492fab13e717c26495cfa2a3d…

1 0

git:5.7:3eb54577: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 Mar '24

07 Mar '24

Module: kamailio Branch: 5.7 Commit: 3eb545779876265f4587ff8ff627530b70c761dc URL: https://github.com/kamailio/kamailio/commit/3eb545779876265f4587ff8ff627530… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-07T10:17:45+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_mysql/README --- Diff: https://github.com/kamailio/kamailio/commit/3eb545779876265f4587ff8ff627530… Patch: https://github.com/kamailio/kamailio/commit/3eb545779876265f4587ff8ff627530… --- diff --git a/src/modules/db_mysql/README b/src/modules/db_mysql/README index 8d9f526cbe1..b1ae13eca1b 100644 --- a/src/modules/db_mysql/README +++ b/src/modules/db_mysql/README @@ -32,6 +32,7 @@ Daniel-Constantin Mierla 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) 3.7. opt_ssl_mode (integer) + 3.8. opt_ssl_ca (string) 4. Functions 5. Installation @@ -46,9 +47,10 @@ Daniel-Constantin Mierla 1.5. Set insert_delayed parameter 1.6. Set update_affected_found parameter 1.7. Set opt_ssl_mode parameter - 1.8. Set a my.cnf group in db_url parameter - 1.9. Adding a kamailio group to my.cnf - 1.10. Using [client] and specific group + 1.8. Set opt_ssl_ca parameter + 1.9. Set a my.cnf group in db_url parameter + 1.10. Adding a kamailio group to my.cnf + 1.11. Using [client] and specific group Chapter 1. Admin Guide @@ -69,6 +71,7 @@ Chapter 1. Admin Guide 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) 3.7. opt_ssl_mode (integer) + 3.8. opt_ssl_ca (string) 4. Functions 5. Installation @@ -105,6 +108,7 @@ Chapter 1. Admin Guide 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) 3.7. opt_ssl_mode (integer) + 3.8. opt_ssl_ca (string) 3.1. ping_interval (integer) @@ -209,6 +213,21 @@ modparam("db_mysql", "update_affected_found", 1) modparam("db_mysql", "opt_ssl_mode", 1) ... +3.8. opt_ssl_ca (string) + + Configures the CA certs used to verify the MySQL server cert when SSL + is enabled. + + Required when opt_ssl_mode = 4 or 5 and db_mysql is built with + libmysqlclient. + + Default value is NULL (NULL - not configured). + + Example 1.8. Set opt_ssl_ca parameter +... +modparam("db_mysql", "opt_ssl_ca", "/etc/ssl/certs/mysql-ca.pem") +... + 4. Functions No function exported to be used from configuration file. @@ -235,12 +254,12 @@ modparam("db_mysql", "opt_ssl_mode", 1) * mysql://user:pass@[group]/db * mysql://[group]/db - Example 1.8. Set a my.cnf group in db_url parameter + Example 1.9. Set a my.cnf group in db_url parameter ... modparam("usrloc", "db_url", "mysql://[kamailio]/kamailio) ... - Example 1.9. Adding a kamailio group to my.cnf + Example 1.10. Adding a kamailio group to my.cnf ... [kamailio] socket = /path/to/mysql.sock @@ -254,7 +273,7 @@ default-character-set = utf8 both your specific group and the client group, then the value is taken from the last one. - Example 1.10. Using [client] and specific group + Example 1.11. Using [client] and specific group ... [client] socket = /run/mysql/mysqld.sock

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024