sr-dev January 2025

sr-dev@lists.kamailio.org

19 participants
184 discussions

git:master:6839f1a2: cmake/kamctl: Build and install to correct paths

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 6839f1a2e090f06b0b7ca9289dd3b7279903a1e2 URL: https://github.com/kamailio/kamailio/commit/6839f1a2e090f06b0b7ca9289dd3b72… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-15T14:42:31Z cmake/kamctl: Build and install to correct paths - Some filebased databases require the kamailio subfolder --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/6839f1a2e090f06b0b7ca9289dd3b72… Patch: https://github.com/kamailio/kamailio/commit/6839f1a2e090f06b0b7ca9289dd3b72… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index 215399be4ae..c5eb602a18a 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -274,8 +274,10 @@ else() OR db_name STREQUAL "dbtext" OR db_name STREQUAL "mongodb") set(prefix '') + set(folder_suffix "${MAIN_NAME}") else() set(prefix "${table}-") + set(folder_suffix '') endif() add_custom_command( @@ -283,7 +285,8 @@ else() PRE_BUILD COMMAND XML_CATALOG_FILES=${CATALOG} ${XSLTPROC_EXECUTABLE} ${XSLTPROC_FLAGS} - --stringparam dir ${CMAKE_CURRENT_BINARY_DIR}/${db_name_folder} + --stringparam dir + ${CMAKE_CURRENT_BINARY_DIR}/${db_name_folder}/${folder_suffix} --stringparam prefix ${prefix} --stringparam db ${db_name} ${xsl_file} "kamailio-${table}.xml" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/src/lib/srdb1/schema"

2 weeks, 6 days

git:master:3cda5a83: cmake: Remove LOCK_METHOD as an option

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 3cda5a83cc45da2b0a9d6bb18f1b7f85849c526f URL: https://github.com/kamailio/kamailio/commit/3cda5a83cc45da2b0a9d6bb18f1b7f8… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-15T10:52:50Z cmake: Remove LOCK_METHOD as an option - If USE_FAST_LOCK is set to ON, try to use FAST_LOCK. If not avalaible on platoform, fallback to a platform specific one. - If USE_FAST_LOCK is set to OFF, fallback directly to platform specific one. - Fix wrong IF(NOT <option>) evaluation - CMake lint files --- Modified: cmake/defs.cmake Modified: cmake/os-specific/darwin.cmake Modified: cmake/os-specific/dragonfly.cmake Modified: cmake/os-specific/freebsd.cmake Modified: cmake/os-specific/linux.cmake --- Diff: https://github.com/kamailio/kamailio/commit/3cda5a83cc45da2b0a9d6bb18f1b7f8… Patch: https://github.com/kamailio/kamailio/commit/3cda5a83cc45da2b0a9d6bb18f1b7f8…

3 weeks

