- sr-dev - kamailio.org

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

git:6.0:3adaab6c: cmake: Install snmpstats files
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 3adaab6c56657bc73cd83e0b7bbcd158efb070c1 URL: https://github.com/kamailio/kamailio/commit/3adaab6c56657bc73cd83e0b7bbcd15… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:21:15Z cmake: Install snmpstats files (cherry picked from commit f69b22ce3cdc2c06739c11f19c9ebeb5eb1727f3) --- Modified: src/modules/snmpstats/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/3adaab6c56657bc73cd83e0b7bbcd15… Patch: https://github.com/kamailio/kamailio/commit/3adaab6c56657bc73cd83e0b7bbcd15… --- diff --git a/src/modules/snmpstats/CMakeLists.txt b/src/modules/snmpstats/CMakeLists.txt index fa3980030db..ac416979da7 100644 --- a/src/modules/snmpstats/CMakeLists.txt +++ b/src/modules/snmpstats/CMakeLists.txt @@ -7,3 +7,8 @@ find_package(NETSNMP REQUIRED) # TODO: Compiles fine but need to do some more verifcation target_link_libraries(${module_name} PRIVATE NETSNMP::NETSNMP) + +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mibs + DESTINATION ${CMAKE_INSTALL_DATADIR}/snmp/ + OPTIONAL)

1 0

git:6.0:e4e66928: cmake: Fix naming to be clear we want the CLIENT version
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: e4e669286264cc7e7ce6aab92c68a486311de708 URL: https://github.com/kamailio/kamailio/commit/e4e669286264cc7e7ce6aab92c68a48… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:21:04Z cmake: Fix naming to be clear we want the CLIENT version (cherry picked from commit 640bd4fb7529ad8b0a9415775679dca5e64c52be) --- Added: cmake/modules/FindLibfreeradiusClient.cmake Modified: cmake/modules/FindRadius.cmake Removed: cmake/modules/FindLibfreeradius.cmake --- Diff: https://github.com/kamailio/kamailio/commit/e4e669286264cc7e7ce6aab92c68a48… Patch: https://github.com/kamailio/kamailio/commit/e4e669286264cc7e7ce6aab92c68a48…

1 0

git:6.0:5ce31280: cmake: Fix typo
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 5ce31280e1c4988408b4b77833947ae0cece4c83 URL: https://github.com/kamailio/kamailio/commit/5ce31280e1c4988408b4b77833947ae… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:20:56Z cmake: Fix typo (cherry picked from commit 8d1b60bc7f21fe9d0fadd1df926fee931966f34e) --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/5ce31280e1c4988408b4b77833947ae… Patch: https://github.com/kamailio/kamailio/commit/5ce31280e1c4988408b4b77833947ae… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index 10ef2cf9db8..ca8a4f20660 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -264,7 +264,7 @@ else() dbschema_${db_name} COMMAND ${CMAKE_COMMAND} -E make_directory "${db_name_folder}" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Creating scehmas for ${db_name}") + COMMENT "Creating schemas for ${db_name}") # Loop through each table and add a command for xsltproc foreach(table ${EXTRACTED_TABLES})

1 0

git:6.0:ff20204c: cmake/sctp: Search for libsctp and error if not found
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: ff20204c0163d56964036bdfba5d9325cd74c90e URL: https://github.com/kamailio/kamailio/commit/ff20204c0163d56964036bdfba5d932… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:20:22Z cmake/sctp: Search for libsctp and error if not found (cherry picked from commit 9b7719a61ab02c93939e3681cb90e9fa04f3ac5d) --- Modified: src/modules/sctp/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/ff20204c0163d56964036bdfba5d932… Patch: https://github.com/kamailio/kamailio/commit/ff20204c0163d56964036bdfba5d932… --- diff --git a/src/modules/sctp/CMakeLists.txt b/src/modules/sctp/CMakeLists.txt index 5d8cb523a49..22e51fd7c08 100644 --- a/src/modules/sctp/CMakeLists.txt +++ b/src/modules/sctp/CMakeLists.txt @@ -2,6 +2,23 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) +# TODO: find include file required +find_path( + SCTP_INCLUDE_DIR + NAMES sctp.h + PATHS /usr/include /usr/local/include /usr/include/netinet) + +if(NOT SCTP_INCLUDE_DIR) + message(FATAL_ERROR "sctp.h not found. maybe missing libsctp-dev?") +endif() + +target_include_directories(${module_name} PRIVATE ${SCTP_INCLUDE_DIR}) + +find_library( + SCTP_LIBRARY + NAMES sctp + PATHS /usr/lib /usr/local/lib) + if(UNIX) - target_link_libraries(${module_name} PRIVATE -lsctp) + target_link_libraries(${module_name} PRIVATE ${SCTP_LIBRARY}) endif()

