sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
301 discussions

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

git:6.0:9e21ce85: presence: do not break on one notify sending failure
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 9e21ce85d0c97679f9e14f9c31108f2dcdad772e URL: https://github.com/kamailio/kamailio/commit/9e21ce85d0c97679f9e14f9c31108f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:11+01:00 presence: do not break on one notify sending failure - try all of them, debug message with successful and failure counters - GH #4118 (cherry picked from commit 65e51b776290a1981e9ac27fbe6b47813516bc8b) --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/9e21ce85d0c97679f9e14f9c31108f2… Patch: https://github.com/kamailio/kamailio/commit/9e21ce85d0c97679f9e14f9c31108f2… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 47a11b23183..191cac0d04b 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1557,6 +1557,8 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) subs_t *subs_array = NULL, *s = NULL; str *notify_body = NULL, *aux_body = NULL; int ret_code = -1; + int retOK = 0; + int retErr = 0; subs_array = get_subs_dialog(pres_uri, event, NULL); if(subs_array == NULL) { @@ -1586,7 +1588,9 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) < 0) { LM_ERR("Could not send notify for [event]=%.*s\n", event->name.len, event->name.s); - goto done; + retErr++; + } else { + retOK++; } if(aux_body != NULL) { @@ -1599,7 +1603,10 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) } } - ret_code = 1; + LM_DBG("sent ok: %d - err: %d\n", retOK, retErr); + if(retOK > 0) { + ret_code = 1; + } done: free_subs_list(subs_array, PKG_MEM_TYPE, 0);

1 0

git:6.0:a5ac9e04: core: more checks for extract_candidate()
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: a5ac9e04b91971da44256373904450501f9a4493 URL: https://github.com/kamailio/kamailio/commit/a5ac9e04b91971da442563739044505… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:12:47+01:00 core: more checks for extract_candidate() (cherry picked from commit 3198b66aa5dbda1c6a03f46a610073671cbd5157) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/a5ac9e04b91971da442563739044505… Patch: https://github.com/kamailio/kamailio/commit/a5ac9e04b91971da442563739044505… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 483cfdec70e..61022b6148f 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -314,7 +314,7 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream) int len, fl; sdp_ice_attr_t *ice_attr; - if((body->len < 12) || (strncasecmp(body->s, "a=candidate:", 12) != 0)) { + if((body->len <= 12) || (strncasecmp(body->s, "a=candidate:", 12) != 0)) { /*LM_DBG("We are not pointing to an a=candidate: attribute =>`%.*s'\n", body->len, body->s); */ return -1; } @@ -332,6 +332,10 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream) start = space + 1; len = len - (space - start + 1); + if(start + len > body->s + body->len) { + LM_ERR("no component in `a=candidate'\n"); + return -1; + } space = memchr(start, 32, len); if(space == NULL) { LM_ERR("no component in `a=candidate'\n");

1 0

git:6.0:6e2a37c4: core: extended logs for subst lumps
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 6e2a37c449a14c03f9c086ae9fb61729d8fce393 URL: https://github.com/kamailio/kamailio/commit/6e2a37c449a14c03f9c086ae9fb6172… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:12:31+01:00 core: extended logs for subst lumps (cherry picked from commit d307fee57b7a8a7e0b5ccf0956464a159e156b73) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/6e2a37c449a14c03f9c086ae9fb6172… Patch: https://github.com/kamailio/kamailio/commit/6e2a37c449a14c03f9c086ae9fb6172…

1 0

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

28 Jan '25

Module: kamailio Branch: master Commit: d8d627eff7de268a487d7f91cc52e7ba8a6c708e URL: https://github.com/kamailio/kamailio/commit/d8d627eff7de268a487d7f91cc52e7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:10:33+01:00 etc/kamailio.cfg: close comment for tls_threads_mode --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/d8d627eff7de268a487d7f91cc52e7b… Patch: https://github.com/kamailio/kamailio/commit/d8d627eff7de268a487d7f91cc52e7b… --- 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

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