sr-dev January 2024

sr-dev@lists.kamailio.org

19 participants
311 discussions

git:master:2ffeaf6f: usrloc: fix condition for keepalive interval

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2ffeaf6f480cbe1581395519b252c2bf35291ef7 URL: https://github.com/kamailio/kamailio/commit/2ffeaf6f480cbe1581395519b252c2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-15T12:15:58+01:00 usrloc: fix condition for keepalive interval --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/2ffeaf6f480cbe1581395519b252c2b… Patch: https://github.com/kamailio/kamailio/commit/2ffeaf6f480cbe1581395519b252c2b… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 8d0fc259bdf..e5a013b45a3 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -164,7 +164,7 @@ int ul_ka_urecord(urecord_t *ur) } if(ul_ka_interval > 0 && uc->last_keepalive > 0) { ka_limit = ul_ka_interval + (fastrand() % ul_ka_randomize); - if((uc->last_keepalive + ka_limit) < tnow) { + if((uc->last_keepalive + ka_limit) > tnow) { /* not yet the time for keepalive */ continue; }

11 months, 4 weeks

git:master:4d8e888c: usrloc: add ka_randomize to ka_interval when checking for keepalive

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4d8e888c805ddecdb7227350c1c01e52c235ffb5 URL: https://github.com/kamailio/kamailio/commit/4d8e888c805ddecdb7227350c1c01e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-15T10:37:42+01:00 usrloc: add ka_randomize to ka_interval when checking for keepalive --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/4d8e888c805ddecdb7227350c1c01e5… Patch: https://github.com/kamailio/kamailio/commit/4d8e888c805ddecdb7227350c1c01e5… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index eba6bec5c0d..8d0fc259bdf 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -163,7 +163,7 @@ int ul_ka_urecord(urecord_t *ur) } } if(ul_ka_interval > 0 && uc->last_keepalive > 0) { - ka_limit = ul_ka_interval - (fastrand() % ul_ka_randomize); + ka_limit = ul_ka_interval + (fastrand() % ul_ka_randomize); if((uc->last_keepalive + ka_limit) < tnow) { /* not yet the time for keepalive */ continue;

11 months, 4 weeks

git:master:b3e19d8c: lcr: prefix global variable with short name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b3e19d8c97c099823ad439167b07ccbb30d05a25 URL: https://github.com/kamailio/kamailio/commit/b3e19d8c97c099823ad439167b07ccb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-15T10:15:52+01:00 lcr: prefix global variable with short name --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b3e19d8c97c099823ad439167b07ccb… Patch: https://github.com/kamailio/kamailio/commit/b3e19d8c97c099823ad439167b07ccb… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 5442c59601a..dac215a9eb5 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -240,7 +240,7 @@ struct gw_info **gw_pt = (struct gw_info **)NULL; struct rule_id_info **rule_id_hash_table = (struct rule_id_info **)NULL; /* Pinging related vars */ -struct tm_binds tmb; +struct tm_binds _lcr_tmb; void ping_timer(unsigned int ticks, void *param); unsigned int ping_valid_reply_codes[MAX_NO_OF_REPLY_CODES]; str ping_method = {"OPTIONS", 7}; @@ -622,7 +622,7 @@ static int mod_init(void) return -1; } if(ping_interval_param > 0) { - if(load_tm_api(&tmb) == -1) { + if(load_tm_api(&_lcr_tmb) == -1) { LM_ERR("could not bind tm api\n"); return -1; } @@ -2951,7 +2951,8 @@ void ping_timer(unsigned int ticks, void *param) uac_r.ssock = &ping_socket_param; } - if(tmb.t_request(&uac_r, &uri, &uri, &ping_from_param, 0) < 0) { + if(_lcr_tmb.t_request(&uac_r, &uri, &uri, &ping_from_param, 0) + < 0) { LM_ERR("unable to ping [%.*s]\n", uri.len, uri.s); } }

11 months, 4 weeks

git:master:e6836cf2: registrar: prefix global variables with short name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e6836cf2dc772fd7e5b4322d4243ca3c2177de1f URL: https://github.com/kamailio/kamailio/commit/e6836cf2dc772fd7e5b4322d4243ca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-15T10:11:22+01:00 registrar: prefix global variables with short name --- Modified: src/modules/registrar/api.c Modified: src/modules/registrar/lookup.c Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/registrar.h Modified: src/modules/registrar/regpv.c Modified: src/modules/registrar/reply.c Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/e6836cf2dc772fd7e5b4322d4243ca3… Patch: https://github.com/kamailio/kamailio/commit/e6836cf2dc772fd7e5b4322d4243ca3…

11 months, 4 weeks

