- sr-dev - kamailio.org

git:master:0694eb74: Revert "src/CMakeLists.txt: remove explicit sources lex.yy.c and cfg.tab.c"
by Daniel-Constantin Mierla 18 Dec '24

18 Dec '24

Module: kamailio Branch: master Commit: 0694eb74d91aaf8584f23ee934a36f2dc16a0fdf URL: https://github.com/kamailio/kamailio/commit/0694eb74d91aaf8584f23ee934a36f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-18T11:26:31+01:00 Revert "src/CMakeLists.txt: remove explicit sources lex.yy.c and cfg.tab.c" This reverts commit da629accb2c2095e3255f4aa3389a0af02272980. --- Modified: src/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/0694eb74d91aaf8584f23ee934a36f2… Patch: https://github.com/kamailio/kamailio/commit/0694eb74d91aaf8584f23ee934a36f2… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b08d6e3603d..2b02f33098f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -104,7 +104,8 @@ add_subdirectory(modules) # Module subdiretory does not contribute to the Kamailio executable. target_sources( kamailio - PRIVATE ${kamailio_SRC_FILES} + PRIVATE ${kamailio_SRC_FILES} ${CMAKE_CURRENT_BINARY_DIR}/core/lex.yy.c + ${CMAKE_CURRENT_BINARY_DIR}/core/cfg.tab.c ) target_include_directories(kamailio PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/core)

1 0

Re: [kamailio/kamailio] src/CMakeLists.txt: remove explicit sources lex.yy.c and cfg.tab.c (da629ac)
by Xenofon Karamanos 18 Dec '24

18 Dec '24

Hey @miconda, These files are generated from other files and do not exist in the source tree, when configuring. They are produced during the build step and therefore I needed to find a way to list them at sources so they don't produce the errors above. If you search `CMakeLists.txt`, you can see the `custom_commands` that generate them and `CMake` knows not to error if not found because they are `OUTPUT` of these commands and instead built them. I haven't seen these warning before. ``` - warnings shown before: Warning: Source file ".../src/core/lex.yy.c" is listed multiple times for target "kamailio". Warning: Source file ".../src/core/cfg.tab.c" is listed multiple times for target "kamailio" ``` Did you make any change before that might included this? There is only one place that list this source files as source and its here ``` target_sources( kamailio PRIVATE ${kamailio_SRC_FILES} ${CMAKE_CURRENT_BINARY_DIR}/core/lex.yy.c ${CMAKE_CURRENT_BINARY_DIR}/core/cfg.tab.c ) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/da629accb2c2095e3255f4aa3389a0a… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/da629accb2c2095e3255f4aa3389a0af02272980/150486656(a)github.com>

1 0

Re: [kamailio/kamailio] src/CMakeLists.txt: remove explicit sources lex.yy.c and cfg.tab.c (da629ac)
by Daniel-Constantin Mierla 18 Dec '24

18 Dec '24

What is the operating system and the cmake version you have? I tested on macos with cmake version 3.29.5. and on debian 11 (32b) with cmake version 3.18.4. Also, do you have the latest kamailio from git master branch? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/da629accb2c2095e3255f4aa3389a0a… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/da629accb2c2095e3255f4aa3389a0af02272980/150486180(a)github.com>

1 0

Re: [kamailio/kamailio] src/CMakeLists.txt: remove explicit sources lex.yy.c and cfg.tab.c (da629ac)
by space88man 18 Dec '24

18 Dec '24

This commit seems to have broken the build: I am seeing the same error as CI/CD ``` /usr/bin/ld: CMakeFiles/kamailio.dir/main.c.o: in function `main': /home/centos/src/kamailio-5.8/build/src/main.c:2509: undefined reference to `pp_define_set_type' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/main.c:2510: undefined reference to `pp_define' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/main.c:2516: undefined reference to `pp_define_set' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/main.c:2745: undefined reference to `yyin' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/main.c:2747: undefined reference to `ksr_cfg_print_initial_state' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/main.c:2748: undefined reference to `yyparse' /usr/bin/ld: CMakeFiles/kamailio.dir/core/core_cmd.c.o: in function `core_ppdefines': /home/centos/src/kamailio-5.8/build/src/core/core_cmd.c:1008: undefined reference to `pp_get_define_name' /usr/bin/ld: CMakeFiles/kamailio.dir/core/core_cmd.c.o: in function `core_ppdefines_full': /home/centos/src/kamailio-5.8/build/src/core/core_cmd.c:1033: undefined reference to `pp_get_define' /usr/bin/ld: CMakeFiles/kamailio.dir/core/ppcfg.c.o: in function `pp_substdef_add': /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:171: undefined reference to `pp_define_set_type' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:172: undefined reference to `pp_define' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:199: undefined reference to `pp_define_set' /usr/bin/ld: CMakeFiles/kamailio.dir/core/ppcfg.c.o: in function `pp_define_core': /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:312: undefined reference to `pp_define_set_type' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:313: undefined reference to `pp_define' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:324: undefined reference to `pp_define_set_type' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:325: undefined reference to `pp_define' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:337: undefined reference to `pp_define_set_type' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:338: undefined reference to `pp_define' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:344: undefined reference to `pp_define_set_type' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:345: undefined reference to `pp_define' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:360: undefined reference to `pp_define_set' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:365: undefined reference to `pp_define' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:369: undefined reference to `pp_define_set' /usr/bin/ld: CMakeFiles/kamailio.dir/core/ppcfg.c.o: in function `pp_snexpr_defval': /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:384: undefined reference to `pp_lookup' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:389: undefined reference to `pp_get_define' /usr/bin/ld: CMakeFiles/kamailio.dir/core/ppcfg.c.o: in function `pp_ifexp_eval': /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:434: undefined reference to `pp_ifexp_state' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:442: undefined reference to `pp_ifexp_state' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/ppcfg.c:468: undefined reference to `pp_ifexp_state' /usr/bin/ld: CMakeFiles/kamailio.dir/core/pv_core.c.o: in function `pv_get_def': /home/centos/src/kamailio-5.8/build/src/core/pv_core.c:136: undefined reference to `pp_define_get' /usr/bin/ld: CMakeFiles/kamailio.dir/core/pv_core.c.o: in function `pv_get_defn': /home/centos/src/kamailio-5.8/build/src/core/pv_core.c:160: undefined reference to `pp_define_get' /usr/bin/ld: CMakeFiles/kamailio.dir/core/sr_module.c.o: in function `register_module': /home/centos/src/kamailio-5.8/build/src/core/sr_module.c:332: undefined reference to `pp_define_set_type' /usr/bin/ld: /home/centos/src/kamailio-5.8/build/src/core/sr_module.c:333: undefined reference to `pp_define' ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/da629accb2c2095e3255f4aa3389a0a… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/da629accb2c2095e3255f4aa3389a0af02272980/150485816(a)github.com>

1 0

git:master:da629acc: src/CMakeLists.txt: remove explicit sources lex.yy.c and cfg.tab.c
by Daniel-Constantin Mierla 18 Dec '24

18 Dec '24

Module: kamailio Branch: master Commit: da629accb2c2095e3255f4aa3389a0af02272980 URL: https://github.com/kamailio/kamailio/commit/da629accb2c2095e3255f4aa3389a0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-18T08:48:02+01:00 src/CMakeLists.txt: remove explicit sources lex.yy.c and cfg.tab.c - they should be included by the GLOB of source files - warnings shown before: Warning: Source file ".../src/core/lex.yy.c" is listed multiple times for target "kamailio". Warning: Source file ".../src/core/cfg.tab.c" is listed multiple times for target "kamailio" --- Modified: src/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/da629accb2c2095e3255f4aa3389a0a… Patch: https://github.com/kamailio/kamailio/commit/da629accb2c2095e3255f4aa3389a0a… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2b02f33098f..b08d6e3603d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -104,8 +104,7 @@ add_subdirectory(modules) # Module subdiretory does not contribute to the Kamailio executable. target_sources( kamailio - PRIVATE ${kamailio_SRC_FILES} ${CMAKE_CURRENT_BINARY_DIR}/core/lex.yy.c - ${CMAKE_CURRENT_BINARY_DIR}/core/cfg.tab.c + PRIVATE ${kamailio_SRC_FILES} ) target_include_directories(kamailio PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/core)

1 0

git:master:96c9317b: pkg/kamailio/deb: version set 6.0.0~pre0
by Victor Seva 17 Dec '24

17 Dec '24

Module: kamailio Branch: master Commit: 96c9317b5f7a52eba94286dbe832d4bb1e4efd48 URL: https://github.com/kamailio/kamailio/commit/96c9317b5f7a52eba94286dbe832d4b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-17T20:15:48+01:00 pkg/kamailio/deb: version set 6.0.0~pre0 --- 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/noble/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/96c9317b5f7a52eba94286dbe832d4b… Patch: https://github.com/kamailio/kamailio/commit/96c9317b5f7a52eba94286dbe832d4b…

1 0

git:master:da1c3456: cmake/modules-docs.cmake: added COMMENT to target definitions
by Daniel-Constantin Mierla 17 Dec '24

17 Dec '24

Module: kamailio Branch: master Commit: da1c3456054fbfc3a353b5462fe4e27e852c8e47 URL: https://github.com/kamailio/kamailio/commit/da1c3456054fbfc3a353b5462fe4e27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-17T19:28:54+01:00 cmake/modules-docs.cmake: added COMMENT to target definitions --- Modified: cmake/modules-docs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/da1c3456054fbfc3a353b5462fe4e27… Patch: https://github.com/kamailio/kamailio/commit/da1c3456054fbfc3a353b5462fe4e27… --- diff --git a/cmake/modules-docs.cmake b/cmake/modules-docs.cmake index 3084632ade8..c33c6ff5363 100644 --- a/cmake/modules-docs.cmake +++ b/cmake/modules-docs.cmake @@ -85,20 +85,25 @@ else() add_custom_target( ${MODULE_NAME}_doc_text DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}/${MODULE_NAME}.txt + COMMENT "Processing target ${MODULE_NAME}_doc_text" ) add_custom_target( ${MODULE_NAME}_readme DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_NAME}/README + COMMENT "Processing target ${MODULE_NAME}_readme" ) add_custom_target( - ${MODULE_NAME}_doc_html DEPENDS ${DOCS_OUTPUT_DIR}/${MODULE_NAME}.html + ${MODULE_NAME}_doc_html + DEPENDS ${DOCS_OUTPUT_DIR}/${MODULE_NAME}.html + COMMENT "Processing target ${MODULE_NAME}_doc_html" ) add_custom_target( - ${MODULE_NAME}_doc DEPENDS ${MODULE_NAME}_doc_text - ${MODULE_NAME}_doc_html + ${MODULE_NAME}_doc + DEPENDS ${MODULE_NAME}_doc_text ${MODULE_NAME}_doc_html + COMMENT "Processing target ${MODULE_NAME}_doc" ) # Each version has seperate custon coommands for not recompiling all if 1

1 0

git:master:6f54793e: cmake/modules-docs.cmake: added target to generate readme for modules
by Daniel-Constantin Mierla 17 Dec '24

17 Dec '24

Module: kamailio Branch: master Commit: 6f54793ebbd86f898be749f9e6b00274ccb1f631 URL: https://github.com/kamailio/kamailio/commit/6f54793ebbd86f898be749f9e6b0027… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-17T19:15:34+01:00 cmake/modules-docs.cmake: added target to generate readme for modules - e.g., make acc_readme --- Modified: cmake/modules-docs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/6f54793ebbd86f898be749f9e6b0027… Patch: https://github.com/kamailio/kamailio/commit/6f54793ebbd86f898be749f9e6b0027… --- diff --git a/cmake/modules-docs.cmake b/cmake/modules-docs.cmake index 53beeae6fb9..3084632ade8 100644 --- a/cmake/modules-docs.cmake +++ b/cmake/modules-docs.cmake @@ -87,6 +87,11 @@ else() DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}/${MODULE_NAME}.txt ) + add_custom_target( + ${MODULE_NAME}_readme + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_NAME}/README + ) + add_custom_target( ${MODULE_NAME}_doc_html DEPENDS ${DOCS_OUTPUT_DIR}/${MODULE_NAME}.html ) @@ -117,6 +122,16 @@ else() "Generating text documentation with xsltproc and lynx for ${MODULE_NAME}" ) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_NAME}/README + COMMAND + ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}/${MODULE_NAME}.txt + ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_NAME}/README + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}/${MODULE_NAME}.txt + COMMENT "Generating README file for module ${MODULE_NAME}" + ) + add_custom_command( OUTPUT ${DOCS_OUTPUT_DIR}/${MODULE_NAME}.html COMMAND @@ -145,6 +160,5 @@ else() OPTIONAL ) endif() - endfunction() endif()

1 0

git:master:2dc8de17: cmake: Add support for multiple groups
by Xenofon Karamanos 17 Dec '24

17 Dec '24

Module: kamailio Branch: master Commit: 2dc8de17cd9103f4075e3324427f3009144a324d URL: https://github.com/kamailio/kamailio/commit/2dc8de17cd9103f4075e3324427f300… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-17T16:59:49Z cmake: Add support for multiple groups - cmake-format with default options --- Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/2dc8de17cd9103f4075e3324427f300… Patch: https://github.com/kamailio/kamailio/commit/2dc8de17cd9103f4075e3324427f300…

