Directory mirrors store and serve v2 hidden service descriptors by default.

svn:r16858

diff --git a/ChangeLog b/ChangeLog
index 8664609f3d75b38f1f6e77ad5f0ae41b4a680a88..1485a4c113565cb0bf105988cda1db18cd6c3c8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@ Changes in version 0.2.1.6-alpha - 2008-09-xx
   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

diff --git a/doc/tor.1.in b/doc/tor.1.in
index e8162df34d6ef5a37a3276a7a4ef95adb862a0cf..40570d7784791e411735191ae590b2bc09836a16 100644 (file)
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -1077,7 +1077,7 @@ usage to a file \fBhsusage\fP  in its data directory. (Default: 0)
 .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

diff --git a/src/or/config.c b/src/or/config.c
index 92a4a0dbebccf19da9c928c83c055dca5946f74b..bb729da9b7328db6a9a6cf762d75e65a77b8e513 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -219,7 +219,7 @@ static config_var_t _option_vars[] = {
   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 @@ options_validate(or_options_t *old_options, or_options_t *options,
     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",

diff --git a/src/or/router.c b/src/or/router.c
index 1132f9dca5de124434b2ff9e48c2ad4325b27079..18e8abcfe1e9b65c4c61011afcea15b53a0ce323 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1702,7 +1702,8 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
     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);

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 0e4df84aae94e06e6f46e2942b78f8505d16666a..32595b8080546e1c1250386a6d51e6b2fedfa802 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4936,7 +4936,7 @@ hid_serv_acting_as_directory(void)
   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;