[or-cvs] r12528: get rid of the __ConsiderAllRoutersAsHidServDirectories conf (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2007-11-17 07:28:18 -0500 (Sat, 17 Nov 2007)
New Revision: 12528

Modified:
   tor/trunk/src/or/config.c
   tor/trunk/src/or/dirserv.c
   tor/trunk/src/or/or.h
Log:
get rid of the __ConsiderAllRoutersAsHidServDirectories config option


Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-11-17 12:15:32 UTC (rev 12527)
+++ tor/trunk/src/or/config.c	2007-11-17 12:28:18 UTC (rev 12528)
@@ -288,8 +288,6 @@
   VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"),
   V(VirtualAddrNetwork,          STRING,   "127.192.0.0/10"),
   VAR("__AllDirActionsPrivate",  BOOL,  AllDirActionsPrivate,     "0"),
-  /*XXXX020 for testing.  Maybe remove before -rc. */
-  V(__ConsiderAllRoutersAsHidServDirectories, BOOL, "0"),
   VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"),
   VAR("__LeaveStreamsUnattached",BOOL,  LeaveStreamsUnattached,   "0"),
   /*XXXX020 for testing.  Maybe remove before -rc. */

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2007-11-17 12:15:32 UTC (rev 12527)
+++ tor/trunk/src/or/dirserv.c	2007-11-17 12:28:18 UTC (rev 12528)
@@ -1909,8 +1909,6 @@
   }
   rs->is_bad_exit = listbadexits && ri->is_bad_exit;
   ri->is_hs_dir = dirserv_thinks_router_is_hs_dir(ri, now);
-  if (get_options()->__ConsiderAllRoutersAsHidServDirectories)
-    ri->is_hs_dir = 1; /* Override real value. */
   rs->is_hs_dir = ri->is_hs_dir;
   /* 0.1.1.9-alpha is the first version to support fetch by descriptor
    * hash. */

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-11-17 12:15:32 UTC (rev 12527)
+++ tor/trunk/src/or/or.h	2007-11-17 12:28:18 UTC (rev 12528)
@@ -2092,8 +2092,6 @@
    * them at some point, since I think C says that identifiers beginning with
    * __ are implementation-reserved or something. */
   int __MinUptimeHidServDirectoryV2; /**< Accept hs dirs after what time? */
-  int __ConsiderAllRoutersAsHidServDirectories; /**< Consider all routers as
-                                                 * hidden service dirs? */
   int FetchUselessDescriptors; /**< Do we fetch non-running descriptors too? */
   int AllDirActionsPrivate; /**< Should every directory action be sent
                              * through a Tor circuit? */