[kamailio/kamailio] cmake: add FreeBSD support (PR #4104)

by Boris Korzun

#### 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) - [ ] 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I've tested cmake-build in the FreeBSD environment, as requested by @miconda in #4099. And founded some troubles. First of all are: specific flags for FreeBSD and arch-name for FreeBSD cmake-environment. I've fixed it in the PR. But there're some unresolved problems I want to discuss... A `LOCK_METHOD` problem: There's a `LOCK_METHOD` variable in defs.cmake: https://github.com/kamailio/kamailio/blob/6b0b8cb84b7d0e965d50bdf0dfa542300… And the explicit usage `LOCK_METHOD` as `USE_FUTEX` in a compile_definitions: https://github.com/kamailio/kamailio/blob/6b0b8cb84b7d0e965d50bdf0dfa542300… I suppose it's incorrect while some OSs (FreeBSD, ex.) doesn't tested with futexlock.h earlier. A resolv-link problem: There're an explicit links of the resolv library: https://github.com/kamailio/kamailio/blob/6b0b8cb84b7d0e965d50bdf0dfa542300… https://github.com/kamailio/kamailio/blob/6b0b8cb84b7d0e965d50bdf0dfa542300… I think it's incorrect while some OSs (FreeBSD, ex.) uses builtin resolv (libc, etc). Initially сmake is built successful after the above fixes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4104 -- Commit Summary -- * cmake: add amd64 arch fallback * cmake: add FreeBSD support -- File Changes -- M cmake/compiler-specific.cmake (2) M cmake/defs.cmake (4) M cmake/os-specific.cmake (3) A cmake/os-specific/freebsd.cmake (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4104.patch https://github.com/kamailio/kamailio/pull/4104.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4104 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4104(a)github.com>

3 weeks

git:5.8:50e69e9a: sanity: log as debug when Content-Length is missing for datagram protocols

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: 50e69e9a269e5d5dba0251f893abc34907a12970 URL: https://github.com/kamailio/kamailio/commit/50e69e9a269e5d5dba0251f893abc34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-15T09:25:11+01:00 sanity: log as debug when Content-Length is missing for datagram protocols - the header is optional for datagram protocols (RFC3261, 20.14) (cherry picked from commit e38c7f8bac1aef9890d266fa466cea1561346732) --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/50e69e9a269e5d5dba0251f893abc34… Patch: https://github.com/kamailio/kamailio/commit/50e69e9a269e5d5dba0251f893abc34… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index fa3d0493883..44765f7a17f 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -625,7 +625,11 @@ int check_cl(sip_msg_t *msg) } LM_DBG("check_cl passed\n"); } else { - LM_WARN("content length header missing in request\n"); + if(msg->rcv.proto != PROTO_UDP && msg->rcv.proto != PROTO_SCTP) { + LM_WARN("content length header missing in request\n"); + } else { + LM_DBG("content length header missing in request\n"); + } } return SANITY_CHECK_PASSED;

3 weeks

git:master:e38c7f8b: sanity: log as debug when Content-Length is missing for datagram protocols

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e38c7f8bac1aef9890d266fa466cea1561346732 URL: https://github.com/kamailio/kamailio/commit/e38c7f8bac1aef9890d266fa466cea1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-15T07:26:58+01:00 sanity: log as debug when Content-Length is missing for datagram protocols - the header is optional for datagram protocols (RFC3261, 20.14) --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/e38c7f8bac1aef9890d266fa466cea1… Patch: https://github.com/kamailio/kamailio/commit/e38c7f8bac1aef9890d266fa466cea1… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index 45864b47523..582a1aaada0 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -627,7 +627,11 @@ int check_cl(sip_msg_t *msg) } LM_DBG("check_cl passed\n"); } else { - LM_WARN("content length header missing in request\n"); + if(msg->rcv.proto != PROTO_UDP && msg->rcv.proto != PROTO_SCTP) { + LM_WARN("content length header missing in request\n"); + } else { + LM_DBG("content length header missing in request\n"); + } } return SANITY_CHECK_PASSED;

3 weeks

git:master:0498446f: cmake: add FreeBSD support

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 0498446fd24462a7de72f73aae37a76ceabc4276 URL: https://github.com/kamailio/kamailio/commit/0498446fd24462a7de72f73aae37a76… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-01-14T19:05:39+02:00 cmake: add FreeBSD support --- Added: cmake/os-specific/freebsd.cmake Modified: cmake/os-specific.cmake --- Diff: https://github.com/kamailio/kamailio/commit/0498446fd24462a7de72f73aae37a76… Patch: https://github.com/kamailio/kamailio/commit/0498446fd24462a7de72f73aae37a76… --- diff --git a/cmake/os-specific.cmake b/cmake/os-specific.cmake index d70a44cf379..ab67a4f7d68 100644 --- a/cmake/os-specific.cmake +++ b/cmake/os-specific.cmake @@ -12,6 +12,9 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "DragonFly") elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") # Mac OS X specific flags include(${OS_SPECIFIC_DIR}/darwin.cmake) +elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + # FreeBSD specific flags + include(${OS_SPECIFIC_DIR}/freebsd.cmake) elseif() message(FATAL_ERROR "Unsupported system: ${CMAKE_SYSTEM_NAME}") endif() diff --git a/cmake/os-specific/freebsd.cmake b/cmake/os-specific/freebsd.cmake new file mode 100644 index 00000000000..03d1f2032c3 --- /dev/null +++ b/cmake/os-specific/freebsd.cmake @@ -0,0 +1,37 @@ +message( + STATUS + "Configuring for FreeBSD" +) + +target_compile_definitions( + common + INTERFACE HAVE_SOCKADDR_SA_LEN + HAVE_GETHOSTBYNAME2 + HAVE_UNION_SEMUN + HAVE_SCHED_YIELD + HAVE_MSGHDR_MSG_CONTROL + HAVE_CONNECT_ECONNRESET_BUG + HAVE_TIMEGM + HAVE_IP_MREQN +) + +if(${RAW_SOCKS}) + target_compile_definitions(common INTERFACE USE_RAW_SOCKS) +endif() + +message(STATUS "USE_FAST_LOCK = ${USE_FAST_LOCK}") +if(NOT ${USE_FAST_LOCK}) + target_compile_definitions(common INTERFACE USE_PTHREAD_MUTEX) +endif() + +if(NOT DEFINED ${NO_SELECT}) + target_compile_definitions(common INTERFACE HAVE_SELECT) +endif() + +if(NOT DEFINED ${NO_KQUEUE}) + target_compile_definitions(common INTERFACE HAVE_KQUEUE) +endif() + +if(NOT DEFINED RUN_PREFIX) + set(RUN_PREFIX "/var") +endif()

3 weeks

git:master:78ac89b1: cmake: add amd64 arch fallback

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 78ac89b1785c178d72410f54010c59d446b3b947 URL: https://github.com/kamailio/kamailio/commit/78ac89b1785c178d72410f54010c59d… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-01-14T19:05:39+02:00 cmake: add amd64 arch fallback --- Modified: cmake/compiler-specific.cmake Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/78ac89b1785c178d72410f54010c59d… Patch: https://github.com/kamailio/kamailio/commit/78ac89b1785c178d72410f54010c59d… --- diff --git a/cmake/compiler-specific.cmake b/cmake/compiler-specific.cmake index 16b697fef35..e64ea577cbb 100644 --- a/cmake/compiler-specific.cmake +++ b/cmake/compiler-specific.cmake @@ -8,7 +8,7 @@ option(PROFILE "Enable profiling" OFF) add_library(common_compiler_flags INTERFACE) # Define the flags for the C compiler -if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_definitions(common_compiler_flags INTERFACE CC_GCC_LIKE_ASM) diff --git a/cmake/defs.cmake b/cmake/defs.cmake index 3659b26ab43..edb1e16d6e3 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -14,6 +14,8 @@ message(STATUS "OS version: ${OSREL}") if(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i486|i586|i686") set(TARGET_ARCH "i386") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") + set(TARGET_ARCH "x86_64") else() set(TARGET_ARCH "${CMAKE_SYSTEM_PROCESSOR}") endif() @@ -139,7 +141,7 @@ option(USE_FAST_LOCK "Use fast locking if available" ON) # Check the system processor type and set USE_FAST_LOCK accordingly if(USE_FAST_LOCK) if(CMAKE_SYSTEM_PROCESSOR MATCHES - "i386|i486|i586|i686|x86_64|sparc64|sparc|ppc|ppc64|alpha|mips2|mips64") + "i386|i486|i586|i686|x86_64|amd64|sparc64|sparc|ppc|ppc64|alpha|mips2|mips64") set(USE_FAST_LOCK YES) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") set(USE_FAST_LOCK NO)

3 weeks

git:5.8:1d79bd10: siputils: declare iterator out if for loop for C99 compiler

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: 1d79bd109bd5f1563a23189cfab9ed8e9bb821c9 URL: https://github.com/kamailio/kamailio/commit/1d79bd109bd5f1563a23189cfab9ed8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-14T13:17:33+01:00 siputils: declare iterator out if for loop for C99 compiler - for sip_generate_charging_vector() - variables declared at the begining of blocks (cherry picked from commit 6b0b8cb84b7d0e965d50bdf0dfa5423004879f55) --- Modified: src/modules/siputils/chargingvector.c --- Diff: https://github.com/kamailio/kamailio/commit/1d79bd109bd5f1563a23189cfab9ed8… Patch: https://github.com/kamailio/kamailio/commit/1d79bd109bd5f1563a23189cfab9ed8… --- diff --git a/src/modules/siputils/chargingvector.c b/src/modules/siputils/chargingvector.c index 110f06be77d..8bc723c6448 100644 --- a/src/modules/siputils/chargingvector.c +++ b/src/modules/siputils/chargingvector.c @@ -86,6 +86,9 @@ static void sip_generate_charging_vector(char *pcv, const unsigned int maxsize) static struct in_addr ip = {0}; unsigned char newConferenceIdentifier[SIZE_CONF_ID] = {0}; int len = SIZE_CONF_ID; + int i; + char *ptr = NULL; + char *endptr = NULL; /* if supplied buffer cannot carry 16 (SIZE_CONF_ID) hex characters and a null terminator (=33 bytes), then reduce length of generated icid-value */ @@ -143,10 +146,10 @@ static void sip_generate_charging_vector(char *pcv, const unsigned int maxsize) idx++; } LM_DBG("PCV generate\n"); - char *ptr = pcv; - const char *endptr = ptr + maxsize - 1; + ptr = pcv; + endptr = ptr + maxsize - 1; - for(int i = 0; i < len && ptr < endptr; i++) { + for(i = 0; i < len && ptr < endptr; i++) { ptr += snprintf(ptr, 3, "%02X", newConferenceIdentifier[i]); } }

3 weeks, 1 day

git:master:6b0b8cb8: siputils: declare iterator out if for loop for C99 compiler

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6b0b8cb84b7d0e965d50bdf0dfa5423004879f55 URL: https://github.com/kamailio/kamailio/commit/6b0b8cb84b7d0e965d50bdf0dfa5423… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-14T13:16:12+01:00 siputils: declare iterator out if for loop for C99 compiler - for sip_generate_charging_vector() - variables declared at the begining of blocks --- Modified: src/modules/siputils/chargingvector.c --- Diff: https://github.com/kamailio/kamailio/commit/6b0b8cb84b7d0e965d50bdf0dfa5423… Patch: https://github.com/kamailio/kamailio/commit/6b0b8cb84b7d0e965d50bdf0dfa5423… --- diff --git a/src/modules/siputils/chargingvector.c b/src/modules/siputils/chargingvector.c index e86f56eb6f3..fa99b732d7b 100644 --- a/src/modules/siputils/chargingvector.c +++ b/src/modules/siputils/chargingvector.c @@ -88,6 +88,9 @@ static void sip_generate_charging_vector(char *pcv, const unsigned int maxsize) static struct in_addr ip = {0}; unsigned char newConferenceIdentifier[SIZE_CONF_ID] = {0}; int len = SIZE_CONF_ID; + int i; + char *ptr = NULL; + char *endptr = NULL; /* if supplied buffer cannot carry 16 (SIZE_CONF_ID) hex characters and a null terminator (=33 bytes), then reduce length of generated icid-value */ @@ -145,10 +148,10 @@ static void sip_generate_charging_vector(char *pcv, const unsigned int maxsize) idx++; } LM_DBG("PCV generate\n"); - char *ptr = pcv; - const char *endptr = ptr + maxsize - 1; + ptr = pcv; + endptr = ptr + maxsize - 1; - for(int i = 0; i < len && ptr < endptr; i++) { + for(i = 0; i < len && ptr < endptr; i++) { ptr += snprintf(ptr, 3, "%02X", newConferenceIdentifier[i]); } }

3 weeks, 1 day

git:5.8:3772cdfd: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.8 Commit: 3772cdfda5c23d5267bac7059ace198418ef3986 URL: https://github.com/kamailio/kamailio/commit/3772cdfda5c23d5267bac7059ace198… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-01-14T09:46:23+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/jsonrpcs/README Modified: src/modules/rtpengine/README Modified: src/modules/siprepo/README Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/3772cdfda5c23d5267bac7059ace198… Patch: https://github.com/kamailio/kamailio/commit/3772cdfda5c23d5267bac7059ace198…

3 weeks, 1 day

← Newer
1
...
9
10
11
12
13
14
15
...
19
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2025