nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 13:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'testing-intro-rot' into 'main'

Browse Source 
hs_service: don't force high intro point rotation for TestingTorNetwork

Closes #40922

See merge request tpo/core/tor!802
This commit is contained in:
David Goulet 2024-03-14 17:41:54 +00:00
commit 2d19050ef9
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug40922 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (testing):
- Enabling TestingTorNetwork no longer forces fast hidden service
intro point rotation. This reduces noise and errors when
using hidden services with TestingTorNetwork enabled.
Fixes bug 40922; bugfix on 0.3.2.1-alpha.

17
src/feature/hs/hs_service.c
View File

@ -410,11 +410,6 @@ get_intro_point_max_introduce2(void)
static int32_t static int32_t
get_intro_point_min_lifetime(void) get_intro_point_min_lifetime(void)
{ {
#define MIN_INTRO_POINT_LIFETIME_TESTING 10
if (get_options()->TestingTorNetwork) {
return MIN_INTRO_POINT_LIFETIME_TESTING;
}
/* The [0, 2147483647] range is quite large to accommodate anything we decide /* The [0, 2147483647] range is quite large to accommodate anything we decide
* in the future. */ * in the future. */
return networkstatus_get_param(NULL, "hs_intro_min_lifetime", return networkstatus_get_param(NULL, "hs_intro_min_lifetime",
@ -427,11 +422,6 @@ get_intro_point_min_lifetime(void)
static int32_t static int32_t
get_intro_point_max_lifetime(void) get_intro_point_max_lifetime(void)
{ {
#define MAX_INTRO_POINT_LIFETIME_TESTING 30
if (get_options()->TestingTorNetwork) {
return MAX_INTRO_POINT_LIFETIME_TESTING;
}
/* The [0, 2147483647] range is quite large to accommodate anything we decide /* The [0, 2147483647] range is quite large to accommodate anything we decide
* in the future. */ * in the future. */
return networkstatus_get_param(NULL, "hs_intro_max_lifetime", return networkstatus_get_param(NULL, "hs_intro_max_lifetime",
@ -3039,13 +3029,6 @@ get_max_intro_circ_per_period(const hs_service_t *service)
tor_assert(service->config.num_intro_points <= tor_assert(service->config.num_intro_points <=
HS_CONFIG_V3_MAX_INTRO_POINTS); HS_CONFIG_V3_MAX_INTRO_POINTS);
/** For a testing network, allow to do it for the maximum amount so circuit
* creation and rotation and so on can actually be tested without limit. */
#define MAX_INTRO_POINT_CIRCUIT_RETRIES_TESTING -1
if (get_options()->TestingTorNetwork) {
return MAX_INTRO_POINT_CIRCUIT_RETRIES_TESTING;
}
num_wanted_ip = service->config.num_intro_points; num_wanted_ip = service->config.num_intro_points;
/* The calculation is as follow. We have a number of intro points that we /* The calculation is as follow. We have a number of intro points that we