Commit 2d19050e authored by David Goulet's avatar David Goulet 🐼
Browse files

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

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

Closes #40922

See merge request tpo/core/tor!802
parents d1e8c7a6 d2249616

changes/bug40922

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/feature/hs/hs_service.c

+0 −17
Original line number Diff line number Diff line
@@ -410,11 +410,6 @@ get_intro_point_max_introduce2(void) 
static int32_t

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

   * in the future. */

  return networkstatus_get_param(NULL, "hs_intro_min_lifetime",
@@ -427,11 +422,6 @@ get_intro_point_min_lifetime(void) 
static int32_t

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

   * in the future. */

  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 <=

             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;



  /* The calculation is as follow. We have a number of intro points that we