sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
301 discussions

Branch 6.0 has been created
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Hello, the branch 6.0 has been created, to be used for releasing v6.0.x series. To check out this branch, the following commands can be used: git clone https://github.com/kamailio/kamailio kamailio-6.0 cd kamailio-6.0 git checkout -b 6.0 origin/6.0 Pushing commits in this branch: git push origin 6.0:6.0 Note that 6.0 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 6.0 branch: git cherry-pick -x COMMITID In few weeks, the first release from branch 6.0 will be out, respectively Kamailio v6.0.0. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

1 0

git:6.0:fc3412ed: Makefile.defs: version set to 6.0.0-rc0
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 6.0 Commit: fc3412ed108a9264a28ed1afc41ee5b0fef7a825 URL: https://github.com/kamailio/kamailio/commit/fc3412ed108a9264a28ed1afc41ee5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T20:36:33+01:00 Makefile.defs: version set to 6.0.0-rc0 - version set also in CMakeLists.txt - branch 6.0 created for release series 6.0.x --- Modified: CMakeLists.txt Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/fc3412ed108a9264a28ed1afc41ee5b… Patch: https://github.com/kamailio/kamailio/commit/fc3412ed108a9264a28ed1afc41ee5b… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 074b855959d..67fdbf351cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ project( HOMEPAGE_URL "https://www.kamailio.org") # Set the version number -set(EXTRAVERSION "-pre1") +set(EXTRAVERSION "-rc0") set(RELEASE "${PROJECT_VERSION}${EXTRAVERSION}") message(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}") diff --git a/src/Makefile.defs b/src/Makefile.defs index cc6635bc9fe..5946eb600fa 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 6 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -rc0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:ec5c1907: Makefile.defs: version set to 6.1.0-dev0
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: master Commit: ec5c1907c21ca8a479eed330cc3be9900f98f95a URL: https://github.com/kamailio/kamailio/commit/ec5c1907c21ca8a479eed330cc3be99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T20:34:15+01:00 Makefile.defs: version set to 6.1.0-dev0 - version set also in CMakeLists.txt - master branch is now open for development of the future release series 6.1.x --- Modified: CMakeLists.txt Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ec5c1907c21ca8a479eed330cc3be99… Patch: https://github.com/kamailio/kamailio/commit/ec5c1907c21ca8a479eed330cc3be99… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 074b855959d..24d2510b725 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,12 +5,12 @@ cmake_minimum_required(VERSION 3.10) # Set the project name project( kamailio - VERSION 6.0.0 + VERSION 6.1.0 DESCRIPTION "Kamailio SIP Server" HOMEPAGE_URL "https://www.kamailio.org") # Set the version number -set(EXTRAVERSION "-pre1") +set(EXTRAVERSION "-dev0") set(RELEASE "${PROJECT_VERSION}${EXTRAVERSION}") message(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}") diff --git a/src/Makefile.defs b/src/Makefile.defs index cc6635bc9fe..7656029123e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 6 -PATCHLEVEL = 0 +PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:1fc08485: Makefile.defs/CMakeLists.txt: version set to 6.0.0-pre1
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: master Commit: 1fc084851c75ae5b1d3957c25c99c5c76a7e3125 URL: https://github.com/kamailio/kamailio/commit/1fc084851c75ae5b1d3957c25c99c5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T20:28:37+01:00 Makefile.defs/CMakeLists.txt: version set to 6.0.0-pre1 --- Modified: CMakeLists.txt Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1fc084851c75ae5b1d3957c25c99c5c… Patch: https://github.com/kamailio/kamailio/commit/1fc084851c75ae5b1d3957c25c99c5c… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 833e95db6d4..074b855959d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ project( HOMEPAGE_URL "https://www.kamailio.org") # Set the version number -set(EXTRAVERSION "-pre0") +set(EXTRAVERSION "-pre1") set(RELEASE "${PROJECT_VERSION}${EXTRAVERSION}") message(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}") diff --git a/src/Makefile.defs b/src/Makefile.defs index e411a2c1b2c..cc6635bc9fe 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 6 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:b3605a63: README: updated the version
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: master Commit: b3605a63b503d2579cef3f6feb43fbf768de9d21 URL: https://github.com/kamailio/kamailio/commit/b3605a63b503d2579cef3f6feb43fbf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T16:29:16+01:00 README: updated the version --- Modified: README --- Diff: https://github.com/kamailio/kamailio/commit/b3605a63b503d2579cef3f6feb43fbf… Patch: https://github.com/kamailio/kamailio/commit/b3605a63b503d2579cef3f6feb43fbf… --- diff --git a/README b/README index d6c537dac44..26ceba852a1 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ -Kamailio v5.8 +Kamailio v6.0 ============= https://www.kamailio.org

1 0

git:master:874183da: cmake/phonenum: Remove find_package as it's broken for newer distributions
by Xenofon Karamanos 22 Jan '25

22 Jan '25

Module: kamailio Branch: master Commit: 874183da2a6000f5f8e755e19338b74757e09bf0 URL: https://github.com/kamailio/kamailio/commit/874183da2a6000f5f8e755e19338b74… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-22T14:54:28Z cmake/phonenum: Remove find_package as it's broken for newer distributions - Search for the library manually --- Modified: src/modules/phonenum/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/874183da2a6000f5f8e755e19338b74… Patch: https://github.com/kamailio/kamailio/commit/874183da2a6000f5f8e755e19338b74… --- diff --git a/src/modules/phonenum/CMakeLists.txt b/src/modules/phonenum/CMakeLists.txt index de2c23984fb..1003c5115b3 100644 --- a/src/modules/phonenum/CMakeLists.txt +++ b/src/modules/phonenum/CMakeLists.txt @@ -3,14 +3,14 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) # TODO: Support for find_package added after version 8.13.4 -find_package(libphonenumber CONFIG QUIET) +# TODO: Debian and Ubuntu are missing static installation of libphonenumber +# and find_package() does not work for them. +# find_package(libphonenumber CONFIG QUIET) if(libphonenumber_FOUND) - # message(STATUS "Found libphonenumber: ${libphonenumber_INCLUDE_DIRS}") + message(STATUS "Found libphonenumber: ${libphonenumber_INCLUDE_DIRS}") + message(STATUS "Found libphonenumber: ${libphonenumber_LIBRARY}") else() - message( - STATUS - "libphonenumber not found with find_package()... looking with other methods" - ) + message(STATUS "Looking for libphonenumber...") # add additional logic here to handle the missing dependency TODO: Fix lint # issue find_library(libphonenumber_LIBRARY NAMES phonenumber)

1 0

git:5.8:6fd7fd2a: core: reworked how rport, received and extra params are added to first via of generated replies
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 6fd7fd2acf7d76e4e8ba7669c170dc837a84848d URL: https://github.com/kamailio/kamailio/commit/6fd7fd2acf7d76e4e8ba7669c170dc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:49:47+01:00 core: reworked how rport, received and extra params are added to first via of generated replies (cherry picked from commit d613f30214782d47ed0aab8bf2fb55329d87862a) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/6fd7fd2acf7d76e4e8ba7669c170dc8… Patch: https://github.com/kamailio/kamailio/commit/6fd7fd2acf7d76e4e8ba7669c170dc8… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f7590dc5161..e775c0c3f00 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2647,57 +2647,50 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, if(unlikely(httpreq)) pvia = p; if(hdr == msg->h_via1) { - if(rport_buf) { - if(msg->via1->rport) { /* delete the old one */ - /* copy until rport */ - append_str_trans(p, hdr->name.s, - msg->via1->rport->start - hdr->name.s - 1, - msg); - /* copy new rport */ - append_str(p, rport_buf, rport_len); - /* copy the rest of the via */ - append_str_trans(p, - msg->via1->rport->start - + msg->via1->rport->size, - hdr->body.s + hdr->body.len - - msg->via1->rport->start - - msg->via1->rport->size, - msg); - } else if(msg->via1->branch) { /* add after branch */ - /* copy until after branch */ - append_str_trans(p, hdr->name.s, - msg->via1->branch->start - hdr->name.s - + msg->via1->branch->size, - msg); - /* copy new rport */ - append_str(p, rport_buf, rport_len); - /* copy the rest of the via */ - append_str_trans(p, - msg->via1->branch->start - + msg->via1->branch->size, - hdr->body.s + hdr->body.len - - msg->via1->branch->start - - msg->via1->branch->size, - msg); - } else { /* just append the new one */ - /* normal whole via copy */ - append_str_trans(p, hdr->name.s, - (hdr->body.s + hdr->body.len) - hdr->name.s, - msg); - append_str(p, rport_buf, rport_len); - } - } else { - /* normal whole via copy */ + if(rport_buf && msg->via1->rport) { /* replace old rport */ + /* copy until rport */ + append_str_trans(p, hdr->name.s, + msg->via1->rport->start - hdr->name.s - 1, msg); + } else if(msg->via1->branch) { /* add after branch */ + append_str_trans(p, hdr->name.s, + msg->via1->branch->start - hdr->name.s + + msg->via1->branch->size, + msg); + } else { /* append after header */ append_str_trans(p, hdr->name.s, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } + if(rport_buf) { + /* add rport */ + append_str(p, rport_buf, rport_len); + } if(received_buf) { + /* add received */ append_str(p, received_buf, received_len); } if(xparams.len > 0) { + /* add extra parameters */ append_str(p, xparams.s, xparams.len); } + /* copy the rest of the via */ + if(rport_buf && msg->via1->rport) { + append_str_trans(p, + msg->via1->rport->start + + msg->via1->rport->size, + hdr->body.s + hdr->body.len + - msg->via1->rport->start + - msg->via1->rport->size, + msg); + } else if(msg->via1->branch) { + append_str_trans(p, + msg->via1->branch->start + + msg->via1->branch->size, + hdr->body.s + hdr->body.len + - msg->via1->branch->start + - msg->via1->branch->size, + msg); + } } else { /* normal whole via copy */ append_str_trans(p, hdr->name.s,

