Commit 387de08f authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'ticket20960'

parents 56b11905 55d02c00

changes/ticket20960

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Removed features:

    - The AuthDirMaxServersPerAuthAddr option no longer exists: The same

      limit for relays running on a single IP applies to authority IP

      addresses as well as to non-authority IP addresses.  Closes ticket

      20960.

doc/tor.1.txt

+0 −4
Original line number Diff line number Diff line
@@ -2246,10 +2246,6 @@ on the public Tor network. 
    list as acceptable on a single IP address. Set this to "0" for "no limit".

    (Default: 2)



[[AuthDirMaxServersPerAuthAddr]] **AuthDirMaxServersPerAuthAddr** __NUM__::

    Authoritative directories only. Like AuthDirMaxServersPerAddr, but applies

    to addresses shared with directory authorities. (Default: 5)



[[AuthDirFastGuarantee]] **AuthDirFastGuarantee** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::

    Authoritative directories only. If non-zero, always vote the

    Fast flag for any relay advertising this amount of capacity or

src/or/config.c

+1 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static config_var_t option_vars_[] = { 
  OBSOLETE("AuthDirListBadDirs"),

  V(AuthDirListBadExits,         BOOL,     "0"),

  V(AuthDirMaxServersPerAddr,    UINT,     "2"),

  V(AuthDirMaxServersPerAuthAddr,UINT,     "5"),

  OBSOLETE("AuthDirMaxServersPerAuthAddr"),

  V(AuthDirHasIPv6Connectivity,  BOOL,     "0"),

  VAR("AuthoritativeDirectory",  BOOL, AuthoritativeDir,    "0"),

  V(AutomapHostsOnResolve,       BOOL,     "0"),
@@ -594,7 +594,6 @@ static const config_var_t testing_tor_network_defaults[] = { 
  V(EnforceDistinctSubnets,      BOOL,     "0"),

  V(AssumeReachable,             BOOL,     "1"),

  V(AuthDirMaxServersPerAddr,    UINT,     "0"),

  V(AuthDirMaxServersPerAuthAddr,UINT,     "0"),

  V(ClientBootstrapConsensusAuthorityDownloadSchedule, CSV_INTERVAL,

    "0, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 16, 32, 60"),

  V(ClientBootstrapConsensusFallbackDownloadSchedule, CSV_INTERVAL,

src/or/dirserv.c

+1 −7
Original line number Diff line number Diff line
@@ -2056,12 +2056,8 @@ get_possible_sybil_list(const smartlist_t *routers) 
  int addr_count;

  /* Allow at most this number of Tor servers on a single IP address, ... */

  int max_with_same_addr = options->AuthDirMaxServersPerAddr;

  /* ... unless it's a directory authority, in which case allow more. */

  int max_with_same_addr_on_authority = options->AuthDirMaxServersPerAuthAddr;

  if (max_with_same_addr <= 0)

    max_with_same_addr = INT_MAX;

  if (max_with_same_addr_on_authority <= 0)

    max_with_same_addr_on_authority = INT_MAX;



  smartlist_add_all(routers_by_ip, routers);

  smartlist_sort(routers_by_ip, compare_routerinfo_by_ip_and_bw_);
@@ -2074,8 +2070,6 @@ get_possible_sybil_list(const smartlist_t *routers) 
        last_addr = ri->addr;

        addr_count = 1;

      } else if (++addr_count > max_with_same_addr) {

        if (!router_addr_is_trusted_dir(ri->addr) ||

            addr_count > max_with_same_addr_on_authority)

        digestmap_set(omit_as_sybil, ri->cache_info.identity_digest, ri);

      }

  } SMARTLIST_FOREACH_END(ri);

src/or/or.h

+0 −3
Original line number Diff line number Diff line
@@ -3969,9 +3969,6 @@ typedef struct { 
                            * and vote for all other exits as good. */

  int AuthDirMaxServersPerAddr; /**< Do not permit more than this

                                 * number of servers per IP address. */

  int AuthDirMaxServersPerAuthAddr; /**< Do not permit more than this

                                     * number of servers per IP address shared

                                     * with an authority. */

  int AuthDirHasIPv6Connectivity; /**< Boolean: are we on IPv6?  */

  int AuthDirPinKeys; /**< Boolean: Do we enforce key-pinning? */