git:master:82ae289d: sanity: prefix global variables with short name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 82ae289d8f549b142aa0631b6225838bbbc1f446 URL: https://github.com/kamailio/kamailio/commit/82ae289d8f549b142aa0631b6225838… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-15T10:00:34+01:00 sanity: prefix global variables with short name --- Modified: src/modules/sanity/sanity.c Modified: src/modules/sanity/sanity_mod.c Modified: src/modules/sanity/sanity_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/82ae289d8f549b142aa0631b6225838… Patch: https://github.com/kamailio/kamailio/commit/82ae289d8f549b142aa0631b6225838… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index 7ec9fc6c26b..fa3d0493883 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -81,12 +81,13 @@ int ki_sanity_reply(sip_msg_t *msg) || msg->id != _ksr_sanity_info.msgid || msg->pid != _ksr_sanity_info.msgpid) { LM_INFO("no sanity reply info set - sending 500\n"); - if(slb.zreply(msg, 500, "Server Sanity Failure") < 0) { + if(_sanity_slb.zreply(msg, 500, "Server Sanity Failure") < 0) { return -1; } return 1; } - if(slb.zreply(msg, _ksr_sanity_info.code, _ksr_sanity_info.reason) + if(_sanity_slb.zreply( + msg, _ksr_sanity_info.code, _ksr_sanity_info.reason) < 0) { return -1; } @@ -120,7 +121,7 @@ int sanity_reply(sip_msg_t *msg, int code, char *reason) _ksr_sanity_info.msgpid = msg->pid; } else { if(!(msg->msg_flags & FL_MSG_NOREPLY)) { - if(slb.zreply(msg, code, reason) < 0) { + if(_sanity_slb.zreply(msg, code, reason) < 0) { return -1; } } diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 7a496ca2a83..99f64fbf082 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -34,7 +34,7 @@ MODULE_VERSION #define PROXY_REQUIRE_DEF "" -str pr_str = STR_STATIC_INIT(PROXY_REQUIRE_DEF); +static str _sanity_prval = STR_STATIC_INIT(PROXY_REQUIRE_DEF); int default_msg_checks = SANITY_DEFAULT_CHECKS; int default_uri_checks = SANITY_DEFAULT_URI_CHECKS; @@ -43,7 +43,7 @@ int ksr_sanity_noreply = 0; str_list_t *proxyrequire_list = NULL; -sl_api_t slb; +sl_api_t _sanity_slb; static int mod_init(void); static int w_sanity_check(sip_msg_t *_msg, char *_msg_check, char *_uri_check); @@ -70,7 +70,7 @@ static cmd_export_t cmds[] = {{"sanity_check", (cmd_function)w_sanity_check, 0, static param_export_t params[] = { {"default_checks", PARAM_INT, &default_msg_checks}, {"uri_checks", PARAM_INT, &default_uri_checks}, - {"proxy_require", PARAM_STR, &pr_str}, + {"proxy_require", PARAM_STR, &_sanity_prval}, {"autodrop", PARAM_INT, &_sanity_drop}, {"noreply", PARAM_INT, &ksr_sanity_noreply}, {0, 0, 0}}; @@ -102,13 +102,13 @@ static int mod_init(void) ksr_sanity_info_init(); /* bind the SL API */ - if(sl_load_api(&slb) != 0) { + if(sl_load_api(&_sanity_slb) != 0) { LM_ERR("cannot bind to SL API\n"); return -1; } LM_DBG("parsing proxy requires string:\n"); - ptr = parse_str_list(&pr_str); + ptr = parse_str_list(&_sanity_prval); proxyrequire_list = ptr; diff --git a/src/modules/sanity/sanity_mod.h b/src/modules/sanity/sanity_mod.h index 4ad92850e15..41e13359eb2 100644 --- a/src/modules/sanity/sanity_mod.h +++ b/src/modules/sanity/sanity_mod.h @@ -72,6 +72,6 @@ extern int default_checks; extern str_list_t *proxyrequire_list; -extern sl_api_t slb; +extern sl_api_t _sanity_slb; #endif /* MOD_SANITY_CHK_H */

11 months, 4 weeks

git:master:7867a29d: siptrace: prefix global variables with short name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7867a29d3f49d6bc149b9f556ae28ce089e841f4 URL: https://github.com/kamailio/kamailio/commit/7867a29d3f49d6bc149b9f556ae28ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-15T09:54:49+01:00 siptrace: prefix global variables with short name --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/7867a29d3f49d6bc149b9f556ae28ce… Patch: https://github.com/kamailio/kamailio/commit/7867a29d3f49d6bc149b9f556ae28ce…

11 months, 4 weeks

[kamailio/kamailio] Ticket to monitor the progress of tls_wolfssl (Issue #3160)

by space88man

### Description This is an umbrella ticket to address issues with the WIP `tls_wolfssl` module ### Expected behavior The module behaves robustly under load testing and various configurations and thus can be accepted long-term in kamailio -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3160 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3160(a)github.com>

11 months, 4 weeks

[kamailio/kamailio] kamailio 5.7.2 & master - compile tls_wolfssl error (Issue #3610)

by badien

Compile tls_wolfssl error: checking dependency style of gcc... gcc3 checking whether make supports nested variables... (cached) yes ./configure: line 6164: syntax error near unexpected token `2.4.2' ./configure: line 6164: `LT_PREREQ(2.4.2)' make[2]: *** [Makefile:21: ../../../misc/external/wolfssl/build/include/wolfssl/options.h] Error 2 make[1]: *** [Makefile:508: modules] Error 1 make[1]: Leaving directory '/usr/local/src/kamailio-5.7/src' make: *** [Makefile:34: all] Error 2 Please check, thanks -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3610 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3610(a)github.com>

11 months, 4 weeks

git:5.7:bbbcb270: tls: remove thread-enablement on EVP_RAND_CTX

by S-P Chan

Module: kamailio Branch: 5.7 Commit: bbbcb27040c632642c50209455efbb8225888723 URL: https://github.com/kamailio/kamailio/commit/bbbcb27040c632642c50209455efbb8… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-14T14:44:47+08:00 tls: remove thread-enablement on EVP_RAND_CTX - with late initialisation it is not necessary to enable thread locking on EVP_RAND_CTX - the function remains but is not used in case requirements change with OpenSSL >= 3.2 (cherry-pick from 8dffc45ee91aeed839efb38d17040359dcac953a) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/bbbcb27040c632642c50209455efbb8… Patch: https://github.com/kamailio/kamailio/commit/bbbcb27040c632642c50209455efbb8… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 65f5ae72c65..629f69ad6b3 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -731,6 +731,12 @@ int tls_pre_init(void) * - executed before any mod_init() */ #if OPENSSL_VERSION_NUMBER >= 0x030000000L +/* + * With late initialisation it is not necessary to + * enable threading on the EVP_RAND_CTX. This function + * left here in case more complex requirements arise in + * OpenSSL >= 3.2. + */ long tls_h_mod_randctx(void *) { do { OSSL_LIB_CTX *osslglobal = NULL; @@ -768,7 +774,7 @@ long tls_h_mod_randctx(void *) { return 0L; } -#endif +#endif /* OPENSSL_VERSION_NUMBER */ int tls_h_mod_pre_init_f(void) { @@ -794,14 +800,21 @@ int tls_h_mod_pre_init_f(void) SSL_load_error_strings(); #endif +#if 0 #if OPENSSL_VERSION_NUMBER >= 0x030000000L + /* + * With deferred initialisation it is not necessary to enable threading + * on the EVP_RAND_CTX. We leave this block here as an example of how + * to do it in case of future requirements. + */ pthread_t tid; long rl; pthread_create(&tid, NULL, (void *(*)(void *))tls_h_mod_randctx, NULL); pthread_join(tid, (void **)&rl); if ((int)rl) return (int)rl; -#endif +#endif /* OPENSSL_VERSION_NUMBER */ +#endif /* 0 */ tls_mod_preinitialized = 1; return 0;

12 months

git:master:8dffc45e: tls: remove thread-enablement on EVP_RAND_CTX

by S-P Chan

Module: kamailio Branch: master Commit: 8dffc45ee91aeed839efb38d17040359dcac953a URL: https://github.com/kamailio/kamailio/commit/8dffc45ee91aeed839efb38d1704035… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-14T14:08:03+08:00 tls: remove thread-enablement on EVP_RAND_CTX - with late initialisation it is not necessary to enable thread locking on EVP_RAND_CTX - the function remains but is not used in case requirements change with OpenSSL >= 3.2 --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/8dffc45ee91aeed839efb38d1704035… Patch: https://github.com/kamailio/kamailio/commit/8dffc45ee91aeed839efb38d1704035… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index d077b41e08a..bb1d0f19207 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -733,6 +733,12 @@ int tls_pre_init(void) * - executed before any mod_init() */ #if OPENSSL_VERSION_NUMBER >= 0x030000000L +/* + * With late initialisation it is not necessary to + * enable threading on the EVP_RAND_CTX. This function + * left here in case more complex requirements arise in + * OpenSSL >= 3.2. + */ long tls_h_mod_randctx(void *) { do { OSSL_LIB_CTX *osslglobal = NULL; @@ -770,7 +776,7 @@ long tls_h_mod_randctx(void *) { return 0L; } -#endif +#endif /* OPENSSL_VERSION_NUMBER */ int tls_h_mod_pre_init_f(void) { @@ -796,14 +802,21 @@ int tls_h_mod_pre_init_f(void) SSL_load_error_strings(); #endif +#if 0 #if OPENSSL_VERSION_NUMBER >= 0x030000000L + /* + * With deferred initialisation it is not necessary to enable threading + * on the EVP_RAND_CTX. We leave this block here as an example of how + * to do it in case of future requirements. + */ pthread_t tid; long rl; pthread_create(&tid, NULL, (void *(*)(void *))tls_h_mod_randctx, NULL); pthread_join(tid, (void **)&rl); if ((int)rl) return (int)rl; -#endif +#endif /* OPENSSL_VERSION_NUMBER */ +#endif /* 0 */ tls_mod_preinitialized = 1; return 0;

12 months

← Newer
1
...
18
19
20
21
22
23
24
...
32
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 2024