sr-dev December 2024

sr-dev@lists.kamailio.org

17 participants
347 discussions

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)
by Xenofon Karamanos 12 Dec '24

12 Dec '24

Yeah, looking into it. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150280974(a)github.com>

1 0

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)
by Victor Seva 12 Dec '24

12 Dec '24

@xkaraman this change broke the build ``` cmake --build /home/runner/work/kamailio/kamailio/build -j8 [ 0%] Building C object src/modules/acc/CMakeFiles/acc.dir/acc.c.o [ 0%] Building C object src/modules/acc/CMakeFiles/acc.dir/acc_cdr.c.o gmake[2]: *** No rule to make target 'src/modules/xprint_doc', needed by 'src/modules/CMakeFiles/kamailio_docs'. Stop. [ 0%] Generating cfg.tab.c and cfg.tab.h from cfg.y gmake[1]: *** [CMakeFiles/Makefile2:3444: src/modules/CMakeFiles/kamailio_docs.dir/all] Error 2 [ 0%] Building C object src/modules/alias_db/CMakeFiles/alias_db.dir/alias_db.c.o gmake[1]: *** Waiting for unfinished jobs.... ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150280924(a)github.com>

1 0

git:master:92f899f3: pua_dialoginfo: rename short global variable
by Daniel-Constantin Mierla 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 92f899f3689f0f0b291590e82e61751b76b2539c URL: https://github.com/kamailio/kamailio/commit/92f899f3689f0f0b291590e82e61751… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-12T12:25:35+01:00 pua_dialoginfo: rename short global variable --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/92f899f3689f0f0b291590e82e61751… Patch: https://github.com/kamailio/kamailio/commit/92f899f3689f0f0b291590e82e61751… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 86febe2d1bd..26883cc27ad 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -76,7 +76,7 @@ MODULE_VERSION */ /* #define PUA_DIALOGINFO_DEBUG 1 */ -pua_api_t pua; +pua_api_t _pua_api; struct dlg_binds dlg_api; @@ -1063,15 +1063,15 @@ static int mod_init(void) return -1; } - if(bind_pua(&pua) < 0) { + if(bind_pua(&_pua_api) < 0) { LM_ERR("Can't bind pua\n"); return -1; } - if(pua.send_publish == NULL) { + if(_pua_api.send_publish == NULL) { LM_ERR("Could not import send_publish\n"); return -1; } - pua_send_publish = pua.send_publish; + pua_send_publish = _pua_api.send_publish; /* bind to the dialog API */ if(load_dlg_api(&dlg_api) != 0) {

1 0

git:master:f24eed8b: cmake: Add kamailio_docs target to all if BUILD_DOC is ON
by Xenofon Karamanos 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: f24eed8ba01870361d916844a073df71cbc9e609 URL: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-12T11:20:35Z cmake: Add kamailio_docs target to all if BUILD_DOC is ON --- Modified: cmake/modules_docs.cmake Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… Patch: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7…

1 0

git:master:21bdc234: cmake: Fix double $ typo. Fixes building with ninja
by Xenofon Karamanos 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 21bdc234e219db83e085b055d4f81cb3ff63193d URL: https://github.com/kamailio/kamailio/commit/21bdc234e219db83e085b055d4f81cb… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-12T11:20:35Z cmake: Fix double $ typo. Fixes building with ninja --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/21bdc234e219db83e085b055d4f81cb… Patch: https://github.com/kamailio/kamailio/commit/21bdc234e219db83e085b055d4f81cb… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index a927c1ee627..e651bb88c8b 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -11,7 +11,7 @@ message(STATUS "Temporary kamctl.{db} files in : ${KAMCTL_TMP_DIR}") file(MAKE_DIRECTORY ${KAMCTL_TMP_DIR}) set(BIN_DIR "${CMAKE_INSTALL_FULL_SBINDIR}") -set(LIB_DIR "$${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}/kamctl") +set(LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}/kamctl") set(CFG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/${MAIN_NAME}") set(SHARE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${MAIN_NAME}")

1 0

git:master:170ddcca: cmake: Add option to not use git to gather commit info
by Xenofon Karamanos 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 170ddcca96b3ee11f4daed1592f0cee9c753db2b URL: https://github.com/kamailio/kamailio/commit/170ddcca96b3ee11f4daed1592f0cee… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-12T11:19:48Z cmake: Add option to not use git to gather commit info --- Modified: src/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/170ddcca96b3ee11f4daed1592f0cee… Patch: https://github.com/kamailio/kamailio/commit/170ddcca96b3ee11f4daed1592f0cee… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 30f80f0db32..2b02f33098f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,9 +24,13 @@ include(${CMAKE_SOURCE_DIR}/cmake/defs.cmake) # ----------------------- # The following produces core/autover.h Find Git +option(USE_GIT "Use git to get commit information" ON) find_package(Git QUIET) -if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") +if(USE_GIT + AND GIT_FOUND + AND EXISTS "${PROJECT_SOURCE_DIR}/.git" +) execute_process( COMMAND ${GIT_EXECUTABLE} rev-parse --verify --short=6 HEAD WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

1 0

git:master:ac74fd01: cmake: Generete parser files in build folder
by Xenofon Karamanos 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: ac74fd01fade29b433eb45966a0ed5e222614318 URL: https://github.com/kamailio/kamailio/commit/ac74fd01fade29b433eb45966a0ed5e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-12T11:19:48Z cmake: Generete parser files in build folder --- Modified: src/CMakeLists.txt Modified: src/core/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/ac74fd01fade29b433eb45966a0ed5e… Patch: https://github.com/kamailio/kamailio/commit/ac74fd01fade29b433eb45966a0ed5e… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 867f7508f26..30f80f0db32 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -70,8 +70,9 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.20) cmake_policy(SET CMP0118 NEW) else() set_source_files_properties( - ${CMAKE_SOURCE_DIR}/src/core/lex.yy.c ${CMAKE_SOURCE_DIR}/src/core/cfg.tab.c - ${CMAKE_SOURCE_DIR}/src/core/cfg.tab.h PROPERTIES GENERATED TRUE + ${CMAKE_CURRENT_BINARY_DIR}/core/lex.yy.c + ${CMAKE_CURRENT_BINARY_DIR}/core/cfg.tab.c + ${CMAKE_CURRENT_BINARY_DIR}/core/cfg.tab.h PROPERTIES GENERATED TRUE ) endif() # ----------------------- @@ -98,9 +99,11 @@ add_subdirectory(modules) # from their own CMakeLists.txt # Module subdiretory does not contribute to the Kamailio executable. target_sources( - kamailio PRIVATE ${kamailio_SRC_FILES} ${CMAKE_SOURCE_DIR}/src/core/lex.yy.c - ${CMAKE_SOURCE_DIR}/src/core/cfg.tab.c + kamailio + 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) # Debuggng the sources of kamailio executable. # get_property( diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index e72cca6fa61..cbda772884a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -20,19 +20,19 @@ find_package(BISON REQUIRED) # Generate lex.yy.c from cfg.lex add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/lex.yy.c - COMMAND ${FLEX_EXECUTABLE} -o ${CMAKE_CURRENT_SOURCE_DIR}/lex.yy.c + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex.yy.c + COMMAND ${FLEX_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/lex.yy.c ${CMAKE_CURRENT_SOURCE_DIR}/cfg.lex DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/cfg.lex - ${CMAKE_CURRENT_SOURCE_DIR}/cfg.tab.h + ${CMAKE_CURRENT_BINARY_DIR}/cfg.tab.h COMMENT "Generating lex.yy.c from cfg.lex" ) # Generate cfg.tab.c and cfg.tab.h from cfg.y add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/cfg.tab.c - ${CMAKE_CURRENT_SOURCE_DIR}/cfg.tab.h - COMMAND ${BISON_EXECUTABLE} -d -b cfg -o ${CMAKE_CURRENT_SOURCE_DIR}/cfg.tab.c + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cfg.tab.c + ${CMAKE_CURRENT_BINARY_DIR}/cfg.tab.h + COMMAND ${BISON_EXECUTABLE} -d -b cfg -o ${CMAKE_CURRENT_BINARY_DIR}/cfg.tab.c ${CMAKE_CURRENT_SOURCE_DIR}/cfg.y DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/cfg.y COMMENT "Generating cfg.tab.c and cfg.tab.h from cfg.y" @@ -41,9 +41,9 @@ add_custom_command( # Add custom target for generating the 3 source files mentioned above add_custom_target( GenerateParser ALL - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lex.yy.c - ${CMAKE_CURRENT_SOURCE_DIR}/cfg.tab.c - ${CMAKE_CURRENT_SOURCE_DIR}/cfg.tab.h + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lex.yy.c + ${CMAKE_CURRENT_BINARY_DIR}/cfg.tab.c + ${CMAKE_CURRENT_BINARY_DIR}/cfg.tab.h COMMENT "Generating parser source files" )

1 0

git:master:a557b186: pre-commit: cmake-format and cmake-lint hooks [skip ci]
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: a557b186fed55d6a0fdba78f0e59a634df569ff9 URL: https://github.com/kamailio/kamailio/commit/a557b186fed55d6a0fdba78f0e59a63… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T11:21:16+01:00 pre-commit: cmake-format and cmake-lint hooks [skip ci] --- Modified: .pre-commit-config.yaml --- Diff: https://github.com/kamailio/kamailio/commit/a557b186fed55d6a0fdba78f0e59a63… Patch: https://github.com/kamailio/kamailio/commit/a557b186fed55d6a0fdba78f0e59a63… --- diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7e8b8a8860a..7892175df39 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,4 +11,9 @@ repos: - repo: https://github.com/pre-commit/mirrors-clang-format rev: v15.0.7 hooks: - - id: clang-format + - id: clang-format + - repo: https://github.com/cheshirekow/cmake-format-precommit + rev: v0.6.13 + hooks: + - id: cmake-format + - id: cmake-lint

1 0

git:master:f385148f: core: use one strlen for mod_path
by Daniel-Constantin Mierla 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: f385148ff68e2125a2111d9c506022519f17d1c9 URL: https://github.com/kamailio/kamailio/commit/f385148ff68e2125a2111d9c5060225… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-12T10:22:27+01:00 core: use one strlen for mod_path --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/f385148ff68e2125a2111d9c5060225… Patch: https://github.com/kamailio/kamailio/commit/f385148ff68e2125a2111d9c5060225… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 6d50f294389..f19a2d3812b 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -410,12 +410,14 @@ int ksr_locate_module(char *mod_path, char **new_path) int mdir_len; int path_type; int len; + int mod_path_len; *new_path = NULL; + mod_path_len = strlen(mod_path); path = mod_path; path_type = 0; modfile.s = path; - modfile.len = strlen(mod_path); + modfile.len = mod_path_len; modname.s = modfile.s; if(modfile.len > 3 && strcmp(modfile.s + modfile.len - 3, ".so") == 0) { path_type = 1; @@ -502,7 +504,7 @@ int ksr_locate_module(char *mod_path, char **new_path) if(path == 0) { /* try path <MODS_DIR>/mod_path - K compat */ path = (char *)pkg_malloc( - mdir_len + 1 /* "/" */ + strlen(mod_path) + 1); + mdir_len + 1 /* "/" */ + mod_path_len + 1); if(path == 0) { PKG_MEM_ERROR; goto error; @@ -513,8 +515,8 @@ int ksr_locate_module(char *mod_path, char **new_path) path[len] = '/'; len++; } - path[len] = 0; - strcat(path, mod_path); + memcpy(path + len, mod_path, mod_path_len); + path[len + mod_path_len] = 0; if(stat(path, &stat_buf) == -1) { LM_DBG("module file not found <%s>\n", path);

1 0

[kamailio/kamailio] segfault on t_next_contacts after adding additional contacts to $xavp(tm_contacts) (Issue #4063)
by Benoît Panizzon 12 Dec '24

12 Dec '24

### Description Goal: Build a destination set from multiple contacts gathered from multiple registered AoR. Situation: assumptions, observations: * lookup() returns success there are registered contacts for each AoR. * All contacts have same q value. * lookup() can only be called for one AoR, there is no way to call it for multiple AoR. * If lookup() is called multiple times, only the destination set gathered by the last invocation is preserved, all other ones are overwritten. * t_load_contacts() transfers the destination set into the $xavp(tm_contacts) but like lookup() initializes that So I am trying to find a way to store/collate all destination sets into one and parallel fork a call to all contacts from multiple AoR. Idea: Stack all contacts in $xavp(contact_stack) with the same structure as $xavp(tm_contacts) and append it to tm_contacts. xavp_rm("contact_stack"); # Make sure this is not defined. We are in a loop setting $var(lookupuri) to (sip:315996608@3cx-pbx.imp.ch and sip:315996608-1@157.161.4.181) { lookup("location", "$var(lookupuri)"); t_load_contacts(0); # Now $xavp(tm_contacts) is populated $xavp(contact_stack) = $xavp(tm_contacts); # Store contact set } xavp_rm("tm_contacts"); # Re Initialize tm_contacts to empty $xavp(tm_contacts) = $xavp(contact_stack); # Restore tm_contacts from stacked set. xlog("L_INFO", "$cfg(route): COUNT: $cnt($xavp(tm_contacts))\n"); # Make sure, the count matches what we expect. xlog("L_INFO", "$cfg(route): Before t_next_contacts\n"); t_next_contacts(); # Load destination set => CRASH! xlog("L_INFO", "$cfg(route): After t_next_contacts\n"); Log (some more infos logged I omitted in the example above) ``` Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Auth_aor_user[0] = 315996608 Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Sigprofile[0] = local Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Lookupuri[0] = sip:315996608@3cx-pbx.imp.ch Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: LOOKUP sip:315996608@3cx-pbx.imp.ch SUCCESS!!!! Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Auth_aor_user[1] = 315996608-1 Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Sigprofile[1] = local Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Lookupuri[1] = sip:315996608-1@157.161.4.181 Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: LOOKUP sip:315996608-1@157.161.4.181 SUCCESS!!!! Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: ADD to tm_contacts Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: COUNT: 4 Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Before t_next_contacts Dec 10 16:18:05 dev-cpereg01 kernel: [13747450.274883] traps: kamailio[3964710] general protection fault ip:55bc00e61f2b sp:7ffce62d7520 error:0 in kamailio[55bc00ba5000+457000] ``` #### Reproduction Code above with: version: kamailio 5.7.6 (x86_64/linux) from official kamailio repository on ubuntu jammy. #### Debugging Data If required, I can try to enable coredumps. #### Log Messages Shown above #### SIP Traffic Probably not needed. ### Possible Solutions None yet. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4063 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4063(a)github.com>

3 4

← Newer
1
...
19
20
21
22
23
24
25
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2024