sr-dev

sr-dev@lists.kamailio.org

8 participants
44164 discussions

git:master:bbb373e2: pua_usrloc: reformat exported structures

by Victor Seva

Module: kamailio Branch: master Commit: bbb373e2239e5e25527b708551dd5e03399f7bf3 URL: https://github.com/kamailio/kamailio/commit/bbb373e2239e5e25527b708551dd5e0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T19:13:38+01:00 pua_usrloc: reformat exported structures --- Modified: src/modules/pua_usrloc/pua_usrloc.c --- Diff: https://github.com/kamailio/kamailio/commit/bbb373e2239e5e25527b708551dd5e0… Patch: https://github.com/kamailio/kamailio/commit/bbb373e2239e5e25527b708551dd5e0… --- diff --git a/src/modules/pua_usrloc/pua_usrloc.c b/src/modules/pua_usrloc/pua_usrloc.c index bd2184a0aff..a0c154b77fc 100644 --- a/src/modules/pua_usrloc/pua_usrloc.c +++ b/src/modules/pua_usrloc/pua_usrloc.c @@ -70,29 +70,33 @@ usrloc_api_t ul; static int mod_init(void); +/* clang-format off */ static cmd_export_t cmds[] = { - {"pua_set_publish", (cmd_function)w_pua_set_publish, 0, 0, 0, - REQUEST_ROUTE}, - {"bind_pua_usrloc", (cmd_function)bind_pua_usrloc, 1, 0, 0, 0}, - {0, 0, 0, 0, 0, 0}}; + {"pua_set_publish", (cmd_function)w_pua_set_publish, 0, 0, 0, REQUEST_ROUTE}, + {"bind_pua_usrloc", (cmd_function)bind_pua_usrloc, 1, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"default_domain", PARAM_STR, &default_domain}, - {"entity_prefix", PARAM_STR, &pres_prefix}, - {"branch_flag", PARAM_INT, &pua_ul_bflag}, {0, 0, 0}}; + {"default_domain", PARAM_STR, &default_domain}, + {"entity_prefix", PARAM_STR, &pres_prefix}, + {"branch_flag", PARAM_INT, &pua_ul_bflag}, + {0, 0, 0} +}; struct module_exports exports = { - "pua_usrloc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "pua_usrloc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /*! \brief * init module function

3 weeks, 5 days

git:master:954fa318: cmake: Use CMAKE_INSTALL_FULL_* paths where appropriate

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 954fa3188b3e5e18b0992667b8904a1d17430598 URL: https://github.com/kamailio/kamailio/commit/954fa3188b3e5e18b0992667b8904a1… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-11T17:27:52Z cmake: Use CMAKE_INSTALL_FULL_* paths where appropriate - include(GNUInstallDirs) from root so all CMakeLists have access to the variables -CMake formatting --- Modified: CMakeLists.txt Modified: src/CMakeLists.txt Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/954fa3188b3e5e18b0992667b8904a1… Patch: https://github.com/kamailio/kamailio/commit/954fa3188b3e5e18b0992667b8904a1…

3 weeks, 5 days

git:master:b540392e: cmake: support for intel 32b cpu architectures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b540392ef910a63f2bda1b78d5970298edc87308 URL: https://github.com/kamailio/kamailio/commit/b540392ef910a63f2bda1b78d597029… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-11T15:38:02+01:00 cmake: support for intel 32b cpu architectures - identified with i386, i486, i586 and i686 - target cpu arch aliased it i386, like in old-makefiles, some code depending on it --- Modified: cmake/compiler-specific.cmake Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/b540392ef910a63f2bda1b78d597029… Patch: https://github.com/kamailio/kamailio/commit/b540392ef910a63f2bda1b78d597029… --- diff --git a/cmake/compiler-specific.cmake b/cmake/compiler-specific.cmake index 58b8b9cc998..f6bd54c2655 100644 --- a/cmake/compiler-specific.cmake +++ b/cmake/compiler-specific.cmake @@ -37,6 +37,35 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") target_link_options(common INTERFACE -m64) endif() +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i486|i586|i686") + + if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_definitions(common INTERFACE CC_GCC_LIKE_ASM) + + target_compile_options( + common INTERFACE -O0 + # <$<$<BOOL:${PROFILE}>:-pg> + ) + + target_compile_options( + common + INTERFACE -Wall -funroll-loops -Wcast-align + -Werror=implicit-function-declaration -Werror=implicit-int + ) + + # If GCC version is greater than 4.2.0, enable the following flags + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.2.0) + target_compile_options( + common INTERFACE -m32 -minline-all-stringops -falign-loops + -ftree-vectorize -fno-strict-overflow -mtune=generic + ) + endif() + elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_compile_definitions(common INTERFACE CC_GCC_LIKE_ASM) + target_compile_options(common INTERFACE -m32) + target_link_options(common INTERFACE -m32) + endif() + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") if(CMAKE_C_COMPILER_ID STREQUAL "GNU") diff --git a/cmake/defs.cmake b/cmake/defs.cmake index 1d151646c05..0509cad4fca 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -12,12 +12,17 @@ message(STATUS "OS: ${OS}") set(OSREL ${CMAKE_SYSTEM_VERSION}) message(STATUS "OS version: ${OSREL}") # set(HOST_ARCH "__CPU_${CMAKE_HOST_SYSTEM_PROCESSOR}") -set(TARGET_ARCH "__CPU_${CMAKE_SYSTEM_PROCESSOR}") + +if(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i486|i586|i686") + set(TARGET_ARCH "i386") +else() + set(TARGET_ARCH "${CMAKE_SYSTEM_PROCESSOR}") +endif() message(STATUS "Host Processor: ${CMAKE_HOST_SYSTEM_PROCESSOR}") # message(STATUS "Processor compile definition: ${HOST_ARCH}") message(STATUS "Target Processor: ${CMAKE_SYSTEM_PROCESSOR}") -message(STATUS "Target Processor compile definition: ${TARGET_ARCH}") +message(STATUS "Target Processor Alias: ${TARGET_ARCH}") # TODO Check if target arch is supported if(NOT TARGET_ARCH IN_LIST # supported_archs) message(FATAL_ERROR "Target architecture not supported") @@ -138,7 +143,7 @@ option(USE_FAST_LOCK "Use fast locking if available" ON) # if(USE_FAST_LOCK) if(CMAKE_SYSTEM_PROCESSOR MATCHES - "i386|x86_64|sparc64|sparc|ppc|ppc64|alpha|mips2|mips64" + "i386|i486|i586|i686|x86_64|sparc64|sparc|ppc|ppc64|alpha|mips2|mips64" ) set(USE_FAST_LOCK YES) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") @@ -296,9 +301,9 @@ include(${CMAKE_SOURCE_DIR}/cmake/os-specific.cmake) set(COMPILER_NAME ${CMAKE_C_COMPILER_ID}) if(CMAKE_C_COMPILER_ID STREQUAL "GNU") - set(COMPILER_NAME "gcc") + set(COMPILER_NAME "gcc") elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") - set(COMPILER_NAME "clang") + set(COMPILER_NAME "clang") endif() string(TOLOWER ${OS} OS_LOWER) @@ -307,12 +312,12 @@ target_compile_definitions( INTERFACE NAME="${MAIN_NAME}" VERSION="${RELEASE}" - ARCH="${CMAKE_HOST_SYSTEM_PROCESSOR}" + ARCH="${TARGET_ARCH}" OS=${OS} OS_QUOTED="${OS}" COMPILER="${COMPILER_NAME} ${CMAKE_C_COMPILER_VERSION}" # ${HOST_ARCH} - ${TARGET_ARCH} + __CPU_${TARGET_ARCH} __OS_${OS_LOWER} VERSIONVAL=${VERSIONVAL} CFG_DIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}/${CFG_NAME}/"

3 weeks, 5 days

