sr-dev January 2025

sr-dev@lists.kamailio.org

19 participants
184 discussions

git:master:6750e2e2: core: socket info - set receive timeout for netlink socket

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6750e2e2f1d6c10f6b5e66897d38657a576a9732 URL: https://github.com/kamailio/kamailio/commit/6750e2e2f1d6c10f6b5e66897d38657… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-20T12:58:18+01:00 core: socket info - set receive timeout for netlink socket - GH #4098 --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/6750e2e2f1d6c10f6b5e66897d38657… Patch: https://github.com/kamailio/kamailio/commit/6750e2e2f1d6c10f6b5e66897d38657… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index b431ea395db..24243fea153 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1378,6 +1378,7 @@ static int nl_bound_sock(void) { int sock = -1; struct sockaddr_nl la; + struct timeval recvtimeout; sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); if(sock < 0) { @@ -1396,6 +1397,15 @@ static int nl_bound_sock(void) goto error; } + recvtimeout.tv_sec = 4; + recvtimeout.tv_usec = 0; + if(setsockopt( + sock, SOL_SOCKET, SO_RCVTIMEO, &recvtimeout, sizeof(recvtimeout)) + < 0) { + LM_ERR("failed to set receive timeout\n"); + goto error; + } + return sock; error: if(sock >= 0) @@ -1448,6 +1458,10 @@ static int get_flags(int family) goto error; } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); + if(rtn <= 0) { + LM_ERR("failed to receive data (%d/%d)\n", rtn, errno); + goto error; + } nlp = (struct nlmsghdr *)p; if(nlp->nlmsg_type == NLMSG_DONE) { LM_DBG("done\n"); @@ -1550,6 +1564,10 @@ static int build_iface_list(void) goto error; } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); + if(rtn <= 0) { + LM_ERR("failed to receive data (%d/%d)\n", rtn, errno); + goto error; + } LM_DBG("received %d byles \n", rtn); nlp = (struct nlmsghdr *)p; if(nlp->nlmsg_type == NLMSG_DONE) {

2 weeks, 2 days

