[or-cvs] r12609: two pieces of r12607 for karsten to look at closer (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2007-11-29 10:37:17 -0500 (Thu, 29 Nov 2007)
New Revision: 12609

Modified:
   tor/trunk/src/or/config.c
   tor/trunk/src/or/rendservice.c
Log:
two pieces of r12607 for karsten to look at closer


Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-11-29 15:30:32 UTC (rev 12608)
+++ tor/trunk/src/or/config.c	2007-11-29 15:37:17 UTC (rev 12609)
@@ -290,6 +290,7 @@
   VAR("__AllDirActionsPrivate",  BOOL,  AllDirActionsPrivate,     "0"),
   VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"),
   VAR("__LeaveStreamsUnattached",BOOL,  LeaveStreamsUnattached,   "0"),
+  /* XXX020 Karsten: this still needs a man page entry -RD */
   V(MinUptimeHidServDirectoryV2, INTERVAL, "24 hours"),
   { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
 };

Modified: tor/trunk/src/or/rendservice.c
===================================================================
--- tor/trunk/src/or/rendservice.c	2007-11-29 15:30:32 UTC (rev 12608)
+++ tor/trunk/src/or/rendservice.c	2007-11-29 15:37:17 UTC (rev 12609)
@@ -324,6 +324,9 @@
         version = atoi(version_str);
         versions_bitmask |= 1 << version;
       }
+      /* XXX020 Karsten: do you really want to overwrite the
+       * descriptor_version in the second line? Perhaps if both bits
+       * are set you want to leave it at -1? -RD */
       if (versions_bitmask == 1 << 0) service->descriptor_version = 0;
       if (versions_bitmask == 1 << 2) service->descriptor_version = 2;
     }