[or-cvs] r16858: {tor} Directory mirrors store and serve v2 hidden service descript (in tor/trunk: . doc src/or)

[kloesing@xxxxxxxx]

Author: kloesing
Date: 2008-09-11 16:06:04 -0400 (Thu, 11 Sep 2008)
New Revision: 16858

Modified:
   tor/trunk/ChangeLog
   tor/trunk/doc/tor.1.in
   tor/trunk/src/or/config.c
   tor/trunk/src/or/router.c
   tor/trunk/src/or/routerlist.c
Log:
Directory mirrors store and serve v2 hidden service descriptors by default.

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-09-11 19:58:23 UTC (rev 16857)
+++ tor/trunk/ChangeLog	2008-09-11 20:06:04 UTC (rev 16858)
@@ -28,6 +28,8 @@
   o Minor features:
     - Use a lockfile to make sure that two Tor processes are not
       simultaneously running with the same datadir.
+    - Directory mirrors store and serve v2 hidden service descriptors by
+      default (new default value for HidServDirectoryV2 is 1).
 
   o Code simplifications and refactoring:
     - Revise the connection_new functions so that a more typesafe variant

Modified: tor/trunk/doc/tor.1.in
===================================================================
--- tor/trunk/doc/tor.1.in	2008-09-11 19:58:23 UTC (rev 16857)
+++ tor/trunk/doc/tor.1.in	2008-09-11 20:06:04 UTC (rev 16858)
@@ -1077,7 +1077,7 @@
 .TP
 \fBHidServDirectoryV2 \fR\fB0\fR|\fB1\fR\fP
 When this option is set, Tor accepts and serves v2 hidden service
-descriptors. (Default: 0)
+descriptors. (Default: 1)
 .LP
 .TP
 \fBBridgeAuthoritativeDir \fR\fB0\fR|\fB1\fR\fP

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2008-09-11 19:58:23 UTC (rev 16857)
+++ tor/trunk/src/or/config.c	2008-09-11 20:06:04 UTC (rev 16858)
@@ -219,7 +219,7 @@
   V(Group,                       STRING,   NULL),
   V(HardwareAccel,               BOOL,     "0"),
   V(HashedControlPassword,       LINELIST, NULL),
-  V(HidServDirectoryV2,          BOOL,     "0"),
+  V(HidServDirectoryV2,          BOOL,     "1"),
   VAR("HiddenServiceDir",    LINELIST_S, RendConfigLines,    NULL),
   OBSOLETE("HiddenServiceExcludeNodes"),
   OBSOLETE("HiddenServiceNodes"),
@@ -3022,9 +3022,6 @@
     REJECT("HSAuthorityRecordStats is set but we're not running as "
            "a hidden service authority.");
 
-  if (options->HidServDirectoryV2 && !options->DirPort)
-    REJECT("Running as hidden service directory, but no DirPort set.");
-
   if (options->ConnLimit <= 0) {
     r = tor_snprintf(buf, sizeof(buf),
         "ConnLimit must be greater than 0, but was set to %d",

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2008-09-11 19:58:23 UTC (rev 16857)
+++ tor/trunk/src/or/router.c	2008-09-11 20:06:04 UTC (rev 16858)
@@ -1702,7 +1702,8 @@
     onion_pkey, identity_pkey,
     family_line,
     we_are_hibernating() ? "opt hibernating 1\n" : "",
-    options->HidServDirectoryV2 ? "opt hidden-service-dir\n" : "");
+    (options->DirPort && options->HidServDirectoryV2) ?
+        "opt hidden-service-dir\n" : "");
 
   tor_free(family_line);
   tor_free(onion_pkey);

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2008-09-11 19:58:23 UTC (rev 16857)
+++ tor/trunk/src/or/routerlist.c	2008-09-11 20:06:04 UTC (rev 16858)
@@ -4936,7 +4936,7 @@
   routerstatus_t *rs;
   if (!me)
     return 0;
-  if (!get_options()->HidServDirectoryV2) {
+  if (!get_options()->DirPort || !get_options()->HidServDirectoryV2) {
     log_info(LD_REND, "We are not acting as hidden service directory, "
                       "because we have not been configured as such.");
     return 0;