1 0

git:5.8:8eff8116: core: add extra params to first via only for generated replies
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 8eff811614b72fbf80af6d546d65c65e6b59c1a5 URL: https://github.com/kamailio/kamailio/commit/8eff811614b72fbf80af6d546d65c65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:49:34+01:00 core: add extra params to first via only for generated replies (cherry picked from commit 9045c8d537b8960a18451f870effe2255cb4861d) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/8eff811614b72fbf80af6d546d65c65… Patch: https://github.com/kamailio/kamailio/commit/8eff811614b72fbf80af6d546d65c65… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 262ba07a23a..f7590dc5161 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2692,16 +2692,17 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } - if(received_buf) + if(received_buf) { append_str(p, received_buf, received_len); + } + if(xparams.len > 0) { + append_str(p, xparams.s, xparams.len); + } } else { /* normal whole via copy */ append_str_trans(p, hdr->name.s, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } - if(xparams.len > 0) { - append_str(p, xparams.s, xparams.len); - } append_str(p, CRLF, CRLF_LEN); /* if is HTTP, replace Via with Sia * - HTTP Via format is different than SIP Via

1 0

git:5.8:b6360f4d: core: add rport to generated replies after first via branch when no incoming rport
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: b6360f4d8549c18efad507bc37ef599d9e3316d7 URL: https://github.com/kamailio/kamailio/commit/b6360f4d8549c18efad507bc37ef599… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:49:25+01:00 core: add rport to generated replies after first via branch when no incoming rport (cherry picked from commit 09d1ba87f4d37c3e13153229c63698f09ca195bc) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/b6360f4d8549c18efad507bc37ef599… Patch: https://github.com/kamailio/kamailio/commit/b6360f4d8549c18efad507bc37ef599… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 4e81f89cedb..262ba07a23a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2663,6 +2663,22 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, - msg->via1->rport->start - msg->via1->rport->size, msg); + } else if(msg->via1->branch) { /* add after branch */ + /* copy until after branch */ + append_str_trans(p, hdr->name.s, + msg->via1->branch->start - hdr->name.s + + msg->via1->branch->size, + msg); + /* copy new rport */ + append_str(p, rport_buf, rport_len); + /* copy the rest of the via */ + append_str_trans(p, + msg->via1->branch->start + + msg->via1->branch->size, + hdr->body.s + hdr->body.len + - msg->via1->branch->start + - msg->via1->branch->size, + msg); } else { /* just append the new one */ /* normal whole via copy */ append_str_trans(p, hdr->name.s,

1 0

git:5.8:132e5324: etc/kamailio.org: do record route for REFER
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 132e5324bf9f794ea82df0f12ef094f6c12ee178 URL: https://github.com/kamailio/kamailio/commit/132e5324bf9f794ea82df0f12ef094f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:49:13+01:00 etc/kamailio.org: do record route for REFER - it creates a subscription dialog - https://datatracker.ietf.org/doc/html/rfc3515#section-2 (cherry picked from commit cfc9d69435b4bbc53dbe6748e0d22603760c48fd) --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/132e5324bf9f794ea82df0f12ef094f… Patch: https://github.com/kamailio/kamailio/commit/132e5324bf9f794ea82df0f12ef094f… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 3f9a5fe793f..d0a3d2754dc 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -561,7 +561,7 @@ request_route { # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); - if (is_method("INVITE|SUBSCRIBE")) { + if (is_method("INVITE|SUBSCRIBE|REFER")) { record_route(); } @@ -678,8 +678,8 @@ route[WITHINDLG] { } else if ( is_method("ACK") ) { # ACK is forwarded statelessly route(NATMANAGE); - } else if ( is_method("NOTIFY") ) { - # Add Record-Route for in-dialog NOTIFY as per RFC 6665. + } else if ( is_method("NOTIFY|REFER") ) { + # Add Record-Route for in-dialog NOTIFY and REFER (RFC6665, RFC3515) record_route(); } route(RELAY);

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2025