1 0

git:6.0:aef5f6c4: cmake: Link with correct Erlang target
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: aef5f6c422981a36a1eac3d93079d8aa930c3810 URL: https://github.com/kamailio/kamailio/commit/aef5f6c422981a36a1eac3d93079d8a… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:20:12Z cmake: Link with correct Erlang target (cherry picked from commit 2dbd3d47cdbd55365fcb37b48a30c3224b8af810) --- Modified: src/modules/erlang/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/aef5f6c422981a36a1eac3d93079d8a… Patch: https://github.com/kamailio/kamailio/commit/aef5f6c422981a36a1eac3d93079d8a… --- diff --git a/src/modules/erlang/CMakeLists.txt b/src/modules/erlang/CMakeLists.txt index 16c4be64bfd..db92655b497 100644 --- a/src/modules/erlang/CMakeLists.txt +++ b/src/modules/erlang/CMakeLists.txt @@ -5,4 +5,6 @@ add_library(${module_name} SHARED ${MODULE_SOURCES}) # erlang-dev find_package(Erlang REQUIRED) -target_link_libraries(${module_name} PRIVATE Erlang::EI) +target_link_libraries(${module_name} PRIVATE Erlang::Erlang) +target_include_directories(${module_name} PRIVATE ${Erlang_INCLUDE_DIRS}) +target_compile_definitions(${module_name} PRIVATE _REENTRANT)

1 0

git:6.0:fa54a06f: cmake/Radius: Add libfreeradius support
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: fa54a06f165f7d6a0c49a8653f2ed71fe775dbc4 URL: https://github.com/kamailio/kamailio/commit/fa54a06f165f7d6a0c49a8653f2ed71… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:19:58Z cmake/Radius: Add libfreeradius support - Add libfreeradius.cmake to search for libfreeradius-client - Link modules with correct libraries paths - Fix description (cherry picked from commit 53bd567dd7444a8145aa876d82db2c6b579a7e19) --- Added: cmake/modules/FindLibfreeradius.cmake Modified: cmake/modules/FindRadius.cmake Modified: src/modules/acc_radius/CMakeLists.txt Modified: src/modules/auth_radius/CMakeLists.txt Modified: src/modules/misc_radius/CMakeLists.txt Modified: src/modules/peering/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/fa54a06f165f7d6a0c49a8653f2ed71… Patch: https://github.com/kamailio/kamailio/commit/fa54a06f165f7d6a0c49a8653f2ed71…

1 0

git:master:8ebae54c: cmake: Use pkg-config instead for json-c dev package.
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 8ebae54cff261b95fcece3be3719da511cc35084 URL: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-29T10:07:24Z cmake: Use pkg-config instead for json-c dev package. --- Modified: src/modules/nsq/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5… Patch: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5… --- 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:master:e7f9531a: cmake: Use pkg-config instead for json-c dev package.
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: e7f9531adc6f319b6889d5644eb55a9cccfdd27d URL: https://github.com/kamailio/kamailio/commit/e7f9531adc6f319b6889d5644eb55a9… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-29T10:03:55Z cmake: Use pkg-config instead for json-c dev package. --- 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/e7f9531adc6f319b6889d5644eb55a9… Patch: https://github.com/kamailio/kamailio/commit/e7f9531adc6f319b6889d5644eb55a9…

1 0