git:master:2fbea39d: github: codeql use same strategy for nightly builds [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 2fbea39d4125be89f36cce161f9e6b0dbcd50595 URL: https://github.com/kamailio/kamailio/commit/2fbea39d4125be89f36cce161f9e6b0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T13:15:09+01:00 github: codeql use same strategy for nightly builds [skip ci] --- Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/2fbea39d4125be89f36cce161f9e6b0… Patch: https://github.com/kamailio/kamailio/commit/2fbea39d4125be89f36cce161f9e6b0… --- diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 84460230bba..3fe6ef06cfa 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -6,7 +6,27 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: jobs: + # is required nightly build? + # More info at https://stackoverflow.com/questions/63014786/how-to-schedule-a-github-actio… + check: + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - uses: octokit/request-action(a)v2.x + id: check_last_run + with: + route: GET /repos/{owner}/{repo}/actions/workflows/alpine.yml/runs?per_page=1&status=completed + owner: ${{ github.repository_owner }} + repo: kamailio + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - run: "echo Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }}" + outputs: + last_sha: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} analyze: + needs: [check] + if: needs.check.outputs.last_sha != github.sha name: Analyze runs-on: [self-hosted, linux, x64, codeql] permissions:

3 weeks, 5 days

Re: [kamailio/kamailio] cmake: added target compile option -ffile-prefix-map (28f4089)

by Daniel-Constantin Mierla

I am not yet familiar with CMake and was not sure what/where can be done. For example, afterwards, by testing I could figure out that the CMakeList.txt for (many) modules can be more or less the same, like a template. For `acc` module, I could get: ``` set(MODNAME acc) file(GLOB ${MODNAME}_SRC "*.c") add_library(${MODNAME} SHARED ${${MODNAME}_SRC}) target_compile_options(${MODNAME} PUBLIC "-ffile-prefix-map=${CMAKE_SOURCE_DIR}/src/modules/${MODNAME}/=") ``` First line is different per module, setting the module name, but there might be already available a CMake variable with the module name (in your comment you use `${MODULE_NAME}`). So, the CMakeList.txt in the module folder can include a common-template file. On the other hand, I am not sure if using too many variables will slow down compilation, because of too many times expanding the vars. Anyhow, feel free to update/optimize as you consider to be better. I am mostly trying to figure out solutions for what I see it is different, without adding more load on your shoulders. It might not be the best, so it can be updated. If I get stuck with something I will get it to you. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/28f4089efcc9c2ccf8c79fc9ecc509a… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/28f4089efcc9c2ccf8c79fc9ecc509ae29d873e5/150201533(a)github.com>

3 weeks, 5 days

Re: [kamailio/kamailio] cmake: added target compile option -ffile-prefix-map (28f4089)

by Xenofon Karamanos

Since this was for all modules and the main, it could be done in the https://github.com/kamailio/kamailio/blob/master/cmake/defs.cmake specifically in: https://github.com/kamailio/kamailio/blob/ccadde0a6656cd78fc1b4f67ed40b5a6a… All modules are then linked with this INTERFACE target. or because it has some specific folder names in the option it may be easier in the modules CMakeLists.txt. Just add this `target_compile_definitions(${MODULE_NAME} PRIVATE|PUBLIC "-ffile-prefix-map=${CMAKE_SOURCE_DIR}/src/modules/${MODULE_NAME}/= " ) https://github.com/kamailio/kamailio/blob/ccadde0a6656cd78fc1b4f67ed40b5a6a… -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/28f4089efcc9c2ccf8c79fc9ecc509a… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/28f4089efcc9c2ccf8c79fc9ecc509ae29d873e5/150201036(a)github.com>

3 weeks, 5 days

git:master:ccadde0a: cmake/defs.cmake: value of -DCOMPILER updated to include compiler suite name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ccadde0a6656cd78fc1b4f67ed40b5a6ac119d9e URL: https://github.com/kamailio/kamailio/commit/ccadde0a6656cd78fc1b4f67ed40b5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-11T11:19:11+01:00 cmake/defs.cmake: value of -DCOMPILER updated to include compiler suite name - similar format like for old-makefiles, not only the version number --- Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/ccadde0a6656cd78fc1b4f67ed40b5a… Patch: https://github.com/kamailio/kamailio/commit/ccadde0a6656cd78fc1b4f67ed40b5a… --- diff --git a/cmake/defs.cmake b/cmake/defs.cmake index bb9a0b680a7..1d151646c05 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -294,6 +294,13 @@ endif() include(${CMAKE_SOURCE_DIR}/cmake/compiler-specific.cmake) include(${CMAKE_SOURCE_DIR}/cmake/os-specific.cmake) +set(COMPILER_NAME ${CMAKE_C_COMPILER_ID}) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + set(COMPILER_NAME "gcc") +elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") + set(COMPILER_NAME "clang") +endif() + string(TOLOWER ${OS} OS_LOWER) target_compile_definitions( common @@ -303,7 +310,7 @@ target_compile_definitions( ARCH="${CMAKE_HOST_SYSTEM_PROCESSOR}" OS=${OS} OS_QUOTED="${OS}" - COMPILER="${CMAKE_C_COMPILER_VERSION}" + COMPILER="${COMPILER_NAME} ${CMAKE_C_COMPILER_VERSION}" # ${HOST_ARCH} ${TARGET_ARCH} __OS_${OS_LOWER}

3 weeks, 5 days

git:master:6edc0396: src/CMakeLists.txt: log compiler details

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6edc0396a04664e18ac43cbb024cde9cf2120a8c URL: https://github.com/kamailio/kamailio/commit/6edc0396a04664e18ac43cbb024cde9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-11T11:03:25+01:00 src/CMakeLists.txt: log compiler details --- Modified: src/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/6edc0396a04664e18ac43cbb024cde9… Patch: https://github.com/kamailio/kamailio/commit/6edc0396a04664e18ac43cbb024cde9… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 929c46523dd..7b4b1d15142 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,6 +20,10 @@ message(STATUS "CMAKE_INSTALL_DATADIR: ${CMAKE_INSTALL_FULL_DATADIR}") message(STATUS "CMAKE_INSTALL_DOCDIR: ${CMAKE_INSTALL_FULL_DOCDIR}") message(STATUS "CMAKE_INSTALL_MANDIR: ${CMAKE_INSTALL_FULL_MANDIR}") +message(STATUS "CMAKE_C_COMPILER: " ${CMAKE_C_COMPILER} ) +message(STATUS "CMAKE_C_COMPILER_ID: ${CMAKE_C_COMPILER_ID}") +message(STATUS "CMAKE_C_COMPILER_VERSION: ${CMAKE_C_COMPILER_VERSION}") + find_package(Threads REQUIRED) include(${CMAKE_SOURCE_DIR}/cmake/defs.cmake)

3 weeks, 5 days

git:5.7:e85d6e5d: http_async_client: fixed crash on curl callback

by Federico Cabiddu

Module: kamailio Branch: 5.7 Commit: e85d6e5dd499dce586e72fdca2ee7cbff6520327 URL: https://github.com/kamailio/kamailio/commit/e85d6e5dd499dce586e72fdca2ee7cb… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-12-11T07:49:52+01:00 http_async_client: fixed crash on curl callback --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/e85d6e5dd499dce586e72fdca2ee7cb… Patch: https://github.com/kamailio/kamailio/commit/e85d6e5dd499dce586e72fdca2ee7cb… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index a57aba9c951..a46b7262506 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -157,10 +157,12 @@ void event_cb(int fd, short kind, void *userp) /* CURLMOPT_SOCKETFUNCTION */ int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp) { + struct http_m_cell *cell; struct http_m_global *g = (struct http_m_global *)cbp; - struct http_m_cell *cell = (struct http_m_cell *)sockp; const char *whatstr[] = {"none", "IN", "OUT", "INOUT", "REMOVE"}; + cell = http_m_cell_lookup(e); + LM_DBG("socket callback: s=%d e=%p what=%s\n", s, e, whatstr[what]); if(what == CURL_POLL_REMOVE) { /* if cell is NULL the handle has been removed by the event callback for timeout */

3 weeks, 6 days

git:5.8:59810599: http_async_client: fixed crash on curl callback

by Federico Cabiddu

Module: kamailio Branch: 5.8 Commit: 5981059909f6d767fcad60d639dbeff5f54bfe3f URL: https://github.com/kamailio/kamailio/commit/5981059909f6d767fcad60d639dbeff… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-12-11T07:49:35+01:00 http_async_client: fixed crash on curl callback --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/5981059909f6d767fcad60d639dbeff… Patch: https://github.com/kamailio/kamailio/commit/5981059909f6d767fcad60d639dbeff… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index a57aba9c951..a46b7262506 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -157,10 +157,12 @@ void event_cb(int fd, short kind, void *userp) /* CURLMOPT_SOCKETFUNCTION */ int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp) { + struct http_m_cell *cell; struct http_m_global *g = (struct http_m_global *)cbp; - struct http_m_cell *cell = (struct http_m_cell *)sockp; const char *whatstr[] = {"none", "IN", "OUT", "INOUT", "REMOVE"}; + cell = http_m_cell_lookup(e); + LM_DBG("socket callback: s=%d e=%p what=%s\n", s, e, whatstr[what]); if(what == CURL_POLL_REMOVE) { /* if cell is NULL the handle has been removed by the event callback for timeout */

3 weeks, 6 days

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev