Prechádzať zdrojové kódy

Make AuthDirHasIPv6Connectivity a BOOL.

This is a fix of unreleased tor. It solves ticket #6770.
Linus Nordberg 13 rokov pred
rodič
commit
0e53742a85
2 zmenil súbory, kde vykonal 3 pridanie a 4 odobranie
  1. 2 3
      doc/tor.1.txt
  2. 1 1
      src/or/config.c

+ 2 - 3
doc/tor.1.txt

@@ -1747,13 +1747,12 @@ DIRECTORY AUTHORITY SERVER OPTIONS
     votes on whether to accept relays as hidden service directories.
     (Default: 1)
 
-**AuthDirHasIPv6Connectivity** **0**|**1**|**auto**::
+**AuthDirHasIPv6Connectivity** **0**|**1**::
 
     Authoritative directories only. When set to 0, OR ports with an
     IPv6 address are being accepted without reachability testing.
     When set to 1, IPv6 OR ports are being tested just like IPv4 OR
-    ports.  When set to auto, Tor tries to find out if the authority
-    relay has IPv6 connectivity or not. (Default: auto)
+    ports. (Default: 0)
 
 **AuthDirPublishIPv6** **0**|**1**::
 

+ 1 - 1
src/or/config.c

@@ -204,7 +204,7 @@ static config_var_t _option_vars[] = {
   V(AuthDirListBadExits,         BOOL,     "0"),
   V(AuthDirMaxServersPerAddr,    UINT,     "2"),
   V(AuthDirMaxServersPerAuthAddr,UINT,     "5"),
-  V(AuthDirHasIPv6Connectivity,  AUTOBOOL, "auto"),
+  V(AuthDirHasIPv6Connectivity,  BOOL,     "0"),
   V(AuthDirPublishIPv6,          BOOL,     "0"),
   VAR("AuthoritativeDirectory",  BOOL, AuthoritativeDir,    "0"),
   V(AutomapHostsOnResolve,       BOOL,     "0"),