git:6.0:620eb2f0: kamctl: regenerated db creation files
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 620eb2f029c74006200d19dae1450e7735e3ec2e URL: https://github.com/kamailio/kamailio/commit/620eb2f029c74006200d19dae1450e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:34:25+01:00 kamctl: regenerated db creation files --- Modified: utils/kamctl/db_berkeley/kamailio/contact Modified: utils/kamctl/db_berkeley/kamailio/impu Modified: utils/kamctl/db_berkeley/kamailio/impu_contact Modified: utils/kamctl/db_berkeley/kamailio/impu_subscriber Modified: utils/kamctl/db_berkeley/kamailio/ro_session Modified: utils/kamctl/db_berkeley/kamailio/subscriber_scscf Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/ims_charging-create.sql Modified: utils/kamctl/db_sqlite/ims_usrloc_scscf-create.sql Modified: utils/kamctl/dbtext/kamailio/contact Modified: utils/kamctl/dbtext/kamailio/impu Modified: utils/kamctl/dbtext/kamailio/impu_contact Modified: utils/kamctl/dbtext/kamailio/impu_subscriber Modified: utils/kamctl/dbtext/kamailio/pcscf_location Modified: utils/kamctl/dbtext/kamailio/ro_session Modified: utils/kamctl/dbtext/kamailio/subscriber_scscf Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/contact.json Modified: utils/kamctl/mongodb/kamailio/impu.json Modified: utils/kamctl/mongodb/kamailio/impu_contact.json Modified: utils/kamctl/mongodb/kamailio/impu_subscriber.json Modified: utils/kamctl/mongodb/kamailio/ro_session.json Modified: utils/kamctl/mongodb/kamailio/subscriber_scscf.json Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/ims_charging-create.sql Modified: utils/kamctl/mysql/ims_usrloc_scscf-create.sql Modified: utils/kamctl/oracle/ims_charging-create.sql Modified: utils/kamctl/oracle/ims_usrloc_scscf-create.sql Modified: utils/kamctl/postgres/ims_charging-create.sql Modified: utils/kamctl/postgres/ims_usrloc_scscf-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/620eb2f029c74006200d19dae1450e7… Patch: https://github.com/kamailio/kamailio/commit/620eb2f029c74006200d19dae1450e7…

1 0

git:6.0:ddd98b09: janssonrpcc: fixed warning var may be used uninitialized
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: ddd98b09c80dc0d15af080e37961b59ecde17689 URL: https://github.com/kamailio/kamailio/commit/ddd98b09c80dc0d15af080e37961b59… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:32:01+01:00 janssonrpcc: fixed warning var may be used uninitialized (cherry picked from commit 3039c02404e05da05a031f6ccf68913a8c1c80eb) --- Modified: src/modules/janssonrpcc/janssonrpc_server.c --- Diff: https://github.com/kamailio/kamailio/commit/ddd98b09c80dc0d15af080e37961b59… Patch: https://github.com/kamailio/kamailio/commit/ddd98b09c80dc0d15af080e37961b59… --- diff --git a/src/modules/janssonrpcc/janssonrpc_server.c b/src/modules/janssonrpcc/janssonrpc_server.c index 3fb4d7c624f..5a98a6fc1f9 100644 --- a/src/modules/janssonrpcc/janssonrpc_server.c +++ b/src/modules/janssonrpcc/janssonrpc_server.c @@ -130,6 +130,7 @@ int jsonrpc_parse_server(char *server_s, jsonrpc_server_group_t **group_ptr) param_t *pit = NULL; param_t *freeme = NULL; str conn; + conn.s = NULL; str addr; addr.s = NULL; str srv;

1 0

git:6.0:01429a85: core: tcp_main - include local dst port in conn lookup when using haproxy
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 01429a85381a1d9ad96ce678285358b0ecfe48a1 URL: https://github.com/kamailio/kamailio/commit/01429a85381a1d9ad96ce678285358b… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:54+01:00 core: tcp_main - include local dst port in conn lookup when using haproxy (cherry picked from commit 9c109f3a371445e03defde279912fbb4179244bd) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/01429a85381a1d9ad96ce678285358b… Patch: https://github.com/kamailio/kamailio/commit/01429a85381a1d9ad96ce678285358b… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e0238fe090b..391255cab9d 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1745,7 +1745,8 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, print_ip("ip=", &a->parent->rcv.src_ip, "\n"); #endif if((a->parent->state != S_CONN_BAD) && (port == a->port) - && ((l_port == 0) || (l_port == a->parent->rcv.dst_port)) + && ((l_port == 0) || (l_port == a->parent->rcv.dst_port) + || (l_port == a->parent->cinfo.dst_port)) && (ip_addr_cmp(ip, &a->parent->rcv.src_ip)) && (is_local_ip_any || ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip)