[kamailio/kamailio] cmake - make clean deletes readme files from modules source folders (Issue #4084)

by Daniel-Constantin Mierla

Executing `make clean` in the `build` folder deletes the `README` files from the modules folders. This is probably because the README is an output of a `cmake-make` command. What would be the best option to skip this removing? I found: - https://stackoverflow.com/questions/6259372/cmake-preventing-make-clean-fro… Which indicates adding: ``` SET_DIRECTORY_PROPERTIES(PROPERTIES CLEAN_NO_CUSTOM 1) ``` In the CMakeLists.txt inside the module folders. But maybe it is another place where it can be done once for all modules, or another option... -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4084 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4084(a)github.com>

2 weeks, 2 days

[kamailio/kamailio] Migrate to C23 (Issue #4106)

by soroshsabz

ITNOA As you can see many defects resolve in [C17](https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2244.htm) and [C23](https://en.wikipedia.org/wiki/C23_(C_standard_revision) introduce many new language features for clean coding. So I suggest migrate codebase to C23, and if you agree with me, I can try to migrate that -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4106 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4106(a)github.com>

2 weeks, 2 days

git:master:e50a24aa: cmake/os-specific/darwin.cmake: use -undefined dynamic_lookup for OS v24+

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e50a24aa4a4fcc6c0310f9f2d5f130197372b2f9 URL: https://github.com/kamailio/kamailio/commit/e50a24aa4a4fcc6c0310f9f2d5f1301… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-20T11:05:08+01:00 cmake/os-specific/darwin.cmake: use -undefined dynamic_lookup for OS v24+ - the option -undefined suppress has been deprecated --- Modified: cmake/os-specific/darwin.cmake --- Diff: https://github.com/kamailio/kamailio/commit/e50a24aa4a4fcc6c0310f9f2d5f1301… Patch: https://github.com/kamailio/kamailio/commit/e50a24aa4a4fcc6c0310f9f2d5f1301… --- diff --git a/cmake/os-specific/darwin.cmake b/cmake/os-specific/darwin.cmake index bd02a290b53..a43c075142b 100644 --- a/cmake/os-specific/darwin.cmake +++ b/cmake/os-specific/darwin.cmake @@ -25,11 +25,20 @@ if(NOT ${USE_FAST_LOCK}) target_compile_definitions(common INTERFACE USE_PTHREAD_MUTEX USE_SYSV_SEM) endif() +if (CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 24) + message(STATUS "Running on Big Sur") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -bundle -flat_namespace -undefined suppress") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -dynamiclib -flat_namespace -undefined suppress" ) +else () +set(CMAKE_MODULE_LINKER_FLAGS + "${CMAKE_MODULE_LINKER_FLAGS} -bundle -flat_namespace -undefined dynamic_lookup") +set(CMAKE_SHARED_LINKER_FLAGS + "${CMAKE_SHARED_LINKER_FLAGS} -dynamiclib -flat_namespace -undefined dynamic_lookup" +) +endif () if(NOT NO_SELECT) target_compile_definitions(common INTERFACE HAVE_SELECT)

2 weeks, 2 days

git:master:a1bdef91: cmake: messages about not finding docs-related tools made status

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a1bdef919414173e8327a8dd65ecaa2fca279d6a URL: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-20T10:54:14+01:00 cmake: messages about not finding docs-related tools made status - they should not be needed for development and usual installation, warning makes it look like something relevant cannot be done --- Modified: cmake/modules-docs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2… Patch: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2… --- diff --git a/cmake/modules-docs.cmake b/cmake/modules-docs.cmake index 10b1b70a8f2..721ba7d0b45 100644 --- a/cmake/modules-docs.cmake +++ b/cmake/modules-docs.cmake @@ -6,12 +6,12 @@ find_program(LYNX_EXECUTABLE lynx QUIET) find_program(DOCBOOK2X_EXECUTABLE docbook2x-man QUIET) if(BUILD_DOC AND (NOT XSLTPROC_EXECUTABLE OR NOT LYNX_EXECUTABLE)) - message(WARNING "xsltproc or lynx not found but required for doc generation.") + message(STATUS "xsltproc or lynx not found but required for doc generation.") set(BUILD_DOC OFF) endif() if(BUILD_DOC AND (NOT DOCBOOK2X_EXECUTABLE)) - message(WARNING "docbook2x-man not found but required for man generation.") + message(STATUS "docbook2x-man not found but required for man generation.") set(BUILD_DOC OFF) endif()

2 weeks, 2 days

git:master:09628a8e: cmake: fix typo, missing KRADIUS

by Victor Seva

Module: kamailio Branch: master Commit: 09628a8e6060a21805fccccc1f530062fca1bb75 URL: https://github.com/kamailio/kamailio/commit/09628a8e6060a21805fccccc1f53006… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-20T09:18:45+01:00 cmake: fix typo, missing KRADIUS --- Modified: .pre-commit-config.yaml Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/09628a8e6060a21805fccccc1f53006… Patch: https://github.com/kamailio/kamailio/commit/09628a8e6060a21805fccccc1f53006… --- diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7892175df39..c5df7975c1f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,4 +16,10 @@ repos: rev: v0.6.13 hooks: - id: cmake-format + verbose: true + args: + - -c cmake/cmake-format.py - id: cmake-lint + verbose: true + args: + - -c cmake/cmake-format.py diff --git a/cmake/groups.cmake b/cmake/groups.cmake index b3562cbbbcc..9cd7ddf77dc 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -720,7 +720,7 @@ list( KPOSTGRES KCPL KXML - KRAIDUS + KRADIUS KUNIXODBC KPERL KSNMPSTATS

2 weeks, 2 days

[kamailio/kamailio] ims_diameter_server not freeing shared memory (Issue #4116)

by MGrimby

### Description I have run in to an issue when sending diameter requests using the ims_diameter_server module. Shared memory keeps increasing and are not being freed until restart of kamailio. This leads to all shared memory is being used and no more are able to be allocated. This only happens when the request is sent synchronously. When sent asynchronously shared memory is being freed as far as I can see. Following functions have been used for sending requests. diameter_request([peer], appid, commandcode, message) diameter_request_async([peer], appid, commandcode, message) ### Troubleshooting Sent a bunch of diameter requests and verified that shared memory for the following functions are not freed. do_receive(600): AAATranslateMessage(500): AAACreateAVP(137): #### Reproduction It's possible to reproduce by sending sync diameter request and verify shared memory. Example of diameter request block ``` route[CHECK_LOCATION] { diameter_request("hss.ims.test.local", "16777217", "306", "[ " + "{ \"avpCode\":260, \"vendorId\":0, \"Flags\":64, \"list\":[ { \"avpCode\":266, \"vendorId\":0, \"Flags\":64, \"int32\":10415 }, { \"avpCode\":258, \"vendorId\":0, \"Flags\":64, \"int32\":16777217 } ] }, " + "{ \"avpCode\":277, \"vendorId\":0, \"Flags\":64, \"int32\":1 }, " + "{ \"avpCode\":283, \"vendorId\":0, \"Flags\":64, \"string\":\"ims.test.local\"}, " + "{ \"avpCode\":706, \"vendorId\":10415, \"Flags\":192, \"int32\":0 }, " + "{ \"avpCode\":700, \"vendorId\":10415, \"Flags\":192, \"list\": [ { \"avpCode\":601, \"vendorId\":10415, \"Flags\":192, \"string\":\"tel:" + $fU + "\" }]}, " + "{ \"avpCode\":707, \"vendorId\":10415, \"Flags\":192, \"int32\":0 }, " + "{ \"avpCode\":703, \"vendorId\":10415, \"Flags\":192, \"int32\":14 } ]"); xlog("L_INFO", "Sent Diameter request"); } ``` Stats cdp:replies_received = 343310 shmem:fragments = 142 shmem:free_size = 1221489992 shmem:max_used_size = 948242168 shmem:real_used_size = 925993656 shmem:total_size = 2147483648 shmem:used_size = 558205656 kamcmd mod.stats cdp shm do_receive(600): 256245808 AAATranslateMessage(500): 64420712 AAACreateAVP(137): 218100320 Total: 538774000 #### 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` ``` version: kamailio 5.7.4 (x86_64/linux) dc393e 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: dc393e compiled on 13:56:27 Feb 27 2024 with gcc 8.5.0 ``` * **Operating System**:  ``` Linux bmatkamas1 4.18.0-553.16.1.el8_10.x86_64 #1 SMP Thu Aug 1 04:16:12 EDT 2024 x86_64 x86_64 x86_64 GNU/Linux Red Hat Enterprise Linux release 8.10 (Ootpa) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4116 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4116(a)github.com>

2 weeks, 5 days

git:master:0a5db680: cmake: Remove depracated modules from groups

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 0a5db6808e859e88aae739e277d1647e05a4f4c6 URL: https://github.com/kamailio/kamailio/commit/0a5db6808e859e88aae739e277d1647… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-17T14:56:31Z cmake: Remove depracated modules from groups - cmake lint --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/0a5db6808e859e88aae739e277d1647… Patch: https://github.com/kamailio/kamailio/commit/0a5db6808e859e88aae739e277d1647…

2 weeks, 5 days

git:master:eeffe798: cmake: Fix ignoring excluded module

by Xenofon Karamanos

Module: kamailio Branch: master Commit: eeffe798b85d4f8c580c221b0e655b1b49a7420f URL: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-17T14:56:31Z cmake: Fix ignoring excluded module - When adding groups, we now also check if they contain a user-excluded module. --- Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1… Patch: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1… --- diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 22c1341db8a..be55da5f065 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -4,6 +4,7 @@ set(MODULES_DIR "${CMAKE_CURRENT_SOURCE_DIR}") # Initialize a global property to track added modules set_property(GLOBAL PROPERTY ADDED_MODULES_LIST "") set_property(GLOBAL PROPERTY ALL_MODULE_DOC_TARGETS "") +set_property(GLOBAL PROPERTY EXCLUDED_MODULES_LIST "") include(${CMAKE_SOURCE_DIR}/cmake/groups.cmake) @@ -52,9 +53,12 @@ function(add_module_group group_modules) foreach(module_name IN LISTS group_modules) # Check if the module has already been added get_property(ALREADY_ADDED GLOBAL PROPERTY ADDED_MODULES_LIST) - if(";${ALREADY_ADDED};" MATCHES ";${module_name};") + if("${module_name}" IN_LIST ALREADY_ADDED) message( STATUS "Module ${module_name} has already been added. Skipping...") + elseif("${module_name}" IN_LIST EXCLUDED_MODULES_LIST) + message(STATUS "Module ${module_name} is excluded. Skipping...") + list(REMOVE_ITEM ADDED_MODULES_LIST ${module_name}) else() # Construct the path to the module set(module_path "${MODULES_DIR}/${module_name}") @@ -108,28 +112,6 @@ function(add_module_group group_modules) endforeach() endfunction() -list(APPEND FINAL_MODULES_LIST "") - -# Parse and add extra modules specified by the user -separate_arguments(INCLUDE_MODULES_LIST UNIX_COMMAND "${INCLUDE_MODULES}") -message( - STATUS - "Extra modules (if module already included already from group is ignored): - ${INCLUDE_MODULES_LIST}") -list(APPEND FINAL_MODULES_LIST ${INCLUDE_MODULES_LIST}) - -# Exclude modules that were explicitly excluded by the user -separate_arguments(EXCLUDE_MODULES_LIST UNIX_COMMAND "${EXCLUDE_MODULES}") -message(STATUS "Excluded modules (exlcude even if in included modules): - ${EXCLUDE_MODULES_LIST}") -foreach(module_name IN LISTS EXCLUDE_MODULES_LIST) - # if in list remove it and print a message - if(";${FINAL_MODULES_LIST};" MATCHES ";${module_name};") - list(REMOVE_ITEM FINAL_MODULES_LIST ${module_name}) - message(STATUS "Removed module: ${module_name}") - endif() -endforeach() - # Define targets before adding the groups and modules, so that we can add # dependencies to them. add_custom_target( @@ -140,8 +122,19 @@ add_custom_target( add_custom_target(kamailio_docs_man COMMENT "Generating man pages") +# Parse and add extra modules specified by the user +separate_arguments(INCLUDE_MODULES_LIST UNIX_COMMAND "${INCLUDE_MODULES}") +message( + STATUS + "Extra modules (if module already included already from group is ignored): + ${INCLUDE_MODULES_LIST}") +list(APPEND USER_MODULES_LIST ${INCLUDE_MODULES_LIST}) + +separate_arguments(EXCLUDED_MODULES_LIST UNIX_COMMAND "${EXCLUDE_MODULES}") +message(STATUS "Excluded modules (exlcude even if in included modules): + ${EXCLUDED_MODULES_LIST}") + # Add each group of modules -add_module_group("${FINAL_MODULES_LIST}") foreach(group IN LISTS FULL_MODULE_GROUP_NAMES) get_property(MODULES_IN_GROUP VARIABLE PROPERTY "${group}") if(VERBOSE) @@ -149,10 +142,12 @@ foreach(group IN LISTS FULL_MODULE_GROUP_NAMES) endif() add_module_group("${MODULES_IN_GROUP}") endforeach() +add_module_group("${USER_MODULES_LIST}") get_property(ADDED_MODULES_LIST GLOBAL PROPERTY ADDED_MODULES_LIST) message(STATUS "Modules to be built: ${ADDED_MODULES_LIST}") # TODO: Comment is not showing. probably a bug in CMAKE +# https://gitlab.kitware.com/cmake/cmake/-/issues/26571 add_custom_target(modules COMMENT "Building modules") add_dependencies(modules ${ADDED_MODULES_LIST})

2 weeks, 5 days

git:master:81b84ef8: parser/sdp: more details in logs for setting fmtp payload

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 81b84ef83f59981b6e5f199055e9ab6a94c58b38 URL: https://github.com/kamailio/kamailio/commit/81b84ef83f59981b6e5f199055e9ab6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-17T09:31:42+01:00 parser/sdp: more details in logs for setting fmtp payload --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/81b84ef83f59981b6e5f199055e9ab6… Patch: https://github.com/kamailio/kamailio/commit/81b84ef83f59981b6e5f199055e9ab6… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index 06fc411f502..5eb04b0c047 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -233,7 +233,13 @@ void set_sdp_payload_attr(sdp_payload_attr_t *payload_attr, str *rtp_enc, void set_sdp_payload_fmtp(sdp_payload_attr_t *payload_attr, str *fmtp_string) { if(payload_attr == NULL) { - LM_ERR("Invalid payload location\n"); + if(fmtp_string != NULL && fmtp_string->s != NULL + && fmtp_string->len > 0) { + LM_ERR("Invalid payload location - fmtp: %.*s\n", fmtp_string->len, + fmtp_string->s); + } else { + LM_ERR("Invalid payload location\n"); + } return; } payload_attr->fmtp_string.s = fmtp_string->s; @@ -354,6 +360,8 @@ sdp_payload_attr_t *get_sdp_payload4payload( } } + LM_DBG("payload not found: %.*s\n", rtp_payload->len, rtp_payload->s); + return NULL; }

2 weeks, 5 days

← Newer
1
...
6
7
8
9
10
11
12
...
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