1 0

git:master:aa41dd85: tls_wolfssl: update internal submodule to v5.7.4-stable tag
by S-P Chan 17 Dec '24

17 Dec '24

Module: kamailio Branch: master Commit: aa41dd85ed5420f1fff3c6870eb1e5c3b8810f11 URL: https://github.com/kamailio/kamailio/commit/aa41dd85ed5420f1fff3c6870eb1e5c… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-12-17T23:44:45+08:00 tls_wolfssl: update internal submodule to v5.7.4-stable tag --- Modified: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/aa41dd85ed5420f1fff3c6870eb1e5c… Patch: https://github.com/kamailio/kamailio/commit/aa41dd85ed5420f1fff3c6870eb1e5c… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index 00e42151ca0..bdd62314f00 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit 00e42151ca061463ba6a95adb2290f678cbca472 +Subproject commit bdd62314f00fca0e216bf8c963c8eeff6327e0cb

1 0

[kamailio/kamailio] cmake --install looking for various text files like auth.txt, async.txt (Issue #4076)
by space88man 17 Dec '24

17 Dec '24

### Description Ping @xkaraman cmake error on installation; it seems to be looking for various xxxxx.txt files ``` cmake --install . -- Install configuration: "Debug" -- Installing: /home/centos/src/CHROOT/usr/local/kamailio/sbin/kamailio -- kamailio.cfg already exists in /home/centos/src/CHROOT/usr/local/kamailio/etc/kamailio/kamailio.cfg Installing as kamailio.sample -- Up-to-date: /home/centos/src/CHROOT/usr/local/kamailio/etc/kamailio/kamailio.cfg.sample -- Installing: /home/centos/src/CHROOT/usr/local/kamailio/lib64/kamailio/modules/async.so -- Set runtime path of "/home/centos/src/CHROOT/usr/local/kamailio/lib64/kamailio/modules/async.so" to "/usr/local/kamailio/lib64/kamailio" -- Installing: /home/centos/src/CHROOT/usr/local/kamailio/share/doc/kamailio/modules/README.async -- Installing: /home/centos/src/CHROOT/usr/local/kamailio/lib64/kamailio/modules/auth.so -- Set runtime path of "/home/centos/src/CHROOT/usr/local/kamailio/lib64/kamailio/modules/auth.so" to "/usr/local/kamailio/lib64/kamailio" CMake Error at src/modules/cmake_install.cmake:96 (file): file INSTALL cannot find "/home/centos/src/kamailio-5.8/src/modules/auth/auth.txt": No such file or directory. Call Stack (most recent call first): src/cmake_install.cmake:85 (include) cmake_install.cmake:47 (include) ``` ### Troubleshooting #### Reproduction ``` cmake -DCMAKE_INSTALL_PREFIX=/usr/local/kamailio . cmake --build . DESTDIR=~/temp/INSTALLROOT cmake --install . ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4076 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4076(a)github.com>

2 3

git:master:763d3622: cmake: Make docs install optional
by Xenofon Karamanos 17 Dec '24

17 Dec '24

Module: kamailio Branch: master Commit: 763d3622fdb2cdd7916963b6d3f4d532525a5fcc URL: https://github.com/kamailio/kamailio/commit/763d3622fdb2cdd7916963b6d3f4d53… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-17T13:31:59Z cmake: Make docs install optional --- Modified: cmake/modules-docs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/763d3622fdb2cdd7916963b6d3f4d53… Patch: https://github.com/kamailio/kamailio/commit/763d3622fdb2cdd7916963b6d3f4d53… --- diff --git a/cmake/modules-docs.cmake b/cmake/modules-docs.cmake index f4ac35d3ba6..53beeae6fb9 100644 --- a/cmake/modules-docs.cmake +++ b/cmake/modules-docs.cmake @@ -140,6 +140,9 @@ else() RENAME README.${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_DOCDIR}/modules COMPONENT kamailio_docs + # Since the depepndencies might not have been build as they are not in the default target + # and required to build explicitly using `make kamailio_docs`, allow them to be optional. + OPTIONAL ) endif()

1 0

git:master:bef43438: cmake: module_doc made from two targets module_doc_text and module_doc_html
by Daniel-Constantin Mierla 17 Dec '24

17 Dec '24

Module: kamailio Branch: master Commit: bef434385f32a685241a431b54082751c590b32c URL: https://github.com/kamailio/kamailio/commit/bef434385f32a685241a431b5408275… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-17T11:38:14+01:00 cmake: module_doc made from two targets module_doc_text and module_doc_html - targets for independent generation of text or html documentation --- Modified: cmake/modules-docs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/bef434385f32a685241a431b5408275… Patch: https://github.com/kamailio/kamailio/commit/bef434385f32a685241a431b5408275… --- diff --git a/cmake/modules-docs.cmake b/cmake/modules-docs.cmake index 256c6358b5c..f4ac35d3ba6 100644 --- a/cmake/modules-docs.cmake +++ b/cmake/modules-docs.cmake @@ -83,9 +83,17 @@ else() set(MODULE_DOC_PATH "${MODULE_PATH}/doc") add_custom_target( - ${MODULE_NAME}_doc + ${MODULE_NAME}_doc_text DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}/${MODULE_NAME}.txt - ${DOCS_OUTPUT_DIR}/${MODULE_NAME}.html + ) + + add_custom_target( + ${MODULE_NAME}_doc_html DEPENDS ${DOCS_OUTPUT_DIR}/${MODULE_NAME}.html + ) + + add_custom_target( + ${MODULE_NAME}_doc DEPENDS ${MODULE_NAME}_doc_text + ${MODULE_NAME}_doc_html ) # Each version has seperate custon coommands for not recompiling all if 1 @@ -106,7 +114,7 @@ else() # ${SINGLE_HTML_XSL} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_NAME}/doc COMMENT - "Generating documentation with xsltproc and lynx for ${MODULE_NAME}" + "Generating text documentation with xsltproc and lynx for ${MODULE_NAME}" ) add_custom_command( @@ -123,7 +131,7 @@ else() ${SINGLE_HTML_XSL} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_NAME}/doc COMMENT - "Generating documentation with xsltproc and lynx for ${MODULE_NAME}" + "Generating html documentation with xsltproc and lynx for ${MODULE_NAME}" ) endif() @@ -134,5 +142,6 @@ else() COMPONENT kamailio_docs ) endif() + endfunction() endif()

1 0

git:master:19625af3: cmake: rename files to use - instead of _ in the name
by Daniel-Constantin Mierla 17 Dec '24

17 Dec '24

Module: kamailio Branch: master Commit: 19625af3f3b5d36e3515dcc7efc9f6c85ea6bcf9 URL: https://github.com/kamailio/kamailio/commit/19625af3f3b5d36e3515dcc7efc9f6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-17T10:44:24+01:00 cmake: rename files to use - instead of _ in the name - have a coherent naming style, most were with - --- Added: cmake/cmake-uninstall.cmake.in Added: cmake/modules-docs.cmake Modified: CMakeLists.txt Modified: src/modules/CMakeLists.txt Removed: cmake/cmake_uninstall.cmake.in Removed: cmake/modules_docs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/19625af3f3b5d36e3515dcc7efc9f6c… Patch: https://github.com/kamailio/kamailio/commit/19625af3f3b5d36e3515dcc7efc9f6c…

1 0

Development for v6.0.x is frozen
by Daniel-Constantin Mierla 17 Dec '24

17 Dec '24

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

17 Dec '24

Module: kamailio Branch: master Commit: cd518c157cf28a04f703e4cce2f8ed92126b105d URL: https://github.com/kamailio/kamailio/commit/cd518c157cf28a04f703e4cce2f8ed9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-17T08:08:17+01:00 Makefile.defs, CMakeLists.txt: version set to 6.0.0-pre0 - start of testing phase for release series 6.0.x --- Modified: CMakeLists.txt Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/cd518c157cf28a04f703e4cce2f8ed9… Patch: https://github.com/kamailio/kamailio/commit/cd518c157cf28a04f703e4cce2f8ed9… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 38c85610ec2..bc327fe8883 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.10) project(kamailio VERSION 6.0.0) # Set the version number -set(EXTRAVERSION "-dev4") +set(EXTRAVERSION "-pre0") set(RELEASE "${PROJECT_VERSION}${EXTRAVERSION}") message(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}") diff --git a/src/Makefile.defs b/src/Makefile.defs index 6fdd6cf7e91..bc431ef0dde 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 6 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -dev4 +EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:919b7b14: Makefile.defs, CMakeLists.txt: version set to 6.0.0-dev4
by Daniel-Constantin Mierla 17 Dec '24

17 Dec '24

Module: kamailio Branch: master Commit: 919b7b147f380aadd3ef034acd23946edc28624f URL: https://github.com/kamailio/kamailio/commit/919b7b147f380aadd3ef034acd23946… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-17T08:04:46+01:00 Makefile.defs, CMakeLists.txt: version set to 6.0.0-dev4 - end of development for release series 6.0.x --- Modified: CMakeLists.txt Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/919b7b147f380aadd3ef034acd23946… Patch: https://github.com/kamailio/kamailio/commit/919b7b147f380aadd3ef034acd23946… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ae262e1c6c0..38c85610ec2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.10) project(kamailio VERSION 6.0.0) # Set the version number -set(EXTRAVERSION "-dev2") +set(EXTRAVERSION "-dev4") set(RELEASE "${PROJECT_VERSION}${EXTRAVERSION}") message(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}") diff --git a/src/Makefile.defs b/src/Makefile.defs index c3ae2b8b857..6fdd6cf7e91 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 6 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -dev3 +EXTRAVERSION = -dev4 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] Setting $xavp(reg=>q) has no effect (Issue #4068)
by Benoît Panizzon 16 Dec '24

16 Dec '24

### Description I don't know if this is a bug, or if I missing some config requirements. I mentioned the issue on the sr-user but did not get any comment. In case serial (or combined serial/parallel) branching is wished, the q value from the registered contact is considered to define the order in which a call is serial branched. If a CPE registers without q value, the value can be defined by: modparam("registrar", "default_q", 500) If a CPE registers with a q value, the client provided value is not being overridden by the default_q setting. In order to force the order there is a need to override the q value provided by a CPE. According to the Manual this is possible: modparam("registrar", "xavp_cfg", "reg") https://www.kamailio.org/docs/modules/devel/modules/registrar.html#registra… q - q value of contact (integer 0-1000). It overrides q value given in contact header and default_q parameter. Used in save(). #### Reproduction Actual config: ``` modparam("registrar", "method_filtering", 1) modparam("registrar", "max_contacts", 10) modparam("registrar", "max_expires", 3600) modparam("registrar", "gruu_enabled", 0) modparam("registrar", "retry_after", 30) modparam("registrar", "xavp_cfg", "reg") modparam("registrar", "default_q", 600) modparam("registrar", "use_path", 1) modparam("registrar", "path_mode", 1) modparam("registrar", "path_check_local", 0) ``` ``` route[REGISTRAR] { # Create an AOR based on the auth_username for the location service. $var(saveuri) = "sip:" + $aU + "@" + $rd; $xavp(reg=>q) = 450; $var(result) = save("location","0x00","$var(saveuri)"); if ($var(result) == -2) { xlog("L_ERR", "$cfg(route): Too many contacts for $var(saveuri)\n"); sl_reply_error(); } if ($var(result) == -1) { xlog("L_ERR", "$cfg(route): Error saving location $var(saveuri)\n"); sl_reply_error(); } if ($var(result) == 1) { xlog("L_INFO", "$cfg(route): Contact $var(saveuri) inserted\n"); } if ($var(result) == 2) { if ($avp(debug) > 0) { xlog("L_INFO", "$cfg(route): Contact $var(saveuri) updated\n"); } } if ($var(result) == 3) { xlog("L_INFO", "$cfg(route): Contact $var(saveuri) deleted\n"); } if ($var(result) == 4) { xlog("L_INFO", "$cfg(route): Contact $var(saveuri) returned\n"); } } ``` #### Debugging Data ``` # kamctl ul show | json_pp | grep "Q" "Q" : 0.6, "Q" : 0.6, "Q" : 0.6, "Q" : 0.5, "Q" : 0.6, "Q" : 0.6, "Q" : 0.6, ``` CPE providing a q value (0.5 in this case for CPE 4) are not overriden. CPE providing no q value are inserted with default_q value. Expectation: $xavp(reg=>q) = 450 should cause all CPE to register with Q: 0.45 #### Log Messages No errors logged while saving contact. #### SIP Traffic I could show the Register messages of CPE with q= attribute and without, but I don't think this contributes to solving the issue. ### Possible Solutions I attempted some other notations like: $xavp(reg>q) or $xavp(reg[0]=>q) none worked. I also noted some time ago that setting: $xavp(reg=>max_contacts) also does not work ### Additional Information ``` # kamailio -v version: kamailio 5.7.6 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 11.4.0 ``` ``` Distributor ID: Ubuntu Description: Ubuntu 22.04.4 LTS Release: 22.04 Codename: jammy ``` Any help / hints appreciated! -Benoît- -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4068 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4068(a)github.com>

3 11

Freezing development for 6.0.x series
by Daniel-Constantin Mierla 16 Dec '24

16 Dec '24

Hello, I propose to aim freezing the development for 6.0.x series at the end of the 16th of December 2024 (Monday). New features that one wants to get in this release series have to be pushed to git repository or pull requests made for them. Afterwards usually follows a 4-6 weeks of testing till the first release 6.0.0. Unfreezing will happen earlier, after the first weeks of testing when the 6.0 branch will be created. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

1 1

[kamailio/kamailio] Advertise in listen directive still gives port in headers even though it's not set or set to 0 (Issue #3933)
by Evgenii Buchnev 16 Dec '24

16 Dec '24

Reopening. (https://github.com/kamailio/kamailio/issues/3932#issuecomment-2252138364) It's bug. Please see highlighted on screenshot. ![image](https://github.com/user-attachments/assets/88b9671d-d2be-4d49-8596-3e6ab3a2d294) Hey Team, Thank you for the awesome software ### Description Neither option work: `listen=... advertise some.custom.hostname.io` `listen=... advertise some.custom.hostname.io:0` to make Kamailio present only hostname(without port) in Record-Route headers, affects NAPTR/SRV. ### Troubleshooting ============ _Hostname without port - still gives port 5081 in Record-Route_ **kamailio.cfg** ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io name "provider_socket_tls"` ... **sngrep, 200 OK for INVITE** ... `Record-Route: <sip:some.custom.io:5081;transport=tls;r2=on;lr;did=494.6e51>` ... **kamcmd corex.list_sockets** ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:0 } ``` ... ======== _Hostname with port 0 - still gives port 5081 in Record-Route_ kamailio.cfg ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io:0 name "provider_socket_tls"` ... sngrep, 200 OK for INVITE ... `Record-Route: <sip:some.custom.io:5081;transport=tls;r2=on;lr;did=042.7721>` ... kamcmd corex.list_sockets ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:0 } ``` ... ============ _Hostname with explicit different port 8888 - gives that port 8888 in Record-Route (to confirm config works)_ kamailio.cfg ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io:8888 name "provider_socket_tls"` ... sngrep, 200 OK for INVITE ... `Record-Route: <sip:some.custom.io:8888;transport=tls;r2=on;lr;did=dae.ac31>` ... kamcmd corex.list_sockets ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:8888 } ``` ... #### Reproduction Please see Troubleshooting section #### Debugging Data Please see Troubleshooting section #### Log Messages N/A #### SIP Traffic Please see Troubleshooting section ### Possible Solutions N/A ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.2 (x86_64/linux) dbe51d flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: dbe51d compiled on 07:13:22 Jul 17 2024 with gcc 12.2.0) ``` * **Operating System**: ``` [dev]root@[voiceproxy]:~# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 12 (bookworm) Release: 12 Codename: bookworm [dev]root@[voiceproxy]:~# uname -a Linux i-0875d7720d6152612 6.1.0-23-cloud-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.99-1 (2024-07-15) x86_64 GNU/Linux [dev]root@[voiceproxy]:~# cat /etc/*relea* ID=ec2 VERSION="20240702-1796" PRETTY_NAME="Debian GNU/Linux 12 (bookworm)" NAME="Debian GNU/Linux" VERSION_ID="12" VERSION="12 (bookworm)" VERSION_CODENAME=bookworm ID=debian HOME_URL="https://www.debian.org/" SUPPORT_URL="https://www.debian.org/support" BUG_REPORT_URL="https://bugs.debian.org/" ``` * **Might be related** : https://github.com/kamailio/kamailio/issues/1884 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3933 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3933(a)github.com>

3 11

git:master:e4116424: cmake: Generate docs with lynx
by Xenofon Karamanos 16 Dec '24

16 Dec '24

Module: kamailio Branch: master Commit: e4116424065f3d3ee685960976239ae961212dc0 URL: https://github.com/kamailio/kamailio/commit/e4116424065f3d3ee685960976239ae… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-16T09:05:48Z cmake: Generate docs with lynx - Remove pandoc - Add various options that can be user-defined - Add target_dependecies on produced files like .txt and .html - Each produced file it's own custom command for not rebuilding when not nessecary --- Modified: cmake/modules_docs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/e4116424065f3d3ee685960976239ae… Patch: https://github.com/kamailio/kamailio/commit/e4116424065f3d3ee685960976239ae…

1 0

[kamailio/kamailio] xhttp_prom: new xhttp_prom_tags parameter (PR #4072)
by Christian Berger 16 Dec '24

16 Dec '24

- allows custom tags to be added to prometheus metrics - Addresses GH issue #4021   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #4021 #### Description  This change adds a new parameter `xhttp_prom_tags`. It allows the user to append tags to the prometheus metrics. This makes those metrics a lot more useful when having multiple kamailio instances running on a single host. This is done by 2 shared memory helper variables which contain the parameter in different formats. This way it is easy to print them out with minimal changes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4072 -- Commit Summary -- * xhttp_prom: new xhttp_prom_tags parameter * Fixed formating -- File Changes -- M src/modules/xhttp_prom/doc/xhttp_prom_admin.xml (25) M src/modules/xhttp_prom/prom.c (30) M src/modules/xhttp_prom/xhttp_prom.c (50) M src/modules/xhttp_prom/xhttp_prom.h (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4072.patch https://github.com/kamailio/kamailio/pull/4072.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4072 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4072(a)github.com>

1 1

[kamailio/kamailio] Hope pv_www_authenticate in Lua KEMI framework (Issue #4067)
by Chen Ziyan 16 Dec '24

16 Dec '24

### Description When I rewrite from native to Lua syntax, I find that `pv_www_authenticate` has no corresponding implementation, can we add it? ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` Kamailio 5.8.2 Lua 5.1.4 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4067 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4067(a)github.com>

2 2

[kamailio/kamailio] xhttp_prom: new xhttp_prom_tags parameter (PR #4070)
by Christian Berger 16 Dec '24

16 Dec '24

- allows custom tags to be added to prometheus metrics - Addresses GH issue #4021   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #4021 #### Description  This change adds a new parameter `xhttp_prom_tags`. It allows the user to append tags to the prometheus metrics. This makes those metrics a lot more useful when having multiple kamailio instances running on a single host. This is done by 2 shared memory helper variables which contain the parameter in different formats. This way it is easy to print them out with minimal changes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4070 -- Commit Summary -- * xhttp_prom: new xhttp_prom_tags parameter -- File Changes -- M src/modules/xhttp_prom/doc/xhttp_prom_admin.xml (25) M src/modules/xhttp_prom/prom.c (25) M src/modules/xhttp_prom/xhttp_prom.c (45) M src/modules/xhttp_prom/xhttp_prom.h (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4070.patch https://github.com/kamailio/kamailio/pull/4070.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4070 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4070(a)github.com>

2 5

git:master:fb1f6397: auth: export pv_www/proxy_authenticate(...) to kemi
by Daniel-Constantin Mierla 16 Dec '24

16 Dec '24

Module: kamailio Branch: master Commit: fb1f6397cd58b8186558bfb719f73d9765281ff2 URL: https://github.com/kamailio/kamailio/commit/fb1f6397cd58b8186558bfb719f73d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-16T09:32:12+01:00 auth: export pv_www/proxy_authenticate(...) to kemi - GH #4067 --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fb1f6397cd58b8186558bfb719f73d9… Patch: https://github.com/kamailio/kamailio/commit/fb1f6397cd58b8186558bfb719f73d9… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index 9407c415bd2..cf0ede401c8 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -686,6 +686,16 @@ int pv_authenticate(struct sip_msg *msg, str *realm, str *passwd, int flags, return ret; } +/** + * + */ +static int ki_pv_proxy_authenticate( + sip_msg_t *msg, str *realm, str *passwd, int flags) +{ + return pv_authenticate(msg, realm, passwd, flags, HDR_PROXYAUTH_T, + &msg->first_line.u.request.method); +} + /** * */ @@ -727,6 +737,26 @@ static int pv_proxy_authenticate( return AUTH_ERROR; } +/** + * + */ +static int ki_pv_www_authenticate( + sip_msg_t *msg, str *realm, str *passwd, int flags) +{ + return pv_authenticate(msg, realm, passwd, flags, HDR_AUTHORIZATION_T, + &msg->first_line.u.request.method); +} + +/** + * + */ +static int ki_pv_www_authenticate_method( + sip_msg_t *msg, str *realm, str *passwd, int flags, str *method) +{ + return pv_authenticate( + msg, realm, passwd, flags, HDR_AUTHORIZATION_T, method); +} + /** * */ @@ -1403,6 +1433,21 @@ static sr_kemi_t sr_kemi_auth_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("auth"), str_init("pv_proxy_authenticate"), + SR_KEMIP_INT, ki_pv_proxy_authenticate, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("auth"), str_init("pv_www_authenticate"), + SR_KEMIP_INT, ki_pv_www_authenticate, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("auth"), str_init("pv_www_authenticate_method"), + SR_KEMIP_INT, ki_pv_www_authenticate_method, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("auth"), str_init("has_credentials"), SR_KEMIP_INT, ki_has_credentials, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev