sr-dev January 2024

sr-dev@lists.kamailio.org

19 participants
315 discussions

git:master:fe5c7125: outbound: update to OpenSSL 3 API
by S-P Chan 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: fe5c7125c66e37d2db032a63328ad713738a4b0c URL: https://github.com/kamailio/kamailio/commit/fe5c7125c66e37d2db032a63328ad71… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-15T21:32:53+08:00 outbound: update to OpenSSL 3 API --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fe5c7125c66e37d2db032a63328ad71… Patch: https://github.com/kamailio/kamailio/commit/fe5c7125c66e37d2db032a63328ad71… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 32f10f6cdb9..e2e3a86a73b 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -79,8 +79,13 @@ static void *mod_init_openssl(void *arg) { if(flow_token_secret.s) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); +#if OPENSSL_VERSION_NUMBER < 0x030000000L SHA1((const unsigned char *)flow_token_secret.s, flow_token_secret.len, (unsigned char *)ob_key.s); +#else + EVP_Q_digest(NULL, "SHA1", NULL, flow_token_secret.s, + flow_token_secret.len, (unsigned char *)ob_key.s, NULL); +#endif } else { if(RAND_bytes((unsigned char *)ob_key.s, ob_key.len) == 0) { LM_ERR("unable to get %d cryptographically strong pseudo-"

1 0

git:master:47303fc3: Makefile.defs: remove unused define WITH_XAVP, its not used anymore from the code
by Henning Westerholt 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: 47303fc34d4795edc7b58569fb97e7b0532b0367 URL: https://github.com/kamailio/kamailio/commit/47303fc34d4795edc7b58569fb97e7b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-01-15T12:07:16Z Makefile.defs: remove unused define WITH_XAVP, its not used anymore from the code --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/47303fc34d4795edc7b58569fb97e7b… Patch: https://github.com/kamailio/kamailio/commit/47303fc34d4795edc7b58569fb97e7b… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 7a4b7418670..b088bcfffe2 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -727,7 +727,6 @@ C_DEFS+= -DSHM_MMAP \ -DUSE_DNS_FAILOVER \ -DUSE_DST_BLOCKLIST \ -DUSE_NAPTR \ - -DWITH_XAVP \ #-DUSE_DNS_CACHE_STATS \ #-DUSE_DST_BLOCKLIST_STATS \ #-DDNS_WATCHDOG_SUPPORT \

1 0

git:master:555530c7: doc/tutorial: remove unused define WITH_XAVP, its not used anymore from the code
by Henning Westerholt 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: 555530c70f8f7034046e0b81f4a8469ed76bb405 URL: https://github.com/kamailio/kamailio/commit/555530c70f8f7034046e0b81f4a8469… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-01-15T12:06:54Z doc/tutorial: remove unused define WITH_XAVP, its not used anymore from the code --- Modified: doc/tutorials/cfg_list/Makefile Modified: doc/tutorials/counter_list/Makefile Modified: doc/tutorials/rpc_list/Makefile Modified: doc/tutorials/select_list/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/555530c70f8f7034046e0b81f4a8469… Patch: https://github.com/kamailio/kamailio/commit/555530c70f8f7034046e0b81f4a8469… --- diff --git a/doc/tutorials/cfg_list/Makefile b/doc/tutorials/cfg_list/Makefile index cda24264d1c..66aa377d50d 100644 --- a/doc/tutorials/cfg_list/Makefile +++ b/doc/tutorials/cfg_list/Makefile @@ -72,7 +72,7 @@ c_defs=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES \ -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR \ - -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ + -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS \ -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT \ -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 \ diff --git a/doc/tutorials/counter_list/Makefile b/doc/tutorials/counter_list/Makefile index 0ef48b23602..7cef0f72103 100644 --- a/doc/tutorials/counter_list/Makefile +++ b/doc/tutorials/counter_list/Makefile @@ -66,7 +66,7 @@ c_defs=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES \ -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR \ - -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ + -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS \ -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT \ -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 \ diff --git a/doc/tutorials/rpc_list/Makefile b/doc/tutorials/rpc_list/Makefile index ac838ef7dcd..c620793f858 100644 --- a/doc/tutorials/rpc_list/Makefile +++ b/doc/tutorials/rpc_list/Makefile @@ -139,7 +139,7 @@ c_defsX=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES \ -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR \ - -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ + -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS \ -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT \ -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 \ diff --git a/doc/tutorials/select_list/Makefile b/doc/tutorials/select_list/Makefile index 50be57d3a8a..5f3a3282291 100644 --- a/doc/tutorials/select_list/Makefile +++ b/doc/tutorials/select_list/Makefile @@ -68,7 +68,7 @@ c_defs=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES \ -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR \ - -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ + -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS \ -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT \ -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 \

1 0

git:master:6f962070: docs/scripts: remove unused define WITH_XAVP, its not used anymore from the code
by Henning Westerholt 15 Jan '24

15 Jan '24

Module: kamailio Branch: master Commit: 6f9620704c661151415ad723e5f0b31f34b70c1d URL: https://github.com/kamailio/kamailio/commit/6f9620704c661151415ad723e5f0b31… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-01-15T12:06:25Z docs/scripts: remove unused define WITH_XAVP, its not used anymore from the code --- Modified: doc/scripts/cdefs2doc/dump_cfg_defs.pl Modified: doc/scripts/cdefs2doc/dump_counters.pl Modified: doc/scripts/cdefs2doc/dump_rpcs.pl Modified: doc/scripts/cdefs2doc/dump_selects.pl --- Diff: https://github.com/kamailio/kamailio/commit/6f9620704c661151415ad723e5f0b31… Patch: https://github.com/kamailio/kamailio/commit/6f9620704c661151415ad723e5f0b31…

1 0

git:master:2ffeaf6f: usrloc: fix condition for keepalive interval
by Daniel-Constantin Mierla 15 Jan '24

15 Jan '24

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; }

1 0

git:master:4d8e888c: usrloc: add ka_randomize to ka_interval when checking for keepalive
by Daniel-Constantin Mierla 15 Jan '24

15 Jan '24

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;

1 0

git:master:b3e19d8c: lcr: prefix global variable with short name
by Daniel-Constantin Mierla 15 Jan '24

15 Jan '24

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); } }

1 0

git:master:e6836cf2: registrar: prefix global variables with short name
by Daniel-Constantin Mierla 15 Jan '24

15 Jan '24

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…

1 0

git:master:82ae289d: sanity: prefix global variables with short name
by Daniel-Constantin Mierla 15 Jan '24

15 Jan '24

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 */

1 0

git:master:7867a29d: siptrace: prefix global variables with short name
by Daniel-Constantin Mierla 15 Jan '24

15 Jan '24

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…

1 0

← 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