1 0

git:6.0:60c9bafc: outbound: encode bind address into flow token as destination
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 60c9bafc287bfabe7860b389197e8801e26a6bfb URL: https://github.com/kamailio/kamailio/commit/60c9bafc287bfabe7860b389197e880… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:48+01:00 outbound: encode bind address into flow token as destination This is an attempt to fix the combination of the outbound/rr modules and ``tcp_accept_haproxy=yes``. This combination is currently broken, as previously reported on the mailing list: https://www.mail-archive.com/sr-users@lists.kamailio.org/msg21854.html The issue is that the destination address/port combo of the haproxy side is encoded into the flow token. When the rr module decodes the flow token and tries to look up the listening socket using ``find_si``, it cannot be found, because it is given the destination address/port combo of the connection of the haproxy side, not the address/port combo that Kamailio is actually listening on. This patch fixes the issue by encoding the ``bind_address`` of the socket the connection was received on into the flow token as the destination address. The source address remains unchanged, as it *can* be used to look up the TCP connection (with a minor patch to ``_tcpconn_find`` in ``tcp_main.c``) (cherry picked from commit b918e09e9c3e06bddfd7a205f64abb603d589f1c) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/60c9bafc287bfabe7860b389197e880… Patch: https://github.com/kamailio/kamailio/commit/60c9bafc287bfabe7860b389197e880… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index f2e0c7dbc3d..a5f17e4ef99 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -180,15 +180,25 @@ int encode_flow_token(str *flow_token, struct receive_info *rcv) return -1; } + /* By encoding the bind address into the flow token as the destination + address, we make sure that we'll still be able to find the socket when + decoding it even if there's an haproxy in front */ + struct ip_addr dst_ip = rcv->dst_ip; + unsigned short dst_port = rcv->dst_port; + if(rcv->bind_address) { + dst_ip = rcv->bind_address->address; + dst_port = rcv->bind_address->port_no; + } + /* Encode protocol information */ unenc_flow_token[pos++] = - (rcv->dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto; + (dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto; /* Encode destination address */ - for(i = 0; i < (rcv->dst_ip.af == AF_INET6 ? 16 : 4); i++) - unenc_flow_token[pos++] = rcv->dst_ip.u.addr[i]; - unenc_flow_token[pos++] = (rcv->dst_port >> 8) & 0xff; - unenc_flow_token[pos++] = rcv->dst_port & 0xff; + for(i = 0; i < (dst_ip.af == AF_INET6 ? 16 : 4); i++) + unenc_flow_token[pos++] = dst_ip.u.addr[i]; + unenc_flow_token[pos++] = (dst_port >> 8) & 0xff; + unenc_flow_token[pos++] = dst_port & 0xff; /* Encode source address */ for(i = 0; i < (rcv->src_ip.af == AF_INET6 ? 16 : 4); i++)

1 0

git:6.0:af3d036f: main: Print open file limits
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: af3d036fbc6ca41be61b79bb6e22ac72266234ea URL: https://github.com/kamailio/kamailio/commit/af3d036fbc6ca41be61b79bb6e22ac7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:42+01:00 main: Print open file limits (cherry picked from commit 4a335848f1b2b1e685891258803d1acd5540710d) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/af3d036fbc6ca41be61b79bb6e22ac7… Patch: https://github.com/kamailio/kamailio/commit/af3d036fbc6ca41be61b79bb6e22ac7… --- diff --git a/src/main.c b/src/main.c index 9e315285998..a29857757bc 100644 --- a/src/main.c +++ b/src/main.c @@ -59,6 +59,7 @@ #include <sys/utsname.h> #include <sys/stat.h> #include <sys/mman.h> +#include <sys/resource.h> /* getrlimit */ #include <fcntl.h> #include <sys/time.h> #include <sys/wait.h> @@ -2209,6 +2210,7 @@ int main(int argc, char **argv) char *tbuf_tmp; struct stat st = {0}; long l1 = 0; + struct rlimit lim; int option_index = 0; @@ -3310,7 +3312,16 @@ int main(int argc, char **argv) fprintf(stderr, "ERROR: error could not increase file limits\n"); goto error; } + } else { + if(getrlimit(RLIMIT_NOFILE, &lim) < 0) { + LM_CRIT("cannot get the maximum number of file descriptors: %s\n", + strerror(errno)); + goto error; + } + LM_INFO("current open file limits [soft/hard]: [%lu/%lu]\n", + (unsigned long)lim.rlim_cur, (unsigned long)lim.rlim_max); } + if(mlock_pages) mem_lock_pages();

