sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
294 discussions

git:6.0:8d482b1a: pua: added breaks to event type matching switch
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 8d482b1a4a01dca834928795b0e789ae135b8224 URL: https://github.com/kamailio/kamailio/commit/8d482b1a4a01dca834928795b0e789a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T11:43:53+01:00 pua: added breaks to event type matching switch (cherry picked from commit a2ae4fe607125a05debeb40c0ecf1ce05d69ff5f) --- Modified: src/modules/pua/hash.h --- Diff: https://github.com/kamailio/kamailio/commit/8d482b1a4a01dca834928795b0e789a… Patch: https://github.com/kamailio/kamailio/commit/8d482b1a4a01dca834928795b0e789a… --- diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h index 36f0335cc79..ae19357fe17 100644 --- a/src/modules/pua/hash.h +++ b/src/modules/pua/hash.h @@ -178,9 +178,11 @@ static inline int get_event_flag(str *event) case 15: if(strncmp(event->s, "message-summary", 15) == 0) return MSGSUM_EVENT; + break; case 16: if(strncmp(event->s, "as-feature-event", 16) == 0) return DFKS_EVENT; + break; } LM_ERR("Unknown event string\n");

1 0

git:6.0:f540d97e: ims_qos_npn: small docs updates
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: f540d97e3f0be21cb6abc61ac701c8fd437b4371 URL: https://github.com/kamailio/kamailio/commit/f540d97e3f0be21cb6abc61ac701c8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T11:34:17+01:00 ims_qos_npn: small docs updates (cherry picked from commit dcdcee0d9f2326e079f905632af9db3b898330ab) --- Modified: src/modules/ims_qos_npn/doc/ims_qos_npn.xml Modified: src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f540d97e3f0be21cb6abc61ac701c8f… Patch: https://github.com/kamailio/kamailio/commit/f540d97e3f0be21cb6abc61ac701c8f… --- diff --git a/src/modules/ims_qos_npn/doc/ims_qos_npn.xml b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml index 0cd99dcd0c7..fa9d03eb003 100644 --- a/src/modules/ims_qos_npn/doc/ims_qos_npn.xml +++ b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml @@ -7,7 +7,7 @@ ]> <book> <bookinfo> - <title>The IMS QoS Module - Neat Path Networks "branch"</title> + <title>The IMS QoS NPN Module</title> <authorgroup> <author> diff --git a/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml index dfb6ea9ed15..70459b65801 100644 --- a/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml +++ b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml @@ -16,7 +16,7 @@ charging control functions performed by an Application Function (e.g. P-CSCF) over the Rx interface. This module is dependent on the CDP (C Diameter Peer) modules for communicating with PCRF as specified in 3GPP - specification TS 29.214.</para> + specification TS 29.214. It is an enhaced variant of ims_qos.</para> </section> <section> @@ -548,7 +548,7 @@ modparam("ims_qos", "dialog_direction", 1) If set to 1 it will trust the bottom Via as the UE IP/port/transport when doing client identification. </para> <para> - Normally, the UE identification should be done on IPsec SPIs and source IP/port of the packets. + Normally, the UE identification should be done on IPsec SPIs and source IP/port of the packets. In some cases the ims_* modules trust the top Via on requests and the bottom Via on responses. In some (better) cases this trusts the received-from IP (or the alias in the Contact header). </para> @@ -707,7 +707,7 @@ modparam("ims_qos", "af_signaling_port_ps", "5063") <para><emphasis>Note:</emphasis> this is executed asynchronously. See example on how to retrieve return value</para> - <para><emphasis>Note:</emphasis> this authorization session triggers + <para><emphasis>Note:</emphasis> this authorization session triggers event_route[qos:asr_registration], event_route[qos:rar_access_network] and event_route[qos:terminate_dialog].</para> <example> @@ -785,7 +785,7 @@ route[REGISTER_AAR_REPLY] <para><emphasis>Note:</emphasis> this is executed asynchronously. See example on how to retrieve return value</para> - <para><emphasis>Note:</emphasis> this authorization session triggers + <para><emphasis>Note:</emphasis> this authorization session triggers event_route[qos:asr_call], event_route[qos:rar_access_network] and event_route[qos:terminate_dialog].</para>

