sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
296 discussions

[kamailio/kamailio] cmake: should we use >= 3.13, i.e., "more modern cmake" generation? (Issue #4078)
by space88man 28 Jan '25

28 Jan '25

### Description From the cmake timeline 3.0(2014) is called "modern cmake" and ~3.12/3.13(2018) is "more modern cmake" : https://www.youtube.com/watch?v=y7ndUhdQuU8 Since we are doing a major renovation on the kamailio build system should we target the "more modern" generation (that is already > 5 years old). This will encourage the project to follow cmake best practices. Ping @xkaraman @miconda Versions in debian: buster(3.13) bullseye(3.25) bookworm/trixie(3.30) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4078 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4078(a)github.com>

8 25

[kamailio/kamailio] outbound: Fix flow_token_secret bug (PR #4125)
by Xenofon Karamanos 28 Jan '25

28 Jan '25

#### 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 - [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:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes a bug where when `flow_token_secret` was provided, it was not initialized properly and always set to an empty string. - flow_token_secret is of type str and not char* - check the length of the string instead of memory for initialization You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4125 -- Commit Summary -- * outbound: Fix flow_token_secret bug -- File Changes -- M src/modules/outbound/outbound_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4125.patch https://github.com/kamailio/kamailio/pull/4125.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4125 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4125(a)github.com>

3 4

git:master:046ba41e: outbound: Fix flow_token_secret bug
by Henning Westerholt 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 046ba41e431fec7fad0c82a9091ea9e27d9f677d URL: https://github.com/kamailio/kamailio/commit/046ba41e431fec7fad0c82a9091ea9e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-28T17:11:49+01:00 outbound: Fix flow_token_secret bug - flow_token_secret is of type str and not char* - check the length of the string instead of memory for initialization --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/046ba41e431fec7fad0c82a9091ea9e… Patch: https://github.com/kamailio/kamailio/commit/046ba41e431fec7fad0c82a9091ea9e… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index f3c80f18c15..f2e0c7dbc3d 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -66,7 +66,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"force_outbound_flag", PARAM_INT, &ob_force_flag}, {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {"flow_token_secret", PARAM_STR, &flow_token_secret}, {0, 0, 0} }; @@ -86,7 +86,7 @@ struct module_exports exports = { static void mod_init_openssl(void) { - if(flow_token_secret.s) { + if(flow_token_secret.s && flow_token_secret.len > 0) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); #if OPENSSL_VERSION_NUMBER < 0x030000000L

1 0

git:master:99d36df0: cmake/json: Remove find_package call. Use pkg-config instead.
by Xenofon Karamanos 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 99d36df0a15bbb960b2d7ee5916d65a55b9b26cd URL: https://github.com/kamailio/kamailio/commit/99d36df0a15bbb960b2d7ee5916d65a… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-28T14:05:25Z cmake/json: Remove find_package call. Use pkg-config instead. --- Modified: src/modules/json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/99d36df0a15bbb960b2d7ee5916d65a… Patch: https://github.com/kamailio/kamailio/commit/99d36df0a15bbb960b2d7ee5916d65a… --- diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt index 72df4d390f5..5d791dbd03d 100644 --- a/src/modules/json/CMakeLists.txt +++ b/src/modules/json/CMakeLists.txt @@ -2,13 +2,18 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(json-c CONFIG) - -if(NOT json-c_FOUND) - message(STATUS "json-c not found. looking with pkg-config") - find_package(PkgConfig REQUIRED) - pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) - add_library(json-c::json-c ALIAS PkgConfig::json-c) -endif() +# TODO: When we have a proper cmake config file for json-c for most OS, we can +# use that instead of pkg-config. +# json-c v 0.14 and 0.15 have wrong include directories in their cmake config +# files. uncomment the following line when we have a proper cmake config file +# for json-c for most OS. +# find_package(json-c 0.16 CONFIG) + +# if(NOT json-c_FOUND) +message(STATUS "json-c not found. looking with pkg-config") +find_package(PkgConfig REQUIRED) +pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) +add_library(json-c::json-c ALIAS PkgConfig::json-c) +# endif() target_link_libraries(${module_name} PRIVATE json-c::json-c)

1 0

git:master:532744ee: cmake/json: Use CONFIG mode
by Xenofon Karamanos 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 532744eebf1014939c4ccd9a6aa4e7d6fbb454ac URL: https://github.com/kamailio/kamailio/commit/532744eebf1014939c4ccd9a6aa4e7d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-28T11:18:24Z cmake/json: Use CONFIG mode --- Modified: src/modules/json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/532744eebf1014939c4ccd9a6aa4e7d… Patch: https://github.com/kamailio/kamailio/commit/532744eebf1014939c4ccd9a6aa4e7d… --- diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt index c4cbf81440c..72df4d390f5 100644 --- a/src/modules/json/CMakeLists.txt +++ b/src/modules/json/CMakeLists.txt @@ -2,7 +2,8 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(json-c QUIET) +find_package(json-c CONFIG) + if(NOT json-c_FOUND) message(STATUS "json-c not found. looking with pkg-config") find_package(PkgConfig REQUIRED)

1 0

git:6.0:3a480f03: etc/kamailio.cfg: close comment for tls_threads_mode
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 3a480f03fa54855059b72db8304f47cca7ee753e URL: https://github.com/kamailio/kamailio/commit/3a480f03fa54855059b72db8304f47c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:14:00+01:00 etc/kamailio.cfg: close comment for tls_threads_mode (cherry picked from commit d8d627eff7de268a487d7f91cc52e7ba8a6c708e) --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/3a480f03fa54855059b72db8304f47c… Patch: https://github.com/kamailio/kamailio/commit/3a480f03fa54855059b72db8304f47c… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index a61227d4173..a06e09fdc77 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -234,9 +234,10 @@ tls_max_connections=2048 /* For OpenSSL 3 integration * functions calling libssl3 can be invoked in a transient thread * 0: disable threaded calls - * 1: use thread executors for process#0 only - * 2: no thread executors, but use atfork handler to reset thread-locals to NULL + * 1: use thread executors for process #0 only + * 2: no thread executors, but use atfork handler to reset thread-locals to NULL */ tls_threads_mode=2 + #!endif /* set it to yes to enable sctp and load sctp.so module */

1 0

git:6.0:b4718cd7: http_async_client: check returned cell inside check_multi_info()
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: b4718cd7dca8e037664dbc49a1cfac684906ecea URL: https://github.com/kamailio/kamailio/commit/b4718cd7dca8e037664dbc49a1cfac6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:50+01:00 http_async_client: check returned cell inside check_multi_info() (cherry picked from commit b16550fa72d23084b4221769fe74b1f3c357c9fd) --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/b4718cd7dca8e037664dbc49a1cfac6… Patch: https://github.com/kamailio/kamailio/commit/b4718cd7dca8e037664dbc49a1cfac6… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index 30ae016d720..7edc0ddc1a0 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -604,7 +604,7 @@ void check_multi_info(struct http_m_global *g) CURL *easy; CURLcode res; - struct http_m_cell *cell; + struct http_m_cell *cell = NULL; double tmp_time; LM_DBG("REMAINING: %d\n", g->still_running); @@ -616,9 +616,15 @@ void check_multi_info(struct http_m_global *g) curl_easy_getinfo(easy, CURLINFO_EFFECTIVE_URL, &eff_url); - LM_DBG("DONE: %s => (%d) %s\n", eff_url, res, cell->error); + LM_DBG("DONE: %s => (%d)\n", eff_url, res); cell = http_m_cell_lookup(easy); + if(cell == NULL) { + LM_ERR("failed to get the cell\n"); + curl_multi_remove_handle(g->multi, easy); + curl_easy_cleanup(easy); + continue; + } if(msg->data.result != 0) { LM_ERR("handle %p returned error %d: %s\n", easy, res, cell->error);

1 0

git:6.0:dfa9239c: htable: wrapped maco code in do {} while(0)
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: dfa9239cf6df7644e9fe6b83cfc33aff518a19c6 URL: https://github.com/kamailio/kamailio/commit/dfa9239cf6df7644e9fe6b83cfc33af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:39+01:00 htable: wrapped maco code in do {} while(0) (cherry picked from commit 65a296b3478503ed3519ea9156d8f46f5cb9ce2a) --- Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/dfa9239cf6df7644e9fe6b83cfc33af… Patch: https://github.com/kamailio/kamailio/commit/dfa9239cf6df7644e9fe6b83cfc33af… --- diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 4e0757f237b..d9fc187e722 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -144,10 +144,19 @@ ht_cell_t *ht_iterator_get_current(str *iname); void ht_slot_lock(ht_t *ht, int idx); void ht_slot_unlock(ht_t *ht, int idx); -#define HT_UPDATE_EXPIRE(ht, it, now) \ - if(ht->updateexpire || (now && it->expire && it->expire < now)) \ - it->expire = now + ht->htexpire -#define HT_COPY_EXPIRE(ht, it, now, src) \ - HT_UPDATE_EXPIRE(ht, it, now); \ - else it->expire = src->expire +#define HT_UPDATE_EXPIRE(ht, it, now) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } \ + } while(0) +#define HT_COPY_EXPIRE(ht, it, now, src) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } else { \ + it->expire = src->expire; \ + } \ + } while(0) + #endif

1 0

git:6.0:b38925b0: htable: Fix expiry on assignment
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: b38925b0b3628539840de2b6240da75b9f9f3cc6 URL: https://github.com/kamailio/kamailio/commit/b38925b0b3628539840de2b6240da75… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:31+01:00 htable: Fix expiry on assignment Update cell expiry on assignment for htables w/o updateexpiry (analogue to #4079). (cherry picked from commit 75994f40c99ffa2c7c33e5fce5e3d3cd8db7d780) --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/b38925b0b3628539840de2b6240da75… Patch: https://github.com/kamailio/kamailio/commit/b38925b0b3628539840de2b6240da75… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 9190dd310ff..47b4b975194 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -496,9 +496,7 @@ int ht_set_cell_ex( it->value.s.s[it->value.s.len] = '\0'; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } @@ -514,11 +512,7 @@ int ht_set_cell_ex( cell->next = it->next; cell->prev = it->prev; if(exv <= 0) { - if(ht->updateexpire) { - cell->expire = now + ht->htexpire; - } else { - cell->expire = it->expire; - } + HT_COPY_EXPIRE(ht, cell, now, it); } else { it->expire = now + exv; } @@ -535,9 +529,7 @@ int ht_set_cell_ex( it->value.n = val->n; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } @@ -556,11 +548,7 @@ int ht_set_cell_ex( return -1; } if(exv <= 0) { - if(ht->updateexpire) { - cell->expire = now + ht->htexpire; - } else { - cell->expire = it->expire; - } + HT_COPY_EXPIRE(ht, cell, now, it); } else { it->expire = now + exv; } @@ -578,9 +566,7 @@ int ht_set_cell_ex( it->value.n = val->n; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 5ac11b9bb00..4e0757f237b 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -143,4 +143,11 @@ ht_cell_t *ht_iterator_get_current(str *iname); void ht_slot_lock(ht_t *ht, int idx); void ht_slot_unlock(ht_t *ht, int idx); + +#define HT_UPDATE_EXPIRE(ht, it, now) \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) \ + it->expire = now + ht->htexpire +#define HT_COPY_EXPIRE(ht, it, now, src) \ + HT_UPDATE_EXPIRE(ht, it, now); \ + else it->expire = src->expire #endif

1 0

git:6.0:9c44aec6: core/parser/sdp: proper test for media ip separator
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 9c44aec667fc3c088612dd31935bce2eb082812d URL: https://github.com/kamailio/kamailio/commit/9c44aec667fc3c088612dd31935bce2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:23+01:00 core/parser/sdp: proper test for media ip separator (cherry picked from commit 200cdb318569191cd012dfe99b252f98fe9623b9) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/9c44aec667fc3c088612dd31935bce2… Patch: https://github.com/kamailio/kamailio/commit/9c44aec667fc3c088612dd31935bce2… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 61022b6148f..893ef0e58a4 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -561,7 +561,7 @@ int extract_mediaip(str *body, str *mediaip, int *pf, char *line) * - for length, at least 6: ' IP[4|6] x...' * - white space after */ - if(cp + 6 > mediaip->s + mediaip->len && cp[4] != ' ') { + if(cp + 6 > mediaip->s + mediaip->len || cp[4] != ' ') { LM_ERR("invalid content for `%s' line\n", line); return -1; }

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
30
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