1 0

git:6.0:5f2c7c7a: ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to reg events
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 5f2c7c7a958d010afd303a4feb95241aefd31dca URL: https://github.com/kamailio/kamailio/commit/5f2c7c7a958d010afd303a4feb95241… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:33+01:00 ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to reg events (cherry picked from commit 75af5c3d8b14a0b17d34c416f2dfc0df6c3ff6f8) --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/5f2c7c7a958d010afd303a4feb95241… Patch: https://github.com/kamailio/kamailio/commit/5f2c7c7a958d010afd303a4feb95241… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index bcddbf17cc2..b1af5189a8d 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -1376,7 +1376,7 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) ret = CSCF_RETURN_TRUE; LM_DBG("Sending 200 OK to subscribing user\n"); subscribe_reply( - msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, &scscf_name_str); + msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, &presentity_uri); if(event_type == IMS_REGISTRAR_SUBSCRIBE || event_type == IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) { @@ -1427,7 +1427,7 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) ret = CSCF_RETURN_TRUE; LM_DBG("Sending 200 OK to subscribing user\n"); subscribe_reply( - msg, 200, MSG_REG_UNSUBSCRIBE_OK, &expires, &scscf_name_str); + msg, 200, MSG_REG_UNSUBSCRIBE_OK, &expires, &presentity_uri); } doneorerror:

1 0

git:6.0:225f23a0: ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 225f23a03a2941d44cbb1b56d0d95adcc3f78004 URL: https://github.com/kamailio/kamailio/commit/225f23a03a2941d44cbb1b56d0d95ad… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:27+01:00 ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265 (cherry picked from commit 7de4f84f08e4ce910c007aad3fa2cadbe4b11dd2) --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/225f23a03a2941d44cbb1b56d0d95ad… Patch: https://github.com/kamailio/kamailio/commit/225f23a03a2941d44cbb1b56d0d95ad… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index aade763a09a..bcddbf17cc2 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -497,13 +497,15 @@ int event_reg(udomain_t *_d, impurecord_t *r_passed, ucontact_t *c_passed, case IMS_REGISTRAR_NONE: return 0; case IMS_REGISTRAR_SUBSCRIBE: + case IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE: if(r_passed || !presentity_uri || !watcher_contact || !_d) { LM_ERR("this is a subscribe called from cfg file: r_passed be " "zero and presentity_uri, watcher_contact and _d should " "be valid for a subscribe"); return 0; } - LM_DBG("Event type is IMS REGISTRAR SUBSCRIBE about to get " + LM_DBG("Event type is IMS REGISTRAR SUBSCRIBE/RE-SUBSCRIBE about " + "to get " "reginfo_full\n"); //lets get IMPU list for presentity as well as register for callbacks (IFF it is a new SUBSCRIBE) @@ -1376,8 +1378,8 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) subscribe_reply( msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, &scscf_name_str); - if(event_type == IMS_REGISTRAR_SUBSCRIBE) { - //do reg event only for the initial subscribe + if(event_type == IMS_REGISTRAR_SUBSCRIBE + || event_type == IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) { if(event_reg(domain, 0, 0, event_type, &presentity_uri, &watcher_contact, 0, 0, 0) != 0) { @@ -1723,7 +1725,8 @@ void create_notifications(udomain_t *_t, impurecord_t *r_passed, } //This is a fix to ensure that when a user subscribes a full reg info is only sent to that UE - if(event_type == IMS_REGISTRAR_SUBSCRIBE) { + if(event_type == IMS_REGISTRAR_SUBSCRIBE + || event_type == IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) { if(contact_match(watcher_contact, &s->watcher_contact) && (presentity_uri->len == s->presentity_uri.len) && (memcmp(s->presentity_uri.s, presentity_uri->s,

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev