sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:99fde923: tm: remove some commented out code in timer logic
by Henning Westerholt 19 Aug '22

19 Aug '22

Module: kamailio Branch: master Commit: 99fde923448d251fb0e04d443d9a2bffce15d1b1 URL: https://github.com/kamailio/kamailio/commit/99fde923448d251fb0e04d443d9a2bf… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-19T14:39:38Z tm: remove some commented out code in timer logic --- Modified: src/modules/tm/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/99fde923448d251fb0e04d443d9a2bf… Patch: https://github.com/kamailio/kamailio/commit/99fde923448d251fb0e04d443d9a2bf… --- diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index 8437b4ed40..fecb73b3a4 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -354,9 +354,6 @@ inline static void final_response_handler( { int silent; #ifdef USE_DNS_FAILOVER - /*int i; - int added_branches; - */ int branch_ret; int prev_branch; ticks_t now;

1 0

git:master:2ba21dfa: tls_wolfssl: add support for configuration option TLSv1.3 and TLSv1.3+
by S-P Chan 19 Aug '22

19 Aug '22

Module: kamailio Branch: master Commit: 2ba21dfaa5098c8a2dcf9185e1327c55a4e0e4bc URL: https://github.com/kamailio/kamailio/commit/2ba21dfaa5098c8a2dcf9185e1327c5… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-08-19T22:20:52+08:00 tls_wolfssl: add support for configuration option TLSv1.3 and TLSv1.3+ --- Modified: src/modules/tls_wolfssl/tls_cfg.c Modified: src/modules/tls_wolfssl/tls_domain.h Modified: src/modules/tls_wolfssl/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/2ba21dfaa5098c8a2dcf9185e1327c5… Patch: https://github.com/kamailio/kamailio/commit/2ba21dfaa5098c8a2dcf9185e1327c5…

1 0

git:master:ac4d7ce7: tls_wolfssl: add parser logic for previous commits related to TLSv1.3
by S-P Chan 19 Aug '22

19 Aug '22

Module: kamailio Branch: master Commit: ac4d7ce7bf153604e0e07d1003a1d078882c90f4 URL: https://github.com/kamailio/kamailio/commit/ac4d7ce7bf153604e0e07d1003a1d07… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-08-19T22:20:52+08:00 tls_wolfssl: add parser logic for previous commits related to TLSv1.3 --- Modified: src/modules/tls_wolfssl/tls_config.c --- Diff: https://github.com/kamailio/kamailio/commit/ac4d7ce7bf153604e0e07d1003a1d07… Patch: https://github.com/kamailio/kamailio/commit/ac4d7ce7bf153604e0e07d1003a1d07… --- diff --git a/src/modules/tls_wolfssl/tls_config.c b/src/modules/tls_wolfssl/tls_config.c index 16694616f1..282b4a26bb 100644 --- a/src/modules/tls_wolfssl/tls_config.c +++ b/src/modules/tls_wolfssl/tls_config.c @@ -125,6 +125,8 @@ static cfg_option_t methods[] = { {"TLSv1.1+", .val = TLS_USE_TLSv1_1_PLUS}, {"TLSv1.2", .val = TLS_USE_TLSv1_2}, {"TLSv1.2+", .val = TLS_USE_TLSv1_2_PLUS}, + {"TLSv1.3", .val = TLS_USE_TLSv1_3}, + {"TLSv1.3+", .val = TLS_USE_TLSv1_3_PLUS}, {0} };

1 0

git:master:377a23b8: tls_wolfssl: add timestamp and sni info for a session
by S-P Chan 19 Aug '22

19 Aug '22