1 0

git:master:a2ae4fe6: pua: added breaks to event type matching switch
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: a2ae4fe607125a05debeb40c0ecf1ce05d69ff5f URL: https://github.com/kamailio/kamailio/commit/a2ae4fe607125a05debeb40c0ecf1ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T11:42:49+01:00 pua: added breaks to event type matching switch --- Modified: src/modules/pua/hash.h --- Diff: https://github.com/kamailio/kamailio/commit/a2ae4fe607125a05debeb40c0ecf1ce… Patch: https://github.com/kamailio/kamailio/commit/a2ae4fe607125a05debeb40c0ecf1ce… --- diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h index 36f0335cc79..ae19357fe17 100644 --- a/src/modules/pua/hash.h +++ b/src/modules/pua/hash.h @@ -178,9 +178,11 @@ static inline int get_event_flag(str *event) case 15: if(strncmp(event->s, "message-summary", 15) == 0) return MSGSUM_EVENT; + break; case 16: if(strncmp(event->s, "as-feature-event", 16) == 0) return DFKS_EVENT; + break; } LM_ERR("Unknown event string\n");

1 0

git:master:dcdcee0d: ims_qos_npn: small docs updates
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: dcdcee0d9f2326e079f905632af9db3b898330ab URL: https://github.com/kamailio/kamailio/commit/dcdcee0d9f2326e079f905632af9db3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T11:34:01+01:00 ims_qos_npn: small docs updates --- Modified: src/modules/ims_qos_npn/doc/ims_qos_npn.xml Modified: src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dcdcee0d9f2326e079f905632af9db3… Patch: https://github.com/kamailio/kamailio/commit/dcdcee0d9f2326e079f905632af9db3… --- diff --git a/src/modules/ims_qos_npn/doc/ims_qos_npn.xml b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml index 0cd99dcd0c7..fa9d03eb003 100644 --- a/src/modules/ims_qos_npn/doc/ims_qos_npn.xml +++ b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml @@ -7,7 +7,7 @@ ]> <book> <bookinfo> - <title>The IMS QoS Module - Neat Path Networks "branch"</title> + <title>The IMS QoS NPN Module</title> <authorgroup> <author> diff --git a/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml index dfb6ea9ed15..70459b65801 100644 --- a/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml +++ b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml @@ -16,7 +16,7 @@ charging control functions performed by an Application Function (e.g. P-CSCF) over the Rx interface. This module is dependent on the CDP (C Diameter Peer) modules for communicating with PCRF as specified in 3GPP - specification TS 29.214.</para> + specification TS 29.214. It is an enhaced variant of ims_qos.</para> </section> <section> @@ -548,7 +548,7 @@ modparam("ims_qos", "dialog_direction", 1) If set to 1 it will trust the bottom Via as the UE IP/port/transport when doing client identification. </para> <para> - Normally, the UE identification should be done on IPsec SPIs and source IP/port of the packets. + Normally, the UE identification should be done on IPsec SPIs and source IP/port of the packets. In some cases the ims_* modules trust the top Via on requests and the bottom Via on responses. In some (better) cases this trusts the received-from IP (or the alias in the Contact header). </para> @@ -707,7 +707,7 @@ modparam("ims_qos", "af_signaling_port_ps", "5063") <para><emphasis>Note:</emphasis> this is executed asynchronously. See example on how to retrieve return value</para> - <para><emphasis>Note:</emphasis> this authorization session triggers + <para><emphasis>Note:</emphasis> this authorization session triggers event_route[qos:asr_registration], event_route[qos:rar_access_network] and event_route[qos:terminate_dialog].</para> <example> @@ -785,7 +785,7 @@ route[REGISTER_AAR_REPLY] <para><emphasis>Note:</emphasis> this is executed asynchronously. See example on how to retrieve return value</para> - <para><emphasis>Note:</emphasis> this authorization session triggers + <para><emphasis>Note:</emphasis> this authorization session triggers event_route[qos:asr_call], event_route[qos:rar_access_network] and event_route[qos:terminate_dialog].</para>

1 0

git:6.0:1efa1332: cmake: Use pkg-config instead for json-c dev package.
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 1efa133244bbca0c9c35b76f936cce2b0a5864d3 URL: https://github.com/kamailio/kamailio/commit/1efa133244bbca0c9c35b76f936cce2… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:28:40Z cmake: Use pkg-config instead for json-c dev package. (cherry picked from commit 8ebae54cff261b95fcece3be3719da511cc35084) --- Modified: src/modules/nsq/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/1efa133244bbca0c9c35b76f936cce2… Patch: https://github.com/kamailio/kamailio/commit/1efa133244bbca0c9c35b76f936cce2… --- diff --git a/src/modules/nsq/CMakeLists.txt b/src/modules/nsq/CMakeLists.txt index b4a482c2a47..e6acfa9a2f7 100644 --- a/src/modules/nsq/CMakeLists.txt +++ b/src/modules/nsq/CMakeLists.txt @@ -4,13 +4,19 @@ add_library(${module_name} SHARED ${MODULE_SOURCES}) find_package(Libev REQUIRED) -find_package(json-c QUIET) -if(NOT json-c_FOUND) - message(STATUS "json-c not found. looking with pkg-config") - find_package(PkgConfig REQUIRED) - pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) - add_library(json-c::json-c ALIAS PkgConfig::json-c) -endif() +# TODO: When we have a proper cmake config file for json-c for most OS, we can +# use that instead of pkg-config. +# json-c v 0.14 and 0.15 have wrong include directories in their cmake config +# files. uncomment the following line when we have a proper cmake config file +# for json-c for most OS. +# find_package(json-c 0.16 CONFIG) + +# if(NOT json-c_FOUND) +# message(STATUS "json-c not found. looking with pkg-config") +find_package(PkgConfig REQUIRED) +pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) +add_library(json-c::json-c ALIAS PkgConfig::json-c) +# endif() find_package(CURL REQUIRED)

1 0

git:6.0:2496ccd1: cmake: Use pkg-config instead for json-c dev package.
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 2496ccd1d1878e275a8797a286de6edc4aff4805 URL: https://github.com/kamailio/kamailio/commit/2496ccd1d1878e275a8797a286de6ed… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:28:26Z cmake: Use pkg-config instead for json-c dev package. (cherry picked from commit e7f9531adc6f319b6889d5644eb55a9cccfdd27d) --- Modified: src/modules/json/CMakeLists.txt Modified: src/modules/jsonrpcc/CMakeLists.txt Modified: src/modules/kazoo/CMakeLists.txt Modified: src/modules/pua_json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/2496ccd1d1878e275a8797a286de6ed… Patch: https://github.com/kamailio/kamailio/commit/2496ccd1d1878e275a8797a286de6ed…

1 0

git:6.0:d0360fbb: cmake/json: Remove find_package call. Use pkg-config instead.
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: d0360fbb8e622c786f3d8791b67f06d1eb6e0ae4 URL: https://github.com/kamailio/kamailio/commit/d0360fbb8e622c786f3d8791b67f06d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:28:03Z cmake/json: Remove find_package call. Use pkg-config instead. (cherry picked from commit 99d36df0a15bbb960b2d7ee5916d65a55b9b26cd) --- Modified: src/modules/json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/d0360fbb8e622c786f3d8791b67f06d… Patch: https://github.com/kamailio/kamailio/commit/d0360fbb8e622c786f3d8791b67f06d… --- diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt index 72df4d390f5..5d791dbd03d 100644 --- a/src/modules/json/CMakeLists.txt +++ b/src/modules/json/CMakeLists.txt @@ -2,13 +2,18 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(json-c CONFIG) - -if(NOT json-c_FOUND) - message(STATUS "json-c not found. looking with pkg-config") - find_package(PkgConfig REQUIRED) - pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) - add_library(json-c::json-c ALIAS PkgConfig::json-c) -endif() +# TODO: When we have a proper cmake config file for json-c for most OS, we can +# use that instead of pkg-config. +# json-c v 0.14 and 0.15 have wrong include directories in their cmake config +# files. uncomment the following line when we have a proper cmake config file +# for json-c for most OS. +# find_package(json-c 0.16 CONFIG) + +# if(NOT json-c_FOUND) +message(STATUS "json-c not found. looking with pkg-config") +find_package(PkgConfig REQUIRED) +pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) +add_library(json-c::json-c ALIAS PkgConfig::json-c) +# endif() target_link_libraries(${module_name} PRIVATE json-c::json-c)

1 0

git:6.0:f08adc56: cmake/json: Use CONFIG mode
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: f08adc567b19721b1bf515a2b1595fed28152177 URL: https://github.com/kamailio/kamailio/commit/f08adc567b19721b1bf515a2b1595fe… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:27:05Z cmake/json: Use CONFIG mode (cherry picked from commit 532744eebf1014939c4ccd9a6aa4e7d6fbb454ac) --- Modified: src/modules/json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/f08adc567b19721b1bf515a2b1595fe… Patch: https://github.com/kamailio/kamailio/commit/f08adc567b19721b1bf515a2b1595fe… --- diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt index c4cbf81440c..72df4d390f5 100644 --- a/src/modules/json/CMakeLists.txt +++ b/src/modules/json/CMakeLists.txt @@ -2,7 +2,8 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(json-c QUIET) +find_package(json-c CONFIG) + if(NOT json-c_FOUND) message(STATUS "json-c not found. looking with pkg-config") find_package(PkgConfig REQUIRED)

1 0

git:6.0:5da84593: cmake: fix CPL definition
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 5da8459301f0a9d74b9c9b0f8e6e5890c194a8c2 URL: https://github.com/kamailio/kamailio/commit/5da8459301f0a9d74b9c9b0f8e6e589… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:21:36Z cmake: fix CPL definition (cherry picked from commit feb371852ea9b53a1dd95fec0db0943c5fb160ad) --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/5da8459301f0a9d74b9c9b0f8e6e589… Patch: https://github.com/kamailio/kamailio/commit/5da8459301f0a9d74b9c9b0f8e6e589… --- diff --git a/cmake/groups.cmake b/cmake/groups.cmake index 9cd7ddf77dc..73ef6d632dd 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -167,7 +167,7 @@ set(MOD_LIST_POSTGRES db_postgres) set(MOD_LIST_UNIXODBC db_unixodbc) # * modules depending on xml2 library -set(MOD_LIST_CPLC cplc) +set(MOD_LIST_CPL cplc) # * modules depending on xml2 library set(MOD_LIST_XMLDEPS xhttp_pi xmlrpc xmlops) @@ -385,7 +385,7 @@ set(MOD_LIST_ALL ${MOD_LIST_UNIXODBC} ${MOD_LIST_XMLDEPS} ${MOD_LIST_PERLDEPS} - ${MOD_LIST_CPLC} + ${MOD_LIST_CPL} ${MOD_LIST_XMPP} ${MOD_LIST_BERKELEY} ${MOD_LIST_UTILS}

1 0

git:6.0:7a174649: cmake/perl: Install files / Add perl user link and def options
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 7a17464946f8027e9d66497a44357d7f0eac64a2 URL: https://github.com/kamailio/kamailio/commit/7a17464946f8027e9d66497a44357d7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:21:26Z cmake/perl: Install files / Add perl user link and def options - Fix perl extra_c_flags parsing by using SHELL: - Add user option PERL_LDOPTS to define extra ldopts - Add user option PERL_CCOPTS to define extra defs - Add new generated file to compilation - Add new target for sgml docs - Add install directives for perl libraries (cherry picked from commit f4d7e298bb351be5f12652083bd5e37109748169) --- Modified: src/modules/app_perl/CMakeLists.txt Modified: src/modules/db_perlvdb/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/7a17464946f8027e9d66497a44357d7… Patch: https://github.com/kamailio/kamailio/commit/7a17464946f8027e9d66497a44357d7…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
30
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