Commit 45698e89 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'tor-github/pr/1515'

parents 7ee1e16c a0820bc0

changes/ticket32410

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features (relay):

    - When the relay module is disabled, make "DirCache 0" the default.

      Closes ticket 32410.

src/app/config/config.c

+12 −0
Original line number Diff line number Diff line
@@ -363,7 +363,13 @@ static const config_var_t option_vars_[] = { 
  V(CircuitStreamTimeout,        INTERVAL, "0"),

  V(CircuitPriorityHalflife,     DOUBLE,  "-1.0"), /*negative:'Use default'*/

  V(ClientDNSRejectInternalAddresses, BOOL,"1"),

#if defined(HAVE_MODULE_RELAY) || defined(TOR_UNIT_TESTS)

  /* The unit tests expect the ClientOnly default to be 0. */

  V(ClientOnly,                  BOOL,     "0"),

#else

  /* We must be a Client if the relay module is disabled. */

  V(ClientOnly,                  BOOL,     "1"),

#endif /* defined(HAVE_MODULE_RELAY) || defined(TOR_UNIT_TESTS) */

  V(ClientPreferIPv6ORPort,      AUTOBOOL, "auto"),

  V(ClientPreferIPv6DirPort,     AUTOBOOL, "auto"),

  V(ClientAutoIPv6ORPort,        BOOL,     "0"),
@@ -400,7 +406,13 @@ static const config_var_t option_vars_[] = { 
  V(DirPortFrontPage,            FILENAME, NULL),

  VAR("DirReqStatistics",        BOOL,     DirReqStatistics_option, "1"),

  VAR("DirAuthority",            LINELIST, DirAuthorities, NULL),

#if defined(HAVE_MODULE_RELAY) || defined(TOR_UNIT_TESTS)

  /* The unit tests expect the DirCache default to be 1. */

  V(DirCache,                    BOOL,     "1"),

#else

  /* We can't be a DirCache if the relay module is disabled. */

  V(DirCache,                    BOOL,     "0"),

#endif /* defined(HAVE_MODULE_RELAY) || defined(TOR_UNIT_TESTS) */

  /* A DirAuthorityFallbackRate of 0.1 means that 0.5% of clients try an

   * authority when all fallbacks are up, and 2% try an authority when 25% of

   * fallbacks are down. (We rebuild the list when 25% of fallbacks are down).

src/app/config/or_options_st.h

+3 −1
Original line number Diff line number Diff line
@@ -573,7 +573,9 @@ struct or_options_t { 


  int DirCache; /**< Cache all directory documents and accept requests via

                 * tunnelled dir conns from clients. If 1, enabled (default);

                 * If 0, disabled. */

                 * If 0, disabled. Use dir_server_mode() rather than

                 * referencing this option directly. (Except for routermode

                 * and relay_config, which do direct checks.) */



  char *VirtualAddrNetworkIPv4; /**< Address and mask to hand out for virtual

                                 * MAPADDRESS requests for IPv4 addresses */

src/feature/relay/relay_config.h

+0 −3
Original line number Diff line number Diff line
@@ -122,9 +122,6 @@ options_validate_relay_mode(const or_options_t *old_options, 
    return -1;

  }



  /* 31851 / 29211: Set this option the correct way */

  options->ClientOnly = 1;



  return 0;

}

src/test/conf_examples/badnick_1/error_no_dirauth_relay

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
This tor was built with relay mode disabled.