Module: kamailio Branch: master Commit: 377a23b8f0152d9c61ddf17e4b95d7fa08dd11d9 URL: https://github.com/kamailio/kamailio/commit/377a23b8f0152d9c61ddf17e4b95d7f… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-08-19T22:20:52+08:00 tls_wolfssl: add timestamp and sni info for a session - ref: commit c0c1dcc100 for tls --- Modified: src/modules/tls_wolfssl/tls_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/377a23b8f0152d9c61ddf17e4b95d7f… Patch: https://github.com/kamailio/kamailio/commit/377a23b8f0152d9c61ddf17e4b95d7f… --- diff --git a/src/modules/tls_wolfssl/tls_rpc.c b/src/modules/tls_wolfssl/tls_rpc.c index 6ee5a14e023..887ac451aa4 100644 --- a/src/modules/tls_wolfssl/tls_rpc.c +++ b/src/modules/tls_wolfssl/tls_rpc.c @@ -115,6 +115,9 @@ static void tls_list(rpc_t* rpc, void* c) struct tls_extra_data* tls_d; struct tcp_connection* con; int i, len, timeout; + struct tm timestamp; + char timestamp_s[128]; + const char* sni; TCPCONN_LOCK; for(i = 0; i < TCP_ID_HASH_SIZE; i++) { @@ -132,8 +135,29 @@ static void tls_list(rpc_t* rpc, void* c) BUG("failed to convert destination ip"); dst_ip[len] = 0; timeout = TICKS_TO_S(con->timeout - get_ticks_raw()); - rpc->struct_add(handle, "ddsdsd", + timestamp = *localtime(&con->timestamp); + if (snprintf(timestamp_s, 128, "%d-%02d-%02d %02d:%02d:%02d", timestamp.tm_year + 1900, + timestamp.tm_mon + 1, timestamp.tm_mday, timestamp.tm_hour, + timestamp.tm_min, timestamp.tm_sec) < 0) { + timestamp_s[0] = 'N'; + timestamp_s[1] = '/'; + timestamp_s[2] = 'A'; + timestamp_s[3] = '\0'; + } + + if (tls_d) { + sni = wolfSSL_get_servername(tls_d->ssl, TLSEXT_NAMETYPE_host_name); + if (sni == NULL) { + sni = "N/A"; + } + } else { + sni = "N/A"; + } + + rpc->struct_add(handle, "dssdsdsd", "id", con->id, + "sni", sni, + "timestamp", timestamp_s, "timeout", timeout, "src_ip", src_ip, "src_port", con->rcv.src_port,

1 0

git:master:24cfce96: tm: improve comment related to dns failover, add debug output in this case
by Henning Westerholt 19 Aug '22

19 Aug '22

Module: kamailio Branch: master Commit: 24cfce96a1e9e970ab7661a4e188dab2b3542fd0 URL: https://github.com/kamailio/kamailio/commit/24cfce96a1e9e970ab7661a4e188dab… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-19T14:02:16Z tm: improve comment related to dns failover, add debug output in this case --- Modified: src/modules/tm/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/24cfce96a1e9e970ab7661a4e188dab… Patch: https://github.com/kamailio/kamailio/commit/24cfce96a1e9e970ab7661a4e188dab… --- diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index 4c821ba871..8437b4ed40 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -442,12 +442,14 @@ inline static void final_response_handler( BLST_ERR_TIMEOUT, &r_buf->dst, r_buf->my_T->uas.request); #endif #ifdef USE_DNS_FAILOVER - /* if this is an invite, the destination resolves to more ips, and - * it still hasn't passed more than fr_inv_timeout since we - * started, add another branch/uac */ + /* if this is an request, the destination resolves to more IPs, and + * it still hasn't passed more than max_inv_lifetime or + * max_noninv_lifetimesince we started, add another branch/uac */ if(cfg_get(core, core_cfg, use_dns_failover)) { now = get_ticks_raw(); if((s_ticks_t)(t->end_of_life - now) > 0) { + LM_DBG("send on branch %d failed, adding another branch\n", + r_buf->branch); branch_ret = add_uac_dns_fallback( t, t->uas.request, &t->uac[r_buf->branch], 0); prev_branch = -1;

1 0

git:master:d6b1c20d: tm: restore X/AVP values from initial transaction in DNS failover processing
by Henning Westerholt 19 Aug '22

19 Aug '22

Module: kamailio Branch: master Commit: d6b1c20d3ad94d9136cf247e67b7fc0d32b18d3b URL: https://github.com/kamailio/kamailio/commit/d6b1c20d3ad94d9136cf247e67b7fc0… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-09T14:11:59Z tm: restore X/AVP values from initial transaction in DNS failover processing - restore X/AVP values from initial transaction in DNS failover processing - the X/AVP context gets lost, so we need to re-create it from the transaction - otherwise modules that depends on the X/AVPs, e.g. topology hiding will not work - tested with one load-balancer and two proxy servers --- Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/d6b1c20d3ad94d9136cf247e67b7fc0… Patch: https://github.com/kamailio/kamailio/commit/d6b1c20d3ad94d9136cf247e67b7fc0… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index fbcf1b3e02..6b26f28f6a 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1042,6 +1042,8 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, t->uac[t->nr_of_outgoings].on_branch_failure = old_uac->on_branch_failure; /* copy branch flags */ t->uac[t->nr_of_outgoings].branch_flags = old_uac->branch_flags; + /* restore X/AVP values from initial transaction */ + tm_xdata_swap(t, 0, 0); if (cfg_get(tm, tm_cfg, reparse_on_dns_failover)){ /* Reuse the old buffer and only replace the via header.

2 6

git:master:9ceeabc2: Revert "tm: restore X/AVP values from initial transaction in DNS failover processing"
by Henning Westerholt 19 Aug '22

19 Aug '22

Module: kamailio Branch: master Commit: 9ceeabc299e08c944014c16ef54cd159b063be2e URL: https://github.com/kamailio/kamailio/commit/9ceeabc299e08c944014c16ef54cd15… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-19T13:15:53Z Revert "tm: restore X/AVP values from initial transaction in DNS failover processing" This reverts commit d6b1c20d3ad94d9136cf247e67b7fc0d32b18d3b. --- Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/9ceeabc299e08c944014c16ef54cd15… Patch: https://github.com/kamailio/kamailio/commit/9ceeabc299e08c944014c16ef54cd15… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 6b26f28f6a..fbcf1b3e02 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1042,8 +1042,6 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, t->uac[t->nr_of_outgoings].on_branch_failure = old_uac->on_branch_failure; /* copy branch flags */ t->uac[t->nr_of_outgoings].branch_flags = old_uac->branch_flags; - /* restore X/AVP values from initial transaction */ - tm_xdata_swap(t, 0, 0); if (cfg_get(tm, tm_cfg, reparse_on_dns_failover)){ /* Reuse the old buffer and only replace the via header.

1 0

git:master:399b34c6: tm: backup and restore X/AVP values from initial transaction in DNS failover processing
by Henning Westerholt 19 Aug '22

19 Aug '22

Module: kamailio Branch: master Commit: 399b34c6bd4e5cbfcf4dcb699755c393229fcb99 URL: https://github.com/kamailio/kamailio/commit/399b34c6bd4e5cbfcf4dcb699755c39… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-19T13:17:46Z tm: backup and restore X/AVP values from initial transaction in DNS failover processing - restore X/AVP values from initial transaction in DNS failover processing - the X/AVP context gets lost, so we need to re-create it from the transaction - otherwise modules that depends on the X/AVPs, e.g. topology hiding will not work - tested with one load-balancer and two proxy servers - previous fix d6b1c20d3ad94 was reverted, we now properly backup and restore --- Modified: src/modules/tm/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/399b34c6bd4e5cbfcf4dcb699755c39… Patch: https://github.com/kamailio/kamailio/commit/399b34c6bd4e5cbfcf4dcb699755c39… --- diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index a662920cab..4c821ba871 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -360,6 +360,7 @@ inline static void final_response_handler( int branch_ret; int prev_branch; ticks_t now; + tm_xlinks_t backup_xd; #endif #ifdef EXTRA_DEBUG @@ -450,11 +451,15 @@ inline static void final_response_handler( branch_ret = add_uac_dns_fallback( t, t->uas.request, &t->uac[r_buf->branch], 0); prev_branch = -1; + /* restore X/AVP values from initial transaction */ + tm_xdata_swap(t, &backup_xd, 0); while((branch_ret >= 0) && (branch_ret != prev_branch)) { prev_branch = branch_ret; branch_ret = t_send_branch(t, branch_ret, t->uas.request, 0, 0); } + /* restore X/AVP values from backup data */ + tm_xdata_swap(t, &backup_xd, 1); } } #endif

1 0

git:master:3b0b03c9: tls: exclude TLSv1.3 from OpenSSL > 1.1.0 < 1.1.1 for Debian stretch
by Henning Westerholt 19 Aug '22

19 Aug '22

Module: kamailio Branch: master Commit: 3b0b03c921945000b2c0f97810061fee58faf77d URL: https://github.com/kamailio/kamailio/commit/3b0b03c921945000b2c0f97810061fe… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-19T07:10:45Z tls: exclude TLSv1.3 from OpenSSL > 1.1.0 < 1.1.1 for Debian stretch --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/3b0b03c921945000b2c0f97810061fe… Patch: https://github.com/kamailio/kamailio/commit/3b0b03c921945000b2c0f97810061fe… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 9bbd0acb83..e6d0060d41 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -463,6 +463,7 @@ static void init_ssl_methods(void) sr_tls_methods[TLS_USE_TLSv1_2 - 1].TLSMethodMin = TLS1_2_VERSION; sr_tls_methods[TLS_USE_TLSv1_2 - 1].TLSMethodMax = TLS1_2_VERSION; +#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) sr_tls_methods[TLS_USE_TLSv1_3_cli - 1].TLSMethod = TLS_client_method(); sr_tls_methods[TLS_USE_TLSv1_3_cli - 1].TLSMethodMin = TLS1_3_VERSION; sr_tls_methods[TLS_USE_TLSv1_3_cli - 1].TLSMethodMax = TLS1_3_VERSION; @@ -472,6 +473,7 @@ static void init_ssl_methods(void) sr_tls_methods[TLS_USE_TLSv1_3 - 1].TLSMethod = TLS_method(); sr_tls_methods[TLS_USE_TLSv1_3 - 1].TLSMethodMin = TLS1_3_VERSION; sr_tls_methods[TLS_USE_TLSv1_3 - 1].TLSMethodMax = TLS1_3_VERSION; +#endif /* ranges of TLS versions (require a minimum TLS version) */ sr_tls_methods[TLS_USE_TLSv1_PLUS - 1].TLSMethod = TLS_method(); @@ -483,8 +485,10 @@ static void init_ssl_methods(void) sr_tls_methods[TLS_USE_TLSv1_2_PLUS - 1].TLSMethod = TLS_method(); sr_tls_methods[TLS_USE_TLSv1_2_PLUS - 1].TLSMethodMin = TLS1_2_VERSION; +#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) sr_tls_methods[TLS_USE_TLSv1_3_PLUS - 1].TLSMethod = TLS_method(); sr_tls_methods[TLS_USE_TLSv1_3_PLUS - 1].TLSMethodMin = TLS1_3_VERSION; +#endif #endif }

1 0

git:master:60f25fc4: tls: remove wrong TLSv1.3 statements from #ifdef block for openssl < 1.1.0
by Henning Westerholt 18 Aug '22

18 Aug '22

Module: kamailio Branch: master Commit: 60f25fc4b47222bac0eb09fbed93a1b63dcc54a4 URL: https://github.com/kamailio/kamailio/commit/60f25fc4b47222bac0eb09fbed93a1b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-18T10:32:47Z tls: remove wrong TLSv1.3 statements from #ifdef block for openssl < 1.1.0 --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/60f25fc4b47222bac0eb09fbed93a1b… Patch: https://github.com/kamailio/kamailio/commit/60f25fc4b47222bac0eb09fbed93a1b… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 1b88aa03bc..9bbd0acb83 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -401,12 +401,6 @@ static void init_ssl_methods(void) ssl_methods[TLS_USE_TLSv1_2 - 1] = TLSv1_2_method(); #endif -#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) - ssl_methods[TLS_USE_TLSv1_3_cli - 1] = TLSv1_3_client_method(); - ssl_methods[TLS_USE_TLSv1_3_srv - 1] = TLSv1_3_server_method(); - ssl_methods[TLS_USE_TLSv1_3 - 1] = TLSv1_3_method(); -#endif - /* ranges of TLS versions (require a minimum TLS version) */ ssl_methods[TLS_USE_TLSv1_PLUS - 1] = (void*)TLS_OP_TLSv1_PLUS; @@ -418,9 +412,6 @@ static void init_ssl_methods(void) ssl_methods[TLS_USE_TLSv1_2_PLUS - 1] = (void*)TLS_OP_TLSv1_2_PLUS; #endif -#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) - ssl_methods[TLS_USE_TLSv1_3_PLUS - 1] = (void*)TLS_OP_TLSv1_3_PLUS; -#endif #else /* openssl 1.1.0+ */ memset(sr_tls_methods, 0, sizeof(sr_tls_methods));

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev