[or-cvs] r10215: Make caches-extra-info lines parseable. (in tor/trunk: . doc/spec src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-05-18 20:24:29 -0400 (Fri, 18 May 2007)
New Revision: 10215

Modified:
   tor/trunk/
   tor/trunk/doc/spec/dir-spec.txt
   tor/trunk/src/or/router.c
Log:
 r12794@catbus:  nickm | 2007-05-18 20:24:26 -0400
 Make caches-extra-info lines parseable.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12794] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/doc/spec/dir-spec.txt
===================================================================
--- tor/trunk/doc/spec/dir-spec.txt	2007-05-19 00:14:34 UTC (rev 10214)
+++ tor/trunk/doc/spec/dir-spec.txt	2007-05-19 00:24:29 UTC (rev 10215)
@@ -488,12 +488,12 @@
          used, and should still be recognized by new code until Tor 0.1.2.x
          is obsolete.]
 
-   "caches-extra-info" 0|1 NL
+   "caches-extra-info" NL
 
        [At most once.]
 
-       True if this router is a directory cache that provides extra-info
-       documents.  If absent, the value should be treated as false.
+       Present only if this router is a directory cache that provides
+       extra-info documents.
 
        [Versions before 0.2.0.1-alpha don't recognize this, and versions
         before 0.1.2.5-alpha will reject descriptors containing it unless

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2007-05-19 00:14:34 UTC (rev 10214)
+++ tor/trunk/src/or/router.c	2007-05-19 00:24:29 UTC (rev 10215)
@@ -1357,7 +1357,7 @@
     (int) router->bandwidthburst,
     (int) router->bandwidthcapacity,
     extra_info_digest,
-    options->DownloadExtraInfo ? "opt caches-extra-info 1\n" : "",
+    options->DownloadExtraInfo ? "opt caches-extra-info\n" : "",
     onion_pkey, identity_pkey,
     family_line, bandwidth_usage,
     we_are_hibernating() ? "opt hibernating 1\n" : "");